mirror of
https://github.com/CJackHwang/ds2api.git
synced 2026-05-14 21:25:09 +08:00
fix security advisory issues
This commit is contained in:
@@ -6,6 +6,7 @@ import (
|
||||
"fmt"
|
||||
"log"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"runtime"
|
||||
"strings"
|
||||
@@ -160,6 +161,16 @@ func (f *filteredLogFormatter) NewLogEntry(r *http.Request) middleware.LogEntry
|
||||
return noopLogEntry{}
|
||||
}
|
||||
}
|
||||
if r != nil && r.URL != nil {
|
||||
if redacted, changed := redactSensitiveQueryParams(r.URL); changed {
|
||||
cloned := *r
|
||||
clonedURL := *r.URL
|
||||
clonedURL.RawQuery = redacted
|
||||
cloned.URL = &clonedURL
|
||||
cloned.RequestURI = clonedURL.RequestURI()
|
||||
return f.base.NewLogEntry(&cloned)
|
||||
}
|
||||
}
|
||||
return f.base.NewLogEntry(r)
|
||||
}
|
||||
|
||||
@@ -169,6 +180,35 @@ func (noopLogEntry) Write(_ int, _ int, _ http.Header, _ time.Duration, _ interf
|
||||
|
||||
func (noopLogEntry) Panic(_ interface{}, _ []byte) {}
|
||||
|
||||
func redactSensitiveQueryParams(u *url.URL) (string, bool) {
|
||||
if u == nil || u.RawQuery == "" {
|
||||
return "", false
|
||||
}
|
||||
values, err := url.ParseQuery(u.RawQuery)
|
||||
if err != nil && len(values) == 0 {
|
||||
return "", false
|
||||
}
|
||||
changed := false
|
||||
for name, vals := range values {
|
||||
if !isSensitiveQueryParam(name) {
|
||||
continue
|
||||
}
|
||||
for i := range vals {
|
||||
vals[i] = "REDACTED"
|
||||
}
|
||||
values[name] = vals
|
||||
changed = true
|
||||
}
|
||||
if !changed {
|
||||
return "", false
|
||||
}
|
||||
return values.Encode(), true
|
||||
}
|
||||
|
||||
func isSensitiveQueryParam(name string) bool {
|
||||
return strings.EqualFold(name, "key") || strings.EqualFold(name, "api_key")
|
||||
}
|
||||
|
||||
var defaultCORSAllowHeaders = []string{
|
||||
"Content-Type",
|
||||
"Authorization",
|
||||
|
||||
47
internal/server/router_log_test.go
Normal file
47
internal/server/router_log_test.go
Normal file
@@ -0,0 +1,47 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"log"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/go-chi/chi/v5/middleware"
|
||||
)
|
||||
|
||||
func TestFilteredLogFormatterRedactsSensitiveQueryParams(t *testing.T) {
|
||||
var buf bytes.Buffer
|
||||
formatter := &filteredLogFormatter{
|
||||
base: &middleware.DefaultLogFormatter{
|
||||
Logger: log.New(&buf, "", 0),
|
||||
NoColor: true,
|
||||
},
|
||||
}
|
||||
req := httptest.NewRequest(
|
||||
http.MethodPost,
|
||||
"/v1beta/models/gemini-2.5-pro:generateContent?key=caller-secret&api_key=second-secret&alt=sse",
|
||||
nil,
|
||||
)
|
||||
|
||||
entry := formatter.NewLogEntry(req)
|
||||
entry.Write(http.StatusOK, 0, http.Header{}, time.Millisecond, nil)
|
||||
|
||||
got := buf.String()
|
||||
for _, secret := range []string{"caller-secret", "second-secret"} {
|
||||
if strings.Contains(got, secret) {
|
||||
t.Fatalf("log line contains sensitive query value %q: %s", secret, got)
|
||||
}
|
||||
}
|
||||
if !strings.Contains(got, "key=REDACTED") || !strings.Contains(got, "api_key=REDACTED") {
|
||||
t.Fatalf("log line did not include redacted sensitive params: %s", got)
|
||||
}
|
||||
if !strings.Contains(got, "alt=sse") {
|
||||
t.Fatalf("log line did not preserve non-sensitive query param: %s", got)
|
||||
}
|
||||
if req.URL.RawQuery != "key=caller-secret&api_key=second-secret&alt=sse" {
|
||||
t.Fatalf("request was mutated, RawQuery = %q", req.URL.RawQuery)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user