[jboss-svn-commits] JBL Code SVN: r29426 - in labs/jbossesb/workspace/dbevenius/saml_support/product: install and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 22 03:16:15 EDT 2009
Author: beve
Date: 2009-09-22 03:16:15 -0400 (Tue, 22 Sep 2009)
New Revision: 29426
Modified:
labs/jbossesb/workspace/dbevenius/saml_support/product/install/build.xml
labs/jbossesb/workspace/dbevenius/saml_support/product/ivy.xml
labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSLoginModule.java
labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/JBossSTSSecurityHandler.java
labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/deployment.xml
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/readme.txt
labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/war/resources/WEB-INF/web.xml
Log:
Got saml security to work with AS 4.2.3.
Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/install/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/install/build.xml 2009-09-21 19:33:53 UTC (rev 29425)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/install/build.xml 2009-09-22 07:16:15 UTC (rev 29426)
@@ -167,6 +167,16 @@
<!-- install h2 jar -->
<copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${server.lib.dir}"/>
+
+ <!-- copy JBoss Identity jars -->
+ <copy todir="${server.lib.dir}" overwrite="true">
+ <fileset dir="${org.jboss.esb.dist.lib}">
+ <include name="jboss-identity-*.jar"/>
+ <include name="xmlsec-*.jar"/>
+ </fileset>
+ </copy>
+ <copy file="${org.jboss.esb.dist.lib}/jbossws-native-core-3.0.5.GA.jar" tofile="${deploy.dir}/jbossws.sar/jbossws-core.jar"/>
+ <copy file="${org.jboss.esb.dist.lib}/jbossws-common-1.0.8.GA.jar" tofile="${server.lib.dir}/jbossws-common.jar"/>
<!-- embedded jopr console -->
<ant dir="embedded-console" target="copy-console">
@@ -253,6 +263,15 @@
</fileset>
</copy>
+ <copy todir="${org.jboss.esb.server.home}/common/lib" overwrite="true">
+ <fileset dir="${org.jboss.esb.dist.lib}">
+ <include name="jboss-identity-*.jar"/>
+ <include name="xmlsec-*.jar"/>
+ </fileset>
+ </copy>
+
+ <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
+
<!-- jbossesb.sar -->
<copy todir="${deploy.dir}/jbossesb.sar" includeemptydirs="false" overwrite="true">
<fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar">
@@ -338,7 +357,7 @@
<copy file="${org.jboss.esb.dist}/tools/console/console/jboss-esb-console.ear/contract.war" todir="${deploy.dir}" />
<!-- install h2 jar -->
- <copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${server.lib.dir}"/>
+ <copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${org.jboss.esb.server.home}/common/lib" overwrite="true"/>
<copy file="${org.jboss.esb.dist.lib}/scout-1.0.jar" tofile="${client.dir}/scout.jar" overwrite="true"/>
Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/ivy.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/ivy.xml 2009-09-21 19:33:53 UTC (rev 29425)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/ivy.xml 2009-09-22 07:16:15 UTC (rev 29426)
@@ -168,6 +168,11 @@
<dependency org="org.jboss.identity" name="jboss-identity-bindings" rev="1.0.0.beta2"/>
<dependency org="org.jboss.identity" name="jboss-identity-bindings-jboss" rev="1.0.0.beta2"/>
<dependency org="org.jboss.identity" name="jboss-identity-web" rev="1.0.0.beta2"/>
+ <dependency org="org.apache" name="xmlsec" rev="1.4.3"/>
+ <!-- Needed for WSTrustClient with JBoss AS 4.x :https://jira.jboss.org/jira/browse/JBWS-2346 -->
+ <dependency org="org.jboss.ws.native" name="jbossws-native-core" rev="3.0.5.GA"/>
+ <dependency org="org.jboss.ws" name="jbossws-common" rev="1.0.8.GA"/>
+
</dependencies>
</ivy-module>
Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSLoginModule.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSLoginModule.java 2009-09-21 19:33:53 UTC (rev 29425)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSLoginModule.java 2009-09-22 07:16:15 UTC (rev 29426)
@@ -214,9 +214,6 @@
AssertionType samlTokenType = SAMLUtil.fromElement(samlToken);
logger.info("Successfully validated Assertion. ");
- // Use info to populate Subject.
- SubjectType subjectType = samlTokenType.getSubject();
-
// Add the SamlToken to the authenticated Subjects principals
subject.getPrincipals().add(new SamlPrincipal(samlToken));
Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/JBossSTSSecurityHandler.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/JBossSTSSecurityHandler.java 2009-09-21 19:33:53 UTC (rev 29425)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/JBossSTSSecurityHandler.java 2009-09-22 07:16:15 UTC (rev 29426)
@@ -21,11 +21,10 @@
package org.jboss.soa.esb.services.security.auth.ws;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import javax.annotation.Resource;
+//import javax.annotation.Resource;
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPHeader;
@@ -199,7 +198,14 @@
*
* @param configFile
*/
- @Resource (name = "JBossSTSClientConfig")
+
+ /*
+ * @Resource (name = "JBossSTSClientConfig")
+ * Commented out as this does not work with AS4.2.3
+ * with AS 5.1.0 this works as expected.
+ *
+ *
+ */
public void setConfigFile(final String configFile)
{
if (configFile != null)
@@ -207,5 +213,4 @@
this.configFile = configFile;
}
}
-
}
Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/deployment.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/deployment.xml 2009-09-21 19:33:53 UTC (rev 29425)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/deployment.xml 2009-09-22 07:16:15 UTC (rev 29426)
@@ -3,5 +3,4 @@
<depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_security_saml_gw</depends>
<depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_security_saml_esb</depends>
<depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_security_saml_esb_reply</depends>
- <depends>jboss.web.deployment:war=/jboss-sts</depends>
</jbossesb-deployment>
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-21 19:33:53 UTC (rev 29425)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/jboss-esb.xml 2009-09-22 07:16:15 UTC (rev 29426)
@@ -27,7 +27,7 @@
<actions mep="OneWay">
<action name="issueToken" class="org.jboss.soa.esb.actions.security.JBossSTSAction">
- <property name="configFile" value="/jboss-sts-client.properties"/>
+ <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="addToEsbAuthRequest" value="true"/>
</action>
Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/readme.txt
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/readme.txt 2009-09-21 19:33:53 UTC (rev 29425)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/readme.txt 2009-09-22 07:16:15 UTC (rev 29426)
@@ -5,15 +5,18 @@
The following will be demonstrated by this quickstart:
- * Configuring a service to use JBossSTSLoginModule to validate a SAML Assertion.
- In JBossESB a service may be configured to use the JBossSTSLoginModule. This JAAS Login Module
- expects the caller to have a SAML Assertion in its AuthenticationRequest.
-
* Using the JBossSTSAction to request a SAML Assertion from JBossSTS
This action would be used when a call to one or more internal or external
service require a valid SAML Assertion. This would be called once and authentication
would only be performed once.
+ * Configuring a service to use JBossSTSLoginModule to validate a SAML Assertion.
+ In JBossESB a service may be configured to use the JBossSTSLoginModule. This JAAS Login Module
+ expects the caller to have a SAML Assertion in its AuthenticationRequest.
+
+ * Calling an external, external to the ESB that is, web service that is secured using
+ JBossSTS.
+
Running this quickstart:
========================
Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts
Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/war/resources/WEB-INF/web.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/war/resources/WEB-INF/web.xml 2009-09-21 19:33:53 UTC (rev 29425)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/samples/quickstarts/security_saml/war/resources/WEB-INF/web.xml 2009-09-22 07:16:15 UTC (rev 29426)
@@ -15,10 +15,12 @@
<url-pattern>/GoodbyeWorldWS</url-pattern>
</servlet-mapping>
+ <!--
<env-entry>
- <env-entry-name>JBossSTSClientConfig</env-entry-name>
+ <env-entry-name>configFile</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>/jboss-sts-client.properties</env-entry-value>
</env-entry>
+ -->
</web-app>
More information about the jboss-svn-commits
mailing list