Skip to content

Commit 3326aaa

Browse files
committed
Fix #26789: only allow auth objects in persistent manifest
1 parent 5f5c046 commit 3326aaa

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -381,24 +381,24 @@ private void createAdditionalManifests(Proxy proxy, String namespace) {
381381
}
382382

383383
private List<HasMetadata> getAdditionManifestsAsObjects(Proxy proxy, String namespace) {
384-
return parseAdditionalManifests(proxy, namespace, proxy.getSpec().getKubernetesAdditionalManifests());
384+
SpecExpressionContext context = SpecExpressionContext.create(
385+
proxy, proxy.getSpec());
386+
return parseAdditionalManifests(context, proxy, namespace, proxy.getSpec().getKubernetesAdditionalManifests());
385387
}
386388

387389
private List<HasMetadata> getAdditionPersistentManifestsAsObjects(Proxy proxy, String namespace) {
388-
return parseAdditionalManifests(proxy, namespace, proxy.getSpec().getKubernetesAdditionalPersistentManifests());
390+
SpecExpressionContext context = SpecExpressionContext.create(
391+
proxy, proxy.getSpec(),
392+
userService.getCurrentAuth().getPrincipal(), userService.getCurrentAuth().getCredentials());
393+
return parseAdditionalManifests(context, proxy, namespace, proxy.getSpec().getKubernetesAdditionalPersistentManifests());
389394
}
390395

391396
/**
392397
* Converts the additional manifests of the spec into HasMetadata objects.
393398
* When the resource has no namespace definition, the provided namespace
394399
* parameter will be used.
395400
*/
396-
private List<HasMetadata> parseAdditionalManifests(Proxy proxy, String namespace, List<String> manifests) {
397-
SpecExpressionContext context = SpecExpressionContext.create(
398-
proxy,
399-
proxy.getSpec(),
400-
userService.getCurrentAuth().getPrincipal(),
401-
userService.getCurrentAuth().getCredentials());
401+
private List<HasMetadata> parseAdditionalManifests(SpecExpressionContext context, Proxy proxy, String namespace, List<String> manifests) {
402402

403403
ArrayList<HasMetadata> result = new ArrayList<>();
404404
for (String manifest : manifests) {

0 commit comments

Comments
 (0)