[jboss-svn-commits] JBL Code SVN: r29481 - in labs/jbossesb/workspace/dbevenius/saml_support/product: rosetta/src/org/jboss/soa/esb/actions/security and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: beve
Date: 2009-09-28 04:42:47 -0400 (Mon, 28 Sep 2009)
New Revision: 29481

Modified:
   labs/jbossesb/workspace/dbevenius/saml_support/product/lib/ext/jboss-identity-fed-api-1.0.0.beta3.jar
   labs/jbossesb/workspace/dbevenius/saml_support/product/lib/ext/jboss-identity-fed-core-1.0.0.beta3.jar
   labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/actions/security/JBossSTSAction.java
   labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/jboss-sts.war
Log:
Updated identity to new version so that the STSClient not supports specifying an endpointURI.
Updated jboss-sts.war to add a service provider with the EndpointURI specified.


Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/lib/ext/jboss-identity-fed-api-1.0.0.beta3.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/lib/ext/jboss-identity-fed-core-1.0.0.beta3.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/actions/security/JBossSTSAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/actions/security/JBossSTSAction.java	2009-09-28 08:36:45 UTC (rev 29480)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/actions/security/JBossSTSAction.java	2009-09-28 08:42:47 UTC (rev 29481)
@@ -88,19 +88,26 @@
     public static final String ADD_TO_ESB_AUTH_REQUEST = "addToEsbAuthRequest";
     public static final String STS_CONFIG = "configFile";
     public static final String TOKEN_TYPE_OPTION = "tokenType";
+    public static final String ENDPOINT_URI_OPTION = "endpointURI";
     
     private final Logger log = Logger.getLogger(JBossSTSAction.class);
     
     private STSClientConfig wsTrustConfig;
     private final String tokenType;
+    private String endpointURI;
     private boolean addAssertionToEsbAuthRequest;
     private STSClient wsTrustClient;
 
     public JBossSTSAction(final ConfigTree config) throws ConfigurationException
     {
         wsTrustConfig = new STSClientConfig.Builder().build(config.getRequiredAttribute(STS_CONFIG));
-        tokenType = config.getRequiredAttribute(TOKEN_TYPE_OPTION);
         addAssertionToEsbAuthRequest = config.getBooleanAttribute(ADD_TO_ESB_AUTH_REQUEST, false);
+        tokenType = config.getAttribute(TOKEN_TYPE_OPTION);
+        endpointURI = config.getAttribute(ENDPOINT_URI_OPTION);
+        if (tokenType == null && endpointURI == null)
+        {
+            throw new ConfigurationException("One of " + TOKEN_TYPE_OPTION + " or " + ENDPOINT_URI_OPTION + " must be set.");
+        }
     }
     
     @Override
@@ -114,7 +121,7 @@
         AssertArgument.isNotNull(message, "message");
         try
         {
-            final Element assertion = wsTrustClient.issueToken(tokenType);
+            Element assertion = endpointURI != null ? wsTrustClient.issueTokenForEndpoint(endpointURI) : wsTrustClient.issueToken(tokenType);
             
             if (log.isDebugEnabled())
             {

Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/jboss-esb.xml	2009-09-28 08:36:45 UTC (rev 29480)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/jboss-esb.xml	2009-09-28 08:42:47 UTC (rev 29481)
@@ -28,7 +28,8 @@
 
                 <action name="issueToken" class="org.jboss.soa.esb.actions.security.JBossSTSAction">
                     <property name="configFile" value="jboss-sts-client.properties"/>
-                    <property name="tokenType" value="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"/>
+                    <!--property name="tokenType" value="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"/-->
+                    <property name="endpointURI" value="http://security_saml/goodbyeworld"/>
                     <property name="addToEsbAuthRequest" value="true"/>
 				</action>
 

Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/jboss-sts.war
===================================================================
(Binary files differ)