wip

Author: kim-codefresh

server/artifacts/artifact_server.go

@@ -154,6 +154,11 @@ func (a *ArtifactServer) GetArtifactFile(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
+	a.getArtifactFromPath(artifact, driver, w, r)
+
+}
+
+func (a *ArtifactServer) getArtifactFromPath(artifact *wfv1.Artifact, driver common.ArtifactDriver, w http.ResponseWriter, r *http.Request) {
 	isDir := strings.HasSuffix(r.URL.Path, "/")
 
 	if !isDir {
@@ -222,15 +227,13 @@ func (a *ArtifactServer) GetArtifactFile(w http.ResponseWriter, r *http.Request)
 	} else { // stream the file itself
 		log.Debugf("not a directory, artifact: %+v", artifact)
 
-		err = a.returnArtifact(w, artifact, driver)
+		err := a.returnArtifact(w, artifact, driver)
 
 		if err != nil {
 			a.httpFromError(err, w)
 		}
 	}
-
 }
-
 func (a *ArtifactServer) getArtifact(w http.ResponseWriter, r *http.Request, isInput bool) {
 	requestPath := strings.SplitN(r.URL.Path, "/", 6)
 	if len(requestPath) != 6 {
@@ -300,24 +303,32 @@ func (a *ArtifactServer) getArtifactByManifest(w http.ResponseWriter, r *http.Re
 	}
 
 	uid := wf.UID
-	path := strings.SplitN(r.URL.Path, "/", 6)
-	nodeId := path[2]
-	artifactName := path[3]
-
-	log.WithFields(log.Fields{"uid": uid, "nodeId": nodeId, "artifactName": artifactName, "isInput": isInput}).Info("Download artifact by manifest")
+	requestPath := strings.SplitN(r.URL.Path, "/", 6)
+	nodeId := requestPath[2]
+	artifactName := requestPath[3]
+	artifactNameIndex := 3
+	fileNameFirstIndex := 4
 
-	art, driver, err := a.getArtifactAndDriver(ctx, nodeId, artifactName, isInput, wf, nil)
-	if err != nil {
-		a.serverInternalError(err, w)
+	var fileName *string
+	if len(requestPath) >= fileNameFirstIndex+1 { // they included a file path in the URL (not just artifact name)
+		joined := strings.Join(requestPath[fileNameFirstIndex:], "/")
+		// sanitize file name
+		cleanedPath := path.Clean(joined)
+		fileName = &cleanedPath
+	} else if len(requestPath) < artifactNameIndex+1 {
+		a.httpBadRequestError(w)
 		return
 	}
 
-	err = a.returnArtifact(w, art, driver)
+	log.WithFields(log.Fields{"uid": uid, "nodeId": nodeId, "artifactName": artifactName, "isInput": isInput}).Info("Download artifact by manifest")
 
+	art, driver, err := a.getArtifactAndDriver(ctx, nodeId, artifactName, isInput, wf, fileName)
 	if err != nil {
 		a.serverInternalError(err, w)
 		return
 	}
+
+	a.getArtifactFromPath(art, driver, w, r)
 }
 
 func (a *ArtifactServer) GetOutputArtifactByUID(w http.ResponseWriter, r *http.Request) {