Merge branch 'main' into fix-snyk-more

GSA · Jan 18, 2024 · 1b15c10 · 1b15c10
2 parents 199ddbc + 2a77249
commit 1b15c10
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 4 deletions.
diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml
@@ -25,7 +25,8 @@ jobs:
           sudo apt-get update -y
           sudo apt-get install -y \
             openssl libssl-dev libffi-dev pkg-config libxml2-dev \
-            libxmlsec1-dev libxmlsec1-openssl libgeos-dev proj-bin
+            libxmlsec1-dev libxmlsec1-openssl libgeos-dev proj-bin \
+            libpq-dev
           pip3 install -r requirements.txt
       - name: Run Snyk Scan
         run: |

diff --git a/ckan/.snyk b/ckan/.snyk
@@ -49,7 +49,7 @@ ignore:
         reason: >-
           No remediation available yet; Issue tracked in github:
           https://github.com/GSA/data.gov/issues/4532
-        expires: 2024-02-8T00:00:00.000Z
+        expires: 2024-02-08T00:00:00.000Z
         created: 2023-11-16T20:31:20.590Z
   SNYK-PYTHON-CKAN-6124881:
     - '*':
@@ -64,5 +64,19 @@ ignore:
           No remediation available yet; Issue tracked in github:
           https://github.com/GSA/data.gov/issues/4532
         expires: 2024-03-14T00:00:00.000Z
-        created: 2023-12-14T00:00:00.000Z        
+        created: 2023-12-14T00:00:00.000Z
+  SNYK-PYTHON-CRYPTOGRAPHY-6149518:
+    - '*':
+        reason: >-
+          No remediation available yet; Issue tracked in github:
+          https://github.com/GSA/data.gov/issues/4532
+        expires: 2024-04-10T19:28:50.100Z
+        created: 2024-01-11T19:28:50.103Z
+  SNYK-PYTHON-PYOPENSSL-6149520:
+    - '*':
+        reason: >-
+          No remediation available yet; Issue tracked in github:
+          https://github.com/GSA/data.gov/issues/4532
+        expires: 2024-04-10T19:29:54.032Z
+        created: 2024-01-11T19:29:54.039Z
 patch: {}
diff --git a/e2e/cypress/integration/dataset.cy.js b/e2e/cypress/integration/dataset.cy.js
@@ -54,4 +54,19 @@ describe('Dataset', () => {
         cy.get('a[class="heading"]').contains('NCEI Contact Information').click();
         cy.get('ul[class="list-unstyled nav nav-simple"] li').eq(1).click();
     });
+
+    it("Can click on feedback button", () => {
+        cy.visit('/dataset/ek500-water-column-sonar-data-collected-during-al0001');
+        // sleep for 1 second to allow touchpoint js to load
+        cy.wait(1000);
+        cy.hide_debug_toolbar();
+        // the button is visible
+        cy.get('#contact-btn').should('be.visible').click();
+        // the modal is invisible
+        cy.get('#fba-modal-dialog').should('be.visible');
+        cy.get('#fba_location_code').should('have.value', 'ek500-water-column-sonar-data-collected-during-al0001');
+        // can hide the modal
+        cy.get('a[class="fba-modal-close"]').click();
+        cy.get('#fba-modal-dialog').should('not.be.visible');
+    });
 });
diff --git a/proxy/nginx-botbegone.conf b/proxy/nginx-botbegone.conf
@@ -17,5 +17,5 @@ if ($http_user_agent ~ 'Googlebot/|Y!J|Yeti|Bytespider|Applebot|HeadlessChrome')
 }
 
 if ($botstracking = 11) {
-  return 200;
+  return 202;
 }