Skip to content

Commit 2f25c03

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

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;
@@ -383,7 +383,7 @@ private static Saml2X509Credential fromDeprecated(
383383
org.springframework.security.saml2.credentials.Saml2X509Credential credential) {
384384
PrivateKey privateKey = credential.getPrivateKey();
385385
X509Certificate certificate = credential.getCertificate();
386-
Set<Saml2X509Credential.Saml2X509CredentialType> credentialTypes = new HashSet<>();
386+
Set<Saml2X509Credential.Saml2X509CredentialType> credentialTypes = new LinkedHashSet<>();
387387
if (credential.isSigningCredential()) {
388388
credentialTypes.add(Saml2X509Credential.Saml2X509CredentialType.SIGNING);
389389
}
@@ -403,7 +403,7 @@ private static org.springframework.security.saml2.credentials.Saml2X509Credentia
403403
Saml2X509Credential credential) {
404404
PrivateKey privateKey = credential.getPrivateKey();
405405
X509Certificate certificate = credential.getCertificate();
406-
Set<org.springframework.security.saml2.credentials.Saml2X509Credential.Saml2X509CredentialType> credentialTypes = new HashSet<>();
406+
Set<org.springframework.security.saml2.credentials.Saml2X509Credential.Saml2X509CredentialType> credentialTypes = new LinkedHashSet<>();
407407
if (credential.isSigningCredential()) {
408408
credentialTypes.add(
409409
org.springframework.security.saml2.credentials.Saml2X509Credential.Saml2X509CredentialType.SIGNING);
@@ -573,9 +573,9 @@ public static final class Builder {
573573

574574
private List<String> signingAlgorithms = new ArrayList<>();
575575

576-
private Collection<Saml2X509Credential> verificationX509Credentials = new HashSet<>();
576+
private Collection<Saml2X509Credential> verificationX509Credentials = new LinkedHashSet<>();
577577

578-
private Collection<Saml2X509Credential> encryptionX509Credentials = new HashSet<>();
578+
private Collection<Saml2X509Credential> encryptionX509Credentials = new LinkedHashSet<>();
579579

580580
private String singleSignOnServiceLocation;
581581

@@ -822,17 +822,17 @@ public static final class Builder {
822822

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

825-
private Collection<Saml2X509Credential> signingX509Credentials = new HashSet<>();
825+
private Collection<Saml2X509Credential> signingX509Credentials = new LinkedHashSet<>();
826826

827-
private Collection<Saml2X509Credential> decryptionX509Credentials = new HashSet<>();
827+
private Collection<Saml2X509Credential> decryptionX509Credentials = new LinkedHashSet<>();
828828

829829
private String assertionConsumerServiceLocation = "{baseUrl}/login/saml2/sso/{registrationId}";
830830

831831
private Saml2MessageBinding assertionConsumerServiceBinding = Saml2MessageBinding.POST;
832832

833833
private ProviderDetails.Builder providerDetails = new ProviderDetails.Builder();
834834

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

837837
private Builder(String registrationId) {
838838
this.registrationId = registrationId;

0 commit comments

Comments
 (0)