Przeglądaj źródła

添加dry-run标志并更新相关逻辑

增加了`-dry-run`标志以仅解析选项,并在启用时跳过引擎初始化。同时,修正了ACME客户端中HTTP01挑战提供者的参数设置。
SongZihuan 3 miesięcy temu
rodzic
commit
b0e7b30d74
4 zmienionych plików z 19 dodań i 1 usunięć
  1. 1 1
      src/acme/newcert.go
  2. 11 0
      src/flagparser/data.go
  3. 3 0
      src/flagparser/flag.go
  4. 4 0
      src/mainfunc/v1.go

+ 1 - 1
src/acme/newcert.go

@@ -40,7 +40,7 @@ func newCert(email string, httpsAddress string, domain string) (crypto.PrivateKe
 		return nil, nil, err
 	}
 
-	err = client.Challenge.SetHTTP01Provider(http01.NewProviderServer(iface, port))
+	err = client.Challenge.SetHTTP01Provider(http01.NewProviderServer(domain, port))
 	if err != nil {
 		return nil, nil, err
 	}

+ 11 - 0
src/flagparser/data.go

@@ -1,7 +1,18 @@
 package flagparser
 
+import "fmt"
+
 var HttpAddress string = ":3366"
 var HttpsAddress string = ""
 var HttpsDomain = ""
 var HttpsEmail = ""
 var HttpsCertDir = "./ssl-certs"
+var DryRun = false
+
+func Print() {
+	fmt.Println("HttpAddress:", HttpAddress)
+	fmt.Println("HttpsAddress:", HttpsAddress)
+	fmt.Println("HttpsDomain:", HttpsDomain)
+	fmt.Println("HttpsEmail:", HttpsEmail)
+	fmt.Println("HttpsCertDir:", HttpsCertDir)
+}

+ 3 - 0
src/flagparser/flag.go

@@ -25,7 +25,10 @@ func InitFlag() (err error) {
 	flag.StringVar(&HttpsEmail, "https-email", HttpsEmail, "https cert email")
 	flag.StringVar(&HttpsCertDir, "https-cert-dir", HttpsCertDir, "https cert save dir")
 
+	flag.BoolVar(&DryRun, "dry-run", DryRun, "only parser the options")
+
 	flag.Parse()
 
+	Print()
 	return nil
 }

+ 4 - 0
src/mainfunc/v1.go

@@ -17,6 +17,10 @@ func MainV1() (exitcode int) {
 		return 1
 	}
 
+	if flagparser.DryRun {
+		return 0
+	}
+
 	err = engine.InitEngine()
 	if err != nil {
 		fmt.Printf("init engine fail: %s\n", err.Error())