Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWS-955 - Polishing

Browse Source
This commit is contained in:
Greg Turnquist
2017-10-30 11:12:19 -05:00
parent e34fb937d1
commit 186bb2462b
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java
View File

@@ -640,8 +640,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl
requestData.setAllowRSA15KeyTransportAlgorithm(allowRSA15KeyTransportAlgorithm);
requestData.setDisableBSPEnforcement(!bspCompliant);
if (requestData.getBSPEnforcer() != null)
{
if (requestData.getBSPEnforcer() != null) {
requestData.getBSPEnforcer().setDisableBSPRules(!bspCompliant);
}
// allow for qualified password types for .Net interoperability

13
spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTestCase.java
View File

@@ -2,7 +2,6 @@ package org.springframework.ws.soap.security.wss4j2;
import java.io.IOException;
import java.security.cert.X509Certificate;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
@@ -16,11 +15,12 @@ import org.apache.wss4j.common.saml.bean.SubjectBean;
import org.apache.wss4j.common.saml.bean.Version;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.junit.Test;
import org.w3c.dom.Document;
import org.springframework.core.io.ClassPathResource;
import org.springframework.ws.context.MessageContext;
import org.springframework.ws.soap.SoapMessage;
import org.springframework.ws.soap.security.wss4j2.support.CryptoFactoryBean;
import org.w3c.dom.Document;
public abstract class Wss4jMessageInterceptorSamlTestCase extends Wss4jTestCase {
@@ -51,8 +51,7 @@ public abstract class Wss4jMessageInterceptorSamlTestCase extends Wss4jTestCase
}
@Test
public void testAddSAML() throws Exception
{
public void testAddSAML() throws Exception {
interceptor.setSecurementPassword("123456");
interceptor.setSecurementUsername("rsaKey");
SoapMessage message = loadSoap11Message("empty-soap.xml");
@@ -68,8 +67,7 @@ public abstract class Wss4jMessageInterceptorSamlTestCase extends Wss4jTestCase
interceptor.validateMessage(message, messageContext);
}
protected CallbackHandler getSamlCalbackHandler(Crypto crypto, X509Certificate userCert)
{
protected CallbackHandler getSamlCalbackHandler(Crypto crypto, X509Certificate userCert) {
return new SamlCallbackHandler(crypto, userCert);
}
@@ -79,8 +77,7 @@ public abstract class Wss4jMessageInterceptorSamlTestCase extends Wss4jTestCase
private X509Certificate userCertificate;
public SamlCallbackHandler(Crypto crypto, X509Certificate userCertificate)
{
public SamlCallbackHandler(Crypto crypto, X509Certificate userCertificate) {
this.crypto = crypto;
this.userCertificate = userCertificate;
}