Skip to content

Commit 4787156

Browse files
fhanikjzheaux
authored andcommitted
Change HashSet to LinkedHashSet
For various RelyingPartyRegistration.credentials to preserve order of insertion. Issue gh-10799
1 parent f0c548c commit 4787156

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistration.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.ArrayList;
2222
import java.util.Collection;
2323
import java.util.Collections;
24-
import java.util.HashSet;
24+
import java.util.LinkedHashSet;
2525
import java.util.LinkedList;
2626
import java.util.List;
2727
import java.util.Set;
@@ -451,7 +451,7 @@ private static Saml2X509Credential fromDeprecated(
451451
org.springframework.security.saml2.credentials.Saml2X509Credential credential) {
452452
PrivateKey privateKey = credential.getPrivateKey();
453453
X509Certificate certificate = credential.getCertificate();
454-
Set<Saml2X509Credential.Saml2X509CredentialType> credentialTypes = new HashSet<>();
454+
Set<Saml2X509Credential.Saml2X509CredentialType> credentialTypes = new LinkedHashSet<>();
455455
if (credential.isSigningCredential()) {
456456
credentialTypes.add(Saml2X509Credential.Saml2X509CredentialType.SIGNING);
457457
}
@@ -471,7 +471,7 @@ private static org.springframework.security.saml2.credentials.Saml2X509Credentia
471471
Saml2X509Credential credential) {
472472
PrivateKey privateKey = credential.getPrivateKey();
473473
X509Certificate certificate = credential.getCertificate();
474-
Set<org.springframework.security.saml2.credentials.Saml2X509Credential.Saml2X509CredentialType> credentialTypes = new HashSet<>();
474+
Set<org.springframework.security.saml2.credentials.Saml2X509Credential.Saml2X509CredentialType> credentialTypes = new LinkedHashSet<>();
475475
if (credential.isSigningCredential()) {
476476
credentialTypes.add(
477477
org.springframework.security.saml2.credentials.Saml2X509Credential.Saml2X509CredentialType.SIGNING);
@@ -696,9 +696,9 @@ public static final class Builder {
696696

697697
private List<String> signingAlgorithms = new ArrayList<>();
698698

699-
private Collection<Saml2X509Credential> verificationX509Credentials = new HashSet<>();
699+
private Collection<Saml2X509Credential> verificationX509Credentials = new LinkedHashSet<>();
700700

701-
private Collection<Saml2X509Credential> encryptionX509Credentials = new HashSet<>();
701+
private Collection<Saml2X509Credential> encryptionX509Credentials = new LinkedHashSet<>();
702702

703703
private String singleSignOnServiceLocation;
704704

@@ -1006,9 +1006,9 @@ public static final class Builder {
10061006

10071007
private String entityId = "{baseUrl}/saml2/service-provider-metadata/{registrationId}";
10081008

1009-
private Collection<Saml2X509Credential> signingX509Credentials = new HashSet<>();
1009+
private Collection<Saml2X509Credential> signingX509Credentials = new LinkedHashSet<>();
10101010

1011-
private Collection<Saml2X509Credential> decryptionX509Credentials = new HashSet<>();
1011+
private Collection<Saml2X509Credential> decryptionX509Credentials = new LinkedHashSet<>();
10121012

10131013
private String assertionConsumerServiceLocation = "{baseUrl}/login/saml2/sso/{registrationId}";
10141014

@@ -1022,7 +1022,7 @@ public static final class Builder {
10221022

10231023
private ProviderDetails.Builder providerDetails = new ProviderDetails.Builder();
10241024

1025-
private Collection<org.springframework.security.saml2.credentials.Saml2X509Credential> credentials = new HashSet<>();
1025+
private Collection<org.springframework.security.saml2.credentials.Saml2X509Credential> credentials = new LinkedHashSet<>();
10261026

10271027
private Builder(String registrationId) {
10281028
this.registrationId = registrationId;

0 commit comments

Comments
 (0)