Buriburizaemon/nezha_domains
1
0
Fork 0
mirror of https://github.com/Buriburizaem0n/nezha_domains.git synced 2026-02-06 05:30:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[dashboard v0.3.12] 修复SSL证书异常数据导致重启

Browse Source
This commit is contained in:
naiba
2021-01-26 09:12:48 +08:00
parent e28d5b1b9a
commit 0104807324
3 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service/dao/dao.go
View File

@@ -13,7 +13,7 @@ import (
pb "github.com/naiba/nezha/proto"
)
var Version = "v0.3.11" // ！！记得修改 README 重的 badge 版本！！
var Version = "v0.3.12" // ！！记得修改 README 重的 badge 版本！！
const (
SnapshotDelay = 3

27
service/rpc/nezha.go
View File

@@ -29,23 +29,28 @@ func (s *NezhaHandler) ReportTask(c context.Context, r *pb.TaskResult) (*pb.Rece
errMsg = r.GetData()
} else {
var last model.MonitorHistory
if err := dao.DB.Where("monitor_id = ? AND data LIKE ?", r.GetId(), "%|%").Order("id DESC").First(&last).Error; err == nil {
var oldCert = strings.Split(last.Data, "|")
var newCert = strings.Split(r.GetData(), "|")
expiresOld, _ := time.Parse("2006-01-02 15:04:05 -0700 MST", oldCert[1])
var newCert = strings.Split(r.GetData(), "|")
if len(newCert) > 1 {
expiresNew, _ := time.Parse("2006-01-02 15:04:05 -0700 MST", newCert[1])
// 证书变更提醒
if last.Data != "" && oldCert[0] != newCert[0] && !expiresNew.Equal(expiresOld) {
errMsg = fmt.Sprintf(
"SSL证书变更，旧：%s, %s 过期；新：%s, %s 过期。",
oldCert[0], expiresOld.Format("2006-01-02 15:04:05"), newCert[0], expiresNew.Format("2006-01-02 15:04:05"))
}
// 证书过期提醒
if err == nil && expiresNew.Before(time.Now().AddDate(0, 0, 7)) {
if expiresNew.Before(time.Now().AddDate(0, 0, 7)) {
errMsg = fmt.Sprintf(
"SSL证书将在七天内过期，过期时间：%s。",
expiresNew.Format("2006-01-02 15:04:05"))
}
// 证书变更提醒
if err := dao.DB.Where("monitor_id = ? AND data LIKE ?", r.GetId(), "%|%").Order("id DESC").First(&last).Error; err == nil {
var oldCert = strings.Split(last.Data, "|")
var expiresOld time.Time
if len(oldCert) > 1 {
expiresOld, _ = time.Parse("2006-01-02 15:04:05 -0700 MST", oldCert[1])
}
if last.Data != "" && oldCert[0] != newCert[0] && !expiresNew.Equal(expiresOld) {
errMsg = fmt.Sprintf(
"SSL证书变更，旧：%s, %s 过期；新：%s, %s 过期。",
oldCert[0], expiresOld.Format("2006-01-02 15:04:05"), newCert[0], expiresNew.Format("2006-01-02 15:04:05"))
}
}
}
}
if errMsg != "" {