You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2013/08/06 12:20:01 UTC
svn commit: r1510895 - in /webservices/wss4j/trunk: ./
ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/
ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/
ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/...
Author: coheigea
Date: Tue Aug 6 10:20:00 2013
New Revision: 1510895
URL: http://svn.apache.org/r1510895
Log:
Finished PMD upgrade
Modified:
webservices/wss4j/trunk/pom.xml
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosTokenDecoderImpl.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/OperationPolicy.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/IssuedTokenAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/KerberosTokenAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SignedPartsAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSInboundSecurityContext.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSCrypto.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SecurityTokenImpl.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/KerberosServiceSecurityToken.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/SecurityTokenReference.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/SubjectAndPrincipalSecurityToken.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidator.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidatorImpl.java
Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Tue Aug 6 10:20:00 2013
@@ -119,8 +119,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
- <!--<version>3.0.1</version>-->
+ <version>3.0.1</version>
<configuration>
<sourceEncoding>UTF-8</sourceEncoding>
<failOnViolation>true</failOnViolation>
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosTokenDecoderImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosTokenDecoderImpl.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosTokenDecoderImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosTokenDecoderImpl.java Tue Aug 6 10:20:00 2013
@@ -113,7 +113,7 @@ public class KerberosTokenDecoderImpl im
int readLowByte = asn1InputStream.read() & 0xff;
int readHighByte = asn1InputStream.read() & 0xff;
- int read = (readHighByte << 8) + readLowByte;
+ int read = (readHighByte << 8) + readLowByte; //NOPMD
if (read != 0x01) {
throw new KerberosTokenDecoderException("invalid kerberos token");
}
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/OperationPolicy.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/OperationPolicy.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/OperationPolicy.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/OperationPolicy.java Tue Aug 6 10:20:00 2013
@@ -76,7 +76,7 @@ public class OperationPolicy {
public int hashCode() {
int hashcode = 17;
if (getOperationName() != null) {
- hashcode *= (31 * getOperationName().hashCode());
+ hashcode *= 31 * getOperationName().hashCode();
}
return hashcode;
}
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/IssuedTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/IssuedTokenAssertionState.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/IssuedTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/IssuedTokenAssertionState.java Tue Aug 6 10:20:00 2013
@@ -34,7 +34,6 @@ import org.apache.xml.security.stax.secu
import org.apache.wss4j.stax.securityEvent.IssuedTokenSecurityEvent;
import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants;
import org.opensaml.common.SAMLVersion;
-import org.opensaml.saml2.core.AttributeStatement;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -76,7 +75,7 @@ public class IssuedTokenAssertionState e
IssuedTokenSecurityEvent<? extends SecurityToken> issuedTokenSecurityEvent
= (IssuedTokenSecurityEvent<? extends SecurityToken>) tokenSecurityEvent;
try {
- if ((issuedToken.getIssuerName() != null) &&
+ if (issuedToken.getIssuerName() != null &&
!issuedToken.getIssuerName().equals(issuedTokenSecurityEvent.getIssuerName())) {
setErrorMessage("IssuerName in Policy (" + issuedToken.getIssuerName() +
") didn't match with the one in the IssuedToken (" + issuedTokenSecurityEvent.getIssuerName() + ")");
@@ -216,7 +215,7 @@ public class IssuedTokenAssertionState e
}
protected String findClaimInAssertion(org.opensaml.saml2.core.Assertion assertion, URI claimURI) {
- List<AttributeStatement> attributeStatements =
+ List<org.opensaml.saml2.core.AttributeStatement> attributeStatements =
assertion.getAttributeStatements();
if (attributeStatements == null || attributeStatements.isEmpty()) {
return "Attribute " + claimURI + " not found in the SAMLAssertion";
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/KerberosTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/KerberosTokenAssertionState.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/KerberosTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/KerberosTokenAssertionState.java Tue Aug 6 10:20:00 2013
@@ -58,7 +58,7 @@ public class KerberosTokenAssertionState
KerberosTokenSecurityEvent kerberosTokenSecurityEvent = (KerberosTokenSecurityEvent) tokenSecurityEvent;
KerberosServiceSecurityToken kerberosServiceSecurityToken = kerberosTokenSecurityEvent.getSecurityToken();
- if ((kerberosToken.getIssuerName() != null) &&
+ if (kerberosToken.getIssuerName() != null &&
!kerberosToken.getIssuerName().equals(kerberosTokenSecurityEvent.getIssuerName())) {
setErrorMessage("IssuerName in Policy (" + kerberosToken.getIssuerName() + ") didn't match with the one in the IssuedToken (" + kerberosTokenSecurityEvent.getIssuerName() + ")");
return false;
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SignedPartsAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SignedPartsAssertionState.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SignedPartsAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SignedPartsAssertionState.java Tue Aug 6 10:20:00 2013
@@ -60,7 +60,7 @@ public class SignedPartsAssertionState e
SignedParts signedParts = (SignedParts) getAssertion();
if (signedParts.isBody()
- && (WSSUtils.pathMatches(WSSConstants.SOAP_11_BODY_PATH, signedPartSecurityEvent.getElementPath(), true, false))) {
+ && WSSUtils.pathMatches(WSSConstants.SOAP_11_BODY_PATH, signedPartSecurityEvent.getElementPath(), true, false)) {
if (signedPartSecurityEvent.isSigned()) {
setAsserted(true);
return true;
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java Tue Aug 6 10:20:00 2013
@@ -54,7 +54,7 @@ public class SpnegoContextTokenAssertion
SpnegoContextToken spnegoContextToken = (SpnegoContextToken) abstractToken;
SpnegoContextTokenSecurityEvent spnegoContextTokenSecurityEvent = (SpnegoContextTokenSecurityEvent) tokenSecurityEvent;
- if ((spnegoContextToken.getIssuerName() != null)
+ if (spnegoContextToken.getIssuerName() != null
&& !spnegoContextToken.getIssuerName().equals(spnegoContextTokenSecurityEvent.getIssuerName())) {
setErrorMessage("IssuerName in Policy (" + spnegoContextToken.getIssuerName() + ") didn't match with the one in the IssuedToken (" + spnegoContextTokenSecurityEvent.getIssuerName() + ")");
return false;
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java Tue Aug 6 10:20:00 2013
@@ -281,7 +281,7 @@ public class WSSec {
securityProperties.setSignatureKeyIdentifier(WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference);
}
} else if (WSSConstants.SAML_TOKEN_UNSIGNED.equals(action) &&
- (securityProperties.getSamlCallbackHandler() == null)) {
+ securityProperties.getSamlCallbackHandler() == null) {
throw new WSSConfigurationException(WSSConfigurationException.ErrorCode.FAILURE, "noSAMLCallbackHandler");
} else if (WSSConstants.SIGNATURE_WITH_KERBEROS_TOKEN.equals(action)) {
if (securityProperties.getCallbackHandler() == null) {
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSInboundSecurityContext.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSInboundSecurityContext.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSInboundSecurityContext.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSInboundSecurityContext.java Tue Aug 6 10:20:00 2013
@@ -29,7 +29,7 @@ import java.util.List;
*/
public interface WSInboundSecurityContext extends InboundSecurityContext {
- public void handleBSPRule(BSPRule bspRule) throws WSSecurityException;
+ void handleBSPRule(BSPRule bspRule) throws WSSecurityException;
- public void ignoredBSPRules(List<BSPRule> bspRules);
+ void ignoredBSPRules(List<BSPRule> bspRules);
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSCrypto.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSCrypto.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSCrypto.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSCrypto.java Tue Aug 6 10:20:00 2013
@@ -35,7 +35,7 @@ class WSSCrypto {
protected static final transient org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(WSSCrypto.class);
- private Class<? extends Merlin> cryptoClass = org.apache.wss4j.common.crypto.Merlin.class;
+ private Class<? extends Merlin> cryptoClass = Merlin.class;
private Properties cryptoProperties;
private Crypto cachedCrypto;
private KeyStore cachedKeyStore;
@@ -44,7 +44,7 @@ class WSSCrypto {
public Crypto getCrypto() throws WSSConfigurationException {
- if ((keyStore == cachedKeyStore) && cachedCrypto != null) {
+ if (keyStore == cachedKeyStore && cachedCrypto != null) {
return cachedCrypto;
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java Tue Aug 6 10:20:00 2013
@@ -348,7 +348,7 @@ public class WSSSecurityProperties exten
if (signatureWSSCrypto != null) {
return signatureWSSCrypto.getCryptoClass();
}
- return org.apache.wss4j.common.crypto.Merlin.class;
+ return Merlin.class;
}
public void setSignatureCryptoClass(Class<? extends Merlin> signatureCryptoClass) {
@@ -417,7 +417,7 @@ public class WSSSecurityProperties exten
if (signatureVerificationWSSCrypto != null) {
return signatureVerificationWSSCrypto.getCryptoClass();
}
- return org.apache.wss4j.common.crypto.Merlin.class;
+ return Merlin.class;
}
public void setSignatureVerificationCryptoClass(Class<? extends Merlin> signatureVerificationCryptoClass) {
@@ -495,7 +495,7 @@ public class WSSSecurityProperties exten
if (decryptionWSSCrypto != null) {
return decryptionWSSCrypto.getCryptoClass();
}
- return org.apache.wss4j.common.crypto.Merlin.class;
+ return Merlin.class;
}
/**
@@ -583,7 +583,7 @@ public class WSSSecurityProperties exten
if (encryptionWSSCrypto != null) {
return encryptionWSSCrypto.getCryptoClass();
}
- return org.apache.wss4j.common.crypto.Merlin.class;
+ return Merlin.class;
}
/**
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java Tue Aug 6 10:20:00 2013
@@ -147,8 +147,8 @@ public class WSSUtils extends XMLSecurit
public static boolean isInSOAPHeader(List<QName> elementPath) {
if (elementPath.size() > 1) {
final QName secondLevelElementName = elementPath.get(1);
- return (WSSConstants.TAG_soap_Header_LocalName.equals(secondLevelElementName.getLocalPart())
- && elementPath.get(0).getNamespaceURI().equals(secondLevelElementName.getNamespaceURI()));
+ return WSSConstants.TAG_soap_Header_LocalName.equals(secondLevelElementName.getLocalPart())
+ && elementPath.get(0).getNamespaceURI().equals(secondLevelElementName.getNamespaceURI());
}
return false;
}
@@ -161,8 +161,8 @@ public class WSSUtils extends XMLSecurit
public static boolean isInSOAPBody(List<QName> elementPath) {
if (elementPath.size() > 1) {
final QName secondLevelElementName = elementPath.get(1);
- return (WSSConstants.TAG_soap_Body_LocalName.equals(secondLevelElementName.getLocalPart())
- && elementPath.get(0).getNamespaceURI().equals(secondLevelElementName.getNamespaceURI()));
+ return WSSConstants.TAG_soap_Body_LocalName.equals(secondLevelElementName.getLocalPart())
+ && elementPath.get(0).getNamespaceURI().equals(secondLevelElementName.getNamespaceURI());
}
return false;
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java Tue Aug 6 10:20:00 2013
@@ -75,7 +75,7 @@ public class InboundWSSecurityContextImp
if (operationSecurityEventOccured) {
if (!this.messageEncryptionTokenOccured
- && (securityEvent instanceof TokenSecurityEvent)) {
+ && securityEvent instanceof TokenSecurityEvent) {
@SuppressWarnings("unchecked")
TokenSecurityEvent<? extends InboundSecurityToken> tokenSecurityEvent =
((TokenSecurityEvent<? extends InboundSecurityToken>) securityEvent);
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java Tue Aug 6 10:20:00 2013
@@ -84,11 +84,11 @@ public class WSSSignatureReferenceVerify
&& !WSSConstants.SWA_ATTACHMENT_CONTENT_SIG_TRANS.equals(algorithm)
&& !WSSConstants.SWA_ATTACHMENT_COMPLETE_SIG_TRANS.equals(algorithm)) {
securityContext.handleBSPRule(BSPRule.R5423);
- if ((j == transformTypes.size() - 1) &&
- (!WSSConstants.NS_C14N_EXCL.equals(algorithm)
+ if (j == transformTypes.size() - 1 &&
+ !WSSConstants.NS_C14N_EXCL.equals(algorithm)
&& !WSSConstants.SOAPMESSAGE_NS10_STRTransform.equals(algorithm)
&& !WSSConstants.SWA_ATTACHMENT_CONTENT_SIG_TRANS.equals(algorithm)
- && !WSSConstants.SWA_ATTACHMENT_COMPLETE_SIG_TRANS.equals(algorithm))) {
+ && !WSSConstants.SWA_ATTACHMENT_COMPLETE_SIG_TRANS.equals(algorithm)) {
securityContext.handleBSPRule(BSPRule.R5412);
}
InclusiveNamespaces inclusiveNamespacesType = XMLSecurityUtils.getQNameType(transformType.getContent(), XMLSecurityConstants.TAG_c14nExcl_InclusiveNamespaces);
@@ -140,8 +140,8 @@ public class WSSSignatureReferenceVerify
throws XMLSecurityException {
//fire a SecurityEvent:
final DocumentContext documentContext = inputProcessorChain.getDocumentContext();
- if ((elementPath.size() == 3 && WSSUtils.isInSOAPHeader(elementPath))
- || (elementPath.size() == 2 && WSSUtils.isInSOAPBody(elementPath))) {
+ if (elementPath.size() == 3 && WSSUtils.isInSOAPHeader(elementPath)
+ || elementPath.size() == 2 && WSSUtils.isInSOAPBody(elementPath)) {
SignedPartSecurityEvent signedPartSecurityEvent =
new SignedPartSecurityEvent(getInboundSecurityToken(), true, documentContext.getProtectionOrder());
signedPartSecurityEvent.setElementPath(elementPath);
@@ -185,7 +185,7 @@ public class WSSSignatureReferenceVerify
Date rightNow = new Date();
long currentTime = rightNow.getTime();
long expiresTime = expiresCal.getTimeInMillis();
- replayCache.add(cacheKey, ((expiresTime - currentTime) / 1000L));
+ replayCache.add(cacheKey, (expiresTime - currentTime) / 1000L);
} else {
replayCache.add(cacheKey);
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java Tue Aug 6 10:20:00 2013
@@ -84,7 +84,8 @@ public class DerivedKeyTokenOutputProces
byte[] label;
try {
- label = (WSSConstants.WS_SecureConversation_DEFAULT_LABEL + WSSConstants.WS_SecureConversation_DEFAULT_LABEL).getBytes("UTF-8");
+ String defaultLabel = WSSConstants.WS_SecureConversation_DEFAULT_LABEL + WSSConstants.WS_SecureConversation_DEFAULT_LABEL;
+ label = defaultLabel.getBytes("UTF-8");
} catch (UnsupportedEncodingException e) {
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "empty", "UTF-8 encoding is not supported", e);
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java Tue Aug 6 10:20:00 2013
@@ -75,7 +75,7 @@ public class UsernameTokenOutputProcesso
}
byte[] nonceValue = null;
- if ((usernameTokenPasswordType == WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST)
+ if (usernameTokenPasswordType == WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST
|| ((WSSSecurityProperties) getSecurityProperties()).isAddUsernameTokenNonce()) {
nonceValue = new byte[16];
WSSConstants.secureRandom.nextBytes(nonceValue);
@@ -83,7 +83,7 @@ public class UsernameTokenOutputProcesso
XMLGregorianCalendar created = null;
String createdStr = "";
- if ((usernameTokenPasswordType == WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST)
+ if (usernameTokenPasswordType == WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST
|| ((WSSSecurityProperties) getSecurityProperties()).isAddUsernameTokenCreated()) {
created = WSSConstants.datatypeFactory.newXMLGregorianCalendar(new GregorianCalendar());
createdStr = created.toXMLFormat();
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java Tue Aug 6 10:20:00 2013
@@ -99,7 +99,7 @@ public class WSSSignatureEndingOutputPro
if (WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference.equals(keyIdentifier) && !useSingleCertificate) {
attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_X509PKIPathv1));
} else if (WSSecurityTokenConstants.KeyIdentifier_EncryptedKeySha1Identifier.equals(keyIdentifier)
- || (WSSecurityTokenConstants.KeyIdentifier_EncryptedKey.equals(keyIdentifier))) {
+ || WSSecurityTokenConstants.KeyIdentifier_EncryptedKey.equals(keyIdentifier)) {
attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_WSS_ENC_KEY_VALUE_TYPE));
} else if (WSSecurityTokenConstants.Saml10Token.equals(securityToken.getTokenType())
|| WSSecurityTokenConstants.Saml11Token.equals(securityToken.getTokenType())) {
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SecurityTokenImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SecurityTokenImpl.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SecurityTokenImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SecurityTokenImpl.java Tue Aug 6 10:20:00 2013
@@ -141,8 +141,7 @@ public abstract class X509SecurityTokenI
*/
protected boolean
matches(
- final java.security.cert.X509Certificate cert,
- final Collection<Pattern> subjectDNPatterns
+ final X509Certificate cert, final Collection<Pattern> subjectDNPatterns
) {
if (subjectDNPatterns.isEmpty()) {
LOG.warn("No Subject DN Certificate Constraints were defined. This could be a security issue");
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/KerberosServiceSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/KerberosServiceSecurityToken.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/KerberosServiceSecurityToken.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/KerberosServiceSecurityToken.java Tue Aug 6 10:20:00 2013
@@ -20,7 +20,7 @@ package org.apache.wss4j.stax.securityTo
public interface KerberosServiceSecurityToken extends SubjectAndPrincipalSecurityToken {
- public byte[] getBinaryContent();
+ byte[] getBinaryContent();
- public String getKerberosTokenValueType();
+ String getKerberosTokenValueType();
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/SecurityTokenReference.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/SecurityTokenReference.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/SecurityTokenReference.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/SecurityTokenReference.java Tue Aug 6 10:20:00 2013
@@ -25,5 +25,5 @@ import java.util.Deque;
public interface SecurityTokenReference extends SecurityToken {
- public Deque<XMLSecEvent> getXmlSecEvents();
+ Deque<XMLSecEvent> getXmlSecEvents();
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/SubjectAndPrincipalSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/SubjectAndPrincipalSecurityToken.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/SubjectAndPrincipalSecurityToken.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/SubjectAndPrincipalSecurityToken.java Tue Aug 6 10:20:00 2013
@@ -26,7 +26,7 @@ import java.security.Principal;
public interface SubjectAndPrincipalSecurityToken extends SecurityToken {
- public Subject getSubject() throws WSSecurityException;
+ Subject getSubject() throws WSSecurityException;
- public Principal getPrincipal() throws WSSecurityException;
+ Principal getPrincipal() throws WSSecurityException;
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidator.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidator.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidator.java Tue Aug 6 10:20:00 2013
@@ -25,7 +25,7 @@ import org.apache.xml.security.stax.secu
public interface SamlTokenValidator extends SignatureTokenValidator {
- public <T extends SamlSecurityToken & InboundSecurityToken> T validate(
+ <T extends SamlSecurityToken & InboundSecurityToken> T validate(
SamlAssertionWrapper samlAssertionWrapper, InboundSecurityToken subjectSecurityToken,
TokenContext tokenContext) throws WSSecurityException;
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidatorImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidatorImpl.java?rev=1510895&r1=1510894&r2=1510895&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidatorImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidatorImpl.java Tue Aug 6 10:20:00 2013
@@ -114,9 +114,9 @@ public class UsernameTokenValidatorImpl
}
verifyDigestPassword(username.getValue(), passwordType, nonceVal, created, tokenContext);
- } else if ((usernameTokenPasswordType == WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT)
- || (passwordType != null && passwordType.getValue() != null
- && usernameTokenPasswordType == WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE)) {
+ } else if (usernameTokenPasswordType == WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT
+ || passwordType != null && passwordType.getValue() != null
+ && usernameTokenPasswordType == WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE) {
verifyPlaintextPassword(username.getValue(), passwordType, tokenContext);
} else if (passwordType != null && passwordType.getValue() != null) {