You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/11/11 13:16:25 UTC
[1/3] cxf git commit: Fix SAML Audience Restriction problem with JMS
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes f515eb1e3 -> c3bb80b0c
Fix SAML Audience Restriction problem with JMS
Conflicts:
systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/161cab50
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/161cab50
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/161cab50
Branch: refs/heads/3.0.x-fixes
Commit: 161cab50b789c277db2460e3e3be9dff00f42fba
Parents: f515eb1
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Nov 11 10:58:29 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Nov 11 12:06:04 2015 +0000
----------------------------------------------------------------------
.../java/org/apache/cxf/transport/jms/JMSMessageUtils.java | 4 +++-
.../org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java | 2 +-
.../org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java | 6 +++++-
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/161cab50/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
index f5e6e9c..4f16cf3 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
@@ -153,7 +153,6 @@ final class JMSMessageUtils {
inMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, protHeaders);
populateIncomingMessageProperties(message, inMessage, messageProperties);
-
}
/**
@@ -208,6 +207,9 @@ final class JMSMessageUtils {
headers.put(JMSSpecConstants.TARGET_SERVICE_IN_REQUESTURI,
Collections.singletonList("true"));
}
+ if (requestURI != null) {
+ inMessage.put(org.apache.cxf.message.Message.REQUEST_URI, requestURI);
+ }
} catch (Exception e) {
headers.put(JMSSpecConstants.MALFORMED_REQUESTURI, Collections.singletonList("true"));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/161cab50/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
index ed90380..4476fae 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
@@ -352,7 +352,7 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor {
if (msg.get(org.apache.cxf.message.Message.REQUEST_URL) != null) {
audiences.add((String)msg.getContextualProperty(org.apache.cxf.message.Message.REQUEST_URL));
} else if (msg.get(org.apache.cxf.message.Message.REQUEST_URI) != null) {
- audiences.add((String)msg.get(org.apache.cxf.message.Message.REQUEST_URL));
+ audiences.add((String)msg.get(org.apache.cxf.message.Message.REQUEST_URI));
}
if (msg.getContextualProperty("javax.xml.ws.wsdl.service") != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/161cab50/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
index f5a3b47..6e18447 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
@@ -112,7 +112,6 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase {
}
@Test
- @org.junit.Ignore
public void testUnsignedSAML2AudienceRestrictionToken() throws Exception {
QName serviceName = new QName("http://cxf.apache.org/hello_world_jms", "HelloWorldService");
QName portName = new QName("http://cxf.apache.org/hello_world_jms", "HelloWorldPort");
@@ -128,8 +127,13 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase {
ConditionsBean conditions = new ConditionsBean();
conditions.setTokenPeriodMinutes(5);
+<<<<<<< HEAD
List<String> audiences = new ArrayList<String>();
audiences.add("http://apache.org/one");
+=======
+ List<String> audiences = new ArrayList<>();
+ audiences.add("jms:jndi:dynamicQueues/test.jmstransport.text");
+>>>>>>> e7d7190... Fix SAML Audience Restriction problem with JMS
AudienceRestrictionBean audienceRestrictionBean = new AudienceRestrictionBean();
audienceRestrictionBean.setAudienceURIs(audiences);
conditions.setAudienceRestrictions(Collections.singletonList(audienceRestrictionBean));
[2/3] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6b1987a6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6b1987a6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6b1987a6
Branch: refs/heads/3.0.x-fixes
Commit: 6b1987a6d2c17581b97f75f9f73c7617b22e1c12
Parents: 161cab5
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Nov 11 12:06:05 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Nov 11 12:06:05 2015 +0000
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6b1987a6/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index e754646..8c432a0 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -772,6 +772,7 @@ M e51a7bd7f3dcc120dbeeebb3e5c306941af64554
M e5a805853864e291626bdb913448fc4e2409cca0
M e617a2c5865cf3d11d0d344a23dc2d493ff4809b
M e681dda5bfd7d68ebf340a459ecf612e8a926290
+M e7d7190b89ecf2ab9bd100ede621ebd6a2808dcd
M e80d3da7612db41f7efe9c5d3128965ec7d2809b
M e92477bc8d0a0a00eb5afca6fb5ee5a85718672b
M e9e4d0bf842d4f391d4e223f0d5068ef86d15fa7
[3/3] cxf git commit: Fixing backmerge
Posted by co...@apache.org.
Fixing backmerge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c3bb80b0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c3bb80b0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c3bb80b0
Branch: refs/heads/3.0.x-fixes
Commit: c3bb80b0c3f1ebd1a85c7826cf26a32c8c371690
Parents: 6b1987a
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Nov 11 12:16:15 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Nov 11 12:16:15 2015 +0000
----------------------------------------------------------------------
.../org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c3bb80b0/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
index 6e18447..9273bd7 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
@@ -127,13 +127,8 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase {
ConditionsBean conditions = new ConditionsBean();
conditions.setTokenPeriodMinutes(5);
-<<<<<<< HEAD
List<String> audiences = new ArrayList<String>();
- audiences.add("http://apache.org/one");
-=======
- List<String> audiences = new ArrayList<>();
audiences.add("jms:jndi:dynamicQueues/test.jmstransport.text");
->>>>>>> e7d7190... Fix SAML Audience Restriction problem with JMS
AudienceRestrictionBean audienceRestrictionBean = new AudienceRestrictionBean();
audienceRestrictionBean.setAudienceURIs(audiences);
conditions.setAudienceRestrictions(Collections.singletonList(audienceRestrictionBean));