diff options
| -rw-r--r-- | system/addon/addon.go | 6 | ||||
| -rw-r--r-- | system/admin/handlers.go | 133 | ||||
| -rw-r--r-- | system/item/item.go | 66 |
3 files changed, 202 insertions, 3 deletions
diff --git a/system/addon/addon.go b/system/addon/addon.go index 5414d6f..dd3d00a 100644 --- a/system/addon/addon.go +++ b/system/addon/addon.go @@ -237,3 +237,9 @@ func reverseDNS(meta Meta) (string, error) { return strings.Join(append(strap, name), "."), nil } + +// String returns the addon name and overrides the item String() method in +// item.Identifiable interface +func (a *Addon) String() string { + return a.PonzuAddonName +} diff --git a/system/admin/handlers.go b/system/admin/handlers.go index bb36e39..23c7e50 100644 --- a/system/admin/handlers.go +++ b/system/admin/handlers.go @@ -1913,6 +1913,20 @@ func editHandler(res http.ResponseWriter, req *http.Request) { return } + if cid == "-1" { + err = hook.BeforeAdminCreate(res, req) + if err != nil { + log.Println("Error running BeforeAdminCreate method in editHandler for:", t, err) + return + } + } else { + err = hook.BeforeAdminUpdate(res, req) + if err != nil { + log.Println("Error running BeforeAdminUpdate method in editHandler for:", t, err) + return + } + } + err = hook.BeforeSave(res, req) if err != nil { log.Println("Error running BeforeSave method in editHandler for:", t, err) @@ -1942,6 +1956,20 @@ func editHandler(res http.ResponseWriter, req *http.Request) { return } + if cid == "-1" { + err = hook.AfterAdminCreate(res, req) + if err != nil { + log.Println("Error running AfterAdminUpdate method in editHandler for:", t, err) + return + } + } else { + err = hook.AfterAdminUpdate(res, req) + if err != nil { + log.Println("Error running AfterAdminUpdate method in editHandler for:", t, err) + return + } + } + scheme := req.URL.Scheme host := req.URL.Host path := req.URL.Path @@ -2029,6 +2057,12 @@ func deleteHandler(res http.ResponseWriter, req *http.Request) { } } + err = hook.BeforeAdminDelete(res, req) + if err != nil { + log.Println("Error running BeforeAdminDelete method in deleteHandler for:", t, err) + return + } + err = hook.BeforeDelete(res, req) if err != nil { log.Println("Error running BeforeDelete method in deleteHandler for:", t, err) @@ -2048,6 +2082,12 @@ func deleteHandler(res http.ResponseWriter, req *http.Request) { return } + err = hook.AfterAdminDelete(res, req) + if err != nil { + log.Println("Error running AfterDelete method in deleteHandler for:", t, err) + return + } + if reject == "true" { err = hook.AfterReject(res, req) if err != nil { @@ -2698,7 +2738,21 @@ func addonsHandler(res http.ResponseWriter, req *http.Request) { id := req.PostFormValue("id") action := strings.ToLower(req.PostFormValue("action")) - _, err = db.Addon(id) + at, ok := addon.Types[id] + if !ok { + log.Println("Error: no addon type found for:", id) + log.Println(err) + res.WriteHeader(http.StatusNotFound) + errView, err := Error404() + if err != nil { + return + } + + res.Write(errView) + return + } + + b, err := db.Addon(id) if err == db.ErrNoAddonExists { log.Println(err) res.WriteHeader(http.StatusNotFound) @@ -2722,9 +2776,55 @@ func addonsHandler(res http.ResponseWriter, req *http.Request) { return } + adn := at() + err = json.Unmarshal(b, adn) + if err != nil { + log.Println(err) + res.WriteHeader(http.StatusInternalServerError) + errView, err := Error500() + if err != nil { + return + } + + res.Write(errView) + return + } + + h, ok := adn.(item.Hookable) + if !ok { + log.Println("Addon", adn, "does not implement the item.Hookable interface or embed item.Item") + return + } + switch action { case "enable": - err := addon.Enable(id) + err := h.BeforeEnable(res, req) + if err != nil { + log.Println(err) + res.WriteHeader(http.StatusInternalServerError) + errView, err := Error500() + if err != nil { + return + } + + res.Write(errView) + return + } + + err = addon.Enable(id) + if err != nil { + log.Println(err) + res.WriteHeader(http.StatusInternalServerError) + errView, err := Error500() + if err != nil { + return + } + + res.Write(errView) + return + } + + err = h.AfterEnable(res, req) if err != nil { log.Println(err) res.WriteHeader(http.StatusInternalServerError) @@ -2736,8 +2836,35 @@ func addonsHandler(res http.ResponseWriter, req *http.Request) { res.Write(errView) return } + case "disable": - err := addon.Disable(id) + err := h.BeforeDisable(res, req) + if err != nil { + log.Println(err) + res.WriteHeader(http.StatusInternalServerError) + errView, err := Error500() + if err != nil { + return + } + + res.Write(errView) + return + } + + err = addon.Disable(id) + if err != nil { + log.Println(err) + res.WriteHeader(http.StatusInternalServerError) + errView, err := Error500() + if err != nil { + return + } + + res.Write(errView) + return + } + + err = h.AfterDisable(res, req) if err != nil { log.Println(err) res.WriteHeader(http.StatusInternalServerError) diff --git a/system/item/item.go b/system/item/item.go index caa6faa..f2e8209 100644 --- a/system/item/item.go +++ b/system/item/item.go @@ -56,6 +56,15 @@ type Hookable interface { BeforeAPIDelete(http.ResponseWriter, *http.Request) error AfterAPIDelete(http.ResponseWriter, *http.Request) error + BeforeAdminCreate(http.ResponseWriter, *http.Request) error + AfterAdminCreate(http.ResponseWriter, *http.Request) error + + BeforeAdminUpdate(http.ResponseWriter, *http.Request) error + AfterAdminUpdate(http.ResponseWriter, *http.Request) error + + BeforeAdminDelete(http.ResponseWriter, *http.Request) error + AfterAdminDelete(http.ResponseWriter, *http.Request) error + BeforeSave(http.ResponseWriter, *http.Request) error AfterSave(http.ResponseWriter, *http.Request) error @@ -67,6 +76,13 @@ type Hookable interface { BeforeReject(http.ResponseWriter, *http.Request) error AfterReject(http.ResponseWriter, *http.Request) error + + // Enable/Disable used for addons + BeforeEnable(http.ResponseWriter, *http.Request) error + AfterEnable(http.ResponseWriter, *http.Request) error + + BeforeDisable(http.ResponseWriter, *http.Request) error + AfterDisable(http.ResponseWriter, *http.Request) error } // Hideable lets a user keep items hidden @@ -173,6 +189,36 @@ func (i Item) AfterAPIDelete(res http.ResponseWriter, req *http.Request) error { return nil } +// BeforeAdminCreate is a no-op to ensure structs which embed Item implement Hookable +func (i Item) BeforeAdminCreate(res http.ResponseWriter, req *http.Request) error { + return nil +} + +// AfterAdminCreate is a no-op to ensure structs which embed Item implement Hookable +func (i Item) AfterAdminCreate(res http.ResponseWriter, req *http.Request) error { + return nil +} + +// BeforeAdminUpdate is a no-op to ensure structs which embed Item implement Hookable +func (i Item) BeforeAdminUpdate(res http.ResponseWriter, req *http.Request) error { + return nil +} + +// AfterAdminUpdate is a no-op to ensure structs which embed Item implement Hookable +func (i Item) AfterAdminUpdate(res http.ResponseWriter, req *http.Request) error { + return nil +} + +// BeforeAdminDelete is a no-op to ensure structs which embed Item implement Hookable +func (i Item) BeforeAdminDelete(res http.ResponseWriter, req *http.Request) error { + return nil +} + +// AfterAdminDelete is a no-op to ensure structs which embed Item implement Hookable +func (i Item) AfterAdminDelete(res http.ResponseWriter, req *http.Request) error { + return nil +} + // BeforeSave is a no-op to ensure structs which embed Item implement Hookable func (i Item) BeforeSave(res http.ResponseWriter, req *http.Request) error { return nil @@ -213,6 +259,26 @@ func (i Item) AfterReject(res http.ResponseWriter, req *http.Request) error { return nil } +// BeforeEnable is a no-op to ensure structs which embed Item implement Hookable +func (i Item) BeforeEnable(res http.ResponseWriter, req *http.Request) error { + return nil +} + +// AfterEnable is a no-op to ensure structs which embed Item implement Hookable +func (i Item) AfterEnable(res http.ResponseWriter, req *http.Request) error { + return nil +} + +// BeforeDisable is a no-op to ensure structs which embed Item implement Hookable +func (i Item) BeforeDisable(res http.ResponseWriter, req *http.Request) error { + return nil +} + +// AfterDisable is a no-op to ensure structs which embed Item implement Hookable +func (i Item) AfterDisable(res http.ResponseWriter, req *http.Request) error { + return nil +} + // SearchMapping returns a default implementation of a Bleve IndexMappingImpl // partially implements search.Searchable func (i Item) SearchMapping() (*mapping.IndexMappingImpl, error) { |