diff options
| -rw-r--r-- | cmd/server/main.go | 4 | ||||
| -rw-r--r-- | internal/webserver/webserver.go | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/cmd/server/main.go b/cmd/server/main.go index 02635f3..631082d 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -161,12 +161,12 @@ func reloadTosAndPrivacy() bool { return false } } - tos, err := os.ReadFile(tosFile) + tos, err := os.ReadFile(tosFile) // #nosec G304 if err != nil { slog.Error("error reading TOS file", "error", err) return false } - privacy, err := os.ReadFile(privacyFile) + privacy, err := os.ReadFile(privacyFile) // #nosec G304 if err != nil { slog.Error("error reading Privacy file", "error", err) return false diff --git a/internal/webserver/webserver.go b/internal/webserver/webserver.go index 0e52515..ac58de4 100644 --- a/internal/webserver/webserver.go +++ b/internal/webserver/webserver.go @@ -6,12 +6,14 @@ import ( "log/slog" "net/http" "strings" + "time" "github.com/gomarkdown/markdown" "github.com/gomarkdown/markdown/html" "github.com/gomarkdown/markdown/parser" "github.com/kyren223/eko/embeds" + "github.com/kyren223/eko/pkg/assert" ) func ServeEkoWebsite() { @@ -19,7 +21,8 @@ func ServeEkoWebsite() { http.HandleFunc("/style.css", func(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "text/css") - w.Write([]byte(css)) + _, err := w.Write([]byte(css)) + assert.NoError(err, "css *should* be valid") }) http.HandleFunc("/terms-of-service", func(w http.ResponseWriter, r *http.Request) { @@ -38,7 +41,15 @@ func ServeEkoWebsite() { writeLegalLayoutHtml(w, html) }) - slog.Error("webserver error", "error", http.ListenAndServe(":7443", nil)) + srv := &http.Server{ + Addr: ":7443", + Handler: http.DefaultServeMux, + ReadTimeout: 5 * time.Second, + WriteTimeout: 10 * time.Second, + IdleTimeout: 120 * time.Second, + } + + slog.Error("webserver error", "error", srv.ListenAndServe()) } func writeLegalLayoutHtml(w io.Writer, html string) { |