Skip to content

update error code if ES dial connection error #797

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.

Sign up for GitHub

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

Merged
merged 10 commits into from
Oct 31, 2025
Merged

update error code if ES dial connection error #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c2da00f
update error code is ES dial connection error
rubvs Oct 5, 2025
eb54af7
code cleanup
rubvs Oct 5, 2025
d09f84d
Merge branch 'main' into update-apikey-error-code
rubvs Oct 5, 2025
a4954a4
improve error handling
rubvs Oct 9, 2025
973290c
update metadata and comment
rubvs Oct 29, 2025
53f2415
format error check statement
rubvs Oct 30, 2025
0efbbea
test: add http error to simulate proxy error
rubvs Oct 30, 2025
5fc3c07
update proxy test
rubvs Oct 30, 2025
967027c
update error msg
rubvs Oct 31, 2025
52bfcc3
Merge branch 'main' into update-apikey-error-code
rubvs Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions extension/apikeyauthextension/authenticator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,12 +281,19 @@ func (a *authenticator) Authenticate(ctx context.Context, headers map[string][]s

hasPrivileges, username, err := a.hasPrivileges(ctx, authHeaderValue)
if err != nil {
if elasticsearchErr, ok := err.(*types.ElasticsearchError); ok {
if elasticsearchErr.Status == http.StatusUnauthorized || elasticsearchErr.Status == http.StatusForbidden {
var elasticsearchErr *types.ElasticsearchError
if errors.As(err, &elasticsearchErr) {
switch elasticsearchErr.Status {
case http.StatusUnauthorized, http.StatusForbidden:
return ctx, status.Error(codes.Unauthenticated, err.Error())
default:
return ctx, status.Errorf(codes.Internal, "error checking privileges for API Key %q: %v", id, err)
}
}
return ctx, status.Errorf(codes.Unauthenticated, "error checking privileges for API Key %q: %v", id, err)
return ctx, errorWithDetails(codes.Unavailable, fmt.Sprintf("retryable server error for API Key %q: %v", id, err), map[string]string{
"component": "apikeyauthextension",
"api_key": id,
})
}
if !hasPrivileges {
cacheEntry := &cacheEntry{
Expand Down
9 changes: 8 additions & 1 deletion extension/apikeyauthextension/authenticator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func TestAuthenticator(t *testing.T) {
},
Status: 400,
}),
expectedErr: `rpc error: code = Unauthenticated desc = error checking privileges for API Key "id": status: 400, failed: [a_type], reason: a_reason`,
expectedErr: `rpc error: code = Internal desc = error checking privileges for API Key "id": status: 400, failed: [a_type], reason: a_reason`,
},
"auth_error": {
handler: newCannedErrorHandler(types.ElasticsearchError{
Expand All @@ -92,6 +92,13 @@ func TestAuthenticator(t *testing.T) {
}),
expectedErr: `rpc error: code = Unauthenticated desc = status: 401, failed: [auth_reason], reason: auth_reason`,
},
"proxy_502_error": {
handler: func(w http.ResponseWriter, r *http.Request) {
// Simulate proxy returning 502 when ES is unreachable - empty response body
w.WriteHeader(http.StatusBadGateway)
},
expectedErr: `rpc error: code = Unavailable desc = retryable server error "id": EOF`,
},
"missing_privileges": {
handler: newCannedHasPrivilegesHandler(hasprivileges.Response{HasAllRequested: false}),
expectedErr: `rpc error: code = PermissionDenied desc = API Key "id" unauthorized`,
Expand Down
Loading