This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new f659e3f Reduce the number of WS-Security interceptors that are created
f659e3f is described below
commit f659e3f568d8c6e1246437022531ccf834c1cf7a
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Wed Jan 23 14:01:17 2019 +0000
Reduce the number of WS-Security interceptors that are created
---
.../interceptors/HttpsTokenInterceptorProvider.java | 15 +++++++++------
.../interceptors/IssuedTokenInterceptorProvider.java | 11 +++++++----
.../interceptors/KerberosTokenInterceptorProvider.java | 16 ++++++++++------
.../SecureConversationTokenInterceptorProvider.java | 11 +++++++----
.../interceptors/SpnegoTokenInterceptorProvider.java | 11 +++++++----
.../security/wss4j/PolicyBasedWSS4JOutInterceptor.java | 2 +-
6 files changed, 41 insertions(+), 25 deletions(-)
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java
index 6586954..2f1db69 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java
@@ -75,10 +75,13 @@ public class HttpsTokenInterceptorProvider extends
AbstractPolicyInterceptorProv
super(Arrays.asList(SP11Constants.TRANSPORT_TOKEN,
SP12Constants.TRANSPORT_TOKEN,
SP11Constants.ISSUED_TOKEN,
SP12Constants.ISSUED_TOKEN,
SP11Constants.HTTPS_TOKEN,
SP12Constants.HTTPS_TOKEN));
- this.getOutInterceptors().add(new HttpsTokenOutInterceptor());
- this.getOutFaultInterceptors().add(new HttpsTokenOutInterceptor());
- this.getInInterceptors().add(new HttpsTokenInInterceptor());
- this.getInFaultInterceptors().add(new HttpsTokenInInterceptor());
+ HttpsTokenOutInterceptor outInterceptor = new
HttpsTokenOutInterceptor();
+ this.getOutInterceptors().add(outInterceptor);
+ this.getOutFaultInterceptors().add(outInterceptor);
+
+ HttpsTokenInInterceptor inInterceptor = new HttpsTokenInInterceptor();
+ this.getInInterceptors().add(inInterceptor);
+ this.getInFaultInterceptors().add(inInterceptor);
}
private static Map<String, List<String>> getProtocolHeaders(Message
message) {
@@ -124,8 +127,8 @@ public class HttpsTokenInterceptorProvider extends
AbstractPolicyInterceptorProv
if (token.getAuthenticationType()
==
HttpsToken.AuthenticationType.RequireClientCertificate) {
boolean disableClientCertCheck =
- MessageUtils.getContextualBoolean(message,
-
SecurityConstants.DISABLE_REQ_CLIENT_CERT_CHECK,
+ MessageUtils.getContextualBoolean(message,
+
SecurityConstants.DISABLE_REQ_CLIENT_CERT_CHECK,
false);
if (!disableClientCertCheck) {
final MessageTrustDecider orig =
message.get(MessageTrustDecider.class);
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
index b40e720..6099eab 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
@@ -78,10 +78,13 @@ public class IssuedTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
this.getInInterceptors().add(in);
this.getInFaultInterceptors().add(in);
- this.getOutInterceptors().add(new IssuedTokenOutInterceptor());
- this.getOutFaultInterceptors().add(new IssuedTokenOutInterceptor());
- this.getInInterceptors().add(new IssuedTokenInInterceptor());
- this.getInFaultInterceptors().add(new IssuedTokenInInterceptor());
+ IssuedTokenOutInterceptor outInterceptor = new
IssuedTokenOutInterceptor();
+ this.getOutInterceptors().add(outInterceptor);
+ this.getOutFaultInterceptors().add(outInterceptor);
+
+ IssuedTokenInInterceptor inInterceptor = new
IssuedTokenInInterceptor();
+ this.getInInterceptors().add(inInterceptor);
+ this.getInFaultInterceptors().add(inInterceptor);
PolicyBasedWSS4JStaxOutInterceptor so = new
PolicyBasedWSS4JStaxOutInterceptor();
PolicyBasedWSS4JStaxInInterceptor si = new
PolicyBasedWSS4JStaxInInterceptor();
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java
index 1e632ea..6485bd2 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java
@@ -78,13 +78,17 @@ public class KerberosTokenInterceptorProvider extends
AbstractPolicyInterceptorP
public KerberosTokenInterceptorProvider() {
super(Arrays.asList(SP11Constants.KERBEROS_TOKEN,
SP12Constants.KERBEROS_TOKEN));
- this.getOutInterceptors().add(new KerberosTokenOutInterceptor());
- this.getOutFaultInterceptors().add(new KerberosTokenOutInterceptor());
- this.getInInterceptors().add(new KerberosTokenDOMInInterceptor());
- this.getInFaultInterceptors().add(new KerberosTokenDOMInInterceptor());
+ KerberosTokenOutInterceptor outInterceptor = new
KerberosTokenOutInterceptor();
+ this.getOutInterceptors().add(outInterceptor);
+ this.getOutFaultInterceptors().add(outInterceptor);
- this.getInInterceptors().add(new KerberosTokenStaxInInterceptor());
- this.getInFaultInterceptors().add(new
KerberosTokenStaxInInterceptor());
+ KerberosTokenDOMInInterceptor domInInterceptor = new
KerberosTokenDOMInInterceptor();
+ this.getInInterceptors().add(domInInterceptor);
+ this.getInFaultInterceptors().add(domInInterceptor);
+
+ KerberosTokenStaxInInterceptor staxInInterceptor = new
KerberosTokenStaxInInterceptor();
+ this.getInInterceptors().add(staxInInterceptor);
+ this.getInFaultInterceptors().add(staxInInterceptor);
this.getOutInterceptors().add(new KerberosTokenInterceptor());
this.getInInterceptors().add(new KerberosTokenInterceptor());
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java
index 5bf0d11..fa354d3 100755
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java
@@ -57,10 +57,13 @@ public class SecureConversationTokenInterceptorProvider
extends AbstractPolicyIn
SP12Constants.SECURE_CONVERSATION_TOKEN,
SP12Constants.BOOTSTRAP_POLICY,
SP11Constants.BOOTSTRAP_POLICY));
- this.getOutInterceptors().add(new SecureConversationOutInterceptor());
- this.getOutFaultInterceptors().add(new
SecureConversationOutInterceptor());
- this.getInInterceptors().add(new SecureConversationInInterceptor());
- this.getInFaultInterceptors().add(new
SecureConversationInInterceptor());
+ SecureConversationOutInterceptor outInterceptor = new
SecureConversationOutInterceptor();
+ this.getOutInterceptors().add(outInterceptor);
+ this.getOutFaultInterceptors().add(outInterceptor);
+
+ SecureConversationInInterceptor inInterceptor = new
SecureConversationInInterceptor();
+ this.getInInterceptors().add(inInterceptor);
+ this.getInFaultInterceptors().add(inInterceptor);
}
static String setupClient(STSClient client,
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoTokenInterceptorProvider.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoTokenInterceptorProvider.java
index 1dc7aec..ec239e9 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoTokenInterceptorProvider.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoTokenInterceptorProvider.java
@@ -46,10 +46,13 @@ public class SpnegoTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
public SpnegoTokenInterceptorProvider() {
super(Arrays.asList(SP11Constants.SPNEGO_CONTEXT_TOKEN,
SP12Constants.SPNEGO_CONTEXT_TOKEN));
- this.getOutInterceptors().add(new SpnegoContextTokenOutInterceptor());
- this.getOutFaultInterceptors().add(new
SpnegoContextTokenOutInterceptor());
- this.getInInterceptors().add(new SpnegoContextTokenInInterceptor());
- this.getInFaultInterceptors().add(new
SpnegoContextTokenInInterceptor());
+ SpnegoContextTokenOutInterceptor outInterceptor = new
SpnegoContextTokenOutInterceptor();
+ this.getOutInterceptors().add(outInterceptor);
+ this.getOutFaultInterceptors().add(outInterceptor);
+
+ SpnegoContextTokenInInterceptor inInterceptor = new
SpnegoContextTokenInInterceptor();
+ this.getInInterceptors().add(inInterceptor);
+ this.getInFaultInterceptors().add(inInterceptor);
}
static String setupClient(STSClient client, SoapMessage message,
AssertionInfoMap aim) {
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
index a0483c3..1a68fe0 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
@@ -153,7 +153,7 @@ public class PolicyBasedWSS4JOutInterceptor extends
AbstractPhaseInterceptor<Soa
SAAJUtils.getHeader(saaj).appendChild(el);
} catch (SOAPException e) {
//ignore
- }
+ }
WSSConfig config =
(WSSConfig)message.getContextualProperty(WSSConfig.class.getName());
if (config == null) {
