Author: anil.saldhana(a)jboss.com
Date: 2011-02-23 12:11:52 -0500 (Wed, 23 Feb 2011)
New Revision: 771
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLConstants.java
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLRequestWriter.java
federation/trunk/picketlink-fed-core/src/test/resources/parser/saml2/saml2-authnrequest.xml
Log:
PLFED-143: fix the authnrequest writing
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLConstants.java
===================================================================
---
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLConstants.java 2011-02-23
16:43:15 UTC (rev 770)
+++
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLConstants.java 2011-02-23
17:11:52 UTC (rev 771)
@@ -34,10 +34,12 @@
ASSERTION( "Assertion" ),
ASSERTION_CONSUMER_SERVICE( "AssertionConsumerService" ),
ASSERTION_CONSUMER_SERVICE_URL( "AssertionConsumerServiceURL" ),
+ ASSERTION_CONSUMER_SERVICE_INDEX( "AssertionConsumerServiceIndex" ),
ASSERTION_ID_REQUEST_SERVICE( "AssertionIDRequestService" ),
ATTRIBUTE( "Attribute" ),
ATTRIBUTE_AUTHORITY_DESCRIPTOR( "AttributeAuthorityDescriptor" ),
ATTRIBUTE_CONSUMING_SERVICE( "AttributeConsumingService" ),
+ ATTRIBUTE_CONSUMING_SERVICE_INDEX( "AttributeConsumingServiceIndex" ),
ATTRIBUTE_SERVICE( "AttributeService" ),
ATTRIBUTE_STATEMENT( "AttributeStatement" ),
ATTRIBUTE_VALUE( "AttributeValue" ),
@@ -69,6 +71,7 @@
EXTENSIONS( "Extensions" ),
FORMAT( "Format" ),
FRIENDLY_NAME( "FriendlyName" ),
+ FORCE_AUTHN( "ForceAuthn"),
GIVEN_NAME( "GivenName" ),
ID( "ID" ),
IDP_SSO_DESCRIPTOR( "IDPSSODescriptor" ),
@@ -77,6 +80,7 @@
IN_RESPONSE_TO( "InResponseTo" ),
ISDEFAULT( "isDefault" ),
IS_REQUIRED( "isRequired" ),
+ IS_PASSIVE( "IsPassive" ),
ISSUE_INSTANT( "IssueInstant" ),
ISSUER( "Issuer" ),
KEY_DESCRIPTOR( "KeyDescriptor" ),
@@ -102,7 +106,9 @@
ORGANIZATION_NAME( "OrganizationName" ),
ORGANIZATION_DISPLAY_NAME( "OrganizationDisplayName" ),
ORGANIZATION_URL( "OrganizationURL" ),
+ PROTOCOL_BINDING( "ProtocolBinding" ),
PROTOCOL_SUPPORT_ENUMERATION( "protocolSupportEnumeration" ),
+ PROVIDER_NAME( "ProviderName" ),
REQUESTED_AUTHN_CONTEXT( "RequestedAuthnContext" ),
RECIPIENT( "Recipient" ),
REQUEST( "Request" ),
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLRequestWriter.java
===================================================================
---
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLRequestWriter.java 2011-02-23
16:43:15 UTC (rev 770)
+++
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLRequestWriter.java 2011-02-23
17:11:52 UTC (rev 771)
@@ -91,6 +91,41 @@
if( assertionURL != null )
StaxUtil.writeAttribute( writer,
JBossSAMLConstants.ASSERTION_CONSUMER_SERVICE_URL.get(), assertionURL.toASCIIString() );
+ Boolean forceAuthn = request.isForceAuthn();
+ if( forceAuthn != null )
+ {
+ StaxUtil.writeAttribute( writer, JBossSAMLConstants.FORCE_AUTHN.get(),
forceAuthn.toString() );
+ }
+
+ Boolean isPassive = request.isIsPassive();
+ if( isPassive != null )
+ {
+ StaxUtil.writeAttribute( writer, JBossSAMLConstants.IS_PASSIVE.get(),
isPassive.toString() );
+ }
+
+ URI protocolBinding = request.getProtocolBinding();
+ if( protocolBinding != null )
+ {
+ StaxUtil.writeAttribute( writer, JBossSAMLConstants.PROTOCOL_BINDING.get(),
protocolBinding.toString() );
+ }
+
+ Integer assertionIndex = request.getAssertionConsumerServiceIndex();
+ if( assertionIndex != null )
+ {
+ StaxUtil.writeAttribute( writer,
JBossSAMLConstants.ASSERTION_CONSUMER_SERVICE_INDEX.get(), assertionIndex.toString() );
+ }
+
+ Integer attrIndex = request.getAttributeConsumingServiceIndex();
+ if( attrIndex != null )
+ {
+ StaxUtil.writeAttribute( writer,
JBossSAMLConstants.ATTRIBUTE_CONSUMING_SERVICE_INDEX.get(), attrIndex.toString() );
+ }
+ String providerName = request.getProviderName();
+ if( StringUtil.isNotNull( providerName ))
+ {
+ StaxUtil.writeAttribute( writer, JBossSAMLConstants.PROVIDER_NAME.get(),
providerName );
+ }
+
NameIDType issuer = request.getIssuer();
if( issuer != null )
{
Modified:
federation/trunk/picketlink-fed-core/src/test/resources/parser/saml2/saml2-authnrequest.xml
===================================================================
---
federation/trunk/picketlink-fed-core/src/test/resources/parser/saml2/saml2-authnrequest.xml 2011-02-23
16:43:15 UTC (rev 770)
+++
federation/trunk/picketlink-fed-core/src/test/resources/parser/saml2/saml2-authnrequest.xml 2011-02-23
17:11:52 UTC (rev 771)
@@ -6,6 +6,8 @@
IssueInstant="2007-12-17T18:40:52.203Z"
ProtocolBinding="urn:oasis:names.tc:SAML:2.0:bindings:HTTP-Redirect"
ProviderName="Test SAML2 SP" Version="2.0"
+ AssertionConsumerServiceIndex="0"
+ AttributeConsumingServiceIndex="0"
xmlns="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">