enhance: escalate `ProxyHeader` as a global config

pull/1571/head
HFO4 2 years ago
parent 9860ebbca9
commit 82b4e29a80

@ -61,6 +61,7 @@ func main() {
} }
api := routers.InitRouter() api := routers.InitRouter()
api.TrustedPlatform = conf.SystemConfig.ProxyHeader
server := &http.Server{Handler: api} server := &http.Server{Handler: api}
// 收到信号后关闭服务器 // 收到信号后关闭服务器
@ -102,7 +103,6 @@ func main() {
} }
} }
api.TrustedPlatform = conf.UnixConfig.ProxyHeader
util.Log().Info("Listening to %q", conf.UnixConfig.Listen) util.Log().Info("Listening to %q", conf.UnixConfig.Listen)
if err := RunUnix(server); err != nil { if err := RunUnix(server); err != nil {
util.Log().Error("Failed to listen to %q: %s", conf.UnixConfig.Listen, err) util.Log().Error("Failed to listen to %q: %s", conf.UnixConfig.Listen, err)

@ -26,7 +26,8 @@ type system struct {
Debug bool Debug bool
SessionSecret string SessionSecret string
HashIDSalt string HashIDSalt string
GracePeriod int `validate:"gte=0"` GracePeriod int `validate:"gte=0"`
ProxyHeader string `validate:"required_with=Listen"`
} }
type ssl struct { type ssl struct {
@ -36,9 +37,8 @@ type ssl struct {
} }
type unix struct { type unix struct {
Listen string Listen string
ProxyHeader string `validate:"required_with=Listen"` Perm uint32
Perm uint32
} }
// slave 作为slave存储端配置 // slave 作为slave存储端配置

@ -18,9 +18,10 @@ var DatabaseConfig = &database{
// SystemConfig 系统公用配置 // SystemConfig 系统公用配置
var SystemConfig = &system{ var SystemConfig = &system{
Debug: false, Debug: false,
Mode: "master", Mode: "master",
Listen: ":5212", Listen: ":5212",
ProxyHeader: "X-Forwarded-For",
} }
// CORSConfig 跨域配置 // CORSConfig 跨域配置
@ -47,8 +48,7 @@ var SSLConfig = &ssl{
} }
var UnixConfig = &unix{ var UnixConfig = &unix{
Listen: "", Listen: "",
ProxyHeader: "X-Forwarded-For",
} }
var OptionOverwrite = map[string]interface{}{} var OptionOverwrite = map[string]interface{}{}

Loading…
Cancel
Save