From e3d95c5a6887894be2a82784c7436f17205a8023 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Fri, 8 May 2015 23:43:06 -0400 Subject: [PATCH] Final changes --- docs/api/client/proof_of_possession.rst | 5 ++++ letsencrypt/client/proof_of_possession.py | 4 +-- .../client/tests/proof_of_possession_test.py | 26 +++++++++++-------- 3 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 docs/api/client/proof_of_possession.rst diff --git a/docs/api/client/proof_of_possession.rst b/docs/api/client/proof_of_possession.rst new file mode 100644 index 000000000..9f1ea0793 --- /dev/null +++ b/docs/api/client/proof_of_possession.rst @@ -0,0 +1,5 @@ +:mod:`letsencrypt.client.proof_of_possession` +-------------------------------------------------- + +.. automodule:: letsencrypt.client.proof_of_possession + :members: diff --git a/letsencrypt/client/proof_of_possession.py b/letsencrypt/client/proof_of_possession.py index 82e3524b4..a2f4956b9 100644 --- a/letsencrypt/client/proof_of_possession.py +++ b/letsencrypt/client/proof_of_possession.py @@ -29,7 +29,7 @@ class ProofOfPossession(object): # pylint: disable=too-few-public-methods :type achall: :class:`letsencrypt.client.achallenges.ProofOfPossession` :returns: Response or None/False if the challenge cannot be completed - :rtype: :class:`letsencrypt.acme.challenges.ProofOfPossessionResponse' + :rtype: :class:`letsencrypt.acme.challenges.ProofOfPossessionResponse` or False """ @@ -64,7 +64,7 @@ class ProofOfPossession(object): # pylint: disable=too-few-public-methods public key. :returns: Response or None/False if the challenge cannot be completed - :rtype: :class:`letsencrypt.acme.challenges.ProofOfPossessionResponse' + :rtype: :class:`letsencrypt.acme.challenges.ProofOfPossessionResponse` or False """ diff --git a/letsencrypt/client/tests/proof_of_possession_test.py b/letsencrypt/client/tests/proof_of_possession_test.py index 0ba801ff1..f068bc1b2 100644 --- a/letsencrypt/client/tests/proof_of_possession_test.py +++ b/letsencrypt/client/tests/proof_of_possession_test.py @@ -43,6 +43,19 @@ class ProofOfPossessionTest(unittest.TestCase): self.achall = achallenges.ProofOfPossession( challb=challenge, domain="example.com") + def test_perform_bad_challenge(self): + hints = challenges.ProofOfPossession.Hints( + jwk=jose.jwk.JWKOct(key=KEY), cert_fingerprints=(), + certs=(), serial_numbers=(), subject_key_identifiers=(), + issuers=(), authorized_for=()) + challenge = challenges.ProofOfPossession( + alg=jose.HS512, nonce='zczv4HMLVe_0kimJ25Juig', hints=hints) + self.achall = achallenges.ProofOfPossession( + challb=challenge, domain="example.com") + + response = self.proof_of_pos.perform(self.achall) + self.assertEqual(response, None) + def test_perform_no_input(self): response = self.proof_of_pos.perform(self.achall) self.assertTrue(response.verify()) @@ -64,15 +77,6 @@ class ProofOfPossessionTest(unittest.TestCase): response = self.proof_of_pos.perform(self.achall) self.assertTrue(response.verify()) - def test_perform_bad_challenge(self): - hints = challenges.ProofOfPossession.Hints( - jwk=jose.jwk.JWKOct(key=KEY), cert_fingerprints=(), - certs=(), serial_numbers=(), subject_key_identifiers=(), - issuers=(), authorized_for=()) - challenge = challenges.ProofOfPossession( - alg=jose.HS512, nonce='zczv4HMLVe_0kimJ25Juig', hints=hints) - self.achall = achallenges.ProofOfPossession( - challb=challenge, domain="example.com") - response = self.proof_of_pos.perform(self.achall) - self.assertEqual(response, None) +if __name__ == "__main__": + unittest.main()