mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-05-14 05:41:29 +00:00
3f1eaf9724
* fix(s3/audit): emit audit log for successful GET/HEAD Successful GET/HEAD object requests never produced a fluent audit entry because those handlers write the response directly (streaming for GET, WriteHeader for HEAD) and never reach a PostLog call site. The wiki advertises GET as an audited verb, so the asymmetry surprises operators who rely on the log for read-access auditing. Move the safety net into the track() middleware: tag each request with an audit-tracking flag, let PostLog/PostAccessLog (delete path) mark it, and emit a single fallback entry after the handler returns when nothing fired. The recorder's status flows into the fallback so the audit row still reflects 200/206 vs 404 etc. No double logging for handlers that already emit (write helpers, error paths, bulk delete). Refs #9463 * fix(s3/audit): defensive nil checks on audit-tracking helpers Address PR review: guard against nil request and nil *atomic.Bool stored under the audit-tracking key. The conditions are unreachable today (the key is private and we only ever store new(atomic.Bool)), but the checks are free and keep the helpers safe if a future caller misbehaves. * test(s3/audit): track() audit fallback coverage + stale comment cleanup (#9469) test(s3/audit): cover track() fallback wiring + cleanup Adds two unit tests in weed/s3api/stats_test.go that exercise the audit-tracking flag set up by track(): one verifies the fallback path fires when a handler writes the response directly (the GET/HEAD object regression in #9463), the other verifies the flag is set when a handler emits PostLog itself so the fallback is skipped. To make the wiring observable without standing up fluent, PostLog now marks the audit flag before short-circuiting on a nil Logger; production behavior is unchanged (no logger, no posting) but the flag stays consistent. Also drops two stale comments in s3api_object_handlers.go that still referenced proxyToFiler — that helper was removed when GET/HEAD started streaming from volume servers directly. Stacks on #9467.
52 lines
1.8 KiB
Go
52 lines
1.8 KiB
Go
package s3api
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3err"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
// TestTrackAuditFallbackForDirectWriteHeader covers the regression behind
|
|
// issue #9463: handlers that bypass writeSuccessResponse helpers and call
|
|
// w.WriteHeader directly (GetObjectHandler stream path, HeadObjectHandler,
|
|
// GetBucketEncryption, GetObjectLockConfiguration, etc.) used to drop their
|
|
// audit entry. track() must mark the request as audited via a fallback
|
|
// PostLog after the handler returns.
|
|
func TestTrackAuditFallbackForDirectWriteHeader(t *testing.T) {
|
|
var captured *http.Request
|
|
handler := func(w http.ResponseWriter, r *http.Request) {
|
|
captured = r
|
|
w.WriteHeader(http.StatusOK)
|
|
}
|
|
wrapped := track(handler, "GET")
|
|
wrapped(httptest.NewRecorder(), httptest.NewRequest(http.MethodGet, "/bucket/object", nil))
|
|
|
|
if assert.NotNil(t, captured, "handler must have been invoked") {
|
|
assert.True(t, s3err.AuditAlreadyLogged(captured),
|
|
"track must emit fallback audit when handler writes response directly")
|
|
}
|
|
}
|
|
|
|
// TestTrackAuditSkipsFallbackWhenHandlerEmits guards against double logging:
|
|
// handlers that already call PostLog (e.g. via writeSuccessResponseXML or
|
|
// WriteErrorResponse) flip the audit flag, and track must observe that and
|
|
// not re-emit.
|
|
func TestTrackAuditSkipsFallbackWhenHandlerEmits(t *testing.T) {
|
|
var captured *http.Request
|
|
handler := func(w http.ResponseWriter, r *http.Request) {
|
|
captured = r
|
|
s3err.PostLog(r, http.StatusOK, s3err.ErrNone)
|
|
w.WriteHeader(http.StatusOK)
|
|
}
|
|
wrapped := track(handler, "PUT")
|
|
wrapped(httptest.NewRecorder(), httptest.NewRequest(http.MethodPut, "/bucket/object", nil))
|
|
|
|
if assert.NotNil(t, captured) {
|
|
assert.True(t, s3err.AuditAlreadyLogged(captured),
|
|
"flag must be set after handler PostLog")
|
|
}
|
|
}
|