|
@@ -54,6 +54,7 @@ type HttpServerConfig struct {
|
|
|
CookieFile string `json:"cookie_file"`
|
|
|
FullProxyDomain string // the domain name of the proxied site with the protocol
|
|
|
KnownHosts []string `json:"known_hosts"`
|
|
|
+ CorsHosts []string `json:"cors_hosts"`
|
|
|
CookieJar []*http.Cookie
|
|
|
PhpSession *http.Cookie
|
|
|
SsoToken *http.Cookie
|
|
@@ -170,29 +171,21 @@ func ReadConfig(loc string) (*HttpServerConfig, error) {
|
|
|
cfg.FullDomain = fmt.Sprintf("%s://%s", cfg.Proto, cfg.AllowedDomain)
|
|
|
cfg.FullProxyDomain = fmt.Sprintf("%s://%s", cfg.Proto, cfg.ProxyAddr)
|
|
|
cfg.FullAltAllowedDomain = fmt.Sprintf("%s://%s", cfg.Proto, cfg.AltAllowedDomain)
|
|
|
- var cookies []Cookie
|
|
|
+ var cookies []*http.Cookie
|
|
|
err = json.Unmarshal(cf, &cookies)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
for idx := range cookies {
|
|
|
- httpCookie := &http.Cookie{
|
|
|
- Domain: cookies[idx].Domain,
|
|
|
- MaxAge: cookies[idx].MaxAge,
|
|
|
- Name: cookies[idx].Name,
|
|
|
- Value: cookies[idx].Value,
|
|
|
- Path: cookies[idx].Path,
|
|
|
- Secure: cookies[idx].Secure,
|
|
|
+ if cookies[idx].Name == "PHPSESSID" {
|
|
|
+ cfg.PhpSession = cookies[idx]
|
|
|
}
|
|
|
- cfg.CookieJar = append(cfg.CookieJar, httpCookie)
|
|
|
- if httpCookie.Name == "PHPSESSID" {
|
|
|
- cfg.PhpSession = httpCookie
|
|
|
- }
|
|
|
- if httpCookie.Name == "sso_token" {
|
|
|
- cfg.SsoToken = httpCookie
|
|
|
+ if cookies[idx].Name == "sso_token" {
|
|
|
+ cfg.SsoToken = cookies[idx]
|
|
|
}
|
|
|
|
|
|
}
|
|
|
+ cfg.CookieJar = cookies
|
|
|
|
|
|
return &cfg, err
|
|
|
|