Skip to content

Sanitize additional client authentication header #130891

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 1 commit into from
Jul 11, 2025
Merged

Sanitize additional client authentication header #130891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,7 @@ public void sanitizeHeaders() {
entry -> entry.getKey().equalsIgnoreCase("authorization")
|| entry.getKey().equalsIgnoreCase("es-secondary-authorization")
|| entry.getKey().equalsIgnoreCase("ES-Client-Authentication")
|| entry.getKey().equalsIgnoreCase("X-Client-Authentication")
);

final ThreadContextStruct newContext = new ThreadContextStruct(
Expand Down
3 changes: 2 additions & 1 deletion server/src/test/java/org/elasticsearch/common/util/concurrent/ThreadContextTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,8 @@ public void testSanitizeHeaders() {
final String authorizationHeader = randomCase("authorization");
final String authorizationHeader2 = randomCase("es-secondary-authorization");
final String authorizationHeader3 = randomCase("ES-Client-Authentication");
Set<String> possibleHeaders = Set.of(authorizationHeader, authorizationHeader2, authorizationHeader3);
final String authorizationHeader4 = randomCase("X-Client-Authentication");
Set<String> possibleHeaders = Set.of(authorizationHeader, authorizationHeader2, authorizationHeader3, authorizationHeader4);
Set<String> headers = randomizeHeaders
? randomSet(0, possibleHeaders.size(), () -> randomFrom(possibleHeaders))
: possibleHeaders;
Expand Down