Skip to content

Commit 47d4013

Browse files
0xJacky0xJacky
authored
Merge pull request #420 from 0xJacky/enhance/auto-cert
Enhance auto cert
2 parents 8059345 + 217f4dc commit 47d4013

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2471
-1654
lines changed

‎api/certificate/certificate.go

+60
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import (
44
"github.com/0xJacky/Nginx-UI/api"
55
"github.com/0xJacky/Nginx-UI/internal/cert"
66
"github.com/0xJacky/Nginx-UI/internal/cosy"
7+
"github.com/0xJacky/Nginx-UI/internal/nginx"
8+
"github.com/0xJacky/Nginx-UI/internal/notification"
79
"github.com/0xJacky/Nginx-UI/model"
810
"github.com/0xJacky/Nginx-UI/query"
911
"github.com/gin-gonic/gin"
@@ -86,6 +88,7 @@ type certJson struct {
8688
ChallengeMethod string `json:"challenge_method"`
8789
DnsCredentialID int `json:"dns_credential_id"`
8890
ACMEUserID int `json:"acme_user_id"`
91+
SyncNodeIds []int `json:"sync_node_ids"`
8992
}
9093

9194
func AddCert(c *gin.Context) {
@@ -103,6 +106,7 @@ func AddCert(c *gin.Context) {
103106
ChallengeMethod: json.ChallengeMethod,
104107
DnsCredentialID: json.DnsCredentialID,
105108
ACMEUserID: json.ACMEUserID,
109+
SyncNodeIds: json.SyncNodeIds,
106110
}
107111

108112
err := certModel.Insert()
@@ -126,6 +130,12 @@ func AddCert(c *gin.Context) {
126130
return
127131
}
128132

133+
err = cert.SyncToRemoteServer(certModel)
134+
if err != nil {
135+
notification.Error("Sync Certificate Error", err.Error())
136+
return
137+
}
138+
129139
c.JSON(http.StatusOK, Transformer(certModel))
130140
}
131141

@@ -154,6 +164,7 @@ func ModifyCert(c *gin.Context) {
154164
KeyType: json.KeyType,
155165
DnsCredentialID: json.DnsCredentialID,
156166
ACMEUserID: json.ACMEUserID,
167+
SyncNodeIds: json.SyncNodeIds,
157168
})
158169

159170
if err != nil {
@@ -175,9 +186,58 @@ func ModifyCert(c *gin.Context) {
175186
return
176187
}
177188

189+
err = cert.SyncToRemoteServer(certModel)
190+
if err != nil {
191+
notification.Error("Sync Certificate Error", err.Error())
192+
return
193+
}
194+
178195
GetCert(c)
179196
}
180197

181198
func RemoveCert(c *gin.Context) {
182199
cosy.Core[model.Cert](c).Destroy()
183200
}
201+
202+
func SyncCertificate(c *gin.Context) {
203+
var json cert.SyncCertificatePayload
204+
205+
if !api.BindAndValid(c, &json) {
206+
return
207+
}
208+
209+
certModel := &model.Cert{
210+
Name: json.Name,
211+
SSLCertificatePath: json.SSLCertificatePath,
212+
SSLCertificateKeyPath: json.SSLCertificateKeyPath,
213+
KeyType: json.KeyType,
214+
AutoCert: model.AutoCertSync,
215+
}
216+
217+
db := model.UseDB()
218+
219+
err := db.Where(certModel).FirstOrCreate(certModel).Error
220+
if err != nil {
221+
api.ErrHandler(c, err)
222+
return
223+
}
224+
225+
content := &cert.Content{
226+
SSLCertificatePath: json.SSLCertificatePath,
227+
SSLCertificateKeyPath: json.SSLCertificateKeyPath,
228+
SSLCertificate: json.SSLCertificate,
229+
SSLCertificateKey: json.SSLCertificateKey,
230+
}
231+
232+
err = content.WriteFile()
233+
if err != nil {
234+
api.ErrHandler(c, err)
235+
return
236+
}
237+
238+
nginx.Reload()
239+
240+
c.JSON(http.StatusOK, gin.H{
241+
"message": "ok",
242+
})
243+
}

‎api/certificate/issue.go

+4-11
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ package certificate
33
import (
44
"github.com/0xJacky/Nginx-UI/internal/cert"
55
"github.com/0xJacky/Nginx-UI/internal/logger"
6-
"github.com/0xJacky/Nginx-UI/internal/nginx"
76
"github.com/0xJacky/Nginx-UI/model"
87
"github.com/gin-gonic/gin"
98
"github.com/go-acme/lego/v4/certcrypto"
109
"github.com/gorilla/websocket"
1110
"net/http"
12-
"strings"
1311
)
1412

1513
const (
@@ -71,7 +69,6 @@ func IssueCert(c *gin.Context) {
7169
payload := &cert.ConfigPayload{}
7270

7371
err = ws.ReadJSON(payload)
74-
7572
if err != nil {
7673
logger.Error(err)
7774
return
@@ -122,14 +119,10 @@ func IssueCert(c *gin.Context) {
122119
return
123120
}
124121

125-
certDirName := strings.Join(payload.ServerName, "_") + "_" + string(payload.GetKeyType())
126-
sslCertificatePath := nginx.GetConfPath("ssl", certDirName, "fullchain.cer")
127-
sslCertificateKeyPath := nginx.GetConfPath("ssl", certDirName, "private.key")
128-
129122
err = certModel.Updates(&model.Cert{
130123
Domains: payload.ServerName,
131-
SSLCertificatePath: sslCertificatePath,
132-
SSLCertificateKeyPath: sslCertificateKeyPath,
124+
SSLCertificatePath: payload.GetCertificatePath(),
125+
SSLCertificateKeyPath: payload.GetCertificateKeyPath(),
133126
AutoCert: model.AutoCertEnabled,
134127
KeyType: payload.KeyType,
135128
ChallengeMethod: payload.ChallengeMethod,
@@ -152,8 +145,8 @@ func IssueCert(c *gin.Context) {
152145
err = ws.WriteJSON(IssueCertResponse{
153146
Status: Success,
154147
Message: "Issued certificate successfully",
155-
SSLCertificate: sslCertificatePath,
156-
SSLCertificateKey: sslCertificateKeyPath,
148+
SSLCertificate: payload.GetCertificatePath(),
149+
SSLCertificateKey: payload.GetCertificateKeyPath(),
157150
KeyType: payload.GetKeyType(),
158151
})
159152

‎api/certificate/router.go

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ func InitCertificateRouter(r *gin.RouterGroup) {
1616
r.POST("cert", AddCert)
1717
r.POST("cert/:id", ModifyCert)
1818
r.DELETE("cert/:id", RemoveCert)
19+
r.PUT("cert_sync", SyncCertificate)
1920
r.GET("certificate/dns_providers", GetDNSProvidersList)
2021
r.GET("certificate/dns_provider/:code", GetDNSProvider)
2122
}

‎api/notification/notification.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ func GetList(c *gin.Context) {
3030
}
3131

3232
func Destroy(c *gin.Context) {
33-
cosy.Core[model.Notification](c).
34-
PermanentlyDelete()
33+
cosy.Core[model.Notification](c).Destroy()
3534
}
3635

3736
func DestroyAll(c *gin.Context) {

‎api/sites/domain.go

-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@ func GetDomains(c *gin.Context) {
2222
sort := c.DefaultQuery("sort", "desc")
2323

2424
configFiles, err := os.ReadDir(nginx.GetConfPath("sites-available"))
25-
2625
if err != nil {
2726
api.ErrHandler(c, err)
2827
return
2928
}
3029

3130
enabledConfig, err := os.ReadDir(nginx.GetConfPath("sites-enabled"))
32-
3331
if err != nil {
3432
api.ErrHandler(c, err)
3533
return

‎app/package.json

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nginx-ui-app-next",
3-
"version": "2.0.0-beta.24",
3+
"version": "2.0.0-beta.25",
44
"type": "module",
55
"scripts": {
66
"dev": "vite",
@@ -13,15 +13,15 @@
1313
"dependencies": {
1414
"@ant-design/icons-vue": "^7.0.1",
1515
"@formkit/auto-animate": "^0.8.2",
16-
"@vue/reactivity": "^3.4.27",
17-
"@vue/shared": "^3.4.27",
18-
"@vueuse/core": "^10.9.0",
16+
"@vue/reactivity": "^3.4.29",
17+
"@vue/shared": "^3.4.29",
18+
"@vueuse/core": "^10.11.0",
1919
"@xterm/addon-attach": "^0.11.0",
2020
"@xterm/addon-fit": "^0.10.0",
2121
"@xterm/xterm": "^5.5.0",
22-
"ant-design-vue": "^4.2.1",
23-
"apexcharts": "^3.49.0",
24-
"axios": "^1.6.8",
22+
"ant-design-vue": "^4.2.3",
23+
"apexcharts": "^3.49.1",
24+
"axios": "^1.7.2",
2525
"dayjs": "^1.11.11",
2626
"highlight.js": "^11.9.0",
2727
"lodash": "^4.17.21",
@@ -32,44 +32,44 @@
3232
"reconnecting-websocket": "^4.4.0",
3333
"sortablejs": "^1.15.2",
3434
"vite-plugin-build-id": "^0.2.9",
35-
"vue": "^3.4.27",
35+
"vue": "^3.4.29",
3636
"vue-github-button": "github:0xJacky/vue-github-button",
37-
"vue-router": "^4.3.2",
37+
"vue-router": "^4.3.3",
3838
"vue3-ace-editor": "2.2.4",
3939
"vue3-apexcharts": "1.4.4",
4040
"vue3-gettext": "3.0.0-beta.4",
4141
"vuedraggable": "^4.1.0"
4242
},
4343
"devDependencies": {
4444
"@antfu/eslint-config-vue": "^0.43.1",
45-
"@types/lodash": "^4.17.1",
45+
"@types/lodash": "^4.17.5",
4646
"@types/nprogress": "^0.2.3",
4747
"@types/sortablejs": "^1.15.8",
4848
"@typescript-eslint/eslint-plugin": "^6.21.0",
4949
"@typescript-eslint/parser": "^6.21.0",
50-
"@vitejs/plugin-vue": "^5.0.4",
50+
"@vitejs/plugin-vue": "^5.0.5",
5151
"@vitejs/plugin-vue-jsx": "^3.1.0",
52-
"@vue/compiler-sfc": "^3.4.27",
52+
"@vue/compiler-sfc": "^3.4.29",
5353
"@vue/tsconfig": "^0.5.1",
54-
"ace-builds": "^1.33.1",
54+
"ace-builds": "^1.35.0",
5555
"autoprefixer": "^10.4.19",
5656
"eslint": "^8.57.0",
5757
"eslint-import-resolver-alias": "^1.1.2",
5858
"eslint-import-resolver-typescript": "^3.6.1",
5959
"eslint-plugin-import": "^2.29.1",
6060
"eslint-plugin-regex": "^1.10.0",
6161
"eslint-plugin-sonarjs": "^0.23.0",
62-
"eslint-plugin-vue": "^9.25.0",
62+
"eslint-plugin-vue": "^9.26.0",
6363
"less": "^4.2.0",
6464
"postcss": "^8.4.38",
65-
"tailwindcss": "^3.4.3",
65+
"tailwindcss": "^3.4.4",
6666
"typescript": "5.3.3",
67-
"unplugin-auto-import": "^0.17.5",
67+
"unplugin-auto-import": "^0.17.6",
6868
"unplugin-vue-components": "^0.26.0",
69-
"unplugin-vue-define-options": "^1.4.4",
70-
"vite": "^5.2.11",
69+
"unplugin-vue-define-options": "^1.4.5",
70+
"vite": "^5.3.1",
7171
"vite-svg-loader": "^5.1.0",
7272
"vue-tsc": "^1.8.27"
7373
},
74-
"packageManager": "pnpm@9.0.6+sha256.0624e30eff866cdeb363b15061bdb7fd9425b17bc1bb42c22f5f4efdea21f6b3"
74+
"packageManager": "pnpm@9.3.0+sha512.ee7b93e0c2bd11409c6424f92b866f31d3ea1bef5fbe47d3c7500cdc3c9668833d2e55681ad66df5b640c61fa9dc25d546efa54d76d7f8bf54b13614ac293631"
7575
}

0 commit comments

Comments
 (0)