Improve handling around checkers.

Author: funilrys

PyFunceble/checker/availability/base.py

@@ -511,8 +511,11 @@ def subject_propagator(self) -> "CheckerBase":
         self.ip_syntax_checker.subject = self.idna_subject
         self.url_syntax_checker.subject = self.idna_subject
 
-        self.status = AvailabilityCheckerStatus()
-        self.status.params = self.params
+        if self.status.subject_kind is None:
+            self.status = AvailabilityCheckerStatus()
+            self.params = AvailabilityCheckerParams()
+            self.status.params = self.params
+
         self.status.dns_lookup_record = self.dns_query_tool.lookup_record
         self.status.whois_lookup_record = self.whois_query_tool.lookup_record
 

PyFunceble/checker/availability/domain.py

@@ -53,6 +53,8 @@
 import PyFunceble.facility
 import PyFunceble.storage
 from PyFunceble.checker.availability.base import AvailabilityCheckerBase
+from PyFunceble.checker.availability.params import AvailabilityCheckerParams
+from PyFunceble.checker.availability.status import AvailabilityCheckerStatus
 from PyFunceble.checker.reputation.domain import DomainReputationChecker
 
 
@@ -87,6 +89,22 @@ class DomainAvailabilityChecker(AvailabilityCheckerBase):
         WHOIS datasets.
     """
 
+    def subject_propagator(self) -> "DomainAvailabilityChecker":
+        """
+        Propagate the currently set subject.
+
+        .. warning::
+            You are not invited to run this method directly.
+        """
+
+        self.status = AvailabilityCheckerStatus()
+        self.params = AvailabilityCheckerParams()
+        self.status.params = self.params
+
+        self.status.subject_kind = "domain"
+
+        return super().subject_propagator()
+
     def try_to_query_status_from_reputation(self) -> "DomainAvailabilityChecker":
         """
         Tries to query the status from the reputation lookup.

PyFunceble/checker/availability/extras/base.py

@@ -67,7 +67,7 @@ class ExtraRuleHandlerBase:
     """
     Provides the base of all extra rules handler.
 
-    :param statatus:
+    :param status:
         The previously gathered status.
     :type status:
         :class:`~PyFunceble.checker.availability.status.AvailabilityCheckerStatus`
@@ -167,7 +167,7 @@ def req_url(self) -> Optional[str]:
         Provides a viable request URL.
         """
 
-        if any(self.status.idna_subject.startswith(x) for x in ("http:", "https:")):
+        if self.status.idna_subject.startswith(("http:", "https:")):
             return self.status.idna_subject
         return f"http://{self.status.idna_subject}:80"
 
@@ -177,7 +177,7 @@ def req_url_https(self) -> Optional[str]:
         Provides a viable request URL that default to an HTTPS URL.
         """
 
-        if any(self.status.idna_subject.startswith(x) for x in ("http:", "https:")):
+        if self.status.idna_subject.startswith(("http:", "https:")):
             return self.status.idna_subject
         return f"https://{self.status.idna_subject}:443"
 
@@ -226,7 +226,7 @@ def do_request(self, *, allow_redirects: bool = True) -> requests.Response:
         Do a request and store its response into the `req` attribute.
 
         :param bool allow_redirects:
-            Whether we shoold follow the redirection - or not.
+            Whether we should follow the redirection - or not.
         """
 
         self.req = self.requester.get(self.req_url, allow_redirects=allow_redirects)

PyFunceble/checker/availability/extras/dns.py

@@ -132,7 +132,7 @@ def start(self) -> "DNSRulesHandler":
             if not self.regex_helper.set_regex(regex).match(
                 self.status.netloc, return_match=False
             ):
-                break
+                continue
 
             for ruler, params in rulesets:
                 if self.status.status_after_extra_rules:

PyFunceble/checker/availability/extras/etoxic.py

@@ -64,7 +64,7 @@ class EToxicHandler(ExtraRuleHandlerBase):
         :class:`~PyFunceble.checker.availability.status.AvailabilityCheckerStatus`
     """
 
-    MATCHES = [
+    MATCHES = (
         ".0wn0.com",
         ".123.st",
         ".1forum.biz",
@@ -282,7 +282,7 @@ class EToxicHandler(ExtraRuleHandlerBase):
         ".yoo7.com",
         ".ze-43eme.com",
         ".zxr7team.com",
-    ]
+    )
 
     @ExtraRuleHandlerBase.ensure_status_is_given
     @ExtraRuleHandlerBase.setup_status_before
@@ -294,7 +294,7 @@ def start(self) -> "EToxicHandler":
         )
 
         if self.status.status_before_extra_rules == PyFunceble.storage.STATUS.up:
-            if any(self.status.netloc.endswith(x) for x in self.MATCHES):
+            if self.status.netloc.endswith(self.MATCHES):
                 self.do_on_header_match(
                     self.req_url,
                     matches={"location": [f"/{self.status.netloc}", "/search/"]},

PyFunceble/checker/availability/extras/parked.py

@@ -65,6 +65,25 @@ class ParkedRulesHandler(ExtraRuleHandlerBase):
         :class:`~PyFunceble.checker.availability.status.AvailabilityCheckerStatus`
     """
 
+    PARKED_CONTENT_PATTERNS = (
+        'class="parked-domains',
+        "buy-domain",
+        "this domain name is parked",
+        "this domain is parked",
+        "interested in this domain",
+        "really cool domain parked",
+        "domain is for sale",
+        '_trackpageview("/parked/[% parked_type %]/',
+        "| parked domain",
+        "parked banner",
+        "contact with domain owner",
+        "web page is parked",
+        "buy or lease this domain",
+        "parked domain name on ",
+        "it is currently parked by the owner",
+        "parked page for",
+    )
+
     def _switch_down_by_cookie(self) -> "ParkedRulesHandler":
         """
         Tries to switch the status to inactive if some special cookies where found.
@@ -75,31 +94,14 @@ def _switch_down_by_cookie(self) -> "ParkedRulesHandler":
 
         return self
 
-    def _swith_down_by_content(self) -> "ParkedRulesHandler":
+    def _switch_down_by_content(self) -> "ParkedRulesHandler":
         """
         Tries to switch the status to inactive if some relative content were found.
         """
 
         content = self.req.text.lower()
 
-        if (  # pylint: disable=too-many-boolean-expressions
-            'class="parked-domains' in content
-            or "buy-domain" in content
-            or "this domain name is parked" in content
-            or "this domain is parked" in content
-            or "interested in this domain" in content
-            or "really cool domain parked" in content
-            or "domain is for sale" in content
-            or '_trackpageview("/parked/[% parked_type %]/' in content
-            or "| parked domain" in content
-            or "parked banner" in content
-            or "contact with domain owner" in content
-            or "web page is parked" in content
-            or "buy or lease this domain" in content
-            or "parked domain name on " in content
-            or "it is currently parked by the owner" in content
-            or "parked page for" in content
-        ):
+        if any(x in content for x in self.PARKED_CONTENT_PATTERNS):
             self.switch_to_down()
 
         return self
@@ -120,7 +122,7 @@ def start(self) -> "ParkedRulesHandler":
                 self._switch_down_by_cookie()
 
             if not self.status.status_after_extra_rules:
-                self._swith_down_by_content()
+                self._switch_down_by_content()
 
             PyFunceble.facility.Logger.info(
                 "Finished to check %r against our own set of parked rules.",

PyFunceble/checker/availability/extras/rules.py

@@ -58,7 +58,6 @@
 import PyFunceble.storage
 from PyFunceble.checker.availability.extras.base import ExtraRuleHandlerBase
 from PyFunceble.checker.availability.status import AvailabilityCheckerStatus
-from PyFunceble.helpers.regex import RegexHelper
 
 
 class ExtraRulesHandler(ExtraRuleHandlerBase):
@@ -106,7 +105,7 @@ def __init__(self, status: Optional[AvailabilityCheckerStatus] = None) -> None:
             r"\.translate\.goog$": [(self.switch_to_down_if_status_code, 403)],
             r"\.tumblr\.com$": [(self.switch_to_down_if_status_code, 404)],
             r"\.vercel\.app$": [
-                (self.switch_to_down_if_status_code, "451"),
+                (self.switch_to_down_if_status_code, 451),
                 self.handle_vercel_dot_app,
             ],
             r"\.web\.app$": [(self.switch_to_down_if_status_code, 404)],
@@ -119,8 +118,8 @@ def __init__(self, status: Optional[AvailabilityCheckerStatus] = None) -> None:
                 (self.switch_to_down_if_status_code, 410),
                 self.handle_wordpress_dot_com,
             ],
-            r"\.weebly\.com$": [(self.switch_to_down_if_status_code, {"404", "406"})],
-            r"\.zzz\.com\.ua$": [(self.switch_to_down_if_status_code, {"402"})],
+            r"\.weebly\.com$": [(self.switch_to_down_if_status_code, {404, 406})],
+            r"\.zzz\.com\.ua$": [(self.switch_to_down_if_status_code, {402})],
         }
 
         if PyFunceble.facility.ConfigLoader.is_already_loaded():
@@ -135,15 +134,12 @@ def __regex_registry_handler(self, regex_registry: dict) -> "ExtraRulesHandler":
         Handles the standard regex lookup case.
         """
 
-        regex_helper = RegexHelper()
-
         for (
             regex,
             data,
         ) in regex_registry.items():
-            broken = False
             for element in data:
-                if not regex_helper.set_regex(regex).match(
+                if not self.regex_helper.set_regex(regex).match(
                     self.status.netloc, return_match=False
                 ):
                     continue
@@ -154,11 +150,7 @@ def __regex_registry_handler(self, regex_registry: dict) -> "ExtraRulesHandler":
                     element()
 
                 if self.status.status_after_extra_rules:
-                    broken = True
-                    break
-
-            if broken:
-                break
+                    return self
 
         return self
 

PyFunceble/checker/availability/extras/subject_switch.py

@@ -116,10 +116,9 @@ def _switch_down_by_history(self) -> "SubjectSwitchRulesHandler":
             if netloc == self.status.idna_subject and netloc not in variations:
                 continue
 
-            if not start_path:
-                if local_path != "/":
-                    continue
-            elif start_path != local_path:
+            if (not start_path and local_path != "/") or (
+                start_path and start_path != local_path
+            ):
                 continue
 
             self.switch_to_down()
@@ -141,7 +140,7 @@ def start(self) -> "SubjectSwitchRulesHandler":
         )
 
         try:
-            if any(self.status.netloc.startswith(x) for x in ("www.", "m.")):
+            if self.status.netloc.startswith(("www.", "m.")):
                 self.do_request()
 
                 if not self.status.status_after_extra_rules:

PyFunceble/checker/availability/ip.py

@@ -53,6 +53,8 @@
 import PyFunceble.facility
 import PyFunceble.storage
 from PyFunceble.checker.availability.base import AvailabilityCheckerBase
+from PyFunceble.checker.availability.params import AvailabilityCheckerParams
+from PyFunceble.checker.availability.status import AvailabilityCheckerStatus
 from PyFunceble.checker.reputation.ip import IPReputationChecker
 
 
@@ -87,6 +89,22 @@ class IPAvailabilityChecker(AvailabilityCheckerBase):
         WHOIS datasets.
     """
 
+    def subject_propagator(self) -> "IPAvailabilityChecker":
+        """
+        Propagate the currently set subject.
+
+        .. warning::
+            You are not invited to run this method directly.
+        """
+
+        self.status = AvailabilityCheckerStatus()
+        self.params = AvailabilityCheckerParams()
+        self.status.params = self.params
+
+        self.status.subject_kind = "ip"
+
+        return super().subject_propagator()
+
     def try_to_query_status_from_reputation(self) -> "IPAvailabilityChecker":
         """
         Tries to query the status from the reputation lookup.

PyFunceble/checker/availability/params.py

@@ -60,7 +60,7 @@
 @dataclasses.dataclass
 class AvailabilityCheckerParams(CheckerParamsBase):
     """
-    Provides the description of an availability checker paramaters.
+    Provides the description of an availability checker parameters.
     """
 
     use_extra_rules: Optional[bool] = None