-
Notifications
You must be signed in to change notification settings - Fork 241
Add option to skip signature verification #595
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
habara-k
wants to merge
5
commits into
line:master
Choose a base branch
from
habara-k:allow-to-skip-signature-verification
base: master
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
Show all changes
5 commits
Select commit
Hold shift + click to select a range
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,14 +15,30 @@ var ( | |
ErrInvalidSignature = errors.New("invalid signature") | ||
) | ||
|
||
// ParseRequest func | ||
func ParseRequest(channelSecret string, r *http.Request) (*CallbackRequest, error) { | ||
type ParseOption struct { | ||
// SkipSignatureValidation is a function that determines whether to skip | ||
// webhook signature verification. | ||
// | ||
// If the function returns true, the signature verification step is skipped. | ||
// This can be useful in scenarios such as when you're in the process of updating | ||
// the channel secret and need to temporarily bypass verification to avoid disruptions. | ||
SkipSignatureValidation func() bool | ||
} | ||
|
||
// ParseRequestWithOption parses a LINE webhook request with optional behavior. | ||
// | ||
// Use this when you need to customize parsing, such as skipping signature validation | ||
// via ParseOption. This is useful during channel secret rotation or local development. | ||
// | ||
// For standard use, prefer ParseRequest. | ||
func ParseRequestWithOption(channelSecret string, r *http.Request, opt *ParseOption) (*CallbackRequest, error) { | ||
defer func() { _ = r.Body.Close() }() | ||
body, err := io.ReadAll(r.Body) | ||
if err != nil { | ||
return nil, err | ||
} | ||
if !ValidateSignature(channelSecret, r.Header.Get("x-line-signature"), body) { | ||
skip := opt != nil && opt.SkipSignatureValidation != nil && opt.SkipSignatureValidation() | ||
if !skip && !ValidateSignature(channelSecret, r.Header.Get("x-line-signature"), body) { | ||
return nil, ErrInvalidSignature | ||
} | ||
|
||
|
@@ -33,6 +49,14 @@ func ParseRequest(channelSecret string, r *http.Request) (*CallbackRequest, erro | |
return &cb, nil | ||
} | ||
|
||
// ParseRequest parses a LINE webhook request with signature verification. | ||
// | ||
// If you need to customize behavior (e.g. skip signature verification), | ||
// use ParseRequestWithOption instead. | ||
func ParseRequest(channelSecret string, r *http.Request) (*CallbackRequest, error) { | ||
return ParseRequestWithOption(channelSecret, r, nil) | ||
} | ||
|
||
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. Can you do these like the Java SDK?
|
||
func ValidateSignature(channelSecret, signature string, body []byte) bool { | ||
decoded, err := base64.StdEncoding.DecodeString(signature) | ||
if err != nil { | ||
|
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
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.
When adding another option later, would it always require a major version upgrade? I think it's better to ensure the code works seamlessly with users' existing builds, even when adding another option.
Uh oh!
There was an error while loading. Please reload this page.
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.
To make sure this change doesn't break existing code that uses the current line-bot-sdk-go, I also added tests for the existing
ParseRequest
(without options). d12c7dfThere 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.
thank you.
Once again: Would adding an option in another change cause any issues in your land(like compile fails)?
type ParseOption struct { SkipSignatureValidation func() bool + SomethingNew func() bool // Adding this later may cause compile error in your land? or not? }