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/29 15:30:18 UTC
svn commit: r1780807 -
/axis/axis2/java/rampart/branches/RAMPART-234/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Author: veithen
Date: Sun Jan 29 15:30:18 2017
New Revision: 1780807
URL: http://svn.apache.org/viewvc?rev=1780807&view=rev
Log:
Avoid unnecessary code changes with respect to trunk.
Modified:
axis/axis2/java/rampart/branches/RAMPART-234/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Modified: axis/axis2/java/rampart/branches/RAMPART-234/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-234/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?rev=1780807&r1=1780806&r2=1780807&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-234/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-234/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java Sun Jan 29 15:30:18 2017
@@ -1823,12 +1823,16 @@ public class RampartUtil {
* @throws RampartException
*/
public static void validateTransport(RampartMessageData rmd) throws RampartException {
-
+
MessageContext msgContext = rmd.getMsgContext();
RampartPolicyData rpd = rmd.getPolicyData();
AxisConfiguration axisConf = msgContext.getConfigurationContext().getAxisConfiguration();
-
- if(rpd != null && rpd.isTransportBinding() && !rmd.isInitiator()){
+
+ if (rpd == null) {
+ return;
+ }
+
+ if (rpd.isTransportBinding() && !rmd.isInitiator()) {
if (rpd.getTransportToken() instanceof HttpsToken) {
try {
TransportInDescription transportIn = msgContext.getTransportIn();
@@ -1868,8 +1872,7 @@ public class RampartUtil {
// verify client certificate used
// try to obtain the client certificate chain directly from the message context
// and then from the servlet request
- HttpsToken token = (HttpsToken)rpd.getTransportToken();
- if (token.isRequireClientCertificate()) {
+ if (((HttpsToken)rpd.getTransportToken()).isRequireClientCertificate()) {
Object certificateChainProperty = msgContext.getProperty(RampartConstants.HTTPS_CLIENT_CERT_KEY);
if (certificateChainProperty instanceof X509Certificate[]) {
// HTTPS client certificate chain found
@@ -1889,6 +1892,7 @@ public class RampartUtil {
// HTTPS client certificate chain NOT found
throw new RampartException("httpsClientCertValidationFailed");
}
+
}
}
}