diff options
| -rw-r--r-- | cmd/ponzu/main.go | 5 | ||||
| -rw-r--r-- | system/admin/handlers.go | 34 | ||||
| -rw-r--r-- | system/db/content.go | 2 | ||||
| -rw-r--r-- | system/db/user.go | 4 | ||||
| -rw-r--r-- | system/tls/enable.go | 5 |
5 files changed, 24 insertions, 26 deletions
diff --git a/cmd/ponzu/main.go b/cmd/ponzu/main.go index 434de67..48aef9e 100644 --- a/cmd/ponzu/main.go +++ b/cmd/ponzu/main.go @@ -186,10 +186,7 @@ func main() { } if https { - // fmt.Println("TLS through Let's Encrypt is not implemented yet.") - // fmt.Println("Please run 'ponzu serve' without the --https flag for now.") - // os.Exit(1) - + fmt.Println("Enabling HTTPS...") tls.Enable() } diff --git a/system/admin/handlers.go b/system/admin/handlers.go index 5d7ac97..da3a63a 100644 --- a/system/admin/handlers.go +++ b/system/admin/handlers.go @@ -23,7 +23,7 @@ import ( func adminHandler(res http.ResponseWriter, req *http.Request) { view, err := Admin(nil) if err != nil { - fmt.Println(err) + log.Println(err) res.WriteHeader(http.StatusInternalServerError) return } @@ -42,7 +42,7 @@ func initHandler(res http.ResponseWriter, req *http.Request) { case http.MethodGet: view, err := Init() if err != nil { - fmt.Println(err) + log.Println(err) res.WriteHeader(http.StatusInternalServerError) return } @@ -52,7 +52,7 @@ func initHandler(res http.ResponseWriter, req *http.Request) { case http.MethodPost: err := req.ParseForm() if err != nil { - fmt.Println(err) + log.Println(err) res.WriteHeader(http.StatusInternalServerError) return } @@ -72,7 +72,7 @@ func initHandler(res http.ResponseWriter, req *http.Request) { _, err = db.SetUser(usr) if err != nil { - fmt.Println(err) + log.Println(err) res.WriteHeader(http.StatusInternalServerError) return } @@ -81,7 +81,7 @@ func initHandler(res http.ResponseWriter, req *http.Request) { req.Form.Set("admin_email", email) err = db.SetConfig(req.Form) if err != nil { - fmt.Println(err) + log.Println(err) res.WriteHeader(http.StatusInternalServerError) return } @@ -116,7 +116,7 @@ func configHandler(res http.ResponseWriter, req *http.Request) { case http.MethodGet: data, err := db.ConfigAll() if err != nil { - fmt.Println(err) + log.Println(err) res.WriteHeader(http.StatusInternalServerError) return } @@ -125,21 +125,21 @@ func configHandler(res http.ResponseWriter, req *http.Request) { err = json.Unmarshal(data, c) if err != nil { - fmt.Println(err) + log.Println(err) res.WriteHeader(http.StatusInternalServerError) return } cfg, err := c.MarshalEditor() if err != nil { - fmt.Println(err) + log.Println(err) res.WriteHeader(http.StatusInternalServerError) return } adminView, err := Admin(cfg) if err != nil { - fmt.Println(err) + log.Println(err) res.WriteHeader(http.StatusInternalServerError) return } @@ -150,14 +150,14 @@ func configHandler(res http.ResponseWriter, req *http.Request) { case http.MethodPost: err := req.ParseForm() if err != nil { - fmt.Println(err) + log.Println(err) res.WriteHeader(http.StatusInternalServerError) return } err = db.SetConfig(req.Form) if err != nil { - fmt.Println(err) + log.Println(err) res.WriteHeader(http.StatusInternalServerError) return } @@ -175,7 +175,7 @@ func configUsersHandler(res http.ResponseWriter, req *http.Request) { case http.MethodGet: view, err := UsersList(req) if err != nil { - fmt.Println(err) + log.Println(err) res.WriteHeader(http.StatusInternalServerError) errView, err := Error500() if err != nil { @@ -202,11 +202,11 @@ func configUsersHandler(res http.ResponseWriter, req *http.Request) { res.Write(errView) return } + email := strings.ToLower(req.FormValue("email")) password := req.PostFormValue("password") if email == "" || password == "" { - fmt.Println(err) res.WriteHeader(http.StatusInternalServerError) errView, err := Error500() if err != nil { @@ -221,7 +221,7 @@ func configUsersHandler(res http.ResponseWriter, req *http.Request) { _, err = db.SetUser(usr) if err != nil { - fmt.Println(err) + log.Println(err) res.WriteHeader(http.StatusInternalServerError) errView, err := Error500() if err != nil { @@ -247,7 +247,7 @@ func configUsersEditHandler(res http.ResponseWriter, req *http.Request) { // check if user to be edited is current user j, err := db.CurrentUser(req) if err != nil { - fmt.Println(err) + log.Println(err) res.WriteHeader(http.StatusInternalServerError) errView, err := Error500() if err != nil { @@ -261,7 +261,7 @@ func configUsersEditHandler(res http.ResponseWriter, req *http.Request) { usr := &user.User{} err = json.Unmarshal(j, usr) if err != nil { - fmt.Println(err) + log.Println(err) res.WriteHeader(http.StatusInternalServerError) errView, err := Error500() if err != nil { @@ -276,7 +276,7 @@ func configUsersEditHandler(res http.ResponseWriter, req *http.Request) { password := req.PostFormValue("password") if !user.IsUser(usr, password) { - fmt.Println("Unexpected user/password combination for", usr.Email) + log.Println("Unexpected user/password combination for", usr.Email) res.WriteHeader(http.StatusBadRequest) errView, err := Error405() if err != nil { diff --git a/system/db/content.go b/system/db/content.go index 2d6e8ea..9ab1f89 100644 --- a/system/db/content.go +++ b/system/db/content.go @@ -178,7 +178,7 @@ func Content(target string) ([]byte, error) { b := tx.Bucket([]byte(ns)) _, err := val.Write(b.Get([]byte(id))) if err != nil { - fmt.Println(err) + log.Println(err) return err } diff --git a/system/db/user.go b/system/db/user.go index f25c2b2..d2dc3a9 100644 --- a/system/db/user.go +++ b/system/db/user.go @@ -177,14 +177,10 @@ func CurrentUser(req *http.Request) ([]byte, error) { return nil, fmt.Errorf("Error. No user data found in request token.") } - fmt.Println(claims, email.(string)) - usr, err := User(email.(string)) if err != nil { return nil, err } - fmt.Println(string(usr)) - return usr, nil } diff --git a/system/tls/enable.go b/system/tls/enable.go index 4be0aa8..c53fac6 100644 --- a/system/tls/enable.go +++ b/system/tls/enable.go @@ -2,6 +2,7 @@ package tls import ( "crypto/tls" + "fmt" "log" "net/http" "os" @@ -41,6 +42,8 @@ func setup() { if host == nil { log.Fatalln("No 'domain' field set in Configuration. Please add a domain before attempting to make certificates.") } + fmt.Println("Using", host, "as host/domain for certificate...") + fmt.Println("NOTE: if the host/domain is not configured properly or is unreachable, HTTPS set-up will fail.") email, err := db.Config("admin_email") if err != nil { @@ -50,6 +53,7 @@ func setup() { if email == nil { log.Fatalln("No 'admin_email' field set in Configuration. Please add an admin email before attempting to make certificates.") } + fmt.Println("Using", email, "as contact email for certificate...") m = autocert.Manager{ Prompt: autocert.AcceptTOS, @@ -71,4 +75,5 @@ func Enable() { } go log.Fatalln(server.ListenAndServeTLS("", "")) + fmt.Println("Server listening for HTTPS requests...") } |