Merge pull request #236 from subutai-io/dev

Allow subutai user delete other's artifacts
subutai-io · Feb 9, 2018 · 457f2f3 · 457f2f3
2 parents 7e2946b + bac08da
commit 457f2f3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/db/db.go b/db/db.go
@@ -232,7 +232,9 @@ func Info(id string) map[string]string {
 		}
 		return nil
 	})
-	list["id"] = id
+	if len(list) != 0 {
+		list["id"] = id
+	}
 	return list
 }
 

diff --git a/upload/upload.go b/upload/upload.go
@@ -147,13 +147,14 @@ func Delete(w http.ResponseWriter, r *http.Request) string {
 		w.Write([]byte("Bad request"))
 		return ""
 	}
-
-	if db.CheckRepo(user, repo[3], id) == 0 {
+	if db.CheckRepo(user, repo[3], id) == 0 && user != "subutai" {
 		log.Warn("File " + info["name"] + "(" + id + ") in " + repo[3] + " repo is not owned by " + user + ", rejecting deletion request")
 		w.WriteHeader(http.StatusNotFound)
 		w.Write([]byte("File " + info["name"] + " not found or it has different owner"))
 		return ""
 	}
+	user = db.FileField(id, "owner")[0]
+
 	md5, _ := db.Hash(id)
 	f, err := os.Stat(config.Storage.Path + md5)
 	if !log.Check(log.WarnLevel, "Reading file stats", err) {