fix: fix refresh and delete in cert and site after sort

casbin · Jul 28, 2024 · 164eafd · 164eafd
1 parent 4b5d42d
commit 164eafd
Show file tree

Hide file tree

Showing 13 changed files with 270 additions and 84 deletions.
diff --git a/controllers/cert.go b/controllers/cert.go
@@ -16,6 +16,8 @@ package controllers
 
 import (
 	"encoding/json"
+	"github.com/beego/beego/utils/pagination"
+	"github.com/casbin/caswaf/util"
 
 	"github.com/casbin/caswaf/object"
 )
@@ -44,13 +46,38 @@ func (c *ApiController) GetCerts() {
 		owner = ""
 	}
 
-	certs, err := object.GetCerts(owner)
-	if err != nil {
-		c.ResponseError(err.Error())
-		return
+	limit := c.Input().Get("pageSize")
+	page := c.Input().Get("p")
+	field := c.Input().Get("field")
+	value := c.Input().Get("value")
+	sortField := c.Input().Get("sortField")
+	sortOrder := c.Input().Get("sortOrder")
+
+	if limit == "" || page == "" {
+		certs, err := object.GetCerts(owner)
+		if err != nil {
+			c.ResponseError(err.Error())
+			return
+		}
+
+		c.ResponseOk(object.GetMaskedCerts(certs))
+	} else {
+		limit := util.ParseInt(limit)
+		count, err := object.GetCertCount(owner, field, value)
+		if err != nil {
+			c.ResponseError(err.Error())
+			return
+		}
+
+		paginator := pagination.SetPaginator(c.Ctx, limit, count)
+		certs, err := object.GetCertsPaginated(owner, paginator.Offset(), limit, field, value, sortField, sortOrder)
+		if err != nil {
+			c.ResponseError(err.Error())
+			return
+		}
+
+		c.ResponseOk(object.GetMaskedCerts(certs), paginator.Nums())
 	}
-
-	c.ResponseOk(object.GetMaskedCerts(certs))
 }
 
 func (c *ApiController) GetCert() {
@@ -142,11 +169,6 @@ func (c *ApiController) UpdateCertDomainExpire() {
 	}
 	cert.DomainExpireTime = domainExpireTime
 
-	_, err = object.UpdateCert(id, cert)
-	if err != nil {
-		c.ResponseError(err.Error())
-		return
-	}
-
-	c.ResponseOk(object.GetMaskedCert(cert))
+	c.Data["json"] = wrapActionResponse(object.UpdateCert(id, cert))
+	c.ServeJSON()
 }
diff --git a/controllers/site.go b/controllers/site.go
@@ -16,6 +16,7 @@ package controllers
 
 import (
 	"encoding/json"
+	"github.com/beego/beego/utils/pagination"
 
 	"github.com/casbin/caswaf/object"
 	"github.com/casbin/caswaf/util"
@@ -45,13 +46,38 @@ func (c *ApiController) GetSites() {
 		owner = ""
 	}
 
-	sites, err := object.GetSites(owner)
+	limit := c.Input().Get("pageSize")
+	page := c.Input().Get("p")
+	field := c.Input().Get("field")
+	value := c.Input().Get("value")
+	sortField := c.Input().Get("sortField")
+	sortOrder := c.Input().Get("sortOrder")
+
+	if limit == "" || page == "" {
+		sites, err := object.GetSites(owner)
+		if err != nil {
+			c.ResponseError(err.Error())
+			return
+		}
+		c.ResponseOk(object.GetMaskedSites(sites, util.GetHostname()))
+		return
+	}
+
+	limitInt := util.ParseInt(limit)
+	count, err := object.GetSiteCount(owner, field, value)
 	if err != nil {
 		c.ResponseError(err.Error())
 		return
 	}
 
-	c.ResponseOk(object.GetMaskedSites(sites, util.GetHostname()))
+	paginator := pagination.SetPaginator(c.Ctx, limitInt, count)
+	sites, err := object.GetSitesPaginated(owner, paginator.Offset(), limitInt, field, value, sortField, sortOrder)
+	if err != nil {
+		c.ResponseError(err.Error())
+		return
+	}
+
+	c.ResponseOk(object.GetMaskedSites(sites, util.GetHostname()), paginator.Nums())
 }
 
 func (c *ApiController) GetSite() {

diff --git a/object/cert.go b/object/cert.go
@@ -206,3 +206,19 @@ func (cert *Cert) isCertNearExpire() (bool, error) {
 
 	return res, nil
 }
+
+func GetCertCount(owner, field, value string) (int64, error) {
+	session := GetSession(owner, -1, -1, field, value, "", "")
+	return session.Count(&Cert{})
+}
+
+func GetCertsPaginated(owner string, offset, limit int, field, value, sortField, sortOrder string) ([]*Cert, error) {
+	certs := []*Cert{}
+	session := GetSession(owner, offset, limit, field, value, sortField, sortOrder)
+	err := session.Where("owner = ? or owner = ?", "admin", owner).Find(&certs)
+	if err != nil {
+		return certs, err
+	}
+
+	return certs, nil
+}
diff --git a/object/ormer_session.go b/object/ormer_session.go
@@ -0,0 +1,31 @@
+package object
+
+import (
+	"fmt"
+	"github.com/casbin/caswaf/util"
+	"github.com/xorm-io/xorm"
+)
+
+func GetSession(owner string, offset, limit int, field, value, sortField, sortOrder string) *xorm.Session {
+	session := ormer.Engine.Prepare()
+	if offset != -1 && limit != -1 {
+		session.Limit(limit, offset)
+	}
+	if owner != "" {
+		session = session.And("owner=?", owner)
+	}
+	if field != "" && value != "" {
+		if util.FilterField(field) {
+			session = session.And(fmt.Sprintf("%s like ?", util.SnakeString(field)), fmt.Sprintf("%%%s%%", value))
+		}
+	}
+	if sortField == "" || sortOrder == "" {
+		sortField = "created_time"
+	}
+	if sortOrder == "ascend" {
+		session = session.Asc(util.SnakeString(sortField))
+	} else {
+		session = session.Desc(util.SnakeString(sortField))
+	}
+	return session
+}
diff --git a/object/site.go b/object/site.go
@@ -334,3 +334,19 @@ func (site *Site) checkNodes() error {
 
 	return nil
 }
+
+func GetSiteCount(owner, field, value string) (int64, error) {
+	session := GetSession(owner, -1, -1, field, value, "", "")
+	return session.Count(&Site{})
+}
+
+func GetSitesPaginated(owner string, offset, limit int, field, value, sortField, sortOrder string) ([]*Site, error) {
+	sites := []*Site{}
+	session := GetSession(owner, offset, limit, field, value, sortField, sortOrder)
+	err := session.Where("owner = ? or owner = ?", "admin", owner).Find(&sites)
+	if err != nil {
+		return sites, err
+	}
+
+	return sites, nil
+}
diff --git a/util/string.go b/util/string.go
@@ -163,3 +163,21 @@ func GenerateTwoUniqueRandomStrings() (string, string, error) {
 	}
 	return str1, str2, nil
 }
+
+func SnakeString(s string) string {
+	data := make([]byte, 0, len(s)*2)
+	j := false
+	num := len(s)
+	for i := 0; i < num; i++ {
+		d := s[i]
+		if i > 0 && d >= 'A' && d <= 'Z' && j {
+			data = append(data, '_')
+		}
+		if d != '_' {
+			j = true
+		}
+		data = append(data, d)
+	}
+	result := strings.ToLower(string(data[:]))
+	return strings.ReplaceAll(result, " ", "")
+}
diff --git a/util/validation.go b/util/validation.go
@@ -0,0 +1,17 @@
+package util
+
+import "regexp"
+
+var (
+	ReWhiteSpace     *regexp.Regexp
+	ReFieldWhiteList *regexp.Regexp
+)
+
+func init() {
+	ReWhiteSpace, _ = regexp.Compile(`\s`)
+	ReFieldWhiteList, _ = regexp.Compile(`^[A-Za-z0-9]+$`)
+}
+
+func FilterField(field string) bool {
+	return ReFieldWhiteList.MatchString(field)
+}
diff --git a/web/src/BaseListPage.js b/web/src/BaseListPage.js
@@ -32,11 +32,19 @@ class BaseListPage extends React.Component {
   }
 
   UNSAFE_componentWillMount() {
-    this.fetch();
+    const {pagination} = this.state;
+    this.fetch({pagination});
   }
 
-  handleTableChange = () => {
-    this.fetch();
+  handleTableChange = (pagination, filters, sorter) => {
+    this.fetch({
+      sortField: sorter.field,
+      sortOrder: sorter.order,
+      pagination,
+      ...filters,
+      searchText: this.state.searchText,
+      searchedColumn: this.state.searchedColumn,
+    });
   };
 
   render() {

diff --git a/web/src/CertListPage.js b/web/src/CertListPage.js
@@ -23,28 +23,14 @@ import copy from "copy-to-clipboard";
 import BaseListPage from "./BaseListPage";
 
 class CertListPage extends BaseListPage {
+  constructor(props) {
+    super(props);
+  }
 
   UNSAFE_componentWillMount() {
     this.fetch();
   }
 
-  fetch = (params = {}) => {
-    this.setState({loading: true});
-    CertBackend.getCerts(this.props.account.name)
-      .then((res) => {
-        this.setState({
-          loading: false,
-        });
-        if (res.status === "ok") {
-          this.setState({
-            data: res.data,
-          });
-        } else {
-          Setting.showMessage("error", `Failed to get certs: ${res.msg}`);
-        }
-      });
-  };
-
   newCert() {
     const randomName = Setting.getRandomName();
     return {
@@ -105,11 +91,7 @@ class CertListPage extends BaseListPage {
           Setting.showMessage("error", `Failed to refresh domain expire: ${res.msg}`);
         } else {
           Setting.showMessage("success", "Domain expire refresh successfully");
-          const newData = [...this.state.data];
-          newData[i] = res.data;
-          this.setState({
-            data: newData,
-          });
+          this.fetch();
         }
       }
       )
@@ -260,21 +242,25 @@ class CertListPage extends BaseListPage {
         title: i18next.t("general:Action"),
         dataIndex: "action",
         key: "action",
-        width: "180px",
+        width: "300px",
         render: (text, record, index) => {
           return (
-            <div>
-              <Button style={{marginTop: "10px", marginBottom: "10px", marginRight: "10px"}} type="default" onClick={() => this.refreshCert(index)}>
+            <div style={{display: "flex", alignItems: "center", flexWrap: "nowrap"}}>
+              <Button style={{margin: "10px 10px 10px 0"}} type="default" onClick={() => this.refreshCert(index)}>
                 {i18next.t("general:Refresh")}
               </Button>
-              <Button style={{marginTop: "10px", marginBottom: "10px", marginRight: "10px"}} type="primary" onClick={() => this.props.history.push(`/certs/${record.owner}/${record.name}`)}>{i18next.t("general:Edit")}</Button>
+              <Button style={{margin: "10px 10px 10px 0"}} type="primary" onClick={() => this.props.history.push(`/certs/${record.owner}/${record.name}`)}>
+                {i18next.t("general:Edit")}
+              </Button>
               <Popconfirm
                 title={`Sure to delete cert: ${record.name} ?`}
                 onConfirm={() => this.deleteCert(index)}
                 okText="OK"
                 cancelText="Cancel"
               >
-                <Button style={{marginBottom: "10px"}} type="danger">{i18next.t("general:Delete")}</Button>
+                <Button style={{margin: "10px 0"}} type="danger">
+                  {i18next.t("general:Delete")}
+                </Button>
               </Popconfirm>
             </div>
           );
@@ -284,7 +270,13 @@ class CertListPage extends BaseListPage {
 
     return (
       <div>
-        <Table columns={columns} dataSource={data} rowKey="name" size="middle" bordered pagination={{pageSize: 100}}
+        <Table
+          columns={columns}
+          dataSource={data}
+          rowKey="name"
+          size="middle"
+          bordered
+          pagination={this.state.pagination}
           title={() => (
             <div>
               {i18next.t("general:Certs")}&nbsp;&nbsp;&nbsp;&nbsp;
@@ -294,9 +286,41 @@ class CertListPage extends BaseListPage {
           loading={this.state.loading}
           onChange={this.handleTableChange}
         />
+
       </div>
     );
   }
+
+  fetch = (params = {}) => {
+    const field = params.searchedColumn, value = params.searchText;
+    const sortField = params.sortField, sortOrder = params.sortOrder;
+    if (!params.pagination) {
+      params.pagination = {current: 1, pageSize: 10};
+    }
+    this.setState({loading: true});
+    CertBackend.getCerts(this.props.account.name, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
+      .then((res) => {
+        this.setState({
+          loading: false,
+        });
+        if (res.status === "ok") {
+          this.setState({
+            data: res.data,
+            pagination: {
+              ...params.pagination,
+              total: res.data2,
+            },
+            searchText: params.searchText,
+            searchedColumn: params.searchedColumn,
+            sortField: sortField,
+            sortOrder: sortOrder,
+          });
+        } else {
+          Setting.showMessage("error", `Failed to get certs: ${res.msg}`);
+        }
+      });
+  };
+
 }
 
 export default CertListPage;
diff --git a/web/src/Setting.js b/web/src/Setting.js
@@ -298,3 +298,7 @@ export function getVersionInfo(text, siteName) {
 
   return {text: versionText, link: link};
 }
+
+export function findIndexByCompositeKey(array, owner, name) {
+  return array.findIndex(item => item.owner === owner && item.name === name);
+}