Răsfoiți Sursa

更新README.md和代码以处理空邮箱情况

将README.md中关于`--https-email`的描述进行了简化,并在`src/certssl/main.go`中修改了处理空邮箱的逻辑,现在会返回错误而不是设置默认值。
SongZihuan 2 luni în urmă
părinte
comite
0f7cd6f121
2 a modificat fișierele cu 3 adăugiri și 3 ștergeri
  1. 1 1
      README.md
  2. 2 2
      src/certssl/main.go

+ 1 - 1
README.md

@@ -11,7 +11,7 @@ Http默认监听端口`:3366`,可通过`--address`和`-http-address`参数更
 Https默认不监听,可通过`--https-address`参数开启监听。
 
 HTTPS默认使用acme的DNS-01调整申请HTTPS证书,因此你需要配置:`--https-domain`域名,`--https-aliyun-dns-access-key`和`--https-aliyun-dns-access-secret`阿里云具有DNS权限的RAM用户的Key和Secret。
-你还可以选择性配置`--https-email`,申请CA联系人你(不会体现在证书上),默认为`no-reply@example.com`
+你还可以选择性配置`--https-email`,申请CA联系人你(不会体现在证书上)。
 你还可以选择性配置`--https-cert-dir`,保存证书和和账号信息(每个邮箱都会对应一个账户),默认为当前目录下`ssl-certs`文件夹。
 
 ## 环境变量

+ 2 - 2
src/certssl/main.go

@@ -13,7 +13,7 @@ const CertDefaultNewApplyTime = 5 * 24 * time.Hour
 
 func GetCertificateAndPrivateKey(basedir string, email string, aliyunAccessKey string, aliyunAccessSecret string, domain string) (crypto.PrivateKey, *x509.Certificate, *x509.Certificate, error) {
 	if email == "" {
-		email = "no-reply@example.com"
+		return nil, nil, nil, fmt.Errorf("email is empty")
 	}
 
 	if !utils.IsValidEmail(email) {
@@ -92,7 +92,7 @@ func WatchCertificate(dir string, email string, aliyunAccessKey string, aliyunAc
 
 func watchCertificate(dir string, email string, aliyunAccessKey string, aliyunAccessSecret string, domain string, oldCert *x509.Certificate) (crypto.PrivateKey, *x509.Certificate, *x509.Certificate, error) {
 	if email == "" {
-		email = "no-reply@example.com"
+		return nil, nil, nil, fmt.Errorf("email is empty")
 	}
 
 	if !utils.IsValidEmail(email) {