mirror of
https://github.com/router-for-me/CLIProxyAPI.git
synced 2026-05-11 00:11:36 +08:00
eba561bf6f
Addressing the P1 note from the Codex reviewer: applyCustomHeaders is
also called with a synthetic &http.Request{Header: ...} from the
websockets executors (aistudio_executor.go, codex_websockets_executor.go),
which forward only the header map. The previous continue meant a custom
Host was dropped from that map, regressing virtual-host overrides on
those flows. Mirror the value to both r.Host (for real net/http) and
r.Header (for header-map-only consumers).
61 lines
1.4 KiB
Go
61 lines
1.4 KiB
Go
package util
|
|
|
|
import (
|
|
"net/http"
|
|
"strings"
|
|
)
|
|
|
|
// ApplyCustomHeadersFromAttrs applies user-defined headers stored in the provided attributes map.
|
|
// Custom headers override built-in defaults when conflicts occur.
|
|
func ApplyCustomHeadersFromAttrs(r *http.Request, attrs map[string]string) {
|
|
if r == nil {
|
|
return
|
|
}
|
|
applyCustomHeaders(r, extractCustomHeaders(attrs))
|
|
}
|
|
|
|
func extractCustomHeaders(attrs map[string]string) map[string]string {
|
|
if len(attrs) == 0 {
|
|
return nil
|
|
}
|
|
headers := make(map[string]string)
|
|
for k, v := range attrs {
|
|
if !strings.HasPrefix(k, "header:") {
|
|
continue
|
|
}
|
|
name := strings.TrimSpace(strings.TrimPrefix(k, "header:"))
|
|
if name == "" {
|
|
continue
|
|
}
|
|
val := strings.TrimSpace(v)
|
|
if val == "" {
|
|
continue
|
|
}
|
|
headers[name] = val
|
|
}
|
|
if len(headers) == 0 {
|
|
return nil
|
|
}
|
|
return headers
|
|
}
|
|
|
|
func applyCustomHeaders(r *http.Request, headers map[string]string) {
|
|
if r == nil || len(headers) == 0 {
|
|
return
|
|
}
|
|
for k, v := range headers {
|
|
if k == "" || v == "" {
|
|
continue
|
|
}
|
|
// net/http reads Host from req.Host (not req.Header) when writing
|
|
// a real request, so we must mirror it there. Some callers pass
|
|
// synthetic requests (e.g. &http.Request{Header: ...}) and only
|
|
// consume r.Header afterwards, so keep the value in the header
|
|
// map too.
|
|
if http.CanonicalHeaderKey(k) == "Host" {
|
|
r.Host = v
|
|
}
|
|
r.Header.Set(k, v)
|
|
}
|
|
}
|