Merge pull request #6618 from ytetsuro/fix/is-valid-valid-url-rule-when-has-newline

MGatner · web-flow · commit 61fcc81e0613 · 2022-10-03T06:00:28.000-04:00
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
@@ -293,7 +293,7 @@ public function valid_url(?string $str = null): bool
             return false;
         }
 
-        if (preg_match('/^(?:([^:]*)\:)?\/\/(.+)$/', $str, $matches)) {
+        if (preg_match('/\A(?:([^:]*)\:)?\/\/(.+)\z/', $str, $matches)) {
             if (! in_array($matches[1], ['http', 'https'], true)) {
                 return false;
             }
diff --git a/tests/system/Validation/StrictRules/FormatRulesTest.php b/tests/system/Validation/StrictRules/FormatRulesTest.php
@@ -217,6 +217,11 @@ public function urlProvider(): Generator
                 false,
                 false,
             ],
+            [
+                "http://www.codeigniter.com\n",
+                false,
+                false,
+            ],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ public function valid_url(?string $str = null): bool`
`293`	`293`	`return false;`
`294`	`294`	`}`
`295`	`295`
`296`		`- if (preg_match('/^(?:([^:]*)\:)?\/\/(.+)$/', $str, $matches)) {`
	`296`	`+ if (preg_match('/\A(?:([^:]*)\:)?\/\/(.+)\z/', $str, $matches)) {`
`297`	`297`	`if (! in_array($matches[1], ['http', 'https'], true)) {`
`298`	`298`	`return false;`
`299`	`299`	`}`
-Original file line number
+Diff line change
                 false,
                 false,
             ],
 +            [
 +                "http://www.codeigniter.com\n",
 +                false,
 +                false,
 +            ],
         ];
+    }