From 2b8a01059a573073a6873a39694da3bb703cd3bc Mon Sep 17 00:00:00 2001 From: samwaf Date: Mon, 6 Jan 2025 13:51:30 +0800 Subject: [PATCH] fix:ssl task logic --- service/waf_service/waf_sslorder.go | 2 +- utils/common.go | 2 +- wafenginecore/wafengine.go | 2 +- waftask/task_ssl.go | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/service/waf_service/waf_sslorder.go b/service/waf_service/waf_sslorder.go index 040b2dc..0c0a917 100644 --- a/service/waf_service/waf_sslorder.go +++ b/service/waf_service/waf_sslorder.go @@ -163,7 +163,7 @@ func (receiver *WafSSLOrderService) RenewAdd(orderId string) (model.SslOrder, er func (receiver *WafSSLOrderService) GetLastedInfo(hostCode string) (model.SslOrder, error) { var bean model.SslOrder - global.GWAF_LOCAL_DB.Model(&model.SslOrder{}).Where("host_code=?", hostCode).Where("result_certificate is null").Order("create_time desc").Limit(1).First(&bean) + global.GWAF_LOCAL_DB.Model(&model.SslOrder{}).Where("host_code=?", hostCode).Where("result_certificate is not null").Order("create_time desc").Limit(1).First(&bean) return bean, nil } diff --git a/utils/common.go b/utils/common.go index 3f878fe..0f647cb 100644 --- a/utils/common.go +++ b/utils/common.go @@ -45,7 +45,7 @@ func GetCurrentDir() string { zlog.Error("Failed to get executable path:", err) return "" } - zlog.Info("当前程序所在文件位置", exePath) + zlog.Debug("当前程序所在文件位置", exePath) exeDir := filepath.Dir(exePath) return exeDir } diff --git a/wafenginecore/wafengine.go b/wafenginecore/wafengine.go index ee988aa..c3a25dc 100644 --- a/wafenginecore/wafengine.go +++ b/wafenginecore/wafengine.go @@ -284,7 +284,7 @@ func (waf *WafEngine) ServeHTTP(w http.ResponseWriter, r *http.Request) { } err := json.Unmarshal([]byte(hostTarget.Host.DEFENSE_JSON), &hostDefense) if err != nil { - zlog.Error("解析defense json失败") + zlog.Debug("解析defense json失败") } //检测爬虫bot if hostDefense.DEFENSE_BOT == 1 { diff --git a/waftask/task_ssl.go b/waftask/task_ssl.go index f1e95d5..53b7fb0 100644 --- a/waftask/task_ssl.go +++ b/waftask/task_ssl.go @@ -88,6 +88,7 @@ func SSLOrderReload() { allSSLHost, _, err := wafHostService.GetAllSSLBindHost() if err == nil { for _, hostBean := range allSSLHost { + zlog.Info(innerLogName, fmt.Sprintf("正在检测域名: %s:%d", hostBean.Host, hostBean.Port)) lastSslOrderInfo, err := wafSslOrderService.GetLastedInfo(hostBean.Code) if err != nil { zlog.Error(innerLogName, "ssl order get lasted info:", err.Error()) @@ -101,7 +102,7 @@ func SSLOrderReload() { zlog.Error(innerLogName, "ssl order get lasted info:", err.Error()) } else { zlog.Info(innerLogName, "ssl order expire:", isExpire, availDay, msg) - if isExpire && availDay <= int(global.GCONFIG_RECORD_SSLOrder_EXPIRE_DAY) { + if isExpire == false && availDay <= int(global.GCONFIG_RECORD_SSLOrder_EXPIRE_DAY) { //没过期 且是知单天数 就才处理 var chanInfo = spec.ChanSslOrder{ Type: enums.ChanSslOrderrenew,