-
Notifications
You must be signed in to change notification settings - Fork 859
fix: SignatureVerifier.is_valid raises ValueError on non-numeric time… #1968
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Shubham-Padkonde
wants to merge
2
commits into
slackapi:main
Choose a base branch
from
Shubham-Padkonde:fix/signature-verifier-non-numeric-timestamp
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| import unittest | ||
| from unittest.mock import Mock | ||
|
|
||
| from slack_sdk.signature import SignatureVerifier | ||
|
|
||
|
|
@@ -98,6 +99,26 @@ 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_non_numeric_timestamp(self): | ||
| verifier = SignatureVerifier( | ||
| signing_secret=self.signing_secret, | ||
| clock=MockClock(), | ||
| ) | ||
| self.assertFalse(verifier.is_valid(self.body, "not-a-number", self.valid_signature)) | ||
| self.assertFalse(verifier.is_valid(self.body, "1.5", self.valid_signature)) | ||
| self.assertFalse(verifier.is_valid(self.body, "", self.valid_signature)) | ||
|
|
||
| def test_is_valid_request_non_numeric_timestamp_header(self): | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: |
||
| verifier = SignatureVerifier( | ||
| signing_secret=self.signing_secret, | ||
| clock=MockClock(), | ||
| ) | ||
| bad_headers = { | ||
| "X-Slack-Request-Timestamp": "not-a-number", | ||
| "X-Slack-Signature": self.valid_signature, | ||
| } | ||
| self.assertFalse(verifier.is_valid_request(self.body, bad_headers)) | ||
|
|
||
| def test_invalid_signing_secret(self): | ||
| with self.assertRaises(ValueError): | ||
| SignatureVerifier("") | ||
|
|
@@ -117,3 +138,11 @@ def test_invalid_signing_secret_reassignment(self): | |
| with self.assertRaises(ValueError): | ||
| verifier.signing_secret = None | ||
| self.assertEqual(verifier.signing_secret, self.signing_secret) | ||
|
|
||
| def test_is_valid_rejects_numeric_timestamp_outside_replay_window(self): | ||
| clock = Mock() | ||
| verifier = SignatureVerifier(signing_secret=self.signing_secret, clock=clock) | ||
| for elapsed, expected in ((300, True), (301, False), (-301, False)): | ||
| with self.subTest(elapsed=elapsed): | ||
| clock.now.return_value = int(self.timestamp) + elapsed | ||
| self.assertEqual(verifier.is_valid(self.body, self.timestamp, self.valid_signature), expected) | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit (optional): Could we add a case showing that a valid numeric timestamp outside the 5-minute window still returns
False? That would pin down that the newtryblock didn't change the replay check. Something likeverifier.is_valid(self.body, "1531420618", self.valid_signature)with a clock that's well past it.