certbot-apache 3.1.0__tar.gz → 3.2.0__tar.gz

{certbot_apache-3.1.0/certbot_apache.egg-info → certbot_apache-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: certbot-apache
-Version: 3.1.0
+Version: 3.2.0
 Summary: Apache plugin for Certbot
 Home-page: https://github.com/certbot/certbot
 Author: Certbot Project
@@ -17,6 +17,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Security
 Classifier: Topic :: System :: Installation/Setup
@@ -25,10 +26,19 @@ Classifier: Topic :: System :: Systems Administration
 Classifier: Topic :: Utilities
 Requires-Python: >=3.9
 License-File: LICENSE.txt
-Requires-Dist: acme>=3.1.0
-Requires-Dist: certbot>=3.1.0
+Requires-Dist: acme>=3.2.0
+Requires-Dist: certbot>=3.2.0
 Requires-Dist: python-augeas
 Provides-Extra: dev
 Requires-Dist: apacheconfig>=0.3.2; extra == "dev"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary

{certbot_apache-3.1.0 → certbot_apache-3.2.0}/certbot_apache/_internal/configurator.py

@@ -271,10 +271,10 @@ class ApacheConfigurator(common.Configurator):
         self.parser: parser.ApacheParser
         self.parser_root: Optional[dualparser.DualBlockNode] = None
         self.version = version
-        self._openssl_version = openssl_version
+        self._openssl_version: Optional[str] = openssl_version
         self.vhosts: List[obj.VirtualHost]
         self.options = copy.deepcopy(self.OS_DEFAULTS)
-        self._enhance_func: Dict[str, Callable] = {
+        self._enhance_func: Dict[str, Callable[[obj.VirtualHost, Any], None]] = {
             "redirect": self._enable_redirect,
             "ensure-http-header": self._set_http_header,
             "staple-ocsp": self._enable_ocsp_stapling,
@@ -599,7 +599,7 @@ class ApacheConfigurator(common.Configurator):
         """Prompts user to choose vhosts to install a wildcard certificate for"""
 
         # Get all vhosts that are covered by the wildcard domain
-        vhosts: List = self._vhosts_for_wildcard(domain)
+        vhosts: List[obj.VirtualHost] = self._vhosts_for_wildcard(domain)
 
         # Go through the vhosts, making sure that we cover all the names
         # present, but preferring the SSL vhosts
@@ -994,9 +994,7 @@ class ApacheConfigurator(common.Configurator):
         for arg in args:
             arg_value = self.parser.get_arg(arg)
             if arg_value is not None:
-                addr = obj.Addr.fromstring(arg_value)
-                if addr is not None:
-                    addrs.add(addr)
+                addrs.add(obj.Addr.fromstring(arg_value))
         is_ssl = False
 
         if self.parser.find_dir("SSLEngine", "on", start=path, exclude=False):
@@ -1126,9 +1124,7 @@ class ApacheConfigurator(common.Configurator):
         """
         addrs = set()
         for param in node.parameters:
-            addr = obj.Addr.fromstring(param)
-            if addr:
-                addrs.add(addr)
+            addrs.add(obj.Addr.fromstring(param))
 
         is_ssl = False
         # Exclusion to match the behavior in get_virtual_hosts_v2
@@ -1646,10 +1642,9 @@ class ApacheConfigurator(common.Configurator):
         for addr in ssl_addr_p:
             old_addr = obj.Addr.fromstring(
                 str(self.parser.get_arg(addr)))
-            if old_addr:
-                ssl_addr = old_addr.get_addr_obj("443")
-                self.parser.aug.set(addr, str(ssl_addr))
-                ssl_addrs.add(ssl_addr)
+            ssl_addr = old_addr.get_addr_obj("443")
+            self.parser.aug.set(addr, str(ssl_addr))
+            ssl_addrs.add(ssl_addr)
 
         return ssl_addrs
 

{certbot_apache-3.1.0 → certbot_apache-3.2.0}/certbot_apache/_internal/dualparser.py

@@ -6,7 +6,6 @@ from typing import List
 from typing import Optional
 from typing import Set
 from typing import Tuple
-from typing import Type
 from typing import TYPE_CHECKING
 from typing import TypeVar
 
@@ -21,7 +20,8 @@ if TYPE_CHECKING:
 
 GenericAugeasParserNode = TypeVar("GenericAugeasParserNode", bound="AugeasParserNode")
 GenericApacheParserNode = TypeVar("GenericApacheParserNode", bound="ApacheParserNode")
-GenericDualNode = TypeVar("GenericDualNode", bound="DualNodeBase")
+# Circular imports needs Any, see https://github.com/python/mypy/issues/11910
+GenericDualNode = TypeVar("GenericDualNode", bound="DualNodeBase[Any, Any]")
 
 
 class DualNodeBase(Generic[GenericAugeasParserNode, GenericApacheParserNode]):
@@ -53,11 +53,11 @@ class DualNodeBase(Generic[GenericAugeasParserNode, GenericApacheParserNode]):
             assertions.assertEqualSimple(firstval, secondval)
         return firstval
 
-    def find_ancestors(self, name: str) -> List["DualNodeBase"]:
+    def find_ancestors(self, name: str) -> List["DualBlockNode"]:
         """ Traverses the ancestor tree and returns ancestors matching name """
         return self._find_helper(DualBlockNode, "find_ancestors", name)
 
-    def _find_helper(self, nodeclass: Type[GenericDualNode], findfunc: str, search: str,
+    def _find_helper(self, nodeclass: type[GenericDualNode], findfunc: str, search: str,
                      **kwargs: Any) -> List[GenericDualNode]:
         """A helper for find_* functions. The function specific attributes should
         be passed as keyword arguments.

{certbot_apache-3.1.0 → certbot_apache-3.2.0}/certbot_apache/_internal/http_01.py

@@ -172,6 +172,7 @@ class ApacheHttp01(common.ChallengePerformer):
 
     def _set_up_challenge(self, achall: KeyAuthorizationAnnotatedChallenge
                           ) -> KeyAuthorizationChallengeResponse:
+        response: KeyAuthorizationChallengeResponse
         response, validation = achall.response_and_validation()
 
         name: str = os.path.join(self.challenge_dir, achall.chall.encode("token"))

{certbot_apache-3.1.0 → certbot_apache-3.2.0}/certbot_apache/_internal/obj.py

@@ -3,7 +3,6 @@ import re
 from typing import Any
 from typing import Iterable
 from typing import Optional
-from typing import Pattern
 from typing import Set
 from typing import Union
 
@@ -126,7 +125,7 @@ class VirtualHost:
 
     """
     # ?: is used for not returning enclosed characters
-    strip_name: Pattern = re.compile(r"^(?:.+://)?([^ :$]*)")
+    strip_name: re.Pattern[str] = re.compile(r"^(?:.+://)?([^ :$]*)")
 
     def __init__(self, filepath: str, path: str, addrs: Set["Addr"], ssl: bool,
                  enabled: bool, name: Optional[str] = None, aliases: Optional[Set[str]] = None,

{certbot_apache-3.1.0 → certbot_apache-3.2.0}/certbot_apache/_internal/parser.py

@@ -9,7 +9,6 @@ from typing import Iterable
 from typing import List
 from typing import Mapping
 from typing import Optional
-from typing import Pattern
 from typing import Set
 from typing import Tuple
 from typing import TYPE_CHECKING
@@ -43,7 +42,7 @@ class ApacheParser:
         default - user config file, name - NameVirtualHost,
 
     """
-    arg_var_interpreter: Pattern = re.compile(r"\$\{[^ \}]*}")
+    arg_var_interpreter: re.Pattern[str] = re.compile(r"\$\{[^ \}]*}")
     fnmatch_chars: Set[str] = {"*", "?", "\\", "[", "]"}
 
     # pylint: disable=unused-argument
@@ -127,7 +126,7 @@ class ApacheParser:
 
         self.aug.set("/test/path/testing/arg", "aRgUMeNT")
         try:
-            matches = self.aug.match(
+            matches: List[str] = self.aug.match(
                 "/test//*[self::arg=~regexp('argument', 'i')]")
         except RuntimeError:
             self.aug.remove("/test/path")
@@ -390,7 +389,7 @@ class ApacheParser:
         :rtype: str
 
         """
-        if_mods = self.aug.match(("%s/IfModule/*[self::arg='%s']" %
+        if_mods: List[str] = self.aug.match(("%s/IfModule/*[self::arg='%s']" %
                                   (aug_conf_path, mod)))
         if not if_mods:
             return self.create_ifmod(aug_conf_path, mod)
@@ -578,7 +577,7 @@ class ApacheParser:
         This also converts all variables and parameters appropriately.
 
         """
-        value = self.aug.get(match)
+        value: str = self.aug.get(match)
 
         # No need to strip quotes for variables, as apache2ctl already does
         # this, but we do need to strip quotes for all normal arguments.

{certbot_apache-3.1.0 → certbot_apache-3.2.0}/certbot_apache/_internal/tests/util.py

@@ -1,5 +1,8 @@
 """Common utilities for certbot_apache."""
 import shutil
+from typing import List
+from typing import Optional
+from typing import Tuple
 import unittest
 from unittest import mock
 
@@ -16,9 +19,10 @@ from certbot_apache._internal import obj
 
 class ApacheTest(unittest.TestCase):
 
-    def setUp(self, test_dir="debian_apache_2_4/multiple_vhosts",
-              config_root="debian_apache_2_4/multiple_vhosts/apache2",
-              vhost_root="debian_apache_2_4/multiple_vhosts/apache2/sites-available"):
+    def setUp(self, test_dir: str = "debian_apache_2_4/multiple_vhosts",
+              config_root: str = "debian_apache_2_4/multiple_vhosts/apache2",
+              vhost_root: str = "debian_apache_2_4/multiple_vhosts/apache2/sites-available"
+              ) -> None:
         # pylint: disable=arguments-differ
         self.temp_dir, self.config_dir, self.work_dir = common.dir_setup(
             test_dir=test_dir,
@@ -27,7 +31,7 @@ class ApacheTest(unittest.TestCase):
         self.config_path = os.path.join(self.temp_dir, config_root)
         self.vhost_path = os.path.join(self.temp_dir, vhost_root)
 
-        self.rsa512jwk = jose.JWKRSA.load(test_util.load_vector(
+        self.rsa512jwk = jose.jwk.JWKRSA.load(test_util.load_vector(
             "rsa512_key.pem"))
 
         self.config = get_apache_configurator(self.config_path, vhost_root,
@@ -50,7 +54,7 @@ class ApacheTest(unittest.TestCase):
                     os.path.pardir, "sites-available", vhost_basename)
                 os.symlink(target, vhost)
 
-    def tearDown(self):
+    def tearDown(self) -> None:
         shutil.rmtree(self.temp_dir)
         shutil.rmtree(self.config_dir)
         shutil.rmtree(self.work_dir)
@@ -58,9 +62,10 @@ class ApacheTest(unittest.TestCase):
 
 class ParserTest(ApacheTest):
 
-    def setUp(self, test_dir="debian_apache_2_4/multiple_vhosts",
-              config_root="debian_apache_2_4/multiple_vhosts/apache2",
-              vhost_root="debian_apache_2_4/multiple_vhosts/apache2/sites-available"):
+    def setUp(self, test_dir: str = "debian_apache_2_4/multiple_vhosts",
+              config_root: str = "debian_apache_2_4/multiple_vhosts/apache2",
+              vhost_root: str = "debian_apache_2_4/multiple_vhosts/apache2/sites-available"
+              ) -> None:
         super().setUp(test_dir, config_root, vhost_root)
 
         from certbot_apache._internal.parser import ApacheParser
@@ -73,12 +78,12 @@ class ParserTest(ApacheTest):
 
 
 def get_apache_configurator(
-        config_path, vhost_path,
-        config_dir, work_dir, version=(2, 4, 7),
-        os_info="generic",
-        conf_vhost_path=None,
-        use_parsernode=False,
-        openssl_version="1.1.1a"):
+        config_path: str, vhost_path: str,
+        config_dir: str, work_dir: str, version: Tuple[int, int, int] = (2, 4, 7),
+        os_info: str = "generic",
+        conf_vhost_path: Optional[str] = None,
+        use_parsernode: bool = False,
+        openssl_version: str = "1.1.1a") -> configurator.ApacheConfigurator:
     """Create an Apache Configurator with the specified options.
 
     :param conf: Function that returns binary paths. self.conf in Configurator
@@ -124,7 +129,7 @@ def get_apache_configurator(
     return config
 
 
-def get_vh_truth(temp_dir, config_name):
+def get_vh_truth(temp_dir: str, config_name: str) -> Optional[List[obj.VirtualHost]]:
     """Return the ground truth for the specified directory."""
     if config_name == "debian_apache_2_4/multiple_vhosts":
         prefix = os.path.join(
@@ -146,13 +151,13 @@ def get_vh_truth(temp_dir, config_name):
                 os.path.join(prefix, "000-default.conf"),
                 os.path.join(aug_pre, "000-default.conf/VirtualHost"),
                 {obj.Addr.fromstring("*:80"),
-                     obj.Addr.fromstring("[::]:80")},
+                    obj.Addr.fromstring("[::]:80")},
                 False, True, "ip-172-30-0-17"),
             obj.VirtualHost(
                 os.path.join(prefix, "certbot.conf"),
                 os.path.join(aug_pre, "certbot.conf/VirtualHost"),
                 {obj.Addr.fromstring("*:80")}, False, True,
-                "certbot.demo", aliases=["www.certbot.demo"]),
+                "certbot.demo", aliases={"www.certbot.demo"}),
             obj.VirtualHost(
                 os.path.join(prefix, "mod_macro-example.conf"),
                 os.path.join(aug_pre,
@@ -168,7 +173,7 @@ def get_vh_truth(temp_dir, config_name):
                 os.path.join(prefix, "wildcard.conf"),
                 os.path.join(aug_pre, "wildcard.conf/VirtualHost"),
                 {obj.Addr.fromstring("*:80")}, False, True,
-                "ip-172-30-0-17", aliases=["*.blue.purple.com"]),
+                "ip-172-30-0-17", aliases={"*.blue.purple.com"}),
             obj.VirtualHost(
                 os.path.join(prefix, "ocsp-ssl.conf"),
                 os.path.join(aug_pre, "ocsp-ssl.conf/IfModule/VirtualHost"),

{certbot_apache-3.1.0 → certbot_apache-3.2.0/certbot_apache.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: certbot-apache
-Version: 3.1.0
+Version: 3.2.0
 Summary: Apache plugin for Certbot
 Home-page: https://github.com/certbot/certbot
 Author: Certbot Project
@@ -17,6 +17,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Security
 Classifier: Topic :: System :: Installation/Setup
@@ -25,10 +26,19 @@ Classifier: Topic :: System :: Systems Administration
 Classifier: Topic :: Utilities
 Requires-Python: >=3.9
 License-File: LICENSE.txt
-Requires-Dist: acme>=3.1.0
-Requires-Dist: certbot>=3.1.0
+Requires-Dist: acme>=3.2.0
+Requires-Dist: certbot>=3.2.0
 Requires-Dist: python-augeas
 Provides-Extra: dev
 Requires-Dist: apacheconfig>=0.3.2; extra == "dev"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary

{certbot_apache-3.1.0 → certbot_apache-3.2.0}/certbot_apache.egg-info/requires.txt

@@ -1,5 +1,5 @@
-acme>=3.1.0
-certbot>=3.1.0
+acme>=3.2.0
+certbot>=3.2.0
 python-augeas
 
 [dev]

{certbot_apache-3.1.0 → certbot_apache-3.2.0}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '3.1.0'
+version = '3.2.0'
 
 install_requires = [
     # We specify the minimum acme and certbot version as the current plugin
@@ -41,6 +41,7 @@ setup(
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Security',
         'Topic :: System :: Installation/Setup',