Skip to content
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

fix(#19314, #15700): allow ssh/altssh subdomains in repo URLs to match webhook payload #21227

Open
wants to merge 16 commits into
base: master
Choose a base branch
from

Conversation

mtbennett-godaddy
Copy link

@mtbennett-godaddy mtbennett-godaddy commented Dec 17, 2024

Fixes #19314. Fixes #15700 (cc: @robinlieb). Possibly fixes #16854 (cc: @aki-ks).


Justification:

However, when using these patterns, webhook payload URLs will not include the subdomain, which causes the current regex matching to fail.


Signed-off-by: Matthew Bennett [email protected]

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

@mtbennett-godaddy mtbennett-godaddy requested a review from a team as a code owner December 17, 2024 19:25
Copy link

bunnyshell bot commented Dec 17, 2024

🔴 Preview Environment stopped on Bunnyshell

See: Environment Details | Pipeline Logs

Available commands (reply to this comment):

  • 🔵 /bns:start to start the environment
  • 🚀 /bns:deploy to redeploy the environment
  • /bns:delete to remove the environment

Copy link

codecov bot commented Dec 17, 2024

Codecov Report

Attention: Patch coverage is 96.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 55.23%. Comparing base (13235ad) to head (a3c50a5).
Report is 4 commits behind head on master.

Files with missing lines Patch % Lines
util/webhook/webhook.go 95.65% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##           master   #21227   +/-   ##
=======================================
  Coverage   55.22%   55.23%           
=======================================
  Files         337      337           
  Lines       57057    57061    +4     
=======================================
+ Hits        31511    31515    +4     
+ Misses      22850    22845    -5     
- Partials     2696     2701    +5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

// 3. Required: hostname parsed from `webURL`
// 4. Optional: `:` followed by port number
// 5. Optional: `/`
return getUrlRegex(apiURL, `(?i)^(https?://)?(%[1]s@)?%[2]s(:[0-9]+)?/?$`)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These regexes seem different from the previous ones.

Copy link
Author

@mtbennett-godaddy mtbennett-godaddy Dec 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct, there are subtle differences.

The previous Application webhook web URL regex was:

(http://|https://|%s@|ssh://(%s@)?)%s(:[0-9]+|)[:/]%s(\.git)?

Which broke down to:

  1. http://, https://, username@, ssh://, or ssh://username@ (where username is the RFC 3986 pattern defined elsewhere in the file)
  2. hostname from original URL, passed through regexp.QuoteMeta()
  3. :port or nothing
  4. colon or slash
  5. path from original URL, passed through regexp.QuoteMeta() (which might be empty)
  6. optional .git extension

The previous ApplicationSet webhook web URL regex was:

(http://|https://|\w+@|ssh://(\w+@)?)%s(:[0-9]+|)[:/]%s(\.git)?

Which differed from the Application one in that:

  • Any sequence of one or more word characters was allowed for username.
  • The hostname and path values were not passed through regexp.QuoteMeta().

In the new common web URL regex used by both webhooks:

The previous ApplicationSet webhook API URL regex was:

(http://|https://|\w+@|ssh://(\w+@)?)%s(:[0-9]+|)[:/]

(Basically the same as the web URL regex, but no path or extension.)

The new API URL regex has the same benefits as listed above for the new web URL regex (except for the altssh/ssh subdomain allowance since these URLs will never have that).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Ready for final review
2 participants