mirror of
https://github.com/NotAShelf/watchdog.git
synced 2026-06-13 00:18:56 +00:00
various: cleanup
Fixes a status code conflict in `LimitedResponseWriter`, and a clock skew bug that I probably introduced last time I dealt with time. I hate computers. We now use `tie.Since()`, which employs a monotonic clock that is immune to system wall clock changes. Signed-off-by: NotAShelf <raf@notashelf.dev> Change-Id: Iec3147c21c5a295170f48cbf1a4620596a6a6964
This commit is contained in:
parent
3662adc61a
commit
7ecc03ac19
3 changed files with 79 additions and 13 deletions
|
|
@ -198,9 +198,19 @@ func rateLimitMiddleware(next http.Handler, limiter *ratelimit.TokenBucket) http
|
|||
// Wraps http.ResponseWriter to enforce max response size
|
||||
type limitedResponseWriter struct {
|
||||
http.ResponseWriter
|
||||
maxSize int
|
||||
written int
|
||||
limitExceeded bool
|
||||
maxSize int
|
||||
written int
|
||||
limitExceeded bool
|
||||
headersWritten bool
|
||||
statusCode int
|
||||
}
|
||||
|
||||
func (w *limitedResponseWriter) WriteHeader(statusCode int) {
|
||||
if !w.headersWritten {
|
||||
w.statusCode = statusCode
|
||||
w.headersWritten = true
|
||||
w.ResponseWriter.WriteHeader(statusCode)
|
||||
}
|
||||
}
|
||||
|
||||
func (w *limitedResponseWriter) Write(p []byte) (int, error) {
|
||||
|
|
@ -208,11 +218,33 @@ func (w *limitedResponseWriter) Write(p []byte) (int, error) {
|
|||
return 0, fmt.Errorf("response size limit exceeded")
|
||||
}
|
||||
|
||||
// Check if adding this data would exceed the limit
|
||||
if w.written+len(p) > w.maxSize {
|
||||
w.limitExceeded = true
|
||||
w.Header().Set("X-Response-Truncated", "true")
|
||||
http.Error(w.ResponseWriter, "Response size limit exceeded", http.StatusInternalServerError)
|
||||
return 0, fmt.Errorf("response size limit exceeded: %d bytes", w.maxSize)
|
||||
|
||||
// If headers haven't been written yet, we can send an error response
|
||||
if !w.headersWritten {
|
||||
w.Header().Set("X-Response-Truncated", "true")
|
||||
http.Error(w.ResponseWriter, "Response size limit exceeded", http.StatusInternalServerError)
|
||||
return 0, fmt.Errorf("response size limit exceeded: %d bytes", w.maxSize)
|
||||
}
|
||||
|
||||
// Headers already written - we can't change status code
|
||||
// Write only up to the limit and then stop
|
||||
remaining := w.maxSize - w.written
|
||||
if remaining > 0 {
|
||||
_, _ = w.ResponseWriter.Write(p[:remaining])
|
||||
w.written = w.maxSize
|
||||
}
|
||||
return len(p), fmt.Errorf("response size limit exceeded after headers sent")
|
||||
}
|
||||
|
||||
// Normal write
|
||||
if !w.headersWritten {
|
||||
w.headersWritten = true
|
||||
if w.statusCode == 0 {
|
||||
w.statusCode = http.StatusOK
|
||||
}
|
||||
}
|
||||
n, err := w.ResponseWriter.Write(p)
|
||||
w.written += n
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue