Every requests should comply with proxy settings.

This patch fixes #349

Indeed, before this patch, only test related HTTP requests were
complying with the proxy settings declared by end-users through
the configuration files.

From now on, any download will comply with the proxy settings.

Author: funilrys

PyFunceble/checker/availability/base.py

@@ -60,7 +60,6 @@
 
 import PyFunceble.checker.utils.whois
 import PyFunceble.facility
-import PyFunceble.factory
 import PyFunceble.storage
 from PyFunceble.checker.availability.extras.base import ExtraRuleHandlerBase
 from PyFunceble.checker.availability.extras.dns import DNSRulesHandler

PyFunceble/checker/availability/domain.py

@@ -51,7 +51,6 @@
 """
 
 import PyFunceble.facility
-import PyFunceble.factory
 import PyFunceble.storage
 from PyFunceble.checker.availability.base import AvailabilityCheckerBase
 from PyFunceble.checker.reputation.domain import DomainReputationChecker

PyFunceble/checker/availability/extras/base.py

@@ -56,10 +56,11 @@
 
 import requests
 
-import PyFunceble.factory
+import PyFunceble.storage
 from PyFunceble.checker.availability.status import AvailabilityCheckerStatus
 from PyFunceble.helpers.regex import RegexHelper
 from PyFunceble.query.dns.query_tool import DNSQueryTool
+from PyFunceble.query.requests.requester import Requester
 
 
 class ExtraRuleHandlerBase:
@@ -76,13 +77,14 @@ class ExtraRuleHandlerBase:
     req: Optional[requests.Response] = None
     dns_query_tool: Optional[DNSQueryTool] = None
     regex_helper: Optional[RegexHelper] = None
+    requester: Optional[Requester] = None
 
     def __init__(self, status: Optional[AvailabilityCheckerStatus] = None) -> None:
         if status is not None:
             self.status = status
 
-        # Be sure that all settings are loaded proprely!!
-        PyFunceble.factory.Requester.guess_all_settings()
+        self.requester = Requester(config=PyFunceble.storage.CONFIGURATION)
+
         self.dns_query_tool = DNSQueryTool()
         self.regex_helper = RegexHelper()
 
@@ -227,9 +229,7 @@ def do_request(self, *, allow_redirects: bool = True) -> requests.Response:
             Whether we shoold follow the redirection - or not.
         """
 
-        self.req = PyFunceble.factory.Requester.get(
-            self.req_url, allow_redirects=allow_redirects
-        )
+        self.req = self.requester.get(self.req_url, allow_redirects=allow_redirects)
 
         return self
 
@@ -272,18 +272,18 @@ def handle_string_match_mode(_req: requests.Response):
                 method()
 
         try:
-            req = PyFunceble.factory.Requester.get(url, allow_redirects=allow_redirects)
+            req = self.requester.get(url, allow_redirects=allow_redirects)
 
             if match_mode == "regex":
                 handle_regex_match_mode(req)
             else:
                 handle_string_match_mode(req)
         except (
-            PyFunceble.factory.Requester.exceptions.RequestException,
-            PyFunceble.factory.Requester.exceptions.InvalidURL,
-            PyFunceble.factory.Requester.exceptions.Timeout,
-            PyFunceble.factory.Requester.exceptions.ConnectionError,
-            PyFunceble.factory.Requester.urllib3_exceptions.InvalidHeader,
+            self.requester.exceptions.RequestException,
+            self.requester.exceptions.InvalidURL,
+            self.requester.exceptions.Timeout,
+            self.requester.exceptions.ConnectionError,
+            self.requester.urllib3_exceptions.InvalidHeader,
             socket.timeout,
         ):
             pass
@@ -363,18 +363,18 @@ def handle_string_match_mode(_req: requests.Response):
                 method()
 
         try:
-            req = PyFunceble.factory.Requester.get(url, allow_redirects=allow_redirects)
+            req = self.requester.get(url, allow_redirects=allow_redirects)
 
             if match_mode == "regex":
                 handle_regex_match_mode(req)
             else:
                 handle_string_match_mode(req)
         except (
-            PyFunceble.factory.Requester.exceptions.RequestException,
-            PyFunceble.factory.Requester.exceptions.InvalidURL,
-            PyFunceble.factory.Requester.exceptions.Timeout,
-            PyFunceble.factory.Requester.exceptions.ConnectionError,
-            PyFunceble.factory.Requester.urllib3_exceptions.InvalidHeader,
+            self.requester.exceptions.RequestException,
+            self.requester.exceptions.InvalidURL,
+            self.requester.exceptions.Timeout,
+            self.requester.exceptions.ConnectionError,
+            self.requester.urllib3_exceptions.InvalidHeader,
             socket.timeout,
         ):
             pass

PyFunceble/checker/availability/extras/etoxic.py

@@ -50,7 +50,6 @@
     limitations under the License.
 """
 
-import PyFunceble.factory
 import PyFunceble.storage
 from PyFunceble.checker.availability.extras.base import ExtraRuleHandlerBase
 

PyFunceble/checker/availability/extras/parked.py

@@ -50,7 +50,6 @@
     limitations under the License.
 """
 
-import PyFunceble.factory
 import PyFunceble.storage
 from PyFunceble.checker.availability.extras.base import ExtraRuleHandlerBase
 
@@ -127,7 +126,7 @@ def start(self) -> "ParkedRulesHandler":
                 "Finished to check %r against our own set of parked rules.",
                 self.status.idna_subject,
             )
-        except PyFunceble.factory.Requester.exceptions.RequestException:
+        except self.requester.exceptions.RequestException:
             pass
 
         return self

PyFunceble/checker/availability/extras/rules.py

@@ -55,7 +55,6 @@
 from box import Box
 
 import PyFunceble.facility
-import PyFunceble.factory
 import PyFunceble.storage
 from PyFunceble.checker.availability.extras.base import ExtraRuleHandlerBase
 from PyFunceble.checker.availability.status import AvailabilityCheckerStatus
@@ -99,15 +98,16 @@ def __init__(self, status: Optional[AvailabilityCheckerStatus] = None) -> None:
             r"\.myhuaweicloudz\.com$": [(self.switch_to_down_if_status_code, 403)],
             r"^scnv\.io$": [(self.switch_to_down_if_status_code, 404)],
             r"\.skyrock\.com$": [(self.switch_to_down_if_status_code, 404)],
-            r"\.squarespace.com$": [(self.switch_to_down_if_status_code, 404),
-                    self.handle_squarespace_com,
+            r"\.squarespace.com$": [
+                (self.switch_to_down_if_status_code, 404),
+                self.handle_squarespace_com,
             ],
             r"\.sz.id$": [(self.switch_to_down_if_status_code, 302)],
             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.handle_vercel_dot_app
+                self.handle_vercel_dot_app,
             ],
             r"\.web\.app$": [(self.switch_to_down_if_status_code, 404)],
             r"\.wix\.com$": [(self.switch_to_down_if_status_code, 404)],
@@ -227,9 +227,7 @@ def handle_imgur_dot_com(self) -> "ExtraRulesHandler":
             This method are assuming we are handling a imgur.com subdomain.
         """
 
-        req = PyFunceble.factory.Requester.get(
-            self.req_url_https, allow_redirects=False
-        )
+        req = self.requester.get(self.req_url_https, allow_redirects=False)
         username = self.status.netloc.replace(".imgur.com", "")
 
         if "Location" in req.headers:
@@ -274,7 +272,10 @@ def handle_squarespace_com(self) -> "ExtraRulesHandler":
             This method assume that we know that we are handling a blogspot domain.
         """
 
-        regex_squarespace = [r"This site has been deleted by the owner\."]
+        regex_squarespace = [
+            r"This site has been deleted"
+            r" by the owner\."
+        ]
 
         self.do_on_body_match(
             self.req_url,

PyFunceble/checker/availability/extras/subject_switch.py

@@ -146,7 +146,7 @@ def start(self) -> "SubjectSwitchRulesHandler":
 
                 if not self.status.status_after_extra_rules:
                     self._switch_down_by_history()
-        except PyFunceble.factory.Requester.exceptions.RequestException:
+        except self.requester.exceptions.RequestException:
             pass
 
         PyFunceble.facility.Logger.info(

PyFunceble/checker/availability/ip.py

@@ -51,7 +51,6 @@
 """
 
 import PyFunceble.facility
-import PyFunceble.factory
 import PyFunceble.storage
 from PyFunceble.checker.availability.base import AvailabilityCheckerBase
 from PyFunceble.checker.reputation.ip import IPReputationChecker

PyFunceble/checker/availability/url.py

@@ -51,7 +51,6 @@
 """
 
 import PyFunceble.facility
-import PyFunceble.factory
 import PyFunceble.storage
 from PyFunceble.checker.availability.base import AvailabilityCheckerBase
 from PyFunceble.checker.availability.status import AvailabilityCheckerStatus

PyFunceble/checker/reputation/base.py

@@ -55,7 +55,6 @@
 from sqlalchemy.orm import Session
 
 import PyFunceble.facility
-import PyFunceble.factory
 import PyFunceble.storage
 from PyFunceble.checker.base import CheckerBase
 from PyFunceble.checker.reputation.params import ReputationCheckerParams