Author: dkulp
Date: Tue Feb 24 18:05:17 2009
New Revision: 747464
URL: http://svn.apache.org/viewvc?rev=747464&view=rev
Log:
Merged revisions 747217 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r747217 | cschneider | 2009-02-23 18:40:53 -0500 (Mon, 23 Feb 2009) | 1 line
CXF-2055: Support passing username of producer to SecurityContext using
JMSXUserID
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java
cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 18:05:17 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560,745578,745586,745592,745638,745950,746012,746019-746020,746256,746266,746306,746357,746373-746374
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560,745578,745586,745592,745638,745950,746012,746019-746020,746256,746266,746306,746357,746373-746374,747217
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java?rev=747464&r1=747463&r2=747464&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
Tue Feb 24 18:05:17 2009
@@ -20,6 +20,7 @@
package org.apache.cxf.transport.jms;
import java.io.UnsupportedEncodingException;
+import java.security.Principal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
@@ -39,6 +40,7 @@
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.HttpHeaderHelper;
+import org.apache.cxf.security.SecurityContext;
import org.springframework.jms.support.JmsUtils;
import org.springframework.jms.support.converter.MessageConversionException;
import org.springframework.jms.support.converter.SimpleMessageConverter102;
@@ -47,8 +49,9 @@
static final Logger LOG = LogUtils.getL7dLogger(JMSUtils.class);
- private static final char[] CORRELATTION_ID_PADDING = {'0', '0', '0',
'0', '0', '0', '0', '0',
- '0', '0', '0',
'0', '0', '0', '0'};
+ private static final char[] CORRELATTION_ID_PADDING = {
+ '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0',
'0'
+ };
private JMSUtils() {
@@ -76,7 +79,7 @@
* Create a JMS of the appropriate type populated with the given payload.
*
* @param payload the message payload, expected to be either of type
String or byte[] depending on payload
- * type
+ * type
* @param session the JMS session
* @param replyTo the ReplyTo destination if any
* @return a JMS of the appropriate type populated with the given payload
@@ -102,9 +105,9 @@
* @param message the incoming message
* @param encoding the message encoding
* @return the message payload as byte[]
- * @throws UnsupportedEncodingException
+ * @throws UnsupportedEncodingException
*/
- public static byte[] retrievePayload(Message message, String encoding)
+ public static byte[] retrievePayload(Message message, String encoding)
throws UnsupportedEncodingException {
Object converted;
try {
@@ -116,8 +119,8 @@
}
if (converted instanceof String) {
if (encoding != null) {
- return ((String)converted).getBytes(encoding);
- } else {
+ return ((String)converted).getBytes(encoding);
+ } else {
// Using the UTF-8 encoding as default
return ((String)converted).getBytes("UTF-8");
}
@@ -129,7 +132,7 @@
}
public static void populateIncomingContext(javax.jms.Message message,
- org.apache.cxf.message.Message
inMessage, String headerType)
+ org.apache.cxf.message.Message
inMessage, String headerType)
throws UnsupportedEncodingException {
try {
JMSMessageHeadersType headers = null;
@@ -165,35 +168,74 @@
// set the message encoding
inMessage.put(org.apache.cxf.message.Message.ENCODING,
getEncoding(val));
}
-
+
}
inMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS,
protHeaders);
+
+ SecurityContext securityContext = buildSecurityContext(message);
+ inMessage.put(SecurityContext.class, securityContext);
} catch (JMSException ex) {
throw JmsUtils.convertJmsAccessException(ex);
}
}
+ /**
+ * Extract the property JMSXUserID from the jms message and create a
SecurityContext from it.
+ * For more info see Jira Issue CXF-2055
+ * {...@link https://issues.apache.org/jira/browse/CXF-2055}
+ *
+ * @param message jms message to retrieve user information from
+ * @return SecurityContext that contains the user of the producer of the
message as the Principal
+ * @throws JMSException if something goes wrong
+ */
+ private static SecurityContext buildSecurityContext(javax.jms.Message
message) throws JMSException {
+ final String jmsUserName = message.getStringProperty("JMSXUserID");
+ if (jmsUserName == null) {
+ return null;
+ }
+ final Principal principal = new Principal() {
+ public String getName() {
+ return jmsUserName;
+ }
+
+ };
+
+ SecurityContext securityContext = new SecurityContext() {
+
+ public Principal getUserPrincipal() {
+ return principal;
+ }
+
+ public boolean isUserInRole(String role) {
+ return false;
+ }
+
+ };
+ return securityContext;
+ }
+
static String getEncoding(String ct) throws UnsupportedEncodingException {
String contentType = ct.toLowerCase();
String enc = null;
-
+
String[] tokens = contentType.split(";");
for (String token : tokens) {
int index = token.indexOf("charset=");
if (index >= 0) {
enc = token.substring(index + 8);
break;
- }
+ }
}
-
+
String normalizedEncoding = HttpHeaderHelper.mapCharset(enc);
if (normalizedEncoding == null) {
- String m = new
org.apache.cxf.common.i18n.Message("INVALID_ENCODING_MSG",
- LOG, new
Object[] {enc}).toString();
+ String m = new
org.apache.cxf.common.i18n.Message("INVALID_ENCODING_MSG", LOG, new Object[] {
+ enc
+ }).toString();
LOG.log(Level.WARNING, m);
- throw new UnsupportedEncodingException(m);
+ throw new UnsupportedEncodingException(m);
}
-
+
return normalizedEncoding;
}
@@ -224,8 +266,8 @@
}
public static void
addContentTypeToProtocolHeader(org.apache.cxf.message.Message message) {
- String contentType =
(String)message.get(org.apache.cxf.message.Message.CONTENT_TYPE);
- String enc = (String)
message.get(org.apache.cxf.message.Message.ENCODING);
+ String contentType =
(String)message.get(org.apache.cxf.message.Message.CONTENT_TYPE);
+ String enc =
(String)message.get(org.apache.cxf.message.Message.ENCODING);
// add the encoding information
if (null != contentType) {
if (enc != null && contentType.indexOf("charset=") == -1) {
@@ -244,7 +286,7 @@
headers = new HashMap<String, List<String>>();
message.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS,
headers);
}
-
+
// Add content type to the protocol headers
List<String> ct;
if (headers.get(JMSConstants.JMS_CONTENT_TYPE) != null) {
@@ -284,7 +326,7 @@
jmsMessage.setJMSCorrelationID(correlationId);
return jmsMessage;
}
-
+
public static String createCorrelationId(final String prefix, long i) {
String index = Long.toHexString(i);
StringBuffer id = new StringBuffer(prefix);
Modified:
cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java?rev=747464&r1=747463&r2=747464&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java
Tue Feb 24 18:05:17 2009
@@ -80,6 +80,7 @@
synchronized (this) {
broker.setPersistenceAdapter(new
MemoryPersistenceAdapter());
broker.setTmpDataDirectory(new File("./target"));
+ broker.setPopulateJMSXUserID(true);
broker.addConnector(brokerUrl);
broker.start();
Thread.sleep(200);
Modified:
cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java?rev=747464&r1=747463&r2=747464&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
Tue Feb 24 18:05:17 2009
@@ -33,6 +33,7 @@
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.security.SecurityContext;
import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.MultiplexDestination;
@@ -95,7 +96,8 @@
}
return jmsDestination;
}
-
+
+
@Test
public void testGetConfigurationFromSpring() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
@@ -406,5 +408,27 @@
"HelloWorldService", "HelloWorldPort");
final JMSDestination destination = setupJMSDestination(true);
assertTrue("is multiplex", destination instanceof
MultiplexDestination);
+ destination.shutdown();
+ }
+
+ @Test
+ public void testSecurityContext() throws Exception {
+ inMessage = null;
+ setupServiceInfo("http://cxf.apache.org/hello_world_jms";,
"/wsdl/jms_test.wsdl",
+ "HelloWorldService", "HelloWorldPort");
+ final JMSDestination destination = setupJMSDestination(true);
+ // set up the conduit send to be true
+ JMSConduit conduit = setupJMSConduit(true, false);
+ final Message outMessage = new MessageImpl();
+ setupMessageHeader(outMessage, null);
+ sendoutMessage(conduit, outMessage, true);
+ waitForReceiveDestMessage();
+ SecurityContext securityContext =
destMessage.get(SecurityContext.class);
+ assertNotNull("SecurityContext should be set in message received by
JMSDestination", securityContext);
+ assertEquals("Principal in SecurityContext should be", "testUser",
+ securityContext.getUserPrincipal().getName());
+ conduit.close();
+ destination.shutdown();
}
+
}
Modified:
cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl?rev=747464&r1=747463&r2=747464&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl
(original)
+++ cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl
Tue Feb 24 18:05:17 2009
@@ -341,7 +341,9 @@
<jms:clientConfig useConduitIdSelector="false"/>
<jms:address
jndiConnectionFactoryName="ConnectionFactory"
- jndiDestinationName="dynamicQueues/test.jmstransport.text">
+ jndiDestinationName="dynamicQueues/test.jmstransport.text"
+ connectionUserName="testUser"
+ connectionPassword="testPassword">
<jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
<jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
</jms:address>
