Author: anil.saldhana(a)jboss.com
Date: 2011-05-10 19:57:26 -0400 (Tue, 10 May 2011)
New Revision: 936
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java
Log:
fall back for older versions of JBossSX
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java
===================================================================
---
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java 2011-05-10
23:56:45 UTC (rev 935)
+++
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java 2011-05-10
23:57:26 UTC (rev 936)
@@ -447,7 +447,14 @@
{
//password is masked
String salt = (String) options.get(PicketLinkFederationConstants.SALT);
- int iterationCount = Integer.parseInt((String)
options.get(PicketLinkFederationConstants.ITERATION_COUNT));
+ if (StringUtil.isNullOrEmpty(salt))
+ throw new RuntimeException("Salt is not configured as module
option");
+
+ String iCount = (String)
options.get(PicketLinkFederationConstants.ITERATION_COUNT);
+ if (StringUtil.isNullOrEmpty(iCount))
+ throw new RuntimeException("Iteration Count is not configured as
module option");
+
+ int iterationCount = Integer.parseInt(iCount);
try
{
builder.password(StringUtil.decode(passwordString, salt,
iterationCount));
@@ -682,6 +689,7 @@
}
}
+ @SuppressWarnings("deprecation")
protected void populateSubject()
{
MappingManager mappingManager = getMappingManager();
@@ -690,10 +698,26 @@
return;
}
- MappingContext<Principal> principalMappingContext =
mappingManager.getMappingContext(MappingType.PRINCIPAL
- .toString());
- MappingContext<RoleGroup> roleMappingContext =
mappingManager.getMappingContext(MappingType.ROLE.toString());
+ MappingContext<Principal> principalMappingContext = null;
+ MappingContext<RoleGroup> roleMappingContext = null;
+ try
+ {
+ principalMappingContext =
mappingManager.getMappingContext(MappingType.PRINCIPAL.toString());
+ }
+ catch (NoSuchMethodError nse)
+ {
+ principalMappingContext = mappingManager.getMappingContext(Principal.class);
+ }
+ try
+ {
+ roleMappingContext =
mappingManager.getMappingContext(MappingType.ROLE.toString());
+ }
+ catch (NoSuchMethodError nse)
+ {
+ roleMappingContext = mappingManager.getMappingContext(RoleGroup.class);
+ }
+
Map<String, Object> contextMap = new HashMap<String, Object>();
contextMap.put(SHARED_TOKEN, this.samlToken);
Show replies by date