增加证书OCSP错误日志管理

internal/web/actions/default/servers/certs/certPopup.go

@@ -26,14 +26,14 @@ func (this *CertPopupAction) RunGet(params struct {
 		return
 	}
 
-	certConfig := &sslconfigs.SSLCertConfig{}
+	var certConfig = &sslconfigs.SSLCertConfig{}
 	err = json.Unmarshal(certResp.SslCertJSON, certConfig)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
-	reverseCommonNames := []string{}
+	var reverseCommonNames = []string{}
 	for i := len(certConfig.CommonNames) - 1; i >= 0; i-- {
 		reverseCommonNames = append(reverseCommonNames, certConfig.CommonNames[i])
 	}
@@ -62,7 +62,7 @@ func (this *CertPopupAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	serverMaps := []maps.Map{}
+	var serverMaps = []maps.Map{}
 	for _, server := range serversResp.Servers {
 		serverMaps = append(serverMaps, maps.Map{
 			"id":   server.Id,

internal/web/actions/default/servers/certs/helper.go

@@ -1,8 +1,11 @@
 package certs
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
 	"net/http"
 )
 
@@ -13,14 +16,29 @@ func NewHelper() *Helper {
 	return &Helper{}
 }
 
-func (this *Helper) BeforeAction(action *actions.ActionObject) {
+func (this *Helper) BeforeAction(actionWrapper actions.ActionWrapper) {
+	var action = actionWrapper.Object()
 	if action.Request.Method != http.MethodGet {
 		return
 	}
 
 	action.Data["teaMenu"] = "servers"
 
-	action.Data["leftMenuItems"] = []maps.Map{
+	var countOCSP int64 = 0
+	parentAction, ok := actionWrapper.(actionutils.ActionInterface)
+	if ok {
+		countOCSPResp, err := parentAction.RPC().SSLCertRPC().CountAllSSLCertsWithOCSPError(parentAction.AdminContext(), &pb.CountAllSSLCertsWithOCSPErrorRequest{})
+		if err == nil {
+			countOCSP = countOCSPResp.Count
+		}
+	}
+
+	var ocspMenuName = "OCSP日志"
+	if countOCSP > 0 {
+		ocspMenuName += "(" + types.String(countOCSP) + ")"
+	}
+
+	var menu = []maps.Map{
 		{
 			"name":     "证书",
 			"url":      "/servers/certs",
@@ -31,5 +49,11 @@ func (this *Helper) BeforeAction(action *actions.ActionObject) {
 			"url":      "/servers/certs/acme",
 			"isActive": action.Data.GetString("leftMenuItem") == "acme",
 		},
+		{
+			"name":     ocspMenuName,
+			"url":      "/servers/certs/ocsp",
+			"isActive": action.Data.GetString("leftMenuItem") == "ocsp",
+		},
 	}
+	action.Data["leftMenuItems"] = menu
 }

internal/web/actions/default/servers/certs/index.go

@@ -25,12 +25,12 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["type"] = params.Type
 	this.Data["keyword"] = params.Keyword
 
-	countAll := int64(0)
+	var countAll = int64(0)
-	countCA := int64(0)
+	var countCA = int64(0)
-	countAvailable := int64(0)
+	var countAvailable = int64(0)
-	countExpired := int64(0)
+	var countExpired = int64(0)
-	count7Days := int64(0)
+	var count7Days = int64(0)
-	count30Days := int64(0)
+	var count30Days = int64(0)
 
 	// 计算数量
 	{
@@ -147,7 +147,7 @@ func (this *IndexAction) RunGet(params struct {
 		return
 	}
 
-	certConfigs := []*sslconfigs.SSLCertConfig{}
+	var certConfigs = []*sslconfigs.SSLCertConfig{}
 	err = json.Unmarshal(listResp.SslCertsJSON, &certConfigs)
 	if err != nil {
 		this.ErrorPage(err)
@@ -155,8 +155,8 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["certs"] = certConfigs
 
-	certMaps := []maps.Map{}
+	var certMaps = []maps.Map{}
-	nowTime := time.Now().Unix()
+	var nowTime = time.Now().Unix()
 	for _, certConfig := range certConfigs {
 		countServersResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithSSLCertId(this.AdminContext(), &pb.CountAllEnabledServersWithSSLCertIdRequest{SslCertId: certConfig.Id})
 		if err != nil {

internal/web/actions/default/servers/certs/init.go

@@ -5,6 +5,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/certs/acme"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/certs/acme/accounts"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/certs/acme/users"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/certs/ocsp"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/iwind/TeaGo"
 )
@@ -55,6 +56,14 @@ func init() {
 			GetPost("/updatePopup", new(accounts.UpdatePopupAction)).
 			Post("/delete", new(accounts.DeleteAction)).
 
+			// OCSP
+			Prefix("/servers/certs/ocsp").
+			Data("leftMenuItem", "ocsp").
+			Get("", new(ocsp.IndexAction)).
+			Post("/reset", new(ocsp.ResetAction)).
+			Post("/resetAll", new(ocsp.ResetAllAction)).
+			Post("/ignore", new(ocsp.IgnoreAction)).
+
 			//
 			EndAll()
 	})

internal/web/actions/default/servers/certs/ocsp/ignore.go

@@ -0,0 +1,26 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package ocsp
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type IgnoreAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IgnoreAction) RunPost(params struct {
+	CertIds []int64
+}) {
+	defer this.CreateLogInfo("忽略一组证书的OCSP状态")
+
+	_, err := this.RPC().SSLCertRPC().IgnoreSSLCertsWithOCSPError(this.AdminContext(), &pb.IgnoreSSLCertsWithOCSPErrorRequest{SslCertIds: params.CertIds})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/servers/certs/ocsp/index.go

@@ -0,0 +1,65 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package ocsp
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+	"time"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.SecondMenu("ocsp")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	Keyword string
+}) {
+	this.Data["keyword"] = params.Keyword
+
+	countResp, err := this.RPC().SSLCertRPC().CountAllSSLCertsWithOCSPError(this.AdminContext(), &pb.CountAllSSLCertsWithOCSPErrorRequest{Keyword: params.Keyword})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var count = countResp.Count
+	var page = this.NewPage(count)
+	this.Data["page"] = page.AsHTML()
+
+	certsResp, err := this.RPC().SSLCertRPC().ListSSLCertsWithOCSPError(this.AdminContext(), &pb.ListSSLCertsWithOCSPErrorRequest{
+		Keyword: params.Keyword,
+		Offset:  page.Offset,
+		Size:    page.Size,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var certMaps = []maps.Map{}
+	for _, cert := range certsResp.SslCerts {
+		certMaps = append(certMaps, maps.Map{
+			"id":            cert.Id,
+			"isOn":          cert.IsOn,
+			"dnsNames":      cert.DnsNames,
+			"commonNames":   cert.CommonNames,
+			"hasOCSP":       len(cert.Ocsp) > 0,
+			"ocspIsUpdated": cert.OcspIsUpdated,
+			"ocspError":     cert.OcspError,
+			"isCA":          cert.IsCA,
+			"isACME":        cert.IsACME,
+			"name":          cert.Name,
+			"isExpired":     cert.TimeEndAt < time.Now().Unix(),
+			"beginDay":      timeutil.FormatTime("Y-m-d", cert.TimeBeginAt),
+			"endDay":        timeutil.FormatTime("Y-m-d", cert.TimeEndAt),
+		})
+	}
+	this.Data["certs"] = certMaps
+
+	this.Show()
+}

internal/web/actions/default/servers/certs/ocsp/reset.go

@@ -0,0 +1,26 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package ocsp
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type ResetAction struct {
+	actionutils.ParentAction
+}
+
+func (this *ResetAction) RunPost(params struct {
+	CertIds []int64
+}) {
+	defer this.CreateLogInfo("重置一组证书的OCSP状态")
+
+	_, err := this.RPC().SSLCertRPC().ResetSSLCertsWithOCSPError(this.AdminContext(), &pb.ResetSSLCertsWithOCSPErrorRequest{SslCertIds: params.CertIds})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/servers/certs/ocsp/resetAll.go

@@ -0,0 +1,24 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package ocsp
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type ResetAllAction struct {
+	actionutils.ParentAction
+}
+
+func (this *ResetAllAction) RunPost(params struct{}) {
+	defer this.CreateLogInfo("忽略所有证书的OCSP状态")
+
+	_, err := this.RPC().SSLCertRPC().ResetAllSSLCertsWithOCSPError(this.AdminContext(), &pb.ResetAllSSLCertsWithOCSPErrorRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

web/public/js/components/common/checkbox.js

@@ -27,6 +27,15 @@ Vue.component("checkbox", {
 	methods: {
 		change: function () {
 			this.$emit("input", this.newValue)
+		},
+		check: function () {
+			this.newValue = this.elementValue
+		},
+		uncheck: function () {
+			this.newValue = ""
+		},
+		isChecked: function () {
+			return this.newValue == this.elementValue
 		}
 	},
 	watch: {

web/views/@default/servers/certs/ocsp/index.html

@@ -0,0 +1,84 @@
+{$layout}
+{$template "/left_menu_top"}
+
+<div class="right-box without-tabbar">
+    <div class="margin"></div>
+
+    <form class="ui form" method="get" action="/servers/certs/ocsp">
+        <div class="ui fields inline">
+            <div class="ui field">
+                <input type="text" placeholder="关键词" style="width: 10em" name="keyword" v-model="keyword"/>
+            </div>
+            <div class="ui field">
+                <button class="ui button small">搜索</button>
+                &nbsp; <a href="/servers/certs/ocsp" v-if="keyword.length > 0">[清除条件]</a>
+            </div>
+        </div>
+    </form>
+    <div class="margin"></div>
+
+    <form class="ui form" v-if="certs.length > 0">
+        <div class="ui divider"></div>
+        <div class="ui fields inline">
+            <div class="ui field" v-if="certIds.length == 0" @click.prevent="resetAllCerts">
+                <button class="ui button small basic">重试所有证书</button>
+            </div>
+            <div class="ui field" v-if="certIds.length > 0">
+                <button class="ui button small basic" @click.prevent="resetCerts">重试选中证书</button>
+            </div>
+            <div class="ui field" v-if="certIds.length > 0">
+                <button class="ui button small basic" @click.prevent="ignoreCerts">忽略选中证书</button>
+            </div>
+        </div>
+    </form>
+
+    <p class="comment" v-if="certs.length == 0">暂时没有OCSP日志。</p>
+
+    <table class="ui table selectable celled" v-if="certs.length > 0">
+        <thead>
+            <tr>
+                <th style="width: 1em"><checkbox v-model="allChecked"></checkbox></th>
+                <th>证书说明</th>
+                <th>顶级发行组织</th>
+                <th>域名</th>
+                <th>错误信息</th>
+                <th class="center">状态</th>
+                <th class="one op">操作</th>
+            </tr>
+        </thead>
+        <tbody v-for="(cert, index) in certs">
+            <tr>
+                <td><checkbox :id="'cert_' + cert.id" ref="certCheckboxes" @input="changeCerts"></checkbox></td>
+                <td><keyword :v-word="keyword">{{cert.name}}</keyword>
+                    <div v-if="cert.isCA" style="margin-top:0.5em">
+                        <micro-basic-label class="olive">CA</micro-basic-label>
+                    </div>
+                    <div v-if="cert.isACME" style="margin-top: 0.5em">
+                        <micro-basic-label class="olive" title="通过ACME协议免费申请">ACME</micro-basic-label>
+                    </div>
+                </td>
+                <td>
+                    <span v-if="cert.commonNames != null && cert.commonNames.length > 0">{{cert.commonNames[cert.commonNames.length-1]}}</span>
+                </td>
+                <td>
+                    <div v-for="dnsName in cert.dnsNames" style="margin-bottom:0.4em">
+                        <span class="ui label tiny basic"><keyword :v-word="keyword">{{dnsName}}</keyword></span>
+                    </div>
+                </td>
+                <td style="word-break: break-all">
+                    <span class="red">{{cert.ocspError}}</span>
+                </td>
+                <td nowrap="" class="center">
+                    <span class="ui label red tiny basic" v-if="!cert.isOn">未启用</span>
+                    <span class="ui label red tiny basic" v-else-if="cert.isExpired">已过期</span>
+                    <span class="ui label green tiny basic" v-else>有效中</span>
+                </td>
+                <td>
+                    <a href="" @click.prevent="viewCert(cert.id)">详情</a> &nbsp;
+                </td>
+            </tr>
+        </tbody>
+    </table>
+
+    <div class="page" v-html="page"></div>
+</div>

web/views/@default/servers/certs/ocsp/index.js

@@ -0,0 +1,62 @@
+Tea.context(function () {
+	this.certIds = []
+	this.allChecked = false
+
+	this.$delay(function () {
+		let that = this
+		this.$watch("allChecked", function (b) {
+			let boxes = that.$refs.certCheckboxes
+			boxes.forEach(function (box) {
+				if (b) {
+					box.check()
+				} else {
+					box.uncheck()
+				}
+				that.changeCerts()
+			})
+		})
+	})
+
+	this.changeCerts = function () {
+		let boxes = this.$refs.certCheckboxes
+		let that = this
+		this.certIds = []
+		boxes.forEach(function (box) {
+			if (box.isChecked()) {
+				let boxId = box.id
+				that.certIds.push(parseInt(boxId.split("_")[1]))
+			}
+		})
+	}
+
+	this.resetAllCerts = function () {
+		this.$post(".resetAll")
+			.success(function () {
+				teaweb.successRefresh("重置成功")
+			})
+	}
+
+	this.resetCerts = function () {
+		this.$post(".reset")
+			.params({ certIds: this.certIds })
+			.success(function () {
+				teaweb.successRefresh("重置成功")
+			})
+	}
+
+	this.ignoreCerts = function () {
+		this.$post(".ignore")
+			.params({ certIds: this.certIds })
+			.success(function () {
+				teaweb.successRefresh("忽略成功")
+			})
+	}
+
+	// 查看证书详情
+	this.viewCert = function (certId) {
+		teaweb.popup("/servers/certs/certPopup?certId=" + certId, {
+			height: "28em",
+			width: "48em"
+		})
+	}
+})