Skip to content

Do not allow users to send internal extra credentials #23294

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
wendigo merged 2 commits into from
Sep 5, 2024
Merged

Do not allow users to send internal extra credentials #23294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b665f63
Extract method in TestHttpRequestSessionContextFactory
electrum Sep 4, 2024
b7fa03e
Do not allow users to send internal extra credentials
electrum Sep 4, 2024
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
6 changes: 5 additions & 1 deletion core/trino-main/src/main/java/io/trino/server/HttpRequestSessionContextFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,11 @@ private static SelectedRole toSelectedRole(ProtocolHeaders protocolHeaders, Stri

private static Map<String, String> parseExtraCredentials(ProtocolHeaders protocolHeaders, MultivaluedMap<String, String> headers)
{
return parseProperty(headers, protocolHeaders.requestExtraCredential());
Map<String, String> credentials = parseProperty(headers, protocolHeaders.requestExtraCredential());
for (String name : credentials.keySet()) {
assertRequest(!name.startsWith("internal$"), "Invalid extra credential name: %s", name);
}
return credentials;
}

private static Map<String, String> parseProperty(MultivaluedMap<String, String> headers, String headerName)
Expand Down
35 changes: 23 additions & 12 deletions core/trino-main/src/test/java/io/trino/server/TestHttpRequestSessionContextFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.MultivaluedHashMap;
import jakarta.ws.rs.core.MultivaluedMap;
import org.assertj.core.api.AbstractThrowableAssert;
import org.junit.jupiter.api.Test;

import java.util.Optional;
Expand Down Expand Up @@ -134,12 +135,7 @@ private static void assertMappedUser(ProtocolHeaders protocolHeaders)
Optional.of(Identity.ofUser("mappedUser")));
assertThat(context.getIdentity()).isEqualTo(Identity.forUser("testUser").withGroups(ImmutableSet.of("testUser")).build());

assertThatThrownBy(
() -> sessionContextFactory(protocolHeaders).createSessionContext(
emptyHeaders,
Optional.of("testRemote"),
Optional.empty()))
.isInstanceOf(WebApplicationException.class)
assertInvalidSession(protocolHeaders, emptyHeaders)
.matches(e -> ((WebApplicationException) e).getResponse().getStatus() == 400);
}

Expand All @@ -164,15 +160,30 @@ private static void assertPreparedStatementsHeaderDoesNotParse(ProtocolHeaders p
.put(protocolHeaders.requestPreparedStatement(), "query1=abcdefg")
.build());

assertThatThrownBy(
() -> sessionContextFactory(protocolHeaders).createSessionContext(
headers,
Optional.of("testRemote"),
Optional.empty()))
.isInstanceOf(WebApplicationException.class)
assertInvalidSession(protocolHeaders, headers)
.hasMessageMatching("Invalid " + protocolHeaders.requestPreparedStatement() + " header: line 1:1: mismatched input 'abcdefg'. Expecting: .*");
}

@Test
public void testInternalExtraCredentialName()
{
MultivaluedMap<String, String> headers = new GuavaMultivaluedMap<>(ImmutableListMultimap.<String, String>builder()
.put(TRINO_HEADERS.requestUser(), "testUser")
.put(TRINO_HEADERS.requestExtraCredential(), "internal$abc=xyz")
.build());

assertInvalidSession(TRINO_HEADERS, headers)
.hasMessage("Invalid extra credential name: internal$abc");
}

private static AbstractThrowableAssert<?, ? extends Throwable> assertInvalidSession(ProtocolHeaders protocolHeaders, MultivaluedMap<String, String> headers)
{
return assertThatThrownBy(
() -> sessionContextFactory(protocolHeaders)
.createSessionContext(headers, Optional.of("testRemote"), Optional.empty()))
.isInstanceOf(WebApplicationException.class);
}

private static HttpRequestSessionContextFactory sessionContextFactory(ProtocolHeaders headers)
{
return new HttpRequestSessionContextFactory(
Expand Down