From 67ec4d09eef289b979f18b869c760cc997ef2f44 Mon Sep 17 00:00:00 2001 From: James Kasten Date: Mon, 28 Sep 2015 15:53:42 -0700 Subject: [PATCH] Put in dummy challenge --- acme/acme/challenges.py | 5 +++++ acme/acme/messages.py | 5 +++-- acme/acme/messages_test.py | 2 -- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/acme/acme/challenges.py b/acme/acme/challenges.py index 81711e605..1ffc6cc99 100644 --- a/acme/acme/challenges.py +++ b/acme/acme/challenges.py @@ -34,6 +34,11 @@ class DVChallenge(Challenge): # pylint: disable=abstract-method """Domain validation challenges.""" +class UnrecognizedChallenge(DVChallenge): + """Unrecognized challenge.""" + typ = "unknown" + + class ChallengeResponse(jose.TypedJSONObjectWithFields): # _fields_to_partial_json | pylint: disable=abstract-method """ACME challenge response.""" diff --git a/acme/acme/messages.py b/acme/acme/messages.py index 594b3d5c7..d6e9952c3 100644 --- a/acme/acme/messages.py +++ b/acme/acme/messages.py @@ -2,7 +2,6 @@ import collections from acme import challenges -from acme import errors from acme import fields from acme import jose from acme import util @@ -383,7 +382,9 @@ class Authorization(ResourceBody): try: challs.append(ChallengeBody.from_json(chall)) except jose.UnrecognizedTypeError: - continue + challs.append(ChallengeBody( + uri="UNKNOWN", chall=challenges.UnrecognizedChallenge, + status=STATUS_UNKNOWN)) return tuple(challs) @property diff --git a/acme/acme/messages_test.py b/acme/acme/messages_test.py index ac722909c..d7bbdb0e4 100644 --- a/acme/acme/messages_test.py +++ b/acme/acme/messages_test.py @@ -275,8 +275,6 @@ class AuthorizationTest(unittest.TestCase): from acme.messages import ChallengeBody from acme.messages import STATUS_VALID - unknown_chall = mock.MagicMock() - unknown_chall.to_json.side_effect = side_effect=jose.UnrecognizedTypeError self.challbs = ( ChallengeBody( uri='http://challb1', status=STATUS_VALID,