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(+) (limited to 'system') 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(-) (limited to 'system') 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(-) (limited to 'system') 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(-) (limited to 'system') 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(-) (limited to 'system') 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(-) (limited to 'system') 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 From 890c2862327e959411671001c8cc59b319ea57c0 Mon Sep 17 00:00:00 2001 From: Ollie Phillips Date: Fri, 29 Mar 2019 10:36:20 +0000 Subject: api before/after response hooks --- system/api/handlers.go | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ system/item/item.go | 27 ++++++++++++++----- 2 files changed, 93 insertions(+), 7 deletions(-) (limited to 'system') diff --git a/system/api/handlers.go b/system/api/handlers.go index 20356e9..29707fe 100644 --- a/system/api/handlers.go +++ b/system/api/handlers.go @@ -100,7 +100,31 @@ func contentsHandler(res http.ResponseWriter, req *http.Request) { return } + // assert hookable + get := it() + hook, ok := get.(item.Hookable) + if !ok { + log.Println("[Response] error: Type", t, "does not implement item.Hookable or embed item.Item.") + res.WriteHeader(http.StatusBadRequest) + return + } + + // hook before response + err = hook.BeforeAPIResponse(res, req) + if err != nil { + log.Println("[Response] error calling BeforeAPIResponse:", err) + res.WriteHeader(http.StatusInternalServerError) + return + } + sendData(res, req, j) + + // hook after response + err = hook.AfterAPIResponse(res, req) + if err != nil { + log.Println("[Response] error calling AfterAPIResponse:", err) + return + } } func contentHandler(res http.ResponseWriter, req *http.Request) { @@ -156,7 +180,31 @@ func contentHandler(res http.ResponseWriter, req *http.Request) { return } + // assert hookable + get := p + hook, ok := get.(item.Hookable) + if !ok { + log.Println("[Response] error: Type", t, "does not implement item.Hookable or embed item.Item.") + res.WriteHeader(http.StatusBadRequest) + return + } + + // hook before response + err = hook.BeforeAPIResponse(res, req) + if err != nil { + log.Println("[Response] error calling BeforeAPIResponse:", err) + res.WriteHeader(http.StatusInternalServerError) + return + } + sendData(res, req, j) + + // hook after response + err = hook.AfterAPIResponse(res, req) + if err != nil { + log.Println("[Response] error calling AfterAPIResponse:", err) + return + } } func contentHandlerBySlug(res http.ResponseWriter, req *http.Request) { @@ -206,7 +254,32 @@ func contentHandlerBySlug(res http.ResponseWriter, req *http.Request) { return } + // assert hookable + get := p + hook, ok := get.(item.Hookable) + if !ok { + log.Println("[Response] error: Type", t, "does not implement item.Hookable or embed item.Item.") + res.WriteHeader(http.StatusBadRequest) + return + } + + // hook before response + err = hook.BeforeAPIResponse(res, req) + if err != nil { + log.Println("[Response] error calling BeforeAPIResponse:", err) + res.WriteHeader(http.StatusInternalServerError) + return + } + sendData(res, req, j) + + // hook after response + err = hook.AfterAPIResponse(res, req) + if err != nil { + log.Println("[Response] error calling AfterAPIResponse:", err) + return + } + } func uploadsHandler(res http.ResponseWriter, req *http.Request) { diff --git a/system/item/item.go b/system/item/item.go index 1108ae0..51ac2a9 100644 --- a/system/item/item.go +++ b/system/item/item.go @@ -24,13 +24,13 @@ func init() { // We store the compiled regex as the key // and assign the replacement as the map's value. rxList = map[*regexp.Regexp][]byte{ - regexp.MustCompile("`[-]+`"): []byte("-"), - regexp.MustCompile("[[:space:]]"): []byte("-"), - regexp.MustCompile("[[:blank:]]"): []byte(""), - regexp.MustCompile("`[^a-z0-9]`i"): []byte("-"), - regexp.MustCompile("[!/:-@[-`{-~]"): []byte(""), - regexp.MustCompile("/[^\x20-\x7F]/"): []byte(""), - regexp.MustCompile("`&(amp;)?#?[a-z0-9]+;`i"): []byte("-"), + regexp.MustCompile("`[-]+`"): []byte("-"), + regexp.MustCompile("[[:space:]]"): []byte("-"), + regexp.MustCompile("[[:blank:]]"): []byte(""), + regexp.MustCompile("`[^a-z0-9]`i"): []byte("-"), + regexp.MustCompile("[!/:-@[-`{-~]"): []byte(""), + regexp.MustCompile("/[^\x20-\x7F]/"): []byte(""), + regexp.MustCompile("`&(amp;)?#?[a-z0-9]+;`i"): []byte("-"), regexp.MustCompile("`&([a-z])(acute|uml|circ|grave|ring|cedil|slash|tilde|caron|lig|quot|rsquo);`i"): []byte("\\1"), } } @@ -65,6 +65,9 @@ type Sortable interface { // to the different lifecycles/events a struct may encounter. Item implements // Hookable with no-ops so our user can override only whichever ones necessary. type Hookable interface { + BeforeAPIResponse(http.ResponseWriter, *http.Request) error + AfterAPIResponse(http.ResponseWriter, *http.Request) error + BeforeAPICreate(http.ResponseWriter, *http.Request) error AfterAPICreate(http.ResponseWriter, *http.Request) error @@ -177,6 +180,16 @@ func (i Item) String() string { return fmt.Sprintf("Item ID: %s", i.UniqueID()) } +// BeforeAPIResponse is a no-op to ensure structs which embed Item implement Hookable +func (i Item) BeforeAPIResponse(res http.ResponseWriter, req *http.Request) error { + return nil +} + +// AfterAPIResponse is a no-op to ensure structs which embed Item implement Hookable +func (i Item) AfterAPIResponse(res http.ResponseWriter, req *http.Request) error { + return nil +} + // BeforeAPICreate is a no-op to ensure structs which embed Item implement Hookable func (i Item) BeforeAPICreate(res http.ResponseWriter, req *http.Request) error { return nil -- cgit v1.2.3 From 7063494d6c82e784878b6fca79e9442c43578954 Mon Sep 17 00:00:00 2001 From: Ollie Phillips Date: Fri, 29 Mar 2019 12:05:42 +0000 Subject: passing data to hooks --- system/api/handlers.go | 12 ++++++------ system/item/item.go | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'system') diff --git a/system/api/handlers.go b/system/api/handlers.go index 29707fe..41c7ee5 100644 --- a/system/api/handlers.go +++ b/system/api/handlers.go @@ -110,7 +110,7 @@ func contentsHandler(res http.ResponseWriter, req *http.Request) { } // hook before response - err = hook.BeforeAPIResponse(res, req) + j, err = hook.BeforeAPIResponse(res, req, j) if err != nil { log.Println("[Response] error calling BeforeAPIResponse:", err) res.WriteHeader(http.StatusInternalServerError) @@ -120,7 +120,7 @@ func contentsHandler(res http.ResponseWriter, req *http.Request) { sendData(res, req, j) // hook after response - err = hook.AfterAPIResponse(res, req) + _, err = hook.AfterAPIResponse(res, req, j) if err != nil { log.Println("[Response] error calling AfterAPIResponse:", err) return @@ -190,7 +190,7 @@ func contentHandler(res http.ResponseWriter, req *http.Request) { } // hook before response - err = hook.BeforeAPIResponse(res, req) + j, err = hook.BeforeAPIResponse(res, req, j) if err != nil { log.Println("[Response] error calling BeforeAPIResponse:", err) res.WriteHeader(http.StatusInternalServerError) @@ -200,7 +200,7 @@ func contentHandler(res http.ResponseWriter, req *http.Request) { sendData(res, req, j) // hook after response - err = hook.AfterAPIResponse(res, req) + _, err = hook.AfterAPIResponse(res, req, j) if err != nil { log.Println("[Response] error calling AfterAPIResponse:", err) return @@ -264,7 +264,7 @@ func contentHandlerBySlug(res http.ResponseWriter, req *http.Request) { } // hook before response - err = hook.BeforeAPIResponse(res, req) + j, err = hook.BeforeAPIResponse(res, req, j) if err != nil { log.Println("[Response] error calling BeforeAPIResponse:", err) res.WriteHeader(http.StatusInternalServerError) @@ -274,7 +274,7 @@ func contentHandlerBySlug(res http.ResponseWriter, req *http.Request) { sendData(res, req, j) // hook after response - err = hook.AfterAPIResponse(res, req) + _, err = hook.AfterAPIResponse(res, req, j) if err != nil { log.Println("[Response] error calling AfterAPIResponse:", err) return diff --git a/system/item/item.go b/system/item/item.go index 51ac2a9..8be21ae 100644 --- a/system/item/item.go +++ b/system/item/item.go @@ -65,8 +65,8 @@ type Sortable interface { // to the different lifecycles/events a struct may encounter. Item implements // Hookable with no-ops so our user can override only whichever ones necessary. type Hookable interface { - BeforeAPIResponse(http.ResponseWriter, *http.Request) error - AfterAPIResponse(http.ResponseWriter, *http.Request) error + BeforeAPIResponse(http.ResponseWriter, *http.Request, []byte) ([]byte, error) + AfterAPIResponse(http.ResponseWriter, *http.Request, []byte) ([]byte, error) BeforeAPICreate(http.ResponseWriter, *http.Request) error AfterAPICreate(http.ResponseWriter, *http.Request) error @@ -181,13 +181,13 @@ func (i Item) String() string { } // BeforeAPIResponse is a no-op to ensure structs which embed Item implement Hookable -func (i Item) BeforeAPIResponse(res http.ResponseWriter, req *http.Request) error { - return nil +func (i Item) BeforeAPIResponse(res http.ResponseWriter, req *http.Request, data []byte) ([]byte, error) { + return data, nil } // AfterAPIResponse is a no-op to ensure structs which embed Item implement Hookable -func (i Item) AfterAPIResponse(res http.ResponseWriter, req *http.Request) error { - return nil +func (i Item) AfterAPIResponse(res http.ResponseWriter, req *http.Request, data []byte) ([]byte, error) { + return data, nil } // BeforeAPICreate is a no-op to ensure structs which embed Item implement Hookable -- cgit v1.2.3 From 878d593ef5da1435c83bf7bb229f8619c1cab9ff Mon Sep 17 00:00:00 2001 From: Ollie Phillips Date: Thu, 4 Apr 2019 15:30:15 +0100 Subject: removed []byte return on AfterAPIResponse, not needed) --- system/api/handlers.go | 6 +++--- system/item/item.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'system') diff --git a/system/api/handlers.go b/system/api/handlers.go index 41c7ee5..99db799 100644 --- a/system/api/handlers.go +++ b/system/api/handlers.go @@ -120,7 +120,7 @@ func contentsHandler(res http.ResponseWriter, req *http.Request) { sendData(res, req, j) // hook after response - _, err = hook.AfterAPIResponse(res, req, j) + err = hook.AfterAPIResponse(res, req, j) if err != nil { log.Println("[Response] error calling AfterAPIResponse:", err) return @@ -200,7 +200,7 @@ func contentHandler(res http.ResponseWriter, req *http.Request) { sendData(res, req, j) // hook after response - _, err = hook.AfterAPIResponse(res, req, j) + err = hook.AfterAPIResponse(res, req, j) if err != nil { log.Println("[Response] error calling AfterAPIResponse:", err) return @@ -274,7 +274,7 @@ func contentHandlerBySlug(res http.ResponseWriter, req *http.Request) { sendData(res, req, j) // hook after response - _, err = hook.AfterAPIResponse(res, req, j) + err = hook.AfterAPIResponse(res, req, j) if err != nil { log.Println("[Response] error calling AfterAPIResponse:", err) return diff --git a/system/item/item.go b/system/item/item.go index 8be21ae..34ced58 100644 --- a/system/item/item.go +++ b/system/item/item.go @@ -66,7 +66,7 @@ type Sortable interface { // Hookable with no-ops so our user can override only whichever ones necessary. type Hookable interface { BeforeAPIResponse(http.ResponseWriter, *http.Request, []byte) ([]byte, error) - AfterAPIResponse(http.ResponseWriter, *http.Request, []byte) ([]byte, error) + AfterAPIResponse(http.ResponseWriter, *http.Request, []byte) error BeforeAPICreate(http.ResponseWriter, *http.Request) error AfterAPICreate(http.ResponseWriter, *http.Request) error @@ -186,8 +186,8 @@ func (i Item) BeforeAPIResponse(res http.ResponseWriter, req *http.Request, data } // AfterAPIResponse is a no-op to ensure structs which embed Item implement Hookable -func (i Item) AfterAPIResponse(res http.ResponseWriter, req *http.Request, data []byte) ([]byte, error) { - return data, nil +func (i Item) AfterAPIResponse(res http.ResponseWriter, req *http.Request, data []byte) error { + return nil } // BeforeAPICreate is a no-op to ensure structs which embed Item implement Hookable -- cgit v1.2.3