lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-02-20 23:47:21 -05:00
Code Issues Releases Wiki Activity

update http header json config

Browse Source
This commit is contained in:
Darien Raymond 2016-11-05 01:28:15 +01:00
parent dfc03ff939
commit d2263a452d
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tools/conf/transport_authenticators.go
View File

@ -36,16 +36,11 @@ func (UTPAuthenticator) Build() (*loader.TypedSettings, error) {
return loader.NewTypedSettings(new(utp.Config)), nil return loader.NewTypedSettings(new(utp.Config)), nil
} }
type HTTPAuthenticatorHeader struct {
Name string `json:"name"`
Value *StringList `json:"value"`
}
type HTTPAuthenticatorRequest struct { type HTTPAuthenticatorRequest struct {
Version *string `json:"version"` Version *string `json:"version"`
Method *string `json:"method"` Method *string `json:"method"`
Path *StringList `json:"path"` Path *StringList `json:"path"`
Headers []HTTPAuthenticatorHeader `json:"headers"` Headers map[string]*StringList `json:"headers"`
} }
func (this *HTTPAuthenticatorRequest) Build() (*http.RequestConfig, error) { func (this *HTTPAuthenticatorRequest) Build() (*http.RequestConfig, error) {
@ -72,12 +67,12 @@ func (this *HTTPAuthenticatorRequest) Build() (*http.RequestConfig, error) {
} }
if len(this.Headers) > 0 { if len(this.Headers) > 0 {
config.Header = make([]*http.Header, len(this.Headers)) config.Header = make([]*http.Header, 0, len(this.Headers))
for idx, header := range this.Headers { for key, value := range this.Headers {
config.Header[idx] = &http.Header{ config.Header = append(config.Header, &http.Header{
Name: header.Name, Name: key,
Value: append([]string(nil), (*header.Value)...), Value: append([]string(nil), (*value)...),
} })
} }
} }
@ -85,10 +80,10 @@ func (this *HTTPAuthenticatorRequest) Build() (*http.RequestConfig, error) {
} }
type HTTPAuthenticatorResponse struct { type HTTPAuthenticatorResponse struct {
Version *string `json:"version"` Version *string `json:"version"`
Status *string `json:"status"` Status *string `json:"status"`
Reason *string `json:"reason"` Reason *string `json:"reason"`
Headers []HTTPAuthenticatorHeader `json:"headers"` Headers map[string]*StringList `json:"headers"`
} }
func (this *HTTPAuthenticatorResponse) Build() (*http.ResponseConfig, error) { func (this *HTTPAuthenticatorResponse) Build() (*http.ResponseConfig, error) {
@ -123,12 +118,12 @@ func (this *HTTPAuthenticatorResponse) Build() (*http.ResponseConfig, error) {
} }
if len(this.Headers) > 0 { if len(this.Headers) > 0 {
config.Header = make([]*http.Header, len(this.Headers)) config.Header = make([]*http.Header, 0, len(this.Headers))
for idx, header := range this.Headers { for key, value := range this.Headers {
config.Header[idx] = &http.Header{ config.Header = append(config.Header, &http.Header{
Name: header.Name, Name: key,
Value: append([]string(nil), (*header.Value)...), Value: append([]string(nil), (*value)...),
} })
} }
} }