oadmin/xinghuoapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update SecurityHeaders call sites to match new signature

Browse Source
This commit is contained in:
erio
2026-03-03 06:37:50 +08:00
parent bf6fe5e962
commit 50a8116ae9
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/cmd/server/main.go
View File

@@ -100,7 +100,7 @@ func runSetupServer() {
r := gin.New() r := gin.New()
r.Use(middleware.Recovery()) r.Use(middleware.Recovery())
r.Use(middleware.CORS(config.CORSConfig{})) r.Use(middleware.CORS(config.CORSConfig{}))
r.Use(middleware.SecurityHeaders(config.CSPConfig{Enabled: true, Policy: config.DefaultCSPPolicy})) r.Use(middleware.SecurityHeaders(config.CSPConfig{Enabled: true, Policy: config.DefaultCSPPolicy}, nil))
// Register setup routes // Register setup routes
setup.RegisterRoutes(r) setup.RegisterRoutes(r)

22
backend/internal/server/middleware/security_headers_test.go
View File

@@ -84,7 +84,7 @@ func TestGetNonceFromContext(t *testing.T) {
func TestSecurityHeaders(t *testing.T) { func TestSecurityHeaders(t *testing.T) {
t.Run("sets_basic_security_headers", func(t *testing.T) { t.Run("sets_basic_security_headers", func(t *testing.T) {
cfg := config.CSPConfig{Enabled: false} cfg := config.CSPConfig{Enabled: false}
middleware := SecurityHeaders(cfg) middleware := SecurityHeaders(cfg, nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
c, _ := gin.CreateTestContext(w) c, _ := gin.CreateTestContext(w)
@@ -99,7 +99,7 @@ func TestSecurityHeaders(t *testing.T) {
t.Run("csp_disabled_no_csp_header", func(t *testing.T) { t.Run("csp_disabled_no_csp_header", func(t *testing.T) {
cfg := config.CSPConfig{Enabled: false} cfg := config.CSPConfig{Enabled: false}
middleware := SecurityHeaders(cfg) middleware := SecurityHeaders(cfg, nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
c, _ := gin.CreateTestContext(w) c, _ := gin.CreateTestContext(w)
@@ -115,7 +115,7 @@ func TestSecurityHeaders(t *testing.T) {
Enabled: true, Enabled: true,
Policy: "default-src 'self'", Policy: "default-src 'self'",
} }
middleware := SecurityHeaders(cfg) middleware := SecurityHeaders(cfg, nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
c, _ := gin.CreateTestContext(w) c, _ := gin.CreateTestContext(w)
@@ -136,7 +136,7 @@ func TestSecurityHeaders(t *testing.T) {
Enabled: true, Enabled: true,
Policy: "default-src 'self'; script-src 'self' __CSP_NONCE__", Policy: "default-src 'self'; script-src 'self' __CSP_NONCE__",
} }
middleware := SecurityHeaders(cfg) middleware := SecurityHeaders(cfg, nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
c, _ := gin.CreateTestContext(w) c, _ := gin.CreateTestContext(w)
@@ -156,7 +156,7 @@ func TestSecurityHeaders(t *testing.T) {
Enabled: true, Enabled: true,
Policy: "script-src 'self' __CSP_NONCE__", Policy: "script-src 'self' __CSP_NONCE__",
} }
middleware := SecurityHeaders(cfg) middleware := SecurityHeaders(cfg, nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
c, _ := gin.CreateTestContext(w) c, _ := gin.CreateTestContext(w)
@@ -180,7 +180,7 @@ func TestSecurityHeaders(t *testing.T) {
Enabled: true, Enabled: true,
Policy: "", Policy: "",
} }
middleware := SecurityHeaders(cfg) middleware := SecurityHeaders(cfg, nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
c, _ := gin.CreateTestContext(w) c, _ := gin.CreateTestContext(w)
@@ -199,7 +199,7 @@ func TestSecurityHeaders(t *testing.T) {
Enabled: true, Enabled: true,
Policy: " \t\n ", Policy: " \t\n ",
} }
middleware := SecurityHeaders(cfg) middleware := SecurityHeaders(cfg, nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
c, _ := gin.CreateTestContext(w) c, _ := gin.CreateTestContext(w)
@@ -217,7 +217,7 @@ func TestSecurityHeaders(t *testing.T) {
Enabled: true, Enabled: true,
Policy: "script-src __CSP_NONCE__; style-src __CSP_NONCE__", Policy: "script-src __CSP_NONCE__; style-src __CSP_NONCE__",
} }
middleware := SecurityHeaders(cfg) middleware := SecurityHeaders(cfg, nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
c, _ := gin.CreateTestContext(w) c, _ := gin.CreateTestContext(w)
@@ -235,7 +235,7 @@ func TestSecurityHeaders(t *testing.T) {
t.Run("calls_next_handler", func(t *testing.T) { t.Run("calls_next_handler", func(t *testing.T) {
cfg := config.CSPConfig{Enabled: true, Policy: "default-src 'self'"} cfg := config.CSPConfig{Enabled: true, Policy: "default-src 'self'"}
middleware := SecurityHeaders(cfg) middleware := SecurityHeaders(cfg, nil)
nextCalled := false nextCalled := false
router := gin.New() router := gin.New()
@@ -258,7 +258,7 @@ func TestSecurityHeaders(t *testing.T) {
Enabled: true, Enabled: true,
Policy: "script-src __CSP_NONCE__", Policy: "script-src __CSP_NONCE__",
} }
middleware := SecurityHeaders(cfg) middleware := SecurityHeaders(cfg, nil)
nonces := make(map[string]bool) nonces := make(map[string]bool)
for i := 0; i < 10; i++ { for i := 0; i < 10; i++ {
@@ -376,7 +376,7 @@ func BenchmarkSecurityHeadersMiddleware(b *testing.B) {
Enabled: true, Enabled: true,
Policy: "script-src 'self' __CSP_NONCE__", Policy: "script-src 'self' __CSP_NONCE__",
} }
middleware := SecurityHeaders(cfg) middleware := SecurityHeaders(cfg, nil)
b.ResetTimer() b.ResetTimer()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {