Introduction of a better split.

Indeed, before this patch, it was had to differ IP from domains.
This patch fixes the issue by introduction a new `subject_kind`
status key which can be used when a split between domains and
ips is necessary.

This patch also introduces a better recognition of domains and
IP when testing from the CLI.

Author: funilrys

PyFunceble/__init__.py

@@ -63,6 +63,7 @@
 from PyFunceble.checker.reputation.ip import IPReputationChecker
 from PyFunceble.checker.reputation.url import URLReputationChecker
 from PyFunceble.checker.syntax.domain import DomainSyntaxChecker
+from PyFunceble.checker.syntax.domain_and_ip import DomainAndIPSyntaxChecker
 from PyFunceble.checker.syntax.ip import IPSyntaxChecker
 from PyFunceble.checker.syntax.ipv4 import IPv4SyntaxChecker
 from PyFunceble.checker.syntax.ipv6 import IPv6SyntaxChecker

PyFunceble/checker/availability/base.py

@@ -516,16 +516,7 @@ def subject_propagator(self) -> "CheckerBase":
         self.status.dns_lookup_record = self.dns_query_tool.lookup_record
         self.status.whois_lookup_record = self.whois_query_tool.lookup_record
 
-        self.status.subject = self.subject
-        self.status.idna_subject = self.idna_subject
-        self.status.netloc = self.url2netloc.set_data_to_convert(
-            self.idna_subject
-        ).get_converted()
-        self.status.status = None
-
-        self.query_syntax_checker()
-
-        return self
+        return super().subject_propagator()
 
     def should_we_continue_test(self, status_post_syntax_checker: str) -> bool:
         """
@@ -657,7 +648,7 @@ def guess_all_settings(
 
         return self
 
-    def query_syntax_checker(self) -> "AvailabilityCheckerBase":
+    def query_common_checker(self) -> "AvailabilityCheckerBase":
         """
         Queries the syntax checker.
         """
@@ -685,7 +676,7 @@ def query_syntax_checker(self) -> "AvailabilityCheckerBase":
             "Finished to check the syntax of %r", self.status.idna_subject
         )
 
-        return self
+        return super().query_common_checker()
 
     @CheckerBase.ensure_subject_is_given
     def query_dns_record(self) -> Optional[Dict[str, Optional[List[str]]]]:

PyFunceble/checker/availability/domain_and_ip.py

@@ -100,11 +100,40 @@ def query_status(
         query_object: Union[IPAvailabilityChecker, DomainAvailabilityChecker] = None
 
         if self.status.ip_syntax:
-            query_object = IPAvailabilityChecker()
+            query_object = IPAvailabilityChecker(
+                self.subject,
+                use_extra_rules=self.use_extra_rules,
+                use_whois_lookup=self.use_whois_lookup,
+                use_dns_lookup=self.use_dns_lookup,
+                use_netinfo_lookup=self.use_netinfo_lookup,
+                use_http_code_lookup=self.use_http_code_lookup,
+                use_reputation_lookup=self.use_reputation_lookup,
+                do_syntax_check_first=self.do_syntax_check_first,
+                db_session=self.db_session,
+                use_whois_db=self.use_whois_db,
+                use_collection=self.use_collection,
+            )
         else:
-            query_object = DomainAvailabilityChecker()
-
-        query_object.__dict__ = self.__dict__
+            query_object = DomainAvailabilityChecker(
+                self.subject,
+                use_extra_rules=self.use_extra_rules,
+                use_whois_lookup=self.use_whois_lookup,
+                use_dns_lookup=self.use_dns_lookup,
+                use_netinfo_lookup=self.use_netinfo_lookup,
+                use_http_code_lookup=self.use_http_code_lookup,
+                use_reputation_lookup=self.use_reputation_lookup,
+                do_syntax_check_first=self.do_syntax_check_first,
+                db_session=self.db_session,
+                use_whois_db=self.use_whois_db,
+                use_collection=self.use_collection,
+            )
+
+        query_object.dns_query_tool = self.dns_query_tool
+        query_object.whois_query_tool = self.whois_query_tool
+        query_object.collection_query_tool = self.collection_query_tool
+        query_object.hostbyaddr_query_tool = self.hostbyaddr_query_tool
+        query_object.addressinfo_query_tool = self.addressinfo_query_tool
+        query_object.http_status_code_query_tool = self.http_status_code_query_tool
 
         result = query_object.query_status()
 

PyFunceble/checker/availability/url.py

@@ -125,7 +125,7 @@ def subject_propagator(self) -> "URLAvailabilityChecker":
 
         self.status.status = None
 
-        self.query_syntax_checker()
+        self.query_common_checker()
 
         return self
 

PyFunceble/checker/base.py

@@ -374,11 +374,42 @@ def subject_propagator(self) -> "CheckerBase":
         Propagate the currently set subject.
 
         .. warning::
-            You are not invited to run this method directly.
+            Be sure to use setup your status first.
+        """
+
+        self.status.subject = self.subject
+        self.status.idna_subject = self.idna_subject
+        self.status.netloc = self.url2netloc.set_data_to_convert(
+            self.idna_subject
+        ).get_converted()
+        self.status.status = None
+
+        return self.query_common_checker()
 
-            Only the :code:`propagate_subject` decorator should call this
-            method.
+    def query_common_checker(self) -> "CheckerBase":
         """
+        Queries the common checkers.
+
+        .. warning::
+            Be sure to use setup your status first.
+        """
+
+        if not self.status.subject_kind:
+            cls_name = self.__class__.__name__.lower()
+            if (
+                hasattr(self.status, "ip_syntax") and self.status.ip_syntax
+            ) or "ip" in cls_name:
+                self.status.subject_kind = "ip"
+            elif (
+                hasattr(self.status, "url_syntax") and self.status.url_syntax
+            ) or "url" in cls_name:
+                self.status.subject_kind = "url"
+            elif (
+                hasattr(self.status, "domain_syntax") and self.status.domain_syntax
+            ) or "domain" in cls_name:
+                self.status.subject_kind = "domain"
+            else:
+                self.status.subject_kind = "unknown"
 
         return self
 

PyFunceble/checker/reputation/base.py

@@ -136,15 +136,7 @@ def subject_propagator(self) -> "CheckerBase":
         self.status.params = self.params
         self.status.dns_lookup_record = self.dns_query_tool.lookup_record
 
-        self.status.subject = self.subject
-        self.status.idna_subject = self.idna_subject
-        self.status.netloc = self.url2netloc.set_data_to_convert(
-            self.idna_subject
-        ).get_converted()
-
-        self.query_syntax_checker()
-
-        return self
+        return super().subject_propagator()
 
     def should_we_continue_test(self, status_post_syntax_checker: str) -> bool:
         """
@@ -156,17 +148,17 @@ def should_we_continue_test(self, status_post_syntax_checker: str) -> bool:
             or status_post_syntax_checker == PyFunceble.storage.STATUS.invalid
         )
 
-    def query_syntax_checker(self) -> "ReputationCheckerBase":
+    def query_common_checker(self) -> "ReputationCheckerBase":
         """
-        Queries the syntax checker.
+        Queries the common checkers.
         """
 
         self.status.second_level_domain_syntax = (
             self.domain_syntax_checker.is_valid_second_level()
         )
         self.status.subdomain_syntax = self.domain_syntax_checker.is_valid_subdomain()
-        self.status.domain_syntax = bool(
-            self.status.subdomain_syntax or self.status.second_level_domain_syntax
+        self.status.domain_syntax = bool(self.status.subdomain_syntax) or bool(
+            self.status.second_level_domain_syntax
         )
 
         self.status.ipv4_syntax = self.ip_syntax_checker.is_valid_v4()
@@ -176,7 +168,7 @@ def query_syntax_checker(self) -> "ReputationCheckerBase":
         self.status.ip_syntax = bool(self.status.ipv4_syntax or self.status.ipv6_syntax)
         self.status.url_syntax = self.url_syntax_checker.is_valid()
 
-        return self
+        return super().query_common_checker()
 
     def query_a_record(self) -> Optional[List[str]]:
         """

PyFunceble/checker/reputation/domain_and_ip.py

@@ -74,11 +74,23 @@ def query_status(self) -> "DomainAndIPReputationChecker":
         """
 
         if self.status.ip_syntax:
-            query_object = IPReputationChecker()
+            query_object = IPReputationChecker(
+                self.subject,
+                do_syntax_check_first=self.do_syntax_check_first,
+                db_session=self.db_session,
+                use_collection=self.use_collection,
+            )
         else:
-            query_object = DomainReputationChecker()
-
-        query_object.__dict__ = self.__dict__
+            query_object = DomainReputationChecker(
+                self.subject,
+                do_syntax_check_first=self.do_syntax_check_first,
+                db_session=self.db_session,
+                use_collection=self.use_collection,
+            )
+
+        query_object.ipv4_reputation_query_tool = self.ipv4_reputation_query_tool
+        query_object.collection_query_tool = self.collection_query_tool
+        query_object.dns_query_tool = self.dns_query_tool
 
         result = query_object.query_status()
 

PyFunceble/checker/status_base.py

@@ -65,6 +65,8 @@ class CheckerStatusBase:
     Provides the base of all status classes.
     """
 
+    subject_kind: Optional[str] = None
+
     subject: Optional[str] = None
     idna_subject: Optional[str] = None
     netloc: Optional[str] = None

PyFunceble/checker/syntax/base.py

@@ -96,13 +96,7 @@ def subject_propagator(self) -> "CheckerBase":
 
         self.status = SyntaxCheckerStatus()
 
-        self.status.subject = self.subject
-        self.status.idna_subject = self.idna_subject
-        self.status.netloc = self.url2netloc.set_data_to_convert(
-            self.idna_subject
-        ).get_converted()
-
-        return self
+        return super().subject_propagator()
 
     @CheckerBase.ensure_subject_is_given
     @CheckerBase.update_status_date_after_query

PyFunceble/checker/syntax/domain.py

@@ -95,14 +95,9 @@ def subject_propagator(self) -> "DomainSyntaxChecker":
         self.subdomain_checker.subject = self.idna_subject
 
         self.status = SyntaxCheckerStatus()
+        self.status.subject_kind = "domain"
 
-        self.status.subject = self.subject
-        self.status.idna_subject = self.idna_subject
-        self.status.netloc = self.url2netloc.set_data_to_convert(
-            self.idna_subject
-        ).get_converted()
-
-        return self
+        return super().subject_propagator()
 
     @DomainSyntaxCheckerBase.ensure_subject_is_given
     def is_valid(self) -> bool: