Author: anil.saldhana(a)jboss.com Date: 2009-03-21 23:31:26 -0400 (Sat, 21 Mar 2009) New Revision: 395 Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.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/resources/xacml/requests/soap-request.xml Log: JBID-66: servlet init params Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java 2009-03-22 02:54:29 UTC (rev 394) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java 2009-03-22 03:31:26 UTC (rev 395) @@ -29,7 +29,6 @@ import java.security.PrivilegedExceptionAction; import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -85,22 +84,21 @@ boolean debug = false; - public void init() throws ServletException - { - ServletContext servletContext = getServletContext(); - issuerId = servletContext.getInitParameter("issuerID"); + public void init(ServletConfig config) throws ServletException + { + issuerId = config.getInitParameter("issuerID"); if(issuerId == null) issuerId = "issue-id:1"; - issuer = servletContext.getInitParameter("issuer"); + issuer = config.getInitParameter("issuer"); if(issuer == null) issuer = "urn:jboss-identity"; - policyConfigFileName = servletContext.getInitParameter("policyConfigFileName"); + policyConfigFileName = config.getInitParameter("policyConfigFileName"); if(policyConfigFileName == null) policyConfigFileName = "policyConfig.xml"; - String debugStr = servletContext.getInitParameter("debug"); + String debugStr = config.getInitParameter("debug"); try { debug = Boolean.parseBoolean(debugStr); @@ -110,6 +108,7 @@ debug = false; } + log.trace("Issuer=" + issuer + " :: issuerID=" + issuerId); log.trace("PolicyConfig File:" + policyConfigFileName); log.trace("Debug="+debug); @@ -117,13 +116,8 @@ { SecurityActions.setSystemProperty("jaxb.debug", "true"); } - super.init(); + super.init(config); } - - public void init(ServletConfig config) throws ServletException - { - super.init(config); - } @SuppressWarnings("unchecked") 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-22 02:54:29 UTC (rev 394) +++ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/InteropEndpointDebugTestCase.java 2009-03-22 03:31:26 UTC (rev 395) @@ -22,6 +22,7 @@ package org.jboss.test.identity.federation.bindings.servlets; import java.io.InputStream; +import java.net.URI; import java.net.URL; import java.net.URLConnection; @@ -51,11 +52,11 @@ */ public class InteropEndpointDebugTestCase extends TestCase { - String endpoint = null; - // String endpoint = "http://interop.demo.jboss.com/test/SOAPServlet"; - //String endpoint = "http://localhost:8080/test/SOAPServlet"; + //String endpoint = null; + //String endpoint = "http://interop.demo.jboss.com/test/SOAPServlet"; + String endpoint = "http://localhost:8080/test/SOAPServlet"; - public void testUseCase1() throws Exception + public void AtestUseCase1() throws Exception { if(endpoint != null) { @@ -65,7 +66,7 @@ } } - public void testUseCase2() throws Exception + public void BtestUseCase2() throws Exception { if(endpoint != null) { @@ -75,8 +76,29 @@ } } - public void testSAMLXACML() throws Exception + public void testHimss() throws Exception { + if(endpoint != null) + { + JAXBElement<?> jb = getResponse("xacml/requests/himss-soap-request.xml"); + Envelope env = (Envelope) jb.getValue(); + Marshaller marshaller = SOAPSAMLXACMLUtil.getMarshaller(); + marshaller.setProperty( Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE ); + marshaller.marshal(jb, System.out); + + check(env, false); + } + } + + public void BtestA() 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 + { //Read the saml request from the file ClassLoader tcl = Thread.currentThread().getContextClassLoader(); InputStream is = tcl.getResourceAsStream("xacml/requests/samlxacml.xml"); @@ -105,8 +127,7 @@ AssertionType at = (AssertionType) responseType.getAssertionOrEncryptedAssertion().get(0); XACMLAuthzDecisionStatementType xst = (XACMLAuthzDecisionStatementType) at.getStatementOrAuthnStatementOrAuthzDecisionStatement().get(0); ResultType rt = xst.getResponse().getResult().get(0); - DecisionType dt = rt.getDecision(); - assertEquals(DecisionType.PERMIT, dt); + DecisionType dt = rt.getDecision(); if(permit) assertEquals(DecisionType.PERMIT, dt); Modified: identity-federation/trunk/identity-bindings/src/test/resources/xacml/requests/soap-request.xml =================================================================== --- identity-federation/trunk/identity-bindings/src/test/resources/xacml/requests/soap-request.xml 2009-03-22 02:54:29 UTC (rev 394) +++ identity-federation/trunk/identity-bindings/src/test/resources/xacml/requests/soap-request.xml 2009-03-22 03:31:26 UTC (rev 395) @@ -1,8 +1,17 @@ <soap-env:Envelope xmlns:soap-env="http://schemas.xmlsoap.org/soap/envelope/">&... -<samlp:RequestAbstract xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol" xsi:type="xacml-samlp:XACMLAuthzDecisionQuery" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xacml-samlp="urn:oasis:xacml:2.0:saml:protocol:schema:os" xacml-samlp:InputContextOnly="true" xacml-samlp:ReturnContext="true" ID="s292657a1c39f12d36dd1f1ba2cf834bb2ebad825c" Version="2.0" IssueInstant="2009-03-16T19:01:52Z" Destination="destination-uri" Consent="consent-uri"> +<samlp:RequestAbstract xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol" +xsi:type="xacml-samlp:XACMLAuthzDecisionQueryType" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xmlns:xacml-samlp="urn:oasis:xacml:2.0:saml:protocol:schema:os" +xacml-samlp:InputContextOnly="true" xacml-samlp:ReturnContext="true" +ID="s292657a1c39f12d36dd1f1ba2cf834bb2ebad825c" Version="2.0" +IssueInstant="2009-03-16T19:01:52Z" Destination="destination-uri" Consent="consent-uri"> <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-... + 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-... <Subject SubjectCategory="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"> <Attribute AttributeId="urn:oasis:names:tc:xacml:1.0:subject:subject-id" DataType="http://www.w3.org/2001/XMLSchema#string" > <AttributeValue>Doctor,Bob</AttributeValue>