Oss 248 refactor y alphabet detectors #4293
Open
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
kashifkhan0771
requested changes
Aug 6, 2025
| case http.StatusOK: | ||
| return true, nil | ||
| case http.StatusPaymentRequired: | ||
| return true, fmt.Errorf("blocked due to billing issue/quota exceeded: %d", res.StatusCode) |
There was a problem hiding this comment.
If we're certain that the API returns this error when the key is valid but blocked due to billing issues or quota limits, then I don't think we should surface it as an error to the user. It's not a failure to verify the key itself.
There was a problem hiding this comment.
+1 to ^
We can consider it as a success iff we're certain that this is only due to billing issues.
| keyPat = regexp.MustCompile(detectors.PrefixRegex([]string{"youneedabudget"}) + `\b([0-9a-f]{64})\b`) | ||
| // YNAB Personal Access Tokens are 64-character hexadecimal strings | ||
| // Based on documentation: access tokens are used with Bearer authentication | ||
| keyPat = regexp.MustCompile(detectors.PrefixRegex([]string{"youneedabudget", "ynab"}) + `["']?([A-Za-z0-9_-]{43,44})["']?`) |
There was a problem hiding this comment.
Are we sure the old pattern keys are no longer valid? Also, we don’t need ["'] in the regex - let’s just capture the exact pattern.
Comment on lines
+65
to
+78
| func verifyMatch(ctx context.Context, client *http.Client, token string) (bool, error) { | ||
| // Try V2 API (legacy) as fallback | ||
| isVerified, err := tryEndpoint(ctx, client, token, PROD_URL, "/users") | ||
| if isVerified || (err != nil && !isAuthError(err)) { | ||
| return isVerified, err | ||
| } | ||
|
|
||
| // Try V2 Staging as final fallback | ||
| return tryEndpoint(ctx, client, token, STAGING_URL, "/users") | ||
| } | ||
|
|
||
| func tryEndpoint(ctx context.Context, client *http.Client, token, baseURL, endpoint string) (bool, error) { | ||
| req, err := http.NewRequestWithContext(ctx, http.MethodGet, baseURL+endpoint, http.NoBody) | ||
| if err != nil { |
| // 403: API key is valid but access is forbidden (quota exceeded, API not enabled, etc.) | ||
| body, _ := io.ReadAll(res.Body) | ||
| if strings.Contains(string(body), "quotaExceeded") { | ||
| return true, fmt.Errorf("quota exceeded (valid key): %d", res.StatusCode) |
There was a problem hiding this comment.
If we're returning true, that means the key was successfully verified. So we shouldn't return a verification error in that case.
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.
Checklist:
make test-community)?make lintthis requires golangci-lint)?