[jboss-svn-commits] JBL Code SVN: r29267 - in labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta: src/org/jboss/soa/esb/services/security/auth/ws and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Sep 9 01:57:41 EDT 2009
Author: beve
Date: 2009-09-09 01:57:40 -0400 (Wed, 09 Sep 2009)
New Revision: 29267
Modified:
labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSCallbackHandler.java
labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlAssertionExtractor.java
labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSLoginModuleUnitTest.java
labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/SamlAssertionExtractorUnitTest.java
Log:
Formatting.
Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSCallbackHandler.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSCallbackHandler.java 2009-09-09 05:34:41 UTC (rev 29266)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSCallbackHandler.java 2009-09-09 05:57:40 UTC (rev 29267)
@@ -33,8 +33,8 @@
public class JBossSTSCallbackHandler implements EsbCallbackHandler
{
private AuthenticationRequest authRequest;
-
- @SuppressWarnings ("unused")
+
+ @SuppressWarnings("unused")
private SecurityConfig securityConfig;
public void handle(final Callback[] callbacks) throws IOException, UnsupportedCallbackException
Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlAssertionExtractor.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlAssertionExtractor.java 2009-09-09 05:34:41 UTC (rev 29266)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlAssertionExtractor.java 2009-09-09 05:57:40 UTC (rev 29267)
@@ -53,97 +53,97 @@
import org.xml.sax.SAXException;
/**
- * Extracts SAML Assertions from a SOAP Message.
- * </p>
+ * Extracts SAML Assertions from a SOAP Message. </p>
*
* @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
+ *
*/
public class SamlAssertionExtractor implements SecurityInfoExtractor<String>
{
- /**
- * Smooks configuration file which specified the extraction
- */
- private static final String SMOOK_CONFIG_FILE = "smooks-saml.xml";
-
- /**
- * Smooks instance the will perform the extraction
- */
- private Smooks smooks;
-
- /**
- * Creates an instance using the default Smooks config file.
- */
- public SamlAssertionExtractor()
- {
- createSmooks( SMOOK_CONFIG_FILE );
- }
+ /**
+ * Smooks configuration file which specified the extraction
+ */
+ private static final String SMOOK_CONFIG_FILE = "smooks-saml.xml";
- /**
- * Creates an instance of Smooks using the passed in config file.
- *
- * @param configFile - the Smooks config file to use.
- */
- public SamlAssertionExtractor(final String configFile)
- {
- createSmooks(configFile);
- }
-
- public Node extractSamlAssertion(final String soap) throws IOException
- {
- if (soap == null || !soap.startsWith("<"))
- {
- return null;
- }
- //final DOMResult result = new DOMResult();
- ExecutionContext execContext = smooks.createExecutionContext();
- smooks.filterSource(execContext, new StreamSource(new StringReader(soap)));
- DOMModel nodeModel = DOMModel.getModel(execContext);
- return nodeModel.getModels().get("Assertion");
- }
-
- public AuthenticationRequest extractSecurityInfo(final String soap)
- {
- if (soap == null || !soap.startsWith("<"))
- {
- return null;
- }
- Node samlToken;
+ /**
+ * Smooks instance the will perform the extraction
+ */
+ private Smooks smooks;
+
+ /**
+ * Creates an instance using the default Smooks config file.
+ */
+ public SamlAssertionExtractor()
+ {
+ createSmooks(SMOOK_CONFIG_FILE);
+ }
+
+ /**
+ * Creates an instance of Smooks using the passed in config file.
+ *
+ * @param configFile
+ * - the Smooks config file to use.
+ */
+ public SamlAssertionExtractor(final String configFile)
+ {
+ createSmooks(configFile);
+ }
+
+ public Node extractSamlAssertion(final String soap) throws IOException
+ {
+ if (soap == null || !soap.startsWith("<"))
+ {
+ return null;
+ }
+ // final DOMResult result = new DOMResult();
+ ExecutionContext execContext = smooks.createExecutionContext();
+ smooks.filterSource(execContext, new StreamSource(new StringReader(soap)));
+ DOMModel nodeModel = DOMModel.getModel(execContext);
+ return nodeModel.getModels().get("Assertion");
+ }
+
+ public AuthenticationRequest extractSecurityInfo(final String soap)
+ {
+ if (soap == null || !soap.startsWith("<"))
+ {
+ return null;
+ }
+ Node samlToken;
try
{
samlToken = extractSamlAssertion(soap);
- }
+ }
catch (final IOException e)
{
- throw new SecurityException("Could not extract saml token info from :" + soap, e);
+ throw new SecurityException("Could not extract saml token info from :" + soap, e);
}
-
- return new AuthenticationRequestImpl.Builder(new SamlPrincipal((Element)samlToken), null ).build();
- }
- private void createSmooks(final String configFile)
- {
- final InputStream is = ClassUtil.getResourceAsStream(configFile, getClass()) ;
- if (is == null)
- {
- throw new IllegalArgumentException("Failed to located configuration file resource: " + configFile) ;
- }
- try
- {
- this.smooks = SmooksResource.createSmooksResource(is);
- }
- catch (final LifecycleResourceException lre)
- {
- throw new IllegalStateException("Could not parse " + configFile, lre);
- }
- catch (final SAXException e)
- {
- throw new IllegalStateException("Could not parse " + configFile, e);
- }
- catch (final IOException e)
- {
- throw new IllegalStateException("Could not parse " + configFile, e);
- }
- }
-
+ return new AuthenticationRequestImpl.Builder(new SamlPrincipal((Element) samlToken), null).build();
+ }
+
+ private void createSmooks(final String configFile)
+ {
+ final InputStream is = ClassUtil.getResourceAsStream(configFile, getClass());
+ if (is == null)
+ {
+ throw new IllegalArgumentException("Failed to located configuration file resource: " + configFile);
+ }
+ try
+ {
+ this.smooks = SmooksResource.createSmooksResource(is);
+ }
+ catch (final LifecycleResourceException lre)
+ {
+ throw new IllegalStateException("Could not parse " + configFile, lre);
+ }
+ catch (final SAXException e)
+ {
+ throw new IllegalStateException("Could not parse " + configFile, e);
+ }
+ catch (final IOException e)
+ {
+ throw new IllegalStateException("Could not parse " + configFile, e);
+ }
+ }
+
}
Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSLoginModuleUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSLoginModuleUnitTest.java 2009-09-09 05:34:41 UTC (rev 29266)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSLoginModuleUnitTest.java 2009-09-09 05:57:40 UTC (rev 29267)
@@ -42,75 +42,75 @@
import org.junit.Test;
import org.w3c.dom.Element;
-
/**
* Unit test for {@link JBossSTSLoginModule}.
*
* @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
- *
+ *
*/
public class JBossSTSLoginModuleUnitTest
{
- @Test
+ @Test
public void loginValidToken() throws Exception
{
final WSTrustClient client = mock(WSTrustClient.class);
when(client.validateToken(any(Element.class))).thenReturn(true);
-
+
final JBossSTSLoginModule loginModule = new JBossSTSLoginModule();
loginModule.setWSTrustClient(client);
-
+
final Element samlToken = createSamlToken();
-
+
final JBossSTSCallbackHandler callbackHandler = new JBossSTSCallbackHandler();
final SamlPrincipal samlPrincipal = new SamlPrincipal(samlToken);
final AuthenticationRequest authRequest = new AuthenticationRequestImpl.Builder(samlPrincipal, null).build();
callbackHandler.setAuthenticationRequest(authRequest);
callbackHandler.setSecurityConfig(null);
-
- // Simulate that we already have an existing Saml Token set on the Subject.
-
+
+ // Simulate that we already have an existing Saml Token set on the
+ // Subject.
+
loginModule.initialize(new Subject(), callbackHandler, null, allOptions());
-
+
// Simulate Phase 1
boolean login = loginModule.login();
assertTrue(login);
-
+
// Simulate Phase 2
boolean commit = loginModule.commit();
assertTrue(commit);
}
-
- @Test (expected = LoginException.class)
+
+ @Test(expected = LoginException.class)
public void loginInValidToken() throws Exception
{
final WSTrustClient client = mock(WSTrustClient.class);
when(client.validateToken(any(Element.class))).thenReturn(false);
-
+
final JBossSTSLoginModule loginModule = new JBossSTSLoginModule();
loginModule.setWSTrustClient(client);
-
+
final Element samlToken = createSamlToken();
-
+
final JBossSTSCallbackHandler callbackHandler = new JBossSTSCallbackHandler();
final SamlPrincipal samlPrincipal = new SamlPrincipal(samlToken);
final AuthenticationRequest authRequest = new AuthenticationRequestImpl.Builder(samlPrincipal, null).build();
callbackHandler.setAuthenticationRequest(authRequest);
callbackHandler.setSecurityConfig(null);
-
+
loginModule.initialize(new Subject(), callbackHandler, null, allOptions());
-
- // Simulate Phase 1
+
+ // Simulate Phase 1
boolean login = loginModule.login();
assertTrue(login);
}
-
+
private Element createSamlToken() throws Exception
{
AssertionType assertionType = new AssertionType();
return SAMLUtil.toElement(assertionType);
}
-
+
/**
* Returns all requried options.
*
@@ -127,57 +127,56 @@
optionsBuilder.samlTokenType("http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0");
return optionsBuilder.build();
}
-
+
public static junit.framework.Test suite()
{
return new JUnit4TestAdapter(JBossSTSLoginModuleUnitTest.class);
}
-
+
private class OptionsBuilder
{
private Map<String, String> options = new HashMap<String, String>();
-
+
public OptionsBuilder serviceName(final String serviceName)
{
- options.put(JBossSTSLoginModule.SERVICE_NAME_OPTION, serviceName);
- return this;
+ options.put(JBossSTSLoginModule.SERVICE_NAME_OPTION, serviceName);
+ return this;
}
-
+
public OptionsBuilder portName(final String portName)
{
- options.put(JBossSTSLoginModule.PORT_NAME_OPTION, portName);
- return this;
+ options.put(JBossSTSLoginModule.PORT_NAME_OPTION, portName);
+ return this;
}
-
+
public OptionsBuilder endpointAddress(final String address)
{
- options.put(JBossSTSLoginModule.ENDPOINT_ADDRESS_OPTION, address);
- return this;
+ options.put(JBossSTSLoginModule.ENDPOINT_ADDRESS_OPTION, address);
+ return this;
}
-
+
public OptionsBuilder username(final String username)
{
- options.put(JBossSTSLoginModule.USERNAME_OPTION, username);
- return this;
+ options.put(JBossSTSLoginModule.USERNAME_OPTION, username);
+ return this;
}
-
+
public OptionsBuilder password(final String password)
{
- options.put(JBossSTSLoginModule.PASSWORD_OPTION, password);
- return this;
+ options.put(JBossSTSLoginModule.PASSWORD_OPTION, password);
+ return this;
}
-
+
public OptionsBuilder samlTokenType(final String type)
{
- options.put(JBossSTSLoginModule.SAML_TOKEN_TYPE_OPTION, type);
- return this;
+ options.put(JBossSTSLoginModule.SAML_TOKEN_TYPE_OPTION, type);
+ return this;
}
-
+
public Map<String, String> build()
{
return options;
}
-
-
+
}
}
Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/SamlAssertionExtractorUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/SamlAssertionExtractorUnitTest.java 2009-09-09 05:34:41 UTC (rev 29266)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/SamlAssertionExtractorUnitTest.java 2009-09-09 05:57:40 UTC (rev 29267)
@@ -20,7 +20,6 @@
*/
package org.jboss.soa.esb.services.security.auth.ws;
-
import static org.junit.Assert.*;
import java.io.IOException;
@@ -42,7 +41,7 @@
* Unit test for {@link SamlAssertionExtractor}.
*
* @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
- *
+ *
*/
public class SamlAssertionExtractorUnitTest
{
@@ -51,16 +50,16 @@
{
final SamlAssertionExtractor extractor = new SamlAssertionExtractor();
final Node samlAssertion = extractor.extractSamlAssertion(readFile("soap-saml-example.xml"));
-
+
assertEquals("saml:Assertion", samlAssertion.getNodeName());
}
-
+
private String readFile(final String fileName) throws SAXException, IOException, ParserConfigurationException, ConfigurationException
{
InputStream inputStream = ClassUtil.getResourceAsStream(fileName, getClass());
return new String(StreamUtils.readStream(inputStream));
}
-
+
public static junit.framework.Test suite()
{
return new JUnit4TestAdapter(SamlAssertionExtractorUnitTest.class);
More information about the jboss-svn-commits
mailing list