diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-10-31 14:12:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-31 14:12:05 +0100 |
commit | 8b04c764e8509f53ef187713ae2c545265de9b04 (patch) | |
tree | 3e7f3efe01708f39259b72a5244d67a0a1989134 | |
parent | 910ce3389a8f94da2bf1af8e7b442d6fbeacf353 (diff) | |
parent | 5c2383c89f6a9473bd77a985254a1a1be1258ba7 (diff) |
Merge pull request #3948 from vespa-engine/mortent/athenz-send-domain
Send domain as part of providerservice
-rw-r--r-- | athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/IdentityDocumentGenerator.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/IdentityDocumentGenerator.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/IdentityDocumentGenerator.java index 644fc929884..efb2179ff6b 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/IdentityDocumentGenerator.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/IdentityDocumentGenerator.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.athenz.instanceproviderservice.impl; -import com.yahoo.athenz.auth.util.Crypto; import com.yahoo.config.provision.Zone; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.config.AthenzProviderServiceConfig; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.impl.model.IdentityDocument; @@ -27,6 +26,7 @@ public class IdentityDocumentGenerator { private final String dnsSuffix; private final String providerService; private final String ztsUrl; + private final String providerDomain; public IdentityDocumentGenerator(AthenzProviderServiceConfig config, NodeRepository nodeRepository, Zone zone, KeyProvider keyProvider) { this.nodeRepository = nodeRepository; @@ -35,6 +35,7 @@ public class IdentityDocumentGenerator { this.dnsSuffix = config.certDnsSuffix(); this.providerService = config.serviceName(); this.ztsUrl = config.ztsUrl(); + this.providerDomain = config.domain(); } public String generateSignedIdentityDocument(String hostname) { @@ -59,7 +60,7 @@ public class IdentityDocumentGenerator { SignedIdentityDocument.DEFAULT_KEY_VERSION, identityDocument.providerUniqueId.asString(), dnsSuffix, - providerService, + providerDomain + "." + providerService, ztsUrl, SignedIdentityDocument.DEFAILT_DOCUMENT_VERSION ); |