Merge pull request #138 from CybercentreCanada/url_tweak

Url tweak
CybercentreCanada · Apr 9, 2024 · f2b6272 · f2b6272
2 parents fb164bf + 9a0154a
commit f2b6272
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/assemblyline_service_utilities/common/balbuzard/patterns.py b/assemblyline_service_utilities/common/balbuzard/patterns.py
@@ -226,7 +226,7 @@ class PatternMatch(object):
         rb"(?:[\w!$-.:;=~@]{,2000}@)?"  # userinfo
         rb"(?:[A-Z0-9.-]{4,253}|\[[0-9A-F:]{3,39}\])"  # hostname
         rb"(?::(?:6553[0-5]|655[0-2][0-9]|65[0-4][0-9]{2}|6[0-4][0-9]{3}|[1-5]?[0-9]{0,4}))?"  # port
-        rb"(?:[/?#](?:[\w!#$-/:;=@?~]{,2000}[\w!#$%&(*+\-/:;=@?~])?)?"  # path, query and fragment
+        rb"(?:[/?#](?:[\w!#$-/:;=@?~]{,2000}[\w!#$%&(*+\-/:=@?~])?)?"  # path, query and fragment
     )
     PAT_ANYHTTP = (
         rb"(?i)http://"

diff --git a/test/balbuzard/test_patterns.py b/test/balbuzard/test_patterns.py
@@ -1,7 +1,6 @@
 import re
 
 import pytest
-
 from assemblyline_service_utilities.common.balbuzard.patterns import PatternMatch
 
 
@@ -70,6 +69,8 @@ def test_PAT_URL_basic_auth(url):
         (b"barefunction(https://example.com)", 1),
         (b'in a string content "https://example.com"works.', 7),
         (b"whitespaceless('https://example.com'){script;}", 11),
+        (b"'https://example.com/';", 2),
+        (b"('https://example.com'); ", 4),
     ],
 )
 def test_PAT_URL_in_context(url, suffix_len):