fix: 优化邮件通知域名显示与错误信息提炼并升级版本号至v1.52.4
This commit is contained in:
1 parent
fb2b877350
commit
cdc7967aae
8 files changed
+57
-25
No files matched your search
@@ -1,3 +1,3 @@
|
||||
package buildinfo
|
||||
package buildinfo
|
||||
|
||||
const Version = "1.52.3"
|
||||
const Version = "1.52.4"
|
||||
@@ -401,9 +401,11 @@ func (s *Service) buildPayload(event Event) (mailPayload, error) {
|
||||
}
|
||||
status := eventStatus(event.Status)
|
||||
domainName := strings.TrimSpace(event.Domain)
|
||||
if domainName == "" {
|
||||
if domainName == "" || isLikelyInternalIdentifier(domainName) {
|
||||
for _, domain := range event.Domains {
|
||||
if domainName = strings.TrimSpace(domain); domainName != "" {
|
||||
candidate := strings.TrimSpace(domain)
|
||||
if candidate != "" && !isLikelyInternalIdentifier(candidate) {
|
||||
domainName = candidate
|
||||
break
|
||||
}
|
||||
}
|
||||
@@ -519,3 +521,28 @@ func sleepContext(ctx context.Context, duration time.Duration) error {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
func isLikelyInternalIdentifier(value string) bool {
|
||||
value = strings.TrimSpace(value)
|
||||
if value == "" {
|
||||
return false
|
||||
}
|
||||
if strings.HasPrefix(value, "internal-") || strings.HasPrefix(value, "domain-") || strings.HasPrefix(value, "task-") || strings.HasPrefix(value, "cert-") {
|
||||
return true
|
||||
}
|
||||
if len(value) == 36 && strings.Count(value, "-") == 4 {
|
||||
isHexUUID := true
|
||||
for _, r := range value {
|
||||
if r == '-' || (r >= '0' && r <= '9') || (r >= 'a' && r <= 'f') || (r >= 'A' && r <= 'F') {
|
||||
continue
|
||||
}
|
||||
isHexUUID = false
|
||||
break
|
||||
}
|
||||
if isHexUUID {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
@@ -97,20 +97,25 @@ func TestVerifiedRecoveryDoesNotRequireManualUnlock(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestMailUsesCertificateDomainInsteadOfInternalID(t *testing.T) {
|
||||
for _, domains := range [][]string{{" ", "example.test"}, nil} {
|
||||
for _, tc := range []struct {
|
||||
domain string
|
||||
domainID string
|
||||
domains []string
|
||||
expected string
|
||||
}{
|
||||
{domain: "", domainID: "internal-domain-id", domains: []string{" ", "example.test"}, expected: "example.test"},
|
||||
{domain: "", domainID: "internal-domain-id", domains: nil, expected: "未指定域名"},
|
||||
{domain: "b6824906-fea9-4f2a-a682-3c2b1ade1ee3", domains: []string{"scert-multi-20260930.apmmk.cn"}, expected: "scert-multi-20260930.apmmk.cn"},
|
||||
} {
|
||||
payload, err := New(newTestConfig("http://mail.example.test"), nil).buildPayload(Event{
|
||||
Status: "success", DomainID: "internal-domain-id", Domains: domains,
|
||||
Status: "success", Domain: tc.domain, DomainID: tc.domainID, Domains: tc.domains,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
expected := "未指定域名"
|
||||
if len(domains) > 0 {
|
||||
expected = "example.test"
|
||||
}
|
||||
for _, body := range []string{payload.Subject, payload.Text, payload.HTML} {
|
||||
if strings.Contains(body, "internal-domain-id") || !strings.Contains(body, expected) {
|
||||
t.Fatal("用户邮件应显示证书域名而非内部记录编号")
|
||||
if (tc.domainID != "" && strings.Contains(body, tc.domainID)) || strings.Contains(body, "b6824906-fea9-4f2a-a682-3c2b1ade1ee3") || !strings.Contains(body, tc.expected) {
|
||||
t.Fatalf("用户邮件应显示证书域名而非内部记录编号或UUID: %s", body)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user