chore(logs): allow anonymous front50 artifact fetching (#5066)

spinnaker · Nov 5, 2020 · aa95418 · aa95418
1 parent beb4286
commit aa95418
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/clouddriver-artifacts/clouddriver-artifacts.gradle b/clouddriver-artifacts/clouddriver-artifacts.gradle
@@ -17,6 +17,7 @@ dependencies {
   implementation "com.netflix.spinnaker.kork:kork-artifacts"
   implementation "com.netflix.spinnaker.kork:kork-annotations"
   implementation "com.netflix.spinnaker.kork:kork-exceptions"
+  implementation "com.netflix.spinnaker.kork:kork-security"
   implementation "com.oracle.oci.sdk:oci-java-sdk-core"
   implementation "com.squareup.okhttp:okhttp"
   implementation "com.sun.jersey:jersey-client:1.9.1"

diff --git a/.../java/com/netflix/spinnaker/clouddriver/artifacts/front50/Front50ArtifactCredentials.java b/.../java/com/netflix/spinnaker/clouddriver/artifacts/front50/Front50ArtifactCredentials.java
@@ -24,6 +24,7 @@
 import com.netflix.spinnaker.clouddriver.core.services.Front50Service;
 import com.netflix.spinnaker.kork.annotations.NonnullByDefault;
 import com.netflix.spinnaker.kork.artifacts.model.Artifact;
+import com.netflix.spinnaker.security.AuthenticatedRequest;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -65,17 +66,25 @@ public InputStream download(Artifact artifact) throws IOException {
     }
 
     Map pipelineTemplate;
-    reference = reference.substring(URL_PREFIX.length());
-    if (reference.contains("@sha256:")) {
-      SplitResult result = splitReferenceOnToken(reference, "@sha256:");
+    String artifactId = reference.substring(URL_PREFIX.length());
+    if (artifactId.contains("@sha256:")) {
+      SplitResult result = splitReferenceOnToken(artifactId, "@sha256:");
       pipelineTemplate =
-          front50Service.getV2PipelineTemplate(result.pipelineTemplateId, "", result.version);
-    } else if (reference.contains(":")) {
-      SplitResult result = splitReferenceOnToken(reference, ":");
+          AuthenticatedRequest.allowAnonymous(
+              () ->
+                  front50Service.getV2PipelineTemplate(
+                      result.pipelineTemplateId, "", result.version));
+    } else if (artifactId.contains(":")) {
+      SplitResult result = splitReferenceOnToken(artifactId, ":");
       pipelineTemplate =
-          front50Service.getV2PipelineTemplate(result.pipelineTemplateId, result.version, "");
+          AuthenticatedRequest.allowAnonymous(
+              () ->
+                  front50Service.getV2PipelineTemplate(
+                      result.pipelineTemplateId, result.version, ""));
     } else {
-      pipelineTemplate = front50Service.getV2PipelineTemplate(reference, "", "");
+      pipelineTemplate =
+          AuthenticatedRequest.allowAnonymous(
+              () -> front50Service.getV2PipelineTemplate(artifactId, "", ""));
     }
 
     return new ByteArrayInputStream(objectMapper.writeValueAsBytes(pipelineTemplate));