You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/01/28 22:19:34 UTC
svn commit: r1780748 -
/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
Author: veithen
Date: Sat Jan 28 22:19:33 2017
New Revision: 1780748
URL: http://svn.apache.org/viewvc?rev=1780748&view=rev
Log:
Some cleanup.
Modified:
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
Modified: axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java?rev=1780748&r1=1780747&r2=1780748&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java Sat Jan 28 22:19:33 2017
@@ -98,9 +98,9 @@ public class RampartEngine {
//Set rampart's configuration of WSS4J
engine.setWssConfig(rmd.getConfig());
- RampartConfig rampartConfig = rpd.getRampartConfig();
- if (rampartConfig != null) {
- WSSConfig config = engine.getWssConfig();
+ RampartConfig rampartConfig = rpd.getRampartConfig();
+ if (rampartConfig != null) {
+ WSSConfig config = engine.getWssConfig();
// Inbound Kerberos authentication for web services
// Check the service policy for Kerberos token and add KerberosTokenValidator for BINARY_TOKEN validation
@@ -108,11 +108,10 @@ public class RampartEngine {
if (endSupptokens != null && endSupptokens.getTokens() != null &&
endSupptokens.getTokens().size() > 0) {
- log.debug("Processing endorsing supporting tokens");
- List tokens = endSupptokens.getTokens();
+ log.debug("Processing endorsing supporting tokens");
- for (Object objectToken : tokens) {
- if (objectToken instanceof KerberosToken) {
+ for (org.apache.ws.secpolicy.model.Token token : endSupptokens.getTokens()) {
+ if (token instanceof KerberosToken) {
log.debug("KerberosToken is found as part of the endorsing supporting tokens.Check for KerberosConfig.");
KerberosConfig kerberosConfig = rampartConfig.getKerberosConfig();
@@ -146,7 +145,7 @@ public class RampartEngine {
if (handler != null) {
WSPasswordCallback[] cb = {
- new WSPasswordCallback(principalName, WSPasswordCallback.CUSTOM_TOKEN)
+ new WSPasswordCallback(principalName, WSPasswordCallback.CUSTOM_TOKEN)
};
try {
@@ -176,12 +175,12 @@ public class RampartEngine {
}
}
}
- }
+ }
engine.setWssConfig(config);
- }
-
- ValidatorData data = new ValidatorData(rmd);
+ }
+
+ ValidatorData data = new ValidatorData(rmd);
SOAPHeader header = rmd.getMsgContext().getEnvelope().getHeader();
if(header == null) {