diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-07-12 13:32:20 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-07-12 13:37:30 +0200 |
commit | 876ca0b666b01fd88be644a1e31065c5707254f0 (patch) | |
tree | 8f9a3d6e08248e990698ce263358b9c27118baf1 /jdisc-security-filters/src/test/java/com/yahoo | |
parent | 5df78771f0ff297c7d83eaaaa71df067896d5520 (diff) |
Add expiration concept to data plane tokens
Diffstat (limited to 'jdisc-security-filters/src/test/java/com/yahoo')
-rw-r--r-- | jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cloud/CloudDataPlaneFilterTest.java | 49 |
1 files changed, 44 insertions, 5 deletions
diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cloud/CloudDataPlaneFilterTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cloud/CloudDataPlaneFilterTest.java index d05baccc069..d9daf8b6f46 100644 --- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cloud/CloudDataPlaneFilterTest.java +++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cloud/CloudDataPlaneFilterTest.java @@ -17,11 +17,15 @@ import com.yahoo.security.token.Token; import com.yahoo.security.token.TokenCheckHash; import com.yahoo.security.token.TokenDomain; import com.yahoo.security.token.TokenGenerator; +import com.yahoo.test.ManualClock; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import javax.security.auth.x500.X500Principal; import java.math.BigInteger; import java.security.cert.X509Certificate; +import java.time.Duration; +import java.time.Instant; import java.util.List; import java.util.Set; @@ -52,11 +56,16 @@ class CloudDataPlaneFilterTest { private static final String TOKEN_SEARCH_CLIENT = "token-search-client"; private static final String TOKEN_CONTEXT = "my-token-context"; private static final String TOKEN_ID = "my-token-id"; + private static final Instant TOKEN_EXPIRATION = EPOCH.plus(Duration.ofDays(1)); private static final Token VALID_TOKEN = TokenGenerator.generateToken(TokenDomain.of(TOKEN_CONTEXT), "vespa_token_", CHECK_HASH_BYTES); private static final Token UNKNOWN_TOKEN = TokenGenerator.generateToken(TokenDomain.of(TOKEN_CONTEXT), "vespa_token_", CHECK_HASH_BYTES); + private ManualClock clock; + + @BeforeEach void resetClock() { clock = new ManualClock(EPOCH); } + @Test void accepts_any_trusted_client_certificate_in_legacy_mode() { var req = FilterTestUtils.newRequestBuilder().withClientCertificate(LEGACY_CLIENT_CERT).build(); @@ -150,6 +159,7 @@ class CloudDataPlaneFilterTest { assertEquals(new ClientPrincipal(Set.of(TOKEN_SEARCH_CLIENT), Set.of(READ)), req.getUserPrincipal()); assertEquals(TOKEN_ID, entry.getKeyValues().get("token.id").get(0)); assertEquals(VALID_TOKEN.fingerprint().toDelimitedHexString(), entry.getKeyValues().get("token.hash").get(0)); + assertEquals(TOKEN_EXPIRATION.toString(), entry.getKeyValues().get("token.exp").get(0)); } @Test @@ -228,13 +238,40 @@ class CloudDataPlaneFilterTest { assertEquals(new ClientPrincipal(Set.of(FEED_CLIENT_ID), Set.of(WRITE)), req.getUserPrincipal()); } - private static CloudDataPlaneFilter newFilterWithLegacyMode() { + @Test + void fails_for_expired_token() { + var entry = new AccessLogEntry(); + var req = FilterTestUtils.newRequestBuilder() + .withMethod(Method.GET) + .withAccessLogEntry(entry) + .withClientCertificate(REVERSE_PROXY_CERT) + .withHeader("Authorization", "Bearer " + VALID_TOKEN.secretTokenString()) + .build(); + var filter = newFilterWithClientsConfig(); + + var responseHandler = new MockResponseHandler(); + filter.filter(req, responseHandler); + assertNull(responseHandler.getResponse()); + + clock.advance(Duration.ofDays(1)); + responseHandler = new MockResponseHandler(); + filter.filter(req, responseHandler); + assertNull(responseHandler.getResponse()); + + clock.advance(Duration.ofMillis(1)); + responseHandler = new MockResponseHandler(); + filter.filter(req, responseHandler); + assertNotNull(responseHandler.getResponse()); + assertEquals(FORBIDDEN, responseHandler.getResponse().getStatus()); + } + + private CloudDataPlaneFilter newFilterWithLegacyMode() { return new CloudDataPlaneFilter( new CloudDataPlaneFilterConfig.Builder() - .legacyMode(true).build(), (X509Certificate) null); + .legacyMode(true).build(), (X509Certificate) null, clock); } - private static CloudDataPlaneFilter newFilterWithClientsConfig() { + private CloudDataPlaneFilter newFilterWithClientsConfig() { return new CloudDataPlaneFilter( new CloudDataPlaneFilterConfig.Builder() .tokenContext(TOKEN_CONTEXT) @@ -251,11 +288,13 @@ class CloudDataPlaneFilterTest { .tokens(new CloudDataPlaneFilterConfig.Clients.Tokens.Builder() .id(TOKEN_ID) .checkAccessHashes(TokenCheckHash.of(VALID_TOKEN, 32).toHexString()) - .fingerprints(VALID_TOKEN.fingerprint().toDelimitedHexString())) + .fingerprints(VALID_TOKEN.fingerprint().toDelimitedHexString()) + .expirations(TOKEN_EXPIRATION.toString())) .permissions(READ.asString()) .id(TOKEN_SEARCH_CLIENT))) .build(), - REVERSE_PROXY_CERT); + REVERSE_PROXY_CERT, + clock); } private static X509Certificate certificate(String name) { |