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/07/19 11:40:32 UTC
[ws-wss4j] branch master updated: Removing useless parameter in UsernameToken
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
The following commit(s) were added to refs/heads/master by this push:
new 594c485ea Removing useless parameter in UsernameToken
594c485ea is described below
commit 594c485eaa8ecfcdefff207ed5292164f1347e82
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jul 19 12:08:31 2022 +0100
Removing useless parameter in UsernameToken
---
.../dom/action/UsernameTokenSignedAction.java | 4 ++--
.../wss4j/dom/message/WSSecUsernameToken.java | 7 ++----
.../wss4j/dom/message/token/UsernameToken.java | 2 +-
.../apache/wss4j/dom/message/UTDerivedKeyTest.java | 26 +++++++++++-----------
.../apache/wss4j/dom/message/UTSignatureTest.java | 4 ++--
5 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java
index 3c5a1b37e..1fce13992 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java
@@ -68,12 +68,12 @@ public class UsernameTokenSignedAction implements Action {
builder.setExpandXopInclude(reqData.isExpandXopInclude());
int iterations = reqData.getDerivedKeyIterations();
- boolean useMac = reqData.isUseDerivedKeyForMAC();
- builder.addDerivedKey(useMac, iterations);
+ builder.addDerivedKey(iterations);
builder.setUserInfo(reqData.getUsername(), passwordCallback.getPassword());
builder.addCreated();
builder.addNonce();
+ boolean useMac = reqData.isUseDerivedKeyForMAC();
byte[] salt = UsernameTokenUtil.generateSalt(useMac);
builder.prepare(salt);
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecUsernameToken.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecUsernameToken.java
index c6fe2edfe..f0d6562ef 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecUsernameToken.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecUsernameToken.java
@@ -44,7 +44,6 @@ public class WSSecUsernameToken extends WSSecBase {
private boolean nonce;
private boolean created;
private boolean useDerivedKey;
- private boolean useMac;
private int iteration = UsernameToken.DEFAULT_ITERATION;
private boolean passwordsAreEncoded;
private boolean precisionInMilliSeconds = true;
@@ -88,13 +87,11 @@ public class WSSecUsernameToken extends WSSecBase {
/**
* Add a derived key to the UsernameToken
- * @param useMac whether the derived key is to be used for a MAC or not
* @param iteration The number of iterations to use in deriving a key
*/
- public void addDerivedKey(boolean useMac, int iteration) {
+ public void addDerivedKey(int iteration) {
passwordType = null;
useDerivedKey = true;
- this.useMac = useMac;
if (iteration > 0) {
this.iteration = iteration;
}
@@ -171,7 +168,7 @@ public class WSSecUsernameToken extends WSSecBase {
ut.setPasswordsAreEncoded(passwordsAreEncoded);
ut.setName(user);
if (useDerivedKey) {
- ut.addSalt(getDocument(), saltValue, useMac);
+ ut.addSalt(getDocument(), saltValue);
ut.addIteration(getDocument(), iteration);
} else {
ut.setPassword(password);
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java
index 165afefe3..1a51a9150 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java
@@ -332,7 +332,7 @@ public class UsernameToken {
* @param mac If <code>true</code> then an optionally generated value is
* usable for a MAC
*/
- public void addSalt(Document doc, byte[] saltValue, boolean mac) {
+ public void addSalt(Document doc, byte[] saltValue) {
elementSalt =
doc.createElementNS(
WSConstants.WSSE11_NS, WSConstants.WSSE11_PREFIX + ":" + WSConstants.SALT_LN
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java
index 7ab706cc4..c80d98951 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java
@@ -81,7 +81,7 @@ public class UTDerivedKeyTest {
usernameToken.setName("bob");
byte[] salt = UsernameTokenUtil.generateSalt(false);
- usernameToken.addSalt(doc, salt, false);
+ usernameToken.addSalt(doc, salt);
assertTrue(salt.length == 16);
assertTrue(salt[0] == 0x02);
byte[] utSalt = usernameToken.getSalt();
@@ -140,7 +140,7 @@ public class UTDerivedKeyTest {
WSSecUsernameToken builder = new WSSecUsernameToken(secHeader);
builder.setUserInfo("bob", "security");
- builder.addDerivedKey(false, 1000);
+ builder.addDerivedKey(1000);
byte[] salt = UsernameTokenUtil.generateSalt(false);
builder.prepare(salt);
@@ -194,7 +194,7 @@ public class UTDerivedKeyTest {
builder.setPasswordsAreEncoded(true);
byte[] bytes = MessageDigest.getInstance("SHA-1").digest("security".getBytes(StandardCharsets.UTF_8));
builder.setUserInfo("bob", org.apache.xml.security.utils.XMLUtils.encodeToString(bytes));
- builder.addDerivedKey(false, 1000);
+ builder.addDerivedKey(1000);
byte[] salt = UsernameTokenUtil.generateSalt(false);
builder.prepare(salt);
@@ -245,7 +245,7 @@ public class UTDerivedKeyTest {
WSSecUsernameToken builder = new WSSecUsernameToken(secHeader);
builder.setUserInfo("bob", "security");
- builder.addDerivedKey(false, 1000);
+ builder.addDerivedKey(1000);
byte[] salt = UsernameTokenUtil.generateSalt(false);
builder.prepare(salt);
@@ -298,7 +298,7 @@ public class UTDerivedKeyTest {
WSSecUsernameToken builder = new WSSecUsernameToken(secHeader);
builder.setUserInfo("colm", "security");
- builder.addDerivedKey(false, 1000);
+ builder.addDerivedKey(1000);
byte[] salt = UsernameTokenUtil.generateSalt(false);
builder.prepare(salt);
@@ -348,7 +348,7 @@ public class UTDerivedKeyTest {
WSSecUsernameToken builder = new WSSecUsernameToken(secHeader);
builder.setUserInfo("bob", "security");
- builder.addDerivedKey(true, 1000);
+ builder.addDerivedKey(1000);
byte[] salt = UsernameTokenUtil.generateSalt(true);
builder.prepare(salt);
@@ -400,7 +400,7 @@ public class UTDerivedKeyTest {
builder.setPasswordsAreEncoded(true);
byte[] bytes = MessageDigest.getInstance("SHA-1").digest("security".getBytes(StandardCharsets.UTF_8));
builder.setUserInfo("bob", org.apache.xml.security.utils.XMLUtils.encodeToString(bytes));
- builder.addDerivedKey(true, 1000);
+ builder.addDerivedKey(1000);
byte[] salt = UsernameTokenUtil.generateSalt(true);
builder.prepare(salt);
@@ -459,7 +459,7 @@ public class UTDerivedKeyTest {
WSSecUsernameToken builder = new WSSecUsernameToken(secHeader);
builder.setUserInfo("bob", "security");
- builder.addDerivedKey(true, 1000);
+ builder.addDerivedKey(1000);
byte[] salt = UsernameTokenUtil.generateSalt(true);
builder.prepare(salt);
@@ -510,7 +510,7 @@ public class UTDerivedKeyTest {
WSSecUsernameToken builder = new WSSecUsernameToken(secHeader);
builder.setUserInfo("colm", "security");
- builder.addDerivedKey(true, 1000);
+ builder.addDerivedKey(1000);
byte[] salt = UsernameTokenUtil.generateSalt(true);
builder.prepare(salt);
@@ -611,7 +611,7 @@ public class UTDerivedKeyTest {
usernameToken.setID(config.getIdAllocator().createId("UsernameToken-", usernameToken));
byte[] salt = UsernameTokenUtil.generateSalt(false);
- usernameToken.addSalt(doc, salt, false);
+ usernameToken.addSalt(doc, salt);
byte[] derivedKey = UsernameTokenUtil.generateDerivedKey("security", salt, 1000);
//
@@ -662,7 +662,7 @@ public class UTDerivedKeyTest {
usernameToken.addIteration(doc, 500);
byte[] salt = UsernameTokenUtil.generateSalt(false);
- usernameToken.addSalt(doc, salt, false);
+ usernameToken.addSalt(doc, salt);
byte[] derivedKey = UsernameTokenUtil.generateDerivedKey("security", salt, 500);
//
@@ -720,7 +720,7 @@ public class UTDerivedKeyTest {
WSSecUsernameToken builder = new WSSecUsernameToken(secHeader);
builder.setUserInfo("bob", "security");
- builder.addDerivedKey(false, 1000);
+ builder.addDerivedKey(1000);
byte[] salt = UsernameTokenUtil.generateSalt(false);
builder.prepare(salt);
@@ -784,7 +784,7 @@ public class UTDerivedKeyTest {
WSSecUsernameToken builder = new WSSecUsernameToken(secHeader);
builder.setUserInfo("bob", "security");
- builder.addDerivedKey(false, 1000);
+ builder.addDerivedKey(1000);
byte[] salt = UsernameTokenUtil.generateSalt(false);
builder.prepare(salt);
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java
index 123e6cb8a..d70c0098d 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java
@@ -77,7 +77,7 @@ public class UTSignatureTest {
WSSecUsernameToken builder = new WSSecUsernameToken(secHeader);
builder.setUserInfo("bob", "security");
- builder.addDerivedKey(true, 1000);
+ builder.addDerivedKey(1000);
byte[] salt = UsernameTokenUtil.generateSalt(true);
builder.prepare(salt);
@@ -129,7 +129,7 @@ public class UTSignatureTest {
WSSecUsernameToken builder = new WSSecUsernameToken(secHeader);
builder.setUserInfo("colm", "security");
- builder.addDerivedKey(true, 1000);
+ builder.addDerivedKey(1000);
byte[] salt = UsernameTokenUtil.generateSalt(true);
builder.prepare(salt);