mirrors/hysteria
1
0
Fork 0
mirror of https://github.com/apernet/hysteria.git synced 2025-04-03 20:47:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: rename insecureSkipVerify to insecure for consistency

Browse source
This commit is contained in:
Toby 2024-12-29 11:25:08 -08:00
parent 2bdaf7b46a
commit 8aa80c233e
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/cmd/server.go
View file

@ -236,9 +236,9 @@ type serverConfigMasqueradeFile struct {
} }
type serverConfigMasqueradeProxy struct { type serverConfigMasqueradeProxy struct {
URL string `mapstructure:"url"` URL string `mapstructure:"url"`
RewriteHost bool `mapstructure:"rewriteHost"` RewriteHost bool `mapstructure:"rewriteHost"`
InsecureSkipVerify bool `mapstructure:"insecureSkipVerify"` Insecure bool `mapstructure:"insecure"`
} }
type serverConfigMasqueradeString struct { type serverConfigMasqueradeString struct {
@ -812,7 +812,7 @@ func (c *serverConfig) fillMasqHandler(hyConfig *server.Config) error {
return configError{Field: "masquerade.proxy.url", Err: fmt.Errorf("unsupported protocol scheme \"%s\"", u.Scheme)} return configError{Field: "masquerade.proxy.url", Err: fmt.Errorf("unsupported protocol scheme \"%s\"", u.Scheme)}
} }
transport := http.DefaultTransport transport := http.DefaultTransport
if c.Masquerade.Proxy.InsecureSkipVerify { if c.Masquerade.Proxy.Insecure {
transport = &http.Transport{ transport = &http.Transport{
TLSClientConfig: &tls.Config{ TLSClientConfig: &tls.Config{
InsecureSkipVerify: true, InsecureSkipVerify: true,

6
app/cmd/server_test.go
View file

@ -169,9 +169,9 @@ func TestServerConfig(t *testing.T) {
Dir: "/www/masq", Dir: "/www/masq",
}, },
Proxy: serverConfigMasqueradeProxy{ Proxy: serverConfigMasqueradeProxy{
URL: "https://some.site.net", URL: "https://some.site.net",
RewriteHost: true, RewriteHost: true,
InsecureSkipVerify: true, Insecure: true,
}, },
String: serverConfigMasqueradeString{ String: serverConfigMasqueradeString{
Content: "aint nothin here", Content: "aint nothin here",

2
app/cmd/server_test.yaml
View file

@ -132,7 +132,7 @@ masquerade:
proxy: proxy:
url: https://some.site.net url: https://some.site.net
rewriteHost: true rewriteHost: true
insecureSkipVerify: true insecure: true
string: string:
content: aint nothin here content: aint nothin here
headers: headers:

1
core/go.sum
View file

@ -59,6 +59,7 @@ golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=