chore: prepare v2.0.0-beta.14

0xJacky · Feb 6, 2024 · 3bbe56c · 3bbe56c
2 parents 4e369ba + 66571bc
commit 3bbe56c
Show file tree

Hide file tree

Showing 25 changed files with 274 additions and 153 deletions.
diff --git a/api/certificate/certificate.go b/api/certificate/certificate.go
@@ -25,7 +25,7 @@ func Transformer(certModel *model.Cert) (certificate *APICertificate) {
 	if certModel.SSLCertificatePath != "" {
 		if _, err := os.Stat(certModel.SSLCertificatePath); err == nil {
 			sslCertificationBytes, _ = os.ReadFile(certModel.SSLCertificatePath)
-			if !cert.IsPublicKey(string(sslCertificationBytes)) {
+			if !cert.IsCertificate(string(sslCertificationBytes)) {
 				sslCertificationBytes = []byte{}
 			}
 		}
@@ -77,9 +77,9 @@ func GetCert(c *gin.Context) {
 
 type certJson struct {
 	Name                  string `json:"name" binding:"required"`
-	SSLCertificatePath    string `json:"ssl_certificate_path" binding:"required,publickey_path"`
+	SSLCertificatePath    string `json:"ssl_certificate_path" binding:"required,certificate_path"`
 	SSLCertificateKeyPath string `json:"ssl_certificate_key_path" binding:"required,privatekey_path"`
-	SSLCertificate        string `json:"ssl_certificate" binding:"omitempty,publickey"`
+	SSLCertificate        string `json:"ssl_certificate" binding:"omitempty,certificate"`
 	SSLCertificateKey     string `json:"ssl_certificate_key" binding:"omitempty,privatekey"`
 	ChallengeMethod       string `json:"challenge_method"`
 	DnsCredentialID       int    `json:"dns_credential_id"`

diff --git a/api/certificate/router.go b/api/certificate/router.go
@@ -11,7 +11,6 @@ func InitDNSCredentialRouter(r *gin.RouterGroup) {
 }
 
 func InitCertificateRouter(r *gin.RouterGroup) {
-	r.GET("domain/:name/cert", IssueCert)
 	r.GET("certs", GetCertList)
 	r.GET("cert/:id", GetCert)
 	r.POST("cert", AddCert)
@@ -20,3 +19,7 @@ func InitCertificateRouter(r *gin.RouterGroup) {
 	r.GET("certificate/dns_providers", GetDNSProvidersList)
 	r.GET("certificate/dns_provider/:code", GetDNSProvider)
 }
+
+func InitCertificateWebSocketRouter(r *gin.RouterGroup) {
+	r.GET("domain/:name/cert", IssueCert)
+}
diff --git a/api/config/get.go b/api/config/get.go
@@ -1,51 +1,52 @@
 package config
 
 import (
-	"github.com/0xJacky/Nginx-UI/api"
-	"github.com/0xJacky/Nginx-UI/internal/config"
-	"github.com/0xJacky/Nginx-UI/internal/nginx"
-	"github.com/0xJacky/Nginx-UI/query"
-	"github.com/gin-gonic/gin"
-	"github.com/sashabaranov/go-openai"
-	"net/http"
-	"os"
+    "github.com/0xJacky/Nginx-UI/api"
+    "github.com/0xJacky/Nginx-UI/internal/config"
+    "github.com/0xJacky/Nginx-UI/internal/nginx"
+    "github.com/0xJacky/Nginx-UI/query"
+    "github.com/gin-gonic/gin"
+    "github.com/sashabaranov/go-openai"
+    "net/http"
+    "os"
 )
 
 func GetConfig(c *gin.Context) {
-	name := c.Param("name")
-	path := nginx.GetConfPath("/", name)
-
-	stat, err := os.Stat(path)
-
-	if err != nil {
-		api.ErrHandler(c, err)
-		return
-	}
-
-	content, err := os.ReadFile(path)
-
-	if err != nil {
-		api.ErrHandler(c, err)
-		return
-	}
-
-	g := query.ChatGPTLog
-	chatgpt, err := g.Where(g.Name.Eq(path)).FirstOrCreate()
-
-	if err != nil {
-		api.ErrHandler(c, err)
-		return
-	}
-
-	if chatgpt.Content == nil {
-		chatgpt.Content = make([]openai.ChatCompletionMessage, 0)
-	}
-
-	c.JSON(http.StatusOK, config.Config{
-		Name:            name,
-		Content:         string(content),
-		ChatGPTMessages: chatgpt.Content,
-		FilePath:        path,
-		ModifiedAt:      stat.ModTime(),
-	})
+    name := c.Param("name")
+
+    path := nginx.GetConfPath("/", name)
+
+    stat, err := os.Stat(path)
+
+    if err != nil {
+        api.ErrHandler(c, err)
+        return
+    }
+
+    content, err := os.ReadFile(path)
+
+    if err != nil {
+        api.ErrHandler(c, err)
+        return
+    }
+
+    g := query.ChatGPTLog
+    chatgpt, err := g.Where(g.Name.Eq(path)).FirstOrCreate()
+
+    if err != nil {
+        api.ErrHandler(c, err)
+        return
+    }
+
+    if chatgpt.Content == nil {
+        chatgpt.Content = make([]openai.ChatCompletionMessage, 0)
+    }
+
+    c.JSON(http.StatusOK, config.Config{
+        Name:            name,
+        Content:         string(content),
+        ChatGPTMessages: chatgpt.Content,
+        FilePath:        path,
+        ModifiedAt:      stat.ModTime(),
+    })
 }
diff --git a/api/config/list.go b/api/config/list.go
@@ -35,7 +35,7 @@ func GetConfigs(c *gin.Context) {
 			}
 		case mode&os.ModeSymlink != 0: // is a symbol
 			var targetPath string
-			targetPath, err = os.Readlink(nginx.GetConfPath(file.Name()))
+			targetPath, err = os.Readlink(nginx.GetConfPath(dir, file.Name()))
 			if err != nil {
 				logger.Error("Read Symlink Error", targetPath, err)
 				continue
@@ -47,7 +47,7 @@ func GetConfigs(c *gin.Context) {
 				logger.Error("Stat Error", targetPath, err)
 				continue
 			}
-			// but target file is not a dir
+			// hide the file if it's target file is a directory
 			if targetInfo.IsDir() {
 				continue
 			}

diff --git a/api/config/modify.go b/api/config/modify.go
@@ -30,7 +30,6 @@ func EditConfig(c *gin.Context) {
 	}
 
 	if content != "" && content != string(origContent) {
-		// model.CreateBackup(path)
 		err = os.WriteFile(path, []byte(content), 0644)
 		if err != nil {
 			api.ErrHandler(c, err)

diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nginx-ui-app-next",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.14",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/app/src/language/LINGUAS b/app/src/language/LINGUAS
@@ -1 +1 @@
-es fr_FR ru_RU vi_VN zh_CN zh_TW
+en zh_CN zh_TW fr_FR es ru_RU vi_VN
diff --git a/app/src/language/en/app.po b/app/src/language/en/app.po
@@ -1561,14 +1561,15 @@ msgstr ""
 msgid "The input is not a SSL Certificate Key"
 msgstr "Certificate Status"
 
+#: src/views/certificate/CertificateEditor.vue:168
+#, fuzzy
+msgid "The path exists, but the file is not a certificate"
+msgstr "Certificate Status"
+
 #: src/views/certificate/CertificateEditor.vue:183
 msgid "The path exists, but the file is not a private key"
 msgstr ""
 
-#: src/views/certificate/CertificateEditor.vue:168
-msgid "The path exists, but the file is not a public key"
-msgstr ""
-
 #: src/views/domain/cert/components/AutoCertStepOne.vue:45
 #, fuzzy
 msgid ""

diff --git a/app/src/language/es/app.po b/app/src/language/es/app.po
@@ -1492,14 +1492,15 @@ msgstr "La entrada no es un Certificado SSL"
 msgid "The input is not a SSL Certificate Key"
 msgstr "La entrada no es una clave de certificado SSL"
 
+#: src/views/certificate/CertificateEditor.vue:168
+#, fuzzy
+msgid "The path exists, but the file is not a certificate"
+msgstr "La ruta existe, pero el archivo no es una clave privada"
+
 #: src/views/certificate/CertificateEditor.vue:183
 msgid "The path exists, but the file is not a private key"
 msgstr "La ruta existe, pero el archivo no es una clave privada"
 
-#: src/views/certificate/CertificateEditor.vue:168
-msgid "The path exists, but the file is not a public key"
-msgstr "La ruta existe, pero el archivo no es una clave pública"
-
 #: src/views/domain/cert/components/AutoCertStepOne.vue:45
 msgid ""
 "The server_name in the current configuration must be the domain name you "
@@ -1672,6 +1673,9 @@ msgstr "Estás usando la última versión"
 msgid "You can check Nginx UI upgrade at this page."
 msgstr "Puede consultar la actualización de Nginx UI en esta página."
 
+#~ msgid "The path exists, but the file is not a public key"
+#~ msgstr "La ruta existe, pero el archivo no es una clave pública"
+
 #, fuzzy
 #~ msgid "Server"
 #~ msgstr "Información del servidor"

diff --git a/app/src/language/fr_FR/app.po b/app/src/language/fr_FR/app.po
@@ -1559,14 +1559,15 @@ msgstr ""
 msgid "The input is not a SSL Certificate Key"
 msgstr "Chemin de la clé du certificat SSL"
 
+#: src/views/certificate/CertificateEditor.vue:168
+#, fuzzy
+msgid "The path exists, but the file is not a certificate"
+msgstr "Chemin de la clé du certificat SSL"
+
 #: src/views/certificate/CertificateEditor.vue:183
 msgid "The path exists, but the file is not a private key"
 msgstr ""
 
-#: src/views/certificate/CertificateEditor.vue:168
-msgid "The path exists, but the file is not a public key"
-msgstr ""
-
 #: src/views/domain/cert/components/AutoCertStepOne.vue:45
 #, fuzzy
 msgid ""

diff --git a/app/src/language/messages.pot b/app/src/language/messages.pot
@@ -1508,12 +1508,12 @@ msgstr ""
 msgid "The input is not a SSL Certificate Key"
 msgstr ""
 
-#: src/views/certificate/CertificateEditor.vue:183
-msgid "The path exists, but the file is not a private key"
+#: src/views/certificate/CertificateEditor.vue:168
+msgid "The path exists, but the file is not a certificate"
 msgstr ""
 
-#: src/views/certificate/CertificateEditor.vue:168
-msgid "The path exists, but the file is not a public key"
+#: src/views/certificate/CertificateEditor.vue:183
+msgid "The path exists, but the file is not a private key"
 msgstr ""
 
 #: src/views/domain/cert/components/AutoCertStepOne.vue:45

diff --git a/app/src/language/ru_RU/app.po b/app/src/language/ru_RU/app.po
@@ -1567,14 +1567,15 @@ msgstr ""
 msgid "The input is not a SSL Certificate Key"
 msgstr "Путь к ключу сертификата SSL"
 
+#: src/views/certificate/CertificateEditor.vue:168
+#, fuzzy
+msgid "The path exists, but the file is not a certificate"
+msgstr "Путь к ключу сертификата SSL"
+
 #: src/views/certificate/CertificateEditor.vue:183
 msgid "The path exists, but the file is not a private key"
 msgstr ""
 
-#: src/views/certificate/CertificateEditor.vue:168
-msgid "The path exists, but the file is not a public key"
-msgstr ""
-
 #: src/views/domain/cert/components/AutoCertStepOne.vue:45
 #, fuzzy
 msgid ""

diff --git a/app/src/language/vi_VN/app.po b/app/src/language/vi_VN/app.po
@@ -1564,12 +1564,12 @@ msgstr ""
 msgid "The input is not a SSL Certificate Key"
 msgstr ""
 
-#: src/views/certificate/CertificateEditor.vue:183
-msgid "The path exists, but the file is not a private key"
+#: src/views/certificate/CertificateEditor.vue:168
+msgid "The path exists, but the file is not a certificate"
 msgstr ""
 
-#: src/views/certificate/CertificateEditor.vue:168
-msgid "The path exists, but the file is not a public key"
+#: src/views/certificate/CertificateEditor.vue:183
+msgid "The path exists, but the file is not a private key"
 msgstr ""
 
 #: src/views/domain/cert/components/AutoCertStepOne.vue:45

diff --git a/app/src/language/zh_CN/app.mo b/app/src/language/zh_CN/app.mo
diff --git a/app/src/language/zh_CN/app.po b/app/src/language/zh_CN/app.po
@@ -1479,14 +1479,14 @@ msgstr "输入的内容不是 SSL 证书"
 msgid "The input is not a SSL Certificate Key"
 msgstr "输入的内容不是 SSL 证书密钥"
 
+#: src/views/certificate/CertificateEditor.vue:168
+msgid "The path exists, but the file is not a certificate"
+msgstr "路径存在，但文件不是证书"
+
 #: src/views/certificate/CertificateEditor.vue:183
 msgid "The path exists, but the file is not a private key"
 msgstr "路径存在，但文件不是私钥"
 
-#: src/views/certificate/CertificateEditor.vue:168
-msgid "The path exists, but the file is not a public key"
-msgstr "路径存在，但文件不是公钥"
-
 #: src/views/domain/cert/components/AutoCertStepOne.vue:45
 msgid ""
 "The server_name in the current configuration must be the domain name you "
@@ -1652,6 +1652,9 @@ msgstr "您使用的是最新版本"
 msgid "You can check Nginx UI upgrade at this page."
 msgstr "你可以在这个页面检查Nginx UI的升级。"
 
+#~ msgid "The path exists, but the file is not a public key"
+#~ msgstr "路径存在，但文件不是公钥"
+
 #~ msgid "Rename Upstream"
 #~ msgstr "重新命名 Upstream"
 

diff --git a/app/src/language/zh_TW/app.po b/app/src/language/zh_TW/app.po
@@ -1526,14 +1526,15 @@ msgstr ""
 msgid "The input is not a SSL Certificate Key"
 msgstr "SSL 憑證金鑰路徑"
 
+#: src/views/certificate/CertificateEditor.vue:168
+#, fuzzy
+msgid "The path exists, but the file is not a certificate"
+msgstr "SSL 憑證金鑰路徑"
+
 #: src/views/certificate/CertificateEditor.vue:183
 msgid "The path exists, but the file is not a private key"
 msgstr ""
 
-#: src/views/certificate/CertificateEditor.vue:168
-msgid "The path exists, but the file is not a public key"
-msgstr ""
-
 #: src/views/domain/cert/components/AutoCertStepOne.vue:45
 #, fuzzy
 msgid ""

diff --git a/app/src/version.json b/app/src/version.json
@@ -1 +1 @@
-{"version":"2.0.0-beta.11","build_id":111,"total_build":315}
+{"version":"2.0.0-beta.14","build_id":112,"total_build":316}
diff --git a/app/src/views/certificate/CertificateEditor.vue b/app/src/views/certificate/CertificateEditor.vue
@@ -164,8 +164,8 @@ const isManaged = computed(() => {
             :label="$gettext('SSL Certificate Path')"
             :validate-status="errors.ssl_certificate_path ? 'error' : ''"
             :help="errors.ssl_certificate_path === 'required' ? $gettext('This field is required')
-              : errors.ssl_certificate_path === 'publickey_path'
-                ? $gettext('The path exists, but the file is not a public key') : ''"
+              : errors.ssl_certificate_path === 'certificate_path'
+                ? $gettext('The path exists, but the file is not a certificate') : ''"
           >
             <p v-if="isManaged">
               {{ data.ssl_certificate_path }}
@@ -193,7 +193,7 @@ const isManaged = computed(() => {
           <AFormItem
             :label="$gettext('SSL Certificate Content')"
             :validate-status="errors.ssl_certificate ? 'error' : ''"
-            :help="errors.ssl_certificate === 'publickey'
+            :help="errors.ssl_certificate === 'certificate'
               ? $gettext('The input is not a SSL Certificate') : ''"
           >
             <CodeEditor

diff --git a/app/version.json b/app/version.json
@@ -1 +1 @@
-{"version":"2.0.0-beta.11","build_id":111,"total_build":315}
+{"version":"2.0.0-beta.14","build_id":112,"total_build":316}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		es fr_FR ru_RU vi_VN zh_CN zh_TW
		en zh_CN zh_TW fr_FR es ru_RU vi_VN
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"version":"2.0.0-beta.11","build_id":111,"total_build":315}
		{"version":"2.0.0-beta.14","build_id":112,"total_build":316}