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 2022/06/14 07:03:11 UTC
[ws-wss4j] 01/06: Finishing PMD migration
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/ws-wss4j.git
commit 1bc3b45fbf591ce4c656d3f46d2edf683b479fdf
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jun 14 07:48:07 2022 +0100
Finishing PMD migration
---
pom.xml | 4 ++--
.../stax/assertionStates/KerberosTokenAssertionState.java | 2 +-
.../stax/assertionStates/ProtectionOrderAssertionState.java | 4 ++--
.../policy/stax/assertionStates/TokenAssertionState.java | 12 ++++--------
.../stax/assertionStates/TokenProtectionAssertionState.java | 6 +-----
.../stax/assertionStates/UsernameTokenAssertionState.java | 4 ++--
6 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2ba961416..87ec827d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.7</version>
+ <version>3.16.0</version>
<configuration>
<rulesets>
<ruleset>${buildtools.dir}/wss4j-pmd-ruleset.xml</ruleset>
@@ -139,7 +139,7 @@
<failOnViolation>true</failOnViolation>
<linkXRef>false</linkXRef>
<verbose>true</verbose>
- <includeTests>true</includeTests>
+ <includeTests>false</includeTests>
<!-- TODO <targetJdk>${targetJdk}</targetJdk>-->
<targetJdk>1.8</targetJdk>
<excludeRoots>
diff --git a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/KerberosTokenAssertionState.java b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/KerberosTokenAssertionState.java
index 3a7ca1b25..1ab21c82b 100644
--- a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/KerberosTokenAssertionState.java
+++ b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/KerberosTokenAssertionState.java
@@ -96,7 +96,7 @@ public class KerberosTokenAssertionState extends TokenAssertionState {
}
}
if (kerberosToken.getApReqTokenType() != null) {
- switch (kerberosToken.getApReqTokenType()) {
+ switch (kerberosToken.getApReqTokenType()) { //NOPMD
case WssKerberosV5ApReqToken11:
if (!kerberosTokenSecurityEvent.isKerberosV5ApReqToken11()) {
setErrorMessage("Policy enforces " + kerberosToken.getApReqTokenType());
diff --git a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/ProtectionOrderAssertionState.java b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/ProtectionOrderAssertionState.java
index 4688e508a..3e4a718ca 100644
--- a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/ProtectionOrderAssertionState.java
+++ b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/ProtectionOrderAssertionState.java
@@ -60,7 +60,7 @@ public class ProtectionOrderAssertionState extends AssertionState implements Ass
String namespace = getAssertion().getName().getNamespaceURI();
AbstractSymmetricAsymmetricBinding.ProtectionOrder protectionOrder =
((AbstractSymmetricAsymmetricBinding) getAssertion()).getProtectionOrder();
- switch (protectionOrder) {
+ switch (protectionOrder) { //NOPMD
case SignBeforeEncrypting:
policyAsserter.assertPolicy(new QName(namespace, SPConstants.SIGN_BEFORE_ENCRYPTING));
break;
@@ -131,7 +131,7 @@ public class ProtectionOrderAssertionState extends AssertionState implements Ass
List<XMLSecurityConstants.ContentType> contentTypes, List<QName> elementPath) {
String namespace = getAssertion().getName().getNamespaceURI();
- switch (protectionOrder) {
+ switch (protectionOrder) { //NOPMD
case SignBeforeEncrypting:
int lastSignature = contentTypes.lastIndexOf(XMLSecurityConstants.ContentType.SIGNATURE);
int firstEncryption = contentTypes.indexOf(XMLSecurityConstants.ContentType.ENCRYPTION);
diff --git a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenAssertionState.java b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenAssertionState.java
index d1044e841..95aa96f94 100644
--- a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenAssertionState.java
+++ b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenAssertionState.java
@@ -246,14 +246,10 @@ public abstract class TokenAssertionState extends AssertionState implements Asse
if (asserted) {
setAsserted(true);
}
- if (!asserted && (tokenUsages.contains(WSSecurityTokenConstants.TOKENUSAGE_MAIN_SIGNATURE)
- || tokenUsages.contains(WSSecurityTokenConstants.TOKENUSAGE_MAIN_ENCRYPTION))) {
- //return false if not asserted for the main signature and encryption tokens
- return false;
- } else {
- //always return true for supporting tokens.
- return true;
- }
+ //return false if not asserted for the main signature and encryption tokens
+ //always return true for supporting tokens.
+ return !(!asserted && (tokenUsages.contains(WSSecurityTokenConstants.TOKENUSAGE_MAIN_SIGNATURE)
+ || tokenUsages.contains(WSSecurityTokenConstants.TOKENUSAGE_MAIN_ENCRYPTION)));
}
public abstract boolean assertToken(TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent,
diff --git a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenProtectionAssertionState.java b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenProtectionAssertionState.java
index 197c6f9db..7c5598797 100644
--- a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenProtectionAssertionState.java
+++ b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenProtectionAssertionState.java
@@ -289,11 +289,7 @@ public class TokenProtectionAssertionState extends AssertionState implements Ass
}
}
}
- if (signedSupportingTokens.size() > signedElements.size()) {
- return false;
- }
-
- return true;
+ return signedSupportingTokens.size() <= signedElements.size();
}
private SecurityToken getEffectiveSignatureToken(SecurityToken securityToken) throws XMLSecurityException {
diff --git a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/UsernameTokenAssertionState.java b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/UsernameTokenAssertionState.java
index ac9bc1507..9bc965445 100644
--- a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/UsernameTokenAssertionState.java
+++ b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/UsernameTokenAssertionState.java
@@ -85,7 +85,7 @@ public class UsernameTokenAssertionState extends TokenAssertionState {
String namespace = getAssertion().getName().getNamespaceURI();
if (usernameToken.getPasswordType() != null) {
- switch (usernameToken.getPasswordType()) {
+ switch (usernameToken.getPasswordType()) { //NOPMD
case NoPassword:
if (usernameTokenSecurityEvent.getUsernameTokenPasswordType()
!= WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE) {
@@ -141,7 +141,7 @@ public class UsernameTokenAssertionState extends TokenAssertionState {
}
if (usernameToken.getUsernameTokenType() != null) {
- switch (usernameToken.getUsernameTokenType()) {
+ switch (usernameToken.getUsernameTokenType()) { //NOPMD
case WssUsernameToken10:
if (usernameTokenSecurityEvent.getUsernameTokenProfile() != null
&& usernameTokenSecurityEvent.getUsernameTokenProfile().equals(WSSConstants.NS_USERNAMETOKEN_PROFILE11)) {