You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/03/11 16:43:52 UTC
svn commit: r1080616 - in
/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security:
policy/interceptors/ trust/
Author: dkulp
Date: Fri Mar 11 15:43:52 2011
New Revision: 1080616
URL: http://svn.apache.org/viewvc?rev=1080616&view=rev
Log:
Re-enable configution compatible with 2.3.x
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationOutInterceptor.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=1080616&r1=1080615&r2=1080616&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java Fri Mar 11 15:43:52 2011
@@ -110,7 +110,7 @@ public class IssuedTokenInterceptorProvi
}
}
if (tok == null) {
- STSClient client = STSUtils.getClient(message);
+ STSClient client = STSUtils.getClient(message, "sts");
AddressingProperties maps =
(AddressingProperties)message
.get("javax.xml.ws.addressing.context.outbound");
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java?rev=1080616&r1=1080615&r2=1080616&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java Fri Mar 11 15:43:52 2011
@@ -531,7 +531,7 @@ class SecureConversationInInterceptor ex
}
}
- STSClient client = STSUtils.getClient(m2);
+ STSClient client = STSUtils.getClient(m2, "sct");
AddressingProperties maps =
(AddressingProperties)message
.get("javax.xml.ws.addressing.context.inbound");
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationOutInterceptor.java?rev=1080616&r1=1080615&r2=1080616&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationOutInterceptor.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationOutInterceptor.java Fri Mar 11 15:43:52 2011
@@ -99,7 +99,7 @@ class SecureConversationOutInterceptor e
return;
}
- STSClient client = STSUtils.getClient(message);
+ STSClient client = STSUtils.getClient(message, "sct");
AddressingProperties maps =
(AddressingProperties)message
.get("javax.xml.ws.addressing.context.outbound");
@@ -139,7 +139,7 @@ class SecureConversationOutInterceptor e
private SecurityToken issueToken(SoapMessage message,
AssertionInfoMap aim,
SecureConversationToken itok) {
- STSClient client = STSUtils.getClient(message);
+ STSClient client = STSUtils.getClient(message, "sct");
AddressingProperties maps =
(AddressingProperties)message
.get("javax.xml.ws.addressing.context.outbound");
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java?rev=1080616&r1=1080615&r2=1080616&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java Fri Mar 11 15:43:52 2011
@@ -49,7 +49,7 @@ public class STSTokenValidator implement
try {
token.setToken(credential.getAssertion().getElement());
- STSClient c = STSUtils.getClient(m);
+ STSClient c = STSUtils.getClient(m, "sts");
synchronized (c) {
System.setProperty("noprint", "true");
c.validateSecurityToken(token);
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java?rev=1080616&r1=1080615&r2=1080616&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java Fri Mar 11 15:43:52 2011
@@ -80,14 +80,19 @@ public final class STSUtils {
return TOKEN_TYPE_SCT_05_12;
}
- public static STSClient getClient(Message message) {
+ public static STSClient getClient(Message message, String type) {
+ if (type == null) {
+ type = "";
+ } else {
+ type = "." + type + "-client";
+ }
STSClient client = (STSClient)message
.getContextualProperty(SecurityConstants.STS_CLIENT);
if (client == null) {
client = new STSClient(message.getExchange().get(Bus.class));
Endpoint ep = message.getExchange().get(Endpoint.class);
- client.setEndpointName(ep.getEndpointInfo().getName().toString() + ".sct-client");
- client.setBeanName(ep.getEndpointInfo().getName().toString() + ".sct-client");
+ client.setEndpointName(ep.getEndpointInfo().getName().toString() + type);
+ client.setBeanName(ep.getEndpointInfo().getName().toString() + type);
}
return client;
}