Skip to content

Commit e28e46d

Browse files
0xJacky0xJacky
committed
Get certificate info from local file
1 parent c747390 commit e28e46d

File tree

11 files changed

+197
-166
lines changed

11 files changed

+197
-166
lines changed

‎frontend/src/api/domain.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ class Domain extends Curd {
1414
return http.get('template')
1515
}
1616

17-
cert_info(domain: string) {
18-
return http.get('cert/' + domain + '/info')
17+
cert_info(path: string) {
18+
return http.get('cert_info?ssl_certificate_path=' + path)
1919
}
2020

2121
add_auto_cert(domain: string) {

‎frontend/src/version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"1.5.0","build_id":40,"total_build":110}
1+
{"version":"1.5.0","build_id":41,"total_build":111}

‎frontend/src/views/domain/cert/Cert.vue‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ const name = computed(() => {
2323
return props.directivesMap['server_name'][0].params.trim()
2424
})
2525
26+
const ssl_certificate_path = computed(() => {
27+
return props.directivesMap['ssl_certificate']?.[0].params.trim() ?? null
28+
})
29+
30+
2631
const enabled = computed({
2732
get() {
2833
return props.enabled
@@ -36,7 +41,7 @@ const enabled = computed({
3641

3742
<template>
3843
<div>
39-
<cert-info ref="info" :domain="name" v-if="name"/>
44+
<cert-info ref="info" :ssl_certificate_path="ssl_certificate_path" v-if="ssl_certificate_path"/>
4045
<issue-cert
4146
:current_server_directives="props.current_server_directives"
4247
:directives-map="props.directivesMap"

‎frontend/src/views/domain/cert/CertInfo.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import dayjs from 'dayjs'
44
import {reactive, ref} from 'vue'
55
import domain from '@/api/domain'
66
7-
const props = defineProps(['domain'])
7+
const props = defineProps(['ssl_certificate_path'])
88
99
const ok = ref(false)
1010
const cert = reactive({issuer_name: '', subject_name: '', not_after: '', not_before: ''})
1111
1212
get()
1313
1414
function get() {
15-
domain.cert_info(props.domain).then((r: any) => {
15+
domain.cert_info(props.ssl_certificate_path).then((r: any) => {
1616
Object.assign(cert, r)
1717
ok.value = true
1818
}).catch(() => {

‎frontend/version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"1.5.0","build_id":40,"total_build":110}
1+
{"version":"1.5.0","build_id":41,"total_build":111}

‎server/api/cert.go‎

Lines changed: 145 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,135 +1,155 @@
11
package api
22

33
import (
4-
"github.com/0xJacky/Nginx-UI/server/pkg/cert"
5-
"github.com/0xJacky/Nginx-UI/server/pkg/nginx"
6-
"github.com/gin-gonic/gin"
7-
"github.com/gorilla/websocket"
8-
"log"
9-
"net/http"
10-
"os"
4+
"github.com/0xJacky/Nginx-UI/server/model"
5+
"github.com/0xJacky/Nginx-UI/server/pkg/cert"
6+
"github.com/0xJacky/Nginx-UI/server/pkg/nginx"
7+
"github.com/gin-gonic/gin"
8+
"github.com/gorilla/websocket"
9+
"log"
10+
"net/http"
11+
"os"
1112
)
1213

1314
func CertInfo(c *gin.Context) {
14-
domain := c.Param("domain")
15-
16-
key, err := cert.GetCertInfo(domain)
17-
18-
if err != nil {
19-
c.JSON(http.StatusOK, gin.H{
20-
"message": "Failed to get cert information",
21-
"error": err,
22-
})
23-
return
24-
}
25-
26-
c.JSON(http.StatusOK, gin.H{
27-
"subject_name": key.Subject.CommonName,
28-
"issuer_name": key.Issuer.CommonName,
29-
"not_after": key.NotAfter,
30-
"not_before": key.NotBefore,
31-
})
15+
path := c.Query("ssl_certificate_path")
16+
17+
log.Println(path)
18+
19+
key, err := cert.GetCertInfo(path)
20+
21+
if err != nil {
22+
c.JSON(http.StatusInternalServerError, gin.H{
23+
"message": "Failed to get certificate information",
24+
"error": err.Error(),
25+
})
26+
return
27+
}
28+
29+
c.JSON(http.StatusOK, gin.H{
30+
"subject_name": key.Subject.CommonName,
31+
"issuer_name": key.Issuer.CommonName,
32+
"not_after": key.NotAfter,
33+
"not_before": key.NotBefore,
34+
})
3235
}
3336

3437
func IssueCert(c *gin.Context) {
35-
domain := c.Param("domain")
36-
var upGrader = websocket.Upgrader{
37-
CheckOrigin: func(r *http.Request) bool {
38-
return true
39-
},
40-
}
41-
42-
// upgrade http to websocket
43-
ws, err := upGrader.Upgrade(c.Writer, c.Request, nil)
44-
if err != nil {
45-
log.Println(err)
46-
return
47-
}
48-
49-
defer func(ws *websocket.Conn) {
50-
err := ws.Close()
51-
if err != nil {
52-
log.Println("defer websocket close err", err)
53-
}
54-
}(ws)
55-
56-
// read
57-
mt, message, err := ws.ReadMessage()
58-
if err != nil {
59-
log.Println(err)
60-
return
61-
}
62-
63-
if mt == websocket.TextMessage && string(message) == "go" {
64-
65-
err = cert.IssueCert(domain)
66-
67-
if err != nil {
68-
69-
log.Println(err)
70-
71-
err = ws.WriteJSON(gin.H{
72-
"status": "error",
73-
"message": err.Error(),
74-
})
75-
76-
if err != nil {
77-
log.Println(err)
78-
return
79-
}
80-
81-
return
82-
}
83-
84-
sslCertificatePath := nginx.GetNginxConfPath("ssl/" + domain + "/fullchain.cer")
85-
_, err = os.Stat(sslCertificatePath)
86-
87-
if err != nil {
88-
log.Println(err)
89-
return
90-
}
91-
92-
log.Println("[found]", "fullchain.cer")
93-
94-
err = ws.WriteJSON(gin.H{
95-
"status": "success",
96-
"message": "[found] fullchain.cer",
97-
})
98-
99-
if err != nil {
100-
log.Println(err)
101-
return
102-
}
103-
104-
sslCertificateKeyPath := nginx.GetNginxConfPath("ssl/" + domain + "/" + domain + ".key")
105-
_, err = os.Stat(sslCertificateKeyPath)
106-
107-
if err != nil {
108-
log.Println(err)
109-
return
110-
}
111-
112-
log.Println("[found]", "cert key")
113-
err = ws.WriteJSON(gin.H{
114-
"status": "success",
115-
"message": "[found] Certificate Key",
116-
})
117-
118-
if err != nil {
119-
log.Println(err)
120-
return
121-
}
122-
123-
err = ws.WriteJSON(gin.H{
124-
"status": "success",
125-
"message": "Issued certificate successfully",
126-
"ssl_certificate": sslCertificatePath,
127-
"ssl_certificate_key": sslCertificateKeyPath,
128-
})
129-
130-
if err != nil {
131-
log.Println(err)
132-
return
133-
}
134-
}
38+
domain := c.Param("domain")
39+
40+
var upGrader = websocket.Upgrader{
41+
CheckOrigin: func(r *http.Request) bool {
42+
return true
43+
},
44+
}
45+
46+
// upgrade http to websocket
47+
ws, err := upGrader.Upgrade(c.Writer, c.Request, nil)
48+
if err != nil {
49+
log.Println(err)
50+
return
51+
}
52+
53+
defer func(ws *websocket.Conn) {
54+
err := ws.Close()
55+
if err != nil {
56+
log.Println("defer websocket close err", err)
57+
}
58+
}(ws)
59+
60+
// read
61+
mt, message, err := ws.ReadMessage()
62+
if err != nil {
63+
log.Println(err)
64+
return
65+
}
66+
67+
if mt == websocket.TextMessage && string(message) == "go" {
68+
69+
err = cert.IssueCert(domain)
70+
71+
if err != nil {
72+
73+
log.Println(err)
74+
75+
err = ws.WriteJSON(gin.H{
76+
"status": "error",
77+
"message": err.Error(),
78+
})
79+
80+
if err != nil {
81+
log.Println(err)
82+
return
83+
}
84+
85+
return
86+
}
87+
88+
sslCertificatePath := nginx.GetNginxConfPath("ssl/" + domain + "/fullchain.cer")
89+
_, err = os.Stat(sslCertificatePath)
90+
91+
if err != nil {
92+
log.Println(err)
93+
return
94+
}
95+
96+
log.Println("[found]", "fullchain.cer")
97+
98+
err = ws.WriteJSON(gin.H{
99+
"status": "success",
100+
"message": "[found] fullchain.cer",
101+
})
102+
103+
if err != nil {
104+
log.Println(err)
105+
return
106+
}
107+
108+
sslCertificateKeyPath := nginx.GetNginxConfPath("ssl/" + domain + "/" + domain + ".key")
109+
_, err = os.Stat(sslCertificateKeyPath)
110+
111+
if err != nil {
112+
log.Println(err)
113+
return
114+
}
115+
116+
log.Println("[found]", "cert key")
117+
err = ws.WriteJSON(gin.H{
118+
"status": "success",
119+
"message": "[found] Certificate Key",
120+
})
121+
122+
if err != nil {
123+
log.Println(err)
124+
return
125+
}
126+
127+
certModel, err := model.FirstCert(domain)
128+
129+
if err != nil {
130+
log.Println(err)
131+
return
132+
}
133+
134+
err = certModel.Updates(&model.Cert{
135+
SSLCertificatePath: sslCertificatePath,
136+
})
137+
138+
if err != nil {
139+
log.Println(err)
140+
return
141+
}
142+
143+
err = ws.WriteJSON(gin.H{
144+
"status": "success",
145+
"message": "Issued certificate successfully",
146+
"ssl_certificate": sslCertificatePath,
147+
"ssl_certificate_key": sslCertificateKeyPath,
148+
})
149+
150+
if err != nil {
151+
log.Println(err)
152+
return
153+
}
154+
}
135155
}

‎server/api/domain.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ func DeleteDomain(c *gin.Context) {
248248

249249
func AddDomainToAutoCert(c *gin.Context) {
250250
domain := c.Param("domain")
251+
251252
cert, err := model.FirstOrCreateCert(domain)
252253
if err != nil {
253254
ErrHandler(c, err)

‎server/model/cert.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import (
88

99
type Cert struct {
1010
Model
11-
Domain string `json:"domain"`
11+
Domain string `json:"domain"`
12+
SSLCertificatePath string `json:"ssl_certificate_path"`
1213
}
1314

1415
func FirstCert(domain string) (c Cert, err error) {
@@ -27,8 +28,8 @@ func FirstOrCreateCert(domain string) (c Cert, err error) {
2728
func GetAutoCertList() (c []Cert) {
2829
var t []Cert
2930
db.Find(&t)
30-
// check if this domain is enabled
3131

32+
// check if this domain is enabled
3233
enabledConfig, err := os.ReadDir(filepath.Join(nginx.GetNginxConfPath("sites-enabled")))
3334

3435
if err != nil {
@@ -49,6 +50,10 @@ func GetAutoCertList() (c []Cert) {
4950
return
5051
}
5152

53+
func (c *Cert) Updates(n *Cert) error {
54+
return db.Model(c).Updates(n).Error
55+
}
56+
5257
func (c *Cert) Remove() error {
5358
return db.Where("domain", c.Domain).Delete(c).Error
5459
}

0 commit comments

Comments
 (0)