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 2016/02/04 16:32:21 UTC
[1/6] cxf git commit: Remove WebServiceContext from the STS Token
providers
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes b41c6ffd2 -> d8673543d
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
index 00d7211..321696a 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
@@ -22,14 +22,13 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import javax.security.auth.callback.CallbackHandler;
-import javax.xml.ws.WebServiceContext;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
@@ -114,7 +113,7 @@ public class SAMLTokenRenewerPOPTest extends org.junit.Assert {
renewerParameters.setAppliesToAddress("http://dummy-service.com/dummy");
renewerParameters.setStsProperties(validatorParameters.getStsProperties());
renewerParameters.setPrincipal(new CustomTokenPrincipal("alice"));
- renewerParameters.setWebServiceContext(validatorParameters.getWebServiceContext());
+ renewerParameters.setMessageContext(validatorParameters.getMessageContext());
renewerParameters.setKeyRequirements(validatorParameters.getKeyRequirements());
renewerParameters.setTokenRequirements(validatorParameters.getTokenRequirements());
renewerParameters.setTokenStore(validatorParameters.getTokenStore());
@@ -145,8 +144,8 @@ public class SAMLTokenRenewerPOPTest extends org.junit.Assert {
Collections.singletonMap(WSConstants.SIGN, signedResults));
handlerResults.add(handlerResult);
- WebServiceContext context = validatorParameters.getWebServiceContext();
- context.getMessageContext().put(WSHandlerConstants.RECV_RESULTS, handlerResults);
+ Map<String, Object> messageContext = validatorParameters.getMessageContext();
+ messageContext.put(WSHandlerConstants.RECV_RESULTS, handlerResults);
// Now successfully renew the token
TokenRenewerResponse renewerResponse =
@@ -191,7 +190,7 @@ public class SAMLTokenRenewerPOPTest extends org.junit.Assert {
renewerParameters.setAppliesToAddress("http://dummy-service.com/dummy");
renewerParameters.setStsProperties(validatorParameters.getStsProperties());
renewerParameters.setPrincipal(new CustomTokenPrincipal("alice"));
- renewerParameters.setWebServiceContext(validatorParameters.getWebServiceContext());
+ renewerParameters.setMessageContext(validatorParameters.getMessageContext());
renewerParameters.setKeyRequirements(validatorParameters.getKeyRequirements());
renewerParameters.setTokenRequirements(validatorParameters.getTokenRequirements());
renewerParameters.setTokenStore(validatorParameters.getTokenStore());
@@ -222,8 +221,8 @@ public class SAMLTokenRenewerPOPTest extends org.junit.Assert {
Collections.singletonMap(WSConstants.SIGN, signedResults));
handlerResults.add(handlerResult);
- WebServiceContext context = validatorParameters.getWebServiceContext();
- context.getMessageContext().put(WSHandlerConstants.RECV_RESULTS, handlerResults);
+ Map<String, Object> messageContext = validatorParameters.getMessageContext();
+ messageContext.put(WSHandlerConstants.RECV_RESULTS, handlerResults);
try {
samlTokenRenewer.renewToken(renewerParameters);
@@ -247,8 +246,7 @@ public class SAMLTokenRenewerPOPTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
// Add STSProperties object
StaticSTSProperties stsProperties = new StaticSTSProperties();
@@ -327,8 +325,7 @@ public class SAMLTokenRenewerPOPTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
index 6dd4ca8..c29fd95 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
@@ -28,7 +28,6 @@ import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
@@ -119,7 +118,7 @@ public class SAMLTokenRenewerRealmTest extends org.junit.Assert {
renewerParameters.setAppliesToAddress("http://dummy-service.com/dummy");
renewerParameters.setStsProperties(validatorParameters.getStsProperties());
renewerParameters.setPrincipal(new CustomTokenPrincipal("alice"));
- renewerParameters.setWebServiceContext(validatorParameters.getWebServiceContext());
+ renewerParameters.setMessageContext(validatorParameters.getMessageContext());
renewerParameters.setKeyRequirements(validatorParameters.getKeyRequirements());
renewerParameters.setTokenRequirements(validatorParameters.getTokenRequirements());
renewerParameters.setTokenStore(validatorParameters.getTokenStore());
@@ -192,7 +191,7 @@ public class SAMLTokenRenewerRealmTest extends org.junit.Assert {
renewerParameters.setAppliesToAddress("http://dummy-service.com/dummy");
renewerParameters.setStsProperties(validatorParameters.getStsProperties());
renewerParameters.setPrincipal(new CustomTokenPrincipal("alice"));
- renewerParameters.setWebServiceContext(validatorParameters.getWebServiceContext());
+ renewerParameters.setMessageContext(validatorParameters.getMessageContext());
renewerParameters.setKeyRequirements(validatorParameters.getKeyRequirements());
renewerParameters.setTokenRequirements(validatorParameters.getTokenRequirements());
renewerParameters.setTokenStore(validatorParameters.getTokenStore());
@@ -235,8 +234,7 @@ public class SAMLTokenRenewerRealmTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
// Add STSProperties object
StaticSTSProperties stsProperties = new StaticSTSProperties();
@@ -327,8 +325,7 @@ public class SAMLTokenRenewerRealmTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
index 3b56bf5..c756b11 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
@@ -26,7 +26,6 @@ import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
@@ -107,7 +106,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
renewerParameters.setAppliesToAddress("http://dummy-service.com/dummy");
renewerParameters.setStsProperties(validatorParameters.getStsProperties());
renewerParameters.setPrincipal(new CustomTokenPrincipal("alice"));
- renewerParameters.setWebServiceContext(validatorParameters.getWebServiceContext());
+ renewerParameters.setMessageContext(validatorParameters.getMessageContext());
renewerParameters.setKeyRequirements(validatorParameters.getKeyRequirements());
renewerParameters.setTokenRequirements(validatorParameters.getTokenRequirements());
renewerParameters.setTokenStore(validatorParameters.getTokenStore());
@@ -184,7 +183,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
renewerParameters.setAppliesToAddress("http://dummy-service.com/dummy");
renewerParameters.setStsProperties(validatorParameters.getStsProperties());
renewerParameters.setPrincipal(new CustomTokenPrincipal("alice"));
- renewerParameters.setWebServiceContext(validatorParameters.getWebServiceContext());
+ renewerParameters.setMessageContext(validatorParameters.getMessageContext());
renewerParameters.setKeyRequirements(validatorParameters.getKeyRequirements());
renewerParameters.setTokenRequirements(validatorParameters.getTokenRequirements());
renewerParameters.setTokenStore(validatorParameters.getTokenStore());
@@ -240,7 +239,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
renewerParameters.setAppliesToAddress("http://dummy-service.com/dummy");
renewerParameters.setStsProperties(validatorParameters.getStsProperties());
renewerParameters.setPrincipal(new CustomTokenPrincipal("alice"));
- renewerParameters.setWebServiceContext(validatorParameters.getWebServiceContext());
+ renewerParameters.setMessageContext(validatorParameters.getMessageContext());
renewerParameters.setKeyRequirements(validatorParameters.getKeyRequirements());
renewerParameters.setTokenRequirements(validatorParameters.getTokenRequirements());
renewerParameters.setTokenStore(validatorParameters.getTokenStore());
@@ -316,7 +315,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
renewerParameters.setAppliesToAddress("http://dummy-service.com/dummy");
renewerParameters.setStsProperties(validatorParameters.getStsProperties());
renewerParameters.setPrincipal(new CustomTokenPrincipal("alice"));
- renewerParameters.setWebServiceContext(validatorParameters.getWebServiceContext());
+ renewerParameters.setMessageContext(validatorParameters.getMessageContext());
renewerParameters.setKeyRequirements(validatorParameters.getKeyRequirements());
renewerParameters.setTokenRequirements(validatorParameters.getTokenRequirements());
renewerParameters.setTokenStore(validatorParameters.getTokenStore());
@@ -393,7 +392,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
renewerParameters.setAppliesToAddress("http://dummy-service.com/dummy");
renewerParameters.setStsProperties(validatorParameters.getStsProperties());
renewerParameters.setPrincipal(new CustomTokenPrincipal("alice"));
- renewerParameters.setWebServiceContext(validatorParameters.getWebServiceContext());
+ renewerParameters.setMessageContext(validatorParameters.getMessageContext());
renewerParameters.setKeyRequirements(validatorParameters.getKeyRequirements());
renewerParameters.setTokenRequirements(validatorParameters.getTokenRequirements());
renewerParameters.setTokenStore(validatorParameters.getTokenStore());
@@ -452,7 +451,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
renewerParameters.setAppliesToAddress("http://dummy-service.com/dummy");
renewerParameters.setStsProperties(validatorParameters.getStsProperties());
renewerParameters.setPrincipal(new CustomTokenPrincipal("alice"));
- renewerParameters.setWebServiceContext(validatorParameters.getWebServiceContext());
+ renewerParameters.setMessageContext(validatorParameters.getMessageContext());
renewerParameters.setKeyRequirements(validatorParameters.getKeyRequirements());
renewerParameters.setTokenRequirements(validatorParameters.getTokenRequirements());
renewerParameters.setTokenStore(validatorParameters.getTokenStore());
@@ -508,7 +507,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
renewerParameters.setAppliesToAddress("http://dummy-service.com/dummy2");
renewerParameters.setStsProperties(validatorParameters.getStsProperties());
renewerParameters.setPrincipal(new CustomTokenPrincipal("alice"));
- renewerParameters.setWebServiceContext(validatorParameters.getWebServiceContext());
+ renewerParameters.setMessageContext(validatorParameters.getMessageContext());
renewerParameters.setKeyRequirements(validatorParameters.getKeyRequirements());
renewerParameters.setTokenRequirements(validatorParameters.getTokenRequirements());
renewerParameters.setTokenStore(validatorParameters.getTokenStore());
@@ -540,8 +539,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
// Add STSProperties object
StaticSTSProperties stsProperties = new StaticSTSProperties();
@@ -615,8 +613,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
index 98283e9..00cbfef 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
@@ -27,7 +27,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rs.security.jose.jwt.JwtConstants;
@@ -190,8 +189,7 @@ public class JWTTokenValidatorRealmTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
@@ -226,8 +224,7 @@ public class JWTTokenValidatorRealmTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
// Add STSProperties object
StaticSTSProperties stsProperties = new StaticSTSProperties();
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
index 13a60b8..03c8bdb 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
@@ -31,7 +31,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rs.security.jose.jwt.JwtClaims;
@@ -338,8 +337,7 @@ public class JWTTokenValidatorTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
@@ -374,8 +372,7 @@ public class JWTTokenValidatorTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
// Add STSProperties object
StaticSTSProperties stsProperties = new StaticSTSProperties();
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
index 94d4b2d..9c48cda 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
@@ -28,7 +28,6 @@ import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
@@ -147,8 +146,7 @@ public class SAMLTokenValidatorCachedRealmTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
// Add STSProperties object
StaticSTSProperties stsProperties = new StaticSTSProperties();
@@ -219,8 +217,7 @@ public class SAMLTokenValidatorCachedRealmTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
index cab5fa7..8e4b060 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
@@ -28,7 +28,6 @@ import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
@@ -156,8 +155,7 @@ public class SAMLTokenValidatorRealmTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
// Add STSProperties object
StaticSTSProperties stsProperties = new StaticSTSProperties();
@@ -228,8 +226,7 @@ public class SAMLTokenValidatorRealmTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
index b959097..3d80c40 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
@@ -34,7 +34,6 @@ import javax.security.auth.callback.UnsupportedCallbackException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rt.security.claims.Claim;
@@ -486,8 +485,7 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
// Add STSProperties object
StaticSTSProperties stsProperties = new StaticSTSProperties();
@@ -617,8 +615,7 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
index 71886fd..af90113 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
@@ -23,7 +23,6 @@ import java.util.Properties;
import org.w3c.dom.Document;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
@@ -140,8 +139,7 @@ public class SCTValidatorTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
// Add STSProperties object
StaticSTSProperties stsProperties = new StaticSTSProperties();
@@ -173,8 +171,7 @@ public class SCTValidatorTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java
index e215214..8812b4b 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java
@@ -27,7 +27,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.QNameConstants;
@@ -248,8 +247,7 @@ public class UsernameTokenValidatorTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
// Add STSProperties object
StaticSTSProperties stsProperties = new StaticSTSProperties();
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java
index 125db6b..9521e28 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java
@@ -24,7 +24,6 @@ import java.util.Properties;
import javax.xml.bind.JAXBElement;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.QNameConstants;
@@ -151,8 +150,7 @@ public class X509TokenValidatorTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
// Add STSProperties object
StaticSTSProperties stsProperties = new StaticSTSProperties();
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java
index 87ab54f..81bde90 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java
@@ -54,7 +54,7 @@ public class CustomAttributeStatementProvider implements AttributeStatementProvi
params.setStsProperties(providerParameters.getStsProperties());
params.setTokenRequirements(providerParameters.getTokenRequirements());
params.setTokenStore(providerParameters.getTokenStore());
- params.setWebServiceContext(providerParameters.getWebServiceContext());
+ params.setMessageContext(providerParameters.getMessageContext());
retrievedClaims =
claimsManager.retrieveClaimValues(
providerParameters.getRequestedPrimaryClaims(),
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
index 502fb55..dcfe966 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
@@ -28,7 +28,6 @@ import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Element;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
@@ -366,8 +365,7 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
index fc770a8..1b27208 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
@@ -34,7 +34,6 @@ import org.apache.cxf.binding.soap.SoapBindingConstants;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
@@ -593,8 +592,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress(
"https://localhost:" + STSPORT + "/SecurityTokenService/b-issuer/Transport");
[4/6] cxf git commit: Finished removing the WebServiceContext from
the STS
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java
index d62071d..21c5114 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java
@@ -27,7 +27,6 @@ import java.util.Properties;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.security.SecurityContext;
@@ -111,15 +110,15 @@ public class ValidateX509TokenUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, principal, msgCtx);
assertTrue(validateResponse(response));
}
@@ -175,15 +174,15 @@ public class ValidateX509TokenUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, principal, msgCtx);
assertFalse(validateResponse(response));
}
[5/6] cxf git commit: Finished removing the WebServiceContext from
the STS
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
index 510c7b4..273b7a7 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
@@ -35,7 +35,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.security.SecurityContext;
@@ -159,11 +158,10 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -231,11 +229,10 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -301,13 +298,12 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
// This should fail as the default DelegationHandler does not allow HolderOfKey
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected as HolderOfKey is not allowed by default");
} catch (STSException ex) {
// expected
@@ -317,7 +313,7 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
issueOperation.setDelegationHandlers(Collections.singletonList(delegationHandler));
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -383,13 +379,12 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
// This should fail as the default DelegationHandler does not allow HolderOfKey
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected as HolderOfKey is not allowed by default");
} catch (STSException ex) {
// expected
@@ -399,7 +394,7 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
issueOperation.setDelegationHandlers(Collections.singletonList(delegationHandler));
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -465,13 +460,12 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
// This should fail as the default DelegationHandler does not allow HolderOfKey
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected as HolderOfKey is not allowed by default");
} catch (STSException ex) {
// expected
@@ -481,7 +475,7 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
issueOperation.setDelegationHandlers(Collections.singletonList(delegationHandler));
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -547,13 +541,12 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
// This should fail as the default DelegationHandler does not allow HolderOfKey
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected as HolderOfKey is not allowed by default");
} catch (STSException ex) {
// expected
@@ -563,7 +556,7 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
issueOperation.setDelegationHandlers(Collections.singletonList(delegationHandler));
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -633,15 +626,14 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token - this should work
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
request.getAny().add(createAppliesToElement("http://dummy-service.com/dummy2"));
// This should fail
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected due to AudienceRestriction");
} catch (STSException ex) {
// expected
@@ -712,15 +704,14 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token - this should work
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
request.getAny().add(createAppliesToElement("http://dummy-service.com/dummy2"));
// This should fail
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected due to AudienceRestriction");
} catch (STSException ex) {
// expected
@@ -784,13 +775,12 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
// This should fail as the default DelegationHandler does not allow UsernameTokens
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected as UsernameTokens are not accepted for OnBehalfOf by default");
} catch (STSException ex) {
// expected
@@ -800,7 +790,7 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
issueOperation.setDelegationHandlers(Collections.singletonList(delegationHandler));
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -863,14 +853,13 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
TokenDelegationHandler delegationHandler = new UsernameTokenDelegationHandler();
issueOperation.setDelegationHandlers(Collections.singletonList(delegationHandler));
// Issue a token - this will fail as the UsernameToken validation fails
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected as no principal is available to create SAML assertion");
} catch (STSException ex) {
// expected
@@ -950,12 +939,11 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "https");
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token - this will fail as the tokenProvider doesn't understand how to handle
// realm "B"
//try {
- // issueOperation.issue(request, webServiceContext);
+ // issueOperation.issue(request, msgCtx);
//} catch (STSException ex) {
// // expected
//}
@@ -963,7 +951,7 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
samlTokenProvider.setRealmMap(realms);
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponseList =
response.getRequestSecurityTokenResponse();
@@ -1052,15 +1040,15 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
// Mock up message context with user 'bob'
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("bob");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("bob"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -1174,15 +1162,15 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
// Mock up message context with user 'bob'
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("bob");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("bob"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java
index ee5a6bb..ef6b190 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java
@@ -31,7 +31,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.security.SecurityContext;
@@ -120,15 +119,15 @@ public class IssueSCTUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -198,15 +197,15 @@ public class IssueSCTUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -272,15 +271,15 @@ public class IssueSCTUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
index 459a78f..411ed13 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
@@ -35,7 +35,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rt.security.claims.Claim;
@@ -128,10 +127,11 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert {
request.getAny().add(secondaryParameters);
request.getAny().add(createAppliesToElement("http://dummy-service.com/dummy"));
- WebServiceContextImpl webServiceContext = setupMessageContext();
+ Map<String, Object> msgCtx = setupMessageContext();
List<RequestSecurityTokenResponseType> securityTokenResponse = issueToken(issueOperation, request,
- webServiceContext);
+ new CustomTokenPrincipal("alice"),
+ msgCtx);
// Test the generated token.
Element assertion = null;
@@ -188,10 +188,11 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert {
request.getAny().add(secondaryParameters);
request.getAny().add(createAppliesToElement("http://dummy-service.com/dummy"));
- WebServiceContextImpl webServiceContext = setupMessageContext();
+ Map<String, Object> msgCtx = setupMessageContext();
List<RequestSecurityTokenResponseType> securityTokenResponse = issueToken(issueOperation, request,
- webServiceContext);
+ new CustomTokenPrincipal("alice"),
+ msgCtx);
// Test the generated token.
Element assertion = null;
@@ -251,11 +252,11 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert {
request.getAny().add(createAppliesToElement("http://dummy-service.com/dummy"));
// Mock up message context
- WebServiceContextImpl webServiceContext = setupMessageContext();
+ Map<String, Object> msgCtx = setupMessageContext();
// Issue a token
List<RequestSecurityTokenResponseType> securityTokenResponse = issueToken(issueOperation,
- request, webServiceContext);
+ request, new CustomTokenPrincipal("alice"), msgCtx);
// Test the generated token.
Element assertion = null;
@@ -316,10 +317,10 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert {
request.getAny().add(secondaryParameters);
request.getAny().add(createAppliesToElement("http://dummy-service.com/dummy"));
- WebServiceContextImpl webServiceContext = setupMessageContext();
+ Map<String, Object> msgCtx = setupMessageContext();
try {
- issueToken(issueOperation, request, webServiceContext);
+ issueToken(issueOperation, request, new CustomTokenPrincipal("alice"), msgCtx);
fail("Failure expected on an unknown non-optional claims type");
} catch (Exception ex) {
// expected
@@ -333,9 +334,9 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert {
* @return
*/
private List<RequestSecurityTokenResponseType> issueToken(TokenIssueOperation issueOperation,
- RequestSecurityTokenType request, WebServiceContextImpl webServiceContext) {
+ RequestSecurityTokenType request, Principal principal, Map<String, Object> msgCtx) {
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -345,14 +346,14 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert {
/**
* @return
*/
- private WebServiceContextImpl setupMessageContext() {
+ private Map<String, Object> setupMessageContext() {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put(
SecurityContext.class.getName(),
createSecurityContext(new CustomTokenPrincipal("alice"))
);
- return new WebServiceContextImpl(msgCtx);
+ return msgCtx;
}
/**
@@ -438,10 +439,11 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert {
request.getAny().add(createAppliesToElement("http://dummy-service.com/dummy"));
- WebServiceContextImpl webServiceContext = setupMessageContext();
+ Map<String, Object> msgCtx = setupMessageContext();
List<RequestSecurityTokenResponseType> securityTokenResponse = issueToken(issueOperation, request,
- webServiceContext);
+ new CustomTokenPrincipal("alice"),
+ msgCtx);
// Test the generated token.
Element assertion = null;
@@ -567,10 +569,9 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "https");
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponseList = issueToken(issueOperation,
- request, webServiceContext);
+ request, null, msgCtx);
RequestSecurityTokenResponseType securityTokenResponse = securityTokenResponseList.get(0);
// Test the generated token.
@@ -721,10 +722,9 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "https");
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponseList = issueToken(issueOperation,
- request, webServiceContext);
+ request, null, msgCtx);
RequestSecurityTokenResponseType securityTokenResponse = securityTokenResponseList.get(0);
// Test the generated token.
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java
index f8badb0..88c7384 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java
@@ -32,7 +32,6 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.security.SecurityContext;
@@ -114,15 +113,15 @@ public class IssueSamlRealmUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "ldap");
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -190,15 +189,15 @@ public class IssueSamlRealmUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "https");
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -266,15 +265,15 @@ public class IssueSamlRealmUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "unknown");
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -351,16 +350,16 @@ public class IssueSamlRealmUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "https");
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token - this will fail as the SAMLRealm configuration is inconsistent
// no signature alias defined
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
fail("Failure expected on no encryption name");
} catch (STSException ex) {
// expected
@@ -370,7 +369,7 @@ public class IssueSamlRealmUnitTest extends org.junit.Assert {
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -449,15 +448,15 @@ public class IssueSamlRealmUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "https");
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java
index d3a0332..4231365 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java
@@ -33,7 +33,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.security.SecurityContext;
@@ -136,15 +135,15 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -208,15 +207,15 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -281,15 +280,15 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -367,15 +366,15 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(requestCollection, webServiceContext);
+ issueOperation.issue(requestCollection, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertEquals(securityTokenResponse.size(), 2);
@@ -461,15 +460,15 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -538,15 +537,15 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
fail("Failure expected on no certificate");
} catch (STSException ex) {
// expected failure on no certificate
@@ -559,7 +558,7 @@ public class IssueSamlUnitTest extends org.junit.Assert {
request.getAny().add(useKeyType);
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -634,11 +633,11 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Now add Entropy
BinarySecretType binarySecretType = new BinarySecretType();
@@ -656,7 +655,7 @@ public class IssueSamlUnitTest extends org.junit.Assert {
request.getAny().add(entropyJaxbType);
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -727,11 +726,11 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Now add Entropy
BinarySecretType binarySecretType = new BinarySecretType();
@@ -749,7 +748,7 @@ public class IssueSamlUnitTest extends org.junit.Assert {
request.getAny().add(entropyJaxbType);
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -819,11 +818,11 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Now add Entropy
WSSecEncryptedKey builder = new WSSecEncryptedKey();
@@ -843,7 +842,7 @@ public class IssueSamlUnitTest extends org.junit.Assert {
request.getAny().add(entropyJaxbType);
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -932,15 +931,15 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -1012,15 +1011,15 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -1103,15 +1102,15 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -1187,15 +1186,15 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -1232,7 +1231,7 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// This should fail as the UseKey certificate is not trusted
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
fail("Failure expected as the UseKey certificate is not trusted");
} catch (STSException ex) {
// expected
@@ -1240,7 +1239,7 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Now allow non-trusted UseKey certificates...
stsProperties.setValidateUseKey(false);
- response = issueOperation.issue(request, webServiceContext);
+ response = issueOperation.issue(request, principal, msgCtx);
securityTokenResponse = response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
}
@@ -1303,15 +1302,15 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -1395,15 +1394,15 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java
index d22fc3b..f6ee62b 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java
@@ -29,7 +29,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.QNameConstants;
@@ -87,11 +86,10 @@ public class IssueUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -138,11 +136,10 @@ public class IssueUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(requestCollection, webServiceContext);
+ issueOperation.issue(requestCollection, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertEquals(securityTokenResponse.size(), 2);
@@ -181,11 +178,10 @@ public class IssueUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token - failure expected on an unknown token type
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected on an unknown token type");
} catch (STSException ex) {
// expected
@@ -194,7 +190,7 @@ public class IssueUnitTest extends org.junit.Assert {
// Issue a token - failure expected as no token type is sent
request.getAny().remove(0);
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected on no token type");
} catch (STSException ex) {
// expected
@@ -205,7 +201,7 @@ public class IssueUnitTest extends org.junit.Assert {
issueOperation.setServices(Collections.singletonList(service));
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -246,11 +242,10 @@ public class IssueUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token - failure expected on an unknown address
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected on an unknown address");
} catch (STSException ex) {
// expected
@@ -261,7 +256,7 @@ public class IssueUnitTest extends org.junit.Assert {
issueOperation.setServices(Collections.singletonList(service));
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -299,11 +294,10 @@ public class IssueUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -345,11 +339,10 @@ public class IssueUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -394,11 +387,10 @@ public class IssueUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -437,11 +429,10 @@ public class IssueUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseType response =
- issueOperation.issueSingle(request, webServiceContext);
+ issueOperation.issueSingle(request, null, msgCtx);
assertTrue(!response.getAny().isEmpty());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
index 3da66d4..96ca530 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
@@ -31,7 +31,6 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.security.SecurityContext;
@@ -145,15 +144,15 @@ public class RenewSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Renew a token
RequestSecurityTokenResponseType response =
- renewOperation.renew(request, webServiceContext);
+ renewOperation.renew(request, principal, msgCtx);
assertTrue(response != null && response.getAny() != null && !response.getAny().isEmpty());
// Test the generated token.
@@ -239,15 +238,15 @@ public class RenewSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- // Validate a token
+ // Renew a token
RequestSecurityTokenResponseType response =
- renewOperation.renew(request, webServiceContext);
+ renewOperation.renew(request, principal, msgCtx);
assertTrue(response != null && response.getAny() != null && !response.getAny().isEmpty());
@@ -333,15 +332,15 @@ public class RenewSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- // Validate a token
+ // Renew a token
RequestSecurityTokenResponseType response =
- renewOperation.renew(request, webServiceContext);
+ renewOperation.renew(request, principal, msgCtx);
assertTrue(response != null && response.getAny() != null && !response.getAny().isEmpty());
@@ -422,15 +421,15 @@ public class RenewSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- // Validate a token
+ // Renew a token
RequestSecurityTokenResponseType response =
- renewOperation.renew(request, webServiceContext);
+ renewOperation.renew(request, principal, msgCtx);
assertTrue(response != null && response.getAny() != null && !response.getAny().isEmpty());
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
index 54f9b9a..cba7187 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
@@ -34,7 +34,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
@@ -143,15 +142,15 @@ public class ValidateJWTTransformationTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, principal, msgCtx);
assertTrue(validateResponse(response));
// Test the generated token.
@@ -229,23 +228,23 @@ public class ValidateJWTTransformationTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
msgCtx.put("url", "https");
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token - this will fail as the tokenProvider doesn't understand how to handle
// realm "B"
try {
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, principal, msgCtx);
} catch (STSException ex) {
// expected
}
samlTokenProvider.setRealmMap(createSamlRealms());
- RequestSecurityTokenResponseType response = validateOperation.validate(request, webServiceContext);
+ RequestSecurityTokenResponseType response = validateOperation.validate(request, principal, msgCtx);
assertTrue(validateResponse(response));
// Test the generated token.
@@ -319,15 +318,15 @@ public class ValidateJWTTransformationTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, principal, msgCtx);
assertTrue(validateResponse(response));
// Test the generated token.
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
index 0c520e3..8bc5efb 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
@@ -29,7 +29,6 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.security.SecurityContext;
@@ -111,15 +110,15 @@ public class ValidateJWTUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, principal, msgCtx);
assertTrue(validateResponse(response));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java
index 0d0bd77..4ea8e97 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java
@@ -29,7 +29,6 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.security.SecurityContext;
@@ -120,21 +119,21 @@ public class ValidateSCTUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, principal, msgCtx);
assertTrue(validateResponse(response));
// Now remove the token from the cache before validating again
tokenStore.remove(tokenStore.getToken(providerResponse.getTokenId()).getId());
assertNull(tokenStore.getToken(providerResponse.getTokenId()));
- response = validateOperation.validate(request, webServiceContext);
+ response = validateOperation.validate(request, principal, msgCtx);
assertFalse(validateResponse(response));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java
index faf5d47..a39b437 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java
@@ -30,7 +30,6 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.security.SecurityContext;
@@ -117,15 +116,15 @@ public class ValidateSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, principal, msgCtx);
assertTrue(validateResponse(response));
}
@@ -178,15 +177,15 @@ public class ValidateSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, principal, msgCtx);
assertTrue(validateResponse(response));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
index 9853ec2..d8ac35e 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
@@ -33,7 +33,6 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rt.security.claims.Claim;
@@ -145,15 +144,15 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, principal, msgCtx);
assertTrue(validateResponse(response));
// Test the generated token.
@@ -231,23 +230,23 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
msgCtx.put("url", "https");
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token - this will fail as the tokenProvider doesn't understand how to handle
// realm "B"
try {
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, principal, msgCtx);
} catch (STSException ex) {
// expected
}
samlTokenProvider.setRealmMap(createSamlRealms());
- RequestSecurityTokenResponseType response = validateOperation.validate(request, webServiceContext);
+ RequestSecurityTokenResponseType response = validateOperation.validate(request, principal, msgCtx);
assertTrue(validateResponse(response));
// Test the generated token.
@@ -419,11 +418,10 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "https");
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- // run the test
+ // Validate a token
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, null, msgCtx);
assertTrue(validateResponse(response));
// Test the generated token.
@@ -513,15 +511,15 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("ted");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("ted"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, principal, msgCtx);
assertTrue(validateResponse(response));
// Test the generated token.
@@ -648,11 +646,10 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "https");
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- // run the test
+ // Validate a token
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, null, msgCtx);
assertTrue(validateResponse(response));
// Test the generated token.
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java
index c4e774e..099371d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java
@@ -24,7 +24,6 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.QNameConstants;
@@ -85,11 +84,10 @@ public class ValidateUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, null, msgCtx);
assertTrue(validateResponse(response));
}
@@ -150,11 +148,10 @@ public class ValidateUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token
RequestSecurityTokenResponseCollectionType response =
- requestCollectionOperation.requestCollection(requestCollection, webServiceContext);
+ requestCollectionOperation.requestCollection(requestCollection, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertEquals(securityTokenResponse.size(), 2);
@@ -189,11 +186,10 @@ public class ValidateUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token
try {
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, null, msgCtx);
fail("Failure expected when no element is presented for validation");
} catch (STSException ex) {
// expected
@@ -235,11 +231,10 @@ public class ValidateUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token - failure expected on an unknown token type
try {
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, null, msgCtx);
fail("Failure expected on an unknown token type");
} catch (STSException ex) {
// expected
@@ -248,7 +243,7 @@ public class ValidateUnitTest extends org.junit.Assert {
// Validate a token - no token type is sent, so it defaults to status
request.getAny().remove(0);
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, null, msgCtx);
assertTrue(validateResponse(response));
}
@@ -290,11 +285,10 @@ public class ValidateUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, null, msgCtx);
assertTrue(validateResponse(response));
assertTrue("AuthenticationContext".equals(response.getContext()));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java
index 53b04cf..de4cf4b 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java
@@ -26,7 +26,6 @@ import java.util.Properties;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.security.SecurityContext;
@@ -104,15 +103,15 @@ public class ValidateUsernameTokenUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, principal, msgCtx);
assertTrue(validateResponse(response));
}
@@ -161,15 +160,15 @@ public class ValidateUsernameTokenUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Validate a token
RequestSecurityTokenResponseType response =
- validateOperation.validate(request, webServiceContext);
+ validateOperation.validate(request, principal, msgCtx);
assertFalse(validateResponse(response));
}
[3/6] cxf git commit: Strip WebServiceContext from the RequestParser
+ RealmParser
Posted by co...@apache.org.
Strip WebServiceContext from the RequestParser + RealmParser
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aafbcde5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aafbcde5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aafbcde5
Branch: refs/heads/3.1.x-fixes
Commit: aafbcde58a0ef31e76bd4444b99592ef685456a7
Parents: da40221
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Feb 2 15:33:22 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 4 14:44:07 2016 +0000
----------------------------------------------------------------------
.../java/org/apache/cxf/sts/RealmParser.java | 6 ++--
.../cxf/sts/operation/AbstractOperation.java | 5 +--
.../cxf/sts/operation/TokenRenewOperation.java | 2 +-
.../sts/operation/TokenValidateOperation.java | 2 +-
.../apache/cxf/sts/request/RequestParser.java | 32 +++++++++-----------
.../cxf/sts/operation/CustomRealmParser.java | 6 ++--
.../cxf/sts/request/RequestParserUnitTest.java | 10 ++----
.../cxf/systest/sts/realms/URLRealmParser.java | 6 ++--
.../cxf/systest/sts/common/UriRealmParser.java | 7 ++---
9 files changed, 34 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/aafbcde5/services/sts/sts-core/src/main/java/org/apache/cxf/sts/RealmParser.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/RealmParser.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/RealmParser.java
index 75a3a4a..a597ea4 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/RealmParser.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/RealmParser.java
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.sts;
-import javax.xml.ws.WebServiceContext;
+import java.util.Map;
import org.apache.cxf.ws.security.sts.provider.STSException;
@@ -28,8 +28,8 @@ import org.apache.cxf.ws.security.sts.provider.STSException;
public interface RealmParser {
/**
- * Return the realm of the current request given a WebServiceContext object
+ * Return the realm of the current request given a message context map
*/
- String parseRealm(WebServiceContext context) throws STSException;
+ String parseRealm(Map<String, Object> messageContext) throws STSException;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aafbcde5/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
index b6a827b..c88471e 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
@@ -181,7 +181,8 @@ public abstract class AbstractOperation {
stsProperties.configureProperties();
RequestParser requestParser = new RequestParser();
- return requestParser.parseRequest(request, context, stsProperties, claimsManager.getClaimParsers());
+ return requestParser.parseRequest(request, context.getMessageContext(), stsProperties,
+ claimsManager.getClaimParsers());
}
/**
@@ -407,7 +408,7 @@ public abstract class AbstractOperation {
// Get the realm of the request
if (stsProperties.getRealmParser() != null) {
RealmParser realmParser = stsProperties.getRealmParser();
- String realm = realmParser.parseRealm(context);
+ String realm = realmParser.parseRealm(context.getMessageContext());
providerParameters.setRealm(realm);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aafbcde5/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
index 312631d..c0da0a8 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
@@ -105,7 +105,7 @@ public class TokenRenewOperation extends AbstractOperation implements RenewOpera
String realm = null;
if (stsProperties.getRealmParser() != null) {
RealmParser realmParser = stsProperties.getRealmParser();
- realm = realmParser.parseRealm(context);
+ realm = realmParser.parseRealm(context.getMessageContext());
}
renewerParameters.setRealm(realm);
http://git-wip-us.apache.org/repos/asf/cxf/blob/aafbcde5/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
index e84fe2e..49cfb74 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
@@ -101,7 +101,7 @@ public class TokenValidateOperation extends AbstractOperation implements Validat
String realm = null;
if (stsProperties.getRealmParser() != null) {
RealmParser realmParser = stsProperties.getRealmParser();
- realm = realmParser.parseRealm(context);
+ realm = realmParser.parseRealm(context.getMessageContext());
}
validatorParameters.setRealm(realm);
http://git-wip-us.apache.org/repos/asf/cxf/blob/aafbcde5/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
index ae1441e..d3e58d5 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
@@ -30,6 +30,7 @@ import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -40,8 +41,6 @@ import javax.xml.crypto.dsig.keyinfo.KeyInfo;
import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
import javax.xml.crypto.dsig.keyinfo.KeyValue;
import javax.xml.crypto.dsig.keyinfo.X509Data;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -97,7 +96,7 @@ public class RequestParser {
private static final Logger LOG = LogUtils.getL7dLogger(RequestParser.class);
public RequestRequirements parseRequest(
- RequestSecurityTokenType request, WebServiceContext wsContext, STSPropertiesMBean stsProperties,
+ RequestSecurityTokenType request, Map<String, Object> messageContext, STSPropertiesMBean stsProperties,
List<ClaimsParser> claimsParsers
) throws STSException {
LOG.fine("Parsing RequestSecurityToken");
@@ -114,9 +113,9 @@ public class RequestParser {
}
try {
boolean found =
- parseTokenRequirements(jaxbElement, tokenRequirements, wsContext, claimsParsers);
+ parseTokenRequirements(jaxbElement, tokenRequirements, messageContext, claimsParsers);
if (!found) {
- found = parseKeyRequirements(jaxbElement, keyRequirements, wsContext, stsProperties);
+ found = parseKeyRequirements(jaxbElement, keyRequirements, messageContext, stsProperties);
}
if (!found) {
LOG.log(
@@ -180,7 +179,7 @@ public class RequestParser {
*/
private static boolean parseKeyRequirements(
JAXBElement<?> jaxbElement, KeyRequirements keyRequirements,
- WebServiceContext wsContext, STSPropertiesMBean stsProperties
+ Map<String, Object> messageContext, STSPropertiesMBean stsProperties
) {
if (QNameConstants.AUTHENTICATION_TYPE.equals(jaxbElement.getName())) {
String authenticationType = (String)jaxbElement.getValue();
@@ -208,7 +207,7 @@ public class RequestParser {
keyRequirements.setKeywrapAlgorithm(keywrapAlgorithm);
} else if (QNameConstants.USE_KEY.equals(jaxbElement.getName())) {
UseKeyType useKey = (UseKeyType)jaxbElement.getValue();
- ReceivedKey receivedKey = parseUseKey(useKey, wsContext);
+ ReceivedKey receivedKey = parseUseKey(useKey, messageContext);
keyRequirements.setReceivedKey(receivedKey);
} else if (QNameConstants.ENTROPY.equals(jaxbElement.getName())) {
EntropyType entropyType = (EntropyType)jaxbElement.getValue();
@@ -234,7 +233,7 @@ public class RequestParser {
private static boolean parseTokenRequirements(
JAXBElement<?> jaxbElement,
TokenRequirements tokenRequirements,
- WebServiceContext wsContext,
+ Map<String, Object> messageContext,
List<ClaimsParser> claimsParsers
) {
if (QNameConstants.TOKEN_TYPE.equals(jaxbElement.getName())) {
@@ -262,7 +261,7 @@ public class RequestParser {
ValidateTargetType validateTargetType = (ValidateTargetType)jaxbElement.getValue();
ReceivedToken validateTarget = new ReceivedToken(validateTargetType.getAny());
if (isTokenReferenced(validateTarget.getToken())) {
- Element target = fetchTokenElementFromReference(validateTarget.getToken(), wsContext);
+ Element target = fetchTokenElementFromReference(validateTarget.getToken(), messageContext);
validateTarget = new ReceivedToken(target);
}
tokenRequirements.setValidateTarget(validateTarget);
@@ -270,7 +269,7 @@ public class RequestParser {
CancelTargetType cancelTargetType = (CancelTargetType)jaxbElement.getValue();
ReceivedToken cancelTarget = new ReceivedToken(cancelTargetType.getAny());
if (isTokenReferenced(cancelTarget.getToken())) {
- Element target = fetchTokenElementFromReference(cancelTarget.getToken(), wsContext);
+ Element target = fetchTokenElementFromReference(cancelTarget.getToken(), messageContext);
cancelTarget = new ReceivedToken(target);
}
tokenRequirements.setCancelTarget(cancelTarget);
@@ -278,7 +277,7 @@ public class RequestParser {
RenewTargetType renewTargetType = (RenewTargetType)jaxbElement.getValue();
ReceivedToken renewTarget = new ReceivedToken(renewTargetType.getAny());
if (isTokenReferenced(renewTarget.getToken())) {
- Element target = fetchTokenElementFromReference(renewTarget.getToken(), wsContext);
+ Element target = fetchTokenElementFromReference(renewTarget.getToken(), messageContext);
renewTarget = new ReceivedToken(target);
}
tokenRequirements.setRenewTarget(renewTarget);
@@ -310,13 +309,13 @@ public class RequestParser {
/**
* Parse the UseKey structure to get a ReceivedKey containing a cert/public-key/secret-key.
* @param useKey The UseKey object
- * @param wsContext The WebServiceContext object
+ * @param messageContext The message context object
* @return the ReceivedKey that has been parsed
* @throws STSException
*/
private static ReceivedKey parseUseKey(
UseKeyType useKey,
- WebServiceContext wsContext
+ Map<String, Object> messageContext
) throws STSException {
byte[] x509 = null;
if (useKey.getAny() instanceof JAXBElement<?>) {
@@ -343,7 +342,7 @@ public class RequestParser {
|| obj instanceof SecurityTokenReferenceType) {
SecurityTokenReferenceType strType =
SecurityTokenReferenceType.class.cast(useKeyJaxb.getValue());
- Element token = fetchTokenElementFromReference(strType, wsContext);
+ Element token = fetchTokenElementFromReference(strType, messageContext);
try {
x509 = Base64Utility.decode(token.getTextContent().trim());
LOG.fine("Found X509Certificate UseKey type via reference");
@@ -354,7 +353,7 @@ public class RequestParser {
}
} else if (useKey.getAny() instanceof Element) {
if (isTokenReferenced(useKey.getAny())) {
- Element token = fetchTokenElementFromReference(useKey.getAny(), wsContext);
+ Element token = fetchTokenElementFromReference(useKey.getAny(), messageContext);
try {
x509 = Base64Utility.decode(token.getTextContent().trim());
LOG.fine("Found X509Certificate UseKey type via reference");
@@ -685,7 +684,7 @@ public class RequestParser {
* Method to fetch token from the SecurityTokenReference
*/
private static Element fetchTokenElementFromReference(
- Object targetToken, WebServiceContext wsContext
+ Object targetToken, Map<String, Object> messageContext
) {
// Get the reference URI
String referenceURI = null;
@@ -723,7 +722,6 @@ public class RequestParser {
// Find processed token corresponding to the URI
referenceURI = XMLUtils.getIDFromReference(referenceURI);
- MessageContext messageContext = wsContext.getMessageContext();
final List<WSHandlerResult> handlerResults =
CastUtils.cast((List<?>) messageContext.get(WSHandlerConstants.RECV_RESULTS));
http://git-wip-us.apache.org/repos/asf/cxf/blob/aafbcde5/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CustomRealmParser.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CustomRealmParser.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CustomRealmParser.java
index ff5b725..b1b121e 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CustomRealmParser.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CustomRealmParser.java
@@ -18,8 +18,7 @@
*/
package org.apache.cxf.sts.operation;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
+import java.util.Map;
import org.apache.cxf.sts.RealmParser;
import org.apache.cxf.ws.security.sts.provider.STSException;
@@ -29,8 +28,7 @@ import org.apache.cxf.ws.security.sts.provider.STSException;
*/
public class CustomRealmParser implements RealmParser {
- public String parseRealm(WebServiceContext context) throws STSException {
- MessageContext messageContext = context.getMessageContext();
+ public String parseRealm(Map<String, Object> messageContext) throws STSException {
String endpoint = (String)messageContext.get("url");
if (endpoint.contains("ldap")) {
return "A";
http://git-wip-us.apache.org/repos/asf/cxf/blob/aafbcde5/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java
index 63035a5..cbb7273 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java
@@ -33,7 +33,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.common.PasswordCallbackHandler;
@@ -133,7 +132,6 @@ public class RequestParserUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgContext = new WrappedMessageContext(msg);
- WebServiceContextImpl wsContext = new WebServiceContextImpl(msgContext);
// Process the security header and store the results in the message context
WSSecurityEngine securityEngine = new WSSecurityEngine();
@@ -146,7 +144,7 @@ public class RequestParserUnitTest extends org.junit.Assert {
resultsList.add(results);
msgContext.put(WSHandlerConstants.RECV_RESULTS, resultsList);
- RequestRequirements requestRequirements = parser.parseRequest(request, wsContext, null, null);
+ RequestRequirements requestRequirements = parser.parseRequest(request, msgContext, null, null);
SCTCanceller sctCanceller = new SCTCanceller();
assertTrue(sctCanceller.canHandleToken(requestRequirements.getTokenRequirements().getCancelTarget()));
@@ -164,7 +162,6 @@ public class RequestParserUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgContext = new WrappedMessageContext(msg);
- WebServiceContextImpl wsContext = new WebServiceContextImpl(msgContext);
// Process the security header and store the results in the message context
WSSecurityEngine securityEngine = new WSSecurityEngine();
@@ -177,7 +174,7 @@ public class RequestParserUnitTest extends org.junit.Assert {
resultsList.add(results);
msgContext.put(WSHandlerConstants.RECV_RESULTS, resultsList);
- RequestRequirements requestRequirements = parser.parseRequest(request, wsContext, null, null);
+ RequestRequirements requestRequirements = parser.parseRequest(request, msgContext, null, null);
SCTValidator sctValidator = new SCTValidator();
assertTrue(sctValidator.canHandleToken(requestRequirements.getTokenRequirements().getValidateTarget()));
@@ -195,7 +192,6 @@ public class RequestParserUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgContext = new WrappedMessageContext(msg);
- WebServiceContextImpl wsContext = new WebServiceContextImpl(msgContext);
// Process the security header and store the results in the message context
WSSecurityEngine securityEngine = new WSSecurityEngine();
@@ -209,7 +205,7 @@ public class RequestParserUnitTest extends org.junit.Assert {
resultsList.add(results);
msgContext.put(WSHandlerConstants.RECV_RESULTS, resultsList);
- RequestRequirements requestRequirements = parser.parseRequest(request, wsContext, null, null);
+ RequestRequirements requestRequirements = parser.parseRequest(request, msgContext, null, null);
assertNotNull(requestRequirements.getKeyRequirements().getReceivedKey().getX509Cert());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aafbcde5/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/URLRealmParser.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/URLRealmParser.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/URLRealmParser.java
index 3f40030..425ee4f 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/URLRealmParser.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/URLRealmParser.java
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.systest.sts.realms;
-import javax.xml.ws.WebServiceContext;
+import java.util.Map;
import org.apache.cxf.sts.RealmParser;
import org.apache.cxf.ws.security.sts.provider.STSException;
@@ -29,8 +29,8 @@ import org.apache.cxf.ws.security.sts.provider.STSException;
*/
public class URLRealmParser implements RealmParser {
- public String parseRealm(WebServiceContext context) throws STSException {
- String url = (String)context.getMessageContext().get("org.apache.cxf.request.url");
+ public String parseRealm(Map<String, Object> messageContext) throws STSException {
+ String url = (String)messageContext.get("org.apache.cxf.request.url");
if (url.contains("realmA")) {
return "A";
} else if (url.contains("realmB")) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aafbcde5/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/UriRealmParser.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/UriRealmParser.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/UriRealmParser.java
index 7ce72d4..87f5d7d 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/UriRealmParser.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/UriRealmParser.java
@@ -18,22 +18,21 @@
*/
package org.apache.cxf.systest.sts.common;
+import java.util.Map;
import java.util.StringTokenizer;
-import javax.xml.ws.WebServiceContext;
-
import org.apache.cxf.sts.RealmParser;
import org.apache.cxf.ws.security.sts.provider.STSException;
public class UriRealmParser implements RealmParser {
@Override
- public String parseRealm(WebServiceContext context) throws STSException {
+ public String parseRealm(Map<String, Object> messageContext) throws STSException {
String realm = null;
try {
- String url = (String)context.getMessageContext().get("org.apache.cxf.request.url");
+ String url = (String)messageContext.get("org.apache.cxf.request.url");
StringTokenizer st = new StringTokenizer(url, "/");
[2/6] cxf git commit: Remove WebServiceContext from the STS Token
providers
Posted by co...@apache.org.
Remove WebServiceContext from the STS Token providers
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/da40221a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/da40221a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/da40221a
Branch: refs/heads/3.1.x-fixes
Commit: da40221a626a1df88dc1260fa8e58b869bb99cf0
Parents: b41c6ff
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Feb 2 15:19:49 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 4 14:43:46 2016 +0000
----------------------------------------------------------------------
.../apache/cxf/sts/claims/ClaimsParameters.java | 20 +++++++-------
.../org/apache/cxf/sts/claims/ClaimsUtils.java | 2 +-
.../apache/cxf/sts/event/map/EventMapper.java | 28 +++++++++-----------
.../cxf/sts/operation/AbstractOperation.java | 6 ++---
.../cxf/sts/operation/TokenCancelOperation.java | 2 +-
.../cxf/sts/operation/TokenRenewOperation.java | 4 +--
.../sts/operation/TokenValidateOperation.java | 2 +-
.../cxf/sts/token/canceller/SCTCanceller.java | 8 +++---
.../canceller/TokenCancellerParameters.java | 21 +++++++--------
.../delegation/TokenDelegationParameters.java | 21 +++++++--------
.../sts/token/provider/SAMLTokenProvider.java | 2 +-
.../cxf/sts/token/provider/SCTProvider.java | 2 +-
.../token/provider/TokenProviderParameters.java | 20 +++++++-------
.../sts/token/provider/TokenProviderUtils.java | 13 +++++----
.../cxf/sts/token/renewer/SAMLTokenRenewer.java | 5 ++--
.../token/renewer/TokenRenewerParameters.java | 20 +++++++-------
.../sts/token/validator/SAMLTokenValidator.java | 2 +-
.../validator/TokenValidatorParameters.java | 21 +++++++--------
.../token/validator/UsernameTokenValidator.java | 2 +-
.../sts/token/validator/X509TokenValidator.java | 2 +-
.../claims/mapper/JexlIssueSamlClaimsTest.java | 3 +--
.../cxf/sts/operation/CancelSCTUnitTest.java | 3 +--
.../cxf/sts/operation/DummyTokenProvider.java | 2 +-
.../sts/operation/IssueJWTClaimsUnitTest.java | 3 +--
.../operation/IssueJWTOnbehalfofUnitTest.java | 3 +--
.../sts/operation/IssueOnbehalfofUnitTest.java | 3 +--
.../sts/operation/IssueSamlClaimsUnitTest.java | 3 +--
.../cxf/sts/operation/RenewSamlUnitTest.java | 3 +--
.../ValidateJWTTransformationTest.java | 6 ++---
.../cxf/sts/operation/ValidateJWTUnitTest.java | 3 +--
.../cxf/sts/operation/ValidateSCTUnitTest.java | 3 +--
.../cxf/sts/operation/ValidateSamlUnitTest.java | 3 +--
.../ValidateTokenTransformationUnitTest.java | 3 +--
.../sts/token/canceller/SCTCancellerTest.java | 7 ++---
.../cxf/sts/token/provider/JWTClaimsTest.java | 4 +--
.../token/provider/JWTProviderActAsTest.java | 4 +--
.../token/provider/JWTProviderLifetimeTest.java | 4 +--
.../provider/JWTProviderOnBehalfOfTest.java | 4 +--
.../provider/JWTTokenProviderRealmTest.java | 4 +--
.../token/provider/JWTTokenProviderTest.java | 4 +--
.../cxf/sts/token/provider/SAMLClaimsTest.java | 4 +--
.../token/provider/SAMLProviderActAsTest.java | 4 +--
.../token/provider/SAMLProviderCustomTest.java | 4 +--
.../token/provider/SAMLProviderKeyTypeTest.java | 7 ++---
.../provider/SAMLProviderLifetimeTest.java | 4 +--
.../provider/SAMLProviderOnBehalfOfTest.java | 4 +--
.../token/provider/SAMLProviderRealmTest.java | 4 +--
.../cxf/sts/token/provider/SCTProviderTest.java | 4 +--
.../renewer/SAMLTokenRenewerLifetimeTest.java | 7 ++---
.../token/renewer/SAMLTokenRenewerPOPTest.java | 21 +++++++--------
.../renewer/SAMLTokenRenewerRealmTest.java | 11 +++-----
.../sts/token/renewer/SAMLTokenRenewerTest.java | 21 +++++++--------
.../validator/JWTTokenValidatorRealmTest.java | 7 ++---
.../token/validator/JWTTokenValidatorTest.java | 7 ++---
.../SAMLTokenValidatorCachedRealmTest.java | 7 ++---
.../validator/SAMLTokenValidatorRealmTest.java | 7 ++---
.../token/validator/SAMLTokenValidatorTest.java | 7 ++---
.../sts/token/validator/SCTValidatorTest.java | 7 ++---
.../validator/UsernameTokenValidatorTest.java | 4 +--
.../token/validator/X509TokenValidatorTest.java | 4 +--
.../CustomAttributeStatementProvider.java | 2 +-
.../sts/delegation/SAMLDelegationTest.java | 4 +--
.../systest/sts/issueunit/IssueUnitTest.java | 4 +--
63 files changed, 166 insertions(+), 264 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsParameters.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsParameters.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsParameters.java
index 32b30ea..e3495cc 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsParameters.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsParameters.java
@@ -24,8 +24,6 @@ import java.security.Principal;
import java.util.Map;
import java.util.Set;
-import javax.xml.ws.WebServiceContext;
-
import org.apache.cxf.sts.STSPropertiesMBean;
import org.apache.cxf.sts.request.KeyRequirements;
import org.apache.cxf.sts.request.TokenRequirements;
@@ -43,7 +41,7 @@ public class ClaimsParameters {
private EncryptionProperties encryptionProperties;
private Principal principal;
private Set<Principal> roles;
- private WebServiceContext webServiceContext;
+ private Map<String, Object> messageContext;
private KeyRequirements keyRequirements;
private TokenRequirements tokenRequirements;
private String appliesToAddress;
@@ -99,14 +97,6 @@ public class ClaimsParameters {
this.encryptionProperties = encryptionProperties;
}
- public WebServiceContext getWebServiceContext() {
- return webServiceContext;
- }
-
- public void setWebServiceContext(WebServiceContext webServiceContext) {
- this.webServiceContext = webServiceContext;
- }
-
public void setPrincipal(Principal principal) {
this.principal = principal;
}
@@ -138,6 +128,14 @@ public class ClaimsParameters {
public String getRealm() {
return realm;
}
+
+ public Map<String, Object> getMessageContext() {
+ return messageContext;
+ }
+
+ public void setMessageContext(Map<String, Object> messageContext) {
+ this.messageContext = messageContext;
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsUtils.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsUtils.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsUtils.java
index fbd7e1c..19d3298 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsUtils.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsUtils.java
@@ -52,7 +52,7 @@ public final class ClaimsUtils {
params.setStsProperties(providerParameters.getStsProperties());
params.setTokenRequirements(providerParameters.getTokenRequirements());
params.setTokenStore(providerParameters.getTokenStore());
- params.setWebServiceContext(providerParameters.getWebServiceContext());
+ params.setMessageContext(providerParameters.getMessageContext());
retrievedClaims =
claimsManager.retrieveClaimValues(
providerParameters.getRequestedPrimaryClaims(),
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/EventMapper.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/EventMapper.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/EventMapper.java
index 97cc9e2..6596523 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/EventMapper.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/EventMapper.java
@@ -84,12 +84,11 @@ public class EventMapper implements STSEventListener {
protected void handleEvent(TokenProviderParametersSupport event, Map<String, Object> map) {
TokenProviderParameters params = event.getTokenParameters();
try {
- HttpServletRequest req = (HttpServletRequest)params.getWebServiceContext().getMessageContext()
- .get(AbstractHTTPDestination.HTTP_REQUEST);
+ HttpServletRequest req =
+ (HttpServletRequest)params.getMessageContext().get(AbstractHTTPDestination.HTTP_REQUEST);
map.put(KEYS.REMOTE_HOST.name(), req.getRemoteHost());
map.put(KEYS.REMOTE_PORT.name(), String.valueOf(req.getRemotePort()));
- map.put(KEYS.URL.name(), (String)params.getWebServiceContext().getMessageContext()
- .get("org.apache.cxf.request.url"));
+ map.put(KEYS.URL.name(), (String)params.getMessageContext().get("org.apache.cxf.request.url"));
} catch (Exception ex) {
map.put(KEYS.REMOTE_HOST.name(), "N.A.");
map.put(KEYS.REMOTE_PORT.name(), "N.A.");
@@ -133,12 +132,11 @@ public class EventMapper implements STSEventListener {
protected void handleEvent(TokenValidatorParametersSupport event, Map<String, Object> map) {
TokenValidatorParameters params = event.getTokenParameters();
- HttpServletRequest req = (HttpServletRequest)params.getWebServiceContext().getMessageContext()
- .get(AbstractHTTPDestination.HTTP_REQUEST);
+ HttpServletRequest req =
+ (HttpServletRequest)params.getMessageContext().get(AbstractHTTPDestination.HTTP_REQUEST);
map.put(KEYS.REMOTE_HOST.name(), req.getRemoteHost());
map.put(KEYS.REMOTE_PORT.name(), String.valueOf(req.getRemotePort()));
- map.put(KEYS.URL.name(), (String)params.getWebServiceContext().getMessageContext()
- .get("org.apache.cxf.request.url"));
+ map.put(KEYS.URL.name(), (String)params.getMessageContext().get("org.apache.cxf.request.url"));
map.put(KEYS.TOKENTYPE.name(), params.getTokenRequirements().getTokenType());
if (params.getTokenRequirements().getActAs() != null) {
map.put(KEYS.VALIDATE_PRINCIPAL.name(), params.getTokenRequirements().getValidateTarget().getPrincipal()
@@ -155,12 +153,11 @@ public class EventMapper implements STSEventListener {
protected void handleEvent(TokenCancellerParametersSupport event, Map<String, Object> map) {
TokenCancellerParameters params = event.getTokenParameters();
- HttpServletRequest req = (HttpServletRequest)params.getWebServiceContext().getMessageContext()
- .get(AbstractHTTPDestination.HTTP_REQUEST);
+ HttpServletRequest req =
+ (HttpServletRequest)params.getMessageContext().get(AbstractHTTPDestination.HTTP_REQUEST);
map.put(KEYS.REMOTE_HOST.name(), req.getRemoteHost());
map.put(KEYS.REMOTE_PORT.name(), String.valueOf(req.getRemotePort()));
- map.put(KEYS.URL.name(), (String)params.getWebServiceContext().getMessageContext()
- .get("org.apache.cxf.request.url"));
+ map.put(KEYS.URL.name(), (String)params.getMessageContext().get("org.apache.cxf.request.url"));
map.put(KEYS.TOKENTYPE.name(), params.getTokenRequirements().getTokenType());
if (params.getTokenRequirements().getActAs() != null) {
map.put(KEYS.CANCEL_PRINCIPAL.name(), params.getTokenRequirements().getCancelTarget().getPrincipal()
@@ -176,12 +173,11 @@ public class EventMapper implements STSEventListener {
protected void handleEvent(TokenRenewerParametersSupport event, Map<String, Object> map) {
TokenRenewerParameters params = event.getTokenParameters();
- HttpServletRequest req = (HttpServletRequest)params.getWebServiceContext().getMessageContext()
- .get(AbstractHTTPDestination.HTTP_REQUEST);
+ HttpServletRequest req =
+ (HttpServletRequest)params.getMessageContext().get(AbstractHTTPDestination.HTTP_REQUEST);
map.put(KEYS.REMOTE_HOST.name(), req.getRemoteHost());
map.put(KEYS.REMOTE_PORT.name(), String.valueOf(req.getRemotePort()));
- map.put(KEYS.URL.name(), (String)params.getWebServiceContext().getMessageContext()
- .get("org.apache.cxf.request.url"));
+ map.put(KEYS.URL.name(), (String)params.getMessageContext().get("org.apache.cxf.request.url"));
map.put(KEYS.TOKENTYPE.name(), params.getTokenRequirements().getTokenType());
if (params.getTokenRequirements().getRenewTarget() != null) {
map.put(KEYS.RENEW_PRINCIPAL.name(), params.getTokenRequirements().getRenewTarget().getPrincipal()
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
index e801906..b6a827b 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
@@ -388,7 +388,7 @@ public abstract class AbstractOperation {
TokenProviderParameters providerParameters = new TokenProviderParameters();
providerParameters.setStsProperties(stsProperties);
providerParameters.setPrincipal(context.getUserPrincipal());
- providerParameters.setWebServiceContext(context);
+ providerParameters.setMessageContext(context.getMessageContext());
providerParameters.setTokenStore(getTokenStore());
providerParameters.setEncryptToken(encryptIssuedToken);
@@ -469,7 +469,7 @@ public abstract class AbstractOperation {
TokenValidatorParameters validatorParameters = new TokenValidatorParameters();
validatorParameters.setStsProperties(stsProperties);
validatorParameters.setPrincipal(context.getUserPrincipal());
- validatorParameters.setWebServiceContext(context);
+ validatorParameters.setMessageContext(context.getMessageContext());
validatorParameters.setTokenStore(getTokenStore());
validatorParameters.setKeyRequirements(null);
validatorParameters.setTokenRequirements(validateRequirements);
@@ -516,7 +516,7 @@ public abstract class AbstractOperation {
TokenDelegationParameters delegationParameters = new TokenDelegationParameters();
delegationParameters.setStsProperties(stsProperties);
delegationParameters.setPrincipal(context.getUserPrincipal());
- delegationParameters.setWebServiceContext(context);
+ delegationParameters.setMessageContext(context.getMessageContext());
delegationParameters.setTokenStore(getTokenStore());
delegationParameters.setTokenPrincipal(tokenPrincipal);
delegationParameters.setTokenRoles(tokenRoles);
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
index 1194952..1bec1fe 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
@@ -78,7 +78,7 @@ public class TokenCancelOperation extends AbstractOperation implements CancelOpe
cancellerParameters.setStsProperties(stsProperties);
cancellerParameters.setPrincipal(context.getUserPrincipal());
- cancellerParameters.setWebServiceContext(context);
+ cancellerParameters.setMessageContext(context.getMessageContext());
cancellerParameters.setTokenStore(getTokenStore());
cancellerParameters.setKeyRequirements(keyRequirements);
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
index f4815f4..312631d 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
@@ -85,7 +85,7 @@ public class TokenRenewOperation extends AbstractOperation implements RenewOpera
renewerParameters.setStsProperties(stsProperties);
renewerParameters.setPrincipal(context.getUserPrincipal());
- renewerParameters.setWebServiceContext(context);
+ renewerParameters.setMessageContext(context.getMessageContext());
renewerParameters.setTokenStore(getTokenStore());
renewerParameters.setKeyRequirements(keyRequirements);
@@ -292,7 +292,7 @@ public class TokenRenewOperation extends AbstractOperation implements RenewOpera
renewerParameters.setStsProperties(providerParameters.getStsProperties());
renewerParameters.setTokenRequirements(providerParameters.getTokenRequirements());
renewerParameters.setTokenStore(providerParameters.getTokenStore());
- renewerParameters.setWebServiceContext(providerParameters.getWebServiceContext());
+ renewerParameters.setMessageContext(providerParameters.getMessageContext());
return renewerParameters;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
index be8f75e..e84fe2e 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
@@ -77,7 +77,7 @@ public class TokenValidateOperation extends AbstractOperation implements Validat
validatorParameters.setStsProperties(stsProperties);
validatorParameters.setPrincipal(context.getUserPrincipal());
- validatorParameters.setWebServiceContext(context);
+ validatorParameters.setMessageContext(context.getMessageContext());
validatorParameters.setTokenStore(getTokenStore());
//validatorParameters.setKeyRequirements(keyRequirements);
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
index 318245c..ff03540 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
@@ -22,11 +22,11 @@ package org.apache.cxf.sts.token.canceller;
import java.security.Key;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.crypto.SecretKey;
-import javax.xml.ws.handler.MessageContext;
import org.w3c.dom.Element;
import org.apache.cxf.common.logging.LogUtils;
@@ -124,7 +124,7 @@ public class SCTCanceller implements TokenCanceller {
}
private boolean matchKey(TokenCancellerParameters tokenParameters, byte[] secretKey) {
- MessageContext messageContext = tokenParameters.getWebServiceContext().getMessageContext();
+ Map<String, Object> messageContext = tokenParameters.getMessageContext();
if (matchDOMSignatureSecret(messageContext, secretKey)) {
return true;
@@ -150,7 +150,7 @@ public class SCTCanceller implements TokenCanceller {
}
private boolean matchDOMSignatureSecret(
- MessageContext messageContext, byte[] secretToMatch
+ Map<String, Object> messageContext, byte[] secretToMatch
) {
final List<WSHandlerResult> handlerResults =
CastUtils.cast((List<?>) messageContext.get(WSHandlerConstants.RECV_RESULTS));
@@ -179,7 +179,7 @@ public class SCTCanceller implements TokenCanceller {
}
private boolean matchStreamingSignatureSecret(
- MessageContext messageContext, byte[] secretToMatch
+ Map<String, Object> messageContext, byte[] secretToMatch
) throws XMLSecurityException {
@SuppressWarnings("unchecked")
final List<SecurityEvent> incomingEventList =
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/TokenCancellerParameters.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/TokenCancellerParameters.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/TokenCancellerParameters.java
index 76af002..5fe83f7 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/TokenCancellerParameters.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/TokenCancellerParameters.java
@@ -20,8 +20,7 @@
package org.apache.cxf.sts.token.canceller;
import java.security.Principal;
-
-import javax.xml.ws.WebServiceContext;
+import java.util.Map;
import org.apache.cxf.sts.STSPropertiesMBean;
import org.apache.cxf.sts.request.KeyRequirements;
@@ -38,7 +37,7 @@ public class TokenCancellerParameters {
private STSPropertiesMBean stsProperties;
private Principal principal;
- private WebServiceContext webServiceContext;
+ private Map<String, Object> messageContext;
private KeyRequirements keyRequirements;
private TokenRequirements tokenRequirements;
private TokenStore tokenStore;
@@ -84,14 +83,6 @@ public class TokenCancellerParameters {
this.stsProperties = stsProperties;
}
- public WebServiceContext getWebServiceContext() {
- return webServiceContext;
- }
-
- public void setWebServiceContext(WebServiceContext webServiceContext) {
- this.webServiceContext = webServiceContext;
- }
-
public void setPrincipal(Principal principal) {
this.principal = principal;
}
@@ -99,5 +90,13 @@ public class TokenCancellerParameters {
public Principal getPrincipal() {
return principal;
}
+
+ public Map<String, Object> getMessageContext() {
+ return messageContext;
+ }
+
+ public void setMessageContext(Map<String, Object> messageContext) {
+ this.messageContext = messageContext;
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/TokenDelegationParameters.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/TokenDelegationParameters.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/TokenDelegationParameters.java
index 1c07d74..ed846dc 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/TokenDelegationParameters.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/TokenDelegationParameters.java
@@ -20,10 +20,9 @@
package org.apache.cxf.sts.token.delegation;
import java.security.Principal;
+import java.util.Map;
import java.util.Set;
-import javax.xml.ws.WebServiceContext;
-
import org.apache.cxf.sts.STSPropertiesMBean;
import org.apache.cxf.sts.request.KeyRequirements;
import org.apache.cxf.sts.request.ReceivedToken;
@@ -39,7 +38,7 @@ public class TokenDelegationParameters {
private STSPropertiesMBean stsProperties;
private Principal principal;
- private WebServiceContext webServiceContext;
+ private Map<String, Object> messageContext;
private KeyRequirements keyRequirements;
private TokenRequirements tokenRequirements;
private TokenStore tokenStore;
@@ -88,14 +87,6 @@ public class TokenDelegationParameters {
this.stsProperties = stsProperties;
}
- public WebServiceContext getWebServiceContext() {
- return webServiceContext;
- }
-
- public void setWebServiceContext(WebServiceContext webServiceContext) {
- this.webServiceContext = webServiceContext;
- }
-
public void setPrincipal(Principal principal) {
this.principal = principal;
}
@@ -127,5 +118,13 @@ public class TokenDelegationParameters {
public void setTokenRoles(Set<Principal> tokenRoles) {
this.tokenRoles = tokenRoles;
}
+
+ public Map<String, Object> getMessageContext() {
+ return messageContext;
+ }
+
+ public void setMessageContext(Map<String, Object> messageContext) {
+ this.messageContext = messageContext;
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
index ad6b386..867f150 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
@@ -151,7 +151,7 @@ public class SAMLTokenProvider extends AbstractSAMLTokenProvider implements Toke
tokenParameters.getStsProperties(),
tokenParameters.getEncryptionProperties(),
keyRequirements,
- tokenParameters.getWebServiceContext());
+ tokenParameters.getMessageContext());
}
response.setToken(token);
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SCTProvider.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SCTProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SCTProvider.java
index 93f3a08..6ddf54a 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SCTProvider.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SCTProvider.java
@@ -180,7 +180,7 @@ public class SCTProvider implements TokenProvider {
tokenParameters.getStsProperties(),
tokenParameters.getEncryptionProperties(),
tokenParameters.getKeyRequirements(),
- tokenParameters.getWebServiceContext());
+ tokenParameters.getMessageContext());
response.setToken(el);
} else {
response.setToken(sct.getElement());
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderParameters.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderParameters.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderParameters.java
index aeb5798..88893a3 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderParameters.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderParameters.java
@@ -22,8 +22,6 @@ package org.apache.cxf.sts.token.provider;
import java.security.Principal;
import java.util.Map;
-import javax.xml.ws.WebServiceContext;
-
import org.apache.cxf.rt.security.claims.ClaimCollection;
import org.apache.cxf.sts.STSPropertiesMBean;
import org.apache.cxf.sts.claims.ClaimsManager;
@@ -42,7 +40,7 @@ public class TokenProviderParameters {
private STSPropertiesMBean stsProperties;
private EncryptionProperties encryptionProperties;
private Principal principal;
- private WebServiceContext webServiceContext;
+ private Map<String, Object> messageContext;
private ClaimCollection requestedPrimaryClaims;
private ClaimCollection requestedSecondaryClaims;
private KeyRequirements keyRequirements;
@@ -110,14 +108,6 @@ public class TokenProviderParameters {
this.encryptionProperties = encryptionProperties;
}
- public WebServiceContext getWebServiceContext() {
- return webServiceContext;
- }
-
- public void setWebServiceContext(WebServiceContext webServiceContext) {
- this.webServiceContext = webServiceContext;
- }
-
public void setPrincipal(Principal principal) {
this.principal = principal;
}
@@ -165,5 +155,13 @@ public class TokenProviderParameters {
public void setEncryptToken(boolean encryptToken) {
this.encryptToken = encryptToken;
}
+
+ public Map<String, Object> getMessageContext() {
+ return messageContext;
+ }
+
+ public void setMessageContext(Map<String, Object> messageContext) {
+ this.messageContext = messageContext;
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java
index 53ef14b..57e9994 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java
@@ -21,13 +21,12 @@ package org.apache.cxf.sts.token.provider;
import java.security.cert.X509Certificate;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -108,7 +107,7 @@ public final class TokenProviderUtils {
STSPropertiesMBean stsProperties,
EncryptionProperties encryptionProperties,
KeyRequirements keyRequirements,
- WebServiceContext context
+ Map<String, Object> messageContext
) throws WSSecurityException {
String name = encryptionProperties.getEncryptionName();
if (name == null) {
@@ -152,7 +151,7 @@ public final class TokenProviderUtils {
WSSecEncrypt builder = new WSSecEncrypt();
if (WSHandlerConstants.USE_REQ_SIG_CERT.equals(name)) {
- X509Certificate cert = getReqSigCert(context.getMessageContext());
+ X509Certificate cert = getReqSigCert(messageContext);
builder.setUseThisCert(cert);
} else {
builder.setUserInfo(name);
@@ -178,10 +177,10 @@ public final class TokenProviderUtils {
* Get the X509Certificate associated with the signature that was received. This cert is to be used
* for encrypting the issued token.
*/
- public static X509Certificate getReqSigCert(MessageContext context) {
+ public static X509Certificate getReqSigCert(Map<String, Object> messageContext) {
@SuppressWarnings("unchecked")
List<WSHandlerResult> results =
- (List<WSHandlerResult>) context.get(WSHandlerConstants.RECV_RESULTS);
+ (List<WSHandlerResult>) messageContext.get(WSHandlerConstants.RECV_RESULTS);
// DOM
X509Certificate cert = WSS4JUtils.getReqSigCert(results);
if (cert != null) {
@@ -191,7 +190,7 @@ public final class TokenProviderUtils {
// Streaming
@SuppressWarnings("unchecked")
final List<SecurityEvent> incomingEventList =
- (List<SecurityEvent>) context.get(SecurityEvent.class.getName() + ".in");
+ (List<SecurityEvent>) messageContext.get(SecurityEvent.class.getName() + ".in");
if (incomingEventList != null) {
for (SecurityEvent incomingEvent : incomingEventList) {
if (WSSecurityEventConstants.SignedPart == incomingEvent.getSecurityEventType()
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
index 5075946..0fe906d 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
@@ -31,7 +31,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.security.auth.callback.CallbackHandler;
-import javax.xml.ws.handler.MessageContext;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -479,7 +478,7 @@ public class SAMLTokenRenewer extends AbstractSAMLTokenProvider implements Token
providerParameters.setStsProperties(renewerParameters.getStsProperties());
providerParameters.setTokenRequirements(renewerParameters.getTokenRequirements());
providerParameters.setTokenStore(renewerParameters.getTokenStore());
- providerParameters.setWebServiceContext(renewerParameters.getWebServiceContext());
+ providerParameters.setMessageContext(renewerParameters.getMessageContext());
// Store token to renew in the additional properties in case you want to base some
// Conditions on the token
@@ -549,7 +548,7 @@ public class SAMLTokenRenewer extends AbstractSAMLTokenProvider implements Token
TokenRenewerParameters tokenParameters,
SAMLKeyInfo subjectKeyInfo
) {
- MessageContext messageContext = tokenParameters.getWebServiceContext().getMessageContext();
+ Map<String, Object> messageContext = tokenParameters.getMessageContext();
final List<WSHandlerResult> handlerResults =
CastUtils.cast((List<?>) messageContext.get(WSHandlerConstants.RECV_RESULTS));
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/TokenRenewerParameters.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/TokenRenewerParameters.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/TokenRenewerParameters.java
index 0c697ab..cd9cf3d 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/TokenRenewerParameters.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/TokenRenewerParameters.java
@@ -22,8 +22,6 @@ package org.apache.cxf.sts.token.renewer;
import java.security.Principal;
import java.util.Map;
-import javax.xml.ws.WebServiceContext;
-
import org.apache.cxf.sts.STSPropertiesMBean;
import org.apache.cxf.sts.request.KeyRequirements;
import org.apache.cxf.sts.request.ReceivedToken;
@@ -41,7 +39,7 @@ public class TokenRenewerParameters {
private STSPropertiesMBean stsProperties;
private EncryptionProperties encryptionProperties;
private Principal principal;
- private WebServiceContext webServiceContext;
+ private Map<String, Object> messageContext;
private KeyRequirements keyRequirements;
private TokenRequirements tokenRequirements;
private String appliesToAddress;
@@ -107,14 +105,6 @@ public class TokenRenewerParameters {
this.encryptionProperties = encryptionProperties;
}
- public WebServiceContext getWebServiceContext() {
- return webServiceContext;
- }
-
- public void setWebServiceContext(WebServiceContext webServiceContext) {
- this.webServiceContext = webServiceContext;
- }
-
public void setPrincipal(Principal principal) {
this.principal = principal;
}
@@ -138,5 +128,13 @@ public class TokenRenewerParameters {
public String getRealm() {
return realm;
}
+
+ public Map<String, Object> getMessageContext() {
+ return messageContext;
+ }
+
+ public void setMessageContext(Map<String, Object> messageContext) {
+ this.messageContext = messageContext;
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
index abb1303..7ac6650 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
@@ -163,7 +163,7 @@ public class SAMLTokenValidator implements TokenValidator {
WSSConfig wssConfig = WSSConfig.getNewInstance();
requestData.setWssConfig(wssConfig);
requestData.setCallbackHandler(callbackHandler);
- requestData.setMsgContext(tokenParameters.getWebServiceContext().getMessageContext());
+ requestData.setMsgContext(tokenParameters.getMessageContext());
requestData.setSubjectCertConstraints(certConstraints.getCompiledSubjectContraints());
WSDocInfo docInfo = new WSDocInfo(validateTargetElement.getOwnerDocument());
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/TokenValidatorParameters.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/TokenValidatorParameters.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/TokenValidatorParameters.java
index 1127e83..8c0c7bd 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/TokenValidatorParameters.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/TokenValidatorParameters.java
@@ -20,8 +20,7 @@
package org.apache.cxf.sts.token.validator;
import java.security.Principal;
-
-import javax.xml.ws.WebServiceContext;
+import java.util.Map;
import org.apache.cxf.sts.STSPropertiesMBean;
import org.apache.cxf.sts.request.KeyRequirements;
@@ -38,7 +37,7 @@ public class TokenValidatorParameters {
private STSPropertiesMBean stsProperties;
private Principal principal;
- private WebServiceContext webServiceContext;
+ private Map<String, Object> messageContext;
private KeyRequirements keyRequirements;
private TokenRequirements tokenRequirements;
private TokenStore tokenStore;
@@ -85,14 +84,6 @@ public class TokenValidatorParameters {
this.stsProperties = stsProperties;
}
- public WebServiceContext getWebServiceContext() {
- return webServiceContext;
- }
-
- public void setWebServiceContext(WebServiceContext webServiceContext) {
- this.webServiceContext = webServiceContext;
- }
-
public void setPrincipal(Principal principal) {
this.principal = principal;
}
@@ -108,5 +99,13 @@ public class TokenValidatorParameters {
public String getRealm() {
return realm;
}
+
+ public Map<String, Object> getMessageContext() {
+ return messageContext;
+ }
+
+ public void setMessageContext(Map<String, Object> messageContext) {
+ this.messageContext = messageContext;
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
index c376cda..cbbd573 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
@@ -119,7 +119,7 @@ public class UsernameTokenValidator implements TokenValidator {
WSSConfig wssConfig = WSSConfig.getNewInstance();
requestData.setWssConfig(wssConfig);
requestData.setCallbackHandler(callbackHandler);
- requestData.setMsgContext(tokenParameters.getWebServiceContext().getMessageContext());
+ requestData.setMsgContext(tokenParameters.getMessageContext());
TokenValidatorResponse response = new TokenValidatorResponse();
ReceivedToken validateTarget = tokenParameters.getToken();
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
index 278d975..276d3fd 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
@@ -120,7 +120,7 @@ public class X509TokenValidator implements TokenValidator {
requestData.setSigVerCrypto(sigCrypto);
requestData.setWssConfig(WSSConfig.getNewInstance());
requestData.setCallbackHandler(callbackHandler);
- requestData.setMsgContext(tokenParameters.getWebServiceContext().getMessageContext());
+ requestData.setMsgContext(tokenParameters.getMessageContext());
requestData.setSubjectCertConstraints(certConstraints.getCompiledSubjectContraints());
TokenValidatorResponse response = new TokenValidatorResponse();
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java
index 219f3f9..f81927b 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java
@@ -377,8 +377,7 @@ public class JexlIssueSamlClaimsTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java
index f8dc0cf..ce23cee 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java
@@ -206,8 +206,7 @@ public class CancelSCTUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java
index b8d590f..98a09a4 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java
@@ -71,7 +71,7 @@ public class DummyTokenProvider implements TokenProvider {
tokenParameters.getStsProperties(),
tokenParameters.getEncryptionProperties(),
tokenParameters.getKeyRequirements(),
- tokenParameters.getWebServiceContext());
+ tokenParameters.getMessageContext());
response.setToken(el);
} else {
response.setToken(bst.getElement());
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
index 82d921b..3dd8372 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
@@ -747,8 +747,7 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
index 5d1bfa6..4f16544 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
@@ -439,8 +439,7 @@ public class IssueJWTOnbehalfofUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
index 65380cd..510c7b4 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
@@ -1269,8 +1269,7 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
index d519348..459a78f 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
@@ -951,8 +951,7 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
index 1d50ff8..3da66d4 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
@@ -537,8 +537,7 @@ public class RenewSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
index 9caf7b0..54f9b9a 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
@@ -383,8 +383,7 @@ public class ValidateJWTTransformationTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
@@ -524,8 +523,7 @@ public class ValidateJWTTransformationTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
index f44a06d..0c520e3 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
@@ -203,8 +203,7 @@ public class ValidateJWTUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java
index d17404b..0d0bd77 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java
@@ -213,8 +213,7 @@ public class ValidateSCTUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java
index 53ade10..faf5d47 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java
@@ -268,8 +268,7 @@ public class ValidateSamlUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
index 8ff98c5..9853ec2 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
@@ -892,8 +892,7 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java
index 6afed6a..3d221b6 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java
@@ -23,7 +23,6 @@ import java.util.Properties;
import org.w3c.dom.Document;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
@@ -130,8 +129,7 @@ public class SCTCancellerTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
// Add STSProperties object
StaticSTSProperties stsProperties = new StaticSTSProperties();
@@ -163,8 +161,7 @@ public class SCTCancellerTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java
index b735f3a..1cf7dde 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
@@ -228,8 +227,7 @@ public class JWTClaimsTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
if (appliesTo != null) {
parameters.setAppliesToAddress(appliesTo);
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
index 9e0fcd6..9d39600 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
@@ -24,7 +24,6 @@ import javax.xml.bind.JAXBElement;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
@@ -161,8 +160,7 @@ public class JWTProviderActAsTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java
index 3d16d40..a9a3df6 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.sts.token.provider;
import java.util.Date;
import java.util.Properties;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
@@ -372,8 +371,7 @@ public class JWTProviderLifetimeTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
index 265b48c..537f8d7 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
@@ -24,7 +24,6 @@ import javax.xml.bind.JAXBElement;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
@@ -161,8 +160,7 @@ public class JWTProviderOnBehalfOfTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java
index 2a747c1..3e39b35 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
@@ -119,8 +118,7 @@ public class JWTTokenProviderRealmTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
index c81f746..7fa13d0 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
@@ -23,7 +23,6 @@ import java.security.cert.X509Certificate;
import java.util.Arrays;
import java.util.Properties;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rs.security.jose.common.JoseConstants;
@@ -359,8 +358,7 @@ public class JWTTokenProviderTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
index f4d292b..9f9b0bc 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
@@ -27,7 +27,6 @@ import java.util.Map;
import java.util.Properties;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rt.security.claims.Claim;
@@ -414,8 +413,7 @@ public class SAMLClaimsTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
if (appliesTo != null) {
parameters.setAppliesToAddress(appliesTo);
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
index b032602..d106933 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
@@ -25,7 +25,6 @@ import java.util.Properties;
import javax.xml.bind.JAXBElement;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.QNameConstants;
@@ -211,8 +210,7 @@ public class SAMLProviderActAsTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java
index 9ead280..7df9e7c 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java
@@ -24,7 +24,6 @@ import java.util.Properties;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
@@ -288,8 +287,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
index ec90777..4c3a01d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Properties;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
@@ -619,8 +618,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
@@ -657,8 +655,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java
index e186afa..d39cd49 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java
@@ -23,7 +23,6 @@ import java.util.Properties;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
@@ -381,8 +380,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java
index 20a690c..c5c0c13 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java
@@ -26,7 +26,6 @@ import javax.xml.bind.JAXBElement;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.QNameConstants;
@@ -214,8 +213,7 @@ public class SAMLProviderOnBehalfOfTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
index 81a763c..a4fe877 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
@@ -24,7 +24,6 @@ import java.util.Properties;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
@@ -186,8 +185,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java
index 658d24b..9caa436 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java
@@ -22,7 +22,6 @@ import java.util.Properties;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.StaticSTSProperties;
@@ -182,8 +181,7 @@ public class SCTProviderTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/da40221a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
index 34a419b..1ee12c4 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
@@ -25,7 +25,6 @@ import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
@@ -328,8 +327,7 @@ public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
@@ -408,8 +406,7 @@ public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
- parameters.setWebServiceContext(webServiceContext);
+ parameters.setMessageContext(msgCtx);
parameters.setAppliesToAddress("http://dummy-service.com/dummy");
[6/6] cxf git commit: Finished removing the WebServiceContext from
the STS
Posted by co...@apache.org.
Finished removing the WebServiceContext from the STS
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d8673543
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d8673543
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d8673543
Branch: refs/heads/3.1.x-fixes
Commit: d8673543d8723579eaf6a57d4b1ac6e22e0d308d
Parents: aafbcde
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Feb 2 16:53:53 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 4 14:44:21 2016 +0000
----------------------------------------------------------------------
.../sts/provider/SecurityTokenServiceImpl.java | 24 +++--
.../provider/SecurityTokenServiceProvider.java | 24 +++--
.../sts/provider/operation/CancelOperation.java | 6 +-
.../sts/provider/operation/IssueOperation.java | 6 +-
.../operation/IssueSingleOperation.java | 6 +-
.../operation/KeyExchangeTokenOperation.java | 6 +-
.../sts/provider/operation/RenewOperation.java | 6 +-
.../operation/RequestCollectionOperation.java | 6 +-
.../provider/operation/ValidateOperation.java | 6 +-
.../cxf/sts/operation/AbstractOperation.java | 36 ++++----
.../cxf/sts/operation/TokenCancelOperation.java | 12 ++-
.../cxf/sts/operation/TokenIssueOperation.java | 41 +++++----
.../cxf/sts/operation/TokenRenewOperation.java | 27 +++---
.../TokenRequestCollectionOperation.java | 20 ++--
.../sts/operation/TokenValidateOperation.java | 17 ++--
.../claims/mapper/JexlIssueSamlClaimsTest.java | 10 +-
.../cxf/sts/operation/CancelSCTUnitTest.java | 9 +-
.../sts/operation/IssueEncryptedUnitTest.java | 40 ++++----
.../sts/operation/IssueJWTClaimsUnitTest.java | 25 +++--
.../operation/IssueJWTOnbehalfofUnitTest.java | 12 +--
.../sts/operation/IssueJWTRealmUnitTest.java | 27 +++---
.../cxf/sts/operation/IssueJWTUnitTest.java | 7 +-
.../sts/operation/IssueOnbehalfofUnitTest.java | 62 +++++--------
.../cxf/sts/operation/IssueSCTUnitTest.java | 19 ++--
.../sts/operation/IssueSamlClaimsUnitTest.java | 38 ++++----
.../sts/operation/IssueSamlRealmUnitTest.java | 33 ++++---
.../cxf/sts/operation/IssueSamlUnitTest.java | 97 ++++++++++----------
.../apache/cxf/sts/operation/IssueUnitTest.java | 31 +++----
.../cxf/sts/operation/RenewSamlUnitTest.java | 31 +++----
.../ValidateJWTTransformationTest.java | 21 ++---
.../cxf/sts/operation/ValidateJWTUnitTest.java | 7 +-
.../cxf/sts/operation/ValidateSCTUnitTest.java | 9 +-
.../cxf/sts/operation/ValidateSamlUnitTest.java | 13 ++-
.../ValidateTokenTransformationUnitTest.java | 31 +++----
.../cxf/sts/operation/ValidateUnitTest.java | 18 ++--
.../ValidateUsernameTokenUnitTest.java | 13 ++-
.../operation/ValidateX509TokenUnitTest.java | 13 ++-
37 files changed, 398 insertions(+), 411 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceImpl.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceImpl.java
index 0490f2d..dc989a2 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceImpl.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceImpl.java
@@ -19,6 +19,9 @@
package org.apache.cxf.ws.security.sts.provider;
+import java.security.Principal;
+import java.util.Map;
+
import javax.annotation.Resource;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFault;
@@ -88,7 +91,7 @@ public class SecurityTokenServiceImpl implements SecurityTokenService {
if (validateOperation == null) {
throwUnsupportedOperation("Validate");
}
- return validateOperation.validate(request, context);
+ return validateOperation.validate(request, getPrincipal(), getMessageContext());
}
@@ -97,7 +100,7 @@ public class SecurityTokenServiceImpl implements SecurityTokenService {
if (requestCollectionOperation == null) {
throwUnsupportedOperation("RequestCollection");
}
- return requestCollectionOperation.requestCollection(requestCollection, context);
+ return requestCollectionOperation.requestCollection(requestCollection, getPrincipal(), getMessageContext());
}
public RequestSecurityTokenResponseType keyExchangeToken(
@@ -105,7 +108,7 @@ public class SecurityTokenServiceImpl implements SecurityTokenService {
if (keyExchangeTokenOperation == null) {
throwUnsupportedOperation("KeyExchangeToken");
}
- return keyExchangeTokenOperation.keyExchangeToken(request, context);
+ return keyExchangeTokenOperation.keyExchangeToken(request, getPrincipal(), getMessageContext());
}
public RequestSecurityTokenResponseCollectionType issue(
@@ -113,7 +116,7 @@ public class SecurityTokenServiceImpl implements SecurityTokenService {
if (issueOperation == null) {
throwUnsupportedOperation("Issue");
}
- return issueOperation.issue(request, context);
+ return issueOperation.issue(request, getPrincipal(), getMessageContext());
}
public RequestSecurityTokenResponseType issueSingle(
@@ -121,7 +124,7 @@ public class SecurityTokenServiceImpl implements SecurityTokenService {
if (issueSingleOperation == null) {
throwUnsupportedOperation("IssueSingle");
}
- return issueSingleOperation.issueSingle(request, context);
+ return issueSingleOperation.issueSingle(request, getPrincipal(), getMessageContext());
}
public RequestSecurityTokenResponseType cancel(
@@ -129,7 +132,7 @@ public class SecurityTokenServiceImpl implements SecurityTokenService {
if (cancelOperation == null) {
throwUnsupportedOperation("Cancel");
}
- return cancelOperation.cancel(request, context);
+ return cancelOperation.cancel(request, getPrincipal(), getMessageContext());
}
public RequestSecurityTokenResponseType renew(
@@ -137,9 +140,16 @@ public class SecurityTokenServiceImpl implements SecurityTokenService {
if (renewOperation == null) {
throwUnsupportedOperation("Renew");
}
- return renewOperation.renew(request, context);
+ return renewOperation.renew(request, getPrincipal(), getMessageContext());
+ }
+
+ protected Principal getPrincipal() {
+ return context.getUserPrincipal();
}
+ protected Map<String, Object> getMessageContext() {
+ return context.getMessageContext();
+ }
private void throwUnsupportedOperation(String string) {
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java
index 7b7c926..8c4a2cb 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java
@@ -22,6 +22,7 @@ package org.apache.cxf.ws.security.sts.provider;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.security.Principal;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -89,32 +90,38 @@ public class SecurityTokenServiceProvider implements Provider<Source> {
try {
Method m = IssueOperation.class.getDeclaredMethod("issue",
RequestSecurityTokenType.class,
- WebServiceContext.class);
+ Principal.class,
+ Map.class);
OPERATION_METHODS.put(WSTRUST_REQUESTTYPE_ISSUE, m);
m = CancelOperation.class.getDeclaredMethod("cancel",
RequestSecurityTokenType.class,
- WebServiceContext.class);
+ Principal.class,
+ Map.class);
OPERATION_METHODS.put(WSTRUST_REQUESTTYPE_CANCEL, m);
m = RenewOperation.class.getDeclaredMethod("renew",
RequestSecurityTokenType.class,
- WebServiceContext.class);
+ Principal.class,
+ Map.class);
OPERATION_METHODS.put(WSTRUST_REQUESTTYPE_RENEW, m);
m = ValidateOperation.class.getDeclaredMethod("validate",
RequestSecurityTokenType.class,
- WebServiceContext.class);
+ Principal.class,
+ Map.class);
OPERATION_METHODS.put(WSTRUST_REQUESTTYPE_VALIDATE, m);
m = KeyExchangeTokenOperation.class.getDeclaredMethod("keyExchangeToken",
RequestSecurityTokenType.class,
- WebServiceContext.class);
+ Principal.class,
+ Map.class);
OPERATION_METHODS.put(WSTRUST_REQUESTTYPE_KEYEXCHANGETOKEN, m);
m = RequestCollectionOperation.class.getDeclaredMethod("requestCollection",
RequestSecurityTokenCollectionType.class,
- WebServiceContext.class);
+ Principal.class,
+ Map.class);
OPERATION_METHODS.put(WSTRUST_REQUESTTYPE_REQUESTCOLLECTION, m);
} catch (Exception ex) {
ex.printStackTrace();
@@ -169,7 +176,8 @@ public class SecurityTokenServiceProvider implements Provider<Source> {
try {
m = IssueSingleOperation.class.getDeclaredMethod("issueSingle",
RequestSecurityTokenType.class,
- WebServiceContext.class);
+ Principal.class,
+ Map.class);
OPERATION_METHODS.put(WSTRUST_REQUESTTYPE_ISSUE, m);
operationMap.put(WSTRUST_REQUESTTYPE_ISSUE, issueSingleOperation);
} catch (Exception e) {
@@ -233,7 +241,7 @@ public class SecurityTokenServiceProvider implements Provider<Source> {
throw new Exception(
"Implementation for this operation not found.");
}
- obj = method.invoke(operationImpl, obj, context);
+ obj = method.invoke(operationImpl, obj, context.getUserPrincipal(), context.getMessageContext());
if (obj == null) {
throw new Exception("Error in implementation class.");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/CancelOperation.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/CancelOperation.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/CancelOperation.java
index b237c77..6187ee8 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/CancelOperation.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/CancelOperation.java
@@ -19,7 +19,8 @@
package org.apache.cxf.ws.security.sts.provider.operation;
-import javax.xml.ws.WebServiceContext;
+import java.security.Principal;
+import java.util.Map;
import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenResponseType;
import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenType;
@@ -27,6 +28,7 @@ import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenType;
public interface CancelOperation {
RequestSecurityTokenResponseType cancel(RequestSecurityTokenType request,
- WebServiceContext context);
+ Principal principal,
+ Map<String, Object> messageContext);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/IssueOperation.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/IssueOperation.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/IssueOperation.java
index 30e919a..b156f31 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/IssueOperation.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/IssueOperation.java
@@ -19,7 +19,8 @@
package org.apache.cxf.ws.security.sts.provider.operation;
-import javax.xml.ws.WebServiceContext;
+import java.security.Principal;
+import java.util.Map;
import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenResponseCollectionType;
import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenType;
@@ -28,6 +29,7 @@ public interface IssueOperation {
RequestSecurityTokenResponseCollectionType issue(
RequestSecurityTokenType request,
- WebServiceContext context);
+ Principal principal,
+ Map<String, Object> messageContext);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/IssueSingleOperation.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/IssueSingleOperation.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/IssueSingleOperation.java
index 1714e02..ba3efa6 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/IssueSingleOperation.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/IssueSingleOperation.java
@@ -19,7 +19,8 @@
package org.apache.cxf.ws.security.sts.provider.operation;
-import javax.xml.ws.WebServiceContext;
+import java.security.Principal;
+import java.util.Map;
import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenResponseType;
import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenType;
@@ -28,6 +29,7 @@ public interface IssueSingleOperation {
RequestSecurityTokenResponseType issueSingle(
RequestSecurityTokenType request,
- WebServiceContext context);
+ Principal principal,
+ Map<String, Object> messageContext);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/KeyExchangeTokenOperation.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/KeyExchangeTokenOperation.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/KeyExchangeTokenOperation.java
index afde2c9..f5f3330 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/KeyExchangeTokenOperation.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/KeyExchangeTokenOperation.java
@@ -19,7 +19,8 @@
package org.apache.cxf.ws.security.sts.provider.operation;
-import javax.xml.ws.WebServiceContext;
+import java.security.Principal;
+import java.util.Map;
import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenResponseType;
import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenType;
@@ -28,6 +29,7 @@ public interface KeyExchangeTokenOperation {
RequestSecurityTokenResponseType keyExchangeToken(
RequestSecurityTokenType request,
- WebServiceContext context);
+ Principal principal,
+ Map<String, Object> messageContext);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/RenewOperation.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/RenewOperation.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/RenewOperation.java
index afc4724..cc8b79d 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/RenewOperation.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/RenewOperation.java
@@ -19,7 +19,8 @@
package org.apache.cxf.ws.security.sts.provider.operation;
-import javax.xml.ws.WebServiceContext;
+import java.security.Principal;
+import java.util.Map;
import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenResponseType;
import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenType;
@@ -27,6 +28,7 @@ import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenType;
public interface RenewOperation {
RequestSecurityTokenResponseType renew(RequestSecurityTokenType request,
- WebServiceContext context);
+ Principal principal,
+ Map<String, Object> messageContext);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/RequestCollectionOperation.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/RequestCollectionOperation.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/RequestCollectionOperation.java
index 7629a4e..eaccc72 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/RequestCollectionOperation.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/RequestCollectionOperation.java
@@ -19,7 +19,8 @@
package org.apache.cxf.ws.security.sts.provider.operation;
-import javax.xml.ws.WebServiceContext;
+import java.security.Principal;
+import java.util.Map;
import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenCollectionType;
import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenResponseCollectionType;
@@ -28,6 +29,7 @@ public interface RequestCollectionOperation {
RequestSecurityTokenResponseCollectionType requestCollection(
RequestSecurityTokenCollectionType requestCollection,
- WebServiceContext context);
+ Principal principal,
+ Map<String, Object> messageContext);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/ValidateOperation.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/ValidateOperation.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/ValidateOperation.java
index 118d7ed..e35d7a5 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/ValidateOperation.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/operation/ValidateOperation.java
@@ -19,7 +19,8 @@
package org.apache.cxf.ws.security.sts.provider.operation;
-import javax.xml.ws.WebServiceContext;
+import java.security.Principal;
+import java.util.Map;
import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenResponseType;
import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenType;
@@ -27,6 +28,7 @@ import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenType;
public interface ValidateOperation {
RequestSecurityTokenResponseType validate(RequestSecurityTokenType request,
- WebServiceContext context);
+ Principal principal,
+ Map<String, Object> messageContext);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
index c88471e..6133816 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
@@ -23,14 +23,13 @@ import java.security.Principal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -169,9 +168,9 @@ public abstract class AbstractOperation {
*/
protected RequestRequirements parseRequest(
RequestSecurityTokenType request,
- WebServiceContext context
+ Map<String, Object> messageContext
) {
- if (context == null || context.getMessageContext() == null) {
+ if (messageContext == null) {
throw new STSException("No message context found");
}
@@ -181,7 +180,7 @@ public abstract class AbstractOperation {
stsProperties.configureProperties();
RequestParser requestParser = new RequestParser();
- return requestParser.parseRequest(request, context.getMessageContext(), stsProperties,
+ return requestParser.parseRequest(request, messageContext, stsProperties,
claimsManager.getClaimParsers());
}
@@ -381,15 +380,16 @@ public abstract class AbstractOperation {
}
/**
- * Create a TokenProviderParameters object given a RequestParser and WebServiceContext object
+ * Create a TokenProviderParameters object
*/
protected TokenProviderParameters createTokenProviderParameters(
- RequestRequirements requestRequirements, WebServiceContext context
+ RequestRequirements requestRequirements, Principal principal,
+ Map<String, Object> messageContext
) {
TokenProviderParameters providerParameters = new TokenProviderParameters();
providerParameters.setStsProperties(stsProperties);
- providerParameters.setPrincipal(context.getUserPrincipal());
- providerParameters.setMessageContext(context.getMessageContext());
+ providerParameters.setPrincipal(principal);
+ providerParameters.setMessageContext(messageContext);
providerParameters.setTokenStore(getTokenStore());
providerParameters.setEncryptToken(encryptIssuedToken);
@@ -408,7 +408,7 @@ public abstract class AbstractOperation {
// Get the realm of the request
if (stsProperties.getRealmParser() != null) {
RealmParser realmParser = stsProperties.getRealmParser();
- String realm = realmParser.parseRealm(context.getMessageContext());
+ String realm = realmParser.parseRealm(messageContext);
providerParameters.setRealm(realm);
}
@@ -460,7 +460,8 @@ public abstract class AbstractOperation {
}
protected TokenValidatorResponse validateReceivedToken(
- WebServiceContext context, String realm,
+ Principal principal,
+ Map<String, Object> messageContext, String realm,
TokenRequirements tokenRequirements, ReceivedToken token) {
token.setState(STATE.NONE);
@@ -469,8 +470,8 @@ public abstract class AbstractOperation {
TokenValidatorParameters validatorParameters = new TokenValidatorParameters();
validatorParameters.setStsProperties(stsProperties);
- validatorParameters.setPrincipal(context.getUserPrincipal());
- validatorParameters.setMessageContext(context.getMessageContext());
+ validatorParameters.setPrincipal(principal);
+ validatorParameters.setMessageContext(messageContext);
validatorParameters.setTokenStore(getTokenStore());
validatorParameters.setKeyRequirements(null);
validatorParameters.setTokenRequirements(validateRequirements);
@@ -511,13 +512,14 @@ public abstract class AbstractOperation {
}
protected void performDelegationHandling(
- RequestRequirements requestRequirements, WebServiceContext context, ReceivedToken token,
+ RequestRequirements requestRequirements, Principal principal,
+ Map<String, Object> messageContext, ReceivedToken token,
Principal tokenPrincipal, Set<Principal> tokenRoles
) {
TokenDelegationParameters delegationParameters = new TokenDelegationParameters();
delegationParameters.setStsProperties(stsProperties);
- delegationParameters.setPrincipal(context.getUserPrincipal());
- delegationParameters.setMessageContext(context.getMessageContext());
+ delegationParameters.setPrincipal(principal);
+ delegationParameters.setMessageContext(messageContext);
delegationParameters.setTokenStore(getTokenStore());
delegationParameters.setTokenPrincipal(tokenPrincipal);
delegationParameters.setTokenRoles(tokenRoles);
@@ -617,7 +619,7 @@ public abstract class AbstractOperation {
protected static org.apache.xml.security.stax.securityToken.SecurityToken
findInboundSecurityToken(SecurityEventConstants.Event event,
- MessageContext messageContext) throws XMLSecurityException {
+ Map<String, Object> messageContext) throws XMLSecurityException {
@SuppressWarnings("unchecked")
final List<SecurityEvent> incomingEventList =
(List<SecurityEvent>) messageContext.get(SecurityEvent.class.getName() + ".in");
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
index 1bec1fe..8db75c3 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
@@ -19,13 +19,14 @@
package org.apache.cxf.sts.operation;
+import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.bind.JAXBElement;
-import javax.xml.ws.WebServiceContext;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.sts.QNameConstants;
@@ -65,20 +66,21 @@ public class TokenCancelOperation extends AbstractOperation implements CancelOpe
}
public RequestSecurityTokenResponseType cancel(
- RequestSecurityTokenType request, WebServiceContext context
+ RequestSecurityTokenType request, Principal principal,
+ Map<String, Object> messageContext
) {
long start = System.currentTimeMillis();
TokenCancellerParameters cancellerParameters = new TokenCancellerParameters();
try {
- RequestRequirements requestRequirements = parseRequest(request, context);
+ RequestRequirements requestRequirements = parseRequest(request, messageContext);
KeyRequirements keyRequirements = requestRequirements.getKeyRequirements();
TokenRequirements tokenRequirements = requestRequirements.getTokenRequirements();
cancellerParameters.setStsProperties(stsProperties);
- cancellerParameters.setPrincipal(context.getUserPrincipal());
- cancellerParameters.setMessageContext(context.getMessageContext());
+ cancellerParameters.setPrincipal(principal);
+ cancellerParameters.setMessageContext(messageContext);
cancellerParameters.setTokenStore(getTokenStore());
cancellerParameters.setKeyRequirements(keyRequirements);
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
index 580abd9..d3ad4f4 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
@@ -28,8 +28,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.bind.JAXBElement;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -85,9 +83,10 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera
public RequestSecurityTokenResponseCollectionType issue(
RequestSecurityTokenType request,
- WebServiceContext context
+ Principal principal,
+ Map<String, Object> messageContext
) {
- RequestSecurityTokenResponseType response = issueSingle(request, context);
+ RequestSecurityTokenResponseType response = issueSingle(request, principal, messageContext);
RequestSecurityTokenResponseCollectionType responseCollection =
QNameConstants.WS_TRUST_FACTORY.createRequestSecurityTokenResponseCollectionType();
responseCollection.getRequestSecurityTokenResponse().add(response);
@@ -96,12 +95,13 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera
public RequestSecurityTokenResponseCollectionType issue(
RequestSecurityTokenCollectionType requestCollection,
- WebServiceContext context
+ Principal principal,
+ Map<String, Object> messageContext
) {
RequestSecurityTokenResponseCollectionType responseCollection =
QNameConstants.WS_TRUST_FACTORY.createRequestSecurityTokenResponseCollectionType();
for (RequestSecurityTokenType request : requestCollection.getRequestSecurityToken()) {
- RequestSecurityTokenResponseType response = issueSingle(request, context);
+ RequestSecurityTokenResponseType response = issueSingle(request, principal, messageContext);
responseCollection.getRequestSecurityTokenResponse().add(response);
}
return responseCollection;
@@ -109,14 +109,15 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera
public RequestSecurityTokenResponseType issueSingle(
RequestSecurityTokenType request,
- WebServiceContext context
+ Principal principal,
+ Map<String, Object> messageContext
) {
long start = System.currentTimeMillis();
TokenProviderParameters providerParameters = new TokenProviderParameters();
try {
- RequestRequirements requestRequirements = parseRequest(request, context);
+ RequestRequirements requestRequirements = parseRequest(request, messageContext);
- providerParameters = createTokenProviderParameters(requestRequirements, context);
+ providerParameters = createTokenProviderParameters(requestRequirements, principal, messageContext);
providerParameters.setClaimsManager(claimsManager);
String realm = providerParameters.getRealm();
@@ -125,7 +126,7 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera
String tokenType = tokenRequirements.getTokenType();
if (stsProperties.getSamlRealmCodec() != null) {
- SamlAssertionWrapper assertion = fetchSAMLAssertionFromWSSecuritySAMLToken(context);
+ SamlAssertionWrapper assertion = fetchSAMLAssertionFromWSSecuritySAMLToken(messageContext);
if (assertion != null) {
String wssecRealm = stsProperties.getSamlRealmCodec().getRealmFromToken(assertion);
@@ -149,14 +150,14 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera
// Validate OnBehalfOf token if present
if (providerParameters.getTokenRequirements().getOnBehalfOf() != null) {
ReceivedToken validateTarget = providerParameters.getTokenRequirements().getOnBehalfOf();
- handleDelegationToken(validateTarget, providerParameters, context,
+ handleDelegationToken(validateTarget, providerParameters, principal, messageContext,
realm, requestRequirements);
}
// See whether ActAs is allowed or not
if (providerParameters.getTokenRequirements().getActAs() != null) {
ReceivedToken validateTarget = providerParameters.getTokenRequirements().getActAs();
- handleDelegationToken(validateTarget, providerParameters, context,
+ handleDelegationToken(validateTarget, providerParameters, principal, messageContext,
realm, requestRequirements);
}
@@ -195,7 +196,7 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera
EncryptionProperties encryptionProperties = providerParameters.getEncryptionProperties();
RequestSecurityTokenResponseType response =
createResponse(
- encryptionProperties, tokenResponse, tokenRequirements, keyRequirements, context
+ encryptionProperties, tokenResponse, tokenRequirements, keyRequirements
);
STSIssueSuccessEvent event = new STSIssueSuccessEvent(providerParameters,
System.currentTimeMillis() - start);
@@ -218,12 +219,13 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera
private void handleDelegationToken(
ReceivedToken validateTarget,
TokenProviderParameters providerParameters,
- WebServiceContext context,
+ Principal principal,
+ Map<String, Object> messageContext,
String realm,
RequestRequirements requestRequirements
) {
TokenValidatorResponse tokenResponse = validateReceivedToken(
- context, realm, requestRequirements.getTokenRequirements(), validateTarget);
+ principal, messageContext, realm, requestRequirements.getTokenRequirements(), validateTarget);
if (tokenResponse == null) {
LOG.fine("No Token Validator has been found that can handle this token");
@@ -251,15 +253,15 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera
}
// See whether OnBehalfOf/ActAs is allowed or not
- performDelegationHandling(requestRequirements, context, validateTarget, tokenPrincipal, tokenRoles);
+ performDelegationHandling(requestRequirements, principal, messageContext,
+ validateTarget, tokenPrincipal, tokenRoles);
}
private RequestSecurityTokenResponseType createResponse(
EncryptionProperties encryptionProperties,
TokenProviderResponse tokenResponse,
TokenRequirements tokenRequirements,
- KeyRequirements keyRequirements,
- WebServiceContext webServiceContext
+ KeyRequirements keyRequirements
) throws WSSecurityException {
RequestSecurityTokenResponseType response =
QNameConstants.WS_TRUST_FACTORY.createRequestSecurityTokenResponseType();
@@ -392,9 +394,8 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera
* Method to fetch SAML assertion from the WS-Security header
*/
private static SamlAssertionWrapper fetchSAMLAssertionFromWSSecuritySAMLToken(
- WebServiceContext wsContext
+ Map<String, Object> messageContext
) {
- MessageContext messageContext = wsContext.getMessageContext();
final List<WSHandlerResult> handlerResults =
CastUtils.cast((List<?>) messageContext.get(WSHandlerConstants.RECV_RESULTS));
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
index c0da0a8..b73c108 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
@@ -19,6 +19,7 @@
package org.apache.cxf.sts.operation;
+import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -26,7 +27,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.bind.JAXBElement;
-import javax.xml.ws.WebServiceContext;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.sts.QNameConstants;
@@ -72,20 +72,21 @@ public class TokenRenewOperation extends AbstractOperation implements RenewOpera
}
public RequestSecurityTokenResponseType renew(
- RequestSecurityTokenType request, WebServiceContext context
+ RequestSecurityTokenType request, Principal principal,
+ Map<String, Object> messageContext
) {
long start = System.currentTimeMillis();
TokenRenewerParameters renewerParameters = new TokenRenewerParameters();
try {
- RequestRequirements requestRequirements = parseRequest(request, context);
+ RequestRequirements requestRequirements = parseRequest(request, messageContext);
KeyRequirements keyRequirements = requestRequirements.getKeyRequirements();
TokenRequirements tokenRequirements = requestRequirements.getTokenRequirements();
renewerParameters.setStsProperties(stsProperties);
- renewerParameters.setPrincipal(context.getUserPrincipal());
- renewerParameters.setMessageContext(context.getMessageContext());
+ renewerParameters.setPrincipal(principal);
+ renewerParameters.setMessageContext(messageContext);
renewerParameters.setTokenStore(getTokenStore());
renewerParameters.setKeyRequirements(keyRequirements);
@@ -105,13 +106,13 @@ public class TokenRenewOperation extends AbstractOperation implements RenewOpera
String realm = null;
if (stsProperties.getRealmParser() != null) {
RealmParser realmParser = stsProperties.getRealmParser();
- realm = realmParser.parseRealm(context.getMessageContext());
+ realm = realmParser.parseRealm(messageContext);
}
renewerParameters.setRealm(realm);
// Validate the request
TokenValidatorResponse tokenResponse = validateReceivedToken(
- context, realm, tokenRequirements, renewTarget);
+ principal, messageContext, realm, tokenRequirements, renewTarget);
if (tokenResponse == null) {
LOG.fine("No Token Validator has been found that can handle this token");
@@ -138,7 +139,7 @@ public class TokenRenewOperation extends AbstractOperation implements RenewOpera
// Renew the token
//
TokenRenewerResponse tokenRenewerResponse = null;
- renewerParameters = createTokenRenewerParameters(requestRequirements, context);
+ renewerParameters = createTokenRenewerParameters(requestRequirements, principal, messageContext);
Map<String, Object> additionalProperties = tokenResponse.getAdditionalProperties();
if (additionalProperties != null) {
renewerParameters.setAdditionalProperties(additionalProperties);
@@ -181,7 +182,7 @@ public class TokenRenewOperation extends AbstractOperation implements RenewOpera
EncryptionProperties encryptionProperties = renewerParameters.getEncryptionProperties();
RequestSecurityTokenResponseType response =
createResponse(
- encryptionProperties, tokenRenewerResponse, tokenRequirements, keyRequirements, context
+ encryptionProperties, tokenRenewerResponse, tokenRequirements, keyRequirements
);
STSRenewSuccessEvent event = new STSRenewSuccessEvent(renewerParameters,
System.currentTimeMillis() - start);
@@ -203,8 +204,7 @@ public class TokenRenewOperation extends AbstractOperation implements RenewOpera
EncryptionProperties encryptionProperties,
TokenRenewerResponse tokenRenewerResponse,
TokenRequirements tokenRequirements,
- KeyRequirements keyRequirements,
- WebServiceContext webServiceContext
+ KeyRequirements keyRequirements
) throws WSSecurityException {
RequestSecurityTokenResponseType response =
QNameConstants.WS_TRUST_FACTORY.createRequestSecurityTokenResponseType();
@@ -279,10 +279,11 @@ public class TokenRenewOperation extends AbstractOperation implements RenewOpera
}
private TokenRenewerParameters createTokenRenewerParameters(
- RequestRequirements requestRequirements, WebServiceContext context
+ RequestRequirements requestRequirements, Principal principal,
+ Map<String, Object> messageContext
) {
TokenProviderParameters providerParameters =
- createTokenProviderParameters(requestRequirements, context);
+ createTokenProviderParameters(requestRequirements, principal, messageContext);
TokenRenewerParameters renewerParameters = new TokenRenewerParameters();
renewerParameters.setAppliesToAddress(providerParameters.getAppliesToAddress());
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRequestCollectionOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRequestCollectionOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRequestCollectionOperation.java
index 3f92b84..1302b14 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRequestCollectionOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRequestCollectionOperation.java
@@ -19,13 +19,14 @@
package org.apache.cxf.sts.operation;
+import java.security.Principal;
import java.util.List;
+import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
-import javax.xml.ws.WebServiceContext;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.sts.QNameConstants;
@@ -66,7 +67,8 @@ public class TokenRequestCollectionOperation extends AbstractOperation
public RequestSecurityTokenResponseCollectionType requestCollection(
RequestSecurityTokenCollectionType requestCollection,
- WebServiceContext context) {
+ Principal principal,
+ Map<String, Object> messageContext) {
RequestSecurityTokenResponseCollectionType responseCollection =
QNameConstants.WS_TRUST_FACTORY.createRequestSecurityTokenResponseCollectionType();
@@ -95,7 +97,8 @@ public class TokenRequestCollectionOperation extends AbstractOperation
}
}
- RequestSecurityTokenResponseType response = handleRequest(request, context, requestType);
+ RequestSecurityTokenResponseType response =
+ handleRequest(request, principal, messageContext, requestType);
responseCollection.getRequestSecurityTokenResponse().add(response);
}
return responseCollection;
@@ -103,7 +106,8 @@ public class TokenRequestCollectionOperation extends AbstractOperation
public RequestSecurityTokenResponseType handleRequest(
RequestSecurityTokenType request,
- WebServiceContext context,
+ Principal principal,
+ Map<String, Object> messageContext,
String requestType
) {
if (WSTRUST_REQUESTTYPE_BATCH_ISSUE.equals(requestType)) {
@@ -113,7 +117,7 @@ public class TokenRequestCollectionOperation extends AbstractOperation
"Error in requesting a token", STSException.REQUEST_FAILED
);
}
- return issueSingleOperation.issueSingle(request, context);
+ return issueSingleOperation.issueSingle(request, principal, messageContext);
} else if (WSTRUST_REQUESTTYPE_BATCH_VALIDATE.equals(requestType)) {
if (validateOperation == null) {
LOG.log(Level.WARNING, "ValidateOperation is null");
@@ -121,7 +125,7 @@ public class TokenRequestCollectionOperation extends AbstractOperation
"Error in requesting a token", STSException.REQUEST_FAILED
);
}
- return validateOperation.validate(request, context);
+ return validateOperation.validate(request, principal, messageContext);
} else if (WSTRUST_REQUESTTYPE_BATCH_CANCEL.equals(requestType)) {
if (cancelOperation == null) {
LOG.log(Level.WARNING, "CancelOperation is null");
@@ -129,7 +133,7 @@ public class TokenRequestCollectionOperation extends AbstractOperation
"Error in requesting a token", STSException.REQUEST_FAILED
);
}
- return cancelOperation.cancel(request, context);
+ return cancelOperation.cancel(request, principal, messageContext);
} else if (WSTRUST_REQUESTTYPE_BATCH_RENEW.equals(requestType)) {
if (renewOperation == null) {
LOG.log(Level.WARNING, "RenewOperation is null");
@@ -137,7 +141,7 @@ public class TokenRequestCollectionOperation extends AbstractOperation
"Error in requesting a token", STSException.REQUEST_FAILED
);
}
- return renewOperation.renew(request, context);
+ return renewOperation.renew(request, principal, messageContext);
} else {
LOG.log(Level.WARNING, "Unknown operation requested");
throw new STSException(
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
index 49cfb74..c029809 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
@@ -19,12 +19,12 @@
package org.apache.cxf.sts.operation;
+import java.security.Principal;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.bind.JAXBElement;
-import javax.xml.ws.WebServiceContext;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -65,19 +65,20 @@ public class TokenValidateOperation extends AbstractOperation implements Validat
public RequestSecurityTokenResponseType validate(
RequestSecurityTokenType request,
- WebServiceContext context
+ Principal principal,
+ Map<String, Object> messageContext
) {
long start = System.currentTimeMillis();
TokenValidatorParameters validatorParameters = new TokenValidatorParameters();
try {
- RequestRequirements requestRequirements = parseRequest(request, context);
+ RequestRequirements requestRequirements = parseRequest(request, messageContext);
TokenRequirements tokenRequirements = requestRequirements.getTokenRequirements();
validatorParameters.setStsProperties(stsProperties);
- validatorParameters.setPrincipal(context.getUserPrincipal());
- validatorParameters.setMessageContext(context.getMessageContext());
+ validatorParameters.setPrincipal(principal);
+ validatorParameters.setMessageContext(messageContext);
validatorParameters.setTokenStore(getTokenStore());
//validatorParameters.setKeyRequirements(keyRequirements);
@@ -101,12 +102,12 @@ public class TokenValidateOperation extends AbstractOperation implements Validat
String realm = null;
if (stsProperties.getRealmParser() != null) {
RealmParser realmParser = stsProperties.getRealmParser();
- realm = realmParser.parseRealm(context.getMessageContext());
+ realm = realmParser.parseRealm(messageContext);
}
validatorParameters.setRealm(realm);
TokenValidatorResponse tokenResponse = validateReceivedToken(
- context, realm, tokenRequirements, validateTarget);
+ principal, messageContext, realm, tokenRequirements, validateTarget);
if (tokenResponse == null) {
LOG.fine("No Token Validator has been found that can handle this token");
@@ -123,7 +124,7 @@ public class TokenValidateOperation extends AbstractOperation implements Validat
if (tokenResponse.getToken().getState() == STATE.VALID
&& !STSConstants.STATUS.equals(tokenType)) {
TokenProviderParameters providerParameters =
- createTokenProviderParameters(requestRequirements, context);
+ createTokenProviderParameters(requestRequirements, principal, messageContext);
processValidToken(providerParameters, validateTarget, tokenResponse);
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java
index f81927b..a4c47ce 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java
@@ -20,6 +20,7 @@ package org.apache.cxf.sts.claims.mapper;
import java.io.IOException;
import java.net.URI;
+import java.security.Principal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -35,7 +36,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rt.security.claims.Claim;
@@ -100,8 +100,9 @@ public class JexlIssueSamlClaimsTest extends org.junit.Assert {
* @return
*/
private List<RequestSecurityTokenResponseType> issueToken(TokenIssueOperation issueOperation,
- RequestSecurityTokenType request, WebServiceContextImpl webServiceContext) {
- RequestSecurityTokenResponseCollectionType response = issueOperation.issue(request, webServiceContext);
+ RequestSecurityTokenType request, Principal principal, Map<String, Object> messageContext) {
+ RequestSecurityTokenResponseCollectionType response =
+ issueOperation.issue(request, principal, messageContext);
List<RequestSecurityTokenResponseType> securityTokenResponse = response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
return securityTokenResponse;
@@ -173,10 +174,9 @@ public class JexlIssueSamlClaimsTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "https");
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponseList = issueToken(issueOperation, request,
- webServiceContext);
+ null, msgCtx);
RequestSecurityTokenResponseType securityTokenResponse = securityTokenResponseList.get(0);
// Test the generated token.
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java
index ce23cee..04900ca 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java
@@ -29,7 +29,6 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.security.SecurityContext;
@@ -115,20 +114,20 @@ public class CancelSCTUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Cancel a token
RequestSecurityTokenResponseType response =
- cancelOperation.cancel(request, webServiceContext);
+ cancelOperation.cancel(request, principal, msgCtx);
assertTrue(validateResponse(response));
// Now try to cancel again
try {
- cancelOperation.cancel(request, webServiceContext);
+ cancelOperation.cancel(request, principal, msgCtx);
} catch (STSException ex) {
// expected
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
index c399543..a8ef79a 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
@@ -29,7 +29,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.QNameConstants;
@@ -103,11 +102,10 @@ public class IssueEncryptedUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -155,11 +153,10 @@ public class IssueEncryptedUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token - as no encryption name has been specified the token will not be encrypted
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -168,7 +165,7 @@ public class IssueEncryptedUnitTest extends org.junit.Assert {
service.setEncryptionProperties(encryptionProperties);
// Issue a (encrypted) token
- response = issueOperation.issue(request, webServiceContext);
+ response = issueOperation.issue(request, null, msgCtx);
securityTokenResponse = response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
}
@@ -215,18 +212,17 @@ public class IssueEncryptedUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token - this should use a (new) default encryption algorithm as configured
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
encryptionProperties.setEncryptionAlgorithm(WSConstants.KEYTRANSPORT_RSA15);
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected on a bad encryption algorithm");
} catch (STSException ex) {
// expected
@@ -278,11 +274,10 @@ public class IssueEncryptedUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -297,7 +292,7 @@ public class IssueEncryptedUnitTest extends org.junit.Assert {
);
request.getAny().add(encryptionAlgorithmType);
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected on a bad encryption algorithm");
} catch (STSException ex) {
// expected
@@ -357,18 +352,17 @@ public class IssueEncryptedUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token - this should use a (new) default key-wrap algorithm as configured
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
encryptionProperties.setKeyWrapAlgorithm(WSConstants.AES_128);
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected on a bad key-wrap algorithm");
} catch (STSException ex) {
// expected
@@ -431,11 +425,10 @@ public class IssueEncryptedUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -451,7 +444,7 @@ public class IssueEncryptedUnitTest extends org.junit.Assert {
);
request.getAny().add(encryptionAlgorithmType);
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected on a bad key-wrap algorithm");
} catch (STSException ex) {
// expected
@@ -502,27 +495,26 @@ public class IssueEncryptedUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token - use various KeyIdentifiers
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
encryptionProperties.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
encryptionProperties.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
encryptionProperties.setKeyIdentifierType(WSConstants.ENCRYPTED_KEY_SHA1_IDENTIFIER);
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
try {
encryptionProperties.setKeyIdentifierType(WSConstants.BST);
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected on a bad key identifier");
} catch (STSException ex) {
// expected
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
index 3dd8372..677b163 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
@@ -34,7 +34,6 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
@@ -131,10 +130,11 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert {
request.getAny().add(secondaryParameters);
request.getAny().add(createAppliesToElement("http://dummy-service.com/dummy"));
- WebServiceContextImpl webServiceContext = setupMessageContext();
+ Map<String, Object> messageContext = setupMessageContext();
List<RequestSecurityTokenResponseType> securityTokenResponse = issueToken(issueOperation, request,
- webServiceContext);
+ new CustomTokenPrincipal("alice"),
+ messageContext);
// Test the generated token.
Element token = null;
@@ -165,9 +165,9 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert {
* @return
*/
private List<RequestSecurityTokenResponseType> issueToken(TokenIssueOperation issueOperation,
- RequestSecurityTokenType request, WebServiceContextImpl webServiceContext) {
+ RequestSecurityTokenType request, Principal principal, Map<String, Object> msgCtx) {
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -177,14 +177,14 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert {
/**
* @return
*/
- private WebServiceContextImpl setupMessageContext() {
+ private Map<String, Object> setupMessageContext() {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put(
SecurityContext.class.getName(),
createSecurityContext(new CustomTokenPrincipal("alice"))
);
- return new WebServiceContextImpl(msgCtx);
+ return msgCtx;
}
/**
@@ -258,10 +258,11 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert {
request.getAny().add(createAppliesToElement("http://dummy-service.com/dummy"));
- WebServiceContextImpl webServiceContext = setupMessageContext();
+ Map<String, Object> messageContext = setupMessageContext();
List<RequestSecurityTokenResponseType> securityTokenResponse = issueToken(issueOperation, request,
- webServiceContext);
+ new CustomTokenPrincipal("alice"),
+ messageContext);
// Test the generated token.
Element token = null;
@@ -384,10 +385,9 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "https");
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponseList = issueToken(issueOperation,
- request, webServiceContext);
+ request, new CustomTokenPrincipal("alice"), msgCtx);
// Test the generated token.
Element token = null;
@@ -537,10 +537,9 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "https");
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponseList = issueToken(issueOperation,
- request, webServiceContext);
+ request, new CustomTokenPrincipal("alice"), msgCtx);
// Test the generated token.
Element token = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
index 4f16544..ff5842d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
@@ -33,7 +33,6 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
@@ -150,11 +149,10 @@ public class IssueJWTOnbehalfofUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -236,13 +234,12 @@ public class IssueJWTOnbehalfofUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
// This should fail as the default DelegationHandler does not allow UsernameTokens
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
fail("Failure expected as UsernameTokens are not accepted for OnBehalfOf by default");
} catch (STSException ex) {
// expected
@@ -252,7 +249,7 @@ public class IssueJWTOnbehalfofUnitTest extends org.junit.Assert {
issueOperation.setDelegationHandlers(Collections.singletonList(delegationHandler));
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -349,12 +346,11 @@ public class IssueJWTOnbehalfofUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "https");
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
tokenProvider.setRealmMap(realms);
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, null, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
index 4608396..5c009a1 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
@@ -33,7 +33,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
@@ -117,15 +116,15 @@ public class IssueJWTRealmUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "ldap");
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -192,15 +191,15 @@ public class IssueJWTRealmUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "https");
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -267,15 +266,15 @@ public class IssueJWTRealmUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "unknown");
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
@@ -351,16 +350,16 @@ public class IssueJWTRealmUnitTest extends org.junit.Assert {
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
msgCtx.put("url", "https");
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token - this will fail as the RealmProperties configuration is inconsistent
// no signature alias defined
try {
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
fail("Failure expected on no encryption name");
} catch (STSException ex) {
// expected
@@ -370,7 +369,7 @@ public class IssueJWTRealmUnitTest extends org.junit.Assert {
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8673543/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java
index 5cd7a3c..2f29d3f 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java
@@ -31,7 +31,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
@@ -114,15 +113,15 @@ public class IssueJWTUnitTest extends org.junit.Assert {
// Mock up message context
MessageImpl msg = new MessageImpl();
WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ Principal principal = new CustomTokenPrincipal("alice");
msgCtx.put(
SecurityContext.class.getName(),
- createSecurityContext(new CustomTokenPrincipal("alice"))
+ createSecurityContext(principal)
);
- WebServiceContextImpl webServiceContext = new WebServiceContextImpl(msgCtx);
// Issue a token
RequestSecurityTokenResponseCollectionType response =
- issueOperation.issue(request, webServiceContext);
+ issueOperation.issue(request, principal, msgCtx);
List<RequestSecurityTokenResponseType> securityTokenResponse =
response.getRequestSecurityTokenResponse();
assertTrue(!securityTokenResponse.isEmpty());