Merge branch 'develop' into DJ_mini-data-lake_WIP

cisagov · Mar 19, 2024 · 9407af6 · 9407af6
2 parents a1c1f64 + 8fe2660
commit 9407af6
Show file tree

Hide file tree

Showing 18 changed files with 32,580 additions and 32,334 deletions.
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -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",
@@ -53,6 +47,7 @@
     "wappalyzer-core": "^6.10.63",
     "ws": "^8.13.0"
   },
+  "description": "",
   "devDependencies": {
     "@jest/globals": "^29",
     "@types/aws-lambda": "^8.10.62",
@@ -92,29 +87,34 @@
     "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",
     "syncmdl": "docker-compose exec -T backend npx ts-node src/tools/run-syncmdl.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"
 }
diff --git a/...s/__mocks__/censysCertificatesSample.json → ...rs/__mocks__/censysCertificatesSample.txt b/...s/__mocks__/censysCertificatesSample.json → ...rs/__mocks__/censysCertificatesSample.txt
diff --git a/...s/helpers/__mocks__/censysIpv4Sample.json → ...ks/helpers/__mocks__/censysIpv4Sample.txt b/...s/helpers/__mocks__/censysIpv4Sample.json → ...ks/helpers/__mocks__/censysIpv4Sample.txt
diff --git a/backend/src/tasks/helpers/technologies_backup.json b/backend/src/tasks/helpers/technologies_backup.json
@@ -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"
+  }
 }