crypt/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-01-21 19:01:07 +03:00
Code Activity

Refactored the port check from NamespaceConfig init to the validation function

Browse Source
This commit is contained in:
Joona Hoikkala
2015-11-08 23:05:33 +02:00
parent 0c4456bd7e
commit 0d01cbfc92
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
letsencrypt/configuration.py
View File

@@ -38,10 +38,6 @@ class NamespaceConfig(object):
def __init__(self, namespace):
self.namespace = namespace
check_config_sanity(self)
if self.http01_port == self.tls_sni_01_port:
raise errors.Error(
"Trying to run http-01 and tls-sni-01 "
"on the same port ({0})".format(self.tls_sni_01_port))
def __getattr__(self, name):
return getattr(self.namespace, name)
@@ -122,6 +118,12 @@ def check_config_sanity(config):
:type args: :class:`letsencrypt.interfaces.IConfig`
"""
# Port check
if config.http01_port == config.tls_sni_01_port:
raise errors.Error(
"Trying to run http-01 and tls-sni-01 "
"on the same port ({0})".format(config.tls_sni_01_port))
# Domain checks
if config.namespace.domains is not None:
_check_config_domain_sanity(config.namespace.domains)