Merge pull request #596 from cisagov/AL-fix-htmlx-vuln

Remove htmx functionality
cisagov · Jul 10, 2023 · 1ac5df8 · 1ac5df8
2 parents 1475518 + 2ba1731
commit 1ac5df8
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 2,768 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -135,7 +135,7 @@ repos:
 
   # Ansible hooks
   - repo: https://github.com/ansible-community/ansible-lint
-    rev: v5.4.0
+    rev: v6.17.2
     hooks:
       - id: ansible-lint
       # files: molecule/default/playbook.yml

diff --git a/src/pe_reports/home/templates/home/home.html b/src/pe_reports/home/templates/home/home.html
@@ -31,11 +31,6 @@
     T.style.display = displayValue;
   }
 
-  function loading() {
-    $("#loading").show();
-    $("#content").hide();
-  }
-
   $(document).ready(function () {
     console.log("Im ready ");
 
@@ -44,9 +39,6 @@
     setTimeout(function () {
       $("#messageDiv").fadeOut("fast");
     }, 5000);
-    $(window).load(function () {
-      $("#loading").hide();
-    });
   });
 </script>
 

diff --git a/src/pe_reports/report_gen/templates/report_gen_UI/home_report_gen.html b/src/pe_reports/report_gen/templates/report_gen_UI/home_report_gen.html
@@ -169,20 +169,12 @@
       if (C.style.display == "" && B.style.display == "") showBulletinDiv();
     }
 
-    function loading() {
-      $("#loading").show();
-      $("#content").hide();
-    }
-
     $(document).ready(function () {
       console.log("Im ready ");
 
       setTimeout(function () {
         $("#messageDiv").fadeOut("fast");
       }, 5000);
-      $(window).load(function () {
-        $("#loading").hide();
-      });
     });
   </script>
 

diff --git a/src/pe_reports/stakeholder/templates/stakeholder_UI/home_stakeholder.html b/src/pe_reports/stakeholder/templates/stakeholder_UI/home_stakeholder.html
@@ -55,11 +55,6 @@
       T.style.display = displayValue;
     }
 
-    function loading() {
-      $("#loading").show();
-      $("#content").hide();
-    }
-
     $(document).ready(function () {
       console.log("Im ready ");
 
@@ -68,9 +63,6 @@
       setTimeout(function () {
         $("#messageDiv").fadeOut("fast");
       }, 5000);
-      $(window).load(function () {
-        $("#loading").hide();
-      });
     });
   </script>
 

diff --git a/src/pe_reports/static/css/custom.css b/src/pe_reports/static/css/custom.css
@@ -9,22 +9,6 @@ img {
   transition: opacity 300ms ease-in;
 }
 
-#loader {
-  position: absolute;
-  left: 50%;
-
-  top: 50%;
-  z-index: 1;
-  width: 120px;
-  height: 120px;
-  margin: -76px 0 0 -76px;
-  border: 16px solid #f3f3f3;
-  border-radius: 50%;
-  border-top: 16px solid #3498db;
-  -webkit-animation: spin 2s linear infinite;
-  animation: spin 2s linear infinite;
-}
-
 @-webkit-keyframes spin {
   0% {
     -webkit-transform: rotate(0deg);
@@ -79,15 +63,6 @@ div#myDiv {
   text-align: center;
 }
 
-div#loading {
-  width: 50%;
-  height: 350px;
-  /*justify-content: center;*/
-  align-items: center;
-  background: url("../SVG-Loaders/svg-loaders/bars.svg") no-repeat;
-  cursor: wait;
-}
-
 homeBG {
   background-color: white;
 }