Author: anil.saldhana(a)jboss.com
Date: 2011-02-22 21:19:04 -0500 (Tue, 22 Feb 2011)
New Revision: 767
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/interfaces/SAML2Handler.java
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/constants/GeneralConstants.java
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java
Log:
PLFED-140: PLFED-141:
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/interfaces/SAML2Handler.java
===================================================================
---
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/interfaces/SAML2Handler.java 2011-02-23
02:09:23 UTC (rev 766)
+++
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/interfaces/SAML2Handler.java 2011-02-23
02:19:04 UTC (rev 767)
@@ -34,7 +34,9 @@
{
//Define some constants
String DISABLE_AUTHN_STATEMENT = "DISABLE_AUTHN_STATEMENT";
- String DISABLE_SENDING_ROLES = "DISABLE_SENDING_ROLES";
+ String DISABLE_SENDING_ROLES = "DISABLE_SENDING_ROLES";
+ String DISABLE_ROLE_PICKING = "DISABLE_ROLE_PICKING";
+ String ROLE_KEY = "ROLE_KEY";
/**
* Processing Point - idp side
Modified:
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/constants/GeneralConstants.java
===================================================================
---
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/constants/GeneralConstants.java 2011-02-23
02:09:23 UTC (rev 766)
+++
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/constants/GeneralConstants.java 2011-02-23
02:19:04 UTC (rev 767)
@@ -40,8 +40,6 @@
String CONFIGURATION = "CONFIGURATION";
String CONFIG_FILE_LOCATION = "/WEB-INF/picketlink-idfed.xml";
- String DISABLE_ROLE_PICKING = "DisableRolePicking";
-
String GLOBAL_LOGOUT = "GLO";
String HANDLER_CONFIG_FILE_LOCATION = "/WEB-INF/picketlink-handlers.xml";
@@ -59,12 +57,6 @@
String ROLES = "ROLES";
String ROLES_ID = "jboss_identity.roles";
- /**
- * {@link SAML2AuthenticationHandler} can be configured with a key that picks
- * the attributes from the IDP attribute statements
- */
- String ROLE_KEY = "ROLE_KEY";
-
String ROLE_GENERATOR = "ROLE_GENERATOR";
String ROLE_VALIDATOR = "ROLE_VALIDATOR";
String ROLE_VALIDATOR_IGNORE = "ROLE_VALIDATOR_IGNORE";
Modified:
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java
===================================================================
---
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java 2011-02-23
02:09:23 UTC (rev 766)
+++
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java 2011-02-23
02:19:04 UTC (rev 767)
@@ -512,9 +512,9 @@
List<String> roles = new ArrayList<String>();
//PLFED-141: Disable role picking from IDP response
- if( handlerConfig.containsKey( GeneralConstants.DISABLE_ROLE_PICKING ))
+ if( handlerConfig.containsKey( DISABLE_ROLE_PICKING ))
{
- String val = (String) handlerConfig.getParameter(
GeneralConstants.DISABLE_ROLE_PICKING );
+ String val = (String) handlerConfig.getParameter( DISABLE_ROLE_PICKING );
if( StringUtil.isNotNull(val) &&
"true".equalsIgnoreCase(val) )
return roles;
}
@@ -522,9 +522,9 @@
//PLFED-140: which of the attribute statements represent roles?
List<String> roleKeys = new ArrayList<String>();
- if( handlerConfig.containsKey( GeneralConstants.ROLE_KEY ) )
+ if( handlerConfig.containsKey( ROLE_KEY ) )
{
- String roleKey = (String) handlerConfig.getParameter(
GeneralConstants.ROLE_KEY );
+ String roleKey = (String) handlerConfig.getParameter( ROLE_KEY );
roleKeys.addAll( StringUtil.tokenize( roleKey ) );
}
Show replies by date