diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2024-01-26 17:53:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-26 17:53:13 +0100 |
| commit | 1c97bdea2713238c87e44440cb03c913911090d2 (patch) | |
| tree | 7b1f18032c52093ba00d9052e4da01539895b5f0 /config-model/src/main/java/com/yahoo/vespa/model/container/xml | |
| parent | 5fabffb2613cc7728b63e01e3cf336fe45b27566 (diff) | |
Revert "Validate applied permissions in config model"
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/container/xml')
3 files changed, 6 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudDataPlaneFilter.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudDataPlaneFilter.java index 53609757d90..a1b569fa110 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudDataPlaneFilter.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudDataPlaneFilter.java @@ -46,7 +46,7 @@ class CloudDataPlaneFilter extends Filter implements CloudDataPlaneFilterConfig. .map(x -> new CloudDataPlaneFilterConfig.Clients.Builder() .id(x.id()) .certificates(x.certificates().stream().map(X509CertificateUtils::toPem).toList()) - .permissions(x.permissions().stream().map(Client.Permission::asString).toList())) + .permissions(x.permissions())) .toList(); builder.clients(clientsCfg).legacyMode(false); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudTokenDataPlaneFilter.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudTokenDataPlaneFilter.java index cba8577860b..bb24f96784e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudTokenDataPlaneFilter.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudTokenDataPlaneFilter.java @@ -44,7 +44,7 @@ class CloudTokenDataPlaneFilter extends Filter implements CloudTokenDataPlaneFil .map(x -> new CloudTokenDataPlaneFilterConfig.Clients.Builder() .id(x.id()) .tokens(tokensConfig(x.tokens())) - .permissions(x.permissions().stream().map(Client.Permission::asString).toList())) + .permissions(x.permissions())) .toList(); builder.clients(clientsCfg).tokenContext(tokenContext); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 8eca29215d4..e4038a5bca6 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -518,8 +518,10 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { String clientId = XML.attribute("id", clientElement).orElseThrow(); if (clientId.startsWith("_")) throw new IllegalArgumentException("Invalid client id '%s', id cannot start with '_'".formatted(clientId)); - var permissions = XML.attribute("permissions", clientElement) - .map(Client.Permission::fromCommaSeparatedString).orElse(Set.of()); + List<String> permissions = XML.attribute("permissions", clientElement) + .map(p -> p.split(",")).stream() + .flatMap(Arrays::stream) + .toList(); var certificates = XML.getChildren(clientElement, "certificate").stream() .flatMap(certElem -> { |