Skip to content

fix: basic auth validation #8053

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
arkodg merged 5 commits into from
Jan 31, 2026
Merged

fix: basic auth validation #8053

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b705a46
fix basic auth validation
zhaohuabing Jan 26, 2026
a07c8f1
Merge branch 'main' into fix-8034
zhaohuabing Jan 28, 2026
dc35eef
Merge branch 'main' into fix-8034
zhaohuabing Jan 31, 2026
f7f56b9
release note
zhaohuabing Jan 31, 2026
eb7c2f6
release note
zhaohuabing Jan 31, 2026
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
10 changes: 10 additions & 0 deletions internal/gatewayapi/securitypolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
package gatewayapi

import (
//nolint:gosec // SHA1 is required to validate htpasswd {SHA} format.
"crypto/sha1"
"crypto/tls"
"encoding/base64"
"encoding/json"
Expand Down Expand Up @@ -1829,6 +1831,14 @@ func validateHtpasswdFormat(data []byte) error {
if !strings.HasPrefix(password, "{SHA}") {
return fmt.Errorf("unsupported htpasswd format: please use {SHA}")
}
// Envoy BasicAuth only supports unsalted SHA1 {SHA}<base64> generated by htpasswd.

@arkodg arkodg Jan 30, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

can we rm L1834 string SHA check, since this makes it redundant

@zhaohuabing zhaohuabing Jan 31, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

It's not redundant - the hashed password must start with "{SHA}", and Line1838 doesn't check that.

shaBytes, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(password, "{SHA}"))
if err != nil {
return fmt.Errorf("invalid htpasswd format: {SHA} must be base64-encoded SHA1")
}
if len(shaBytes) != sha1.Size {
return fmt.Errorf("invalid htpasswd format: {SHA} must be SHA1 (%d bytes)", sha1.Size)
}
}
return nil
}
Expand Down
11 changes: 8 additions & 3 deletions internal/gatewayapi/securitypolicy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,12 +681,12 @@ func Test_validateHtpasswdFormat(t *testing.T) {
}{
{
name: "valid htpasswd with SHA format",
htpasswd: "user1:{SHA}hashed_user1_password\nuser2:{SHA}hashed_user2_password",
htpasswd: "user1:{SHA}W6ph5Mm5Pz8GgiULbPgzG37mj9g=\nuser2:{SHA}qUqP5cyxm6YcTAhz05Hph5gvu9M=",
wantError: false,
},
{
name: "valid htpasswd with SHA format and empty lines",
htpasswd: "user1:{SHA}hashed_user1_password\n\nuser2:{SHA}hashed_user2_password\n",
htpasswd: "user1:{SHA}W6ph5Mm5Pz8GgiULbPgzG37mj9g=\n\nuser2:{SHA}qUqP5cyxm6YcTAhz05Hph5gvu9M=\n",
wantError: false,
},
{
Expand All @@ -709,9 +709,14 @@ func Test_validateHtpasswdFormat(t *testing.T) {
htpasswd: "user1{SHA}hashed_user1_password",
wantError: true,
},
{
name: "invalid htpasswd with hex sha1",
htpasswd: "user1:{SHA}5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
wantError: true,
},
{
name: "mixed valid and invalid formats",
htpasswd: "user1:{SHA}hashed_user1_password\nuser2:$apr1$hashed_user2_password",
htpasswd: "user1:{SHA}W6ph5Mm5Pz8GgiULbPgzG37mj9g=\nuser2:$apr1$hashed_user2_password",
wantError: true,
},
}
Expand Down
2 changes: 1 addition & 1 deletion release-notes/current.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ bug fixes: |
Fixed validation of certificates in a CA bundle when some certificates are invalid.
Fixed an issue where route match rule order is wrong when merging with empty path match.
Fixed wrong cluster type selection when an HTTPRoute mixes Service backends with Backend (FQDN) references, ensuring STRICT_DNS clusters are generated for the FQDN targets.

Fixed SecurityPolicy BasicAuth validation to reject invalid {SHA} htpasswd entries.

# Enhancements that improve performance.
performance improvements: |
Expand Down