Author: anil.saldhana(a)jboss.com Date: 2009-03-26 11:56:22 -0400 (Thu, 26 Mar 2009) New Revision: 403 Added: identity-federation/trunk/identity-bindings/src/test/resources/xacml/requests/himss-soap-request.xml Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/InteropEndpointDebugTestCase.java identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/TestServletConfig.java identity-federation/trunk/identity-fed-api/.classpath identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/util/XMLEncryptionUnitTestCase.java identity-federation/trunk/identity-xmlsecmodel/.classpath identity-federation/trunk/identity-xmlsecmodel/pom.xml Log: updates Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java 2009-03-26 15:55:38 UTC (rev 402) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java 2009-03-26 15:56:22 UTC (rev 403) @@ -34,8 +34,7 @@ import org.apache.catalina.LifecycleException; import org.apache.catalina.connector.Request; import org.apache.log4j.Logger; -import org.jboss.identity.federation.api.saml.v2.response.SAML2Response; -import org.jboss.identity.federation.api.util.XMLEncryptionUtil; +import org.jboss.identity.federation.api.saml.v2.response.SAML2Response; import org.jboss.identity.federation.bindings.config.EncryptionType; import org.jboss.identity.federation.bindings.config.KeyProviderType; import org.jboss.identity.federation.bindings.interfaces.TrustKeyManager; @@ -45,6 +44,7 @@ import org.jboss.identity.federation.core.saml.v2.util.SignatureUtil; import org.jboss.identity.federation.saml.v2.assertion.EncryptedElementType; import org.jboss.identity.federation.saml.v2.protocol.ResponseType; +import org.jboss.identity.xmlsec.util.XMLEncryptionUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java 2009-03-26 15:55:38 UTC (rev 402) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java 2009-03-26 15:56:22 UTC (rev 403) @@ -27,8 +27,7 @@ import org.apache.catalina.LifecycleException; import org.apache.catalina.connector.Request; import org.apache.log4j.Logger; -import org.jboss.identity.federation.api.saml.v2.response.SAML2Response; -import org.jboss.identity.federation.api.util.XMLEncryptionUtil; +import org.jboss.identity.federation.api.saml.v2.response.SAML2Response; import org.jboss.identity.federation.bindings.config.KeyProviderType; import org.jboss.identity.federation.bindings.interfaces.TrustKeyManager; import org.jboss.identity.federation.bindings.util.RedirectBindingSignatureUtil; @@ -36,6 +35,7 @@ import org.jboss.identity.federation.core.saml.v2.util.SignatureUtil; import org.jboss.identity.federation.saml.v2.assertion.EncryptedElementType; import org.jboss.identity.federation.saml.v2.protocol.ResponseType; +import org.jboss.identity.xmlsec.util.XMLEncryptionUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/InteropEndpointDebugTestCase.java =================================================================== --- identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/InteropEndpointDebugTestCase.java 2009-03-26 15:55:38 UTC (rev 402) +++ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/InteropEndpointDebugTestCase.java 2009-03-26 15:56:22 UTC (rev 403) @@ -56,7 +56,7 @@ //String endpoint = "http://interop.demo.jboss.com/test/SOAPServlet"; //String endpoint = "http://localhost:8080/test/SOAPServlet"; - public void AtestUseCase1() throws Exception + public void testUseCase1() throws Exception { if(endpoint != null) { @@ -66,7 +66,7 @@ } } - public void BtestUseCase2() throws Exception + public void testUseCase2() throws Exception { if(endpoint != null) { @@ -90,14 +90,14 @@ } } - public void BtestA() throws Exception + public void testA() throws Exception { String u = "http://www.w3.org/2001/XMLSchema#string"; URI uri = new URI("http://www.w3.org/2001/XMLSchema#string"); assertEquals(uri.toString(),u); } - public void CtestSAMLXACML() throws Exception + public void testSAMLXACML() throws Exception { //Read the saml request from the file ClassLoader tcl = Thread.currentThread().getContextClassLoader(); Modified: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/TestServletConfig.java =================================================================== --- identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/TestServletConfig.java 2009-03-26 15:55:38 UTC (rev 402) +++ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/TestServletConfig.java 2009-03-26 15:56:22 UTC (rev 403) @@ -43,7 +43,7 @@ public String getInitParameter(String name) { - return null; + return sc.getInitParameter(name); } public Enumeration getInitParameterNames() Added: identity-federation/trunk/identity-bindings/src/test/resources/xacml/requests/himss-soap-request.xml =================================================================== --- identity-federation/trunk/identity-bindings/src/test/resources/xacml/requests/himss-soap-request.xml (rev 0) +++ identity-federation/trunk/identity-bindings/src/test/resources/xacml/requests/himss-soap-request.xml 2009-03-26 15:56:22 UTC (rev 403) @@ -0,0 +1,82 @@ +<soap-env:Envelope xmlns:soap-env="http://schemas.xmlsoap.org/soap/envelope/">&... +<samlp:RequestAbstract xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol" +xmlns:xacml-samlp="urn:oasis:xacml:2.0:saml:protocol:schema:os" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +Consent="consent-uri" Destination="destination-uri" +ID="s26b7b6b8e24f105d07a46a448ea2fbffc4c3cd915" +IssueInstant="2009-03-17T21:45:21Z" Version="2.0" +xacml-samlp:InputContextOnly="true" xacml-samlp:ReturnContext="true" +xsi:type="xacml-samlp:XACMLAuthzDecisionQueryType"> +<saml:Issuer xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">vaPepEntity</saml:Issuer> + +<xacml-context:Request xmlns="urn:oasis:names:tc:xacml:2.0:context:schema:os" + xmlns:xacml-context="urn:oasis:names:tc:xacml:2.0:context:schema:os" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance/" +xsi:schemaLocation="urn:oasis:names:tc:xacml:2.0:context:schema:os http://docs.oasis-open.org/xacml/access_control-xacml-2.0-context-schema-... + +<xacml-context:Subject SubjectCategory="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"> +<Attribute AttributeId="urn:oasis:names:tc:xacml:2.0:subject:subject-id" DataType="http://www.w3.org/2001/XMLSchema#string" > +<AttributeValue>Doctor,Bob</AttributeValue> +</Attribute> +<Attribute AttributeId="urn:oasis:names:tc:xspa:1.0:subject:npi" DataType="http://www.w3.org/2001/XMLSchema#string" > +<AttributeValue>100035</AttributeValue> +</Attribute> +<Attribute AttributeId="urn:oasis:names:tc:xacml:2.0:subject:role" DataType="http://www.w3.org/2001/XMLSchema#string" > +<AttributeValue>codeSystem="1.2.840.1986.7" codeSystemName="ISO" displayName="MD/Allopath"</AttributeValue> +</Attribute> +<Attribute AttributeId="urn:oasis:names:tc:xspa:1.0:subject:functional_role" DataType="http://www.w3.org/2001/XMLSchema#string" > +<AttributeValue>physician</AttributeValue> +</Attribute> +<Attribute AttributeId="urn:oasis:names:tc:xspa:1.0:subject:purposeofuse" DataType="http://www.w3.org/2001/XMLSchema#string" > +<AttributeValue>Healthcare Treatment</AttributeValue> +</Attribute> +<Attribute AttributeId="urn:oasis:names:tc:xspa:1.0:subject:hl7:permission" DataType="http://www.w3.org/2001/XMLSchema#string" > +<AttributeValue>codeSystem="2.16.840.1.113883.13.27" codeSystemName="HL7" displayName="PRD-017"</AttributeValue> +<AttributeValue>codeSystem="2.16.840.1.113883.13.27" codeSystemName="HL7" displayName="PRD-003"</AttributeValue> +<AttributeValue>codeSystem="2.16.840.1.113883.13.27" codeSystemName="HL7" displayName="PRD-012"</AttributeValue> +<AttributeValue>codeSystem="2.16.840.1.113883.13.27" codeSystemName="HL7" displayName="PRD-005"</AttributeValue> +<AttributeValue>codeSystem="2.16.840.1.113883.13.27" codeSystemName="HL7" displayName="PRD-010"</AttributeValue> +<AttributeValue>codeSystem="2.16.840.1.113883.13.27" codeSystemName="HL7" displayName="PRD-006"</AttributeValue> +<AttributeValue>codeSystem="2.16.840.1.113883.13.27" codeSystemName="HL7" displayName="PRD-009"</AttributeValue> +</Attribute> +<Attribute AttributeId="urn:oasis:names:tc:xacml:2.0:subject:locality" DataType="http://www.w3.org/2001/XMLSchema#string" > +<AttributeValue>Healthcare Domain A</AttributeValue> +</Attribute> +</xacml-context:Subject> + +<xacml-context:Resource> +<Attribute AttributeId="urn:oasis:names:tc:xspa:1.0:resource:hl7:type" DataType="http://www.w3.org/2001/XMLSchema#string" > +<AttributeValue>urn:oasis:names:tc:xspa:1.0:resource:hl7:type:patient-search</AttributeValue> +</Attribute> +<Attribute AttributeId="urn:oasis:names:tc:xspa:1.0:resource:org:hoursofoperation:start" DataType="http://www.w3.org/2001/XMLSchema#time" > +<AttributeValue>00:00:00-08:00</AttributeValue> +</Attribute> +<Attribute AttributeId="urn:oasis:names:tc:xspa:1.0:resource:org:hoursofoperation:end" DataType="http://www.w3.org/2001/XMLSchema#time" > +<AttributeValue>23:59:00-08:00</AttributeValue> +</Attribute> +<Attribute AttributeId="urn:oasis:names:tc:xspa:1.0:resource:org:allowed-organizations" DataType="http://www.w3.org/2001/XMLSchema#string" > +<AttributeValue>Healthcare Domain A</AttributeValue> +<AttributeValue>DoD Healthcare Domain A</AttributeValue> +</Attribute> +<Attribute AttributeId="urn:oasis:names:tc:xspa:1.0:resource:org:role" DataType="http://www.w3.org/2001/XMLSchema#string" > +<AttributeValue>codeSystem="1.2.840.1986.7" codeSystemName="ISO" displayName="MD/Allopath"</AttributeValue> +<AttributeValue>codeSystem="1.2.840.1986.7" codeSystemName="ISO" displayName="Pharmacist"</AttributeValue> +</Attribute> +</xacml-context:Resource> + +<xacml-context:Action> +<Attribute AttributeId="urn:oasis:names:tc:xacml:1.0:action:action-id" DataType="http://www.w3.org/2001/XMLSchema#string" > +<AttributeValue>Read</AttributeValue> +</Attribute> +</xacml-context:Action> + +<xacml-context:Environment> +<Attribute AttributeId="urn:oasis:names:tc:xacml:2.0:resource:locality" DataType="http://www.w3.org/2001/XMLSchema#string" > +<AttributeValue>Healthcare Domain B</AttributeValue> +</Attribute></xacml-context:Environment> + +</xacml-context:Request> + + +</samlp:RequestAbstract> +</soap-env:Body></soap-env:Envelope> \ No newline at end of file Modified: identity-federation/trunk/identity-fed-api/.classpath =================================================================== --- identity-federation/trunk/identity-fed-api/.classpath 2009-03-26 15:55:38 UTC (rev 402) +++ identity-federation/trunk/identity-fed-api/.classpath 2009-03-26 15:56:22 UTC (rev 403) @@ -9,7 +9,7 @@ <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/> <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/> <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR3/jbossxacml-2.0.3.CR3.jar"/> <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> <classpathentry kind="var" path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/> Modified: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/util/XMLEncryptionUnitTestCase.java =================================================================== --- identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/util/XMLEncryptionUnitTestCase.java 2009-03-26 15:55:38 UTC (rev 402) +++ identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/util/XMLEncryptionUnitTestCase.java 2009-03-26 15:56:22 UTC (rev 403) @@ -37,8 +37,7 @@ import junit.framework.TestCase; import org.jboss.identity.federation.api.saml.v2.common.IDGenerator; -import org.jboss.identity.federation.api.saml.v2.response.SAML2Response; -import org.jboss.identity.federation.api.util.XMLEncryptionUtil; +import org.jboss.identity.federation.api.saml.v2.response.SAML2Response; import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants; import org.jboss.identity.federation.core.saml.v2.holders.IDPInfoHolder; import org.jboss.identity.federation.core.saml.v2.holders.IssuerInfoHolder; @@ -48,6 +47,7 @@ import org.jboss.identity.federation.saml.v2.assertion.AttributeStatementType; import org.jboss.identity.federation.saml.v2.assertion.EncryptedElementType; import org.jboss.identity.federation.saml.v2.protocol.ResponseType; +import org.jboss.identity.xmlsec.util.XMLEncryptionUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; Modified: identity-federation/trunk/identity-xmlsecmodel/.classpath =================================================================== --- identity-federation/trunk/identity-xmlsecmodel/.classpath 2009-03-26 15:55:38 UTC (rev 402) +++ identity-federation/trunk/identity-xmlsecmodel/.classpath 2009-03-26 15:56:22 UTC (rev 403) @@ -9,5 +9,6 @@ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> <classpathentry kind="var" path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/> <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/> <classpathentry kind="output" path="target-eclipse/classes"/> </classpath> Modified: identity-federation/trunk/identity-xmlsecmodel/pom.xml =================================================================== --- identity-federation/trunk/identity-xmlsecmodel/pom.xml 2009-03-26 15:55:38 UTC (rev 402) +++ identity-federation/trunk/identity-xmlsecmodel/pom.xml 2009-03-26 15:56:22 UTC (rev 403) @@ -62,6 +62,11 @@ <version>1.0</version> </dependency> <dependency> + <groupId>org.apache</groupId> + <artifactId>xmlsec</artifactId> + <version>1.4.2</version> + </dependency> + <dependency> <groupId>sun-jaf</groupId> <artifactId>activation</artifactId> <version>1.1</version>