From 554bb22f537d3ff716a6a3959bf9b2e8dd160811 Mon Sep 17 00:00:00 2001 From: mountain Date: Wed, 10 Jul 2024 19:37:54 +0900 Subject: [PATCH] =?UTF-8?q?config=20=EB=A1=9C=EB=94=A9=ED=95=A0=20?= =?UTF-8?q?=EB=95=8C=20=EC=9D=B8=EC=A6=9D=EC=84=9C=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EB=AC=B4=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- reflect_config.go | 5 +++++ server.go | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/reflect_config.go b/reflect_config.go index 46b6ad7..e893a20 100644 --- a/reflect_config.go +++ b/reflect_config.go @@ -2,6 +2,7 @@ package gocommon import ( "crypto/md5" + "crypto/tls" "encoding/hex" "encoding/json" "fmt" @@ -93,9 +94,13 @@ func LoadConfig[T any](outptr *T) error { h.Write([]byte(subpath)) at := hex.EncodeToString(h.Sum(nil)) + http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{InsecureSkipVerify: true} + req, _ := http.NewRequest("GET", configfilepath, nil) req.Header.Add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36 Edg/111.0.1661.51") req.Header.Add("As-X-UrlHash", at) + http.DefaultClient.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify = true + resp, err := http.DefaultClient.Do(req) if err != nil { return err diff --git a/server.go b/server.go index ccce477..086aacf 100644 --- a/server.go +++ b/server.go @@ -106,20 +106,24 @@ func welcomeHandler(w http.ResponseWriter, r *http.Request) { w.Write([]byte("welcome")) } -var tls = flagx.String("tls", "", "") +var tlsflag = flagx.String("tls", "", "") var portptr = flagx.Int("port", 80, "") func isTlsEnabled(fileout ...*string) bool { - if len(*tls) == 0 { + if len(*tlsflag) == 0 { return false } - crtfile := *tls + ".crt" + if strings.HasSuffix(*tlsflag, "/") { + return false + } + + crtfile := *tlsflag + ".crt" if _, err := os.Stat(crtfile); os.IsNotExist(err) { return false } - keyfile := *tls + ".key" + keyfile := *tlsflag + ".key" if _, err := os.Stat(keyfile); os.IsNotExist(err) { return false }