From bd2fc56224f90448a42b1ac2a3f29f717d2ad3f3 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 17 Nov 2026 09:28:15 -0800 Subject: [PATCH 1/5] RANGER-5767: Do not assign header auth roles to users provisioned on behalf of others When header-based authentication is enabled, auto-provisioned external users were assigned the roles from the current request's trusted-proxy token. Creating a service with default policies that reference not-yet-existing users therefore granted those users the creating user's roles (e.g. ROLE_SYS_ADMIN). getHeaderAuthRoles() now takes the username being provisioned and only returns header roles when it matches the authenticated principal. Other users fall back to ROLE_USER and are created without the elevated system session. --- .../main/java/org/apache/ranger/biz/XUserMgr.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java index 047546aec3..6523d6ec34 100755 --- a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java @@ -3834,16 +3834,19 @@ private void updateUserStoreVersion(String label) { /** * Resolves the roles to assign to a freshly auto-provisioned external user. When header-based * authentication is enabled and the current request was authenticated through the trusted proxy, - * the (validated) roles carried in the {@link RangerAuthenticationToken} authorities are used. - * Returns {@code null} otherwise, in which case the caller falls back to the default ROLE_USER. + * the (validated) roles carried in the {@link RangerAuthenticationToken} authorities are used, + * but only when the authenticated principal is the user being provisioned. Users provisioned on + * behalf of another principal (e.g. users referenced in a new service's default policies) must + * not inherit the caller's roles. Returns {@code null} otherwise, in which case the caller falls + * back to the default ROLE_USER. */ - private List getHeaderAuthRoles() { + private List getHeaderAuthRoles(String username) { List ret = null; if (PropertiesUtil.getBooleanProperty(RangerHeaderPreAuthFilter.PROP_HEADER_AUTH_ENABLED, false)) { Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - if (auth instanceof RangerAuthenticationToken && ((RangerAuthenticationToken) auth).getAuthType() == XXAuthSession.AUTH_TYPE_TRUSTED_PROXY) { + if (auth instanceof RangerAuthenticationToken && ((RangerAuthenticationToken) auth).getAuthType() == XXAuthSession.AUTH_TYPE_TRUSTED_PROXY && StringUtils.equalsIgnoreCase(auth.getName(), username)) { List roles = new ArrayList<>(); for (GrantedAuthority authority : auth.getAuthorities()) { @@ -3922,7 +3925,7 @@ private void createExternalUser() { vXPortalUser.setLoginId(userName); vXPortalUser.setUserSource(RangerCommonEnums.USER_EXTERNAL); - List headerRoles = getHeaderAuthRoles(); + List headerRoles = getHeaderAuthRoles(userName); boolean trustedHeaderRoles = CollectionUtils.isNotEmpty(headerRoles); ArrayList roleList = new ArrayList<>(); From 6e45ee423159b31cfb6daa65124f7e12bce8a165 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 17 Nov 2026 12:30:06 -0800 Subject: [PATCH 2/5] address review suggestion - take different approach --- .../java/org/apache/ranger/biz/XUserMgr.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java index 6523d6ec34..4736e0f05d 100755 --- a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java @@ -3834,19 +3834,16 @@ private void updateUserStoreVersion(String label) { /** * Resolves the roles to assign to a freshly auto-provisioned external user. When header-based * authentication is enabled and the current request was authenticated through the trusted proxy, - * the (validated) roles carried in the {@link RangerAuthenticationToken} authorities are used, - * but only when the authenticated principal is the user being provisioned. Users provisioned on - * behalf of another principal (e.g. users referenced in a new service's default policies) must - * not inherit the caller's roles. Returns {@code null} otherwise, in which case the caller falls - * back to the default ROLE_USER. + * the (validated) roles carried in the {@link RangerAuthenticationToken} authorities are used. + * Returns {@code null} otherwise, in which case the caller falls back to the default ROLE_USER. */ - private List getHeaderAuthRoles(String username) { + private List getHeaderAuthRoles() { List ret = null; if (PropertiesUtil.getBooleanProperty(RangerHeaderPreAuthFilter.PROP_HEADER_AUTH_ENABLED, false)) { Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - if (auth instanceof RangerAuthenticationToken && ((RangerAuthenticationToken) auth).getAuthType() == XXAuthSession.AUTH_TYPE_TRUSTED_PROXY && StringUtils.equalsIgnoreCase(auth.getName(), username)) { + if (auth instanceof RangerAuthenticationToken && ((RangerAuthenticationToken) auth).getAuthType() == XXAuthSession.AUTH_TYPE_TRUSTED_PROXY) { List roles = new ArrayList<>(); for (GrantedAuthority authority : auth.getAuthorities()) { @@ -3925,11 +3922,13 @@ private void createExternalUser() { vXPortalUser.setLoginId(userName); vXPortalUser.setUserSource(RangerCommonEnums.USER_EXTERNAL); - List headerRoles = getHeaderAuthRoles(userName); - boolean trustedHeaderRoles = CollectionUtils.isNotEmpty(headerRoles); - ArrayList roleList = new ArrayList<>(); + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + boolean isSelfProvisioning = auth instanceof RangerAuthenticationToken && ((RangerAuthenticationToken) auth).getAuthType() == XXAuthSession.AUTH_TYPE_TRUSTED_PROXY && StringUtils.equalsIgnoreCase(auth.getName(), userName); + List headerRoles = getHeaderAuthRoles(); + boolean trustedHeaderRoles = CollectionUtils.isNotEmpty(headerRoles); + ArrayList roleList = new ArrayList<>(); - if (trustedHeaderRoles) { + if (isSelfProvisioning && trustedHeaderRoles) { roleList.addAll(headerRoles); } else { roleList.add(RangerConstants.ROLE_USER); From cb2a23ab4802e1855f74494b40954610157d8400 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 17 Nov 2026 14:17:55 -0800 Subject: [PATCH 3/5] prevent audit-trail loss of the creator of the users --- .../src/main/java/org/apache/ranger/biz/XUserMgr.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java index 4736e0f05d..3b2463982d 100755 --- a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java @@ -3926,9 +3926,10 @@ private void createExternalUser() { boolean isSelfProvisioning = auth instanceof RangerAuthenticationToken && ((RangerAuthenticationToken) auth).getAuthType() == XXAuthSession.AUTH_TYPE_TRUSTED_PROXY && StringUtils.equalsIgnoreCase(auth.getName(), userName); List headerRoles = getHeaderAuthRoles(); boolean trustedHeaderRoles = CollectionUtils.isNotEmpty(headerRoles); + boolean useHeaderRoles = isSelfProvisioning && trustedHeaderRoles; ArrayList roleList = new ArrayList<>(); - if (isSelfProvisioning && trustedHeaderRoles) { + if (useHeaderRoles) { roleList.addAll(headerRoles); } else { roleList.add(RangerConstants.ROLE_USER); @@ -3939,7 +3940,7 @@ private void createExternalUser() { xXPortalUser = userMgr.mapVXPortalUserToXXPortalUser(vXPortalUser); try { - xXPortalUser = createExternalPortalUser(xXPortalUser, roleList, trustedHeaderRoles); + xXPortalUser = createExternalPortalUser(xXPortalUser, roleList, useHeaderRoles); logger.debug("createExternalUser(): Successfully created user {} in x_portal_user table with roles {}", xXPortalUser.getLoginId(), roleList); } catch (Exception ex) { From 39e9f40317aab8b6920d2d1fd6475b3bd72bf477 Mon Sep 17 00:00:00 2001 From: Madhan Neethiraj Date: Tue, 17 Nov 2026 14:49:27 -0800 Subject: [PATCH 4/5] Refactor role assignment logic in XUserMgr.java --- .../java/org/apache/ranger/biz/XUserMgr.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java index 3b2463982d..3b7f85838c 100755 --- a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java @@ -3922,15 +3922,21 @@ private void createExternalUser() { vXPortalUser.setLoginId(userName); vXPortalUser.setUserSource(RangerCommonEnums.USER_EXTERNAL); - Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - boolean isSelfProvisioning = auth instanceof RangerAuthenticationToken && ((RangerAuthenticationToken) auth).getAuthType() == XXAuthSession.AUTH_TYPE_TRUSTED_PROXY && StringUtils.equalsIgnoreCase(auth.getName(), userName); - List headerRoles = getHeaderAuthRoles(); - boolean trustedHeaderRoles = CollectionUtils.isNotEmpty(headerRoles); - boolean useHeaderRoles = isSelfProvisioning && trustedHeaderRoles; - ArrayList roleList = new ArrayList<>(); - - if (useHeaderRoles) { - roleList.addAll(headerRoles); + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + boolean isSelfProvisioning = auth instanceof RangerAuthenticationToken && ((RangerAuthenticationToken) auth).getAuthType() == XXAuthSession.AUTH_TYPE_TRUSTED_PROXY && StringUtils.equalsIgnoreCase(auth.getName(), userName); + ArrayList roleList = new ArrayList<>(); + boolean useHeaderRoles = false; + + if (isSelfProvisioning) { + List headerRoles = getHeaderAuthRoles(); + + if (CollectionUtils.isNotEmpty(headerRoles)) { + useHeaderRoles = true; + + roleList.addAll(headerRoles); + } else { + roleList.add(RangerConstants.ROLE_USER); + } } else { roleList.add(RangerConstants.ROLE_USER); } From 68568fbee6142571bc6c2699be33ed577462f3c8 Mon Sep 17 00:00:00 2001 From: Madhan Neethiraj Date: Tue, 17 Nov 2026 15:13:39 -0800 Subject: [PATCH 5/5] Remove unnecessary blank line in XUserMgr.java --- .../src/main/java/org/apache/ranger/biz/XUserMgr.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java index 3b7f85838c..fcf8489601 100755 --- a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java @@ -3929,7 +3929,7 @@ private void createExternalUser() { if (isSelfProvisioning) { List headerRoles = getHeaderAuthRoles(); - + if (CollectionUtils.isNotEmpty(headerRoles)) { useHeaderRoles = true;