summaryrefslogtreecommitdiffstats
path: root/security-utils
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahooinc.com>2022-07-15 14:52:02 +0200
committerBjørn Christian Seime <bjorncs@yahooinc.com>2022-07-15 15:35:10 +0200
commit9bcb0afa58fbbdaeffaefe12cad46c7008713aaa (patch)
treefad0158e224337a7f00a34943db0462cb157dfdf /security-utils
parent64adc479fab2fad65c398e70222f3443b75f9f32 (diff)
Change type from SortedSet to Set
Diffstat (limited to 'security-utils')
-rw-r--r--security-utils/src/main/java/com/yahoo/security/tls/authz/ConnectionAuthContext.java7
-rw-r--r--security-utils/src/main/java/com/yahoo/security/tls/authz/PeerAuthorizer.java4
2 files changed, 4 insertions, 7 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/authz/ConnectionAuthContext.java b/security-utils/src/main/java/com/yahoo/security/tls/authz/ConnectionAuthContext.java
index 52d838d29ef..9f767dc99dd 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/authz/ConnectionAuthContext.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/authz/ConnectionAuthContext.java
@@ -4,21 +4,20 @@ import com.yahoo.security.tls.policy.CapabilitySet;
import java.security.cert.X509Certificate;
import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
+import java.util.Set;
/**
* @author bjorncs
*/
public record ConnectionAuthContext(List<X509Certificate> peerCertificateChain,
CapabilitySet capabilities,
- SortedSet<String> matchedPolicies) {
+ Set<String> matchedPolicies) {
public ConnectionAuthContext {
if (peerCertificateChain.isEmpty()) throw new IllegalArgumentException("Peer certificate chain is empty");
peerCertificateChain = List.copyOf(peerCertificateChain);
if (matchedPolicies.isEmpty() && !CapabilitySet.none().equals(capabilities)) throw new AssertionError();
- matchedPolicies = new TreeSet<>(matchedPolicies);
+ matchedPolicies = Set.copyOf(matchedPolicies);
}
public boolean authorized() { return matchedPolicies.size() > 0; }
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/authz/PeerAuthorizer.java b/security-utils/src/main/java/com/yahoo/security/tls/authz/PeerAuthorizer.java
index 30b6ac3f34b..cf21befadd5 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/authz/PeerAuthorizer.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/authz/PeerAuthorizer.java
@@ -13,8 +13,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
import java.util.logging.Logger;
import static com.yahoo.security.SubjectAlternativeName.Type.DNS_NAME;
@@ -42,7 +40,7 @@ public class PeerAuthorizer {
public ConnectionAuthContext authorizePeer(List<X509Certificate> certChain) {
X509Certificate cert = certChain.get(0);
- SortedSet<String> matchedPolicies = new TreeSet<>();
+ Set<String> matchedPolicies = new HashSet<>();
Set<CapabilitySet> grantedCapabilities = new HashSet<>();
String cn = getCommonName(cert).orElse(null);
List<String> sans = getSubjectAlternativeNames(cert);