Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 85853930B for ; Fri, 24 May 2013 19:54:23 +0000 (UTC) Received: (qmail 95355 invoked by uid 500); 24 May 2013 19:54:22 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 95309 invoked by uid 500); 24 May 2013 19:54:22 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 95302 invoked by uid 99); 24 May 2013 19:54:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 May 2013 19:54:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 May 2013 19:54:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A37D02388AB8; Fri, 24 May 2013 19:54:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1486200 - /cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java Date: Fri, 24 May 2013 19:54:01 -0000 To: commits@cxf.apache.org From: owulff@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130524195401.A37D02388AB8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: owulff Date: Fri May 24 19:54:01 2013 New Revision: 1486200 URL: http://svn.apache.org/r1486200 Log: Support adding full group name to SAML token for filtered group list Modified: cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java Modified: cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java?rev=1486200&r1=1486199&r2=1486200&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java (original) +++ cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java Fri May 24 19:54:01 2013 @@ -54,8 +54,17 @@ public class LdapGroupClaimsHandler impl private String groupNameGlobalFilter = ROLE; private String groupNameScopedFilter = SCOPE + "_" + ROLE; private Map appliesToScopeMapping; + private boolean useFullGroupNameAsValue = false; + public boolean isUseFullGroupNameAsValue() { + return useFullGroupNameAsValue; + } + + public void setUseFullGroupNameAsValue(boolean useFullGroupNameAsValue) { + this.useFullGroupNameAsValue = useFullGroupNameAsValue; + } + public String getUserObjectClass() { return userObjectClass; } @@ -251,14 +260,26 @@ public class LdapGroupClaimsHandler impl // Demo_User -> Role=User // Demo_Admin -> Role=Admin String filter = this.groupNameScopedFilter; - filteredGroups.add(parseRole(group, filter.replaceAll(SCOPE, scope))); + String role = null; + if (isUseFullGroupNameAsValue()) { + role = group; + } else { + role = parseRole(group, filter.replaceAll(SCOPE, scope)); + } + filteredGroups.add(role); } else { if (globalPattern.matcher(group).matches()) { //Group matches the global filter //ex. (default groupNameGlobalFilter) // User -> Role=User // Admin -> Role=Admin - filteredGroups.add(parseRole(group, this.groupNameGlobalFilter)); + String role = null; + if (isUseFullGroupNameAsValue()) { + role = group; + } else { + role = parseRole(group, this.groupNameGlobalFilter); + } + filteredGroups.add(role); } else { LOG.finer("Group '" + group + "' doesn't match scoped and global group filter"); }