PyFunceble-dev 4.0.0b35__tar.gz → 4.0.0b36__tar.gz

{PyFunceble-dev-4.0.0b35 → PyFunceble-dev-4.0.0b36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: PyFunceble-dev
-Version: 4.0.0b35
+Version: 4.0.0b36
 Summary: The tool to check the availability or syntax of domain, IP or URL.
 Home-page: https://github.com/funilrys/PyFunceble
 Author: funilrys

{PyFunceble-dev-4.0.0b35 → PyFunceble-dev-4.0.0b36}/PyFunceble/checker/availability/base.py

@@ -841,6 +841,8 @@ class AvailabilityCheckerBase(CheckerBase):
             lookup_result = self.addressinfo_query_tool.get_info()
         elif self.status.ip_syntax:
             lookup_result = self.hostbyaddr_query_tool.get_info()
+        elif self.status.idna_subject.isdigit():
+            lookup_result = None
         else:
             lookup_result = self.addressinfo_query_tool.get_info()
 

{PyFunceble-dev-4.0.0b35 → PyFunceble-dev-4.0.0b36}/PyFunceble/cli/entry_points/pyfunceble/cli.py

@@ -219,6 +219,15 @@ def get_filtering_group_data() -> List[Tuple[List[str], dict]]:
                 "help": argparse.SUPPRESS,
             },
         ),
+        (
+            ["--cidr"],
+            {
+                "dest": "cli_testing.cidr_expand",
+                "action": "store_true",
+                "help": "Activates or disables the expansion of CIDR formatted\n"
+                "addresses. %s" % get_configured_value("cli_testing.cidr_expand"),
+            },
+        ),
         (
             [
                 "--complements",

{PyFunceble-dev-4.0.0b35 → PyFunceble-dev-4.0.0b36}/PyFunceble/cli/file_preloader.py

@@ -66,6 +66,7 @@ from PyFunceble.cli.processes.workers.tester import TesterWorker
 from PyFunceble.cli.utils.stdout import print_single_line
 from PyFunceble.cli.utils.testing import get_subjects_from_line
 from PyFunceble.converter.adblock_input_line2subject import AdblockInputLine2Subject
+from PyFunceble.converter.cidr2subject import CIDR2Subject
 from PyFunceble.converter.input_line2subject import InputLine2Subject
 from PyFunceble.converter.rpz_input_line2subject import RPZInputLine2Subject
 from PyFunceble.converter.rpz_policy2subject import RPZPolicy2Subject
@@ -122,6 +123,7 @@ class FilePreloader:
     rpz_policy2subject: Optional[RPZPolicy2Subject] = None
     rpz_inputline2subject: Optional[RPZInputLine2Subject] = None
     url2netloc: Optional[Url2Netloc] = None
+    cidr2subject: Optional[CIDR2Subject] = None
 
     def __init__(
         self,
@@ -139,6 +141,7 @@ class FilePreloader:
         url2netloc: Optional[Url2Netloc] = None,
         continue_dataset: Optional[ContinueDatasetBase] = None,
         inactive_dataset: Optional[InactiveDatasetBase] = None,
+        cidr2subject: Optional[CIDR2Subject] = None,
     ) -> None:
         if authorized is not None:
             self.authorized = authorized
@@ -160,6 +163,7 @@ class FilePreloader:
         self.url2netloc = url2netloc
         self.continue_dataset = continue_dataset
         self.inactive_dataset = inactive_dataset
+        self.cidr2subject = cidr2subject
 
     def execute_if_authorized(default: Any = None):  # pylint: disable=no-self-argument
         """
@@ -394,6 +398,7 @@ class FilePreloader:
                             inputline2subject=self.inputline2subject,
                             subject2complements=self.subject2complements,
                             url2netloc=self.url2netloc,
+                            cidr2subject=self.cidr2subject,
                         ):
 
                             to_send = copy.deepcopy(self.protocol)

{PyFunceble-dev-4.0.0b35 → PyFunceble-dev-4.0.0b36}/PyFunceble/cli/system/launcher.py

@@ -101,6 +101,7 @@ from PyFunceble.cli.utils.testing import (
 )
 from PyFunceble.cli.utils.version import print_central_messages
 from PyFunceble.converter.adblock_input_line2subject import AdblockInputLine2Subject
+from PyFunceble.converter.cidr2subject import CIDR2Subject
 from PyFunceble.converter.input_line2subject import InputLine2Subject
 from PyFunceble.converter.rpz_input_line2subject import RPZInputLine2Subject
 from PyFunceble.converter.rpz_policy2subject import RPZPolicy2Subject
@@ -133,6 +134,7 @@ class SystemLauncher(SystemBase):
     rpz_policy2subject: RPZPolicy2Subject = RPZPolicy2Subject()
     rpz_inputline2subject: RPZInputLine2Subject = RPZInputLine2Subject()
     url2netloc: Url2Netloc = Url2Netloc()
+    cidr2subject: CIDR2Subject = CIDR2Subject()
 
     stdout_printer: StdoutPrinter = StdoutPrinter()
     file_printer: FilePrinter = FilePrinter()
@@ -528,6 +530,7 @@ class SystemLauncher(SystemBase):
                             inputline2subject=self.inputline2subject,
                             subject2complements=self.subject2complements,
                             url2netloc=self.url2netloc,
+                            cidr2subject=self.cidr2subject,
                         ):
                             to_send = copy.deepcopy(protocol)
                             to_send["subject"] = subject
@@ -575,6 +578,7 @@ class SystemLauncher(SystemBase):
                     inputline2subject=self.inputline2subject,
                     subject2complements=self.subject2complements,
                     url2netloc=self.url2netloc,
+                    cidr2subject=self.cidr2subject,
                 ):
                     to_send = copy.deepcopy(protocol)
                     to_send["subject"], to_send["idna_subject"] = (

{PyFunceble-dev-4.0.0b35 → PyFunceble-dev-4.0.0b36}/PyFunceble/cli/utils/testing.py

@@ -57,6 +57,7 @@ from sqlalchemy.orm import Session
 
 import PyFunceble.storage
 from PyFunceble.converter.adblock_input_line2subject import AdblockInputLine2Subject
+from PyFunceble.converter.cidr2subject import CIDR2Subject
 from PyFunceble.converter.input_line2subject import InputLine2Subject
 from PyFunceble.converter.rpz_input_line2subject import RPZInputLine2Subject
 from PyFunceble.converter.rpz_policy2subject import RPZPolicy2Subject
@@ -186,6 +187,7 @@ def get_subjects_from_line(
     inputline2subject: Optional[InputLine2Subject] = None,
     subject2complements: Optional[Subject2Complements] = None,
     url2netloc: Optional[Url2Netloc] = None,
+    cidr2subject: Optional[CIDR2Subject] = None,
 ) -> List[str]:
     """
     Provides the list of subject to test.
@@ -214,6 +216,9 @@ def get_subjects_from_line(
     if url2netloc is None:
         url2netloc = Url2Netloc()
 
+    if cidr2subject is None:
+        cidr2subject = CIDR2Subject()
+
     if PyFunceble.storage.CONFIGURATION.cli_decoding.adblock:
         result.extend(
             # pylint: disable=line-too-long
@@ -244,6 +249,13 @@ def get_subjects_from_line(
             ]
         )
 
+    if PyFunceble.storage.CONFIGURATION.cli_testing.cidr_expand:
+        result = [
+            y
+            for x in result
+            for y in cidr2subject.set_data_to_convert(x).get_converted()
+        ]
+
     if checker_type.lower() != "syntax":
         for index, subject in enumerate(result):
             if not subject:

PyFunceble-dev-4.0.0b36/PyFunceble/converter/cidr2subject.py

@@ -0,0 +1,114 @@
+# pylint:disable=line-too-long
+"""
+The tool to check the availability or syntax of domain, IP or URL.
+
+::
+
+
+    ██████╗ ██╗   ██╗███████╗██╗   ██╗███╗   ██╗ ██████╗███████╗██████╗ ██╗     ███████╗
+    ██╔══██╗╚██╗ ██╔╝██╔════╝██║   ██║████╗  ██║██╔════╝██╔════╝██╔══██╗██║     ██╔════╝
+    ██████╔╝ ╚████╔╝ █████╗  ██║   ██║██╔██╗ ██║██║     █████╗  ██████╔╝██║     █████╗
+    ██╔═══╝   ╚██╔╝  ██╔══╝  ██║   ██║██║╚██╗██║██║     ██╔══╝  ██╔══██╗██║     ██╔══╝
+    ██║        ██║   ██║     ╚██████╔╝██║ ╚████║╚██████╗███████╗██████╔╝███████╗███████╗
+    ╚═╝        ╚═╝   ╚═╝      ╚═════╝ ╚═╝  ╚═══╝ ╚═════╝╚══════╝╚═════╝ ╚══════╝╚══════╝
+
+Provides the converter of CIDR to subjects.
+
+Author:
+    Nissar Chababy, @funilrys, contactTATAfunilrysTODTODcom
+
+Special thanks:
+    https://pyfunceble.github.io/#/special-thanks
+
+Contributors:
+    https://pyfunceble.github.io/#/contributors
+
+Project link:
+    https://github.com/funilrys/PyFunceble
+
+Project documentation:
+    https://pyfunceble.readthedocs.io/en/dev/
+
+Project homepage:
+    https://pyfunceble.github.io/
+
+License:
+::
+
+
+    Copyright 2017, 2018, 2019, 2020, 2021 Nissar Chababy
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+"""
+
+from ipaddress import IPv4Network
+from typing import Any, List, Optional
+
+from PyFunceble.checker.syntax.ip import IPSyntaxChecker
+from PyFunceble.converter.base import ConverterBase
+
+
+class CIDR2Subject(ConverterBase):
+    """
+    Converts/Extracts the subjects of from the given CIDR.
+    """
+
+    ip_syntax_checker: Optional[IPSyntaxChecker] = None
+
+    def __init__(self, data_to_convert: Optional[Any] = None) -> None:
+        super().__init__(data_to_convert=data_to_convert)
+
+        self.ip_syntax_checker = IPSyntaxChecker()
+
+    @ConverterBase.data_to_convert.setter
+    def data_to_convert(self, value: Any) -> None:
+        """
+        Overrites the default behavior.
+
+        :raise TypeError:
+            When the given data to convert is not :py:class:`str`
+        """
+
+        if not isinstance(value, str):
+            raise TypeError(f"<value> should be {str}, {type(value)} given.")
+
+        # pylint: disable=no-member
+        super(CIDR2Subject, self.__class__).data_to_convert.fset(self, value)
+
+    def get_converted(self) -> List[str]:
+        """
+        Provides the subject-s to test.
+        """
+
+        result = set()
+
+        subject = self.data_to_convert.strip()
+
+        if subject:
+            try:
+                self.ip_syntax_checker.set_subject(subject)
+                if self.ip_syntax_checker.is_valid_v4_range():
+                    result.update(
+                        str(x) for x in IPv4Network(self.ip_syntax_checker.subject)
+                    )
+                elif self.ip_syntax_checker.is_valid_v6_range():
+                    ...
+
+                    # Not Implemented yet.
+                    result.add(subject)
+                else:
+                    result.add(subject)
+            except ValueError:
+                result.add(subject)
+
+        return list(result)

{PyFunceble-dev-4.0.0b35 → PyFunceble-dev-4.0.0b36}/PyFunceble/data/infrastructure/.PyFunceble_production.yaml

@@ -45,6 +45,9 @@ cli_testing:
   # Activates the generation of complements.
   complements: False
 
+  # Activates the expansion of CIDR to single addresses.
+  cidr_expand: False
+
   # Sets the cooldown time to apply between each tests.
   cooldown_time: 0.0
 

{PyFunceble-dev-4.0.0b35 → PyFunceble-dev-4.0.0b36}/PyFunceble/data/infrastructure/dir_structure_production.json

@@ -116,7 +116,7 @@
     "logs": {
         ".gitignore": {
             "content": "*\n!.gitignore\n!/date_format/\n!/no_referrer/\n!/percentage/\n!/whois/\n",
-            "hash": "475d7b0dedad050e4551466a8a17bff7cf0af0a5ef5e463979981cba"
+            "hash": "7e533b26a45b8712a1ed4895b52b2cc798a03a632074800af98a52e7"
         }
     },
     "logs/percentage": {

{PyFunceble-dev-4.0.0b35 → PyFunceble-dev-4.0.0b36}/PyFunceble/query/dns/query_tool.py

@@ -268,7 +268,7 @@ class DNSQueryTool:
                 except ValueError:
                     return dns.name.from_text(self.subject)
             return dns.name.from_text(self.subject)
-        except dns.name.LabelTooLong:
+        except (dns.name.LabelTooLong, dns.name.EmptyLabel):
             return None
 
     @property

{PyFunceble-dev-4.0.0b35 → PyFunceble-dev-4.0.0b36}/PyFunceble/storage.py

@@ -61,7 +61,7 @@ from dotenv import load_dotenv
 from PyFunceble.storage_facility import get_config_directory
 
 PROJECT_NAME: str = "PyFunceble"
-PROJECT_VERSION: str = "4.0.0b35.dev (Blue Duckling)"
+PROJECT_VERSION: str = "4.0.0b36.dev (Blue Duckling)"
 
 DISTRIBUTED_CONFIGURATION_FILENAME: str = ".PyFunceble_production.yaml"
 DISTRIBUTED_DIR_STRUCTURE_FILENAME: str = "dir_structure_production.json"

{PyFunceble-dev-4.0.0b35 → PyFunceble-dev-4.0.0b36}/PyFunceble_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: PyFunceble-dev
-Version: 4.0.0b35
+Version: 4.0.0b36
 Summary: The tool to check the availability or syntax of domain, IP or URL.
 Home-page: https://github.com/funilrys/PyFunceble
 Author: funilrys

{PyFunceble-dev-4.0.0b35 → PyFunceble-dev-4.0.0b36}/PyFunceble_dev.egg-info/SOURCES.txt

@@ -145,6 +145,7 @@ PyFunceble/config/loader.py
 PyFunceble/converter/__init__.py
 PyFunceble/converter/adblock_input_line2subject.py
 PyFunceble/converter/base.py
+PyFunceble/converter/cidr2subject.py
 PyFunceble/converter/input_line2subject.py
 PyFunceble/converter/internal_url.py
 PyFunceble/converter/rpz_input_line2subject.py

{PyFunceble-dev-4.0.0b35 → PyFunceble-dev-4.0.0b36}/version.yaml

@@ -1,4 +1,4 @@
-current_version: 4.0.0b35.dev (Blue Duckling)
+current_version: 4.0.0b36.dev (Blue Duckling)
 deprecated:
 - 3.0.21
 - 3.1.20