Author: anil.saldhana(a)jboss.com
Date: 2011-08-10 23:17:30 -0400 (Wed, 10 Aug 2011)
New Revision: 1175
Modified:
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java
Log:
Merging r1159 through r1173
Modified:
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java
===================================================================
---
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2011-08-11
03:13:45 UTC (rev 1174)
+++
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2011-08-11
03:17:30 UTC (rev 1175)
@@ -503,6 +503,10 @@
cleanUpSessionNote(request);
+ //Determine the transport mechanism
+ boolean isSecure = request.isSecure();
+ String loginType = determineLoginType(isSecure);
+
try
{
samlDocumentHolder = webRequestUtil.getSAMLDocumentHolder(samlRequestMessage);
@@ -522,6 +526,10 @@
SAML2HandlerRequest saml2HandlerRequest = new
DefaultSAML2HandlerRequest(protocolContext,
idpIssuer.getIssuer(), samlDocumentHolder, HANDLER_TYPE.IDP);
saml2HandlerRequest.setRelayState(relayState);
+ if (StringUtil.isNotNull(loginType))
+ {
+ saml2HandlerRequest.addOption(GeneralConstants.LOGIN_TYPE, loginType);
+ }
String assertionID = (String)
session.getSession().getAttribute(GeneralConstants.ASSERTION_ID);
@@ -1012,6 +1020,7 @@
String configFile = GeneralConstants.CONFIG_FILE_LOCATION;
context = (Context) getContainer();
+
if (idpConfiguration == null)
{
@@ -1238,4 +1247,4 @@
}
return attrStatement;
}
-}
+}
\ No newline at end of file
Show replies by date