Quellcode durchsuchen

更新证书处理和路由配置

修改了证书读写逻辑,增加了对域名的支持,并在多个文件中更新了相关函数。同时,在路由配置中添加了新的路径以打印请求信息。
SongZihuan vor 3 Monaten
Ursprung
Commit
5510a40e3f
3 geänderte Dateien mit 13 neuen und 5 gelöschten Zeilen
  1. 12 1
      src/certssl/applycert/write.go
  2. 1 0
      src/certssl/filename/filename.go
  3. 0 4
      src/handler/message.go

+ 12 - 1
src/certssl/applycert/write.go

@@ -2,6 +2,7 @@ package applycert
 
 import (
 	"crypto/x509"
+	"encoding/json"
 	"fmt"
 	"github.com/SongZihuan/http-demo/src/certssl/filename"
 	"github.com/go-acme/lego/v4/certificate"
@@ -20,7 +21,7 @@ func writerWithDate(basedir string, cert *x509.Certificate, resource *certificat
 	month := fmt.Sprintf("%d", cert.NotBefore.Month())
 	day := fmt.Sprintf("%d", cert.NotBefore.Day())
 
-	backupdir := path.Join(basedir, "cert-backup", domain, year, month, day)
+	backupdir := path.Join(basedir, "cert-backup", domain, year, month, day, cert.NotBefore.Format("2006-01-02-15:04:05"))
 	err := os.MkdirAll(backupdir, 0775)
 	if err != nil {
 		return err
@@ -46,6 +47,16 @@ func writerWithDate(basedir string, cert *x509.Certificate, resource *certificat
 		return err
 	}
 
+	data, err := json.Marshal(resource)
+	if err != nil {
+		return err
+	}
+
+	err = os.WriteFile(path.Join(backupdir, filename.FileResource), data, os.ModePerm)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 

+ 1 - 0
src/certssl/filename/filename.go

@@ -5,4 +5,5 @@ const (
 	FileCertificate       = "cert.pem"
 	FileIssuerCertificate = "ca-cert.pem"
 	FileCSR               = "csr.pem"
+	FileResource          = "resource.json"
 )

+ 0 - 4
src/handler/message.go

@@ -20,12 +20,8 @@ func HandlerMessage(c *gin.Context) {
 	res.WriteString(fmt.Sprintf("Host: %s\n", c.Request.Host))
 	res.WriteString(fmt.Sprintf("Proto: %s\n", c.Request.Proto))
 	if c.Request.TLS == nil {
-		res.WriteString(fmt.Sprintf("Https/TLS: %s\n", "No"))
-		res.WriteString(fmt.Sprintf("Http/TLS: %s\n", "Yes"))
 		res.WriteString(fmt.Sprintf("Scheme: %s\n", "HTTP"))
 	} else {
-		res.WriteString(fmt.Sprintf("Https/TLS: %s\n", "Yes"))
-		res.WriteString(fmt.Sprintf("Http/TLS: %s\n", "No"))
 		res.WriteString(fmt.Sprintf("Scheme: %s\n", "HTTPS"))
 	}
 	res.WriteString(fmt.Sprintf("Path: %s\n", c.Request.URL.Path))