Skip to content

Remove CallContext.getAuthenticatedPrincipal() #1400

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
Apr 18, 2025
Merged

Remove CallContext.getAuthenticatedPrincipal() #1400

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
9 changes: 0 additions & 9 deletions polaris-core/src/main/java/org/apache/polaris/core/context/CallContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.apache.iceberg.io.CloseableGroup;
import org.apache.polaris.core.PolarisCallContext;
import org.apache.polaris.core.PolarisDiagnostics;
import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -45,9 +44,6 @@ public interface CallContext extends AutoCloseable {
// created, scoped to the current call context.
String REQUEST_PATH_CATALOG_INSTANCE_KEY = "REQUEST_PATH_CATALOG_INSTANCE";

// Authenticator filters should populate this field alongside resolving a SecurityContext.
// Value type: AuthenticatedPolarisPrincipal
String AUTHENTICATED_PRINCIPAL = "AUTHENTICATED_PRINCIPAL";
String CLOSEABLES = "closeables";

static CallContext setCurrentContext(CallContext context) {
Expand All @@ -63,11 +59,6 @@ static PolarisDiagnostics getDiagnostics() {
return CURRENT_CONTEXT.get().getPolarisCallContext().getDiagServices();
}

static AuthenticatedPolarisPrincipal getAuthenticatedPrincipal() {
return (AuthenticatedPolarisPrincipal)
CallContext.getCurrentContext().contextVariables().get(CallContext.AUTHENTICATED_PRINCIPAL);
}

static void unsetCurrentContext() {
CURRENT_CONTEXT.remove();
}
Expand Down
2 changes: 0 additions & 2 deletions service/common/src/main/java/org/apache/polaris/service/auth/BasePolarisAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ protected Optional<AuthenticatedPolarisPrincipal> getPrincipal(DecodedToken toke

AuthenticatedPolarisPrincipal authenticatedPrincipal =
new AuthenticatedPolarisPrincipal(new PrincipalEntity(principal), activatedPrincipalRoles);
LOGGER.debug("Populating authenticatedPrincipal into CallContext: {}", authenticatedPrincipal);
callContext.contextVariables().put(CallContext.AUTHENTICATED_PRINCIPAL, authenticatedPrincipal);
return Optional.of(authenticatedPrincipal);
}
}