Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-certbot-apache for
openSUSE:Factory checked in at 2021-05-12 19:32:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-certbot-apache (Old)
and /work/SRC/openSUSE:Factory/.python-certbot-apache.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-certbot-apache"
Wed May 12 19:32:32 2021 rev:27 rq:892478 version:1.15.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-certbot-apache/python-certbot-apache.changes
2021-04-15 16:58:24.394768218 +0200
+++
/work/SRC/openSUSE:Factory/.python-certbot-apache.new.2988/python-certbot-apache.changes
2021-05-12 19:33:07.418823949 +0200
@@ -1,0 +2,6 @@
+Wed May 12 12:06:21 UTC 2021 - Mark??ta Machov?? <mmach...@suse.com>
+
+- update to version 1.15.0
+ * sync with the main certbot package
+
+-------------------------------------------------------------------
Old:
----
certbot-apache-1.14.0.tar.gz
New:
----
certbot-apache-1.15.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-certbot-apache.spec ++++++
--- /var/tmp/diff_new_pack.RA99sl/_old 2021-05-12 19:33:07.898822031 +0200
+++ /var/tmp/diff_new_pack.RA99sl/_new 2021-05-12 19:33:07.902822015 +0200
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-certbot-apache
-Version: 1.14.0
+Version: 1.15.0
Release: 0
Summary: Apache plugin for Certbot
License: Apache-2.0
++++++ certbot-apache-1.14.0.tar.gz -> certbot-apache-1.15.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.14.0/PKG-INFO
new/certbot-apache-1.15.0/PKG-INFO
--- old/certbot-apache-1.14.0/PKG-INFO 2021-04-06 19:17:11.454677300 +0200
+++ new/certbot-apache-1.15.0/PKG-INFO 2021-05-04 20:48:45.624423300 +0200
@@ -1,10 +1,10 @@
Metadata-Version: 2.1
Name: certbot-apache
-Version: 1.14.0
+Version: 1.15.0
Summary: Apache plugin for Certbot
Home-page: https://github.com/letsencrypt/letsencrypt
Author: Certbot Project
-Author-email: client-...@letsencrypt.org
+Author-email: certbot-...@eff.org
License: Apache License 2.0
Description: UNKNOWN
Platform: UNKNOWN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/certbot_apache/_internal/apacheparser.py
new/certbot-apache-1.15.0/certbot_apache/_internal/apacheparser.py
--- old/certbot-apache-1.14.0/certbot_apache/_internal/apacheparser.py
2021-04-06 19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/certbot_apache/_internal/apacheparser.py
2021-05-04 20:48:08.000000000 +0200
@@ -15,7 +15,7 @@
def __init__(self, **kwargs):
ancestor, dirty, filepath, metadata = util.parsernode_kwargs(kwargs)
# pylint: disable=unused-variable
- super(ApacheParserNode, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.ancestor = ancestor
self.filepath = filepath
self.dirty = dirty
@@ -39,7 +39,7 @@
def __init__(self, **kwargs):
comment, kwargs = util.commentnode_kwargs(kwargs) # pylint:
disable=unused-variable
- super(ApacheCommentNode, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.comment = comment
def __eq__(self, other): # pragma: no cover
@@ -57,7 +57,7 @@
def __init__(self, **kwargs):
name, parameters, enabled, kwargs = util.directivenode_kwargs(kwargs)
- super(ApacheDirectiveNode, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.name = name
self.parameters = parameters
self.enabled = enabled
@@ -83,7 +83,7 @@
""" apacheconfig implementation of BlockNode interface """
def __init__(self, **kwargs):
- super(ApacheBlockNode, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.children: Tuple[ApacheParserNode, ...] = ()
def __eq__(self, other): # pragma: no cover
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/certbot_apache/_internal/augeasparser.py
new/certbot-apache-1.15.0/certbot_apache/_internal/augeasparser.py
--- old/certbot-apache-1.14.0/certbot_apache/_internal/augeasparser.py
2021-04-06 19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/certbot_apache/_internal/augeasparser.py
2021-05-04 20:48:08.000000000 +0200
@@ -80,7 +80,7 @@
def __init__(self, **kwargs):
ancestor, dirty, filepath, metadata = util.parsernode_kwargs(kwargs)
# pylint: disable=unused-variable
- super(AugeasParserNode, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.ancestor = ancestor
self.filepath = filepath
self.dirty = dirty
@@ -169,7 +169,7 @@
def __init__(self, **kwargs):
comment, kwargs = util.commentnode_kwargs(kwargs) # pylint:
disable=unused-variable
- super(AugeasCommentNode, self).__init__(**kwargs)
+ super().__init__(**kwargs)
# self.comment = comment
self.comment = comment
@@ -188,7 +188,7 @@
def __init__(self, **kwargs):
name, parameters, enabled, kwargs = util.directivenode_kwargs(kwargs)
- super(AugeasDirectiveNode, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.name = name
self.enabled = enabled
if parameters:
@@ -245,7 +245,7 @@
""" Augeas implementation of BlockNode interface """
def __init__(self, **kwargs):
- super(AugeasBlockNode, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.children = ()
def __eq__(self, other):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/certbot_apache/_internal/configurator.py
new/certbot-apache-1.15.0/certbot_apache/_internal/configurator.py
--- old/certbot-apache-1.14.0/certbot_apache/_internal/configurator.py
2021-04-06 19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/certbot_apache/_internal/configurator.py
2021-05-04 20:48:08.000000000 +0200
@@ -8,7 +8,6 @@
import re
import socket
import time
-from typing import cast
from typing import DefaultDict
from typing import Dict
from typing import List
@@ -51,6 +50,47 @@
logger = logging.getLogger(__name__)
+class OsOptions:
+ """
+ Dedicated class to describe the OS specificities (eg. paths, binary names)
+ that the Apache configurator needs to be aware to operate properly.
+ """
+ def __init__(self,
+ server_root="/etc/apache2",
+ vhost_root="/etc/apache2/sites-available",
+ vhost_files="*",
+ logs_root="/var/log/apache2",
+ ctl="apache2ctl",
+ version_cmd: Optional[List[str]] = None,
+ restart_cmd: Optional[List[str]] = None,
+ restart_cmd_alt: Optional[List[str]] = None,
+ conftest_cmd: Optional[List[str]] = None,
+ enmod: Optional[str] = None,
+ dismod: Optional[str] = None,
+ le_vhost_ext="-le-ssl.conf",
+ handle_modules=False,
+ handle_sites=False,
+ challenge_location="/etc/apache2",
+ apache_bin: Optional[str] = None,
+ ):
+ self.server_root = server_root
+ self.vhost_root = vhost_root
+ self.vhost_files = vhost_files
+ self.logs_root = logs_root
+ self.ctl = ctl
+ self.version_cmd = ['apache2ctl', '-v'] if not version_cmd else
version_cmd
+ self.restart_cmd = ['apache2ctl', 'graceful'] if not restart_cmd else
restart_cmd
+ self.restart_cmd_alt = restart_cmd_alt
+ self.conftest_cmd = ['apache2ctl', 'configtest'] if not conftest_cmd
else conftest_cmd
+ self.enmod = enmod
+ self.dismod = dismod
+ self.le_vhost_ext = le_vhost_ext
+ self.handle_modules = handle_modules
+ self.handle_sites = handle_sites
+ self.challenge_location = challenge_location
+ self.bin = apache_bin
+
+
# TODO: Augeas sections ie. <VirtualHost>, <IfModule> beginning and closing
# tags need to be the same case, otherwise Augeas doesn't recognize them.
# This is not able to be completely remedied by regular expressions because
@@ -106,27 +146,7 @@
" change depending on the operating system Certbot is run on.)"
)
- OS_DEFAULTS = dict(
- server_root="/etc/apache2",
- vhost_root="/etc/apache2/sites-available",
- vhost_files="*",
- logs_root="/var/log/apache2",
- ctl="apache2ctl",
- version_cmd=['apache2ctl', '-v'],
- restart_cmd=['apache2ctl', 'graceful'],
- conftest_cmd=['apache2ctl', 'configtest'],
- enmod=None,
- dismod=None,
- le_vhost_ext="-le-ssl.conf",
- handle_modules=False,
- handle_sites=False,
- challenge_location="/etc/apache2",
- bin=None
- )
-
- def option(self, key):
- """Get a value from options"""
- return self.options.get(key)
+ OS_DEFAULTS = OsOptions()
def pick_apache_config(self, warn_on_no_mod_ssl=True):
"""
@@ -156,14 +176,14 @@
for o in opts:
# Config options use dashes instead of underscores
if self.conf(o.replace("_", "-")) is not None:
- self.options[o] = self.conf(o.replace("_", "-"))
+ setattr(self.options, o, self.conf(o.replace("_", "-")))
else:
- self.options[o] = self.OS_DEFAULTS[o]
+ setattr(self.options, o, getattr(self.OS_DEFAULTS, o))
# Special cases
- cast(List[str], self.options["version_cmd"])[0] = self.option("ctl")
- cast(List[str], self.options["restart_cmd"])[0] = self.option("ctl")
- cast(List[str], self.options["conftest_cmd"])[0] = self.option("ctl")
+ self.options.version_cmd[0] = self.options.ctl
+ self.options.restart_cmd[0] = self.options.ctl
+ self.options.conftest_cmd[0] = self.options.ctl
@classmethod
def add_parser_arguments(cls, add):
@@ -178,30 +198,30 @@
else:
# cls.OS_DEFAULTS can be distribution specific, see override
classes
DEFAULTS = cls.OS_DEFAULTS
- add("enmod", default=DEFAULTS["enmod"],
+ add("enmod", default=DEFAULTS.enmod,
help="Path to the Apache 'a2enmod' binary")
- add("dismod", default=DEFAULTS["dismod"],
+ add("dismod", default=DEFAULTS.dismod,
help="Path to the Apache 'a2dismod' binary")
- add("le-vhost-ext", default=DEFAULTS["le_vhost_ext"],
+ add("le-vhost-ext", default=DEFAULTS.le_vhost_ext,
help="SSL vhost configuration extension")
- add("server-root", default=DEFAULTS["server_root"],
+ add("server-root", default=DEFAULTS.server_root,
help="Apache server root directory")
add("vhost-root", default=None,
help="Apache server VirtualHost configuration root")
- add("logs-root", default=DEFAULTS["logs_root"],
+ add("logs-root", default=DEFAULTS.logs_root,
help="Apache server logs directory")
add("challenge-location",
- default=DEFAULTS["challenge_location"],
+ default=DEFAULTS.challenge_location,
help="Directory path for challenge configuration")
- add("handle-modules", default=DEFAULTS["handle_modules"],
+ add("handle-modules", default=DEFAULTS.handle_modules,
help="Let installer handle enabling required modules for you " +
"(Only Ubuntu/Debian currently)")
- add("handle-sites", default=DEFAULTS["handle_sites"],
+ add("handle-sites", default=DEFAULTS.handle_sites,
help="Let installer handle enabling sites for you " +
"(Only Ubuntu/Debian currently)")
- add("ctl", default=DEFAULTS["ctl"],
+ add("ctl", default=DEFAULTS.ctl,
help="Full path to Apache control script")
- add("bin", default=DEFAULTS["bin"],
+ add("bin", default=DEFAULTS.bin,
help="Full path to apache2/httpd binary")
def __init__(self, *args, **kwargs):
@@ -214,7 +234,7 @@
version = kwargs.pop("version", None)
use_parsernode = kwargs.pop("use_parsernode", False)
openssl_version = kwargs.pop("openssl_version", None)
- super(ApacheConfigurator, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
# Add name_server association dict
self.assoc: Dict[str, obj.VirtualHost] = {}
@@ -290,8 +310,8 @@
ssl_module_location =
self.parser.standard_path_from_server_root(ssl_module_location)
else:
# Possibility B: ssl_module is statically linked into Apache
- if self.option("bin"):
- ssl_module_location = self.option("bin")
+ if self.options.bin:
+ ssl_module_location = self.options.bin
else:
logger.warning("ssl_module is statically linked but
--apache-bin is "
"missing; not disabling session tickets.")
@@ -321,7 +341,7 @@
self._prepare_options()
# Verify Apache is installed
- self._verify_exe_availability(self.option("ctl"))
+ self._verify_exe_availability(self.options.ctl)
# Make sure configuration is valid
self.config_test()
@@ -361,20 +381,20 @@
# We may try to enable mod_ssl later. If so, we shouldn't warn if we
can't find it now.
# This is currently only true for debian/ubuntu.
- warn_on_no_mod_ssl = not self.option("handle_modules")
+ warn_on_no_mod_ssl = not self.options.handle_modules
self.install_ssl_options_conf(self.mod_ssl_conf,
self.updated_mod_ssl_conf_digest,
warn_on_no_mod_ssl)
# Prevent two Apache plugins from modifying a config at once
try:
- util.lock_dir_until_exit(self.option("server_root"))
+ util.lock_dir_until_exit(self.options.server_root)
except (OSError, errors.LockError):
logger.debug("Encountered error:", exc_info=True)
raise errors.PluginError(
"Unable to create a lock file in {0}. Are you running"
" Certbot with sufficient privileges to modify your"
- " Apache configuration?".format(self.option("server_root")))
+ " Apache configuration?".format(self.options.server_root))
self._prepared = True
def save(self, title=None, temporary=False):
@@ -410,7 +430,7 @@
:raises .errors.PluginError: If unable to recover the configuration
"""
- super(ApacheConfigurator, self).recovery_routine()
+ super().recovery_routine()
# Reload configuration after these changes take effect if needed
# ie. ApacheParser has been initialized.
if hasattr(self, "parser"):
@@ -435,7 +455,7 @@
the function is unable to correctly revert the configuration
"""
- super(ApacheConfigurator, self).rollback_checkpoints(rollback)
+ super().rollback_checkpoints(rollback)
self.parser.aug.load()
def _verify_exe_availability(self, exe):
@@ -449,7 +469,7 @@
"""Initializes the ApacheParser"""
# If user provided vhost_root value in command line, use it
return parser.ApacheParser(
- self.option("server_root"), self.conf("vhost-root"),
+ self.options.server_root, self.conf("vhost-root"),
self.version, configurator=self)
def get_parsernode_root(self, metadata):
@@ -457,9 +477,9 @@
if HAS_APACHECONFIG:
apache_vars = {}
- apache_vars["defines"] =
apache_util.parse_defines(self.option("ctl"))
- apache_vars["includes"] =
apache_util.parse_includes(self.option("ctl"))
- apache_vars["modules"] =
apache_util.parse_modules(self.option("ctl"))
+ apache_vars["defines"] =
apache_util.parse_defines(self.options.ctl)
+ apache_vars["includes"] =
apache_util.parse_includes(self.options.ctl)
+ apache_vars["modules"] =
apache_util.parse_modules(self.options.ctl)
metadata["apache_vars"] = apache_vars
with open(self.parser.loc["root"]) as f:
@@ -1311,7 +1331,7 @@
:param boolean temp: If the change is temporary
"""
- if self.option("handle_modules"):
+ if self.options.handle_modules:
if self.version >= (2, 4) and ("socache_shmcb_module" not in
self.parser.modules):
self.enable_mod("socache_shmcb", temp=temp)
@@ -1331,7 +1351,7 @@
Duplicates vhost and adds default ssl options
New vhost will reside as (nonssl_vhost.path) +
- ``self.option("le_vhost_ext")``
+ ``self.options.le_vhost_ext``
.. note:: This function saves the configuration
@@ -1430,15 +1450,15 @@
"""
if self.conf("vhost-root") and os.path.exists(self.conf("vhost-root")):
- fp = os.path.join(filesystem.realpath(self.option("vhost_root")),
+ fp = os.path.join(filesystem.realpath(self.options.vhost_root),
os.path.basename(non_ssl_vh_fp))
else:
# Use non-ssl filepath
fp = filesystem.realpath(non_ssl_vh_fp)
if fp.endswith(".conf"):
- return fp[:-(len(".conf"))] + self.option("le_vhost_ext")
- return fp + self.option("le_vhost_ext")
+ return fp[:-(len(".conf"))] + self.options.le_vhost_ext
+ return fp + self.options.le_vhost_ext
def _sift_rewrite_rule(self, line):
"""Decides whether a line should be copied to a SSL vhost.
@@ -2282,7 +2302,7 @@
addr in self._get_proposed_addrs(ssl_vhost)),
servername, serveralias,
" ".join(rewrite_rule_args),
- self.option("logs_root")))
+ self.options.logs_root))
def _write_out_redirect(self, ssl_vhost, text):
# This is the default name
@@ -2294,7 +2314,7 @@
if len(ssl_vhost.name) < (255 - (len(redirect_filename) + 1)):
redirect_filename = "le-redirect-%s.conf" % ssl_vhost.name
- redirect_filepath = os.path.join(self.option("vhost_root"),
+ redirect_filepath = os.path.join(self.options.vhost_root,
redirect_filename)
# Register the new file that will be created
@@ -2414,19 +2434,18 @@
"""
try:
- util.run_script(self.option("restart_cmd"))
+ util.run_script(self.options.restart_cmd)
except errors.SubprocessError as err:
logger.info("Unable to restart apache using %s",
- self.option("restart_cmd"))
- alt_restart = self.option("restart_cmd_alt")
+ self.options.restart_cmd)
+ alt_restart = self.options.restart_cmd_alt
if alt_restart:
logger.debug("Trying alternative restart command: %s",
alt_restart)
# There is an alternative restart command available
# This usually is "restart" verb while original is "graceful"
try:
- util.run_script(self.option(
- "restart_cmd_alt"))
+ util.run_script(self.options.restart_cmd_alt)
return
except errors.SubprocessError as secerr:
error = str(secerr)
@@ -2441,7 +2460,7 @@
"""
try:
- util.run_script(self.option("conftest_cmd"))
+ util.run_script(self.options.conftest_cmd)
except errors.SubprocessError as err:
raise errors.MisconfigurationError(str(err))
@@ -2457,11 +2476,11 @@
"""
try:
- stdout, _ = util.run_script(self.option("version_cmd"))
+ stdout, _ = util.run_script(self.options.version_cmd)
except errors.SubprocessError:
raise errors.PluginError(
"Unable to run %s -v" %
- self.option("version_cmd"))
+ self.options.version_cmd)
regex = re.compile(r"Apache/([0-9\.]*)", re.IGNORECASE)
matches = regex.findall(stdout)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/certbot_apache/_internal/http_01.py
new/certbot-apache-1.15.0/certbot_apache/_internal/http_01.py
--- old/certbot-apache-1.14.0/certbot_apache/_internal/http_01.py
2021-04-06 19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/certbot_apache/_internal/http_01.py
2021-05-04 20:48:08.000000000 +0200
@@ -47,7 +47,7 @@
"""
def __init__(self, *args, **kwargs):
- super(ApacheHttp01, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
self.challenge_conf_pre = os.path.join(
self.configurator.conf("challenge-location"),
"le_http_01_challenge_pre.conf")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/certbot_apache/_internal/interfaces.py
new/certbot-apache-1.15.0/certbot_apache/_internal/interfaces.py
--- old/certbot-apache-1.14.0/certbot_apache/_internal/interfaces.py
2021-04-06 19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/certbot_apache/_internal/interfaces.py
2021-05-04 20:48:08.000000000 +0200
@@ -238,7 +238,7 @@
created or changed after the last save. Default: False.
:type dirty: bool
"""
- super(CommentNode, self).__init__(ancestor=kwargs['ancestor'],
+ super().__init__(ancestor=kwargs['ancestor'],
dirty=kwargs.get('dirty', False),
filepath=kwargs['filepath'],
metadata=kwargs.get('metadata', {}))
# pragma: no cover
@@ -302,7 +302,7 @@
:type enabled: bool
"""
- super(DirectiveNode, self).__init__(ancestor=kwargs['ancestor'],
+ super().__init__(ancestor=kwargs['ancestor'],
dirty=kwargs.get('dirty', False),
filepath=kwargs['filepath'],
metadata=kwargs.get('metadata',
{})) # pragma: no cover
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/certbot_apache/_internal/obj.py
new/certbot-apache-1.15.0/certbot_apache/_internal/obj.py
--- old/certbot-apache-1.14.0/certbot_apache/_internal/obj.py 2021-04-06
19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/certbot_apache/_internal/obj.py 2021-05-04
20:48:08.000000000 +0200
@@ -26,7 +26,7 @@
def __hash__(self): # pylint: disable=useless-super-delegation
# Python 3 requires explicit overridden for __hash__ if __eq__ or
# __cmp__ is overridden. See https://bugs.python.org/issue2235
- return super(Addr, self).__hash__()
+ return super().__hash__()
def _addr_less_specific(self, addr):
"""Returns if addr.get_addr() is more specific than self.get_addr()."""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/certbot_apache/_internal/override_arch.py
new/certbot-apache-1.15.0/certbot_apache/_internal/override_arch.py
--- old/certbot-apache-1.14.0/certbot_apache/_internal/override_arch.py
2021-04-06 19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/certbot_apache/_internal/override_arch.py
2021-05-04 20:48:08.000000000 +0200
@@ -3,13 +3,14 @@
from certbot import interfaces
from certbot_apache._internal import configurator
+from certbot_apache._internal.configurator import OsOptions
@zope.interface.provider(interfaces.IPluginFactory)
class ArchConfigurator(configurator.ApacheConfigurator):
"""Arch Linux specific ApacheConfigurator override class"""
- OS_DEFAULTS = dict(
+ OS_DEFAULTS = OsOptions(
server_root="/etc/httpd",
vhost_root="/etc/httpd/conf",
vhost_files="*.conf",
@@ -18,11 +19,5 @@
version_cmd=['apachectl', '-v'],
restart_cmd=['apachectl', 'graceful'],
conftest_cmd=['apachectl', 'configtest'],
- enmod=None,
- dismod=None,
- le_vhost_ext="-le-ssl.conf",
- handle_modules=False,
- handle_sites=False,
challenge_location="/etc/httpd/conf",
- bin=None,
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/certbot_apache/_internal/override_centos.py
new/certbot-apache-1.15.0/certbot_apache/_internal/override_centos.py
--- old/certbot-apache-1.14.0/certbot_apache/_internal/override_centos.py
2021-04-06 19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/certbot_apache/_internal/override_centos.py
2021-05-04 20:48:08.000000000 +0200
@@ -12,6 +12,7 @@
from certbot_apache._internal import apache_util
from certbot_apache._internal import configurator
from certbot_apache._internal import parser
+from certbot_apache._internal.configurator import OsOptions
logger = logging.getLogger(__name__)
@@ -20,7 +21,7 @@
class CentOSConfigurator(configurator.ApacheConfigurator):
"""CentOS specific ApacheConfigurator override class"""
- OS_DEFAULTS = dict(
+ OS_DEFAULTS = OsOptions(
server_root="/etc/httpd",
vhost_root="/etc/httpd/conf.d",
vhost_files="*.conf",
@@ -30,13 +31,7 @@
restart_cmd=['apachectl', 'graceful'],
restart_cmd_alt=['apachectl', 'restart'],
conftest_cmd=['apachectl', 'configtest'],
- enmod=None,
- dismod=None,
- le_vhost_ext="-le-ssl.conf",
- handle_modules=False,
- handle_sites=False,
challenge_location="/etc/httpd/conf.d",
- bin=None,
)
def config_test(self):
@@ -51,7 +46,7 @@
fedora = os_info[0].lower() == "fedora"
try:
- super(CentOSConfigurator, self).config_test()
+ super().config_test()
except errors.MisconfigurationError:
if fedora:
self._try_restart_fedora()
@@ -69,20 +64,22 @@
raise errors.MisconfigurationError(str(err))
# Finish with actual config check to see if systemctl restart helped
- super(CentOSConfigurator, self).config_test()
+ super().config_test()
def _prepare_options(self):
"""
Override the options dictionary initialization in order to support
alternative restart cmd used in CentOS.
"""
- super(CentOSConfigurator, self)._prepare_options()
- cast(List[str], self.options["restart_cmd_alt"])[0] =
self.option("ctl")
+ super()._prepare_options()
+ if not self.options.restart_cmd_alt: # pragma: no cover
+ raise ValueError("OS option restart_cmd_alt must be set for
CentOS.")
+ self.options.restart_cmd_alt[0] = self.options.ctl
def get_parser(self):
"""Initializes the ApacheParser"""
return CentOSParser(
- self.option("server_root"), self.option("vhost_root"),
+ self.options.server_root, self.options.vhost_root,
self.version, configurator=self)
def _deploy_cert(self, *args, **kwargs): # pylint:
disable=arguments-differ
@@ -91,7 +88,7 @@
has "LoadModule ssl_module..." before parsing the VirtualHost
configuration
that was created by Certbot
"""
- super(CentOSConfigurator, self)._deploy_cert(*args, **kwargs)
+ super()._deploy_cert(*args, **kwargs)
if self.version < (2, 4, 0):
self._deploy_loadmodule_ssl_if_needed()
@@ -169,12 +166,12 @@
def __init__(self, *args, **kwargs):
# CentOS specific configuration file for Apache
self.sysconfig_filep = "/etc/sysconfig/httpd"
- super(CentOSParser, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
def update_runtime_variables(self):
""" Override for update_runtime_variables for custom parsing """
# Opportunistic, works if SELinux not enforced
- super(CentOSParser, self).update_runtime_variables()
+ super().update_runtime_variables()
self.parse_sysconfig_var()
def parse_sysconfig_var(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/certbot_apache/_internal/override_darwin.py
new/certbot-apache-1.15.0/certbot_apache/_internal/override_darwin.py
--- old/certbot-apache-1.14.0/certbot_apache/_internal/override_darwin.py
2021-04-06 19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/certbot_apache/_internal/override_darwin.py
2021-05-04 20:48:08.000000000 +0200
@@ -3,26 +3,19 @@
from certbot import interfaces
from certbot_apache._internal import configurator
+from certbot_apache._internal.configurator import OsOptions
@zope.interface.provider(interfaces.IPluginFactory)
class DarwinConfigurator(configurator.ApacheConfigurator):
"""macOS specific ApacheConfigurator override class"""
- OS_DEFAULTS = dict(
- server_root="/etc/apache2",
+ OS_DEFAULTS = OsOptions(
vhost_root="/etc/apache2/other",
vhost_files="*.conf",
- logs_root="/var/log/apache2",
ctl="apachectl",
version_cmd=['apachectl', '-v'],
restart_cmd=['apachectl', 'graceful'],
conftest_cmd=['apachectl', 'configtest'],
- enmod=None,
- dismod=None,
- le_vhost_ext="-le-ssl.conf",
- handle_modules=False,
- handle_sites=False,
challenge_location="/etc/apache2/other",
- bin=None,
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/certbot_apache/_internal/override_debian.py
new/certbot-apache-1.15.0/certbot_apache/_internal/override_debian.py
--- old/certbot-apache-1.14.0/certbot_apache/_internal/override_debian.py
2021-04-06 19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/certbot_apache/_internal/override_debian.py
2021-05-04 20:48:08.000000000 +0200
@@ -10,6 +10,7 @@
from certbot.compat import os
from certbot_apache._internal import apache_util
from certbot_apache._internal import configurator
+from certbot_apache._internal.configurator import OsOptions
logger = logging.getLogger(__name__)
@@ -18,22 +19,11 @@
class DebianConfigurator(configurator.ApacheConfigurator):
"""Debian specific ApacheConfigurator override class"""
- OS_DEFAULTS = dict(
- server_root="/etc/apache2",
- vhost_root="/etc/apache2/sites-available",
- vhost_files="*",
- logs_root="/var/log/apache2",
- ctl="apache2ctl",
- version_cmd=['apache2ctl', '-v'],
- restart_cmd=['apache2ctl', 'graceful'],
- conftest_cmd=['apache2ctl', 'configtest'],
+ OS_DEFAULTS = OsOptions(
enmod="a2enmod",
dismod="a2dismod",
- le_vhost_ext="-le-ssl.conf",
handle_modules=True,
handle_sites=True,
- challenge_location="/etc/apache2",
- bin=None,
)
def enable_site(self, vhost):
@@ -58,7 +48,7 @@
if not os.path.isdir(os.path.dirname(enabled_path)):
# For some reason, sites-enabled / sites-available do not exist
# Call the parent method
- return super(DebianConfigurator, self).enable_site(vhost)
+ return super().enable_site(vhost)
self.reverter.register_file_creation(False, enabled_path)
try:
os.symlink(vhost.filep, enabled_path)
@@ -132,11 +122,11 @@
# Generate reversal command.
# Try to be safe here... check that we can probably reverse before
# applying enmod command
- if not util.exe_exists(self.option("dismod")):
+ if not util.exe_exists(self.options.dismod):
raise errors.MisconfigurationError(
"Unable to find a2dismod, please make sure a2enmod and "
"a2dismod are configured correctly for certbot.")
self.reverter.register_undo_command(
- temp, [self.option("dismod"), "-f", mod_name])
- util.run_script([self.option("enmod"), mod_name])
+ temp, [self.options.dismod, "-f", mod_name])
+ util.run_script([self.options.enmod, mod_name])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/certbot_apache/_internal/override_fedora.py
new/certbot-apache-1.15.0/certbot_apache/_internal/override_fedora.py
--- old/certbot-apache-1.14.0/certbot_apache/_internal/override_fedora.py
2021-04-06 19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/certbot_apache/_internal/override_fedora.py
2021-05-04 20:48:08.000000000 +0200
@@ -1,7 +1,4 @@
""" Distribution specific override class for Fedora 29+ """
-from typing import cast
-from typing import List
-
import zope.interface
from certbot import errors
@@ -10,13 +7,14 @@
from certbot_apache._internal import apache_util
from certbot_apache._internal import configurator
from certbot_apache._internal import parser
+from certbot_apache._internal.configurator import OsOptions
@zope.interface.provider(interfaces.IPluginFactory)
class FedoraConfigurator(configurator.ApacheConfigurator):
"""Fedora 29+ specific ApacheConfigurator override class"""
- OS_DEFAULTS = dict(
+ OS_DEFAULTS = OsOptions(
server_root="/etc/httpd",
vhost_root="/etc/httpd/conf.d",
vhost_files="*.conf",
@@ -26,13 +24,7 @@
restart_cmd=['apachectl', 'graceful'],
restart_cmd_alt=['apachectl', 'restart'],
conftest_cmd=['apachectl', 'configtest'],
- enmod=None,
- dismod=None,
- le_vhost_ext="-le-ssl.conf",
- handle_modules=False,
- handle_sites=False,
challenge_location="/etc/httpd/conf.d",
- bin=None,
)
def config_test(self):
@@ -43,14 +35,14 @@
during the first (re)start of httpd.
"""
try:
- super(FedoraConfigurator, self).config_test()
+ super().config_test()
except errors.MisconfigurationError:
self._try_restart_fedora()
def get_parser(self):
"""Initializes the ApacheParser"""
return FedoraParser(
- self.option("server_root"), self.option("vhost_root"),
+ self.options.server_root, self.options.vhost_root,
self.version, configurator=self)
def _try_restart_fedora(self):
@@ -63,7 +55,7 @@
raise errors.MisconfigurationError(str(err))
# Finish with actual config check to see if systemctl restart helped
- super(FedoraConfigurator, self).config_test()
+ super().config_test()
def _prepare_options(self):
"""
@@ -71,10 +63,12 @@
instead of httpd and so take advantages of this new bash script in
newer versions
of Fedora to restart httpd.
"""
- super(FedoraConfigurator, self)._prepare_options()
- cast(List[str], self.options["restart_cmd"])[0] = 'apachectl'
- cast(List[str], self.options["restart_cmd_alt"])[0] = 'apachectl'
- cast(List[str], self.options["conftest_cmd"])[0] = 'apachectl'
+ super()._prepare_options()
+ self.options.restart_cmd[0] = 'apachectl'
+ if not self.options.restart_cmd_alt: # pragma: no cover
+ raise ValueError("OS option restart_cmd_alt must be set for
Fedora.")
+ self.options.restart_cmd_alt[0] = 'apachectl'
+ self.options.conftest_cmd[0] = 'apachectl'
class FedoraParser(parser.ApacheParser):
@@ -82,12 +76,12 @@
def __init__(self, *args, **kwargs):
# Fedora 29+ specific configuration file for Apache
self.sysconfig_filep = "/etc/sysconfig/httpd"
- super(FedoraParser, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
def update_runtime_variables(self):
""" Override for update_runtime_variables for custom parsing """
# Opportunistic, works if SELinux not enforced
- super(FedoraParser, self).update_runtime_variables()
+ super().update_runtime_variables()
self._parse_sysconfig_var()
def _parse_sysconfig_var(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/certbot_apache/_internal/override_gentoo.py
new/certbot-apache-1.15.0/certbot_apache/_internal/override_gentoo.py
--- old/certbot-apache-1.14.0/certbot_apache/_internal/override_gentoo.py
2021-04-06 19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/certbot_apache/_internal/override_gentoo.py
2021-05-04 20:48:08.000000000 +0200
@@ -1,36 +1,23 @@
""" Distribution specific override class for Gentoo Linux """
-from typing import cast
-from typing import List
-
import zope.interface
from certbot import interfaces
from certbot_apache._internal import apache_util
from certbot_apache._internal import configurator
from certbot_apache._internal import parser
+from certbot_apache._internal.configurator import OsOptions
@zope.interface.provider(interfaces.IPluginFactory)
class GentooConfigurator(configurator.ApacheConfigurator):
"""Gentoo specific ApacheConfigurator override class"""
- OS_DEFAULTS = dict(
+ OS_DEFAULTS = OsOptions(
server_root="/etc/apache2",
vhost_root="/etc/apache2/vhosts.d",
vhost_files="*.conf",
- logs_root="/var/log/apache2",
- ctl="apache2ctl",
- version_cmd=['apache2ctl', '-v'],
- restart_cmd=['apache2ctl', 'graceful'],
restart_cmd_alt=['apache2ctl', 'restart'],
- conftest_cmd=['apache2ctl', 'configtest'],
- enmod=None,
- dismod=None,
- le_vhost_ext="-le-ssl.conf",
- handle_modules=False,
- handle_sites=False,
challenge_location="/etc/apache2/vhosts.d",
- bin=None,
)
def _prepare_options(self):
@@ -38,13 +25,15 @@
Override the options dictionary initialization in order to support
alternative restart cmd used in Gentoo.
"""
- super(GentooConfigurator, self)._prepare_options()
- cast(List[str], self.options["restart_cmd_alt"])[0] =
self.option("ctl")
+ super()._prepare_options()
+ if not self.options.restart_cmd_alt: # pragma: no cover
+ raise ValueError("OS option restart_cmd_alt must be set for
Gentoo.")
+ self.options.restart_cmd_alt[0] = self.options.ctl
def get_parser(self):
"""Initializes the ApacheParser"""
return GentooParser(
- self.option("server_root"), self.option("vhost_root"),
+ self.options.server_root, self.options.vhost_root,
self.version, configurator=self)
@@ -53,7 +42,7 @@
def __init__(self, *args, **kwargs):
# Gentoo specific configuration file for Apache2
self.apacheconfig_filep = "/etc/conf.d/apache2"
- super(GentooParser, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
def update_runtime_variables(self):
""" Override for update_runtime_variables for custom parsing """
@@ -69,7 +58,7 @@
def update_modules(self):
"""Get loaded modules from httpd process, and add them to DOM"""
- mod_cmd = [self.configurator.option("ctl"), "modules"]
+ mod_cmd = [self.configurator.options.ctl, "modules"]
matches = apache_util.parse_from_subprocess(mod_cmd, r"(.*)_module")
for mod in matches:
self.add_mod(mod.strip())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/certbot_apache/_internal/override_suse.py
new/certbot-apache-1.15.0/certbot_apache/_internal/override_suse.py
--- old/certbot-apache-1.14.0/certbot_apache/_internal/override_suse.py
2021-04-06 19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/certbot_apache/_internal/override_suse.py
2021-05-04 20:48:08.000000000 +0200
@@ -3,26 +3,21 @@
from certbot import interfaces
from certbot_apache._internal import configurator
+from certbot_apache._internal.configurator import OsOptions
@zope.interface.provider(interfaces.IPluginFactory)
class OpenSUSEConfigurator(configurator.ApacheConfigurator):
"""OpenSUSE specific ApacheConfigurator override class"""
- OS_DEFAULTS = dict(
- server_root="/etc/apache2",
+ OS_DEFAULTS = OsOptions(
vhost_root="/etc/apache2/vhosts.d",
vhost_files="*.conf",
- logs_root="/var/log/apache2",
ctl="apachectl",
version_cmd=['apachectl', '-v'],
restart_cmd=['apachectl', 'graceful'],
conftest_cmd=['apachectl', 'configtest'],
enmod="a2enmod",
dismod="a2dismod",
- le_vhost_ext="-le-ssl.conf",
- handle_modules=False,
- handle_sites=False,
challenge_location="/etc/apache2/vhosts.d",
- bin=None,
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/certbot_apache/_internal/parser.py
new/certbot-apache-1.15.0/certbot_apache/_internal/parser.py
--- old/certbot-apache-1.14.0/certbot_apache/_internal/parser.py
2021-04-06 19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/certbot_apache/_internal/parser.py
2021-05-04 20:48:08.000000000 +0200
@@ -81,7 +81,7 @@
# Must also attempt to parse additional virtual host root
if vhostroot:
self.parse_file(os.path.abspath(vhostroot) + "/" +
- self.configurator.option("vhost_files"))
+ self.configurator.options.vhost_files)
# check to see if there were unparsed define statements
if version < (2, 4):
@@ -282,7 +282,7 @@
def update_defines(self):
"""Updates the dictionary of known variables in the configuration"""
- self.variables =
apache_util.parse_defines(self.configurator.option("ctl"))
+ self.variables =
apache_util.parse_defines(self.configurator.options.ctl)
def update_includes(self):
"""Get includes from httpd process, and add them to DOM if needed"""
@@ -292,7 +292,7 @@
# configuration files
_ = self.find_dir("Include")
- matches = apache_util.parse_includes(self.configurator.option("ctl"))
+ matches = apache_util.parse_includes(self.configurator.options.ctl)
if matches:
for i in matches:
if not self.parsed_in_current(i):
@@ -301,7 +301,7 @@
def update_modules(self):
"""Get loaded modules from httpd process, and add them to DOM"""
- matches = apache_util.parse_modules(self.configurator.option("ctl"))
+ matches = apache_util.parse_modules(self.configurator.options.ctl)
for mod in matches:
self.add_mod(mod.strip())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/certbot_apache.egg-info/PKG-INFO
new/certbot-apache-1.15.0/certbot_apache.egg-info/PKG-INFO
--- old/certbot-apache-1.14.0/certbot_apache.egg-info/PKG-INFO 2021-04-06
19:17:11.000000000 +0200
+++ new/certbot-apache-1.15.0/certbot_apache.egg-info/PKG-INFO 2021-05-04
20:48:45.000000000 +0200
@@ -1,10 +1,10 @@
Metadata-Version: 2.1
Name: certbot-apache
-Version: 1.14.0
+Version: 1.15.0
Summary: Apache plugin for Certbot
Home-page: https://github.com/letsencrypt/letsencrypt
Author: Certbot Project
-Author-email: client-...@letsencrypt.org
+Author-email: certbot-...@eff.org
License: Apache License 2.0
Description: UNKNOWN
Platform: UNKNOWN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.14.0/setup.py
new/certbot-apache-1.15.0/setup.py
--- old/certbot-apache-1.14.0/setup.py 2021-04-06 19:17:02.000000000 +0200
+++ new/certbot-apache-1.15.0/setup.py 2021-05-04 20:48:10.000000000 +0200
@@ -1,7 +1,7 @@
from setuptools import find_packages
from setuptools import setup
-version = '1.14.0'
+version = '1.15.0'
# Remember to update local-oldest-requirements.txt when changing the minimum
# acme/certbot version.
@@ -24,7 +24,7 @@
description="Apache plugin for Certbot",
url='https://github.com/letsencrypt/letsencrypt',
author="Certbot Project",
- author_email='client-...@letsencrypt.org',
+ author_email='certbot-...@eff.org',
license='Apache License 2.0',
python_requires='>=3.6',
classifiers=[
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.14.0/tests/augeasnode_test.py
new/certbot-apache-1.15.0/tests/augeasnode_test.py
--- old/certbot-apache-1.14.0/tests/augeasnode_test.py 2021-04-06
19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/tests/augeasnode_test.py 2021-05-04
20:48:08.000000000 +0200
@@ -29,7 +29,7 @@
"""Test AugeasParserNode using available test configurations"""
def setUp(self): # pylint: disable=arguments-differ
- super(AugeasParserNodeTest, self).setUp()
+ super().setUp()
with
mock.patch("certbot_apache._internal.configurator.ApacheConfigurator.get_parsernode_root")
as mock_parsernode:
mock_parsernode.side_effect = _get_augeasnode_mock(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.14.0/tests/autohsts_test.py
new/certbot-apache-1.15.0/tests/autohsts_test.py
--- old/certbot-apache-1.14.0/tests/autohsts_test.py 2021-04-06
19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/tests/autohsts_test.py 2021-05-04
20:48:08.000000000 +0200
@@ -18,7 +18,7 @@
# pylint: disable=protected-access
def setUp(self): # pylint: disable=arguments-differ
- super(AutoHSTSTest, self).setUp()
+ super().setUp()
self.config = util.get_apache_configurator(
self.config_path, self.vhost_path, self.config_dir, self.work_dir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.14.0/tests/centos6_test.py
new/certbot-apache-1.15.0/tests/centos6_test.py
--- old/certbot-apache-1.14.0/tests/centos6_test.py 2021-04-06
19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/tests/centos6_test.py 2021-05-04
20:48:08.000000000 +0200
@@ -36,9 +36,9 @@
test_dir = "centos6_apache/apache"
config_root = "centos6_apache/apache/httpd"
vhost_root = "centos6_apache/apache/httpd/conf.d"
- super(CentOS6Tests, self).setUp(test_dir=test_dir,
- config_root=config_root,
- vhost_root=vhost_root)
+ super().setUp(test_dir=test_dir,
+ config_root=config_root,
+ vhost_root=vhost_root)
self.config = util.get_apache_configurator(
self.config_path, self.vhost_path, self.config_dir, self.work_dir,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.14.0/tests/centos_test.py
new/certbot-apache-1.15.0/tests/centos_test.py
--- old/certbot-apache-1.14.0/tests/centos_test.py 2021-04-06
19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/tests/centos_test.py 2021-05-04
20:48:08.000000000 +0200
@@ -41,9 +41,9 @@
test_dir = "centos7_apache/apache"
config_root = "centos7_apache/apache/httpd"
vhost_root = "centos7_apache/apache/httpd/conf.d"
- super(FedoraRestartTest, self).setUp(test_dir=test_dir,
- config_root=config_root,
- vhost_root=vhost_root)
+ super().setUp(test_dir=test_dir,
+ config_root=config_root,
+ vhost_root=vhost_root)
self.config = util.get_apache_configurator(
self.config_path, self.vhost_path, self.config_dir, self.work_dir,
os_info="fedora_old")
@@ -96,9 +96,9 @@
test_dir = "centos7_apache/apache"
config_root = "centos7_apache/apache/httpd"
vhost_root = "centos7_apache/apache/httpd/conf.d"
- super(MultipleVhostsTestCentOS, self).setUp(test_dir=test_dir,
- config_root=config_root,
- vhost_root=vhost_root)
+ super().setUp(test_dir=test_dir,
+ config_root=config_root,
+ vhost_root=vhost_root)
self.config = util.get_apache_configurator(
self.config_path, self.vhost_path, self.config_dir, self.work_dir,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.14.0/tests/complex_parsing_test.py
new/certbot-apache-1.15.0/tests/complex_parsing_test.py
--- old/certbot-apache-1.14.0/tests/complex_parsing_test.py 2021-04-06
19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/tests/complex_parsing_test.py 2021-05-04
20:48:08.000000000 +0200
@@ -11,7 +11,7 @@
"""Apache Parser Test."""
def setUp(self): # pylint: disable=arguments-differ
- super(ComplexParserTest, self).setUp(
+ super().setUp(
"complex_parsing", "complex_parsing")
self.setup_variables()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/tests/configurator_reverter_test.py
new/certbot-apache-1.15.0/tests/configurator_reverter_test.py
--- old/certbot-apache-1.14.0/tests/configurator_reverter_test.py
2021-04-06 19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/tests/configurator_reverter_test.py
2021-05-04 20:48:08.000000000 +0200
@@ -16,7 +16,7 @@
def setUp(self): # pylint: disable=arguments-differ
- super(ConfiguratorReverterTest, self).setUp()
+ super().setUp()
self.config = util.get_apache_configurator(
self.config_path, self.vhost_path, self.config_dir, self.work_dir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.14.0/tests/configurator_test.py
new/certbot-apache-1.15.0/tests/configurator_test.py
--- old/certbot-apache-1.14.0/tests/configurator_test.py 2021-04-06
19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/tests/configurator_test.py 2021-05-04
20:48:08.000000000 +0200
@@ -30,7 +30,7 @@
"""Test two standard well-configured HTTP vhosts."""
def setUp(self): # pylint: disable=arguments-differ
- super(MultipleVhostsTest, self).setUp()
+ super().setUp()
self.config = util.get_apache_configurator(
self.config_path, self.vhost_path, self.config_dir, self.work_dir)
@@ -103,9 +103,9 @@
"handle_modules", "handle_sites", "ctl"]
exp = {}
- for k in ApacheConfigurator.OS_DEFAULTS:
+ for k in ApacheConfigurator.OS_DEFAULTS.__dict__.keys():
if k in parserargs:
- exp[k.replace("_", "-")] = ApacheConfigurator.OS_DEFAULTS[k]
+ exp[k.replace("_", "-")] =
getattr(ApacheConfigurator.OS_DEFAULTS, k)
# Special cases
exp["vhost-root"] = None
@@ -128,14 +128,13 @@
def test_all_configurators_defaults_defined(self):
from certbot_apache._internal.entrypoint import OVERRIDE_CLASSES
from certbot_apache._internal.configurator import ApacheConfigurator
- parameters = set(ApacheConfigurator.OS_DEFAULTS.keys())
+ parameters = set(ApacheConfigurator.OS_DEFAULTS.__dict__.keys())
for cls in OVERRIDE_CLASSES.values():
- self.assertTrue(parameters.issubset(set(cls.OS_DEFAULTS.keys())))
+
self.assertTrue(parameters.issubset(set(cls.OS_DEFAULTS.__dict__.keys())))
def test_constant(self):
self.assertTrue("debian_apache_2_4/multiple_vhosts/apache" in
- self.config.option("server_root"))
- self.assertEqual(self.config.option("nonexistent"), None)
+ self.config.options.server_root)
@certbot_util.patch_get_utility()
def test_get_all_names(self, mock_getutility):
@@ -1477,9 +1476,9 @@
td = "debian_apache_2_4/augeas_vhosts"
cr = "debian_apache_2_4/augeas_vhosts/apache2"
vr = "debian_apache_2_4/augeas_vhosts/apache2/sites-available"
- super(AugeasVhostsTest, self).setUp(test_dir=td,
- config_root=cr,
- vhost_root=vr)
+ super().setUp(test_dir=td,
+ config_root=cr,
+ vhost_root=vr)
self.config = util.get_apache_configurator(
self.config_path, self.vhost_path, self.config_dir,
@@ -1556,9 +1555,9 @@
td = "debian_apache_2_4/multi_vhosts"
cr = "debian_apache_2_4/multi_vhosts/apache2"
vr = "debian_apache_2_4/multi_vhosts/apache2/sites-available"
- super(MultiVhostsTest, self).setUp(test_dir=td,
- config_root=cr,
- vhost_root=vr)
+ super().setUp(test_dir=td,
+ config_root=cr,
+ vhost_root=vr)
self.config = util.get_apache_configurator(
self.config_path, self.vhost_path,
@@ -1661,7 +1660,7 @@
"""Test that the options-ssl-nginx.conf file is installed and updated
properly."""
def setUp(self): # pylint: disable=arguments-differ
- super(InstallSslOptionsConfTest, self).setUp()
+ super().setUp()
self.config = util.get_apache_configurator(
self.config_path, self.vhost_path, self.config_dir, self.work_dir)
@@ -1774,7 +1773,7 @@
# ssl_module statically linked
self.config._openssl_version = None
self.config.parser.modules['ssl_module'] = None
- self.config.options['bin'] = '/fake/path/to/httpd'
+ self.config.options.bin = '/fake/path/to/httpd'
with mock.patch("certbot_apache._internal.configurator."
"ApacheConfigurator._open_module_file") as mock_omf:
mock_omf.return_value = some_string_contents
@@ -1810,7 +1809,7 @@
# When ssl_module is statically linked but --apache-bin not provided
self.config._openssl_version = None
- self.config.options['bin'] = None
+ self.config.options.bin = None
self.config.parser.modules['ssl_module'] = None
with
mock.patch("certbot_apache._internal.configurator.logger.warning") as mock_log:
self.assertEqual(self.config.openssl_version(), None)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.14.0/tests/debian_test.py
new/certbot-apache-1.15.0/tests/debian_test.py
--- old/certbot-apache-1.14.0/tests/debian_test.py 2021-04-06
19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/tests/debian_test.py 2021-05-04
20:48:08.000000000 +0200
@@ -20,7 +20,7 @@
_multiprocess_can_split_ = True
def setUp(self): # pylint: disable=arguments-differ
- super(MultipleVhostsTestDebian, self).setUp()
+ super().setUp()
self.config = util.get_apache_configurator(
self.config_path, self.vhost_path, self.config_dir, self.work_dir,
os_info="debian")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.14.0/tests/fedora_test.py
new/certbot-apache-1.15.0/tests/fedora_test.py
--- old/certbot-apache-1.14.0/tests/fedora_test.py 2021-04-06
19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/tests/fedora_test.py 2021-05-04
20:48:08.000000000 +0200
@@ -46,9 +46,9 @@
test_dir = "centos7_apache/apache"
config_root = "centos7_apache/apache/httpd"
vhost_root = "centos7_apache/apache/httpd/conf.d"
- super(FedoraRestartTest, self).setUp(test_dir=test_dir,
- config_root=config_root,
- vhost_root=vhost_root)
+ super().setUp(test_dir=test_dir,
+ config_root=config_root,
+ vhost_root=vhost_root)
self.config = util.get_apache_configurator(
self.config_path, self.vhost_path, self.config_dir, self.work_dir,
os_info="fedora")
@@ -90,9 +90,9 @@
test_dir = "centos7_apache/apache"
config_root = "centos7_apache/apache/httpd"
vhost_root = "centos7_apache/apache/httpd/conf.d"
- super(MultipleVhostsTestFedora, self).setUp(test_dir=test_dir,
- config_root=config_root,
- vhost_root=vhost_root)
+ super().setUp(test_dir=test_dir,
+ config_root=config_root,
+ vhost_root=vhost_root)
self.config = util.get_apache_configurator(
self.config_path, self.vhost_path, self.config_dir, self.work_dir,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.14.0/tests/gentoo_test.py
new/certbot-apache-1.15.0/tests/gentoo_test.py
--- old/certbot-apache-1.14.0/tests/gentoo_test.py 2021-04-06
19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/tests/gentoo_test.py 2021-05-04
20:48:08.000000000 +0200
@@ -50,9 +50,9 @@
test_dir = "gentoo_apache/apache"
config_root = "gentoo_apache/apache/apache2"
vhost_root = "gentoo_apache/apache/apache2/vhosts.d"
- super(MultipleVhostsTestGentoo, self).setUp(test_dir=test_dir,
- config_root=config_root,
- vhost_root=vhost_root)
+ super().setUp(test_dir=test_dir,
+ config_root=config_root,
+ vhost_root=vhost_root)
# pylint: disable=line-too-long
with
mock.patch("certbot_apache._internal.override_gentoo.GentooParser.update_runtime_variables"):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.14.0/tests/http_01_test.py
new/certbot-apache-1.15.0/tests/http_01_test.py
--- old/certbot-apache-1.14.0/tests/http_01_test.py 2021-04-06
19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/tests/http_01_test.py 2021-05-04
20:48:08.000000000 +0200
@@ -24,7 +24,7 @@
"""Test for certbot_apache._internal.http_01.ApacheHttp01."""
def setUp(self, *args, **kwargs): # pylint: disable=arguments-differ
- super(ApacheHttp01Test, self).setUp(*args, **kwargs)
+ super().setUp(*args, **kwargs)
self.account_key = self.rsa512jwk
self.achalls: List[achallenges.KeyAuthorizationAnnotatedChallenge] = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.14.0/tests/parser_test.py
new/certbot-apache-1.15.0/tests/parser_test.py
--- old/certbot-apache-1.14.0/tests/parser_test.py 2021-04-06
19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/tests/parser_test.py 2021-05-04
20:48:08.000000000 +0200
@@ -16,7 +16,7 @@
"""Apache Parser Test."""
def setUp(self): # pylint: disable=arguments-differ
- super(BasicParserTest, self).setUp()
+ super().setUp()
def tearDown(self):
shutil.rmtree(self.temp_dir)
@@ -305,11 +305,9 @@
self.assertRaises(
errors.PluginError, self.parser.update_runtime_variables)
-
@mock.patch("certbot_apache._internal.configurator.ApacheConfigurator.option")
@mock.patch("certbot_apache._internal.apache_util.subprocess.Popen")
- def test_update_runtime_vars_bad_ctl(self, mock_popen, mock_opt):
+ def test_update_runtime_vars_bad_ctl(self, mock_popen):
mock_popen.side_effect = OSError
- mock_opt.return_value = "nonexistent"
self.assertRaises(
errors.MisconfigurationError,
self.parser.update_runtime_variables)
@@ -332,7 +330,7 @@
class ParserInitTest(util.ApacheTest):
def setUp(self): # pylint: disable=arguments-differ
- super(ParserInitTest, self).setUp()
+ super().setUp()
def tearDown(self):
shutil.rmtree(self.temp_dir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.14.0/tests/parsernode_configurator_test.py
new/certbot-apache-1.15.0/tests/parsernode_configurator_test.py
--- old/certbot-apache-1.14.0/tests/parsernode_configurator_test.py
2021-04-06 19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/tests/parsernode_configurator_test.py
2021-05-04 20:48:08.000000000 +0200
@@ -20,7 +20,7 @@
"""Test AugeasParserNode using available test configurations"""
def setUp(self): # pylint: disable=arguments-differ
- super(ConfiguratorParserNodeTest, self).setUp()
+ super().setUp()
self.config = util.get_apache_configurator(
self.config_path, self.vhost_path, self.config_dir,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.14.0/tests/parsernode_test.py
new/certbot-apache-1.15.0/tests/parsernode_test.py
--- old/certbot-apache-1.14.0/tests/parsernode_test.py 2021-04-06
19:17:00.000000000 +0200
+++ new/certbot-apache-1.15.0/tests/parsernode_test.py 2021-05-04
20:48:08.000000000 +0200
@@ -18,7 +18,7 @@
self.dirty = dirty
self.filepath = filepath
self.metadata = metadata
- super(DummyParserNode, self).__init__(**kwargs)
+ super().__init__(**kwargs)
def save(self, msg): # pragma: no cover
"""Save"""
@@ -38,7 +38,7 @@
"""
comment, kwargs = util.commentnode_kwargs(kwargs)
self.comment = comment
- super(DummyCommentNode, self).__init__(**kwargs)
+ super().__init__(**kwargs)
class DummyDirectiveNode(DummyParserNode):
@@ -54,7 +54,7 @@
self.parameters = parameters
self.enabled = enabled
- super(DummyDirectiveNode, self).__init__(**kwargs)
+ super().__init__(**kwargs)
def set_parameters(self, parameters): # pragma: no cover
"""Set parameters"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.14.0/tests/util.py
new/certbot-apache-1.15.0/tests/util.py
--- old/certbot-apache-1.14.0/tests/util.py 2021-04-06 19:17:00.000000000
+0200
+++ new/certbot-apache-1.15.0/tests/util.py 2021-05-04 20:48:08.000000000
+0200
@@ -67,7 +67,7 @@
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"):
- super(ParserTest, self).setUp(test_dir, config_root, vhost_root)
+ super().setUp(test_dir, config_root, vhost_root)
zope.component.provideUtility(display_util.FileDisplay(sys.stdout,
False))
@@ -123,11 +123,11 @@
version=version,
use_parsernode=use_parsernode,
openssl_version=openssl_version)
if not conf_vhost_path:
- config_class.OS_DEFAULTS["vhost_root"] = vhost_path
+ config_class.OS_DEFAULTS.vhost_root = vhost_path
else:
# Custom virtualhost path was requested
config.config.apache_vhost_root = conf_vhost_path
- config.config.apache_ctl = config_class.OS_DEFAULTS["ctl"]
+ config.config.apache_ctl = config_class.OS_DEFAULTS.ctl
config.prepare()
return config
