Skip to content
This repository was archived by the owner on Apr 13, 2024. It is now read-only.

Commit 251cce9

Browse files
committed
Move algorithm checks to Signer
1 parent 822cad0 commit 251cce9

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

httpsig/sign.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ def __init__(self, secret, algorithm=None, sign_algorithm=None):
3030

3131
if algorithm != DEFAULT_ALGORITHM:
3232
print("Algorithm: {} is deprecated please update to {}".format(algorithm, DEFAULT_ALGORITHM))
33+
elif algorithm == DEFAULT_ALGORITHM and sign_algorithm is None:
34+
raise HttpSigException("Required sign algorithm for {} algorithm not set".format(DEFAULT_ALGORITHM))
3335

3436
if isinstance(secret, six.string_types):
3537
secret = secret.encode("ascii")

httpsig/verify.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,8 @@ def __init__(self, headers, secret, required_headers=None, method=None,
9292
self.host = host
9393
self.derived_algorithm = algorithm
9494

95-
if self.auth_dict['algorithm'] != DEFAULT_ALGORITHM:
96-
print("Algorithm: {} is deprecated please update to {}".format(self.auth_dict['algorithm'], DEFAULT_ALGORITHM))
97-
elif self.auth_dict['algorithm'] == DEFAULT_ALGORITHM and sign_algorithm is None:
98-
raise HttpSigException("Required sign algorithm for {} algorithm not set".format(DEFAULT_ALGORITHM))
99-
10095
super(HeaderVerifier, self).__init__(
101-
secret, algorithm=self.auth_dict['algorithm'], sign_algorithm=sign_algorithm)
96+
secret, algorithm=self.auth_dict['algorithm'], sign_algorithm=sign_algorithm)
10297

10398
def verify(self):
10499
"""

0 commit comments

Comments
 (0)