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 2012/11/23 11:01:02 UTC
svn commit: r1412804 -
/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java
Author: coheigea
Date: Fri Nov 23 10:01:01 2012
New Revision: 1412804
URL: http://svn.apache.org/viewvc?rev=1412804&view=rev
Log:
Make sure Santuario provider is installed for the SAML case
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java?rev=1412804&r1=1412803&r2=1412804&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java Fri Nov 23 10:01:01 2012
@@ -173,7 +173,6 @@ public class SamlTokenInterceptor extend
private List<WSSecurityEngineResult> processToken(Element tokenElement, final SoapMessage message)
throws WSSecurityException {
- SAMLTokenProcessor p = new SAMLTokenProcessor();
WSDocInfo wsDocInfo = new WSDocInfo(tokenElement.getOwnerDocument());
RequestData data = new RequestData() {
public CallbackHandler getCallbackHandler() {
@@ -208,6 +207,8 @@ public class SamlTokenInterceptor extend
}
};
data.setWssConfig(WSSConfig.getNewInstance());
+
+ SAMLTokenProcessor p = new SAMLTokenProcessor();
List<WSSecurityEngineResult> results =
p.handleToken(tokenElement, data, wsDocInfo);
return results;
@@ -234,6 +235,7 @@ public class SamlTokenInterceptor extend
private void addSamlToken(SoapMessage message) {
+ WSSConfig.init();
SamlToken tok = assertSamlTokens(message);
Header h = findSecurityHeader(message, true);