From 17dfbad8be3d468d7fab1b902b61618a3619ae5d Mon Sep 17 00:00:00 2001 From: Alexandre Dutra Date: Fri, 18 Apr 2025 17:11:20 +0200 Subject: [PATCH] Remove CallContext.getAuthenticatedPrincipal() --- .../org/apache/polaris/core/context/CallContext.java | 9 --------- .../polaris/service/auth/BasePolarisAuthenticator.java | 2 -- 2 files changed, 11 deletions(-) diff --git a/polaris-core/src/main/java/org/apache/polaris/core/context/CallContext.java b/polaris-core/src/main/java/org/apache/polaris/core/context/CallContext.java index 71c4577200..6cd56bc304 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/context/CallContext.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/context/CallContext.java @@ -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; @@ -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) { @@ -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(); } diff --git a/service/common/src/main/java/org/apache/polaris/service/auth/BasePolarisAuthenticator.java b/service/common/src/main/java/org/apache/polaris/service/auth/BasePolarisAuthenticator.java index 5c284a9345..ad2f9da4cf 100644 --- a/service/common/src/main/java/org/apache/polaris/service/auth/BasePolarisAuthenticator.java +++ b/service/common/src/main/java/org/apache/polaris/service/auth/BasePolarisAuthenticator.java @@ -111,8 +111,6 @@ protected Optional 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); } }