[jboss-svn-commits] JBL Code SVN: r29313 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta: tests/src/org/jboss/soa/esb/services/security/auth/ws and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Sep 11 10:29:09 EDT 2009
Author: kevin.conner at jboss.com
Date: 2009-09-11 10:29:09 -0400 (Fri, 11 Sep 2009)
New Revision: 29313
Added:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-userpass-example2.xml
Modified:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java
Log:
Added namespaces and absolute selectors for ws-sec: JBESB-2816
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml 2009-09-11 13:28:01 UTC (rev 29312)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml 2009-09-11 14:29:09 UTC (rev 29313)
@@ -1,29 +1,61 @@
<?xml version="1.0"?>
+
<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
<resource-config selector="global-parameters">
<param name="stream.filter.type">SAX</param>
</resource-config>
- <resource-config selector="Envelope/Header/Security/UsernameToken">
+ <resource-config selector="Envelope/Header/Security/UsernameToken" selector-namespace="http://schemas.xmlsoap.org/ws/2002/04/secext">
<resource>org.milyn.javabean.BeanPopulator</resource>
<param name="beanId">userNameToken</param>
<param name="beanClass">org.jboss.soa.esb.services.security.auth.ws.UsernameToken</param>
<param name="bindings">
- <binding property="userName" selector="Username" default="" />
- <binding property="password" selector="Password" />
+ <binding property="userName" selector="/Envelope/Header/Security/UsernameToken/Username" default=""
+ selector-namespace="http://schemas.xmlsoap.org/ws/2002/04/secext"/>
+ <binding property="password" selector="/Envelope/Header/Security/UsernameToken/Password"
+ selector-namespace="http://schemas.xmlsoap.org/ws/2002/04/secext"/>
</param>
</resource-config>
-
- <resource-config selector="Envelope/Header/Security/BinarySecurityToken">
+
+ <resource-config selector="Envelope/Header/Security/UsernameToken" selector-namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
<resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanId">userNameToken</param>
+ <param name="beanClass">org.jboss.soa.esb.services.security.auth.ws.UsernameToken</param>
+ <param name="bindings">
+ <binding property="userName" selector="/Envelope/Header/Security/UsernameToken/Username" default=""
+ selector-namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
+ <binding property="password" selector="/Envelope/Header/Security/UsernameToken/Password"
+ selector-namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
+ </param>
+ </resource-config>
+
+ <resource-config selector="Envelope/Header/Security/BinarySecurityToken" selector-namespace="http://schemas.xmlsoap.org/ws/2002/04/secext">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
<param name="beanId">binarySecurityToken</param>
<param name="beanClass">org.jboss.soa.esb.services.security.auth.ws.BinarySecurityToken</param>
<param name="bindings">
- <binding property="encodingType" selector="BinarySecurityToken @EncodingType" />
- <binding property="valueType" selector="BinarySecurityToken @ValueType" />
- <binding property="key" selector="BinarySecurityToken" />
+ <binding property="encodingType" selector="/Envelope/Header/Security/BinarySecurityToken/@EncodingType"
+ selector-namespace="http://schemas.xmlsoap.org/ws/2002/04/secext"/>
+ <binding property="valueType" selector="/Envelope/Header/Security/BinarySecurityToken/@ValueType"
+ selector-namespace="http://schemas.xmlsoap.org/ws/2002/04/secext"/>
+ <binding property="key" selector="/Envelope/Header/Security/BinarySecurityToken"
+ selector-namespace="http://schemas.xmlsoap.org/ws/2002/04/secext"/>
</param>
</resource-config>
-</smooks-resource-list>
+ <resource-config selector="Envelope/Header/Security/BinarySecurityToken" selector-namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanId">binarySecurityToken</param>
+ <param name="beanClass">org.jboss.soa.esb.services.security.auth.ws.BinarySecurityToken</param>
+ <param name="bindings">
+ <binding property="encodingType" selector="/Envelope/Header/Security/BinarySecurityToken/@EncodingType"
+ selector-namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
+ <binding property="valueType" selector="/Envelope/Header/Security/BinarySecurityToken/@ValueType"
+ selector-namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
+ <binding property="key" selector="/Envelope/Header/Security/BinarySecurityToken"
+ selector-namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
+ </param>
+ </resource-config>
+
+</smooks-resource-list>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java 2009-09-11 13:28:01 UTC (rev 29312)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java 2009-09-11 14:29:09 UTC (rev 29313)
@@ -52,14 +52,22 @@
{
private WSSecurityInfoExtractor extractor;
- @Test
+ @Test
public void extractUserPassSecurityInfo() throws SAXException, IOException, ParserConfigurationException, ConfigurationException
{
- String soap = createUserPassSoapString();
+ String soap = createUserPassSoapString("soap-userpass-example.xml");
AuthenticationRequest authRequest = extractor.extractSecurityInfo(soap);
assertNotNull(authRequest);
assertEquals( "Clark", authRequest.getPrincipal().getName());
}
+
+ @Test
+ public void processEmptyHeaderWithUserNameElementInBody() throws SAXException, IOException, ParserConfigurationException, ConfigurationException
+ {
+ String soap = createUserPassSoapString("soap-userpass-example2.xml");
+ AuthenticationRequest authRequest = extractor.extractSecurityInfo(soap);
+ assertNull(authRequest);
+ }
@Test
public void extractKeySecurityInfo() throws SAXException, IOException, ParserConfigurationException, ConfigurationException
@@ -99,9 +107,9 @@
assertNull(authRequest);
}
- private String createUserPassSoapString() throws SAXException, IOException, ParserConfigurationException, ConfigurationException
+ private String createUserPassSoapString(final String filename) throws SAXException, IOException, ParserConfigurationException, ConfigurationException
{
- return getStringFromFile("soap-userpass-example.xml");
+ return getStringFromFile(filename);
}
private String createKeySoapString(final String filename) throws SAXException, IOException, ParserConfigurationException, ConfigurationException
Copied: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-userpass-example2.xml (from rev 28610, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-userpass-example2.xml)
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-userpass-example2.xml (rev 0)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-userpass-example2.xml 2009-09-11 14:29:09 UTC (rev 29313)
@@ -0,0 +1,17 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:dummy="http://dummy-namespace/">
+ <soapenv:Header/>
+ <soapenv:Body>
+ <dummy:GetConfigList>
+ <dummy:req>
+ <dummy:CustomerId>123</dummy:CustomerId>
+ <dummy:UserName>John</dummy:UserName>
+ <dummy:MaxNumRows>100</dummy:MaxNumRows>
+ </dummy:req>
+ <dummy:UsernameToken>
+ <dummy:UserName>John</dummy:UserName>
+ </dummy:UsernameToken>
+ </dummy:GetConfigList>
+ </soapenv:Body>
+</soapenv:Envelope>
+
+
More information about the jboss-svn-commits
mailing list