fixrule(meta_refresh_delay | meta_redirect_optional) Fix the rules to…

… align with ACT V4 (#2168) * Bump path-to-regexp and express in /rule-server (#2128) Bumps [path-to-regexp](https://github.com/pillarjs/path-to-regexp) to 0.1.12 and updates ancestor dependency [express](https://github.com/expressjs/express). These dependencies need to be updated together. Updates `path-to-regexp` from 0.1.10 to 0.1.12 - [Release notes](https://github.com/pillarjs/path-to-regexp/releases) - [Changelog](https://github.com/pillarjs/path-to-regexp/blob/master/History.md) - [Commits](pillarjs/path-to-regexp@v0.1.10...v0.1.12) Updates `express` from 4.21.0 to 4.21.2 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.2/History.md) - [Commits](expressjs/express@4.21.0...4.21.2) --- updated-dependencies: - dependency-name: path-to-regexp dependency-type: indirect - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom Brunet <[email protected]> * fix dark mode react portal pop-up (#2138) * fix(extension):Fix reset filter link #1877 (#2136) * reset filter fix * css fix --------- Co-authored-by: Tom Brunet <[email protected]> * fix(extension): Don't show full data:text/html content on generated HTML report page (#2140) * truncating url * remove unused import * Adjust tooltip location --------- Co-authored-by: Tom Brunet <[email protected]> * chore(extension): carbon package update and use new carbon combobutton #1842 (#2137) * carbon package update and use new carbon combobutton * alignment fix --------- Co-authored-by: Tom Brunet <[email protected]> * Update the rules and test cases * update the baselines --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom Brunet <[email protected]> Co-authored-by: Namrata Singh <[email protected]>
IBMa · Feb 4, 2025 · a5559ab · a5559ab
1 parent 981a467
commit a5559ab
Show file tree

Hide file tree

Showing 37 changed files with 938 additions and 32 deletions.
diff --git a/accessibility-checker-engine/src/v4/rules/meta_redirect_optional.ts b/accessibility-checker-engine/src/v4/rules/meta_redirect_optional.ts
@@ -11,10 +11,9 @@
   limitations under the License.
 *****************************************************************************/
 
-import { FragmentUtil } from "../../v2/checker/accessibility/util/fragment";
-import { CommonUtil } from "../util/CommonUtil";
 import { Rule, RuleResult, RuleFail, RuleContext, RulePass, RuleContextHierarchy } from "../api/IRule";
 import { eRulePolicy, eToolkitLevel } from "../api/IRule";
+import { CacheUtil } from "../util/CacheUtil";
 
 export const meta_redirect_optional: Rule = {
     id: "meta_redirect_optional",
@@ -49,39 +48,51 @@ export const meta_redirect_optional: Rule = {
         "toolkitLevel": eToolkitLevel.LEVEL_THREE
     }],
     // Removed ACT bisz58 AAA
-    act: [{ 
+    /**act: [{ 
         "bc659a" : {
             "pass": "pass",
             "fail": "fail",
             "fail_longrefresh": "pass"
         }
-    }],
+    }],*/
+    act: [ "bisz58"],  // fail even if a page is redirected after more than 20 hours (7200)
     run: (context: RuleContext, options?: {}, contextHierarchies?: RuleContextHierarchy): RuleResult | RuleResult[] => {
         const ruleContext = context["dom"].node as Element;
-        // JCH - NO OUT OF SCOPE hidden in context
+
         if (ruleContext.getAttribute("http-equiv").toLowerCase() !== 'refresh') {
             return null;
         }
 
+        let doc = ruleContext.ownerDocument;
+        if (!doc) return;
+
+        // check if the rule already passed or failed: only the first one tridders if multiple
+        if (CacheUtil.getCache(doc, "meta_redirect_optional_done", false))
+            return null;    
+
         let content = ruleContext.getAttribute("content").toLowerCase();
-        // Invalid content field
-        if (!content.match(/^\d+$/) && !content.match(/^\d+;/)) {
+        if (!content || content.trim().length ===0)
             return null;
+
+        let time:number = -1;
+        if (content.match(/^\d+$/)) 
+            time = parseInt(content);
+        else if (content.match(/^\d+;/)) {
+            let pos = content.indexOf(";");
+            time = parseInt(content.substring(0, pos));
         }
-        // Only check the first one since it takes priority
-        if (CommonUtil.triggerOnce(FragmentUtil.getOwnerFragment(ruleContext), "meta_redirect_optional", false)) {
+        // Invalid content field
+        if (time === -1) {
             return null;
         }
-        let timeMatch = content.match(/^(\d+); +[^ ]/);
-        if (!timeMatch || parseInt(timeMatch[1]) === 0) {
+
+        CacheUtil.setCache(doc, "meta_redirect_optional_done", true);
+        if (time === 0)
             return RulePass("pass");
-        } else {
-            let time = parseInt(timeMatch[1]);
-            if (time < 72001) {
-                return RuleFail("fail");
-            } else {
-                return RuleFail("fail_longrefresh");
-            }
-        }
+        else if (time < 72001)
+            return RuleFail("fail");
+
+        return RuleFail("fail_longrefresh");    
+
     }
 }
diff --git a/accessibility-checker-engine/src/v4/rules/meta_refresh_delay.ts b/accessibility-checker-engine/src/v4/rules/meta_refresh_delay.ts
@@ -13,28 +13,29 @@
 
 import { Rule, RuleResult, RuleContext, RulePotential, RulePass, RuleContextHierarchy } from "../api/IRule";
 import { eRulePolicy, eToolkitLevel } from "../api/IRule";
+import { CacheUtil } from "../util/CacheUtil";
 
 export const meta_refresh_delay: Rule = {
     id: "meta_refresh_delay",
     context: "dom:meta[http-equiv][content]",
     refactor: {
         "RPT_Meta_Refresh": {
-            "Pass_0": "Pass_0",
-            "Potential_1": "Potential_1"
+            "Pass_0": "pass",
+            "Potential_1": "potential_refresh"
         }
     },
     help: {
         "en-US": {
             "group": "meta_refresh_delay.html",
-            "Pass_0": "meta_refresh_delay.html",
-            "Potential_1": "meta_refresh_delay.html"
+            "pass": "meta_refresh_delay.html",
+            "potential_refresh": "meta_refresh_delay.html"
         }
     },
     messages: {
         "en-US": {
             "group": "Pages should not refresh automatically",
-            "Pass_0": "Rule Passed",
-            "Potential_1": "Verify page is not being caused to refresh automatically",
+            "pass": "Pages do not refresh automatically",
+            "potential_refresh": "Verify page is not being caused to refresh automatically",
         }
     },
     rulesets: [{
@@ -43,18 +44,39 @@ export const meta_refresh_delay: Rule = {
         "level": eRulePolicy.VIOLATION,
         "toolkitLevel": eToolkitLevel.LEVEL_THREE
     }],
-    act: [ "bisz58", "bc659a" ],
+    //act: [ "bisz58", "bc659a" ],
+    act: [ "bc659a" ],  // pass if a page is redirected after more than 20 hours (7200)
     run: (context: RuleContext, options?: {}, contextHierarchies?: RuleContextHierarchy): RuleResult | RuleResult[] => {
         const ruleContext = context["dom"].node as Element;
         if (ruleContext.getAttribute("http-equiv").toLowerCase() !== 'refresh')
             return null;
 
+        let doc = ruleContext.ownerDocument;
+        if (!doc) return;
+
+        // check if the rule already passed: the first one takes priority
+        if (CacheUtil.getCache(doc, "meta_refresh_delay_done", false))
+            return null;
+
         let content = ruleContext.getAttribute("content").toLowerCase();
+        if (!content || content.trim().length ===0)
+            return null;
+
+        let time:number = -1;
+        if (content.match(/^\d+$/)) 
+            time = parseInt(content);
+        else if (content.match(/^\d+;/)) {
+            let pos = content.indexOf(";");
+            time = parseInt(content.substring(0, pos));
+        }
         // Invalid content field
-        if (!content.match(/^\d+$/) && !content.match(/^\d+;/)) {
+        if (time === -1) {
             return null;
         }
-        let fail = !content.match(/^\d+; +[^ ]/);
-        return !fail ? RulePass("Pass_0") : RulePotential("Potential_1");
+
+        CacheUtil.setCache(doc, "meta_refresh_delay_done", true);
+        if (time === 0) 
+            return RulePass("pass");
+        return RulePotential("potential_refresh");
     }
 }
diff --git a/...ngine/test/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-fail-1.html b/...ngine/test/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-fail-1.html
@@ -0,0 +1,34 @@
+
+<html lang="en">
+  <head>
+    <meta http-equiv="refresh" content="30" />
+  </head>
+<body data-new-gr-c-s-check-loaded="14.1192.0" data-gr-ext-installed="">
+	<img src="/WAI/content-assets/wcag-act-rules/test-assets/shared/w3c-logo.png" alt="" aria-labelledby="label"> <span hidden="" id="label">W3C logo</span>
+
+  <script>
+    UnitTest = {
+      ruleIds: ["meta_redirect_optional"],
+      results: [
+      {
+            "ruleId": "meta_redirect_optional",
+            "value": [
+              "INFORMATION",
+              "FAIL"
+            ],
+            "path": {
+              "dom": "/html[1]/head[1]/meta[1]",
+              "aria": "/document[1]"
+            },
+            "reasonId": "fail",
+            "message": "Check page does not automatically refresh without warning or options",
+            "messageArgs": [],
+            "apiArgs": [],
+            "category": "Accessibility"
+          }
+      ]
+    }
+</script>
+</body>
+
+</html>
diff --git a/...ngine/test/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-fail-2.html b/...ngine/test/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-fail-2.html
@@ -0,0 +1,34 @@
+
+<html lang="en">
+  <head>
+    <meta http-equiv="refresh" content="72001; URL='https://w3.org'" />
+  </head>
+<body data-new-gr-c-s-check-loaded="14.1192.0" data-gr-ext-installed="">
+	<img src="/WAI/content-assets/wcag-act-rules/test-assets/shared/w3c-logo.png" alt="" aria-labelledby="label"> <span hidden="" id="label">W3C logo</span>
+
+  <script>
+    UnitTest = {
+      ruleIds: ["meta_redirect_optional"],
+      results: [
+      {
+            "ruleId": "meta_redirect_optional",
+            "value": [
+              "INFORMATION",
+              "FAIL"
+            ],
+            "path": {
+              "dom": "/html[1]/head[1]/meta[1]",
+              "aria": "/document[1]"
+            },
+            "reasonId": "fail_longrefresh",
+            "message": "Check page does not automatically refresh without warning or options",
+            "messageArgs": [],
+            "apiArgs": [],
+            "category": "Accessibility"
+          }
+      ]
+    }
+</script>
+</body>
+
+</html>
diff --git a/...ngine/test/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-fail-3.html b/...ngine/test/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-fail-3.html
@@ -0,0 +1,35 @@
+
+<html lang="en">
+  <head>
+    <meta http-equiv="refresh" content="0: https://w3.org" />
+    <meta http-equiv="refresh" content="72001; https://w3.org" />
+  </head>
+<body data-new-gr-c-s-check-loaded="14.1192.0" data-gr-ext-installed="">
+	<img src="/WAI/content-assets/wcag-act-rules/test-assets/shared/w3c-logo.png" alt="" aria-labelledby="label"> <span hidden="" id="label">W3C logo</span>
+
+  <script>
+    UnitTest = {
+      ruleIds: ["meta_redirect_optional"],
+      results: [
+      {
+            "ruleId": "meta_redirect_optional",
+            "value": [
+              "INFORMATION",
+              "FAIL"
+            ],
+            "path": {
+              "dom": "/html[1]/head[1]/meta[2]",
+              "aria": "/document[1]"
+            },
+            "reasonId": "fail_longrefresh",
+            "message": "Check page does not automatically refresh without warning or options",
+            "messageArgs": [],
+            "apiArgs": [],
+            "category": "Accessibility"
+          }
+      ]
+    }
+</script>
+</body>
+
+</html>
diff --git a/...t/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-inappplicable-1.html b/...t/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-inappplicable-1.html
@@ -0,0 +1,19 @@
+
+<html lang="en">
+  <head>
+    <meta http-equiv="refresh" />
+  </head>
+<body data-new-gr-c-s-check-loaded="14.1192.0" data-gr-ext-installed="">
+	<img src="/WAI/content-assets/wcag-act-rules/test-assets/shared/w3c-logo.png" alt="" aria-labelledby="label"> <span hidden="" id="label">W3C logo</span>
+
+  <script>
+    UnitTest = {
+      ruleIds: ["meta_redirect_optional"],
+      results: [
+
+      ]
+    }
+</script>
+</body>
+
+</html>
diff --git a/...t/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-inappplicable-2.html b/...t/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-inappplicable-2.html
@@ -0,0 +1,19 @@
+
+<html lang="en">
+  <head>
+    <meta content="72001" />
+  </head>
+<body data-new-gr-c-s-check-loaded="14.1192.0" data-gr-ext-installed="">
+	<img src="/WAI/content-assets/wcag-act-rules/test-assets/shared/w3c-logo.png" alt="" aria-labelledby="label"> <span hidden="" id="label">W3C logo</span>
+
+  <script>
+    UnitTest = {
+      ruleIds: ["meta_redirect_optional"],
+      results: [
+
+      ]
+    }
+</script>
+</body>
+
+</html>
diff --git a/...t/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-inappplicable-3.html b/...t/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-inappplicable-3.html
@@ -0,0 +1,19 @@
+
+<html lang="en">
+  <head>
+    <meta http-equiv="refresh" content="0: http://example.com" />
+  </head>
+<body data-new-gr-c-s-check-loaded="14.1192.0" data-gr-ext-installed="">
+	<img src="/WAI/content-assets/wcag-act-rules/test-assets/shared/w3c-logo.png" alt="" aria-labelledby="label"> <span hidden="" id="label">W3C logo</span>
+
+  <script>
+    UnitTest = {
+      ruleIds: ["meta_redirect_optional"],
+      results: [
+
+      ]
+    }
+</script>
+</body>
+
+</html>
diff --git a/...t/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-inappplicable-4.html b/...t/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-inappplicable-4.html
@@ -0,0 +1,19 @@
+
+<html lang="en">
+  <head>
+    <meta http-equiv="refresh" content="-00.12 foo" />
+  </head>
+<body data-new-gr-c-s-check-loaded="14.1192.0" data-gr-ext-installed="">
+	<img src="/WAI/content-assets/wcag-act-rules/test-assets/shared/w3c-logo.png" alt="" aria-labelledby="label"> <span hidden="" id="label">W3C logo</span>
+
+  <script>
+    UnitTest = {
+      ruleIds: ["meta_redirect_optional"],
+      results: [
+
+      ]
+    }
+</script>
+</body>
+
+</html>
diff --git a/...t/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-inappplicable-5.html b/...t/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-inappplicable-5.html
@@ -0,0 +1,19 @@
+
+<html lang="en">
+  <head>
+    <meta http-equiv="refresh" content="; 72001" />
+  </head>
+<body data-new-gr-c-s-check-loaded="14.1192.0" data-gr-ext-installed="">
+	<img src="/WAI/content-assets/wcag-act-rules/test-assets/shared/w3c-logo.png" alt="" aria-labelledby="label"> <span hidden="" id="label">W3C logo</span>
+
+  <script>
+    UnitTest = {
+      ruleIds: ["meta_redirect_optional"],
+      results: [
+
+      ]
+    }
+</script>
+</body>
+
+</html>
diff --git a/...t/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-inappplicable-6.html b/...t/v2/checker/accessibility/rules/meta_redirect_optional_ruleunit/act-inappplicable-6.html
@@ -0,0 +1,19 @@
+
+<html lang="en">
+  <head>
+    <meta http-equiv="refresh" content="" />
+  </head>
+<body data-new-gr-c-s-check-loaded="14.1192.0" data-gr-ext-installed="">
+	<img src="/WAI/content-assets/wcag-act-rules/test-assets/shared/w3c-logo.png" alt="" aria-labelledby="label"> <span hidden="" id="label">W3C logo</span>
+
+  <script>
+    UnitTest = {
+      ruleIds: ["meta_redirect_optional"],
+      results: [
+
+      ]
+    }
+</script>
+</body>
+
+</html>