diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-06-16 11:31:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-16 11:31:25 +0200 |
| commit | 2f2d0306bc6e670bfbe1d4675b4e4eea7075ecb0 (patch) | |
| tree | 532596b1208c5a5d67f36f531d3567b25a799247 /controller-server | |
| parent | a1d9ca241f859664e7e9d823862f0f1f5ff570a6 (diff) | |
| parent | eec7644398330a189c9ec87f1935f9183b1ca17b (diff) | |
Merge pull request #27440 from vespa-engine/bjorncs/cloud-token-authz-model
Bjorncs/cloud token authz model
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 731806bd53a..b3e5f663317 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 @@ -14,7 +14,6 @@ import com.yahoo.vespa.hosted.controller.api.integration.dataplanetoken.FingerPr import com.yahoo.vespa.hosted.controller.api.integration.dataplanetoken.TokenId; import com.yahoo.vespa.hosted.controller.persistence.CuratorDb; -import java.nio.charset.StandardCharsets; import java.security.Principal; import java.util.List; import java.util.Objects; @@ -56,7 +55,7 @@ public class DataplaneTokenService { * @return a DataplaneToken containing the secret generated token */ public DataplaneToken generateToken(TenantName tenantName, TokenId tokenId, Principal principal) { - TokenDomain tokenDomain = TokenDomain.of(tenantName.value()); + TokenDomain tokenDomain = TokenDomain.of("Vespa Cloud tenant data plane:%s".formatted(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( |