upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-05-28 04:34:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'http01-nginx' into test-http01-nginx2

Browse source
This commit is contained in:
Brad Warren 2018-01-11 14:37:06 -08:00
commit d7c03e136b
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
certbot-nginx/certbot_nginx/configurator.py
View file

@ -412,7 +412,7 @@ class NginxConfigurator(common.Installer):
Rank by how well these match target_name.
:param str target_name: The name to match
:param str port: port number
:param str port: port number as a string
:returns: list of dicts containing the vhost, the matching name, and
the numerical rank
:rtype: list

2
certbot-nginx/certbot_nginx/http_01.py
View file

@ -94,7 +94,7 @@ class NginxHttp01(common.ChallengePerformer):
"""
vhost = self.configurator.choose_redirect_vhost(achall.domain,
self.configurator.config.http01_port, create_if_no_match=True)
'%i' % self.configurator.config.http01_port, create_if_no_match=True)
validation = achall.validation(achall.account_key)
validation_path = self._get_validation_path(achall)

4
certbot-nginx/certbot_nginx/tests/http_01_test.py
View file

@ -30,7 +30,7 @@ class HttpPerformTest(util.NginxTest):
token=b"\xba\xa9\xda?<m\xaewmx\xea\xad\xadv\xf4\x02\xc9y"
b"\x80\xe2_X\t\xe7\xc7\xa4\t\xca\xf7&\x945"
), "pending"),
domain="another.alias", account_key=account_key),
domain="ipv6.com", account_key=account_key),
achallenges.KeyAuthorizationAnnotatedChallenge(
challb=acme_util.chall_to_challb(
challenges.HTTP01(
@ -41,7 +41,7 @@ class HttpPerformTest(util.NginxTest):
achallenges.KeyAuthorizationAnnotatedChallenge(
challb=acme_util.chall_to_challb(
challenges.HTTP01(token=b"kNdwjxOeX0I_A8DXt9Msmg"), "pending"),
domain="sslon.com", account_key=account_key),
domain="migration.com", account_key=account_key),
]
def setUp(self):

1
certbot-nginx/certbot_nginx/tests/util.py
View file

@ -64,6 +64,7 @@ def get_nginx_configurator(
in_progress_dir=os.path.join(backups, "IN_PROGRESS"),
server="https://acme-server.org:443/new",
tls_sni_01_port=5001,
http01_port=80
),
name="nginx",
version=version)