This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch coheigea/saml-refactor-new in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
commit 31d062e928febdba75d13c3b22cb9880f5936842 Author: Colm O hEigeartaigh <cohei...@apache.org> AuthorDate: Fri Jun 27 08:01:38 2025 +0100 Moving STRParserUtil to common --- .../apache/wss4j/common/dom/processor}/STRParserUtil.java | 2 +- .../org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java | 12 +++--------- .../org/apache/wss4j/dom/str/DerivedKeyTokenSTRParser.java | 1 + .../java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java | 1 + .../org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java | 1 + .../java/org/apache/wss4j/dom/str/SignatureSTRParser.java | 1 + 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/processor/STRParserUtil.java similarity index 99% rename from ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java rename to ws-security-common/src/main/java/org/apache/wss4j/common/dom/processor/STRParserUtil.java index 320fa7c97..421a382ab 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java +++ b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/processor/STRParserUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.wss4j.dom.str; +package org.apache.wss4j.common.dom.processor; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java index b57ff8713..c91ac7e6a 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java @@ -19,7 +19,6 @@ package org.apache.wss4j.dom.saml; -import java.security.Principal; import java.util.List; import javax.xml.namespace.QName; @@ -28,10 +27,8 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.Text; import org.apache.wss4j.common.crypto.AlgorithmSuite; -import org.apache.wss4j.common.crypto.AlgorithmSuiteValidator; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.common.principal.WSDerivedKeyTokenPrincipal; import org.apache.wss4j.common.saml.SAMLKeyInfo; import org.apache.wss4j.common.saml.SAMLKeyInfoProcessor; import org.apache.wss4j.common.saml.SAMLUtil; @@ -40,12 +37,8 @@ import org.apache.wss4j.common.token.SecurityTokenReference; import org.apache.wss4j.common.dom.WSConstants; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.common.dom.processor.Processor; +import org.apache.wss4j.common.dom.processor.STRParserUtil; import org.apache.wss4j.common.dom.RequestData; -import org.apache.wss4j.dom.str.STRParser; -import org.apache.wss4j.dom.str.STRParserParameters; -import org.apache.wss4j.dom.str.STRParserResult; -import org.apache.wss4j.dom.str.STRParserUtil; -import org.apache.wss4j.dom.str.SignatureSTRParser; import org.apache.xml.security.utils.XMLUtils; /** @@ -106,7 +99,7 @@ public class WSSSAMLKeyInfoProcessor implements SAMLKeyInfoProcessor { Text txt = (Text)node.getFirstChild(); return new SAMLKeyInfo(XMLUtils.decode(txt.getData())); } else if (SecurityTokenReference.STR_QNAME.equals(el)) { - STRParserParameters parameters = new STRParserParameters(); + /* TODO need to revisit STRParserParameters parameters = new STRParserParameters(); parameters.setData(data); parameters.setStrElement((Element)node); @@ -133,6 +126,7 @@ public class WSSSAMLKeyInfoProcessor implements SAMLKeyInfoProcessor { } return samlKeyInfo; + */ } } node = node.getNextSibling(); 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 ef34ae06c..531f38017 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 @@ -32,6 +32,7 @@ import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.common.dom.WSConstants; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.processor.STRParserUtil; import org.apache.wss4j.common.dom.RequestData; import org.w3c.dom.Element; 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 2179c3399..aa26b775f 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 @@ -36,6 +36,7 @@ import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.common.dom.WSConstants; import org.apache.wss4j.common.dom.WSDocInfo; import org.apache.wss4j.common.dom.engine.WSSecurityEngineResult; +import org.apache.wss4j.common.dom.processor.STRParserUtil; import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor; import org.w3c.dom.Element; 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 9727bc2d0..17529c806 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 @@ -41,6 +41,7 @@ import org.apache.wss4j.common.dom.RequestData; import org.apache.wss4j.common.dom.message.token.DerivedKeyToken; import org.apache.wss4j.common.dom.message.token.UsernameToken; import org.apache.wss4j.common.dom.processor.Processor; +import org.apache.wss4j.common.dom.processor.STRParserUtil; import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor; import org.w3c.dom.Element; 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 cd28cbc1f..176cf9689 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 @@ -51,6 +51,7 @@ import org.apache.wss4j.common.dom.message.token.DerivedKeyToken; import org.apache.wss4j.common.dom.message.token.SecurityContextToken; import org.apache.wss4j.common.dom.message.token.UsernameToken; import org.apache.wss4j.common.dom.processor.Processor; +import org.apache.wss4j.common.dom.processor.STRParserUtil; import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor; import org.w3c.dom.Element;