diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2023-02-23 08:25:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-23 08:25:45 +0100 |
commit | 471cabcd94992c07f8037df6901d92083c91a03b (patch) | |
tree | 2fff02d8d9e044fde143d6154f8d36e22e567cbf /security-utils/src/main/java/com/yahoo/security/tls/ConnectionAuthContext.java | |
parent | 69f149d4f91a2043f1d801afd89596fedacb69a2 (diff) |
Revert "Store original capability (set) names from JSON config in PeerPolicy"
Diffstat (limited to 'security-utils/src/main/java/com/yahoo/security/tls/ConnectionAuthContext.java')
-rw-r--r-- | security-utils/src/main/java/com/yahoo/security/tls/ConnectionAuthContext.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/ConnectionAuthContext.java b/security-utils/src/main/java/com/yahoo/security/tls/ConnectionAuthContext.java index 9252b5619f9..d7ea93955af 100644 --- a/security-utils/src/main/java/com/yahoo/security/tls/ConnectionAuthContext.java +++ b/security-utils/src/main/java/com/yahoo/security/tls/ConnectionAuthContext.java @@ -8,7 +8,6 @@ import java.util.List; import java.util.Optional; import java.util.Set; import java.util.logging.Logger; -import java.util.stream.Collectors; import static com.yahoo.security.SubjectAlternativeName.Type.DNS; import static com.yahoo.security.SubjectAlternativeName.Type.URI; @@ -79,14 +78,10 @@ public record ConnectionAuthContext(List<X509Certificate> peerCertificateChain, b.append(". Peer "); if (peer != null) b.append("'").append(peer).append("' "); return b.append("with ").append(peerCertificateString().orElse("<missing-certificate>")).append(". Requires capabilities ") - .append(toCapabilityNames(required)).append(" but peer has ").append(toCapabilityNames(capabilities)) + .append(required.toNames()).append(" but peer has ").append(capabilities.toNames()) .append(".").toString(); } - private static String toCapabilityNames(CapabilitySet capabilities) { - return capabilities.toCapabilityNames().stream().sorted().collect(Collectors.joining(", ", "[", "]")); - } - public Optional<X509Certificate> peerCertificate() { return peerCertificateChain.isEmpty() ? Optional.empty() : Optional.of(peerCertificateChain.get(0)); } |