Author: dkulp Date: Wed Feb 25 15:31:05 2009 New Revision: 747825 URL: http://svn.apache.org/viewvc?rev=747825&view=rev Log: Merged revisions 747464 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r747464 | dkulp | 2009-02-24 13:05:17 -0500 (Tue, 24 Feb 2009) | 9 lines 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.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 25 15:31:05 2009 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459,747461-747463 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163 1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306,746357,746373-746374 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459,747461-747464 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163 1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306,746357,746373-746374,747217 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java?rev=747825&r1=747824&r2=747825&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java Wed Feb 25 15:31:05 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.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java?rev=747825&r1=747824&r2=747825&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java Wed Feb 25 15:31:05 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.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java?rev=747825&r1=747824&r2=747825&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java Wed Feb 25 15:31:05 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(); @@ -410,5 +412,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.0.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl?rev=747825&r1=747824&r2=747825&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl (original) +++ cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl Wed Feb 25 15:31:05 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>
