Bug: fix require_app_auth matches unexpected routes
#42
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
`APP_ROUTES` contains an `r"/app"` entry to match for the `/app` route. This will also match repositories which start with `app` causing `require_app_auth` to return true. This change adjusts the `/app` regex to match at the beginning of the string and not anywhere within the url.path
|
The app auth routes are copied from https://github.com/octokit/auth-app.js/blob/1c0d530c6b85890853b860b16f0c11e106bb676f/src/requires-app-auth.ts#L1-L22. The regex in the octokit is https://github.com/octokit/auth-app.js/blob/1c0d530c6b85890853b860b16f0c11e106bb676f/src/requires-app-auth.ts#L45. We may need to change the regex at L29 instead. Seems this change should be applied: - APP_AUTH_REGEX = re.compile(rf"(?:{'|'.join(APP_ROUTES)})[^/]*$", re.I)
+ APP_AUTH_REGEX = re.compile(rf"^(?:{'|'.join(APP_ROUTES)})$", re.I)Could you please update this regex instead and test it? I cannot make a pr review comment on unchanged lines. |
yanyongyu
changed the title
apprequire_app_auth matches unexpected routes
yanyongyu
approved these changes
Sep 19, 2023
|
This change breaks github enterprise, because urls begin with /api/v3, this regex no longer matches for the /app endpoint |
|
🤔 That's my mistake. octokit matches the path by replacing the base url first: |
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.
APP_ROUTEScontains anr"/app"entry to match for the/approute. This will also match repositories which start withappcausingrequire_app_authto return true.This change adjusts the
/appregex to match at the beginning of the string and not anywhere within the url.path