From df5b487fec9bdc6b98fc6cbc60c45e360d18eeb4 Mon Sep 17 00:00:00 2001 From: Ollie Phillips Date: Mon, 25 Mar 2019 21:56:32 +0000 Subject: dev --- system/admin/handlers.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/system/admin/handlers.go b/system/admin/handlers.go index d0818ec..ba16998 100644 --- a/system/admin/handlers.go +++ b/system/admin/handlers.go @@ -2200,6 +2200,17 @@ func deleteUploadHandler(res http.ResponseWriter, req *http.Request) { return } + // get upload data + upload, err := db.Upload(t + ":" + id) + if err != nil { + log.Println(err) + res.WriteHeader(http.StatusInternalServerError) + return + } + + // use path to delete the physical file from disk + log.Println("file data:", string(upload)) + err = db.DeleteUpload(t + ":" + id) if err != nil { log.Println(err) -- cgit v1.2.3 From 20da628b140cd90b5937c412a8fa6670389bff38 Mon Sep 17 00:00:00 2001 From: Ollie Phillips Date: Mon, 25 Mar 2019 22:20:32 +0000 Subject: dev --- system/admin/handlers.go | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/system/admin/handlers.go b/system/admin/handlers.go index ba16998..c47755f 100644 --- a/system/admin/handlers.go +++ b/system/admin/handlers.go @@ -8,6 +8,7 @@ import ( "fmt" "log" "net/http" + "os" "strconv" "strings" "time" @@ -2201,15 +2202,28 @@ func deleteUploadHandler(res http.ResponseWriter, req *http.Request) { } // get upload data - upload, err := db.Upload(t + ":" + id) + upload := item.FileUpload{} + data, err := db.Upload(t + ":" + id) if err != nil { log.Println(err) res.WriteHeader(http.StatusInternalServerError) return } + if err = json.Unmarshal(data, &upload); err != nil { + log.Println(err) + res.WriteHeader(http.StatusInternalServerError) + return + } + // use path to delete the physical file from disk - log.Println("file data:", string(upload)) + delPath := strings.Replace(upload.Path, "/api/", "./", 1) + err = os.Remove(delPath) + if err != nil { + log.Println(err) + res.WriteHeader(http.StatusInternalServerError) + return + } err = db.DeleteUpload(t + ":" + id) if err != nil { -- cgit v1.2.3 From 9ea64498a0752d261e45f15e45843ef09c506cf9 Mon Sep 17 00:00:00 2001 From: Ollie Phillips Date: Mon, 25 Mar 2019 22:51:15 +0000 Subject: delete physical upload from disk --- system/admin/filesystem.go | 28 ++++++++++++++++++++++++++++ system/admin/handlers.go | 22 +++------------------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/system/admin/filesystem.go b/system/admin/filesystem.go index 77c721e..21e9740 100644 --- a/system/admin/filesystem.go +++ b/system/admin/filesystem.go @@ -1,10 +1,38 @@ package admin import ( + "encoding/json" "net/http" "os" + "strings" + + "github.com/ponzu-cms/ponzu/system/db" + "github.com/ponzu-cms/ponzu/system/item" ) +func deleteUploadFromDisk(target string) error { + // get data on file + data, err := db.Upload(target) + if err != nil { + return err + } + + // unmarshal data + upload := item.FileUpload{} + if err = json.Unmarshal(data, &upload); err != nil { + return err + } + + // use path to delete the physical file from disk + delPath := strings.Replace(upload.Path, "/api/", "./", 1) + err = os.Remove(delPath) + if err != nil { + return err + } + + return nil +} + func restrict(dir http.Dir) justFilesFilesystem { return justFilesFilesystem{dir} } diff --git a/system/admin/handlers.go b/system/admin/handlers.go index c47755f..40477fa 100644 --- a/system/admin/handlers.go +++ b/system/admin/handlers.go @@ -8,7 +8,6 @@ import ( "fmt" "log" "net/http" - "os" "strconv" "strings" "time" @@ -2201,24 +2200,9 @@ func deleteUploadHandler(res http.ResponseWriter, req *http.Request) { return } - // get upload data - upload := item.FileUpload{} - data, err := db.Upload(t + ":" + id) - if err != nil { - log.Println(err) - res.WriteHeader(http.StatusInternalServerError) - return - } - - if err = json.Unmarshal(data, &upload); err != nil { - log.Println(err) - res.WriteHeader(http.StatusInternalServerError) - return - } - - // use path to delete the physical file from disk - delPath := strings.Replace(upload.Path, "/api/", "./", 1) - err = os.Remove(delPath) + // delete from file system, if good, we continue to delete + // from database, if bad error 500 + err = deleteUploadFromDisk(t + ":" + id) if err != nil { log.Println(err) res.WriteHeader(http.StatusInternalServerError) -- cgit v1.2.3 From ec7b5b2bab2cad13db317a017fb8ee5d32a8f68c Mon Sep 17 00:00:00 2001 From: Ollie Phillips Date: Tue, 26 Mar 2019 09:17:13 +0000 Subject: single allocation for uplaod target --- system/admin/handlers.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/system/admin/handlers.go b/system/admin/handlers.go index 40477fa..8850f03 100644 --- a/system/admin/handlers.go +++ b/system/admin/handlers.go @@ -2200,16 +2200,18 @@ func deleteUploadHandler(res http.ResponseWriter, req *http.Request) { return } + dbTarget := t + ":" + id + // delete from file system, if good, we continue to delete // from database, if bad error 500 - err = deleteUploadFromDisk(t + ":" + id) + err = deleteUploadFromDisk(dbTarget) if err != nil { log.Println(err) res.WriteHeader(http.StatusInternalServerError) return } - err = db.DeleteUpload(t + ":" + id) + err = db.DeleteUpload(dbTarget) if err != nil { log.Println(err) res.WriteHeader(http.StatusInternalServerError) -- cgit v1.2.3 From 9348a3e6cd0a1e2b0cd6611b1f7acb04307544e7 Mon Sep 17 00:00:00 2001 From: Ollie Phillips Date: Tue, 26 Mar 2019 09:28:27 +0000 Subject: use filepath.Join for best OS compatiblity --- system/admin/filesystem.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/system/admin/filesystem.go b/system/admin/filesystem.go index 21e9740..e556ec8 100644 --- a/system/admin/filesystem.go +++ b/system/admin/filesystem.go @@ -4,6 +4,7 @@ import ( "encoding/json" "net/http" "os" + "path/filepath" "strings" "github.com/ponzu-cms/ponzu/system/db" @@ -23,9 +24,11 @@ func deleteUploadFromDisk(target string) error { return err } + // split and rebuild path in OS friendly way // use path to delete the physical file from disk - delPath := strings.Replace(upload.Path, "/api/", "./", 1) - err = os.Remove(delPath) + pathSplit := strings.Split(upload.Path, "/") + pathJoin := filepath.Join(pathSplit[2:]...) + err = os.Remove(pathJoin) if err != nil { return err } -- cgit v1.2.3 From d207c7d0f01bf3debd7b675dec0cf9243dac8a2e Mon Sep 17 00:00:00 2001 From: Ollie Phillips Date: Tue, 26 Mar 2019 22:55:36 +0000 Subject: avoid feeding filepath.Join panicable slice --- system/admin/filesystem.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/admin/filesystem.go b/system/admin/filesystem.go index e556ec8..758966b 100644 --- a/system/admin/filesystem.go +++ b/system/admin/filesystem.go @@ -26,8 +26,8 @@ func deleteUploadFromDisk(target string) error { // split and rebuild path in OS friendly way // use path to delete the physical file from disk - pathSplit := strings.Split(upload.Path, "/") - pathJoin := filepath.Join(pathSplit[2:]...) + pathSplit := strings.Split(strings.TrimPrefix(upload.Path, "/api/"), "/") + pathJoin := filepath.Join(pathSplit...) err = os.Remove(pathJoin) if err != nil { return err -- cgit v1.2.3