fix: config sync issues #685

api/config/get.go

@@ -10,6 +10,7 @@ import (
 	"github.com/sashabaranov/go-openai"
 	"net/http"
 	"os"
+	"path/filepath"
 )
 
 type APIConfigResp struct {
@@ -19,30 +20,30 @@ type APIConfigResp struct {
 }
 
 func GetConfig(c *gin.Context) {
-	name := c.Param("name")
+	relativePath := c.Param("path")
 
-	path := nginx.GetConfPath("/", name)
+	absPath := nginx.GetConfPath(relativePath)
-	if !helper.IsUnderDirectory(path, nginx.GetConfPath()) {
+	if !helper.IsUnderDirectory(absPath, nginx.GetConfPath()) {
 		c.JSON(http.StatusForbidden, gin.H{
 			"message": "path is not under the nginx conf path",
 		})
 		return
 	}
 
-	stat, err := os.Stat(path)
+	stat, err := os.Stat(absPath)
 	if err != nil {
 		api.ErrHandler(c, err)
 		return
 	}
 
-	content, err := os.ReadFile(path)
+	content, err := os.ReadFile(absPath)
 	if err != nil {
 		api.ErrHandler(c, err)
 		return
 	}
 	q := query.Config
 	g := query.ChatGPTLog
-	chatgpt, err := g.Where(g.Name.Eq(path)).FirstOrCreate()
+	chatgpt, err := g.Where(g.Name.Eq(absPath)).FirstOrCreate()
 	if err != nil {
 		api.ErrHandler(c, err)
 		return
@@ -52,7 +53,7 @@ func GetConfig(c *gin.Context) {
 		chatgpt.Content = make([]openai.ChatCompletionMessage, 0)
 	}
 
-	cfg, err := q.Where(q.Filepath.Eq(path)).FirstOrInit()
+	cfg, err := q.Where(q.Filepath.Eq(absPath)).FirstOrInit()
 	if err != nil {
 		api.ErrHandler(c, err)
 		return
@@ -63,8 +64,9 @@ func GetConfig(c *gin.Context) {
 			Name:            stat.Name(),
 			Content:         string(content),
 			ChatGPTMessages: chatgpt.Content,
-			FilePath:        path,
+			FilePath:        absPath,
 			ModifiedAt:      stat.ModTime(),
+			Dir:             filepath.Dir(relativePath),
 		},
 		SyncNodeIds:   cfg.SyncNodeIds,
 		SyncOverwrite: cfg.SyncOverwrite,

api/config/modify.go

@@ -11,6 +11,7 @@ import (
 	"github.com/sashabaranov/go-openai"
 	"net/http"
 	"os"
+	"path/filepath"
 	"time"
 )
 
@@ -19,11 +20,9 @@ type EditConfigJson struct {
 }
 
 func EditConfig(c *gin.Context) {
-	name := c.Param("name")
+	relativePath := c.Param("path")
 	var json struct {
 		Name          string   `json:"name" binding:"required"`
-		Filepath      string   `json:"filepath" binding:"required"`
-		NewFilepath   string   `json:"new_filepath" binding:"required"`
 		Content       string   `json:"content"`
 		SyncOverwrite bool     `json:"sync_overwrite"`
 		SyncNodeIds   []uint64 `json:"sync_node_ids"`
@@ -32,22 +31,8 @@ func EditConfig(c *gin.Context) {
 		return
 	}
 
-	path := json.Filepath
+	absPath := nginx.GetConfPath(relativePath)
-	if !helper.IsUnderDirectory(path, nginx.GetConfPath()) {
+	if !helper.FileExists(absPath) {
-		c.JSON(http.StatusForbidden, gin.H{
-			"message": "filepath is not under the nginx conf path",
-		})
-		return
-	}
-
-	if !helper.IsUnderDirectory(json.NewFilepath, nginx.GetConfPath()) {
-		c.JSON(http.StatusForbidden, gin.H{
-			"message": "new filepath is not under the nginx conf path",
-		})
-		return
-	}
-
-	if !helper.FileExists(path) {
 		c.JSON(http.StatusNotFound, gin.H{
 			"message": "file not found",
 		})
@@ -55,14 +40,14 @@ func EditConfig(c *gin.Context) {
 	}
 
 	content := json.Content
-	origContent, err := os.ReadFile(path)
+	origContent, err := os.ReadFile(absPath)
 	if err != nil {
 		api.ErrHandler(c, err)
 		return
 	}
 
 	if content != "" && content != string(origContent) {
-		err = os.WriteFile(path, []byte(content), 0644)
+		err = os.WriteFile(absPath, []byte(content), 0644)
 		if err != nil {
 			api.ErrHandler(c, err)
 			return
@@ -70,17 +55,15 @@ func EditConfig(c *gin.Context) {
 	}
 
 	q := query.Config
-	cfg, err := q.Where(q.Filepath.Eq(json.Filepath)).FirstOrCreate()
+	cfg, err := q.Where(q.Filepath.Eq(absPath)).FirstOrCreate()
 	if err != nil {
 		api.ErrHandler(c, err)
 		return
 	}
 
-	_, err = q.Where(q.Filepath.Eq(json.Filepath)).
+	_, err = q.Where(q.Filepath.Eq(absPath)).
-		Select(q.Name, q.Filepath, q.SyncNodeIds, q.SyncOverwrite).
+		Select(q.SyncNodeIds, q.SyncOverwrite).
 		Updates(&model.Config{
-			Name:          json.Name,
-			Filepath:      json.NewFilepath,
 			SyncNodeIds:   json.SyncNodeIds,
 			SyncOverwrite: json.SyncOverwrite,
 		})
@@ -89,27 +72,12 @@ func EditConfig(c *gin.Context) {
 		return
 	}
 
+	// use the new values
+	cfg.SyncNodeIds = json.SyncNodeIds
+	cfg.SyncOverwrite = json.SyncOverwrite
+
 	g := query.ChatGPTLog
-	// handle rename
+	err = config.SyncToRemoteServer(cfg, absPath)
-	if path != json.NewFilepath {
-		if helper.FileExists(json.NewFilepath) {
-			c.JSON(http.StatusNotAcceptable, gin.H{
-				"message": "File exists",
-			})
-			return
-		}
-		err := os.Rename(json.Filepath, json.NewFilepath)
-		if err != nil {
-			api.ErrHandler(c, err)
-			return
-		}
-
-		// update ChatGPT record
-		_, _ = g.Where(g.Name.Eq(json.NewFilepath)).Delete()
-		_, _ = g.Where(g.Name.Eq(path)).Update(g.Name, json.NewFilepath)
-	}
-
-	err = config.SyncToRemoteServer(cfg, json.NewFilepath)
 	if err != nil {
 		api.ErrHandler(c, err)
 		return
@@ -123,7 +91,7 @@ func EditConfig(c *gin.Context) {
 		return
 	}
 
-	chatgpt, err := g.Where(g.Name.Eq(json.NewFilepath)).FirstOrCreate()
+	chatgpt, err := g.Where(g.Name.Eq(absPath)).FirstOrCreate()
 	if err != nil {
 		api.ErrHandler(c, err)
 		return
@@ -134,10 +102,11 @@ func EditConfig(c *gin.Context) {
 	}
 
 	c.JSON(http.StatusOK, config.Config{
-		Name:            name,
+		Name:            filepath.Base(absPath),
 		Content:         content,
 		ChatGPTMessages: chatgpt.Content,
-		FilePath:        json.NewFilepath,
+		FilePath:        absPath,
 		ModifiedAt:      time.Now(),
+		Dir:             filepath.Dir(relativePath),
 	})
 }

api/config/rename.go

@@ -5,11 +5,13 @@ import (
 	"github.com/0xJacky/Nginx-UI/internal/config"
 	"github.com/0xJacky/Nginx-UI/internal/helper"
 	"github.com/0xJacky/Nginx-UI/internal/nginx"
+	"github.com/0xJacky/Nginx-UI/model"
 	"github.com/0xJacky/Nginx-UI/query"
 	"github.com/gin-gonic/gin"
 	"github.com/uozi-tech/cosy/logger"
 	"net/http"
 	"os"
+	"strings"
 )
 
 func Rename(c *gin.Context) {
@@ -77,7 +79,10 @@ func Rename(c *gin.Context) {
 		_, _ = g.Where(g.Name.Like(origFullPath+"%")).Update(g.Name, g.Name.Replace(origFullPath, newFullPath))
 	}
 
-	_, err = q.Where(q.Filepath.Eq(origFullPath)).Update(q.Filepath, newFullPath)
+	_, err = q.Where(q.Filepath.Eq(origFullPath)).Updates(&model.Config{
+		Filepath: newFullPath,
+		Name:     json.NewName,
+	})
 	if err != nil {
 		api.ErrHandler(c, err)
 		return
@@ -92,6 +97,6 @@ func Rename(c *gin.Context) {
 	}
 
 	c.JSON(http.StatusOK, gin.H{
-		"message": "ok",
+		"path": strings.TrimLeft(newFullPath, nginx.GetConfPath()),
 	})
 }

api/config/router.go

@@ -9,9 +9,9 @@ func InitRouter(r *gin.RouterGroup) {
 	r.GET("config_base_path", GetBasePath)
 
 	r.GET("configs", GetConfigs)
-	r.GET("configs/*name", GetConfig)
+	r.GET("configs/*path", GetConfig)
 	r.POST("configs", AddConfig)
-	r.POST("configs/*name", EditConfig)
+	r.POST("configs/*path", EditConfig)
 
 	o := r.Group("", middleware.RequireSecureSession())
 	{

app/src/api/config.ts

@@ -10,6 +10,7 @@ export interface Config {
   modified_at: string
   sync_node_ids?: number[]
   sync_overwrite?: false
+  dir: string
 }
 
 class ConfigCurd extends Curd<Config> {
@@ -25,7 +26,7 @@ class ConfigCurd extends Curd<Config> {
     return http.post('/config_mkdir', { base_path: basePath, folder_name: name })
   }
 
-  rename(basePath: string, origName: string, newName: string, syncNodeIds: number[]) {
+  rename(basePath: string, origName: string, newName: string, syncNodeIds?: number[]) {
     return http.post('/config_rename', {
       base_path: basePath,
       orig_name: origName,

app/src/components/Notification/config.ts

@@ -11,13 +11,13 @@ export function syncConfigError(text: string) {
     return $gettext('Please upgrade the remote Nginx UI to the latest version')
   }
 
-  return $gettext('Sync config %{config_name} to %{env_name} failed, response: %{resp}', { config_name: data.cert_name, env_name: data.env_name, resp: data.resp_body }, true)
+  return $gettext('Sync config %{config_name} to %{env_name} failed, response: %{resp}', { config_name: data.config_name, env_name: data.env_name, resp: data.resp_body }, true)
 }
 
 export function syncRenameConfigSuccess(text: string) {
   const data = JSON.parse(text)
 
-  return $gettext('Rename %{orig_path} to %{new_path} on %{env_name} successfully', { orig_path: data.orig_path, new_path: data.orig_path, env_name: data.env_name })
+  return $gettext('Rename %{orig_path} to %{new_path} on %{env_name} successfully', { orig_path: data.orig_path, new_path: data.new_path, env_name: data.env_name })
 }
 
 export function syncRenameConfigError(text: string) {
@@ -27,7 +27,7 @@ export function syncRenameConfigError(text: string) {
     return $gettext('Please upgrade the remote Nginx UI to the latest version')
   }
 
-  return $gettext('Rename %{orig_path} to %{new_path} on %{env_name} failed, response: %{resp}', { orig_path: data.orig_path, new_path: data.orig_path, resp: data.resp_body, env_name: data.env_name }, true)
+  return $gettext('Rename %{orig_path} to %{new_path} on %{env_name} failed, response: %{resp}', { orig_path: data.orig_path, new_path: data.new_path, resp: data.resp_body, env_name: data.env_name }, true)
 }
 
 export function saveSiteSuccess(text: string) {

app/src/views/config/ConfigEditor.vue

@@ -11,6 +11,7 @@ import NodeSelector from '@/components/NodeSelector/NodeSelector.vue'
 import { useBreadcrumbs } from '@/composables/useBreadcrumbs'
 import { formatDateTime } from '@/lib/helper'
 import { useSettingsStore } from '@/pinia'
+import ConfigName from '@/views/config/components/ConfigName.vue'
 import InspectConfig from '@/views/config/InspectConfig.vue'
 import { InfoCircleOutlined } from '@ant-design/icons-vue'
 import { message } from 'ant-design-vue'
@@ -255,7 +256,7 @@ function goBack() {
                 name="name"
                 :label="$gettext('Name')"
               >
-                <AInput v-model:value="data.name" />
+                <ConfigName :name="data.name" :dir="data.dir" />
               </AFormItem>
               <AFormItem
                 v-if="!addMode"

app/src/views/config/ConfigList.vue

@@ -7,7 +7,6 @@ import Mkdir from '@/views/config/components/Mkdir.vue'
 import Rename from '@/views/config/components/Rename.vue'
 import configColumns from '@/views/config/configColumns'
 import InspectConfig from '@/views/config/InspectConfig.vue'
-import { $gettext } from '../../gettext'
 
 const table = ref()
 const route = useRoute()
@@ -143,12 +142,12 @@ const refRename = ref()
           size="small"
           @click="() => {
             if (!record.is_dir) {
-              $router.push({
+              router.push({
                 path: `/config/${basePath}${record.name}/edit`,
               })
             }
             else {
-              $router.push({
+              router.push({
                 query: {
                   dir: basePath + record.name,
                 },

app/src/views/config/components/ConfigName.vue

@@ -0,0 +1,67 @@
+<script setup lang="ts">
+import config from '@/api/config'
+import use2FAModal from '@/components/TwoFA/use2FAModal'
+import { message } from 'ant-design-vue'
+
+const props = defineProps<{
+  dir?: string
+}>()
+
+const name = defineModel<string>('name', { default: '' })
+
+const router = useRouter()
+
+const modify = ref(false)
+const buffer = ref('')
+const loading = ref(false)
+
+function clickModify() {
+  buffer.value = name.value
+  modify.value = true
+}
+
+function save() {
+  loading.value = true
+  const otpModal = use2FAModal()
+
+  otpModal.open().then(() => {
+    config.rename(props.dir!, name.value, buffer.value).then(r => {
+      modify.value = false
+      message.success($gettext('Renamed successfully'))
+      router.push({
+        path: `/config/${r.path}/edit`,
+      })
+    }).catch(e => {
+      message.error($gettext(e?.message ?? 'Server error'))
+    }).finally(() => {
+      loading.value = false
+    })
+  })
+}
+</script>
+
+<template>
+  <div v-if="!modify" class="flex items-center">
+    <div class="mr-2">
+      {{ name }}
+    </div>
+    <div>
+      <AButton type="link" size="small" @click="clickModify">
+        {{ $gettext('Rename') }}
+      </AButton>
+    </div>
+  </div>
+  <div v-else>
+    <AInput v-model:value="buffer">
+      <template #suffix>
+        <AButton :disabled="buffer === name" type="link" size="small" :loading @click="save">
+          {{ $gettext('Save') }}
+        </AButton>
+      </template>
+    </AInput>
+  </div>
+</template>
+
+<style scoped lang="less">
+
+</style>

internal/config/config.go

@@ -17,4 +17,5 @@ type Config struct {
 	SiteCategoryID  uint64                         `json:"site_category_id"`
 	SiteCategory    *model.SiteCategory            `json:"site_category,omitempty"`
 	Enabled         bool                           `json:"enabled"`
+	Dir             string                         `json:"dir"`
 }