main.go

@@ -2,54 +2,16 @@ package main
 
 import (
 	"acme-mana/src"
-	"crypto/x509"
-	"encoding/json"
-	"encoding/pem"
-	"github.com/go-acme/lego/v4/certificate"
-	"log"
-	"os"
-	"path"
-	"path/filepath"
 )
 
 func main() {
-	//src.Start()
+	//config := src.GetAppConfig()
-	testParseCert()
+	//fmt.Println(config)
-}
+	//src.Apply(config.Domains[0])
-
+	//fmt.Println(os.Getwd())
-func testParseCert() {
+	//err := os.MkdirAll("cert\\abc", 0777)
-	// 读取
-	dir := src.GetAppConfig().CertDir
-	dir = filepath.Join(dir, "acme.zzzykj.cn")
-	certFile := path.Join(dir, src.CertFileName)
-	certBytes, err := os.ReadFile(certFile)
-	if err != nil {
-		panic(err)
-	}
-	block, _ := pem.Decode(certBytes)
-	if block == nil {
-		log.Fatalf("Failed to decode PEM block")
-		return
-	}
-
-	certParse, err := x509.ParseCertificate(block.Bytes)
-	if err != nil {
-		log.Fatalf("Failed to parse certificate: %v", err)
-	}
-	//info, err := json.Marshal(certParse)
 	//if err != nil {
-	//	log.Fatalf("Failed to marshal certificate: %v", err)
+	//	fmt.Println(err)
 	//}
-	certInfo := src.CertInfo{
+	src.Start()
-		Cert: certificate.Resource{},
-		Info: *certParse,
-	}
-	info, err := json.Marshal(certInfo)
-	if err != nil {
-		log.Fatalf("Failed to marshal certificate: %v", err)
-	}
-	log.Println(string(info))
-
-	//log.Println(string(info))
-	//log.Println(certParse)
 }

src/acme-client.go

@@ -7,7 +7,6 @@ import (
 	"crypto/rand"
 	"crypto/x509"
 	"encoding/json"
-	"encoding/pem"
 	"github.com/go-acme/lego/v4/certificate"
 	"github.com/go-acme/lego/v4/lego"
 	"github.com/go-acme/lego/v4/log"
@@ -90,7 +89,7 @@ func saveCertFile(cert *certificate.Resource, name string) {
 	dir = filepath.Join(dir, name)
 	_, err := os.Stat(dir)
 	if os.IsNotExist(err) {
-		err := os.MkdirAll(dir, 0755)
+		err := os.MkdirAll(dir, 0644)
 		if err != nil {
 			log.Infof("创建目录 %s 失败", dir)
 			log.Fatal(err)
@@ -98,24 +97,18 @@ func saveCertFile(cert *certificate.Resource, name string) {
 		log.Infof("创建目录 %s", dir)
 	}
 
-	certBytes := cert.Certificate
+	err = os.WriteFile(path.Join(dir, "cert.crt"), cert.Certificate, 0644)
-	err = os.WriteFile(path.Join(dir, CertFileName), certBytes, 0755)
 	if err != nil {
 		log.Fatalf("Failed to save certificate: %v", err)
 	}
 
-	err = os.WriteFile(path.Join(dir, KeyFileName), cert.PrivateKey, 0755)
+	err = os.WriteFile(path.Join(dir, "cert.key"), cert.PrivateKey, 0644)
 	if err != nil {
 		log.Fatalf("Failed to save private key: %v", err)
 	}
 
-	block, _ := pem.Decode(certBytes)
+	// 获取 cert 的过期时间
-	if block == nil {
+	certParse, err := x509.ParseCertificate(cert.Certificate)
-		log.Fatalf("Failed to decode PEM block")
-		return
-	}
-
-	certParse, err := x509.ParseCertificate(block.Bytes)
 	if err != nil {
 		log.Fatalf("Failed to parse certificate: %v", err)
 	}
@@ -128,7 +121,7 @@ func saveCertFile(cert *certificate.Resource, name string) {
 	if err != nil {
 		log.Fatalf("Failed to marshal certificate: %v", err)
 	}
-	err = os.WriteFile(path.Join(dir, CertInfoFileName), certJson, 0644)
+	err = os.WriteFile(path.Join(dir, "info.json"), certJson, 0644)
 	if err != nil {
 		log.Fatalf("Failed to save certificate info: %v", err)
 	}

src/command.go

@@ -6,7 +6,10 @@ import (
 	"os"
 )
 
-// InitSocket /*
+/*
+*
+初始化Socket
+*/
 func InitSocket() {
 	log.Println("Start listen command")
 	// 删除旧的 socket 文件

src/daemon.go

@@ -34,10 +34,6 @@ func Start() {
 		daemonStatus()
 	case "dump":
 		dumpConfig()
-	case "domains":
-		showDomains()
-	case "apply":
-		applyOnce()
 	case "-s":
 		daemonCommand()
 	default:
@@ -83,14 +79,14 @@ func daemonStart() {
 			return
 		}
 
-		workPath, err := os.Executable()
+		path, err := os.Executable()
 		if err != nil {
 			log.Fatalf("Failed to get executable path: %v", err)
 		}
 		cmd := exec.Cmd{
-			Path: workPath,
+			Path: path,
 			Args: os.Args,
-			Dir:  filepath.Dir(workPath),
+			Dir:  filepath.Dir(path),
 			Env:  append(os.Environ(), "GO_DAEMON=1"),
 			//Stdin:       os.Stdin,
 			Stdout: stdout,
@@ -101,6 +97,11 @@ func daemonStart() {
 			SysProcAttr: &syscall.SysProcAttr{},
 		}
 
+		//cmd := exec.Command(os.Args[0])
+		//cmd.Env = append(os.Environ(), "GO_DAEMON=1")
+		//cmd.Stdout = os.Stdout
+		//cmd.Stderr = os.Stderr
+		//cmd.SysProcAttr = &syscall.SysProcAttr{}
 		log.Println("Starting daemon...")
 		err = cmd.Start()
 		if err != nil {
@@ -165,31 +166,6 @@ func dumpConfig() {
 	log.Println(string(config))
 }
 
-func applyOnce() {
-	if len(os.Args) < 3 {
-		log.Fatalf("Please enter domain name!")
-	}
-	name := os.Args[2]
-	if name == "" {
-		log.Fatalf("No domain specified!")
-	}
-	domain := GetAppConfig().FindDomain(name)
-	if domain == nil {
-		log.Fatalf("Domain not found: %s", name)
-	}
-	Apply(*domain)
-}
-
-func showDomains() {
-	domains := GetAppConfig().Domains
-	// 格式化为json并打印
-	config, err := json.MarshalIndent(domains, "", "    ")
-	if err != nil {
-		log.Fatalf("Failed to marshal config: %v", err)
-	}
-	log.Println(string(config))
-}
-
 /*
 守护进程接收名称
 */

src/http.go

@@ -43,7 +43,7 @@ func getCert(c *gin.Context) {
 		})
 		return
 	}
-	crtFilePath := path.Join(dir, CertFileName)
+	crtFilePath := path.Join(dir, "cert.crt")
 	crtContent, err := os.ReadFile(crtFilePath)
 	if err != nil {
 		c.JSON(200, gin.H{
@@ -54,7 +54,7 @@ func getCert(c *gin.Context) {
 	}
 	crt := string(crtContent)
 
-	keyFilePath := path.Join(dir, KeyFileName)
+	keyFilePath := path.Join(dir, "cert.key")
 	keyContent, err := os.ReadFile(keyFilePath)
 	if err != nil {
 		c.JSON(200, gin.H{

src/task.go

@@ -1,79 +1,7 @@
 package src
 
-import (
+import "log"
-	"encoding/json"
-	"log"
-	"os"
-	"path"
-	"time"
-)
-
-var AutoRefreshCertTicker = time.NewTicker(time.Hour)
 
 func AutoRefreshCert() {
 	log.Println("Start auto refresh cert")
-	defer AutoRefreshCertTicker.Stop()
-	for {
-		select {
-		case <-AutoRefreshCertTicker.C:
-			doRefreshCert()
-		}
-	}
-}
-
-func doRefreshCert() {
-	domains := GetAppConfig().Domains
-	for _, domain := range domains {
-		doRefreshCertOnce(domain)
-	}
-}
-
-func doRefreshCertOnce(domain Domain) {
-	name := domain.Name
-	dir := GetAppConfig().CertDir
-	certDir := path.Join(dir, name)
-	// 判断文件夹和证书文件是否存在
-	_, err := os.Stat(certDir)
-	if os.IsNotExist(err) {
-		log.Println("Applying for a certificate, Domain: {} certificate directory does not exist!", name)
-		Apply(domain)
-		return
-	}
-	if existFile(certDir, CertFileName) {
-		log.Println("Applying for a certificate, Domain: {} {} does not exist!", name, CertFileName)
-		Apply(domain)
-		return
-	}
-	if existFile(certDir, KeyFileName) {
-		log.Println("Applying for a certificate, Domain: {} {} does not exist!", name, KeyFileName)
-		Apply(domain)
-		return
-	}
-	if existFile(certDir, CertInfoFileName) {
-		log.Println("Applying for a certificate, Domain: {} {} does not exist!", name, CertInfoFileName)
-		Apply(domain)
-		return
-	}
-	infoFile := path.Join(dir, CertInfoFileName)
-	infoBytes, err := os.ReadFile(infoFile)
-	if err != nil {
-		log.Println("Failed to read cert info file, Domain: {}", name)
-	}
-	var certInfo CertInfo
-	err = json.Unmarshal(infoBytes, &certInfo)
-	if err != nil {
-		log.Println("Failed to parse cert info file, Domain: {}", name)
-	}
-	log.Println("Checking if the certificate is expired, Domain: {}", name)
-	if certInfo.Info.NotAfter.Sub(time.Now()) < 7*24*time.Hour {
-		log.Println("Apply for a certificate that is about to expire, domain name:", name)
-		Apply(domain)
-	}
-}
-
-func existFile(dir string, fileName string) bool {
-	f := path.Join(dir, fileName)
-	_, err := os.Stat(f)
-	return !os.IsNotExist(err)
-
 }

src/variable.go

@@ -3,10 +3,6 @@ package src
 const PidFile = "acme-mana.pid"
 const SocketFile = "acme-mana.sock"
 
-const CertFileName = "fullchain.pem"
-const KeyFileName = "privkey.pem"
-const CertInfoFileName = "info.json"
-
 var appConfig AppConfig = ReadConfig()
 
 func GetAppConfig() AppConfig {