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/20 07:08:56 UTC
[ws-wss4j] branch master updated (7a9ce441e -> 1ab1b6450)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
from 7a9ce441e Removing unused parameters
new 73339c49b Fixing bug with not passing initiator boolean
new 1ab1b6450 More work on removing unused parameters
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/wss4j/common/saml/SAMLUtil.java | 15 +++++----------
.../apache/wss4j/common/saml/SamlAssertionWrapper.java | 11 +++--------
.../apache/wss4j/dom/processor/SAMLTokenProcessor.java | 3 +--
.../org/apache/wss4j/dom/saml/WSSecSignatureSAML.java | 3 +--
.../apache/wss4j/dom/str/DerivedKeyTokenSTRParser.java | 3 +--
.../org/apache/wss4j/dom/str/EncryptedKeySTRParser.java | 5 ++---
.../apache/wss4j/dom/str/SecurityTokenRefSTRParser.java | 3 +--
.../java/org/apache/wss4j/dom/str/SignatureSTRParser.java | 6 ++----
.../processor/output/DerivedKeyTokenOutputProcessor.java | 3 +--
.../securityToken/EncryptedKeySha1SecurityTokenImpl.java | 2 +-
.../stax/impl/securityToken/SamlSecurityTokenImpl.java | 3 +--
.../src/main/java/org/apache/wss4j/stax/setup/WSSec.java | 2 +-
.../main/java/org/apache/wss4j/stax/utils/WSSUtils.java | 2 +-
.../stax/validate/SecurityContextTokenValidatorImpl.java | 2 +-
14 files changed, 22 insertions(+), 41 deletions(-)
[ws-wss4j] 02/02: More work on removing unused parameters
Posted by co...@apache.org.
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 1ab1b645010d8b44fd7f9f83ae277f3f3c14bd85
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jul 20 08:08:39 2022 +0100
More work on removing unused parameters
---
.../main/java/org/apache/wss4j/common/saml/SAMLUtil.java | 15 +++++----------
.../apache/wss4j/common/saml/SamlAssertionWrapper.java | 11 +++--------
.../apache/wss4j/dom/processor/SAMLTokenProcessor.java | 3 +--
.../org/apache/wss4j/dom/saml/WSSecSignatureSAML.java | 3 +--
.../apache/wss4j/dom/str/DerivedKeyTokenSTRParser.java | 3 +--
.../org/apache/wss4j/dom/str/EncryptedKeySTRParser.java | 5 ++---
.../apache/wss4j/dom/str/SecurityTokenRefSTRParser.java | 3 +--
.../java/org/apache/wss4j/dom/str/SignatureSTRParser.java | 6 ++----
.../processor/output/DerivedKeyTokenOutputProcessor.java | 3 +--
.../securityToken/EncryptedKeySha1SecurityTokenImpl.java | 2 +-
.../stax/impl/securityToken/SamlSecurityTokenImpl.java | 3 +--
.../main/java/org/apache/wss4j/stax/utils/WSSUtils.java | 2 +-
.../stax/validate/SecurityContextTokenValidatorImpl.java | 2 +-
13 files changed, 21 insertions(+), 40 deletions(-)
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java b/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java
index 66a7d71ae..09a681550 100644
--- a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java
@@ -76,16 +76,15 @@ public final class SAMLUtil {
public static SAMLKeyInfo getCredentialFromSubject(
SamlAssertionWrapper samlAssertion,
SAMLKeyInfoProcessor keyInfoProcessor,
- Crypto sigCrypto,
- CallbackHandler callbackHandler
+ Crypto sigCrypto
) throws WSSecurityException {
if (samlAssertion.getSaml1() != null) {
return getCredentialFromSubject(
- samlAssertion.getSaml1(), keyInfoProcessor, sigCrypto, callbackHandler
+ samlAssertion.getSaml1(), keyInfoProcessor, sigCrypto
);
} else if (samlAssertion.getSaml2() != null) {
return getCredentialFromSubject(
- samlAssertion.getSaml2(), keyInfoProcessor, sigCrypto, callbackHandler
+ samlAssertion.getSaml2(), keyInfoProcessor, sigCrypto
);
}
@@ -99,15 +98,13 @@ public final class SAMLUtil {
* @param assertion The SAML 1.1 assertion
* @param keyInfoProcessor A pluggable way to parse the KeyInfo
* @param sigCrypto A Crypto instance
- * @param callbackHandler A CallbackHandler instance
* @return The SAMLKeyInfo object obtained from the Subject
* @throws WSSecurityException
*/
public static SAMLKeyInfo getCredentialFromSubject(
org.opensaml.saml.saml1.core.Assertion assertion,
SAMLKeyInfoProcessor keyInfoProcessor,
- Crypto sigCrypto,
- CallbackHandler callbackHandler
+ Crypto sigCrypto
) throws WSSecurityException {
for (org.opensaml.saml.saml1.core.Statement stmt : assertion.getStatements()) {
org.opensaml.saml.saml1.core.Subject samlSubject = null;
@@ -146,15 +143,13 @@ public final class SAMLUtil {
* @param assertion The SAML 2 assertion
* @param keyInfoProcessor A pluggable way to parse the KeyInfo
* @param sigCrypto A Crypto instance
- * @param callbackHandler A CallbackHandler instance
* @return The SAMLKeyInfo object obtained from the Subject
* @throws WSSecurityException
*/
public static SAMLKeyInfo getCredentialFromSubject(
org.opensaml.saml.saml2.core.Assertion assertion,
SAMLKeyInfoProcessor keyInfoProcessor,
- Crypto sigCrypto,
- CallbackHandler callbackHandler
+ Crypto sigCrypto
) throws WSSecurityException {
org.opensaml.saml.saml2.core.Subject samlSubject = assertion.getSubject();
if (samlSubject != null) {
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java b/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
index 32e2fe635..e158570bb 100644
--- a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
@@ -25,8 +25,6 @@ import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
-import javax.security.auth.callback.CallbackHandler;
-
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoType;
import org.apache.wss4j.common.ext.WSSecurityException;
@@ -670,20 +668,17 @@ public class SamlAssertionWrapper {
*/
public void parseSubject(
SAMLKeyInfoProcessor keyInfoProcessor,
- Crypto sigCrypto,
- CallbackHandler callbackHandler
+ Crypto sigCrypto
) throws WSSecurityException {
if (samlVersion == SAMLVersion.VERSION_11) {
subjectKeyInfo =
SAMLUtil.getCredentialFromSubject(
- (org.opensaml.saml.saml1.core.Assertion)samlObject, keyInfoProcessor,
- sigCrypto, callbackHandler
+ (org.opensaml.saml.saml1.core.Assertion)samlObject, keyInfoProcessor, sigCrypto
);
} else if (samlVersion == SAMLVersion.VERSION_20) {
subjectKeyInfo =
SAMLUtil.getCredentialFromSubject(
- (org.opensaml.saml.saml2.core.Assertion)samlObject, keyInfoProcessor,
- sigCrypto, callbackHandler
+ (org.opensaml.saml.saml2.core.Assertion)samlObject, keyInfoProcessor, sigCrypto
);
}
}
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
index e8f392f2f..491c655d9 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
@@ -159,8 +159,7 @@ public class SAMLTokenProcessor implements Processor {
) throws WSSecurityException {
// Parse the subject if it exists
samlAssertion.parseSubject(
- new WSSSAMLKeyInfoProcessor(data), data.getSigVerCrypto(),
- data.getCallbackHandler()
+ new WSSSAMLKeyInfoProcessor(data), data.getSigVerCrypto()
);
// Now delegate the rest of the verification to the Validator
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
index d110fcc05..3ed8061e2 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
@@ -243,8 +243,7 @@ public class WSSecSignatureSAML extends WSSecSignature {
actionToken.setCrypto(userCrypto);
SAMLKeyInfo samlKeyInfo =
SAMLUtil.getCredentialFromSubject(
- samlAssertion, new WSSSAMLKeyInfoProcessor(data),
- userCrypto, data.getCallbackHandler()
+ samlAssertion, new WSSSAMLKeyInfoProcessor(data), userCrypto
);
if (samlKeyInfo != null) {
publicKey = samlKeyInfo.getPublicKey();
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/DerivedKeyTokenSTRParser.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/DerivedKeyTokenSTRParser.java
index 475aa6c69..2893a8785 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/DerivedKeyTokenSTRParser.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/DerivedKeyTokenSTRParser.java
@@ -110,8 +110,7 @@ public class DerivedKeyTokenSTRParser implements STRParser {
STRParserUtil.checkSamlTokenBSPCompliance(secRef, samlAssertion, data.getBSPEnforcer());
SAMLKeyInfo keyInfo =
- SAMLUtil.getCredentialFromSubject(samlAssertion, new WSSSAMLKeyInfoProcessor(data),
- data.getSigVerCrypto(), data.getCallbackHandler());
+ SAMLUtil.getCredentialFromSubject(samlAssertion, new WSSSAMLKeyInfoProcessor(data), data.getSigVerCrypto());
// TODO Handle malformed SAML tokens where they don't have the
// secret in them
byte[] secretKey = keyInfo.getSecret();
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java
index 5c062acd8..48f0d095e 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java
@@ -111,7 +111,7 @@ public class EncryptedKeySTRParser implements STRParser {
SAMLKeyInfo keyInfo =
SAMLUtil.getCredentialFromSubject(samlAssertion, new WSSSAMLKeyInfoProcessor(data),
- data.getSigVerCrypto(), data.getCallbackHandler());
+ data.getSigVerCrypto());
parserResult.setCerts(keyInfo.getCerts());
parserResult.setPublicKey(keyInfo.getPublicKey());
} else {
@@ -148,8 +148,7 @@ public class EncryptedKeySTRParser implements STRParser {
SAMLKeyInfo samlKi =
SAMLUtil.getCredentialFromSubject(samlAssertion,
- new WSSSAMLKeyInfoProcessor(data),
- data.getSigVerCrypto(), data.getCallbackHandler());
+ new WSSSAMLKeyInfoProcessor(data), data.getSigVerCrypto());
parserResult.setCerts(samlKi.getCerts());
parserResult.setPublicKey(samlKi.getPublicKey());
} else {
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java
index 8d71f58b2..a8d02ef9f 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java
@@ -96,8 +96,7 @@ public class SecurityTokenRefSTRParser implements STRParser {
) throws WSSecurityException {
STRParserUtil.checkSamlTokenBSPCompliance(secRef, samlAssertion, data.getBSPEnforcer());
SAMLKeyInfo samlKi =
- SAMLUtil.getCredentialFromSubject(samlAssertion, new WSSSAMLKeyInfoProcessor(data),
- data.getSigVerCrypto(), data.getCallbackHandler());
+ SAMLUtil.getCredentialFromSubject(samlAssertion, new WSSSAMLKeyInfoProcessor(data), data.getSigVerCrypto());
if (samlKi == null) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILED_CHECK, "invalidSAMLToken",
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java
index cceb00ec6..478556fac 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java
@@ -138,8 +138,7 @@ public class SignatureSTRParser implements STRParser {
SAMLKeyInfo samlKi =
SAMLUtil.getCredentialFromSubject(samlAssertion,
- new WSSSAMLKeyInfoProcessor(data),
- data.getSigVerCrypto(), data.getCallbackHandler());
+ new WSSSAMLKeyInfoProcessor(data), data.getSigVerCrypto());
X509Certificate[] foundCerts = samlKi.getCerts();
if (foundCerts != null && foundCerts.length > 0) {
parserResult.setCerts(new X509Certificate[]{foundCerts[0]});
@@ -381,8 +380,7 @@ public class SignatureSTRParser implements STRParser {
} else {
samlAssertion = new SamlAssertionWrapper(processedToken);
samlAssertion.parseSubject(
- new WSSSAMLKeyInfoProcessor(data),
- data.getSigVerCrypto(), data.getCallbackHandler()
+ new WSSSAMLKeyInfoProcessor(data), data.getSigVerCrypto()
);
}
STRParserUtil.checkSamlTokenBSPCompliance(secRef, samlAssertion, data.getBSPEnforcer());
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
index 94cbb1842..a0fe52dff 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
@@ -118,8 +118,7 @@ public class DerivedKeyTokenOutputProcessor extends AbstractOutputProcessor {
byte[] secret;
if (WSSecurityTokenConstants.SECURITY_CONTEXT_TOKEN.equals(wrappingSecurityToken.getTokenType())) {
WSPasswordCallback passwordCallback = new WSPasswordCallback(wsuIdDKT, WSPasswordCallback.SECRET_KEY);
- WSSUtils.doSecretKeyCallback(((WSSSecurityProperties)securityProperties).getCallbackHandler(),
- passwordCallback, wsuIdDKT);
+ WSSUtils.doSecretKeyCallback(((WSSSecurityProperties)securityProperties).getCallbackHandler(), passwordCallback);
if (passwordCallback.getKey() == null) {
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "noKey",
new Object[] {wsuIdDKT});
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/EncryptedKeySha1SecurityTokenImpl.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/EncryptedKeySha1SecurityTokenImpl.java
index d8b058d9a..c6b382831 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/EncryptedKeySha1SecurityTokenImpl.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/EncryptedKeySha1SecurityTokenImpl.java
@@ -67,7 +67,7 @@ public class EncryptedKeySha1SecurityTokenImpl
WSPasswordCallback secretKeyCallback =
new WSPasswordCallback(getSha1Identifier(), null,
WSSConstants.NS_ENCRYPTED_KEY_SHA1, WSPasswordCallback.SECRET_KEY);
- WSSUtils.doSecretKeyCallback(callbackHandler, secretKeyCallback, getSha1Identifier());
+ WSSUtils.doSecretKeyCallback(callbackHandler, secretKeyCallback);
if (secretKeyCallback.getKey() == null) {
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "noKey",
new Object[] {getSha1Identifier()});
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SamlSecurityTokenImpl.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SamlSecurityTokenImpl.java
index b4f9c51fc..a43ac6a1c 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SamlSecurityTokenImpl.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SamlSecurityTokenImpl.java
@@ -94,8 +94,7 @@ public class SamlSecurityTokenImpl extends AbstractInboundSecurityToken implemen
subjectKeyInfo =
SAMLUtil.getCredentialFromSubject(samlAssertionWrapper, null,
- securityProperties.getSignatureVerificationCrypto(),
- securityProperties.getCallbackHandler());
+ securityProperties.getSignatureVerificationCrypto());
} else {
// Possibly an Encrypted Assertion...we just need the key here
this.samlAssertionWrapper = null;
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java
index 0d82703f1..dc3e81a34 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java
@@ -100,7 +100,7 @@ public class WSSUtils extends XMLSecurityUtils {
* @param callbackHandler a CallbackHandler implementation
* @throws WSSecurityException
*/
- public static void doSecretKeyCallback(CallbackHandler callbackHandler, Callback callback, String id)
+ public static void doSecretKeyCallback(CallbackHandler callbackHandler, Callback callback)
throws WSSecurityException {
if (callbackHandler != null) {
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SecurityContextTokenValidatorImpl.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SecurityContextTokenValidatorImpl.java
index 25805df98..fba0b6a4a 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SecurityContextTokenValidatorImpl.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SecurityContextTokenValidatorImpl.java
@@ -61,7 +61,7 @@ public class SecurityContextTokenValidatorImpl implements SecurityContextTokenVa
WSPasswordCallback passwordCallback = new WSPasswordCallback(
identifier, WSPasswordCallback.SECURITY_CONTEXT_TOKEN);
WSSUtils.doSecretKeyCallback(
- tokenContext.getWssSecurityProperties().getCallbackHandler(), passwordCallback, null);
+ tokenContext.getWssSecurityProperties().getCallbackHandler(), passwordCallback);
if (passwordCallback.getKey() == null) {
throw new WSSecurityException(WSSecurityException.ErrorCode.SECURITY_TOKEN_UNAVAILABLE,
"noKey", new Object[] {securityContextTokenType.getId()});
[ws-wss4j] 01/02: Fixing bug with not passing initiator boolean
Posted by co...@apache.org.
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 73339c49b1aa8e9efeece02e8990ea31def2707a
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jul 20 08:08:27 2022 +0100
Fixing bug with not passing initiator boolean
---
ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/WSSec.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/WSSec.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/WSSec.java
index 3449cb819..29b98fb4b 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/WSSec.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/WSSec.java
@@ -135,7 +135,7 @@ public class WSSec {
*/
public static InboundWSSec getInboundWSSec(WSSSecurityProperties securityProperties,
boolean initiator) throws WSSecurityException {
- return getInboundWSSec(securityProperties, false, false);
+ return getInboundWSSec(securityProperties, initiator, false);
}
/**