From 16a5e8e11248c4a9e6c00421ba30caca8a1e46eb Mon Sep 17 00:00:00 2001 From: jonmv Date: Tue, 27 Jun 2023 10:32:57 +0200 Subject: Short-cut re-acquiring ordered locks --- .../main/java/com/yahoo/security/tls/PeerAuthorizer.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'security-utils') diff --git a/security-utils/src/main/java/com/yahoo/security/tls/PeerAuthorizer.java b/security-utils/src/main/java/com/yahoo/security/tls/PeerAuthorizer.java index d0e1a33fcac..7c798eddab1 100644 --- a/security-utils/src/main/java/com/yahoo/security/tls/PeerAuthorizer.java +++ b/security-utils/src/main/java/com/yahoo/security/tls/PeerAuthorizer.java @@ -58,16 +58,10 @@ public class PeerAuthorizer { } private static boolean matchesRequiredCredentials(RequiredPeerCredential requiredCredential, String cn, List sans) { - switch (requiredCredential.field()) { - case CN: - return cn != null && requiredCredential.pattern().matches(cn); - case SAN_DNS: - case SAN_URI: - return sans.stream() - .anyMatch(san -> requiredCredential.pattern().matches(san)); - default: - throw new RuntimeException("Unknown field: " + requiredCredential.field()); - } + return switch (requiredCredential.field()) { + case CN -> cn != null && requiredCredential.pattern().matches(cn); + case SAN_DNS, SAN_URI -> sans.stream().anyMatch(san -> requiredCredential.pattern().matches(san)); + }; } private static List getSubjectAlternativeNames(X509Certificate peerCertificate) { -- cgit v1.2.3