Merge pull request #371 from kevinbackhouse/fix-redos

Fix ReDoS bugs

Author: bdewilde

src/textacy/constants.py

@@ -166,7 +166,7 @@
 RE_ACRONYM: Pattern = re.compile(
     r"(?:^|(?<=\W))"
     r"(?:"
-    r"(?:(?:(?:[A-Z]\.?)+[a-z0-9&/-]?)+(?:[A-Z][s.]?|\ds?))"
+    r"(?:(?:(?:[A-Z]\.?)[a-z0-9&/-]?)+(?:[A-Z][s.]?|\ds?))"
     r"|"
     r"(?:\d(?:\-?[A-Z])+)"
     r")"

src/textacy/preprocessing/resources.py

@@ -68,9 +68,9 @@ def get_text(self) -> str:
     r"(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))"
     r"|"
     # host name
-    r"(?:(?:[a-z\u00a1-\uffff0-9]-?)*[a-z\u00a1-\uffff0-9]+)"
+    r"(?:(?:[a-z\u00a1-\uffff0-9]-?)*[a-z\u00a1-\uffff0-9])"
     # domain name
-    r"(?:\.(?:[a-z\u00a1-\uffff0-9]-?)*[a-z\u00a1-\uffff0-9]+)*"
+    r"(?:\.(?:[a-z\u00a1-\uffff0-9]-?)*[a-z\u00a1-\uffff0-9])*"
     # TLD identifier
     r"(?:\.(?:[a-z\u00a1-\uffff]{2,}))"
     r")"