diff options
author | Morten Tokle <mortent@oath.com> | 2018-04-26 12:37:48 +0200 |
---|---|---|
committer | Morten Tokle <mortent@oath.com> | 2018-04-26 12:37:48 +0200 |
commit | 76ac43a8f476d3fd10a994904be6872054a9f223 (patch) | |
tree | 1cba130fcb8d2b31e93413f7e3e979948c4eae23 /athenz-identity-provider-service/src | |
parent | 965a59df674215cc21cc6036c114ca420835d514 (diff) |
Include ipaddress SAN in CSR
Diffstat (limited to 'athenz-identity-provider-service/src')
2 files changed, 8 insertions, 5 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGenerator.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGenerator.java index 01b797a54a5..a5f143fe50a 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGenerator.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGenerator.java @@ -87,7 +87,8 @@ public class IdentityDocumentGenerator { providerUniqueId, HostName.getLocalhost(), node.hostname(), - Instant.now()); + Instant.now(), + node.ipAddresses()); } private static String toZoneDnsSuffix(Zone zone, String dnsSuffix) { diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java index 091d309a593..1400dd3e338 100644 --- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java +++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.hosted.athenz.instanceproviderservice.instanceconfirmation; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.ImmutableSet; import com.yahoo.config.model.api.ApplicationInfo; import com.yahoo.config.model.api.HostInfo; import com.yahoo.config.model.api.Model; @@ -9,12 +10,12 @@ import com.yahoo.config.model.api.ServiceInfo; import com.yahoo.config.model.api.SuperModel; import com.yahoo.config.model.api.SuperModelProvider; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.vespa.hosted.athenz.instanceproviderservice.AutoGeneratedKeyProvider; -import com.yahoo.vespa.hosted.athenz.instanceproviderservice.KeyProvider; -import com.yahoo.vespa.hosted.athenz.instanceproviderservice.impl.Utils; import com.yahoo.vespa.athenz.identityprovider.api.bindings.IdentityDocument; import com.yahoo.vespa.athenz.identityprovider.api.bindings.ProviderUniqueId; import com.yahoo.vespa.athenz.identityprovider.api.bindings.SignedIdentityDocument; +import com.yahoo.vespa.hosted.athenz.instanceproviderservice.AutoGeneratedKeyProvider; +import com.yahoo.vespa.hosted.athenz.instanceproviderservice.KeyProvider; +import com.yahoo.vespa.hosted.athenz.instanceproviderservice.impl.Utils; import org.junit.Test; import java.net.URI; @@ -121,7 +122,8 @@ public class InstanceValidatorTest { "environment", "region", applicationId.instance().value(), "cluster-id", 0), "hostname", "instance-hostname", - Instant.now()); + Instant.now(), + ImmutableSet.of("127.0.0.1", "::1")); try { ObjectMapper mapper = Utils.getMapper(); |