fix: rename insecureSkipVerify to insecure for consistency

apernet · Dec 29, 2024 · 8aa80c2 · 8aa80c2
1 parent 2bdaf7b
commit 8aa80c2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/app/cmd/server.go b/app/cmd/server.go
@@ -236,9 +236,9 @@ type serverConfigMasqueradeFile struct {
 }
 
 type serverConfigMasqueradeProxy struct {
-	URL                string `mapstructure:"url"`
-	RewriteHost        bool   `mapstructure:"rewriteHost"`
-	InsecureSkipVerify bool   `mapstructure:"insecureSkipVerify"`
+	URL         string `mapstructure:"url"`
+	RewriteHost bool   `mapstructure:"rewriteHost"`
+	Insecure    bool   `mapstructure:"insecure"`
 }
 
 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)}
 		}
 		transport := http.DefaultTransport
-		if c.Masquerade.Proxy.InsecureSkipVerify {
+		if c.Masquerade.Proxy.Insecure {
 			transport = &http.Transport{
 				TLSClientConfig: &tls.Config{
 					InsecureSkipVerify: true,

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

diff --git a/app/cmd/server_test.yaml b/app/cmd/server_test.yaml
@@ -132,7 +132,7 @@ masquerade:
   proxy:
     url: https://some.site.net
     rewriteHost: true
-    insecureSkipVerify: true
+    insecure: true
   string:
     content: aint nothin here
     headers:

diff --git a/core/go.sum b/core/go.sum
@@ -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/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/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/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=