Events of type "repository" now avoid checking hook id. #3463
Conversation
This file contains 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
eleftherias
reviewed
May 30, 2024
eleftherias
reviewed
May 30, 2024
Events of type "repository" having "action" delete must trigger the deletion of registered repositories. Given we use the same deserialization struct for both "repository" and "meta" events, we erroneously checked the received hook id against the one stored in the database, thus consistently failing. Added fix, test case, and improved logs.
evankanderson
approved these changes
May 30, 2024
| @@ -678,7 +694,7 @@ func (s *Server) processRelevantRepositoryEvent( | |||
| } | |||
|
|
|||
| // This only makes sense for "meta" event type | |||
| if dbrepo.WebhookID.Valid { | |||
| if event.GetHookID() != 0 && dbrepo.WebhookID.Valid { | |||
| // Check if the payload webhook ID matches the one we | |||
| // have stored in the DB for this repository | |||
| if event.GetHookID() != dbrepo.WebhookID.Int64 { | |||
There was a problem hiding this comment.
Does the comment on line 701-703 still make sense?
There was a problem hiding this comment.
I think it does.
This routine is called only on meta and repository events, and this fix ensures that we check the hook id only when available, which is the case solely for the meta event.
The comment per sé is still valid, but can be removed if it's not useful.
I lean towards leaving it there for posterity, maybe rewriting it at the top of the if, but let me know.
There was a problem hiding this comment.
I agree that it's valid and useful
eleftherias
approved these changes
May 31, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Events of type "repository" having "action" delete must trigger the deletion of registered repositories. Given we use the same deserialization struct for both "repository" and "meta" events, we erroneously checked the received hook id against the one stored in the database, thus consistently failing.
Added fix, test case, and improved logs.
Fixes #3461
Change Type
Mark the type of change your PR introduces:
Testing
Review Checklist: