diff options
author | Morten Tokle <mortent@yahooinc.com> | 2023-01-24 23:22:00 +0100 |
---|---|---|
committer | Morten Tokle <mortent@yahooinc.com> | 2023-01-24 23:22:00 +0100 |
commit | bdddeb15c1ff070045b76010cae12c5bedf95cf0 (patch) | |
tree | e42f89fa34fde3282a7c1c07fb0254e013c07e82 /vespa-athenz | |
parent | 3e5e45f78b32a833e47ba314d2df840092a6aaaf (diff) |
Support updating athenz domain meta
Diffstat (limited to 'vespa-athenz')
3 files changed, 47 insertions, 0 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzDomainMeta.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzDomainMeta.java new file mode 100644 index 00000000000..7808a689982 --- /dev/null +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzDomainMeta.java @@ -0,0 +1,12 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.athenz.api; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + +@JsonIgnoreProperties(ignoreUnknown = true) +public record AthenzDomainMeta( + @JsonProperty("account") String account, + @JsonProperty("name") String name +) { +} diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java index 44ea5ef329f..d8d6d2c3486 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java @@ -5,6 +5,7 @@ import com.yahoo.athenz.auth.util.Crypto; import com.yahoo.security.KeyUtils; import com.yahoo.vespa.athenz.api.AthenzAssertion; import com.yahoo.vespa.athenz.api.AthenzDomain; +import com.yahoo.vespa.athenz.api.AthenzDomainMeta; import com.yahoo.vespa.athenz.api.AthenzGroup; import com.yahoo.vespa.athenz.api.AthenzIdentity; import com.yahoo.vespa.athenz.api.AthenzPolicy; @@ -33,6 +34,7 @@ import com.yahoo.vespa.athenz.utils.AthenzIdentities; import org.apache.http.Header; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.client.methods.RequestBuilder; +import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.message.BasicHeader; @@ -216,6 +218,34 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient { } @Override + public AthenzDomainMeta getDomainMeta(AthenzDomain domain) { + HttpUriRequest request = RequestBuilder.get() + .setUri(zmsUrl.resolve("domain/%s".formatted(domain.getName()))) + .build(); + return execute(request, response -> readEntity(response, AthenzDomainMeta.class)); + } + + @Override + public void updateDomain(AthenzDomain domain, Map<String, Object> attributes) { + for (String attribute : attributes.keySet()) { + Object attrVal = attributes.get(attribute); + + String val = attrVal instanceof String ? "\"" + attrVal.toString() + "\"" : attrVal.toString(); + String domainMeta = """ + { + "%s": %s + } + """ + .formatted(attribute, val); + HttpUriRequest request = RequestBuilder.put() + .setUri(zmsUrl.resolve("domain/%s/meta/system/%s".formatted(domain.getName(), attribute))) + .setEntity(new StringEntity(domainMeta, ContentType.APPLICATION_JSON)) + .build(); + execute(request, response -> readEntity(response, Void.class)); + } + } + + @Override public boolean hasAccess(AthenzResourceName resource, String action, AthenzIdentity identity) { URI uri = zmsUrl.resolve(String.format("access/%s/%s?principal=%s", action, resource.toResourceNameString(), identity.getFullName())); diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/ZmsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/ZmsClient.java index 4342b32e4c8..541aa4d9c60 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/ZmsClient.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/ZmsClient.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.athenz.client.zms; import com.yahoo.vespa.athenz.api.AthenzDomain; +import com.yahoo.vespa.athenz.api.AthenzDomainMeta; import com.yahoo.vespa.athenz.api.AthenzGroup; import com.yahoo.vespa.athenz.api.AthenzIdentity; import com.yahoo.vespa.athenz.api.AthenzPolicy; @@ -52,6 +53,10 @@ public interface ZmsClient extends Closeable { List<AthenzDomain> getDomainListByAccount(String id); + AthenzDomainMeta getDomainMeta(AthenzDomain domain); + + void updateDomain(AthenzDomain domain, Map<String, Object> attributes); + boolean hasAccess(AthenzResourceName resource, String action, AthenzIdentity identity); void createPolicy(AthenzDomain athenzDomain, String athenzPolicy); |