From 7e2422a0a9499721bb01114e7dea781515e91a5b Mon Sep 17 00:00:00 2001 From: nhyatt Date: Mon, 12 Feb 2024 07:57:37 -0600 Subject: [PATCH] more more strings to constants --- internal/webserver/httpServer.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/internal/webserver/httpServer.go b/internal/webserver/httpServer.go index 1091417..c77db70 100644 --- a/internal/webserver/httpServer.go +++ b/internal/webserver/httpServer.go @@ -31,6 +31,8 @@ const ( TYPE_TEXT_JS string = "text/javascript" TYPE_TEXT_PLAIN string = "text/plain" TYPE_TEXT_RAW string = "text/raw" + + DEBUG_INVALID_METHOD string = "http invalid method" ) var validFiles map[string]string = map[string]string{ @@ -89,9 +91,9 @@ func webRoot(w http.ResponseWriter, r *http.Request) { httpAccessLog(r) crossSiteOrigin(w) - if strings.ToLower(r.Method) != "get" { - config.Cfg.Log.Debug("http invalid method", "url", r.URL.Path, "expected", "GET", "received", r.Method) - tmpltError(w, http.StatusBadRequest, "Invalid http method.") + if !strings.EqualFold(r.Method, http.MethodGet) { + config.Cfg.Log.Debug(DEBUG_INVALID_METHOD, "url", r.URL.Path, "expected", http.MethodGet, "received", r.Method) + tmpltError(w, http.StatusBadRequest, DEBUG_INVALID_METHOD) return } @@ -128,9 +130,9 @@ func webJSON(w http.ResponseWriter, r *http.Request) { httpAccessLog(r) crossSiteOrigin(w) - if strings.ToLower(r.Method) != "get" { - config.Cfg.Log.Debug("http invalid method", "url", r.URL.Path, "expected", "GET", "received", r.Method) - tmpltError(w, http.StatusBadRequest, "Invalid http method.") + if !strings.EqualFold(r.Method, http.MethodGet) { + config.Cfg.Log.Debug(DEBUG_INVALID_METHOD, "url", r.URL.Path, "expected", http.MethodGet, "received", r.Method) + tmpltError(w, http.StatusBadRequest, DEBUG_INVALID_METHOD) return } @@ -161,9 +163,9 @@ func webTXT(w http.ResponseWriter, r *http.Request) { httpAccessLog(r) crossSiteOrigin(w) - if strings.ToLower(r.Method) != "get" { - config.Cfg.Log.Debug("http invalid method", "url", r.URL.Path, "expected", "GET", "received", r.Method) - tmpltError(w, http.StatusBadRequest, "Invalid http method.") + if !strings.EqualFold(r.Method, http.MethodGet) { + config.Cfg.Log.Debug(DEBUG_INVALID_METHOD, "url", r.URL.Path, "expected", http.MethodGet, "received", r.Method) + tmpltError(w, http.StatusBadRequest, DEBUG_INVALID_METHOD) return }