fix(webhook): support paths in API URL regex for enterprise setups #26149
+6
−3
Conversation
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
🔴 Preview Environment stopped on BunnyshellSee: Environment Details | Pipeline Logs Available commands (reply to this comment):
|
Contributor
ppapapetrou76
left a comment
ppapapetrou76
left a comment
There was a problem hiding this comment.
@HsiuChuanHsu can you please check the failing unit tests?
HsiuChuanHsu
force-pushed
the
fix-25095
branch
from
c5bb224 to
1804473
Compare
Author
|
It's all green! |
chansuke
reviewed
Jan 27, 2026
| {true, "https://user@example.com/", "https://example.com/", "https+username should match https"}, | ||
| {true, "http://example.com/", "https://user@example.com/", "http should match https+username"}, | ||
| {true, "https://example.com/", "https://user@example.com/", "https should match https+username"}, | ||
| {true, "https://git.ourenterprise.com/", "https://git.ourenterprise.com/api/v3", "enterprise API URL with path should match base repo URL"}, |
Member
There was a problem hiding this comment.
Would it make sense to add a test case for the common webhook shape where apiURL includes /repos/{owner}/{repo} but the generator API is the base /api/v3?
{true, "https://git.ourenterprise.com/api/v3/repos/org/repo", "https://git.ourenterprise.com/api/v3", "enterprise API URL with repo path should match base API"},
Author
There was a problem hiding this comment.
For sure. Test cases with API path followed by additional repository-specific segments are added.
Signed-off-by: HsiuChuanHsu <hchsu2106@gmail.com>
Signed-off-by: HsiuChuanHsu <hchsu2106@gmail.com>
Add test cases that verify the regex accepts webhook URLs containing the base API path followed by additional repository-specific segments. Signed-off-by: HsiuChuanHsu <hchsu2106@gmail.com>
HsiuChuanHsu
force-pushed
the
fix-25095
branch
from
1804473 to
12ef775
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
WHY
Using GitHub Enterprise (or similar self-hosted Git platforms) often have API URLs with paths like https://git.company.com/api/v3 .
Since PR #21227, these setups have been failing because our webhook validator only expected URLs without paths.
HOW
Update the regex pattern in GetAPIURLRegex() to accept optional path segments.
The key change is replacing the overly strict /?$ (which only allowed a single trailing slash) with (/[\w.%/-]*)?$.
What
Files Modified:
util/webhook/webhook.go- Updated regex to support paths in API URLsutil/webhook/webhook_test.go- Added test case for enterprise API URL patternFixes: #25095
Checklist: