From 89ac11c309d59b6162b188dcd74f8bc4a11cd4ef Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Thu, 12 Feb 2015 23:55:47 +0000 Subject: [PATCH] Fix imports --- letsencrypt/client/auth_handler.py | 6 +-- letsencrypt/client/client.py | 10 ++--- letsencrypt/client/network.py | 10 ++--- letsencrypt/client/revoker.py | 6 +-- letsencrypt/client/tests/auth_handler_test.py | 38 +++++++++---------- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/letsencrypt/client/auth_handler.py b/letsencrypt/client/auth_handler.py index 11d940e94..f3b1bab92 100644 --- a/letsencrypt/client/auth_handler.py +++ b/letsencrypt/client/auth_handler.py @@ -4,7 +4,7 @@ import sys import Crypto.PublicKey.RSA -from letsencrypt import acme +from letsencrypt.acme import messages from letsencrypt.client import challenge_util from letsencrypt.client import constants @@ -112,14 +112,14 @@ class AuthHandler(object): # pylint: disable=too-many-instance-attributes """ try: auth = self.network.send_and_receive_expected( - acme.messages.AuthorizationRequest.create( + messages.AuthorizationRequest.create( session_id=self.msgs[domain].session_id, nonce=self.msgs[domain].nonce, responses=self.responses[domain], name=domain, key=Crypto.PublicKey.RSA.importKey( self.authkey[domain].pem)), - acme.messages.Authorization) + messages.Authorization) logging.info("Received Authorization for %s", domain) return auth except errors.LetsEncryptClientError as err: diff --git a/letsencrypt/client/client.py b/letsencrypt/client/client.py index 0899c9702..f28af1603 100644 --- a/letsencrypt/client/client.py +++ b/letsencrypt/client/client.py @@ -9,7 +9,7 @@ import Crypto.PublicKey.RSA import M2Crypto import zope.component -from letsencrypt import acme +from letsencrypt.acme import messages from letsencrypt.client import auth_handler from letsencrypt.client import client_authenticator @@ -115,8 +115,8 @@ class Client(object): """ return self.network.send_and_receive_expected( - acme.messages.ChallengeRequest(identifier=domain), - acme.messages.Challenge) + messages.ChallengeRequest(identifier=domain), + messages.Challenge) def acme_certificate(self, csr_der): """Handle ACME "certificate" phase. @@ -129,10 +129,10 @@ class Client(object): """ logging.info("Preparing and sending CSR...") return self.network.send_and_receive_expected( - acme.messages.CertificateRequest.create( + messages.CertificateRequest.create( csr=M2Crypto.X509.load_request_der_string(csr_der), key=Crypto.PublicKey.RSA.importKey(self.authkey.pem)), - acme.messages.Certificate) + messages.Certificate) def save_certificate(self, certificate_msg, cert_path, chain_path): # pylint: disable=no-self-use diff --git a/letsencrypt/client/network.py b/letsencrypt/client/network.py index 390e0d922..bdba746b0 100644 --- a/letsencrypt/client/network.py +++ b/letsencrypt/client/network.py @@ -5,7 +5,7 @@ import time import requests -from letsencrypt import acme +from letsencrypt.acme import messages from letsencrypt.client import errors @@ -53,7 +53,7 @@ class Network(object): raise errors.LetsEncryptClientError( 'Sending ACME message to server has failed: %s' % error) - return acme.messages.Message.from_json(response.json(), validate=True) + return messages.Message.from_json(response.json(), validate=True) def send_and_receive_expected(self, msg, expected): """Send ACME message to server and return expected message. @@ -94,14 +94,14 @@ class Network(object): for _ in xrange(rounds): if isinstance(response, expected): return response - elif isinstance(response, acme.messages.Error): + elif isinstance(response, messages.Error): logging.error("%s", response) raise errors.LetsEncryptClientError(response.error) - elif isinstance(response, acme.messages.Defer): + elif isinstance(response, messages.Defer): logging.info("Waiting for %d seconds...", delay) time.sleep(delay) response = self.send( - acme.messages.StatusRequest(token=response.token)) + messages.StatusRequest(token=response.token)) else: logging.fatal("Received unexpected message") logging.fatal("Expected: %s", expected) diff --git a/letsencrypt/client/revoker.py b/letsencrypt/client/revoker.py index 732a6c596..0f974f366 100644 --- a/letsencrypt/client/revoker.py +++ b/letsencrypt/client/revoker.py @@ -8,7 +8,7 @@ import Crypto.PublicKey.RSA import M2Crypto import zope.component -from letsencrypt import acme +from letsencrypt.acme import messages from letsencrypt.client import crypto_util from letsencrypt.client import display @@ -43,9 +43,9 @@ class Revoker(object): key = Crypto.PublicKey.RSA.importKey(backup_key_file.read()) revocation = self.network.send_and_receive_expected( - acme.messages.RevocationRequest.create( + messages.RevocationRequest.create( certificate=certificate, key=key), - acme.messages.Revocation) + messages.Revocation) zope.component.getUtility(interfaces.IDisplay).generic_notification( "You have successfully revoked the certificate for " diff --git a/letsencrypt/client/tests/auth_handler_test.py b/letsencrypt/client/tests/auth_handler_test.py index f102202f8..3cfeb3759 100644 --- a/letsencrypt/client/tests/auth_handler_test.py +++ b/letsencrypt/client/tests/auth_handler_test.py @@ -4,12 +4,12 @@ import unittest import mock -from letsencrypt import acme +from letsencrypt.acme import messages from letsencrypt.client import challenge_util from letsencrypt.client import errors -from letsencrypt.client.tests import acme_util +from letsencrypt.client.tests import acme_util TRANSLATE = { @@ -48,8 +48,8 @@ class SatisfyChallengesTest(unittest.TestCase): def test_name1_dvsni1(self): dom = "0" challenge = [acme_util.CHALLENGES["dvsni"]] - msg = acme.messages.Challenge(session_id=dom, nonce="nonce0", - challenges=challenge, combinations=[]) + msg = messages.Challenge(session_id=dom, nonce="nonce0", + challenges=challenge, combinations=[]) self.handler.add_chall_msg(dom, msg, "dummy_key") self.handler._satisfy_challenges() # pylint: disable=protected-access @@ -68,8 +68,8 @@ class SatisfyChallengesTest(unittest.TestCase): for i in xrange(5): self.handler.add_chall_msg( str(i), - acme.messages.Challenge(session_id=str(i), nonce="nonce%d" % i, - challenges=challenge, combinations=[]), + messages.Challenge(session_id=str(i), nonce="nonce%d" % i, + challenges=challenge, combinations=[]), "dummy_key") self.handler._satisfy_challenges() # pylint: disable=protected-access @@ -96,8 +96,8 @@ class SatisfyChallengesTest(unittest.TestCase): combos = acme_util.gen_combos(challenges) self.handler.add_chall_msg( dom, - acme.messages.Challenge(session_id="0", nonce="nonce0", - challenges=challenges, combinations=combos), + messages.Challenge(session_id="0", nonce="nonce0", + challenges=challenges, combinations=combos), "dummy_key") path = gen_path(["simpleHttps"], challenges) @@ -126,8 +126,8 @@ class SatisfyChallengesTest(unittest.TestCase): combos = acme_util.gen_combos(challenges) self.handler.add_chall_msg( dom, - acme.messages.Challenge(session_id=dom, nonce="nonce0", - challenges=challenges, combinations=combos), + messages.Challenge(session_id=dom, nonce="nonce0", + challenges=challenges, combinations=combos), "dummy_key") path = gen_path(["simpleHttps", "recoveryToken"], challenges) @@ -157,7 +157,7 @@ class SatisfyChallengesTest(unittest.TestCase): for i in xrange(5): self.handler.add_chall_msg( str(i), - acme.messages.Challenge( + messages.Challenge( session_id=str(i), nonce="nonce%d" % i, challenges=challenges, combinations=combos), "dummy_key") @@ -207,7 +207,7 @@ class SatisfyChallengesTest(unittest.TestCase): paths.append(gen_path(chosen_chall[i], challenge_list[i])) self.handler.add_chall_msg( dom, - acme.messages.Challenge( + messages.Challenge( session_id=dom, nonce="nonce%d" % i, challenges=challenge_list[i], combinations=[]), "dummy_key") @@ -256,7 +256,7 @@ class SatisfyChallengesTest(unittest.TestCase): for i in xrange(3): self.handler.add_chall_msg( str(i), - acme.messages.Challenge( + messages.Challenge( session_id=str(i), nonce="nonce%d" % i, challenges=challenges, combinations=combos), "dummy_key") @@ -324,8 +324,8 @@ class GetAuthorizationsTest(unittest.TestCase): for i in xrange(3): self.handler.add_chall_msg( str(i), - acme.messages.Challenge(session_id=str(i), nonce="nonce%d" % i, - challenges=challenge, combinations=[]), + messages.Challenge(session_id=str(i), nonce="nonce%d" % i, + challenges=challenge, combinations=[]), "dummy_key") self.mock_sat_chall.side_effect = self._sat_solved_at_once @@ -353,8 +353,8 @@ class GetAuthorizationsTest(unittest.TestCase): challenges = acme_util.get_challenges() self.handler.add_chall_msg( "0", - acme.messages.Challenge(session_id="0", nonce="nonce0", - challenges=challenges, combinations=[]), + messages.Challenge(session_id="0", nonce="nonce0", + challenges=challenges, combinations=[]), "dummy_key") # Don't do anything to satisfy challenges @@ -382,8 +382,8 @@ class GetAuthorizationsTest(unittest.TestCase): dom = str(i) self.handler.add_chall_msg( dom, - acme.messages.Challenge(session_id=dom, nonce="nonce%d" % i, - challenges=challs[i], combinations=[]), + messages.Challenge(session_id=dom, nonce="nonce%d" % i, + challenges=challs[i], combinations=[]), "dummy_key") self.mock_sat_chall.side_effect = self._sat_incremental