mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 12:12:25 -05:00 
			
		
		
		
	updates our codeberg.org/gruf/go-kv log key-value formatting library to latest version, which comes with some maaaaaaajor speed boosts in the form of:
- very minimal reflect.Value{} usage
- caching prepared formatting functions per type
~~still a work-in-progress until i make a release tag on the go-kv repository, which itself is waiting on published benchmark results in the README and finishing writing some code comments~~
benchmarks so far show this to be ~3x faster than the "fmt" stdlib package on average, when run across a wide variety (106 different types) of test cases, while still creating more visually friendly log output and actually recursing down nested struct ptrs
Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4341
Co-authored-by: kim <grufwub@gmail.com>
Co-committed-by: kim <grufwub@gmail.com>
		
	
			
		
			
				
	
	
		
			148 lines
		
	
	
	
		
			4 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			148 lines
		
	
	
	
		
			4 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // GoToSocial
 | |
| // Copyright (C) GoToSocial Authors admin@gotosocial.org
 | |
| // SPDX-License-Identifier: AGPL-3.0-or-later
 | |
| //
 | |
| // This program is free software: you can redistribute it and/or modify
 | |
| // it under the terms of the GNU Affero General Public License as published by
 | |
| // the Free Software Foundation, either version 3 of the License, or
 | |
| // (at your option) any later version.
 | |
| //
 | |
| // This program is distributed in the hope that it will be useful,
 | |
| // but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | |
| // GNU Affero General Public License for more details.
 | |
| //
 | |
| // You should have received a copy of the GNU Affero General Public License
 | |
| // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | |
| 
 | |
| package middleware
 | |
| 
 | |
| import (
 | |
| 	"fmt"
 | |
| 	"net/http"
 | |
| 	"strings"
 | |
| 	"time"
 | |
| 
 | |
| 	"code.superseriousbusiness.org/gotosocial/internal/gtscontext"
 | |
| 	"code.superseriousbusiness.org/gotosocial/internal/gtserror"
 | |
| 	"code.superseriousbusiness.org/gotosocial/internal/log"
 | |
| 	"code.superseriousbusiness.org/gotosocial/internal/util"
 | |
| 	"codeberg.org/gruf/go-bytesize"
 | |
| 	"codeberg.org/gruf/go-kv/v2"
 | |
| 	"github.com/gin-gonic/gin"
 | |
| )
 | |
| 
 | |
| // Logger returns a gin middleware which provides request logging and panic recovery.
 | |
| func Logger(logClientIP bool) gin.HandlerFunc {
 | |
| 	return func(c *gin.Context) {
 | |
| 		// Determine pre-handler time
 | |
| 		before := time.Now()
 | |
| 
 | |
| 		// defer so that we log *after
 | |
| 		// the request has completed*
 | |
| 		defer func() {
 | |
| 
 | |
| 			// Get response status code.
 | |
| 			code := c.Writer.Status()
 | |
| 
 | |
| 			// Get request context.
 | |
| 			ctx := c.Request.Context()
 | |
| 
 | |
| 			// Recover from any panics
 | |
| 			// and dump stack to stderr.
 | |
| 			if r := util.Recover(); r != nil {
 | |
| 
 | |
| 				if code == 0 {
 | |
| 					// No response was written, send a generic Internal Error
 | |
| 					c.Writer.WriteHeader(http.StatusInternalServerError)
 | |
| 				}
 | |
| 
 | |
| 				// Append panic information to the request.
 | |
| 				err := fmt.Errorf("recovered panic: %v", r)
 | |
| 				_ = c.Error(err)
 | |
| 			}
 | |
| 
 | |
| 			// Initialize the logging fields
 | |
| 			fields := make(kv.Fields, 5, 8)
 | |
| 
 | |
| 			// Set request logging fields
 | |
| 			fields[0] = kv.Field{"latency", time.Since(before)}
 | |
| 			fields[1] = kv.Field{"userAgent", c.Request.UserAgent()}
 | |
| 			fields[2] = kv.Field{"method", c.Request.Method}
 | |
| 			fields[3] = kv.Field{"statusCode", code}
 | |
| 
 | |
| 			// If the request contains sensitive query
 | |
| 			// data only log path, else log entire URI.
 | |
| 			if sensitiveQuery(c.Request.URL.RawQuery) {
 | |
| 				path := c.Request.URL.Path
 | |
| 				fields[4] = kv.Field{"uri", path}
 | |
| 			} else {
 | |
| 				uri := c.Request.RequestURI
 | |
| 				fields[4] = kv.Field{"uri", uri}
 | |
| 			}
 | |
| 
 | |
| 			if logClientIP {
 | |
| 				// Append IP only if configured to.
 | |
| 				fields = append(fields, kv.Field{
 | |
| 					"clientIP", c.ClientIP(),
 | |
| 				})
 | |
| 			}
 | |
| 
 | |
| 			if pubKeyID := gtscontext.HTTPSignaturePubKeyID(ctx); pubKeyID != nil {
 | |
| 				// Append public key ID if attached.
 | |
| 				fields = append(fields, kv.Field{
 | |
| 					"pubKeyID", pubKeyID.String(),
 | |
| 				})
 | |
| 			}
 | |
| 
 | |
| 			if len(c.Errors) > 0 {
 | |
| 				// Always attach any found errors.
 | |
| 				fields = append(fields, kv.Field{
 | |
| 					"errors", c.Errors,
 | |
| 				})
 | |
| 			}
 | |
| 
 | |
| 			// Create entry
 | |
| 			// with fields.
 | |
| 			l := log.New().
 | |
| 				WithContext(ctx).
 | |
| 				WithFields(fields...)
 | |
| 
 | |
| 			// Default is info
 | |
| 			lvl := log.INFO
 | |
| 
 | |
| 			if code >= 500 {
 | |
| 				// Actual error.
 | |
| 				lvl = log.ERROR
 | |
| 			}
 | |
| 
 | |
| 			// Get appropriate text for this code.
 | |
| 			statusText := http.StatusText(code)
 | |
| 			if statusText == "" {
 | |
| 				// Look for custom codes.
 | |
| 				switch code {
 | |
| 				case gtserror.StatusClientClosedRequest:
 | |
| 					statusText = gtserror.StatusTextClientClosedRequest
 | |
| 				default:
 | |
| 					statusText = "Unknown Status"
 | |
| 				}
 | |
| 			}
 | |
| 
 | |
| 			// Generate a nicer looking bytecount.
 | |
| 			size := bytesize.Size(c.Writer.Size()) // #nosec G115 -- Just logging
 | |
| 
 | |
| 			// Write log entry with status text + body size.
 | |
| 			l.Logf(lvl, "%s: wrote %s", statusText, size)
 | |
| 		}()
 | |
| 
 | |
| 		// Process
 | |
| 		// request.
 | |
| 		c.Next()
 | |
| 	}
 | |
| }
 | |
| 
 | |
| // sensitiveQuery checks whether given query string
 | |
| // contains sensitive data that shouldn't be logged.
 | |
| func sensitiveQuery(query string) bool {
 | |
| 	return strings.Contains(query, "token")
 | |
| }
 |