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 2025/07/16 11:19:31 UTC

(ws-wss4j) branch coheigea/saml-refactor-new updated (de1679d85 -> a35482a6d)

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a change to branch coheigea/saml-refactor-new
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git


    from de1679d85 Fixing policy tests
     new 1c95a804e Simplifying SamlTokenSecurityEvent
     new a35482a6d Refactoring SamlTokenSecurityEvent

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:
 .../apache/wss4j/api/stax/securityEvent/SamlTokenSecurityEvent.java  | 5 ++---
 .../org/apache/wss4j/api/stax/securityToken/SamlSecurityToken.java   | 2 ++
 .../apache/wss4j/stax/impl/securityToken/SamlSecurityTokenImpl.java  | 5 +++++
 3 files changed, 9 insertions(+), 3 deletions(-)


(ws-wss4j) 01/02: Simplifying SamlTokenSecurityEvent

Posted by co...@apache.org.
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 1c95a804ed639cad5ef86f9addb88de3b7f6a036
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jul 16 11:36:46 2025 +0100

    Simplifying SamlTokenSecurityEvent
---
 .../apache/wss4j/api/stax/securityEvent/SamlTokenSecurityEvent.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityEvent/SamlTokenSecurityEvent.java b/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityEvent/SamlTokenSecurityEvent.java
index 6ddd8ed56..5b9bdeda2 100644
--- a/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityEvent/SamlTokenSecurityEvent.java
+++ b/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityEvent/SamlTokenSecurityEvent.java
@@ -19,7 +19,6 @@
 package org.apache.wss4j.api.stax.securityEvent;
 
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.principal.SAMLTokenPrincipal;
 import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 import org.apache.wss4j.api.stax.securityToken.SamlSecurityToken;
 
@@ -35,6 +34,6 @@ public class SamlTokenSecurityEvent extends IssuedTokenSecurityEvent<SamlSecurit
     }
 
     public SamlAssertionWrapper getSamlAssertionWrapper() throws WSSecurityException {
-        return (SamlAssertionWrapper)((SAMLTokenPrincipal)getSecurityToken().getPrincipal()).getToken();
+        return getSecurityToken().getSamlAssertionWrapper();
     }
 }


(ws-wss4j) 02/02: Refactoring SamlTokenSecurityEvent

Posted by co...@apache.org.
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 a35482a6dff3d6fb86fc2d63e2afe2c963a848c5
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jul 16 12:19:14 2025 +0100

    Refactoring SamlTokenSecurityEvent
---
 .../apache/wss4j/api/stax/securityEvent/SamlTokenSecurityEvent.java  | 2 +-
 .../org/apache/wss4j/api/stax/securityToken/SamlSecurityToken.java   | 2 ++
 .../apache/wss4j/stax/impl/securityToken/SamlSecurityTokenImpl.java  | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityEvent/SamlTokenSecurityEvent.java b/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityEvent/SamlTokenSecurityEvent.java
index 5b9bdeda2..e6c6f8985 100644
--- a/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityEvent/SamlTokenSecurityEvent.java
+++ b/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityEvent/SamlTokenSecurityEvent.java
@@ -30,7 +30,7 @@ public class SamlTokenSecurityEvent extends IssuedTokenSecurityEvent<SamlSecurit
 
     @Override
     public String getIssuerName() throws WSSecurityException {
-        return getSamlAssertionWrapper().getIssuerString();
+        return getSecurityToken().getIssuerName();
     }
 
     public SamlAssertionWrapper getSamlAssertionWrapper() throws WSSecurityException {
diff --git a/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityToken/SamlSecurityToken.java b/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityToken/SamlSecurityToken.java
index b81dd2eea..2e040bf90 100644
--- a/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityToken/SamlSecurityToken.java
+++ b/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityToken/SamlSecurityToken.java
@@ -23,4 +23,6 @@ import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
 public interface SamlSecurityToken extends SubjectAndPrincipalSecurityToken {
 
     SamlAssertionWrapper getSamlAssertionWrapper();
+
+    String getIssuerName();
 }
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 3041871ac..ed57e8a93 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
@@ -261,4 +261,9 @@ public class SamlSecurityTokenImpl extends AbstractInboundSecurityToken implemen
     public SamlAssertionWrapper getSamlAssertionWrapper() {
         return samlAssertionWrapper;
     }
+
+    @Override
+    public String getIssuerName() {
+        return samlAssertionWrapper.getIssuerString();
+    }
 }