mirror/pasty
1
0
Fork 0
mirror of https://github.com/lus/pasty.git synced 2023-08-10 21:13:09 +03:00
Code Issues Projects Releases Wiki Activity

implement request logging

Browse Source
This commit is contained in:
Lukas Schulte Pelkum
2023-06-17 17:00:44 +02:00
parent 127af0a907
commit c414fd7c59
11 changed files with 148 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/web/frontend_server.go
View File

@@ -31,7 +31,7 @@ func frontendHandler(notFoundHandler http.HandlerFunc) http.HandlerFunc {
}
return
}
writeErr(writer, err)
writeErr(request, writer, err)
return
}
defer func() {
@@ -40,7 +40,7 @@ func frontendHandler(notFoundHandler http.HandlerFunc) http.HandlerFunc {
fileInfo, err := file.Stat()
if err != nil {
writeErr(writer, err)
writeErr(request, writer, err)
return
}
@@ -55,7 +55,7 @@ func frontendHandler(notFoundHandler http.HandlerFunc) http.HandlerFunc {
content, err := io.ReadAll(file)
if err != nil {
writeErr(writer, err)
writeErr(request, writer, err)
return
}
@@ -65,10 +65,10 @@ func frontendHandler(notFoundHandler http.HandlerFunc) http.HandlerFunc {
}
}
func serveIndexFile(writer http.ResponseWriter, _ *http.Request) {
func serveIndexFile(writer http.ResponseWriter, request *http.Request) {
indexFile, err := frontend.ReadFile("frontend/index.html")
if err != nil {
writeErr(writer, err)
writeErr(request, writer, err)
return
}
writer.Header().Set("Content-Type", "text/html")

8
internal/web/response_writer.go
View File

@@ -2,10 +2,12 @@ package web
import (
"encoding/json"
"github.com/lus/pasty/pkg/chizerolog"
"net/http"
)
func writeErr(writer http.ResponseWriter, err error) {
func writeErr(request *http.Request, writer http.ResponseWriter, err error) {
chizerolog.InjectError(request, err)
writeString(writer, http.StatusInternalServerError, err.Error())
}
@@ -26,8 +28,8 @@ func writeJSON(writer http.ResponseWriter, status int, value any) error {
return nil
}
func writeJSONOrErr(writer http.ResponseWriter, status int, value any) {
func writeJSONOrErr(request *http.Request, writer http.ResponseWriter, status int, value any) {
if err := writeJSON(writer, status, value); err != nil {
writeErr(writer, err)
writeErr(request, writer, err)
}
}

6
internal/web/server.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/lus/pasty/internal/pastes"
"github.com/lus/pasty/internal/reports"
"github.com/lus/pasty/internal/storage"
"github.com/lus/pasty/pkg/chizerolog"
"net/http"
)
@@ -49,6 +50,9 @@ type Server struct {
func (server *Server) Start() error {
router := chi.NewRouter()
router.Use(chizerolog.Logger)
router.Use(chizerolog.Recover)
// Register the web frontend handler
router.Get("/*", frontendHandler(router.NotFoundHandler()))
@@ -72,7 +76,7 @@ func (server *Server) Start() error {
router.With(server.v2MiddlewareInjectPaste).Post("/api/v2/pastes/{paste_id}/report", server.v2EndpointReportPaste)
}
router.Get("/api/v2/info", func(writer http.ResponseWriter, request *http.Request) {
writeJSONOrErr(writer, http.StatusOK, map[string]any{
writeJSONOrErr(request, writer, http.StatusOK, map[string]any{
"version": meta.Version,
"modificationTokens": server.ModificationTokensEnabled,
"reports": server.ReportClient != nil,

12
internal/web/v2_end_create_paste.go
View File

@@ -18,12 +18,12 @@ func (server *Server) v2EndpointCreatePaste(writer http.ResponseWriter, request
// Read, parse and validate the request payload
body, err := io.ReadAll(request.Body)
if err != nil {
writeErr(writer, err)
writeErr(request, writer, err)
return
}
payload := new(v2EndpointCreatePastePayload)
if err := json.Unmarshal(body, payload); err != nil {
writeErr(writer, err)
writeErr(request, writer, err)
return
}
if payload.Content == "" {
@@ -37,7 +37,7 @@ func (server *Server) v2EndpointCreatePaste(writer http.ResponseWriter, request
id, err := pastes.GenerateID(request.Context(), server.Storage.Pastes(), server.PasteIDCharset, server.PasteIDLength)
if err != nil {
writeErr(writer, err)
writeErr(request, writer, err)
return
}
@@ -54,17 +54,17 @@ func (server *Server) v2EndpointCreatePaste(writer http.ResponseWriter, request
paste.ModificationToken = modificationToken
if err := paste.HashModificationToken(); err != nil {
writeErr(writer, err)
writeErr(request, writer, err)
return
}
}
if err := server.Storage.Pastes().Upsert(request.Context(), paste); err != nil {
writeErr(writer, err)
writeErr(request, writer, err)
return
}
cpy := *paste
cpy.ModificationToken = modificationToken
writeJSONOrErr(writer, http.StatusCreated, cpy)
writeJSONOrErr(request, writer, http.StatusCreated, cpy)
}

3
internal/web/v2_end_delete_paste.go
View File

@@ -13,6 +13,7 @@ func (server *Server) v2EndpointDeletePaste(writer http.ResponseWriter, request
}
if err := server.Storage.Pastes().DeleteByID(request.Context(), paste.ID); err != nil {
writeErr(writer, err)
writeErr(request, writer, err)
}
writer.WriteHeader(http.StatusOK)
}

5
internal/web/v2_end_get_paste.go
View File

@@ -1,6 +1,7 @@
package web
import (
"errors"
"github.com/lus/pasty/internal/pastes"
"net/http"
)
@@ -8,11 +9,11 @@ import (
func (server *Server) v2EndpointGetPaste(writer http.ResponseWriter, request *http.Request) {
paste, ok := request.Context().Value("paste").(*pastes.Paste)
if !ok {
writeString(writer, http.StatusInternalServerError, "missing paste object")
writeErr(request, writer, errors.New("missing paste object"))
return
}
cpy := *paste
cpy.ModificationToken = ""
writeJSONOrErr(writer, http.StatusOK, cpy)
writeJSONOrErr(request, writer, http.StatusOK, cpy)
}

6
internal/web/v2_end_modify_paste.go
View File

@@ -22,12 +22,12 @@ func (server *Server) v2EndpointModifyPaste(writer http.ResponseWriter, request
// Read, parse and validate the request payload
body, err := io.ReadAll(request.Body)
if err != nil {
writeErr(writer, err)
writeErr(request, writer, err)
return
}
payload := new(v2EndpointModifyPastePayload)
if err := json.Unmarshal(body, payload); err != nil {
writeErr(writer, err)
writeErr(request, writer, err)
return
}
if payload.Content != nil && *payload.Content == "" {
@@ -55,6 +55,6 @@ func (server *Server) v2EndpointModifyPaste(writer http.ResponseWriter, request
// Save the modified paste
if err := server.Storage.Pastes().Upsert(request.Context(), paste); err != nil {
writeErr(writer, err)
writeErr(request, writer, err)
}
}

8
internal/web/v2_end_report_paste.go
View File

@@ -22,12 +22,12 @@ func (server *Server) v2EndpointReportPaste(writer http.ResponseWriter, request
// Read, parse and validate the request payload
body, err := io.ReadAll(request.Body)
if err != nil {
writeErr(writer, err)
writeErr(request, writer, err)
return
}
payload := new(v2EndpointReportPastePayload)
if err := json.Unmarshal(body, payload); err != nil {
writeErr(writer, err)
writeErr(request, writer, err)
return
}
if payload.Reason == "" {
@@ -41,8 +41,8 @@ func (server *Server) v2EndpointReportPaste(writer http.ResponseWriter, request
}
response, err := server.ReportClient.Send(report)
if err != nil {
writeErr(writer, err)
writeErr(request, writer, err)
return
}
writeJSONOrErr(writer, http.StatusOK, response)
writeJSONOrErr(request, writer, http.StatusOK, response)
}

5
internal/web/v2_mid_inject_paste.go
View File

@@ -17,10 +17,7 @@ func (server *Server) v2MiddlewareInjectPaste(next http.Handler) http.Handler {
paste, err := server.Storage.Pastes().FindByID(request.Context(), pasteID)
if err != nil {
if pasteID == "" {
writeErr(writer, err)
return
}
writeErr(request, writer, err)
}
if paste == nil {
writeString(writer, http.StatusNotFound, "paste not found")