[java-identity-provider] branch main updated: IDP-1759 - AuthenticatingAuthority elements created in the wrong order

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=9055bab0538083fb1a4856ecc83923757ff8ca80

The following commit(s) were added to refs/heads/main by this push:
       new  9055bab05 IDP-1759 - AuthenticatingAuthority elements created in the wrong order
9055bab05 is described below

commit 9055bab0538083fb1a4856ecc83923757ff8ca80
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Feb 25 09:15:25 2021 -0500

    IDP-1759 - AuthenticatingAuthority elements created in the wrong order
    
    https://issues.shibboleth.net/jira/browse/IDP-1759
---
 .../idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java
index 00781f4c3..f042bf944 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java
@@ -361,9 +361,6 @@ public class ValidateSAMLAuthentication extends AbstractValidationAction {
         final ProxyAuthenticationPrincipal proxied = new ProxyAuthenticationPrincipal();
         
         final Assertion assertion = (Assertion) samlAuthnContext.getAuthnStatement().getParent();
-        
-        proxied.getAuthorities().add(assertion.getIssuer().getValue());
-        
         if (!authnContext.getAuthenticatingAuthorities().isEmpty()) {
             proxied.getAuthorities().addAll(
                     authnContext.getAuthenticatingAuthorities()
@@ -372,7 +369,8 @@ public class ValidateSAMLAuthentication extends AbstractValidationAction {
                         .filter(aa -> !Strings.isNullOrEmpty(aa))
                         .collect(Collectors.toUnmodifiableList()));
         }
-        
+        proxied.getAuthorities().add(assertion.getIssuer().getValue());
+                
         final ProxyRestriction condition = assertion.getConditions().getProxyRestriction();
         if (condition != null) {
             proxied.setProxyCount(condition.getProxyCount());

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.