Merge pull request #92 from cisagov/91-resolve-lint-issues-flagged-by…

…-end-of-file-fixer-prettier-and-trailing-white-space

Resolve Lint Issues Related to Whitespace/Prettier and Secrets

.dockerignore

@@ -11,4 +11,4 @@ nvd-dump
 minio-data
 **/node_modules
 **/.cache
-./docs/node_modules
+./docs/node_modules

.pre-commit-config.yaml

@@ -16,6 +16,7 @@ repos:
         args:
           - --allow-missing-credentials
       - id: detect-private-key
+        exclude: dev.env.example
       - id: end-of-file-fixer
         exclude: files/(issue|motd)
       - id: mixed-line-ending
@@ -26,6 +27,7 @@ repos:
           - --autofix
       - id: requirements-txt-fixer
       - id: trailing-whitespace
+        exclude: .*.snap
 
   # Text file hooks
   - repo: https://github.com/igorshubovych/markdownlint-cli

Dockerfile.docs

@@ -21,4 +21,4 @@ COPY ./docs .
 # Configure port used by Gatsby
 ENV INTERNAL_STATUS_PORT=44475
 
-CMD npm run codegen; npm run develop -- -H 0.0.0.0 --port 4000
+CMD npm run codegen; npm run develop -- -H 0.0.0.0 --port 4000

LICENSE

@@ -113,4 +113,4 @@ party to this document and has no duty or obligation with respect to this
 CC0 or use of the Work.
 
 For more information, please see
-<http://creativecommons.org/publicdomain/zero/1.0/>
+<http://creativecommons.org/publicdomain/zero/1.0/>

backend/.dockerignore

@@ -4,4 +4,4 @@ node_modules
 dist
 Dockerfile*
 nvd-dump
-coverage
+coverage

backend/.npmrc

@@ -1 +1 @@
-engine-strict=true
+engine-strict=true

backend/.snyk

@@ -4,9 +4,9 @@ version: v1.22.1
 
 # ignores vulnerabilities until expiry date; change duration by modifying expiry date
 
-ignore: 
+ignore:
     # ignore scrapy 2.x.x for 6 months.
-    SNYK-PYTHON-SCRAPY-40690: 
+    SNYK-PYTHON-SCRAPY-40690:
         - '*':
             reason: No fix available up to version 2.11.0
             expires: 2024-06-01T00:00:00.000Z

backend/Dockerfile.pe

@@ -33,9 +33,9 @@ RUN git clone -b AL-staging-SQS https://github.com/cisagov/pe-reports.git && \
 
 RUN python -m spacy download en_core_web_lg
 
-# Create database.ini 
-RUN echo "[database]" > database.ini \ 
-    && echo "user=$(cat db_user.txt)" >> database.ini \ 
+# Create database.ini
+RUN echo "[database]" > database.ini \
+    && echo "user=$(cat db_user.txt)" >> database.ini \
     && echo "password=$(cat db_password.txt)" >> database.ini
 
 COPY worker worker

backend/Dockerfile.worker

@@ -26,7 +26,7 @@ WORKDIR /app
 
 RUN apk add --no-cache curl unzip musl-dev
 
-RUN curl -4LO http://github.com/Findomain/Findomain/releases/latest/download/findomain-linux.zip 
+RUN curl -4LO http://github.com/Findomain/Findomain/releases/latest/download/findomain-linux.zip
 RUN unzip findomain-linux.zip && chmod +x findomain && cp findomain /usr/bin/findomain
 
 RUN go mod init crossfeed-worker

backend/src/api/users.ts

@@ -306,7 +306,7 @@ Crossfeed access instructions:
 5. You will be prompted to enable MFA. Scan the QR code with an authenticator app on your phone, such as Microsoft Authenticator. Enter the MFA code you see after scanning.
 6. After configuring your account, you will be redirected to Crossfeed.
 
-For more information on using Crossfeed, view the Crossfeed user guide at https://docs.crossfeed.cyber.dhs.gov/user-guide/quickstart/. 
+For more information on using Crossfeed, view the Crossfeed user guide at https://docs.crossfeed.cyber.dhs.gov/user-guide/quickstart/.
 
 If you encounter any difficulties, please feel free to reply to this email (or send an email to ${
       process.env.CROSSFEED_SUPPORT_EMAIL_REPLYTO
@@ -825,7 +825,7 @@ export const inviteV2 = wrapHandler(async (event) => {
       `Hello,
       Your Crossfeed registration is under review.
       You will receive an email when your registration is approved.
-      
+
       Thank you!`
     );
   };

backend/src/tasks/cve.ts

@@ -20,7 +20,7 @@ import { CISACatalogOfKnownExploitedVulnerabilities } from 'src/models/generated
  * The CVE scan creates vulnerabilities based on existing
  * data (such as product version numbers / CPEs, webpages)
  * that have already been collected from other scans.
- * 
+ *
  * To manually test the CVE tools from your command line, run:
 
 nvdsync -cve_feed cve-1.1.json.gz nvd-dump

backend/src/tasks/helpers/technologies.json

@@ -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"
+  }
+}