From 33cb4defd2273abd50ad90f8ffbac4dd21b479a8 Mon Sep 17 00:00:00 2001 From: nhyatt Date: Thu, 25 Jan 2024 07:08:36 -0600 Subject: [PATCH] adds request log to txt/json endpoints removes un-necessary debug log --- internal/nsupdate/nsupdate.go | 2 -- internal/webserver/httpServer.go | 6 ++++++ internal/webserver/httpTemplate.go | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/internal/nsupdate/nsupdate.go b/internal/nsupdate/nsupdate.go index 9451a16..d588a62 100644 --- a/internal/nsupdate/nsupdate.go +++ b/internal/nsupdate/nsupdate.go @@ -52,8 +52,6 @@ func (c NsUpdateStruct) UpdateTXT(record, recordType, value string) error { } oldTXT := strings.TrimLeft(strings.TrimRight(stdout.String(), "\n\""), "\"") - config.Cfg.Log.Debug("existing record", "record", strings.ReplaceAll(oldTXT, `" "`, ``)) - config.Cfg.Log.Debug("new record", "record", strings.ReplaceAll(value, `" "`, ``)) if strings.ReplaceAll(oldTXT, `" "`, ``) != strings.ReplaceAll(value, `" "`, ``) { config.Cfg.Log.Debug("deleting record", "record", record) diff --git a/internal/webserver/httpServer.go b/internal/webserver/httpServer.go index dfd5f0c..1091417 100644 --- a/internal/webserver/httpServer.go +++ b/internal/webserver/httpServer.go @@ -125,6 +125,9 @@ func webRoot(w http.ResponseWriter, r *http.Request) { } 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.") @@ -155,6 +158,9 @@ func webJSON(w http.ResponseWriter, r *http.Request) { } 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.") diff --git a/internal/webserver/httpTemplate.go b/internal/webserver/httpTemplate.go index 4fa01b7..2afbdc7 100644 --- a/internal/webserver/httpTemplate.go +++ b/internal/webserver/httpTemplate.go @@ -147,5 +147,6 @@ func tmpltTXT(w http.ResponseWriter) { return } + w.Header().Add("Content-Type", TYPE_TEXT_PLAIN) w.Write(msgBuffer.Bytes()) //nolint:errcheck }