upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-14 19:20:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

py3 compat

Browse source
This commit is contained in:
Jakub Warmuz 2015-07-31 22:45:48 +00:00
parent 68d34391dd
commit eacf658003
No known key found for this signature in database
GPG key ID: 2A7BAD3A489B52EA
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
acme/acme/challenges.py
View file

@ -70,7 +70,7 @@ class SimpleHTTP(DVChallenge):
"""
# TODO: check that path combined with uri does not go above
# URI_ROOT_PATH!
return '..' not in self.token and '/' not in self.token
return b'..' not in self.token and b'/' not in self.token
@ChallengeResponse.register
@ -134,7 +134,8 @@ class SimpleHTTPResponse(ChallengeResponse):
"""
return jose.JWS.sign(
payload=self.gen_resource(chall).json_dumps().encode('utf-8'),
payload=self.gen_resource(chall).json_dumps(
sort_keys=True).encode('utf-8'),
key=account_key, alg=alg, **kwargs)
def check_validation(self, validation, chall, account_public_key):
@ -258,7 +259,7 @@ class DVSNI(DVChallenge):
"""
return DVSNIResponse(validation=jose.JWS.sign(
payload=self.json_dumps().encode('utf-8'),
payload=self.json_dumps(sort_keys=True).encode('utf-8'),
key=account_key, alg=alg, **kwargs))

6
acme/acme/challenges_test.py
View file

@ -136,7 +136,7 @@ class SimpleHTTPResponseTest(unittest.TestCase):
jose.JWS.sign(payload=bad_resource.json_dumps().encode('utf-8'),
alg=jose.RS256, key=account_key)
for bad_resource in (resource.update(tls=True),
resource.update(token=r'x'*20))
resource.update(token=b'x'*20))
)
for validation in validations:
self.assertFalse(self.resp_http.check_validation(
@ -219,11 +219,11 @@ class DVSNIResponseTest(unittest.TestCase):
from acme.challenges import DVSNI
self.chall = DVSNI(
token=jose.b64decode('a82d5ff8ef740d12881f6d3c2277ab2e'))
token=jose.b64decode(b'a82d5ff8ef740d12881f6d3c2277ab2e'))
from acme.challenges import DVSNIResponse
self.validation = jose.JWS.sign(
payload=self.chall.json_dumps().encode(),
payload=self.chall.json_dumps(sort_keys=True).encode(),
key=self.key, alg=jose.RS256)
self.msg = DVSNIResponse(validation=self.validation)
self.jmsg_to = {

5
acme/acme/messages_test.py
View file

@ -224,9 +224,10 @@ class AuthorizationTest(unittest.TestCase):
self.challbs = (
ChallengeBody(
uri='http://challb1', status=STATUS_VALID,
chall=challenges.SimpleHTTP(token='IlirfxKKXAsHtmzK29Pj8A')),
chall=challenges.SimpleHTTP(token=b'IlirfxKKXAsHtmzK29Pj8A')),
ChallengeBody(uri='http://challb2', status=STATUS_VALID,
chall=challenges.DNS(token='DGyRejmCefe7v4NfDGDKfA')),
chall=challenges.DNS(
token=b'DGyRejmCefe7v4NfDGDKfA')),
ChallengeBody(uri='http://challb3', status=STATUS_VALID,
chall=challenges.RecoveryContact()),
)