Skip to content

Commit

Permalink
Fix issues flagged by pretty-format-json.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Matthew-Grayson
Matthew-Grayson committed Mar 13, 2024
1 parent 4f0c470 commit 9d8d2dc
Show file tree
Hide file tree
Showing 18 changed files with 31,191 additions and 30,980 deletions.
13,582 changes: 6,791 additions & 6,791 deletions backend/package-lock.json
View file

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions backend/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
{
"name": "crossfeed-backend",
"version": "1.0.0",
"description": "",
"engines": {
"node": ">=18.0.0"
},
"engineStrict": true,
"author": "",
"dependencies": {
"@aws-sdk/client-cloudwatch-logs": "^3.417.0",
"@aws-sdk/client-ssm": "^3.414.0",
Expand Down Expand Up @@ -53,6 +47,7 @@
"wappalyzer-core": "^6.10.63",
"ws": "^8.13.0"
},
"description": "",
"devDependencies": {
"@jest/globals": "^29",
"@types/aws-lambda": "^8.10.62",
Expand Down Expand Up @@ -92,28 +87,33 @@
"webpack": "^5.88",
"webpack-cli": "^5.1"
},
"engineStrict": true,
"engines": {
"node": ">=18.0.0"
},
"license": "ISC",
"name": "crossfeed-backend",
"overrides": {
"execa": "^5.1.1",
"file-type": "^16.5.4",
"superagent": "^8.0.5",
"xml2js": "0.5.0",
"kind-of": "^6.0.3",
"execa": "^5.1.1",
"natural": "^6.5.0",
"semver": "^7.5.3"
"semver": "^7.5.3",
"superagent": "^8.0.5",
"xml2js": "0.5.0"
},
"scripts": {
"test": "jest --detectOpenHandles",
"test-python": "pytest",
"lint": "eslint '**/*.{ts,tsx,js,jsx}'",
"lint:fix": "eslint '**/*.{ts,tsx,js,jsx}' --fix",
"codegen": "ts-node src/tools/generate-types.ts",
"build-worker": "sh ./tools/build-worker.sh",
"deploy-worker-staging": "./tools/deploy-worker.sh",
"codegen": "ts-node src/tools/generate-types.ts",
"control-queue": "docker-compose exec -T backend npx ts-node src/tools/consumeControlQueue.ts",
"deploy-worker-prod": "./tools/deploy-worker.sh crossfeed-prod-worker",
"syncdb": "docker-compose exec -T backend npx ts-node src/tools/run-syncdb.ts",
"deploy-worker-staging": "./tools/deploy-worker.sh",
"lint": "eslint '**/*.{ts,tsx,js,jsx}'",
"lint:fix": "eslint '**/*.{ts,tsx,js,jsx}' --fix",
"pesyncdb": "docker-compose exec -T backend npx ts-node src/tools/run-pesyncdb.ts",
"control-queue": "docker-compose exec -T backend npx ts-node src/tools/consumeControlQueue.ts"
"syncdb": "docker-compose exec -T backend npx ts-node src/tools/run-syncdb.ts",
"test": "jest --detectOpenHandles",
"test-python": "pytest"
},
"author": "",
"license": "ISC"
"version": "1.0.0"
}
176 changes: 88 additions & 88 deletions backend/src/tasks/helpers/technologies.json
View file
Original file line number Diff line number Diff line change
@@ -1,93 +1,93 @@
{
"Sitefinity": {
"cats": [
1
],
"icon": "Sitefinity.svg",
"cpe": "cpe:/a:progress:sitefinity",
"implies": "Microsoft ASP.NET",
"js": {
"Telerik.Sitefinity": ""
},
"meta": {
"generator": "^Sitefinity (\\S+)\\;version:\\1"
},
"website": "https://www.progress.com/sitefinity-cms",
"examples": [
{
"name": "with version and suffix",
"html": "</script><meta name=\"Generator\" content=\"Sitefinity 11.0.6700 PE\" /><link",
"version": "11.0.6700"
},
{
"name": "with version and no suffix",
"html": "</script><meta name=\"Generator\" content=\"Sitefinity 11.0.6700\" /><link",
"version": "11.0.6700"
}
]
"Atlassian Crowd": {
"cats": [
61
],
"cookies": {
"crowd.rememberme.token": ""
},
"Oracle WebLogic Server": {
"cats": [
22
],
"cpe": "cpe:/a:oracle:weblogic_server",
"html": [
"<title>Oracle WebLogic Server Administration Console</title>",
"<p id=\"footerVersion\">WebLogic Server Version: (.*?)</p>\\;version:\\1"
],
"icon": "Oracle.png",
"website": "http://www.oracle.com/technetwork/middleware/ias/overview/index.html",
"examples": [
{
"name": "with version",
"html": "<p id=\"footerVersion\">WebLogic Server Version: 10.3.6.0</p>",
"version": "10.3.6.0"
}
]
"cpe": "cpe:/a:atlassian:crowd",
"examples": [
{
"html": "<input id=\"crowd-version\" type=\"hidden\" value=\"Version:&nbsp;3.7.0 (Build:#1271 - 2018-12-30) \">",
"name": "with version",
"version": "3.7.0"
}
],
"html": [
"<link rel=\"shortcut icon\" href=\"/crowd/console/favicon.ico\">",
"<input id=\"crowd-version\" type=\"hidden\" value=\"Version:&nbsp;(\\S+) \\;version:\\1"
],
"website": "https://www.atlassian.com/software/crowd"
},
"Microsoft Exchange Server": {
"cats": [
30
],
"cpe": "cpe:/a:microsoft:exchange_server",
"html": [
"<link rel=\"shortcut icon\" href=\"/owa/auth/(.*?)/\\;version:\\1"
],
"icon": "Microsoft.png",
"website": "https://www.microsoft.com/en-us/microsoft-365/exchange/email"
},
"Oracle PeopleSoft": {
"cats": [
61
],
"cookies": {
"PS_TOKEN": ""
},
"Microsoft Exchange Server": {
"cats": [
30
],
"cpe": "cpe:/a:microsoft:exchange_server",
"html": [
"<link rel=\"shortcut icon\" href=\"/owa/auth/(.*?)/\\;version:\\1"
],
"icon": "Microsoft.png",
"website": "https://www.microsoft.com/en-us/microsoft-365/exchange/email"
"cpe": "cpe:/a:oracle:peoplesoft_enterprise",
"html": [
"<title>Oracle PeopleSoft Sign-in</title>"
],
"website": "https://www.oracle.com/applications/peoplesoft/"
},
"Oracle WebLogic Server": {
"cats": [
22
],
"cpe": "cpe:/a:oracle:weblogic_server",
"examples": [
{
"html": "<p id=\"footerVersion\">WebLogic Server Version: 10.3.6.0</p>",
"name": "with version",
"version": "10.3.6.0"
}
],
"html": [
"<title>Oracle WebLogic Server Administration Console</title>",
"<p id=\"footerVersion\">WebLogic Server Version: (.*?)</p>\\;version:\\1"
],
"icon": "Oracle.png",
"website": "http://www.oracle.com/technetwork/middleware/ias/overview/index.html"
},
"Sitefinity": {
"cats": [
1
],
"cpe": "cpe:/a:progress:sitefinity",
"examples": [
{
"html": "</script><meta name=\"Generator\" content=\"Sitefinity 11.0.6700 PE\" /><link",
"name": "with version and suffix",
"version": "11.0.6700"
},
{
"html": "</script><meta name=\"Generator\" content=\"Sitefinity 11.0.6700\" /><link",
"name": "with version and no suffix",
"version": "11.0.6700"
}
],
"icon": "Sitefinity.svg",
"implies": "Microsoft ASP.NET",
"js": {
"Telerik.Sitefinity": ""
},
"Atlassian Crowd": {
"cats": [
61
],
"cpe": "cpe:/a:atlassian:crowd",
"cookies": {
"crowd.rememberme.token": ""
},
"html": [
"<link rel=\"shortcut icon\" href=\"/crowd/console/favicon.ico\">",
"<input id=\"crowd-version\" type=\"hidden\" value=\"Version:&nbsp;(\\S+) \\;version:\\1"
],
"website": "https://www.atlassian.com/software/crowd",
"examples": [
{
"name": "with version",
"html": "<input id=\"crowd-version\" type=\"hidden\" value=\"Version:&nbsp;3.7.0 (Build:#1271 - 2018-12-30) \">",
"version": "3.7.0"
}
]
"meta": {
"generator": "^Sitefinity (\\S+)\\;version:\\1"
},
"Oracle PeopleSoft": {
"cats": [
61
],
"cookies": {
"PS_TOKEN": ""
},
"cpe": "cpe:/a:oracle:peoplesoft_enterprise",
"html": [
"<title>Oracle PeopleSoft Sign-in</title>"
],
"website": "https://www.oracle.com/applications/peoplesoft/"
}
}
"website": "https://www.progress.com/sitefinity-cms"
}
}
66 changes: 33 additions & 33 deletions backend/src/tasks/helpers/technologies_backup.json
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
{
"Telerik UI for ASP.NET AJAX": {
"__comments__":"TODO: this needs to be added back to the main file once we fix the test",
"cats": [
59
],
"cpe": "cpe:/a:telerik:ui_for_asp.net_ajax",
"js": {
"Telerik": ""
},
"html": [
"[<link|<script].*?Telerik\\.Web\\.UI\\.WebResource\\.axd",
"[<link|<script].*?Telerik\\.Web\\.UI\\.WebResource\\.axd\\?.*?Telerik\\.Web\\.UI%2c\\+Version%3d(20.*?)%2c\\;version:\\1",
"<!-- (20\\d{2}\\.\\d\\.\\d{3}\\.\\d{2}) -->\\;version:\\1"
],
"website": "https://www.telerik.com/products/aspnet-ajax.aspx",
"examples": [
{
"name": "with version",
"html": "<head><link href=\"/Telerik.Web.UI.WebResource.axd?compress=1&amp;_TSM_CombinedScripts_=%3b%3bTelerik.Web.UI%2c+Version%3d2014.2.724.40%2c+Culture%3dneutral%2c+PublicKeyToken%3d7a3d4%3aen-US%3af-7b88-4e1e-8026-2b8c288%3aed2942d4\" type=\"text/css\" rel=\"stylesheet\" /></head>",
"version": "2014.2.724.40"
},
{
"name": "with no version",
"html": "<script src=\"/Telerik.Web.UI.WebResource.axd?_TSM_HiddenField_=ctl02_TSM&amp;compress=0&amp;_TSM_CombinedScripts_=%3b%3bSystem.Web.Extensions%2c+Version%3d4.0.0.0%2c+Culture%3dneutral%2c+PublicKeyToken%3d7a3d4%3aen-US%3af-7b88-4e1e-8026-2b8c288%3aed2942d4\" type=\"text/javascript\"></script>",
"version": ""
},
{
"name": "with version in comment",
"html": "\t<!-- 2016.1.113.45 --><ul",
"version": "2016.1.113.45"
}
]
}
"Telerik UI for ASP.NET AJAX": {
"__comments__": "TODO: this needs to be added back to the main file once we fix the test",
"cats": [
59
],
"cpe": "cpe:/a:telerik:ui_for_asp.net_ajax",
"examples": [
{
"html": "<head><link href=\"/Telerik.Web.UI.WebResource.axd?compress=1&amp;_TSM_CombinedScripts_=%3b%3bTelerik.Web.UI%2c+Version%3d2014.2.724.40%2c+Culture%3dneutral%2c+PublicKeyToken%3d7a3d4%3aen-US%3af-7b88-4e1e-8026-2b8c288%3aed2942d4\" type=\"text/css\" rel=\"stylesheet\" /></head>",
"name": "with version",
"version": "2014.2.724.40"
},
{
"html": "<script src=\"/Telerik.Web.UI.WebResource.axd?_TSM_HiddenField_=ctl02_TSM&amp;compress=0&amp;_TSM_CombinedScripts_=%3b%3bSystem.Web.Extensions%2c+Version%3d4.0.0.0%2c+Culture%3dneutral%2c+PublicKeyToken%3d7a3d4%3aen-US%3af-7b88-4e1e-8026-2b8c288%3aed2942d4\" type=\"text/javascript\"></script>",
"name": "with no version",
"version": ""
},
{
"html": "\t<!-- 2016.1.113.45 --><ul",
"name": "with version in comment",
"version": "2016.1.113.45"
}
],
"html": [
"[<link|<script].*?Telerik\\.Web\\.UI\\.WebResource\\.axd",
"[<link|<script].*?Telerik\\.Web\\.UI\\.WebResource\\.axd\\?.*?Telerik\\.Web\\.UI%2c\\+Version%3d(20.*?)%2c\\;version:\\1",
"<!-- (20\\d{2}\\.\\d\\.\\d{3}\\.\\d{2}) -->\\;version:\\1"
],
"js": {
"Telerik": ""
},
"website": "https://www.telerik.com/products/aspnet-ajax.aspx"
}
}
Loading

0 comments on commit 9d8d2dc

Please sign in to comment.