diff --git a/slack_sdk/signature/__init__.py b/slack_sdk/signature/__init__.py index 52cd7bcb5..68c5dff36 100644 --- a/slack_sdk/signature/__init__.py +++ b/slack_sdk/signature/__init__.py @@ -66,10 +66,25 @@ def is_valid( if timestamp is None or signature is None: return False - if abs(self.clock.now() - int(timestamp)) > 60 * 5: + try: + timestamp_value = int(timestamp) + except (TypeError, ValueError): + return False + if abs(self.clock.now() - timestamp_value) > 60 * 5: + return False + + # hmac.compare_digest() only accepts ASCII strings; a signature + # with non-ASCII characters can never match, so reject it here + # instead of letting compare_digest() raise TypeError. + if not isinstance(signature, str) or not signature.isascii(): return False - calculated_signature = self.generate_signature(timestamp=timestamp, body=body) + try: + calculated_signature = self.generate_signature(timestamp=timestamp, body=body) + except UnicodeDecodeError: + # A bytes body that is not valid UTF-8 can never match a + # signature computed over its decoded form. + return False if calculated_signature is None: return False return hmac.compare_digest(calculated_signature, signature) diff --git a/tests/slack_sdk/signature/test_signature_verifier.py b/tests/slack_sdk/signature/test_signature_verifier.py index 05a4de420..e960806e8 100644 --- a/tests/slack_sdk/signature/test_signature_verifier.py +++ b/tests/slack_sdk/signature/test_signature_verifier.py @@ -98,6 +98,55 @@ def test_is_valid_none(self): self.assertFalse(verifier.is_valid(self.body, None, None)) self.assertFalse(verifier.is_valid(None, None, None)) + def test_is_valid_malformed_timestamp(self): + verifier = SignatureVerifier( + signing_secret=self.signing_secret, + clock=MockClock(), + ) + self.assertFalse(verifier.is_valid(self.body, "abc", "v0=aa")) + self.assertFalse(verifier.is_valid(self.body, "1.5", "v0=aa")) + self.assertFalse(verifier.is_valid(self.body, "", "v0=aa")) + + def test_is_valid_malformed_signature(self): + verifier = SignatureVerifier( + signing_secret=self.signing_secret, + clock=MockClock(), + ) + self.assertFalse(verifier.is_valid(self.body, self.timestamp, "v0=é")) + self.assertFalse(verifier.is_valid(self.body, self.timestamp, "v0=✓")) + + def test_is_valid_malformed_body(self): + verifier = SignatureVerifier( + signing_secret=self.signing_secret, + clock=MockClock(), + ) + self.assertFalse(verifier.is_valid(b"\xff\xfe", self.timestamp, "v0=aa")) + self.assertFalse(verifier.is_valid(b"\x80\x81\x82", self.timestamp, "v0=aa")) + + def test_is_valid_request_malformed_inputs(self): + verifier = SignatureVerifier( + signing_secret=self.signing_secret, + clock=MockClock(), + ) + self.assertFalse( + verifier.is_valid_request( + self.body, + {"X-Slack-Request-Timestamp": "abc", "X-Slack-Signature": "v0=aa"}, + ) + ) + self.assertFalse( + verifier.is_valid_request( + self.body, + {"X-Slack-Request-Timestamp": self.timestamp, "X-Slack-Signature": "v0=é"}, + ) + ) + self.assertFalse( + verifier.is_valid_request( + b"\xff\xfe", + {"X-Slack-Request-Timestamp": self.timestamp, "X-Slack-Signature": "v0=aa"}, + ) + ) + def test_invalid_signing_secret(self): with self.assertRaises(ValueError): SignatureVerifier("")