diff options
Diffstat (limited to 'security-utils/src/test/java/com/yahoo/security')
3 files changed, 7 insertions, 6 deletions
diff --git a/security-utils/src/test/java/com/yahoo/security/tls/ConnectionAuthContextTest.java b/security-utils/src/test/java/com/yahoo/security/tls/ConnectionAuthContextTest.java index 7092486e521..ae36cc2f774 100644 --- a/security-utils/src/test/java/com/yahoo/security/tls/ConnectionAuthContextTest.java +++ b/security-utils/src/test/java/com/yahoo/security/tls/ConnectionAuthContextTest.java @@ -28,16 +28,17 @@ class ConnectionAuthContextTest { void fails_on_missing_capabilities() { ConnectionAuthContext ctx = createConnectionAuthContext(); assertThrows(MissingCapabilitiesException.class, - () -> ctx.verifyCapabilities(CapabilitySet.of(Capability.CONTENT__STATUS_PAGES))); + () -> ctx.verifyCapabilities(CapabilitySet.from(Capability.CONTENT__STATUS_PAGES))); } @Test void creates_correct_error_message() { ConnectionAuthContext ctx = createConnectionAuthContext(); - CapabilitySet requiredCaps = CapabilitySet.of(Capability.CONTENT__STATUS_PAGES); + CapabilitySet requiredCaps = CapabilitySet.from(Capability.CONTENT__STATUS_PAGES); String expectedMessage = """ Permission denied for 'myaction' on 'myresource'. Peer 'mypeer' with [CN='myidentity']. - Requires capabilities [vespa.content.status_pages] but peer has [vespa.logserver.api]. + Requires capabilities [vespa.content.status_pages] but peer has + [vespa.content.document_api, vespa.content.search_api, vespa.slobrok.api]. """; String actualMessage = ctx.createPermissionDeniedErrorMessage(requiredCaps, "myaction", "myresource", "mypeer"); assertThat(actualMessage).isEqualToIgnoringWhitespace(expectedMessage); @@ -45,7 +46,7 @@ class ConnectionAuthContextTest { private static ConnectionAuthContext createConnectionAuthContext() { return new ConnectionAuthContext( - List.of(createCertificate()), CapabilitySet.of(Capability.LOGSERVER_API), Set.of(), + List.of(createCertificate()), CapabilitySet.CONTAINER_NODE, Set.of(), CapabilityMode.ENFORCE); } diff --git a/security-utils/src/test/java/com/yahoo/security/tls/PeerAuthorizerTest.java b/security-utils/src/test/java/com/yahoo/security/tls/PeerAuthorizerTest.java index 55fa8424ae3..bea5c6108f2 100644 --- a/security-utils/src/test/java/com/yahoo/security/tls/PeerAuthorizerTest.java +++ b/security-utils/src/test/java/com/yahoo/security/tls/PeerAuthorizerTest.java @@ -149,7 +149,7 @@ public class PeerAuthorizerTest { } private static PeerPolicy createPolicy(String name, List<Capability> caps, List<RequiredPeerCredential> creds) { - return new PeerPolicy(name, Optional.empty(), CapabilitySet.of(caps), creds); + return new PeerPolicy(name, Optional.empty(), CapabilitySet.from(caps), creds); } private static void assertAuthorized(ConnectionAuthContext result) { diff --git a/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializerTest.java b/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializerTest.java index 9ba5886e408..895428037ed 100644 --- a/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializerTest.java +++ b/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializerTest.java @@ -49,7 +49,7 @@ public class TransportSecurityOptionsJsonSerializerTest { RequiredPeerCredential.of(SAN_DNS, "*.suffix.com"), RequiredPeerCredential.of(SAN_URI, "myscheme://resource/path/"))), new PeerPolicy("node", Optional.empty(), - CapabilitySet.of(Capability.SLOBROK__API), + CapabilitySet.from(Capability.SLOBROK__API), Collections.singletonList(RequiredPeerCredential.of(CN, "hostname"))))))) .build(); |