diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-06-15 15:35:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-15 15:35:12 +0200 |
| commit | c483f99e61db99228262b72734a0417058dea208 (patch) | |
| tree | a97645ad6e901db2b03c2958f8ab51c854574d6d /controller-server | |
| parent | 177607da061beaa790fa173ff4f62204fe4e7c34 (diff) | |
| parent | 01e1c1bfc9180c62d88501d9c4c29585cdca46fc (diff) | |
Merge pull request #27438 from vespa-engine/vekterli/use-fixed-derivation-context-for-token-fingerprints
Simplify token API by using fixed context for fingerprints
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/dataplanetoken/DataplaneTokenService.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/dataplanetoken/DataplaneTokenService.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/dataplanetoken/DataplaneTokenService.java index 7941ae68a4f..731806bd53a 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/dataplanetoken/DataplaneTokenService.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/dataplanetoken/DataplaneTokenService.java @@ -29,7 +29,6 @@ import java.util.stream.Stream; public class DataplaneTokenService { private static final String TOKEN_PREFIX = "vespa_cloud_"; - private static final byte[] FINGERPRINT_CONTEXT = new byte[0]; private static final int TOKEN_BYTES = 32; private static final int CHECK_HASH_BYTES = 32; @@ -57,7 +56,7 @@ public class DataplaneTokenService { * @return a DataplaneToken containing the secret generated token */ public DataplaneToken generateToken(TenantName tenantName, TokenId tokenId, Principal principal) { - TokenDomain tokenDomain = new TokenDomain(FINGERPRINT_CONTEXT, tenantName.value().getBytes(StandardCharsets.UTF_8)); + TokenDomain tokenDomain = TokenDomain.of(tenantName.value()); Token token = TokenGenerator.generateToken(tokenDomain, TOKEN_PREFIX, TOKEN_BYTES); TokenCheckHash checkHash = TokenCheckHash.of(token, CHECK_HASH_BYTES); DataplaneTokenVersions.Version newTokenVersion = new DataplaneTokenVersions.Version( |