mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2026-10-28 16:00:18 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ecedaf8c21 | ||
|
|
d7c42e3e8b | ||
|
|
d32cbb40f6 | ||
|
|
8684a26459 | ||
|
|
1798f9768e | ||
|
|
eb4beb50c4 | ||
|
|
3a7cd211af | ||
|
|
bd0bc0079e | ||
|
|
93ed58d784 | ||
|
|
8d320ef2ca | ||
|
|
b3c1e0df42 | ||
|
|
5346d5f58a | ||
|
|
ac09426f10 | ||
|
|
19707a68dd | ||
|
|
7c7fd492c4 | ||
|
|
fbf66766c2 | ||
|
|
d7355f3ccc | ||
|
|
93ca724985 | ||
|
|
9481a7535d | ||
|
|
14be5b7870 | ||
|
|
c4b76a8e89 | ||
|
|
9295f4ef8a | ||
|
|
c925184bf6 | ||
|
|
87828b03ae | ||
|
|
e7b4146e1b | ||
|
|
ec998552b9 | ||
|
|
1af237944d |
@@ -826,6 +826,26 @@ func (b *BaseApi) UpdateAgentFeishuConfig(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags AI
|
||||||
|
// @Summary Switch to the bundled OpenClaw Feishu plugin
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.AgentFeishuSwitchReq true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /ai/agents/channel/feishu/switch [post]
|
||||||
|
func (b *BaseApi) SwitchAgentFeishuPlugin(c *gin.Context) {
|
||||||
|
var req dto.AgentFeishuSwitchReq
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := agentService.SwitchFeishuPlugin(req); err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
// @Tags AI
|
// @Tags AI
|
||||||
// @Summary Get Agent Telegram channel config
|
// @Summary Get Agent Telegram channel config
|
||||||
// @Accept json
|
// @Accept json
|
||||||
|
|||||||
+12
-16
@@ -72,22 +72,6 @@ func (b *BaseApi) CloseOllamaModel(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, nil)
|
helper.SuccessWithData(c, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Tags AI
|
|
||||||
// @Summary Sync Ollama model list
|
|
||||||
// @Success 200 {array} dto.OllamaModelDropList
|
|
||||||
// @Security ApiKeyAuth
|
|
||||||
// @Security Timestamp
|
|
||||||
// @Router /ai/ollama/model/sync [post]
|
|
||||||
// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"同步 Ollama 模型列表","formatEN":"sync Ollama model list"}
|
|
||||||
func (b *BaseApi) SyncOllamaModel(c *gin.Context) {
|
|
||||||
list, err := aiToolService.Sync()
|
|
||||||
if err != nil {
|
|
||||||
helper.BadRequest(c, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
helper.SuccessWithData(c, list)
|
|
||||||
}
|
|
||||||
|
|
||||||
// @Tags AI
|
// @Tags AI
|
||||||
// @Summary Page Ollama models
|
// @Summary Page Ollama models
|
||||||
// @Accept json
|
// @Accept json
|
||||||
@@ -114,6 +98,18 @@ func (b *BaseApi) SearchOllamaModel(c *gin.Context) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (b *BaseApi) SyncOllamaModelAccount(c *gin.Context) {
|
||||||
|
var req dto.OllamaModelAccountSync
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := aiToolService.SyncAccount(req); err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
// @Tags AI
|
// @Tags AI
|
||||||
// @Summary Page Ollama models
|
// @Summary Page Ollama models
|
||||||
// @Accept json
|
// @Accept json
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ func (b *BaseApi) SearchContainer(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
total, list, err := containerService.Page(req)
|
total, list, err := containerService.Page(c.Request.Context(), req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
@@ -249,9 +249,10 @@ func (b *BaseApi) ListContainerByImage(c *gin.Context) {
|
|||||||
// @Success 200 {object} dto.ContainerStatus
|
// @Success 200 {object} dto.ContainerStatus
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
|
// @Param containersOnly query boolean false "Only count containers"
|
||||||
// @Router /containers/status [get]
|
// @Router /containers/status [get]
|
||||||
func (b *BaseApi) LoadContainerStatus(c *gin.Context) {
|
func (b *BaseApi) LoadContainerStatus(c *gin.Context) {
|
||||||
data, err := containerService.LoadStatus()
|
data, err := containerService.LoadStatus(c.Request.Context(), c.Query("containersOnly") == "true")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
@@ -415,9 +416,14 @@ func (b *BaseApi) LoadResourceLimit(c *gin.Context) {
|
|||||||
// @Success 200 {array} dto.ContainerListStats
|
// @Success 200 {array} dto.ContainerListStats
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
|
// @Param ids query string false "Comma-separated container IDs; omitted selects all containers"
|
||||||
// @Router /containers/list/stats [get]
|
// @Router /containers/list/stats [get]
|
||||||
func (b *BaseApi) ContainerListStats(c *gin.Context) {
|
func (b *BaseApi) ContainerListStats(c *gin.Context) {
|
||||||
data, err := containerService.ContainerListStats()
|
var ids []string
|
||||||
|
if _, supplied := c.Request.URL.Query()["ids"]; supplied {
|
||||||
|
ids = strings.FieldsFunc(c.Query("ids"), func(r rune) bool { return r == ',' })
|
||||||
|
}
|
||||||
|
data, err := containerService.ContainerListStats(c.Request.Context(), ids)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ func (b *BaseApi) CreateMysql(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
req.Password = string(password)
|
req.Password = string(password)
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, err := mysqlService.Create(context.Background(), req); err != nil {
|
if _, err := mysqlService.Create(context.Background(), req); err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/global"
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/mcpapi"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
@@ -22,6 +23,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func ErrorWithDetail(ctx *gin.Context, code int, msgKey string, err error) {
|
func ErrorWithDetail(ctx *gin.Context, code int, msgKey string, err error) {
|
||||||
|
mcpapi.SetBusinessErrorHeader(ctx.Request, ctx.Writer.Header(), err)
|
||||||
res := dto.Response{
|
res := dto.Response{
|
||||||
Code: code,
|
Code: code,
|
||||||
Message: "",
|
Message: "",
|
||||||
@@ -32,6 +34,7 @@ func ErrorWithDetail(ctx *gin.Context, code int, msgKey string, err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func ErrorWithBusinessCode(ctx *gin.Context, code int, businessCode, msgKey string, err error) {
|
func ErrorWithBusinessCode(ctx *gin.Context, code int, businessCode, msgKey string, err error) {
|
||||||
|
mcpapi.SetBusinessErrorHeader(ctx.Request, ctx.Writer.Header(), err)
|
||||||
res := dto.Response{
|
res := dto.Response{
|
||||||
Code: code,
|
Code: code,
|
||||||
ErrorCode: businessCode,
|
ErrorCode: businessCode,
|
||||||
@@ -42,6 +45,7 @@ func ErrorWithBusinessCode(ctx *gin.Context, code int, businessCode, msgKey stri
|
|||||||
}
|
}
|
||||||
|
|
||||||
func ErrorWithDetailAndData(ctx *gin.Context, code int, msgKey string, err error, data interface{}) {
|
func ErrorWithDetailAndData(ctx *gin.Context, code int, msgKey string, err error, data interface{}) {
|
||||||
|
mcpapi.SetBusinessErrorHeader(ctx.Request, ctx.Writer.Header(), err)
|
||||||
res := dto.Response{
|
res := dto.Response{
|
||||||
Code: code,
|
Code: code,
|
||||||
Data: data,
|
Data: data,
|
||||||
|
|||||||
@@ -0,0 +1,137 @@
|
|||||||
|
package v2
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/service"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/mcpapi"
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
)
|
||||||
|
|
||||||
|
type mcpBusinessAPI struct {
|
||||||
|
installApp func(request.AppInstallCreate, bool) (*model.AppInstall, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
func MCPBusinessDispatch() gin.HandlerFunc {
|
||||||
|
return (&mcpBusinessAPI{installApp: (&service.AppService{}).InstallForMCP}).dispatch()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (api *mcpBusinessAPI) dispatch() gin.HandlerFunc {
|
||||||
|
return func(c *gin.Context) {
|
||||||
|
var handler gin.HandlerFunc
|
||||||
|
switch c.Request.Method + " " + c.FullPath() {
|
||||||
|
case "POST /api/v2/databases":
|
||||||
|
handler = api.createMysql
|
||||||
|
case "POST /api/v2/databases/status":
|
||||||
|
handler = api.mysqlStatus
|
||||||
|
case "GET /api/v2/databases/db/list/:type":
|
||||||
|
handler = api.databases
|
||||||
|
case "POST /api/v2/apps/install":
|
||||||
|
handler = api.install
|
||||||
|
case "GET /api/v2/apps/installed/info/:appInstallId":
|
||||||
|
handler = api.appInfo
|
||||||
|
default:
|
||||||
|
c.Next()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
present, trusted := mcpapi.Check(c.Request)
|
||||||
|
if !present {
|
||||||
|
c.Next()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !trusted {
|
||||||
|
c.AbortWithStatus(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
handler(c)
|
||||||
|
c.Abort()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (api *mcpBusinessAPI) createMysql(c *gin.Context) {
|
||||||
|
var req dto.MysqlDBCreate
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if len(req.Password) != 0 {
|
||||||
|
password, err := base64.StdEncoding.DecodeString(req.Password)
|
||||||
|
if err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
req.Password = string(password)
|
||||||
|
}
|
||||||
|
created, err := (&service.MysqlService{}).CreateForMCP(c.Request.Context(), req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
nodeID, _ := mcpapi.NodeID(c.Request)
|
||||||
|
helper.SuccessWithData(c, map[string]any{"id": created.ID, "database": created.MysqlName, "name": created.Name, "nodeId": nodeID})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (api *mcpBusinessAPI) mysqlStatus(c *gin.Context) {
|
||||||
|
var req dto.OperationWithNameAndType
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
data, err := (&service.MysqlService{}).LoadStatusForMCP(c.Request.Context(), req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, data)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (api *mcpBusinessAPI) databases(c *gin.Context) {
|
||||||
|
dbType, err := helper.GetStrParamByKey(c, "type")
|
||||||
|
if err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
list, err := (&service.DatabaseService{}).ListForMCP(c.Request.Context(), dbType)
|
||||||
|
if err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, list)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (api *mcpBusinessAPI) install(c *gin.Context) {
|
||||||
|
var req request.AppInstallCreate
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if value, exists := req.Params["WEBSITE_DIR"]; exists {
|
||||||
|
directory, ok := value.(string)
|
||||||
|
if !ok || directory == "" || directory != settingService.GetWebsiteDir() {
|
||||||
|
c.AbortWithStatus(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
installed, err := api.installApp(req, true)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, installed)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (api *mcpBusinessAPI) appInfo(c *gin.Context) {
|
||||||
|
id, err := helper.GetIntParamByKey(c, "appInstallId")
|
||||||
|
if err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
info, err := (&service.AppInstallService{}).GetAppInstallInfoForMCP(c.Request.Context(), id)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, info)
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
package v2
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/taskscope"
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
)
|
||||||
|
|
||||||
|
func PanelMCPTaskAccess() gin.HandlerFunc {
|
||||||
|
return func(c *gin.Context) {
|
||||||
|
if hasPanelMCPTaskAccess(c.Request) {
|
||||||
|
c.Request = c.Request.WithContext(taskscope.WithGrants(c.Request.Context(), constant.TaskScopePanelMCP))
|
||||||
|
}
|
||||||
|
c.Next()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func hasPanelMCPTaskAccess(req *http.Request) bool {
|
||||||
|
if !global.IsMaster {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
local, ok := req.Context().Value(http.LocalAddrContextKey).(net.Addr)
|
||||||
|
values := req.Header.Values("X-Panel-MCP-Task-Access")
|
||||||
|
return ok && local.Network() == "unix" && len(values) == 1 && values[0] == "1"
|
||||||
|
}
|
||||||
@@ -61,13 +61,14 @@ func (b *BaseApi) CreateRuntime(c *gin.Context) {
|
|||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /runtimes/del [post]
|
// @Router /runtimes/del [post]
|
||||||
// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除运行环境 [id]","formatEN":"Delete runtime [id]"}
|
// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除运行环境 [name]","formatEN":"Delete runtime [name]"}
|
||||||
func (b *BaseApi) DeleteRuntime(c *gin.Context) {
|
func (b *BaseApi) DeleteRuntime(c *gin.Context) {
|
||||||
var req request.RuntimeDelete
|
var req request.RuntimeDelete
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
err := runtimeService.Delete(req)
|
name, err := runtimeService.Delete(req)
|
||||||
|
helper.SetOperationLogValues(c, map[string]string{"name": name})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ import (
|
|||||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto/response"
|
"github.com/1Panel-dev/1Panel/agent/app/dto/response"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/service"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/taskscope"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -21,7 +23,7 @@ func (b *BaseApi) PageTasks(c *gin.Context) {
|
|||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
total, list, err := taskService.Page(req)
|
total, list, err := taskServiceForRequest(c).Page(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
@@ -45,7 +47,7 @@ func (b *BaseApi) ReadTaskLogByLine(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
var res *response.FileLineContent
|
var res *response.FileLineContent
|
||||||
res, err := taskService.ReadByLine(req)
|
res, err := taskServiceForRequest(c).ReadByLine(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
@@ -64,10 +66,17 @@ func (b *BaseApi) ReadTaskLogByLine(c *gin.Context) {
|
|||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /logs/tasks/executing/count [get]
|
// @Router /logs/tasks/executing/count [get]
|
||||||
func (b *BaseApi) CountExecutingTasks(c *gin.Context) {
|
func (b *BaseApi) CountExecutingTasks(c *gin.Context) {
|
||||||
count, err := taskService.CountExecutingTask()
|
count, err := taskServiceForRequest(c).CountExecutingTask()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
helper.SuccessWithData(c, count)
|
helper.SuccessWithData(c, count)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func taskServiceForRequest(c *gin.Context) service.ITaskLogService {
|
||||||
|
if granted := taskscope.Grants(c.Request.Context()); len(granted) != 0 {
|
||||||
|
return service.NewITaskService(granted...)
|
||||||
|
}
|
||||||
|
return taskService
|
||||||
|
}
|
||||||
|
|||||||
@@ -402,7 +402,7 @@ func (b *BaseApi) ChangeDefaultServer(c *gin.Context) {
|
|||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /websites/php/version [post]
|
// @Router /websites/php/version [post]
|
||||||
// @x-panel-log {"bodyKeys":["websiteId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteId","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"php 版本变更 [domain]","formatEN":"php version update [domain]"}
|
// @x-panel-log {"bodyKeys":["websiteID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteID","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"php 版本变更 [domain]","formatEN":"php version update [domain]"}
|
||||||
func (b *BaseApi) ChangePHPVersion(c *gin.Context) {
|
func (b *BaseApi) ChangePHPVersion(c *gin.Context) {
|
||||||
var req request.WebsitePHPVersionReq
|
var req request.WebsitePHPVersionReq
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
|||||||
@@ -1,13 +1,16 @@
|
|||||||
package v2
|
package v2
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/buserr"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -176,3 +179,64 @@ func (b *BaseApi) DownloadCAFile(c *gin.Context) {
|
|||||||
c.Header("Content-Disposition", "attachment; filename*=utf-8''"+url.PathEscape(info.Name()))
|
c.Header("Content-Disposition", "attachment; filename*=utf-8''"+url.PathEscape(info.Name()))
|
||||||
http.ServeContent(c.Writer, c.Request, info.Name(), info.ModTime(), file)
|
http.ServeContent(c.Writer, c.Request, info.Name(), info.ModTime(), file)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Website CA
|
||||||
|
// @Summary Upload website CA archive
|
||||||
|
// @Accept multipart/form-data
|
||||||
|
// @Param file formData file true "ZIP containing ca.crt and ca.key"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /websites/ca/upload [post]
|
||||||
|
func (b *BaseApi) UploadWebsiteCA(c *gin.Context) {
|
||||||
|
c.Request.Body = http.MaxBytesReader(c.Writer, c.Request.Body, 11<<20)
|
||||||
|
if err := c.Request.ParseMultipartForm(11 << 20); err != nil {
|
||||||
|
helper.InternalServer(c, buserr.New("ErrCAUpload"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if c.Request.MultipartForm != nil {
|
||||||
|
defer c.Request.MultipartForm.RemoveAll()
|
||||||
|
}
|
||||||
|
file, err := c.FormFile("file")
|
||||||
|
if err != nil || file.Size > 10<<20 || !strings.HasSuffix(strings.ToLower(file.Filename), ".zip") {
|
||||||
|
helper.InternalServer(c, buserr.New("ErrCAUpload"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
stream, err := file.Open()
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer stream.Close()
|
||||||
|
data, err := io.ReadAll(io.LimitReader(stream, (10<<20)+1))
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err = websiteCAService.Upload(file.Filename[:len(file.Filename)-len(".zip")], data); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Website CA
|
||||||
|
// @Summary Import website CA from PEM or server files
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.WebsiteCAImport true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /websites/ca/import [post]
|
||||||
|
func (b *BaseApi) ImportWebsiteCA(c *gin.Context) {
|
||||||
|
c.Request.Body = http.MaxBytesReader(c.Writer, c.Request.Body, 3<<20)
|
||||||
|
var req request.WebsiteCAImport
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := websiteCAService.Import(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|||||||
@@ -386,6 +386,7 @@ type AgentAccountProviderCountReq struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type AgentAccountInfo struct {
|
type AgentAccountInfo struct {
|
||||||
|
AppInstallID uint `json:"appInstallId"`
|
||||||
ID uint `json:"id"`
|
ID uint `json:"id"`
|
||||||
MasterAccountID uint `json:"masterAccountId"`
|
MasterAccountID uint `json:"masterAccountId"`
|
||||||
Provider string `json:"provider"`
|
Provider string `json:"provider"`
|
||||||
@@ -432,7 +433,23 @@ type AgentFeishuConfigReq struct {
|
|||||||
AgentID uint `json:"agentId" validate:"required"`
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type AgentFeishuTransition struct {
|
||||||
|
Confirmed bool `json:"confirmed"`
|
||||||
|
Streaming bool `json:"streaming"`
|
||||||
|
GroupSessionScope string `json:"groupSessionScope"`
|
||||||
|
RequireMention string `json:"requireMention"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentFeishuSwitchReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
TaskID string `json:"taskID" validate:"required"`
|
||||||
|
Streaming bool `json:"streaming"`
|
||||||
|
GroupSessionScope string `json:"groupSessionScope" validate:"required,oneof=group group_sender group_topic group_topic_sender"`
|
||||||
|
RequireMention string `json:"requireMention" validate:"required,oneof=true false"`
|
||||||
|
}
|
||||||
|
|
||||||
type AgentFeishuConfigUpdateReq struct {
|
type AgentFeishuConfigUpdateReq struct {
|
||||||
|
GroupSessionScope string `json:"groupSessionScope" validate:"omitempty,oneof=group group_sender group_topic group_topic_sender"`
|
||||||
AgentID uint `json:"agentId" validate:"required"`
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
ThreadSession bool `json:"threadSession"`
|
ThreadSession bool `json:"threadSession"`
|
||||||
@@ -447,6 +464,11 @@ type AgentFeishuConfigUpdateReq struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type AgentFeishuConfig struct {
|
type AgentFeishuConfig struct {
|
||||||
|
BuiltinManaged bool `json:"builtinManaged"`
|
||||||
|
LegacyConfigured bool `json:"legacyConfigured"`
|
||||||
|
GroupSessionScope string `json:"groupSessionScope"`
|
||||||
|
BuiltinAvailable bool `json:"builtinAvailable"`
|
||||||
|
Legacy bool `json:"legacy"`
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
ThreadSession bool `json:"threadSession"`
|
ThreadSession bool `json:"threadSession"`
|
||||||
ReplyMode string `json:"replyMode"`
|
ReplyMode string `json:"replyMode"`
|
||||||
|
|||||||
+6
-5
@@ -14,16 +14,17 @@ type OllamaModelInfo struct {
|
|||||||
CreatedAt time.Time `json:"createdAt"`
|
CreatedAt time.Time `json:"createdAt"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type OllamaModelDropList struct {
|
|
||||||
ID uint `json:"id"`
|
|
||||||
Name string `json:"name"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type OllamaModelName struct {
|
type OllamaModelName struct {
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
TaskID string `json:"taskID"`
|
TaskID string `json:"taskID"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type OllamaModelAccountSync struct {
|
||||||
|
ID uint `json:"id" validate:"required"`
|
||||||
|
ModelAccountBaseURLType string `json:"modelAccountBaseURLType" validate:"required,oneof=container localhost systemIP custom"`
|
||||||
|
ModelAccountBaseURL string `json:"modelAccountBaseURL"`
|
||||||
|
}
|
||||||
|
|
||||||
type OllamaBindDomain struct {
|
type OllamaBindDomain struct {
|
||||||
Domain string `json:"domain" validate:"required"`
|
Domain string `json:"domain" validate:"required"`
|
||||||
AppInstallID uint `json:"appInstallID" validate:"required"`
|
AppInstallID uint `json:"appInstallID" validate:"required"`
|
||||||
|
|||||||
@@ -43,6 +43,8 @@ type AppOssConfig struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type AppVersion struct {
|
type AppVersion struct {
|
||||||
|
FeishuLegacy bool `json:"feishuLegacy,omitempty"`
|
||||||
|
FeishuConfigured bool `json:"feishuConfigured,omitempty"`
|
||||||
Version string `json:"version"`
|
Version string `json:"version"`
|
||||||
DetailId uint `json:"detailId"`
|
DetailId uint `json:"detailId"`
|
||||||
DockerCompose string `json:"dockerCompose"`
|
DockerCompose string `json:"dockerCompose"`
|
||||||
|
|||||||
@@ -172,6 +172,7 @@ type ContainerItemStats struct {
|
|||||||
}
|
}
|
||||||
type ContainerListStats struct {
|
type ContainerListStats struct {
|
||||||
ContainerID string `json:"containerID"`
|
ContainerID string `json:"containerID"`
|
||||||
|
ContainerName string `json:"containerName"`
|
||||||
|
|
||||||
CPUTotalUsage uint64 `json:"cpuTotalUsage"`
|
CPUTotalUsage uint64 `json:"cpuTotalUsage"`
|
||||||
SystemUsage uint64 `json:"systemUsage"`
|
SystemUsage uint64 `json:"systemUsage"`
|
||||||
|
|||||||
@@ -23,6 +23,10 @@ type AppInstallCreate struct {
|
|||||||
Services map[string]string `json:"services"`
|
Services map[string]string `json:"services"`
|
||||||
TaskID string `json:"taskID"`
|
TaskID string `json:"taskID"`
|
||||||
|
|
||||||
|
SyncModelAccount *bool `json:"syncModelAccount"`
|
||||||
|
ModelAccountBaseURLType string `json:"modelAccountBaseURLType" validate:"omitempty,oneof=container localhost systemIP custom"`
|
||||||
|
ModelAccountBaseURL string `json:"modelAccountBaseURL"`
|
||||||
|
|
||||||
AppContainerConfig
|
AppContainerConfig
|
||||||
NodePushConfig
|
NodePushConfig
|
||||||
}
|
}
|
||||||
@@ -83,6 +87,7 @@ type AppBackupDelete struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type AppInstalledOperate struct {
|
type AppInstalledOperate struct {
|
||||||
|
FeishuTransition *dto.AgentFeishuTransition `json:"feishuTransition,omitempty"`
|
||||||
InstallId uint `json:"installId" validate:"required"`
|
InstallId uint `json:"installId" validate:"required"`
|
||||||
BackupId uint `json:"backupId"`
|
BackupId uint `json:"backupId"`
|
||||||
DetailId uint `json:"detailId"`
|
DetailId uint `json:"detailId"`
|
||||||
@@ -101,6 +106,7 @@ type AppInstalledOperate struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type AppInstallUpgrade struct {
|
type AppInstallUpgrade struct {
|
||||||
|
FeishuTransition *dto.AgentFeishuTransition `json:"feishuTransition,omitempty"`
|
||||||
InstallID uint `json:"installId"`
|
InstallID uint `json:"installId"`
|
||||||
DetailID uint `json:"detailId"`
|
DetailID uint `json:"detailId"`
|
||||||
Backup bool `json:"backup"`
|
Backup bool `json:"backup"`
|
||||||
@@ -122,6 +128,9 @@ type AppInstallDelete struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type AppInstalledUpdate struct {
|
type AppInstalledUpdate struct {
|
||||||
|
SyncModelAccount *bool `json:"syncModelAccount"`
|
||||||
|
ModelAccountBaseURLType string `json:"modelAccountBaseURLType" validate:"omitempty,oneof=container localhost systemIP custom"`
|
||||||
|
ModelAccountBaseURL string `json:"modelAccountBaseURL"`
|
||||||
InstallId uint `json:"installId" validate:"required"`
|
InstallId uint `json:"installId" validate:"required"`
|
||||||
Params map[string]interface{} `json:"params" validate:"required"`
|
Params map[string]interface{} `json:"params" validate:"required"`
|
||||||
TaskID string `json:"-"`
|
TaskID string `json:"-"`
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package request
|
||||||
|
|
||||||
|
type MCPWebsiteBinding struct {
|
||||||
|
Operation string `json:"operation"`
|
||||||
|
RequestID string `json:"requestId"`
|
||||||
|
BindingID string `json:"bindingId"`
|
||||||
|
WebsiteID uint `json:"websiteId"`
|
||||||
|
Domain string `json:"domain"`
|
||||||
|
EnableSSL bool `json:"enableSSL"`
|
||||||
|
SSLID uint `json:"sslID"`
|
||||||
|
Upstream string `json:"upstream"`
|
||||||
|
CoreHost string `json:"coreHost"`
|
||||||
|
ProxyKey string `json:"proxyKey"`
|
||||||
|
}
|
||||||
@@ -182,3 +182,12 @@ type WebsiteSSLFileUpload struct {
|
|||||||
PushNode bool `json:"pushNode"`
|
PushNode bool `json:"pushNode"`
|
||||||
Nodes string `json:"nodes"`
|
Nodes string `json:"nodes"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type WebsiteCAImport struct {
|
||||||
|
Name string `json:"name" validate:"required,max=128"`
|
||||||
|
Type string `json:"type" validate:"required,oneof=paste local"`
|
||||||
|
Certificate string `json:"certificate" validate:"required_if=Type paste"`
|
||||||
|
PrivateKey string `json:"privateKey" validate:"required_if=Type paste"`
|
||||||
|
CertificatePath string `json:"certificatePath" validate:"required_if=Type local"`
|
||||||
|
PrivateKeyPath string `json:"privateKeyPath" validate:"required_if=Type local"`
|
||||||
|
}
|
||||||
|
|||||||
@@ -50,6 +50,8 @@ type TagDTO struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type AppInstalledCheck struct {
|
type AppInstalledCheck struct {
|
||||||
|
ModelAccountBaseURLType string `json:"modelAccountBaseURLType"`
|
||||||
|
ModelAccountBaseURL string `json:"modelAccountBaseURL"`
|
||||||
IsExist bool `json:"isExist"`
|
IsExist bool `json:"isExist"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
App string `json:"app"`
|
App string `json:"app"`
|
||||||
@@ -184,6 +186,12 @@ type AppParam struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type AppConfig struct {
|
type AppConfig struct {
|
||||||
|
AppKey string `json:"appKey"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
HttpPort int `json:"httpPort"`
|
||||||
|
SyncModelAccount bool `json:"syncModelAccount"`
|
||||||
|
ModelAccountBaseURLType string `json:"modelAccountBaseURLType"`
|
||||||
|
ModelAccountBaseURL string `json:"modelAccountBaseURL"`
|
||||||
Params []AppParam `json:"params"`
|
Params []AppParam `json:"params"`
|
||||||
RawCompose string `json:"rawCompose"`
|
RawCompose string `json:"rawCompose"`
|
||||||
request.AppContainerConfig
|
request.AppContainerConfig
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package response
|
||||||
|
|
||||||
|
type MCPWebsiteBinding struct {
|
||||||
|
State string `json:"state"`
|
||||||
|
WebsiteID uint `json:"websiteId"`
|
||||||
|
BindingID string `json:"bindingId"`
|
||||||
|
RequestID string `json:"requestId"`
|
||||||
|
Domain string `json:"domain"`
|
||||||
|
Endpoint string `json:"endpoint"`
|
||||||
|
EnableSSL bool `json:"enableSSL"`
|
||||||
|
SSLID uint `json:"sslID"`
|
||||||
|
WebsiteStatus string `json:"websiteStatus"`
|
||||||
|
Reason string `json:"reason"`
|
||||||
|
Code string `json:"code,omitempty"`
|
||||||
|
Error string `json:"error,omitempty"`
|
||||||
|
Definitive bool `json:"definitive,omitempty"`
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@ package model
|
|||||||
|
|
||||||
type AgentAccount struct {
|
type AgentAccount struct {
|
||||||
BaseModel
|
BaseModel
|
||||||
|
AppInstallID uint `json:"appInstallId"`
|
||||||
Provider string `json:"provider"`
|
Provider string `json:"provider"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
APIKey string `json:"apiKey"`
|
APIKey string `json:"apiKey"`
|
||||||
|
|||||||
@@ -28,6 +28,10 @@ type AppInstall struct {
|
|||||||
Favorite bool `json:"favorite"`
|
Favorite bool `json:"favorite"`
|
||||||
SortOrder int `json:"sortOrder" gorm:"default:0"`
|
SortOrder int `json:"sortOrder" gorm:"default:0"`
|
||||||
|
|
||||||
|
SyncModelAccount bool `json:"syncModelAccount"`
|
||||||
|
ModelAccountBaseURLType string `json:"modelAccountBaseURLType"`
|
||||||
|
ModelAccountBaseURL string `json:"modelAccountBaseURL"`
|
||||||
|
|
||||||
App App `json:"app" gorm:"-:migration"`
|
App App `json:"app" gorm:"-:migration"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/model"
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -18,6 +19,7 @@ type IAgentAccountRepo interface {
|
|||||||
DeleteByID(id uint) error
|
DeleteByID(id uint) error
|
||||||
List(opts ...DBOption) ([]model.AgentAccount, error)
|
List(opts ...DBOption) ([]model.AgentAccount, error)
|
||||||
CountTextByProviders(providers []string) (map[string]int64, error)
|
CountTextByProviders(providers []string) (map[string]int64, error)
|
||||||
|
SaveLocal(account *model.AgentAccount, models []model.AgentAccountModel) error
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewIAgentAccountRepo() IAgentAccountRepo {
|
func NewIAgentAccountRepo() IAgentAccountRepo {
|
||||||
@@ -97,6 +99,25 @@ func (a AgentAccountRepo) CountTextByProviders(providers []string) (map[string]i
|
|||||||
return counts, nil
|
return counts, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a AgentAccountRepo) SaveLocal(account *model.AgentAccount, models []model.AgentAccountModel) error {
|
||||||
|
return global.DB.Transaction(func(tx *gorm.DB) error {
|
||||||
|
if err := tx.Save(account).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := tx.Where("account_id = ?", account.ID).Delete(&model.AgentAccountModel{}).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if len(models) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
for i := range models {
|
||||||
|
models[i].AccountID = account.ID
|
||||||
|
models[i].SortOrder = i + 1
|
||||||
|
}
|
||||||
|
return tx.Create(&models).Error
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func normalizeProviders(providers []string) []string {
|
func normalizeProviders(providers []string) []string {
|
||||||
seen := make(map[string]struct{}, len(providers))
|
seen := make(map[string]struct{}, len(providers))
|
||||||
result := make([]string, 0, len(providers))
|
result := make([]string, 0, len(providers))
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package repo
|
package repo
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/model"
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
"github.com/1Panel-dev/1Panel/agent/global"
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
)
|
)
|
||||||
@@ -14,6 +16,7 @@ type IAiRepo interface {
|
|||||||
Create(cronjob *model.OllamaModel) error
|
Create(cronjob *model.OllamaModel) error
|
||||||
Update(id uint, vars map[string]interface{}) error
|
Update(id uint, vars map[string]interface{}) error
|
||||||
Delete(opts ...DBOption) error
|
Delete(opts ...DBOption) error
|
||||||
|
DeleteAll(ctx context.Context) error
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewIAiRepo() IAiRepo {
|
func NewIAiRepo() IAiRepo {
|
||||||
@@ -67,3 +70,7 @@ func (u *AiRepo) Delete(opts ...DBOption) error {
|
|||||||
}
|
}
|
||||||
return db.Delete(&model.OllamaModel{}).Error
|
return db.Delete(&model.OllamaModel{}).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (u *AiRepo) DeleteAll(ctx context.Context) error {
|
||||||
|
return getTx(ctx).Where("1 = 1").Delete(&model.OllamaModel{}).Error
|
||||||
|
}
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ type IAppInstallRepo interface {
|
|||||||
LoadBaseInfo(key string, name string) (*RootInfo, error)
|
LoadBaseInfo(key string, name string) (*RootInfo, error)
|
||||||
LoadInstallAppByKeyAndName(key string, name string) (*model.AppInstall, error)
|
LoadInstallAppByKeyAndName(key string, name string) (*model.AppInstall, error)
|
||||||
GetFirstByCtx(ctx context.Context, opts ...DBOption) (model.AppInstall, error)
|
GetFirstByCtx(ctx context.Context, opts ...DBOption) (model.AppInstall, error)
|
||||||
|
GetSnapshot(ctx context.Context, id uint) (model.AppInstall, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewIAppInstallRepo() IAppInstallRepo {
|
func NewIAppInstallRepo() IAppInstallRepo {
|
||||||
@@ -131,6 +132,12 @@ func (a *AppInstallRepo) GetFirstByCtx(ctx context.Context, opts ...DBOption) (m
|
|||||||
return install, err
|
return install, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a *AppInstallRepo) GetSnapshot(ctx context.Context, id uint) (model.AppInstall, error) {
|
||||||
|
var install model.AppInstall
|
||||||
|
err := getTx(ctx).WithContext(ctx).Preload("App").Where("id = ?", id).First(&install).Error
|
||||||
|
return install, err
|
||||||
|
}
|
||||||
|
|
||||||
func (a *AppInstallRepo) Create(ctx context.Context, install *model.AppInstall) error {
|
func (a *AppInstallRepo) Create(ctx context.Context, install *model.AppInstall) error {
|
||||||
db := getTx(ctx).Model(&model.AppInstall{})
|
db := getTx(ctx).Model(&model.AppInstall{})
|
||||||
return db.Omit(clause.Associations).Create(&install).Error
|
return db.Omit(clause.Associations).Create(&install).Error
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/model"
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
"github.com/1Panel-dev/1Panel/agent/global"
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/encrypt"
|
"github.com/1Panel-dev/1Panel/agent/utils/encrypt"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
@@ -20,6 +21,8 @@ type IDatabaseRepo interface {
|
|||||||
Update(id uint, vars map[string]interface{}) error
|
Update(id uint, vars map[string]interface{}) error
|
||||||
Delete(ctx context.Context, opts ...DBOption) error
|
Delete(ctx context.Context, opts ...DBOption) error
|
||||||
Get(opts ...DBOption) (model.Database, error)
|
Get(opts ...DBOption) (model.Database, error)
|
||||||
|
ListInstalledLocalMysql(ctx context.Context) ([]InstalledLocalMysql, error)
|
||||||
|
GetInstalledLocalMysql(ctx context.Context, name string) (InstalledLocalMysql, error)
|
||||||
WithoutByFrom(from string) DBOption
|
WithoutByFrom(from string) DBOption
|
||||||
WithAppInstallID(appInstallID uint) DBOption
|
WithAppInstallID(appInstallID uint) DBOption
|
||||||
WithTypeList(dbType string) DBOption
|
WithTypeList(dbType string) DBOption
|
||||||
@@ -29,6 +32,32 @@ func NewIDatabaseRepo() IDatabaseRepo {
|
|||||||
return &DatabaseRepo{}
|
return &DatabaseRepo{}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type InstalledLocalMysql struct {
|
||||||
|
ID uint
|
||||||
|
Type, From, Database string
|
||||||
|
ContainerName, Version, Env string
|
||||||
|
}
|
||||||
|
|
||||||
|
func installedLocalMysqlQuery(ctx context.Context) *gorm.DB {
|
||||||
|
return getTx(ctx).WithContext(ctx).Table("databases AS d").
|
||||||
|
Joins("JOIN app_installs AS ai ON ai.id = d.app_install_id AND ai.name = d.name").
|
||||||
|
Joins("JOIN apps AS a ON a.id = ai.app_id").
|
||||||
|
Where("d.type = ? AND d.\"from\" = ? AND a.key = ?", constant.AppMysql, "local", constant.AppMysql).
|
||||||
|
Where("ai.status <> ? AND ai.container_name <> ?", constant.StatusDeleted, "")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *DatabaseRepo) ListInstalledLocalMysql(ctx context.Context) ([]InstalledLocalMysql, error) {
|
||||||
|
result := make([]InstalledLocalMysql, 0)
|
||||||
|
err := installedLocalMysqlQuery(ctx).Select("d.id, d.type, d.\"from\", d.name AS database, ai.version").Order("d.id").Scan(&result).Error
|
||||||
|
return result, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *DatabaseRepo) GetInstalledLocalMysql(ctx context.Context, name string) (InstalledLocalMysql, error) {
|
||||||
|
var result InstalledLocalMysql
|
||||||
|
err := installedLocalMysqlQuery(ctx).Where("d.name = ?", name).Select("d.id, ai.container_name, ai.version, ai.env").Take(&result).Error
|
||||||
|
return result, err
|
||||||
|
}
|
||||||
|
|
||||||
func (d *DatabaseRepo) Get(opts ...DBOption) (model.Database, error) {
|
func (d *DatabaseRepo) Get(opts ...DBOption) (model.Database, error) {
|
||||||
var database model.Database
|
var database model.Database
|
||||||
db := global.DB
|
db := global.DB
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ type IMysqlRepo interface {
|
|||||||
List(opts ...DBOption) ([]model.DatabaseMysql, error)
|
List(opts ...DBOption) ([]model.DatabaseMysql, error)
|
||||||
Page(limit, offset int, opts ...DBOption) (int64, []model.DatabaseMysql, error)
|
Page(limit, offset int, opts ...DBOption) (int64, []model.DatabaseMysql, error)
|
||||||
Create(ctx context.Context, mysql *model.DatabaseMysql) error
|
Create(ctx context.Context, mysql *model.DatabaseMysql) error
|
||||||
|
CreateMetadata(ctx context.Context, mysql *model.DatabaseMysql) error
|
||||||
Delete(ctx context.Context, opts ...DBOption) error
|
Delete(ctx context.Context, opts ...DBOption) error
|
||||||
Update(id uint, vars map[string]interface{}) error
|
Update(id uint, vars map[string]interface{}) error
|
||||||
DeleteLocal(ctx context.Context) error
|
DeleteLocal(ctx context.Context) error
|
||||||
@@ -94,6 +95,10 @@ func (u *MysqlRepo) Create(ctx context.Context, mysql *model.DatabaseMysql) erro
|
|||||||
return getTx(ctx).Create(mysql).Error
|
return getTx(ctx).Create(mysql).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (u *MysqlRepo) CreateMetadata(ctx context.Context, mysql *model.DatabaseMysql) error {
|
||||||
|
return getTx(ctx).WithContext(ctx).Create(mysql).Error
|
||||||
|
}
|
||||||
|
|
||||||
func (u *MysqlRepo) Delete(ctx context.Context, opts ...DBOption) error {
|
func (u *MysqlRepo) Delete(ctx context.Context, opts ...DBOption) error {
|
||||||
return getTx(ctx, opts...).Delete(&model.DatabaseMysql{}).Error
|
return getTx(ctx, opts...).Delete(&model.DatabaseMysql{}).Error
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,8 +14,10 @@ type DatabaseUserRepo struct{}
|
|||||||
|
|
||||||
type IDatabaseUserRepo interface {
|
type IDatabaseUserRepo interface {
|
||||||
Get(opts ...DBOption) (model.DatabaseUser, error)
|
Get(opts ...DBOption) (model.DatabaseUser, error)
|
||||||
|
GetEncryptedWithContext(ctx context.Context, opts ...DBOption) (model.DatabaseUser, error)
|
||||||
List(opts ...DBOption) ([]model.DatabaseUser, error)
|
List(opts ...DBOption) ([]model.DatabaseUser, error)
|
||||||
Save(user *model.DatabaseUser) error
|
Save(user *model.DatabaseUser) error
|
||||||
|
SaveEncryptedWithContext(ctx context.Context, user *model.DatabaseUser) error
|
||||||
Delete(opts ...DBOption) error
|
Delete(opts ...DBOption) error
|
||||||
DeleteBy(ctx context.Context, opts ...DBOption) error
|
DeleteBy(ctx context.Context, opts ...DBOption) error
|
||||||
Update(vars map[string]interface{}, opts ...DBOption) error
|
Update(vars map[string]interface{}, opts ...DBOption) error
|
||||||
@@ -45,6 +47,13 @@ func (u *DatabaseUserRepo) Get(opts ...DBOption) (model.DatabaseUser, error) {
|
|||||||
return user, nil
|
return user, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetEncryptedWithContext leaves credential transformation to the caller.
|
||||||
|
func (u *DatabaseUserRepo) GetEncryptedWithContext(ctx context.Context, opts ...DBOption) (model.DatabaseUser, error) {
|
||||||
|
var user model.DatabaseUser
|
||||||
|
err := getTx(ctx, opts...).WithContext(ctx).First(&user).Error
|
||||||
|
return user, err
|
||||||
|
}
|
||||||
|
|
||||||
func (u *DatabaseUserRepo) List(opts ...DBOption) ([]model.DatabaseUser, error) {
|
func (u *DatabaseUserRepo) List(opts ...DBOption) ([]model.DatabaseUser, error) {
|
||||||
var users []model.DatabaseUser
|
var users []model.DatabaseUser
|
||||||
db := global.DB.Model(&model.DatabaseUser{})
|
db := global.DB.Model(&model.DatabaseUser{})
|
||||||
@@ -75,6 +84,10 @@ func (u *DatabaseUserRepo) Save(user *model.DatabaseUser) error {
|
|||||||
return global.DB.Save(user).Error
|
return global.DB.Save(user).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (u *DatabaseUserRepo) SaveEncryptedWithContext(ctx context.Context, user *model.DatabaseUser) error {
|
||||||
|
return getTx(ctx).WithContext(ctx).Save(user).Error
|
||||||
|
}
|
||||||
|
|
||||||
func (u *DatabaseUserRepo) Delete(opts ...DBOption) error {
|
func (u *DatabaseUserRepo) Delete(opts ...DBOption) error {
|
||||||
db := global.DB
|
db := global.DB
|
||||||
for _, opt := range opts {
|
for _, opt := range opts {
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ type IDatabaseUserGrantRepo interface {
|
|||||||
Get(opts ...DBOption) (model.DatabaseUserGrant, error)
|
Get(opts ...DBOption) (model.DatabaseUserGrant, error)
|
||||||
List(opts ...DBOption) ([]model.DatabaseUserGrant, error)
|
List(opts ...DBOption) ([]model.DatabaseUserGrant, error)
|
||||||
Save(grant *model.DatabaseUserGrant) error
|
Save(grant *model.DatabaseUserGrant) error
|
||||||
|
CreateIfAbsent(ctx context.Context, grant *model.DatabaseUserGrant) error
|
||||||
Replace(dbType, database string, grants []model.DatabaseUserGrant) error
|
Replace(dbType, database string, grants []model.DatabaseUserGrant) error
|
||||||
Delete(opts ...DBOption) error
|
Delete(opts ...DBOption) error
|
||||||
DeleteBy(ctx context.Context, opts ...DBOption) error
|
DeleteBy(ctx context.Context, opts ...DBOption) error
|
||||||
@@ -52,6 +53,12 @@ func (u *DatabaseUserGrantRepo) Save(grant *model.DatabaseUserGrant) error {
|
|||||||
return global.DB.Save(grant).Error
|
return global.DB.Save(grant).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (u *DatabaseUserGrantRepo) CreateIfAbsent(ctx context.Context, grant *model.DatabaseUserGrant) error {
|
||||||
|
return getTx(ctx).WithContext(ctx).
|
||||||
|
Where("type = ? AND database = ? AND db_name = ? AND username = ? AND host = ?", grant.Type, grant.Database, grant.DBName, grant.Username, grant.Host).
|
||||||
|
FirstOrCreate(grant).Error
|
||||||
|
}
|
||||||
|
|
||||||
func (u *DatabaseUserGrantRepo) Replace(dbType, database string, grants []model.DatabaseUserGrant) error {
|
func (u *DatabaseUserGrantRepo) Replace(dbType, database string, grants []model.DatabaseUserGrant) error {
|
||||||
return global.DB.Transaction(func(tx *gorm.DB) error {
|
return global.DB.Transaction(func(tx *gorm.DB) error {
|
||||||
if err := tx.Where("`type` = ? AND database = ?", dbType, database).Delete(&model.DatabaseUserGrant{}).Error; err != nil {
|
if err := tx.Where("`type` = ? AND database = ?", dbType, database).Delete(&model.DatabaseUserGrant{}).Error; err != nil {
|
||||||
|
|||||||
@@ -15,10 +15,13 @@ type SettingRepo struct{}
|
|||||||
type ISettingRepo interface {
|
type ISettingRepo interface {
|
||||||
GetList(opts ...DBOption) ([]model.Setting, error)
|
GetList(opts ...DBOption) ([]model.Setting, error)
|
||||||
Get(opts ...DBOption) (model.Setting, error)
|
Get(opts ...DBOption) (model.Setting, error)
|
||||||
|
GetWithContext(ctx context.Context, opts ...DBOption) (model.Setting, error)
|
||||||
GetValueByKey(key string) (string, error)
|
GetValueByKey(key string) (string, error)
|
||||||
GetCoreValueByKey(key string) (string, error)
|
GetCoreValueByKey(key string) (string, error)
|
||||||
Create(key, value string) error
|
Create(key, value string) error
|
||||||
|
CreateWithContext(ctx context.Context, setting *model.Setting) error
|
||||||
Update(key, value string) error
|
Update(key, value string) error
|
||||||
|
UpdateIfMatch(ctx context.Context, id uint, expectedValue, value string) (int64, error)
|
||||||
WithByKey(key string) DBOption
|
WithByKey(key string) DBOption
|
||||||
|
|
||||||
UpdateOrCreate(key, value string) error
|
UpdateOrCreate(key, value string) error
|
||||||
@@ -67,6 +70,22 @@ func (s *SettingRepo) Get(opts ...DBOption) (model.Setting, error) {
|
|||||||
return settings, err
|
return settings, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *SettingRepo) GetWithContext(ctx context.Context, opts ...DBOption) (model.Setting, error) {
|
||||||
|
var setting model.Setting
|
||||||
|
err := getTx(ctx, opts...).WithContext(ctx).First(&setting).Error
|
||||||
|
return setting, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SettingRepo) CreateWithContext(ctx context.Context, setting *model.Setting) error {
|
||||||
|
return getTx(ctx).WithContext(ctx).Create(setting).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SettingRepo) UpdateIfMatch(ctx context.Context, id uint, expectedValue, value string) (int64, error) {
|
||||||
|
result := getTx(ctx).WithContext(ctx).Model(&model.Setting{}).
|
||||||
|
Where("id = ? AND value = ?", id, expectedValue).Update("value", value)
|
||||||
|
return result.RowsAffected, result.Error
|
||||||
|
}
|
||||||
|
|
||||||
func (s *SettingRepo) GetValueByKey(key string) (string, error) {
|
func (s *SettingRepo) GetValueByKey(key string) (string, error) {
|
||||||
var setting model.Setting
|
var setting model.Setting
|
||||||
if err := global.DB.Model(&model.Setting{}).Where("key = ?", key).First(&setting).Error; err != nil {
|
if err := global.DB.Model(&model.Setting{}).Where("key = ?", key).First(&setting).Error; err != nil {
|
||||||
|
|||||||
+19
-6
@@ -19,8 +19,8 @@ type ITaskRepo interface {
|
|||||||
GetFirst(opts ...DBOption) (model.Task, error)
|
GetFirst(opts ...DBOption) (model.Task, error)
|
||||||
Page(page, size int, opts ...DBOption) (int64, []model.Task, error)
|
Page(page, size int, opts ...DBOption) (int64, []model.Task, error)
|
||||||
Update(ctx context.Context, task *model.Task) error
|
Update(ctx context.Context, task *model.Task) error
|
||||||
UpdateRunningTaskToFailed() error
|
UpdateRunningTaskToFailed(opts ...DBOption) error
|
||||||
CountExecutingTask() (int64, error)
|
CountExecutingTask(opts ...DBOption) (int64, error)
|
||||||
Delete(opts ...DBOption) error
|
Delete(opts ...DBOption) error
|
||||||
DeleteAll() error
|
DeleteAll() error
|
||||||
|
|
||||||
@@ -29,6 +29,7 @@ type ITaskRepo interface {
|
|||||||
WithResourceID(id uint) DBOption
|
WithResourceID(id uint) DBOption
|
||||||
WithOperate(taskOperate string) DBOption
|
WithOperate(taskOperate string) DBOption
|
||||||
WithByStatus(status string) DBOption
|
WithByStatus(status string) DBOption
|
||||||
|
WithoutScopes(scopes ...string) DBOption
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewITaskRepo() ITaskRepo {
|
func NewITaskRepo() ITaskRepo {
|
||||||
@@ -110,18 +111,30 @@ func (t TaskRepo) Update(ctx context.Context, task *model.Task) error {
|
|||||||
return getTaskTx(ctx).Save(&task).Error
|
return getTaskTx(ctx).Save(&task).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t TaskRepo) UpdateRunningTaskToFailed() error {
|
func (t TaskRepo) UpdateRunningTaskToFailed(opts ...DBOption) error {
|
||||||
return getTaskDb(t.WithByStatus(constant.StatusExecuting)).Model(&model.Task{}).Updates(map[string]interface{}{
|
opts = append(opts, t.WithByStatus(constant.StatusExecuting))
|
||||||
|
return getTaskDb(opts...).Model(&model.Task{}).Updates(map[string]interface{}{
|
||||||
"status": constant.StatusFailed, "error_msg": constant.InterruptedMsg, "end_at": time.Now(),
|
"status": constant.StatusFailed, "error_msg": constant.InterruptedMsg, "end_at": time.Now(),
|
||||||
}).Error
|
}).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t TaskRepo) CountExecutingTask() (int64, error) {
|
func (t TaskRepo) CountExecutingTask(opts ...DBOption) (int64, error) {
|
||||||
var count int64
|
var count int64
|
||||||
err := getTaskDb(t.WithByStatus(constant.StatusExecuting)).Model(&model.Task{}).Count(&count).Error
|
opts = append(opts, t.WithByStatus(constant.StatusExecuting))
|
||||||
|
err := getTaskDb(opts...).Model(&model.Task{}).Count(&count).Error
|
||||||
return count, err
|
return count, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (t TaskRepo) WithoutScopes(scopes ...string) DBOption {
|
||||||
|
excluded := append([]string(nil), scopes...)
|
||||||
|
return func(db *gorm.DB) *gorm.DB {
|
||||||
|
if len(excluded) == 0 {
|
||||||
|
return db
|
||||||
|
}
|
||||||
|
return db.Where("type IS NULL OR type NOT IN ?", excluded)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (t TaskRepo) Delete(opts ...DBOption) error {
|
func (t TaskRepo) Delete(opts ...DBOption) error {
|
||||||
db := global.TaskDB
|
db := global.TaskDB
|
||||||
for _, opt := range opts {
|
for _, opt := range opts {
|
||||||
|
|||||||
@@ -88,6 +88,7 @@ type IAgentService interface {
|
|||||||
|
|
||||||
GetFeishuConfig(req dto.AgentFeishuConfigReq) (*dto.AgentFeishuConfig, error)
|
GetFeishuConfig(req dto.AgentFeishuConfigReq) (*dto.AgentFeishuConfig, error)
|
||||||
UpdateFeishuConfig(req dto.AgentFeishuConfigUpdateReq) error
|
UpdateFeishuConfig(req dto.AgentFeishuConfigUpdateReq) error
|
||||||
|
SwitchFeishuPlugin(req dto.AgentFeishuSwitchReq) error
|
||||||
GetTelegramConfig(req dto.AgentTelegramConfigReq) (*dto.AgentTelegramConfig, error)
|
GetTelegramConfig(req dto.AgentTelegramConfigReq) (*dto.AgentTelegramConfig, error)
|
||||||
UpdateTelegramConfig(req dto.AgentTelegramConfigUpdateReq) error
|
UpdateTelegramConfig(req dto.AgentTelegramConfigUpdateReq) error
|
||||||
GetDiscordConfig(req dto.AgentIDReq) (*dto.AgentDiscordConfig, error)
|
GetDiscordConfig(req dto.AgentIDReq) (*dto.AgentDiscordConfig, error)
|
||||||
@@ -1055,7 +1056,7 @@ func (a AgentService) CreateAccount(req dto.AgentAccountCreateReq) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
validateAvailability := req.ValidateAvailability == nil || *req.ValidateAvailability
|
validateAvailability := req.ValidateAvailability == nil || *req.ValidateAvailability
|
||||||
resolvedInput, err := resolveAgentAccountInput(provider, req.APIType, req.AuthMode, req.APIKey, req.BaseURL, verifyModel, validateAvailability)
|
resolvedInput, err := resolveAgentAccountInput(provider, req.APIType, req.AuthMode, req.APIKey, req.BaseURL, verifyModel, validateAvailability, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -1108,12 +1109,15 @@ func (a AgentService) UpdateAccount(req dto.AgentAccountUpdateReq) error {
|
|||||||
if strings.TrimSpace(requestedVerifyModel) == "" {
|
if strings.TrimSpace(requestedVerifyModel) == "" {
|
||||||
requestedVerifyModel = account.VerifyModel
|
requestedVerifyModel = account.VerifyModel
|
||||||
}
|
}
|
||||||
verifyModel, err := resolveAgentAccountVerifyModel(provider, requestedVerifyModel, models)
|
verifyModel := ""
|
||||||
|
if account.AppInstallID == 0 || len(models) > 0 {
|
||||||
|
verifyModel, err = resolveAgentAccountVerifyModel(provider, requestedVerifyModel, models)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
}
|
||||||
validateAvailability := req.ValidateAvailability == nil || *req.ValidateAvailability
|
validateAvailability := req.ValidateAvailability == nil || *req.ValidateAvailability
|
||||||
resolvedInput, err := resolveAgentAccountInput(provider, req.APIType, req.AuthMode, req.APIKey, req.BaseURL, verifyModel, validateAvailability)
|
resolvedInput, err := resolveAgentAccountInput(provider, req.APIType, req.AuthMode, req.APIKey, req.BaseURL, verifyModel, validateAvailability, account.AppInstallID != 0 && len(models) == 0)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -1127,7 +1131,7 @@ func (a AgentService) UpdateAccount(req dto.AgentAccountUpdateReq) error {
|
|||||||
account.Remark = req.Remark
|
account.Remark = req.Remark
|
||||||
account.Verified = true
|
account.Verified = true
|
||||||
|
|
||||||
if err := global.DB.Save(account).Error; err != nil {
|
if err := agentAccountRepo.Save(account); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
terminalai.InvalidateTerminalRuntimeCache()
|
terminalai.InvalidateTerminalRuntimeCache()
|
||||||
@@ -1158,13 +1162,34 @@ func (a AgentService) PageAccounts(req dto.AgentAccountSearch) (int64, []dto.Age
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, nil, err
|
return 0, nil, err
|
||||||
}
|
}
|
||||||
|
installIDs := make([]uint, 0, len(list))
|
||||||
|
for _, account := range list {
|
||||||
|
if account.AppInstallID != 0 {
|
||||||
|
installIDs = append(installIDs, account.AppInstallID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
localInstalls := make(map[uint]bool, len(installIDs))
|
||||||
|
if len(installIDs) > 0 {
|
||||||
|
installs, err := appInstallRepo.ListBy(context.Background(), repo.WithByIDs(installIDs))
|
||||||
|
if err != nil {
|
||||||
|
return 0, nil, err
|
||||||
|
}
|
||||||
|
for _, install := range installs {
|
||||||
|
localInstalls[install.ID] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
items := make([]dto.AgentAccountInfo, 0, len(list))
|
items := make([]dto.AgentAccountInfo, 0, len(list))
|
||||||
for _, item := range list {
|
for _, item := range list {
|
||||||
apiKey := ""
|
apiKey := ""
|
||||||
if item.RememberAPIKey {
|
if item.RememberAPIKey {
|
||||||
apiKey = item.APIKey
|
apiKey = item.APIKey
|
||||||
}
|
}
|
||||||
|
appInstallID := uint(0)
|
||||||
|
if localInstalls[item.AppInstallID] {
|
||||||
|
appInstallID = item.AppInstallID
|
||||||
|
}
|
||||||
items = append(items, dto.AgentAccountInfo{
|
items = append(items, dto.AgentAccountInfo{
|
||||||
|
AppInstallID: appInstallID,
|
||||||
ID: item.ID,
|
ID: item.ID,
|
||||||
MasterAccountID: item.MasterAccountID,
|
MasterAccountID: item.MasterAccountID,
|
||||||
Provider: item.Provider,
|
Provider: item.Provider,
|
||||||
@@ -1362,13 +1387,27 @@ func (a AgentService) SyncAgentsByAccount(account *model.AgentAccount) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (a AgentService) VerifyAccount(req dto.AgentAccountVerifyReq) error {
|
func (a AgentService) VerifyAccount(req dto.AgentAccountVerifyReq) error {
|
||||||
_, err := resolveAgentAccountInput(req.Provider, req.APIType, req.AuthMode, req.APIKey, req.BaseURL, req.Model, true)
|
_, err := resolveAgentAccountInput(req.Provider, req.APIType, req.AuthMode, req.APIKey, req.BaseURL, req.Model, true, false)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a AgentService) DeleteAccount(req dto.AgentAccountDeleteReq) error {
|
func (a AgentService) DeleteAccount(req dto.AgentAccountDeleteReq) error {
|
||||||
agentAccountMutationMu.Lock()
|
agentAccountMutationMu.Lock()
|
||||||
defer agentAccountMutationMu.Unlock()
|
defer agentAccountMutationMu.Unlock()
|
||||||
|
account, err := agentAccountRepo.GetFirst(repo.WithByID(req.ID))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if account.AppInstallID != 0 && account.Provider != "ollama" {
|
||||||
|
_, err := appInstallRepo.GetFirst(repo.WithByID(account.AppInstallID))
|
||||||
|
if err == nil {
|
||||||
|
return buserr.WithDetail("ErrInvalidParams", "Delete the local inference engine instead", nil)
|
||||||
|
}
|
||||||
|
if !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if err := global.DB.Transaction(func(tx *gorm.DB) error {
|
if err := global.DB.Transaction(func(tx *gorm.DB) error {
|
||||||
var agentCount int64
|
var agentCount int64
|
||||||
if err := tx.Model(&model.Agent{}).Where("account_id = ?", req.ID).Count(&agentCount).Error; err != nil {
|
if err := tx.Model(&model.Agent{}).Where("account_id = ?", req.ID).Count(&agentCount).Error; err != nil {
|
||||||
@@ -1553,6 +1592,10 @@ func (a AgentService) UpdateConfigFile(req dto.AgentConfigFileUpdateReq) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if _, busy := feishuSwitches.LoadOrStore(agent.ConfigPath, true); busy {
|
||||||
|
return buserr.New("TaskIsExecuting")
|
||||||
|
}
|
||||||
|
defer feishuSwitches.Delete(agent.ConfigPath)
|
||||||
if err := validateAgentConfigFileContent(agent.AgentType, req.Content); err != nil {
|
if err := validateAgentConfigFileContent(agent.AgentType, req.Content); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,9 +45,29 @@ func (a AgentService) GetFeishuConfig(req dto.AgentFeishuConfigReq) (*dto.AgentF
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
if agent.AgentType != constant.AppOpenclaw || !isOpenclawBundledFeishuVersion(install.Version) {
|
||||||
result := extractFeishuConfig(conf)
|
result := extractFeishuConfig(conf)
|
||||||
installed, _ := checkPluginInstalled(install.GetPath(), "feishu")
|
result.Installed, _ = checkPluginInstalled(install.GetPath(), "feishu")
|
||||||
result.Installed = installed
|
return &result, nil
|
||||||
|
}
|
||||||
|
legacy, configured, err := classifyLegacyFeishu(conf, install.GetPath())
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result := extractFeishuConfig(conf)
|
||||||
|
if !legacy {
|
||||||
|
result = extractBundledFeishuConfig(conf)
|
||||||
|
}
|
||||||
|
result.BuiltinManaged = true
|
||||||
|
result.BuiltinAvailable = hasBundledFeishu(install.ContainerName)
|
||||||
|
result.Installed = result.BuiltinAvailable
|
||||||
|
result.Legacy, result.LegacyConfigured = legacy, configured
|
||||||
|
if legacy {
|
||||||
|
result.GroupSessionScope = "group"
|
||||||
|
if result.ThreadSession {
|
||||||
|
result.GroupSessionScope = "group_topic"
|
||||||
|
}
|
||||||
|
}
|
||||||
return &result, nil
|
return &result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -72,6 +92,9 @@ func (a AgentService) UpdateFeishuConfig(req dto.AgentFeishuConfigUpdateReq) err
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
if agent.AgentType == constant.AppOpenclaw && isOpenclawBundledFeishuVersion(install.Version) {
|
||||||
|
return saveBundledFeishuConfig(agent, install, req)
|
||||||
|
}
|
||||||
return a.mutateAgentConfig(req.AgentID, func(_ *model.Agent, _ *model.AppInstall, conf map[string]interface{}) error {
|
return a.mutateAgentConfig(req.AgentID, func(_ *model.Agent, _ *model.AppInstall, conf map[string]interface{}) error {
|
||||||
config := dto.AgentFeishuConfig{
|
config := dto.AgentFeishuConfig{
|
||||||
Enabled: req.Enabled,
|
Enabled: req.Enabled,
|
||||||
@@ -358,6 +381,9 @@ func (a AgentService) InstallPlugin(req dto.AgentPluginInstallReq) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if req.Type == "feishu" && agent.AgentType == constant.AppOpenclaw && isOpenclawBundledFeishuVersion(install.Version) {
|
||||||
|
return buserr.New("ErrFeishuManaged")
|
||||||
|
}
|
||||||
if err := task.CheckScopeTaskIsExecuting(task.TaskScopeAI, req.AgentID); err != nil {
|
if err := task.CheckScopeTaskIsExecuting(task.TaskScopeAI, req.AgentID); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -403,6 +429,9 @@ func (a AgentService) UpgradePlugin(req dto.AgentPluginUpgradeReq) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if req.Type == "feishu" && agent.AgentType == constant.AppOpenclaw && isOpenclawBundledFeishuVersion(install.Version) {
|
||||||
|
return buserr.New("ErrFeishuManaged")
|
||||||
|
}
|
||||||
if err := task.CheckScopeTaskIsExecuting(task.TaskScopeAI, req.AgentID); err != nil {
|
if err := task.CheckScopeTaskIsExecuting(task.TaskScopeAI, req.AgentID); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -443,6 +472,9 @@ func (a AgentService) UninstallPlugin(req dto.AgentPluginUninstallReq) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if req.Type == "feishu" && agent.AgentType == constant.AppOpenclaw && isOpenclawBundledFeishuVersion(install.Version) {
|
||||||
|
return buserr.New("ErrFeishuManaged")
|
||||||
|
}
|
||||||
if err := task.CheckScopeTaskIsExecuting(task.TaskScopeAI, req.AgentID); err != nil {
|
if err := task.CheckScopeTaskIsExecuting(task.TaskScopeAI, req.AgentID); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -538,10 +570,13 @@ func (a AgentService) DeleteChannelConfig(req dto.AgentChannelDeleteReq) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (a AgentService) CheckPlugin(req dto.AgentPluginCheckReq) (*dto.AgentPluginStatus, error) {
|
func (a AgentService) CheckPlugin(req dto.AgentPluginCheckReq) (*dto.AgentPluginStatus, error) {
|
||||||
_, install, err := a.loadAgentAndInstall(req.AgentID)
|
agent, install, err := a.loadAgentAndInstall(req.AgentID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
if req.Type == "feishu" && agent.AgentType == constant.AppOpenclaw && isOpenclawBundledFeishuVersion(install.Version) {
|
||||||
|
return &dto.AgentPluginStatus{Installed: hasBundledFeishu(install.ContainerName)}, nil
|
||||||
|
}
|
||||||
installed, err := checkPluginInstalled(install.GetPath(), req.Type)
|
installed, err := checkPluginInstalled(install.GetPath(), req.Type)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
@@ -0,0 +1,677 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"slices"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"syscall"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/task"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/buserr"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/i18n"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/cmd"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/common"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/compose"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Keep panel configuration writes out of the backup/activation/recovery window.
|
||||||
|
var feishuSwitches sync.Map
|
||||||
|
|
||||||
|
func isOpenclawBundledFeishuVersion(version string) bool {
|
||||||
|
return common.CompareAppVersion(version, "2026.10.7")
|
||||||
|
}
|
||||||
|
|
||||||
|
func hasBundledFeishu(container string) bool {
|
||||||
|
image, err := feishuContainerImage(container)
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
_, err = bundledFeishuImage(image)
|
||||||
|
return err == nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func usesBundledFeishu(conf map[string]interface{}) bool {
|
||||||
|
f := getChannelConfig(conf, "feishu")
|
||||||
|
for _, key := range []string{"threadSession", "replyMode"} {
|
||||||
|
if _, old := f[key]; old {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if _, old := f["streaming"].(bool); old {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
entries := childMap(childMap(conf, "plugins"), "entries")
|
||||||
|
if extractBoolValue(childMap(entries, "openclaw-lark")["enabled"], false) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
_, streaming := f["streaming"].(map[string]interface{})
|
||||||
|
_, selected := entries["feishu"]
|
||||||
|
return selected && (extractBoolValue(childMap(entries, "feishu")["enabled"], false) || f["groupSessionScope"] != nil || streaming)
|
||||||
|
}
|
||||||
|
|
||||||
|
func hasLegacyFeishu(conf map[string]interface{}, installPath string) bool {
|
||||||
|
legacy, _, err := classifyLegacyFeishu(conf, installPath)
|
||||||
|
return err != nil || legacy
|
||||||
|
}
|
||||||
|
|
||||||
|
func selectBundledFeishu(conf map[string]interface{}, enabled bool) {
|
||||||
|
plugins := ensureChildMap(conf, "plugins")
|
||||||
|
entries := ensureChildMap(plugins, "entries")
|
||||||
|
if legacy, ok := entries["openclaw-lark"]; ok {
|
||||||
|
if entry, ok := legacy.(map[string]interface{}); ok {
|
||||||
|
entry["enabled"] = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ensureChildMap(entries, "feishu")["enabled"] = enabled
|
||||||
|
// Preserve an absent allowlist; creating one would disable unrelated plugins.
|
||||||
|
if allow, ok := plugins["allow"]; ok && len(extractStringList(allow)) > 0 {
|
||||||
|
ids := slices.DeleteFunc(extractStringList(allow), func(id string) bool { return id == "openclaw-lark" })
|
||||||
|
if !slices.Contains(ids, "feishu") {
|
||||||
|
ids = append(ids, "feishu")
|
||||||
|
}
|
||||||
|
plugins["allow"] = ids
|
||||||
|
}
|
||||||
|
if deny, ok := plugins["deny"]; ok {
|
||||||
|
plugins["deny"] = slices.DeleteFunc(extractStringList(deny), func(id string) bool { return id == "feishu" })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func feishuConfigError(field string) error { return buserr.WithDetail("ErrFeishuConfig", field, nil) }
|
||||||
|
|
||||||
|
func convertLegacyFeishu(conf map[string]interface{}, req dto.AgentFeishuSwitchReq) error {
|
||||||
|
f := getChannelConfig(conf, "feishu")
|
||||||
|
if len(f) == 0 {
|
||||||
|
if raw, exists := childMap(conf, "channels")["feishu"]; exists && raw != nil {
|
||||||
|
if _, ok := raw.(map[string]interface{}); !ok {
|
||||||
|
return feishuConfigError("channels.feishu")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
f = ensureChildMap(ensureChildMap(conf, "channels"), "feishu")
|
||||||
|
f["enabled"], f["dmPolicy"], f["groupPolicy"] = false, "pairing", "allowlist"
|
||||||
|
}
|
||||||
|
if err := checkLegacyFeishuFields(f, "channels.feishu", false); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := convertFeishuAccess(f, "channels.feishu"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
delete(f, "threadSession")
|
||||||
|
delete(f, "replyMode")
|
||||||
|
f["streaming"] = map[string]interface{}{"mode": "off"}
|
||||||
|
if req.Streaming {
|
||||||
|
f["streaming"] = map[string]interface{}{"mode": "partial"}
|
||||||
|
}
|
||||||
|
f["groupSessionScope"] = req.GroupSessionScope
|
||||||
|
f["requireMention"] = req.RequireMention == "true"
|
||||||
|
delete(f, "topicSessionMode")
|
||||||
|
// Preserve legacy defaults explicitly; bundled defaults are more restrictive.
|
||||||
|
if _, ok := f["groupPolicy"]; !ok {
|
||||||
|
f["groupPolicy"] = "open"
|
||||||
|
}
|
||||||
|
entries := ensureChildMap(ensureChildMap(conf, "plugins"), "entries")
|
||||||
|
ensureChildMap(entries, "openclaw-lark")["enabled"] = false
|
||||||
|
selectBundledFeishu(conf, extractBoolValue(f["enabled"], true))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Limit automatic conversion to the shared channel fields; custom plugin options require review.
|
||||||
|
func checkLegacyFeishuFields(f map[string]interface{}, field string, group bool) error {
|
||||||
|
allowed := strings.Fields("enabled name appId appSecret encryptKey verificationToken domain connectionMode webhookPath defaultAccount dmPolicy allowFrom groupPolicy groupAllowFrom groupSenderAllowFrom requireMention accounts groups streaming threadSession replyMode groupSessionScope topicSessionMode replyInThread")
|
||||||
|
if group {
|
||||||
|
allowed = strings.Fields("enabled requireMention allowFrom groupSessionScope topicSessionMode replyInThread")
|
||||||
|
}
|
||||||
|
for _, key := range sortedChildKeys(f) {
|
||||||
|
if !slices.Contains(allowed, key) {
|
||||||
|
return feishuConfigError(field + "." + key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if enabled, exists := f["enabled"]; exists {
|
||||||
|
if _, ok := enabled.(bool); !ok {
|
||||||
|
return feishuConfigError(field + ".enabled")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, key := range []string{"dmPolicy", "groupPolicy"} {
|
||||||
|
if raw, exists := f[key]; exists {
|
||||||
|
value, ok := raw.(string)
|
||||||
|
options := []string{"open", "allowlist", "disabled"}
|
||||||
|
if key == "dmPolicy" {
|
||||||
|
options = append(options, "pairing")
|
||||||
|
}
|
||||||
|
if !ok || !slices.Contains(options, value) {
|
||||||
|
return feishuConfigError(field + "." + key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, key := range []string{"allowFrom", "groupSenderAllowFrom"} {
|
||||||
|
if raw, exists := f[key]; exists {
|
||||||
|
values, ok := raw.([]interface{})
|
||||||
|
if !ok {
|
||||||
|
return feishuConfigError(field + "." + key)
|
||||||
|
}
|
||||||
|
for _, value := range values {
|
||||||
|
if _, ok := value.(string); !ok {
|
||||||
|
return feishuConfigError(field + "." + key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, section := range []string{"accounts", "groups"} {
|
||||||
|
raw, exists := f[section]
|
||||||
|
if !exists {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
entries, ok := raw.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return feishuConfigError(field + "." + section)
|
||||||
|
}
|
||||||
|
for _, id := range sortedChildKeys(entries) {
|
||||||
|
entry, ok := entries[id].(map[string]interface{})
|
||||||
|
name := field + "." + section + "." + id
|
||||||
|
if !ok {
|
||||||
|
return feishuConfigError(name)
|
||||||
|
}
|
||||||
|
if err := checkLegacyFeishuFields(entry, name, section == "groups"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func convertFeishuAccess(f map[string]interface{}, field string) error {
|
||||||
|
if raw, ok := f["groupAllowFrom"]; ok {
|
||||||
|
values, ok := raw.([]interface{})
|
||||||
|
if !ok {
|
||||||
|
return feishuConfigError(field + ".groupAllowFrom")
|
||||||
|
}
|
||||||
|
groups, senders := []string{}, []string{}
|
||||||
|
for _, value := range values {
|
||||||
|
id, ok := value.(string)
|
||||||
|
if !ok {
|
||||||
|
return feishuConfigError(field + ".groupAllowFrom")
|
||||||
|
}
|
||||||
|
switch {
|
||||||
|
case strings.HasPrefix(id, "oc_"):
|
||||||
|
groups = append(groups, id)
|
||||||
|
case strings.HasPrefix(id, "ou_"):
|
||||||
|
senders = append(senders, id)
|
||||||
|
default:
|
||||||
|
return feishuConfigError(field + ".groupAllowFrom")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// A sender-only legacy allowlist has different group admission semantics.
|
||||||
|
if len(senders) > 0 && (len(groups) == 0 || f["groupSenderAllowFrom"] != nil) {
|
||||||
|
return feishuConfigError(field + ".groupAllowFrom")
|
||||||
|
}
|
||||||
|
f["groupAllowFrom"] = groups
|
||||||
|
if len(senders) > 0 {
|
||||||
|
f["groupSenderAllowFrom"] = senders
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, section := range []string{"accounts", "groups"} {
|
||||||
|
for id, value := range childMap(f, section) {
|
||||||
|
entry, ok := value.(map[string]interface{})
|
||||||
|
name := field + "." + section + "." + id
|
||||||
|
if !ok {
|
||||||
|
return feishuConfigError(name)
|
||||||
|
}
|
||||||
|
// Account/group overrides must be resolved explicitly, not flattened.
|
||||||
|
for _, key := range []string{"threadSession", "replyMode"} {
|
||||||
|
if _, ok := entry[key]; ok {
|
||||||
|
return feishuConfigError(name + "." + key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if mention, ok := entry["requireMention"]; ok {
|
||||||
|
if _, ok := mention.(bool); !ok {
|
||||||
|
return feishuConfigError(name + ".requireMention")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if raw, exists := entry["streaming"]; exists {
|
||||||
|
streaming, ok := raw.(bool)
|
||||||
|
if !ok || streaming {
|
||||||
|
return feishuConfigError(name + ".streaming")
|
||||||
|
}
|
||||||
|
entry["streaming"] = map[string]interface{}{"mode": "off"}
|
||||||
|
}
|
||||||
|
if err := convertFeishuAccess(entry, name); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractBundledFeishuConfig(conf map[string]interface{}) dto.AgentFeishuConfig {
|
||||||
|
result := extractFeishuConfig(conf)
|
||||||
|
f := getChannelConfig(conf, "feishu")
|
||||||
|
result.Enabled = extractBoolValue(f["enabled"], true) && extractBoolValue(childMap(childMap(childMap(conf, "plugins"), "entries"), "feishu")["enabled"], true)
|
||||||
|
result.GroupSessionScope = extractStringValue(f["groupSessionScope"])
|
||||||
|
if result.GroupSessionScope == "" {
|
||||||
|
result.GroupSessionScope = "group"
|
||||||
|
}
|
||||||
|
result.Streaming = extractStringValue(childMap(f, "streaming")["mode"]) != "off"
|
||||||
|
result.GroupPolicy = extractStringValue(f["groupPolicy"])
|
||||||
|
if result.GroupPolicy == "" {
|
||||||
|
result.GroupPolicy = "allowlist"
|
||||||
|
}
|
||||||
|
if len(f) == 0 {
|
||||||
|
result.Streaming = false
|
||||||
|
result.RequireMention = "true"
|
||||||
|
} else if _, ok := f["requireMention"]; !ok {
|
||||||
|
result.RequireMention = "open"
|
||||||
|
}
|
||||||
|
accounts := childMap(f, "accounts")
|
||||||
|
ids := sortedChildKeys(accounts)
|
||||||
|
if (f["appId"] != nil || f["appSecret"] != nil) && !slices.Contains(ids, "default") {
|
||||||
|
ids = append([]string{"default"}, ids...)
|
||||||
|
}
|
||||||
|
result.Bots = []dto.AgentFeishuBot{}
|
||||||
|
for _, id := range ids {
|
||||||
|
effective := make(map[string]interface{}, len(f))
|
||||||
|
for k, v := range f {
|
||||||
|
effective[k] = v
|
||||||
|
}
|
||||||
|
for k, v := range childMap(accounts, id) {
|
||||||
|
effective[k] = v
|
||||||
|
}
|
||||||
|
bot := defaultFeishuBot()
|
||||||
|
bot.AccountID, bot.IsDefault = id, id == "default"
|
||||||
|
bot.Name = extractDisplayName(childMap(accounts, id), "", id)
|
||||||
|
bot.Enabled = extractBoolValue(childMap(accounts, id)["enabled"], true)
|
||||||
|
bot.AppID, bot.AppSecret = extractStringValue(effective["appId"]), extractStringValue(effective["appSecret"])
|
||||||
|
bot.DmPolicy = extractStringValue(effective["dmPolicy"])
|
||||||
|
if bot.DmPolicy == "" {
|
||||||
|
bot.DmPolicy = "pairing"
|
||||||
|
}
|
||||||
|
bot.AllowFrom = extractStringList(effective["allowFrom"])
|
||||||
|
result.Bots = append(result.Bots, bot)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
func setBundledFeishuConfig(conf map[string]interface{}, req dto.AgentFeishuConfigUpdateReq) error {
|
||||||
|
if !slices.Contains([]string{"group", "group_sender", "group_topic", "group_topic_sender"}, req.GroupSessionScope) {
|
||||||
|
return feishuConfigError("groupSessionScope")
|
||||||
|
}
|
||||||
|
f := ensureChildMap(ensureChildMap(conf, "channels"), "feishu")
|
||||||
|
accounts := childMap(f, "accounts")
|
||||||
|
seen := map[string]bool{}
|
||||||
|
appIDs := map[string]bool{}
|
||||||
|
for _, bot := range req.Bots {
|
||||||
|
if bot.AccountID == "" || bot.AccountID != strings.ToLower(strings.TrimSpace(bot.AccountID)) || seen[bot.AccountID] || appIDs[bot.AppID] || bot.AppID == "" || !slices.Contains([]string{"pairing", "open", "allowlist", "disabled"}, bot.DmPolicy) || (bot.DmPolicy == "allowlist" && len(bot.AllowFrom) == 0) {
|
||||||
|
return feishuConfigError("accounts")
|
||||||
|
}
|
||||||
|
seen[bot.AccountID] = true
|
||||||
|
appIDs[bot.AppID] = true
|
||||||
|
entry := childMap(accounts, bot.AccountID)
|
||||||
|
if _, exists := entry["appSecret"]; !exists && bot.AppSecret == "" {
|
||||||
|
entry["appSecret"] = f["appSecret"]
|
||||||
|
}
|
||||||
|
// SecretRef credentials cannot be represented by the form: keep them intact.
|
||||||
|
if _, secretRef := entry["appSecret"].(map[string]interface{}); !secretRef && bot.AppSecret == "" {
|
||||||
|
return feishuConfigError("accounts." + bot.AccountID + ".appSecret")
|
||||||
|
}
|
||||||
|
entry["appId"], entry["name"], entry["enabled"], entry["dmPolicy"] = bot.AppID, bot.Name, bot.Enabled, bot.DmPolicy
|
||||||
|
if bot.AppSecret != "" {
|
||||||
|
entry["appSecret"] = bot.AppSecret
|
||||||
|
}
|
||||||
|
switch bot.DmPolicy {
|
||||||
|
case "open":
|
||||||
|
entry["allowFrom"] = []string{"*"}
|
||||||
|
case "allowlist":
|
||||||
|
entry["allowFrom"] = bot.AllowFrom
|
||||||
|
default:
|
||||||
|
if len(bot.AllowFrom) > 0 {
|
||||||
|
entry["allowFrom"] = bot.AllowFrom
|
||||||
|
} else {
|
||||||
|
entry["allowFrom"] = []string{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
accounts[bot.AccountID] = entry
|
||||||
|
}
|
||||||
|
for id := range accounts {
|
||||||
|
if !seen[id] {
|
||||||
|
delete(accounts, id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !seen["default"] {
|
||||||
|
delete(f, "appId")
|
||||||
|
delete(f, "appSecret")
|
||||||
|
}
|
||||||
|
if id := extractStringValue(f["defaultAccount"]); id != "" && !seen[id] {
|
||||||
|
return feishuConfigError("defaultAccount")
|
||||||
|
}
|
||||||
|
if len(accounts) > 0 {
|
||||||
|
f["accounts"] = accounts
|
||||||
|
} else {
|
||||||
|
delete(f, "accounts")
|
||||||
|
}
|
||||||
|
f["enabled"], f["groupSessionScope"], f["groupPolicy"] = req.Enabled, req.GroupSessionScope, req.GroupPolicy
|
||||||
|
if req.RequireMention == "open" {
|
||||||
|
delete(f, "requireMention")
|
||||||
|
} else {
|
||||||
|
f["requireMention"] = req.RequireMention == "true"
|
||||||
|
}
|
||||||
|
if req.GroupPolicy == "allowlist" {
|
||||||
|
f["groupAllowFrom"] = req.GroupAllowFrom
|
||||||
|
} else {
|
||||||
|
delete(f, "groupAllowFrom")
|
||||||
|
}
|
||||||
|
streaming := ensureChildMap(f, "streaming")
|
||||||
|
streaming["mode"] = "off"
|
||||||
|
if req.Streaming {
|
||||||
|
streaming["mode"] = "partial"
|
||||||
|
}
|
||||||
|
selectBundledFeishu(conf, req.Enabled && hasEnabledBots(req.Bots))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Write beside the original so validation and rename preserve the mounted filesystem and owner.
|
||||||
|
func stageFeishuConfig(configPath string, payload []byte) (string, error) {
|
||||||
|
info, err := os.Lstat(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if !info.Mode().IsRegular() {
|
||||||
|
return "", feishuConfigError("openclaw.json")
|
||||||
|
}
|
||||||
|
f, err := os.CreateTemp(filepath.Dir(configPath), ".feishu-*.json")
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
name := f.Name()
|
||||||
|
defer func() {
|
||||||
|
f.Close()
|
||||||
|
if err != nil {
|
||||||
|
os.Remove(name)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
if stat, ok := info.Sys().(*syscall.Stat_t); ok {
|
||||||
|
err = f.Chown(int(stat.Uid), int(stat.Gid))
|
||||||
|
}
|
||||||
|
if err == nil {
|
||||||
|
err = f.Chmod(info.Mode().Perm())
|
||||||
|
}
|
||||||
|
if err == nil {
|
||||||
|
_, err = f.Write(payload)
|
||||||
|
}
|
||||||
|
if err == nil {
|
||||||
|
err = f.Sync()
|
||||||
|
}
|
||||||
|
if err == nil {
|
||||||
|
err = f.Close()
|
||||||
|
}
|
||||||
|
return name, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func validateFeishuConfig(container, configPath string) error {
|
||||||
|
out, err := cmd.RunDockerExecWithStdout(time.Minute, container, "env", "OPENCLAW_CONFIG_PATH=/home/node/.openclaw/"+filepath.Base(configPath), "openclaw", "config", "validate", "--json")
|
||||||
|
return feishuValidationResult(out, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func replaceFeishuConfig(configPath string, expected, payload []byte) error {
|
||||||
|
tmp, err := stageFeishuConfig(configPath, payload)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer os.Remove(tmp)
|
||||||
|
current, err := os.ReadFile(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !bytes.Equal(current, expected) {
|
||||||
|
return buserr.New("ErrFeishuConfigChanged")
|
||||||
|
}
|
||||||
|
return os.Rename(tmp, configPath)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) SwitchFeishuPlugin(req dto.AgentFeishuSwitchReq) error {
|
||||||
|
agent, install, err := a.loadOpenclawAgentAndInstall(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !isOpenclawBundledFeishuVersion(install.Version) {
|
||||||
|
return buserr.New("ErrFeishuImageRequired")
|
||||||
|
}
|
||||||
|
if _, busy := feishuSwitches.LoadOrStore(agent.ConfigPath, true); busy {
|
||||||
|
return buserr.New("TaskIsExecuting")
|
||||||
|
}
|
||||||
|
started := false
|
||||||
|
defer func() {
|
||||||
|
if !started {
|
||||||
|
feishuSwitches.Delete(agent.ConfigPath)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
if err := task.CheckScopeTaskIsExecuting(task.TaskScopeAI, req.AgentID); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !hasBundledFeishu(install.ContainerName) {
|
||||||
|
return buserr.New("ErrFeishuImageRequired")
|
||||||
|
}
|
||||||
|
conf, err := readOpenclawConfig(agent.ConfigPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
legacy, configured, err := classifyLegacyFeishu(conf, install.GetPath())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !legacy {
|
||||||
|
return buserr.New("ErrFeishuAlreadySwitched")
|
||||||
|
}
|
||||||
|
if err := prepareLegacyFeishu(conf, configured, &dto.AgentFeishuTransition{Confirmed: true, Streaming: req.Streaming, GroupSessionScope: req.GroupSessionScope, RequireMention: req.RequireMention}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
switchTask, err := task.NewTaskWithOps("Feishu", task.TaskUpdate, task.TaskScopeAI, req.TaskID, req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
switchTask.AddSubTaskWithAlias("AgentFeishuSwitch", func(t *task.Task) error { return a.runFeishuSwitch(agent, install, req, t) }, nil)
|
||||||
|
started = true
|
||||||
|
go func() { defer feishuSwitches.Delete(agent.ConfigPath); executeAgentPluginTask(switchTask) }()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) runFeishuSwitch(agent *model.Agent, install *model.AppInstall, req dto.AgentFeishuSwitchReq, t *task.Task) (result error) {
|
||||||
|
original, conf, err := readFeishuConfigBytes(agent.ConfigPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
legacy, configured, err := classifyLegacyFeishu(conf, install.GetPath())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !legacy {
|
||||||
|
return buserr.New("ErrFeishuAlreadySwitched")
|
||||||
|
}
|
||||||
|
image, err := feishuContainerImage(install.ContainerName)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
image, err = bundledFeishuImage(image)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err = prepareLegacyFeishu(conf, configured, &dto.AgentFeishuTransition{Confirmed: true, Streaming: req.Streaming, GroupSessionScope: req.GroupSessionScope, RequireMention: req.RequireMention}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
payload, err := json.MarshalIndent(conf, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
recovery, err := feishuRecoveryPayload(payload, configured)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// Validate both candidates without invoking Doctor or mutating retained state.
|
||||||
|
for _, candidate := range [][]byte{payload, recovery} {
|
||||||
|
staged, stageErr := stageFeishuConfig(agent.ConfigPath, candidate)
|
||||||
|
if stageErr != nil {
|
||||||
|
return stageErr
|
||||||
|
}
|
||||||
|
validateErr := validateFeishuImageConfig(image, staged)
|
||||||
|
os.Remove(staged)
|
||||||
|
if validateErr != nil {
|
||||||
|
return validateErr
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if _, err = compose.Stop(install.GetComposePath()); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
replaced := false
|
||||||
|
defer func() {
|
||||||
|
if !replaced {
|
||||||
|
if _, startErr := compose.Operate(install.GetComposePath(), "start"); startErr != nil {
|
||||||
|
result = errors.Join(result, buserr.WithErr("ErrFeishuRestore", startErr))
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if result == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if _, stopErr := compose.Stop(install.GetComposePath()); stopErr != nil {
|
||||||
|
result = errors.Join(result, buserr.WithErr("ErrFeishuRestore", stopErr))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if restoreErr := replaceFeishuConfig(agent.ConfigPath, payload, recovery); restoreErr != nil {
|
||||||
|
result = errors.Join(result, buserr.WithErr("ErrFeishuRestore", restoreErr))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if _, startErr := compose.Operate(install.GetComposePath(), "start"); startErr != nil {
|
||||||
|
result = errors.Join(result, buserr.WithErr("ErrFeishuRestore", startErr))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if healthErr := verifyFeishuActivation(install.ContainerName, false); healthErr != nil {
|
||||||
|
result = errors.Join(result, buserr.WithErr("ErrFeishuRestore", healthErr))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
t.Log(i18n.GetMsgByKey("AgentFeishuRecoveryDisabled"))
|
||||||
|
}()
|
||||||
|
current, err := os.ReadFile(agent.ConfigPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !bytes.Equal(current, original) {
|
||||||
|
return buserr.New("ErrFeishuConfigChanged")
|
||||||
|
}
|
||||||
|
backup, err := backupFeishuConfig(agent.ConfigPath, original)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
t.Log(i18n.GetWithName("AgentFeishuBackup", filepath.Base(backup)))
|
||||||
|
if err = replaceFeishuConfig(agent.ConfigPath, original, payload); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
replaced = true
|
||||||
|
if _, err = compose.Operate(install.GetComposePath(), "start"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
enabled := configured && extractBoolValue(getChannelConfig(conf, "feishu")["enabled"], true)
|
||||||
|
if err = verifyFeishuActivation(install.ContainerName, enabled); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if enabled {
|
||||||
|
probeFeishuConnection(install.ContainerName, t)
|
||||||
|
}
|
||||||
|
if configured {
|
||||||
|
t.Log(i18n.GetMsgByKey("AgentFeishuVerifyMessages"))
|
||||||
|
} else {
|
||||||
|
t.Log(i18n.GetMsgByKey("AgentFeishuRecoveryDisabled"))
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func saveBundledFeishuConfig(agent *model.Agent, install *model.AppInstall, req dto.AgentFeishuConfigUpdateReq) error {
|
||||||
|
if !isOpenclawBundledFeishuVersion(install.Version) {
|
||||||
|
return buserr.New("ErrFeishuImageRequired")
|
||||||
|
}
|
||||||
|
if _, busy := feishuSwitches.LoadOrStore(agent.ConfigPath, true); busy {
|
||||||
|
return buserr.New("TaskIsExecuting")
|
||||||
|
}
|
||||||
|
defer feishuSwitches.Delete(agent.ConfigPath)
|
||||||
|
if err := task.CheckScopeTaskIsExecuting(task.TaskScopeAI, req.AgentID); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !hasBundledFeishu(install.ContainerName) {
|
||||||
|
return buserr.New("ErrFeishuImageRequired")
|
||||||
|
}
|
||||||
|
original, err := os.ReadFile(agent.ConfigPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var conf map[string]interface{}
|
||||||
|
if err = json.Unmarshal(original, &conf); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if hasLegacyFeishu(conf, install.GetPath()) {
|
||||||
|
return buserr.New("ErrFeishuSwitchRequired")
|
||||||
|
}
|
||||||
|
if err = setBundledFeishuConfig(conf, req); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
payload, err := json.MarshalIndent(conf, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
staged, err := stageFeishuConfig(agent.ConfigPath, payload)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer os.Remove(staged)
|
||||||
|
if err = validateFeishuConfig(install.ContainerName, staged); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return replaceFeishuConfig(agent.ConfigPath, original, payload)
|
||||||
|
}
|
||||||
|
|
||||||
|
func feishuProbeOK(output string) bool {
|
||||||
|
raw, err := extractEmbeddedJSON(output)
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
var status struct {
|
||||||
|
ChannelAccounts map[string][]struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
Configured bool `json:"configured"`
|
||||||
|
Running bool `json:"running"`
|
||||||
|
Probe struct {
|
||||||
|
OK bool `json:"ok"`
|
||||||
|
} `json:"probe"`
|
||||||
|
} `json:"channelAccounts"`
|
||||||
|
}
|
||||||
|
if json.Unmarshal(raw, &status) != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
accounts, ok := status.ChannelAccounts["feishu"]
|
||||||
|
if !ok {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, account := range accounts {
|
||||||
|
if account.Enabled && (!account.Configured || !account.Running || !account.Probe.OK) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func feishuGatewayReady(output string, enabled bool) bool {
|
||||||
|
raw, err := extractEmbeddedJSON(output)
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
var health struct {
|
||||||
|
OK bool `json:"ok"`
|
||||||
|
Plugins struct {
|
||||||
|
Loaded []string `json:"loaded"`
|
||||||
|
} `json:"plugins"`
|
||||||
|
}
|
||||||
|
return json.Unmarshal(raw, &health) == nil && health.OK && !slices.Contains(health.Plugins.Loaded, "openclaw-lark") && (!enabled || slices.Contains(health.Plugins.Loaded, "feishu"))
|
||||||
|
}
|
||||||
@@ -0,0 +1,201 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"syscall"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/buserr"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/cmd"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/docker"
|
||||||
|
"github.com/docker/docker/api/types/container"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Inspect a stopped disposable container; its entrypoint never touches retained state.
|
||||||
|
func bundledFeishuImage(image string) (string, error) {
|
||||||
|
cli, err := docker.NewDockerClient()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
defer cli.Close()
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
info, _, err := cli.ImageInspectWithRaw(ctx, image)
|
||||||
|
if err != nil {
|
||||||
|
return "", buserr.New("ErrFeishuImageRequired")
|
||||||
|
}
|
||||||
|
created, err := cli.ContainerCreate(ctx, &container.Config{Image: info.ID, Entrypoint: []string{"/bin/true"}}, &container.HostConfig{NetworkMode: "none"}, nil, nil, "")
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
cleanup, done := context.WithTimeout(context.Background(), 10*time.Second)
|
||||||
|
defer done()
|
||||||
|
_ = cli.ContainerRemove(cleanup, created.ID, container.RemoveOptions{Force: true, RemoveVolumes: true})
|
||||||
|
}()
|
||||||
|
if _, err = cli.ContainerStatPath(ctx, created.ID, "/app/.1panel-feishu-bundled-v1"); err != nil {
|
||||||
|
return "", buserr.New("ErrFeishuImageRequired")
|
||||||
|
}
|
||||||
|
return info.ID, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func feishuContainerImage(name string) (string, error) {
|
||||||
|
cli, err := docker.NewDockerClient()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
defer cli.Close()
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
info, err := cli.ContainerInspect(ctx, name)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return info.Image, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// The original state is read-only and the normal Doctor entrypoint is bypassed.
|
||||||
|
func validateFeishuImageConfig(image, configPath string) error {
|
||||||
|
info, err := os.Stat(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
uid, gid := uint32(1000), uint32(1000)
|
||||||
|
if stat, ok := info.Sys().(*syscall.Stat_t); ok {
|
||||||
|
uid, gid = stat.Uid, stat.Gid
|
||||||
|
}
|
||||||
|
user := fmt.Sprintf("%d:%d", uid, gid)
|
||||||
|
tmpfs := fmt.Sprintf("/tmp:rw,mode=0700,uid=%d,gid=%d", uid, gid)
|
||||||
|
name := "1panel-feishu-" + strings.TrimSuffix(filepath.Base(configPath), ".json")
|
||||||
|
mgr := cmd.NewCommandMgr(cmd.WithTimeout(2 * time.Minute))
|
||||||
|
defer func() { _ = cmd.NewCommandMgr(cmd.WithTimeout(15*time.Second)).Run("docker", "rm", "-f", "-v", name) }()
|
||||||
|
out, runErr := mgr.RunWithStdout("docker", "run", "--name", name, "--rm", "--network", "none", "--read-only", "--user", user,
|
||||||
|
"--tmpfs", tmpfs,
|
||||||
|
"--mount", "type=bind,src="+filepath.Dir(configPath)+",dst=/home/node/.openclaw,readonly",
|
||||||
|
"--env", "HOME=/home/node", "--env", "TMPDIR=/tmp", "--env", "OPENCLAW_STATE_DIR=/tmp/state",
|
||||||
|
"--env", "OPENCLAW_CONFIG_PATH=/home/node/.openclaw/"+filepath.Base(configPath),
|
||||||
|
"--entrypoint", "sh", image, "-c", "mkdir -m 700 /tmp/state && ln -s /home/node/.openclaw/extensions /tmp/state/extensions && exec node /app/openclaw.mjs config validate --json")
|
||||||
|
return feishuValidationResult(out, runErr)
|
||||||
|
}
|
||||||
|
|
||||||
|
func feishuValidationResult(out string, runErr error) error {
|
||||||
|
raw, _ := extractEmbeddedJSON(out)
|
||||||
|
var result struct {
|
||||||
|
Valid bool `json:"valid"`
|
||||||
|
Issues []struct {
|
||||||
|
Path string `json:"path"`
|
||||||
|
} `json:"issues"`
|
||||||
|
}
|
||||||
|
if json.Unmarshal(raw, &result) == nil && result.Valid && runErr == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
fields := []string{}
|
||||||
|
for _, issue := range result.Issues {
|
||||||
|
if issue.Path != "" {
|
||||||
|
fields = append(fields, issue.Path)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(fields) == 0 {
|
||||||
|
fields = append(fields, "openclaw.json")
|
||||||
|
}
|
||||||
|
return feishuConfigError(strings.Join(fields, ", "))
|
||||||
|
}
|
||||||
|
|
||||||
|
func backupFeishuConfig(configPath string, original []byte) (string, error) {
|
||||||
|
f, err := os.CreateTemp(filepath.Dir(configPath), ".feishu-backup-*.json")
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if _, err = f.Write(original); err == nil {
|
||||||
|
err = f.Sync()
|
||||||
|
}
|
||||||
|
closeErr := f.Close()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if closeErr != nil {
|
||||||
|
return "", closeErr
|
||||||
|
}
|
||||||
|
return f.Name(), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Doctor can spend 94 seconds waiting for the previous container's owner lease.
|
||||||
|
func waitOpenclawReady(name string) error {
|
||||||
|
script := `const fs=require('fs');const c=JSON.parse(fs.readFileSync('/home/node/.openclaw/openclaw.json','utf8'));const tls=c.gateway?.tls?.enabled===true;const h=require(tls?'https':'http');function check(p){const r=h.get({hostname:'127.0.0.1',port:c.gateway?.port||18789,path:p,rejectUnauthorized:false,timeout:3000},s=>{s.resume();if(s.statusCode===404&&p==='/readyz')return check('/healthz');process.exitCode=s.statusCode===200?0:1});r.on('timeout',()=>r.destroy());r.on('error',()=>process.exitCode=1)}check('/readyz')`
|
||||||
|
deadline := time.Now().Add(4 * time.Minute)
|
||||||
|
for time.Now().Before(deadline) {
|
||||||
|
if cmd.RunDockerExec(8*time.Second, name, "node", "-e", script) == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
time.Sleep(2 * time.Second)
|
||||||
|
}
|
||||||
|
return buserr.New("ErrFeishuActivation")
|
||||||
|
}
|
||||||
|
|
||||||
|
func verifyFeishuActivation(name string, enabled bool) error {
|
||||||
|
if err := waitOpenclawReady(name); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
output, err := cmd.RunDockerExecWithStdout(time.Minute, name, "openclaw", "plugins", "list", "--json")
|
||||||
|
if err != nil {
|
||||||
|
return buserr.New("ErrFeishuActivation")
|
||||||
|
}
|
||||||
|
raw, _ := extractEmbeddedJSON(output)
|
||||||
|
var result struct {
|
||||||
|
Plugins []struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Status string `json:"status"`
|
||||||
|
Origin string `json:"origin"`
|
||||||
|
} `json:"plugins"`
|
||||||
|
}
|
||||||
|
if json.Unmarshal(raw, &result) != nil {
|
||||||
|
return buserr.New("ErrFeishuActivation")
|
||||||
|
}
|
||||||
|
found := false
|
||||||
|
for _, p := range result.Plugins {
|
||||||
|
if p.ID == "openclaw-lark" && p.Status != "disabled" {
|
||||||
|
return buserr.New("ErrFeishuActivation")
|
||||||
|
}
|
||||||
|
if p.ID == "feishu" && p.Origin == "bundled" && (p.Status == "loaded" || (!enabled && p.Status == "disabled")) {
|
||||||
|
found = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
return buserr.New("ErrFeishuActivation")
|
||||||
|
}
|
||||||
|
health, err := cmd.RunDockerExecWithStdout(20*time.Second, name, "openclaw", "gateway", "health", "--json")
|
||||||
|
if err != nil || !feishuGatewayReady(health, enabled) {
|
||||||
|
return buserr.New("ErrFeishuActivation")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func readFeishuConfigBytes(file string) ([]byte, map[string]interface{}, error) {
|
||||||
|
info, err := os.Lstat(file)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
if !info.Mode().IsRegular() {
|
||||||
|
return nil, nil, feishuConfigError("openclaw.json")
|
||||||
|
}
|
||||||
|
f, err := os.Open(file)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
raw, err := io.ReadAll(f)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
var conf map[string]interface{}
|
||||||
|
if err = json.Unmarshal(raw, &conf); err != nil || conf == nil {
|
||||||
|
return nil, nil, feishuConfigError("openclaw.json")
|
||||||
|
}
|
||||||
|
return raw, conf, nil
|
||||||
|
}
|
||||||
@@ -8,11 +8,15 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const hermesWeixinLoginScript = `import asyncio
|
const hermesWeixinLoginScript = `import asyncio
|
||||||
from gateway.platforms.weixin import qr_login
|
try:
|
||||||
|
from plugins.platforms.weixin.adapter import qr_login
|
||||||
|
except ModuleNotFoundError as exc:
|
||||||
|
if exc.name not in ('plugins', 'plugins.platforms', 'plugins.platforms.weixin', 'plugins.platforms.weixin.adapter'):
|
||||||
|
raise
|
||||||
|
from gateway.platforms.weixin import qr_login
|
||||||
from hermes_cli.config import save_env_value
|
from hermes_cli.config import save_env_value
|
||||||
|
|
||||||
creds = asyncio.run(qr_login('/opt/data'))
|
creds = asyncio.run(qr_login('/opt/data'))
|
||||||
print('RESULT =', creds)
|
|
||||||
|
|
||||||
if not creds:
|
if not creds:
|
||||||
raise SystemExit(1)
|
raise SystemExit(1)
|
||||||
|
|||||||
@@ -0,0 +1,202 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/repo"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
|
terminalai "github.com/1Panel-dev/1Panel/agent/utils/terminal/ai"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
func SyncLocalModelAccount(install model.AppInstall, accountID uint, baseURL string, models []dto.AgentAccountModel, updateBaseURL, createIfMissing bool) (*model.AgentAccount, error) {
|
||||||
|
if install.ID == 0 || (install.App.Key != "ollama" && install.App.Key != "vllm") {
|
||||||
|
return nil, fmt.Errorf("invalid local model installation")
|
||||||
|
}
|
||||||
|
agentAccountMutationMu.Lock()
|
||||||
|
defer agentAccountMutationMu.Unlock()
|
||||||
|
account, err := agentAccountRepo.GetFirst(repo.WithByAppInstallID(install.ID))
|
||||||
|
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) && accountID != 0 {
|
||||||
|
account, err = agentAccountRepo.GetFirst(repo.WithByID(accountID), repo.WithByProvider(install.App.Key))
|
||||||
|
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err == nil && account.AppInstallID != 0 && account.AppInstallID != install.ID {
|
||||||
|
return nil, fmt.Errorf("model account belongs to another installation")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
if !createIfMissing {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
name := install.Name
|
||||||
|
for suffix := 1; ; suffix++ {
|
||||||
|
existing, err := agentAccountRepo.List(repo.WithByProvider(install.App.Key), repo.WithByName(name))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(existing) == 0 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
name = fmt.Sprintf("%s-%d", install.Name, suffix)
|
||||||
|
}
|
||||||
|
apiType, apiKey := "openai-completions", "vllm-local"
|
||||||
|
if install.App.Key == "ollama" {
|
||||||
|
apiType, apiKey = "openai-responses", "ollama-local"
|
||||||
|
}
|
||||||
|
account = &model.AgentAccount{Name: name, Provider: install.App.Key, BaseURL: baseURL, APIType: apiType, APIKey: apiKey, RememberAPIKey: true, Verified: true}
|
||||||
|
}
|
||||||
|
accountChanged := account.ID == 0 || account.AppInstallID != install.ID || (updateBaseURL && account.BaseURL != baseURL)
|
||||||
|
account.AppInstallID = install.ID
|
||||||
|
if updateBaseURL {
|
||||||
|
account.BaseURL = baseURL
|
||||||
|
}
|
||||||
|
rows := make([]model.AgentAccountModel, 0, len(models))
|
||||||
|
verifyModelExists := account.VerifyModel == ""
|
||||||
|
for _, item := range models {
|
||||||
|
rows = append(rows, model.AgentAccountModel{Model: item.ID, Name: item.Name})
|
||||||
|
if item.ID == account.VerifyModel {
|
||||||
|
verifyModelExists = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !verifyModelExists {
|
||||||
|
account.VerifyModel = ""
|
||||||
|
accountChanged = true
|
||||||
|
}
|
||||||
|
var previous []model.AgentAccountModel
|
||||||
|
if account.ID != 0 {
|
||||||
|
previous, err = agentAccountModelRepo.List(repo.WithByAccountID(account.ID), repo.WithOrderAsc("sort_order"), repo.WithOrderAsc("id"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
modelsChanged := len(previous) != len(rows)
|
||||||
|
if !modelsChanged {
|
||||||
|
for i := range rows {
|
||||||
|
if previous[i].Model != rows[i].Model || previous[i].Name != rows[i].Name {
|
||||||
|
modelsChanged = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if modelsChanged {
|
||||||
|
err = agentAccountRepo.SaveLocal(account, rows)
|
||||||
|
} else if accountChanged {
|
||||||
|
err = agentAccountRepo.Save(account)
|
||||||
|
} else {
|
||||||
|
return account, nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
terminalai.InvalidateTerminalRuntimeCache()
|
||||||
|
terminalai.InvalidateFileAIRuntimeCache()
|
||||||
|
return account, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func SyncOllamaModelAccount(createIfMissing bool) error {
|
||||||
|
app, err := appRepo.GetFirst(appRepo.WithKey("ollama"))
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
install, err := appInstallRepo.GetFirst(appInstallRepo.WithAppId(app.ID))
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !install.SyncModelAccount {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return syncOllamaModelAccount(install, fmt.Sprintf("http://%s:11434/v1", install.ContainerName), false, createIfMissing)
|
||||||
|
}
|
||||||
|
|
||||||
|
func syncOllamaModelAccount(install model.AppInstall, baseURL string, updateBaseURL, createIfMissing bool) error {
|
||||||
|
models, err := aiRepo.List(repo.WithByStatus(constant.StatusSuccess), repo.WithOrderAsc("name"))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
items := make([]dto.AgentAccountModel, 0, len(models))
|
||||||
|
for _, item := range models {
|
||||||
|
items = append(items, dto.AgentAccountModel{ID: item.Name, Name: item.Name})
|
||||||
|
}
|
||||||
|
_, err = SyncLocalModelAccount(install, 0, baseURL, items, updateBaseURL, createIfMissing)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadOllamaModelAccountAddress(install model.AppInstall) (string, string, error) {
|
||||||
|
addressType := install.ModelAccountBaseURLType
|
||||||
|
if addressType == "" {
|
||||||
|
addressType = "container"
|
||||||
|
}
|
||||||
|
account, err := agentAccountRepo.GetFirst(repo.WithByAppInstallID(install.ID), repo.WithByProvider("ollama"))
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return addressType, install.ModelAccountBaseURL, nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return "", "", err
|
||||||
|
}
|
||||||
|
if addressType != "custom" {
|
||||||
|
expectedURL, err := ResolveLocalModelAccountBaseURL(addressType, "", install.ContainerName, "11434", install.HttpPort)
|
||||||
|
if err != nil {
|
||||||
|
return "", "", err
|
||||||
|
}
|
||||||
|
if strings.TrimRight(account.BaseURL, "/") != expectedURL {
|
||||||
|
addressType = "custom"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return addressType, account.BaseURL, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func CleanupLocalModelAccount(installID uint) {
|
||||||
|
if installID == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
accounts, err := agentAccountRepo.List(repo.WithByAppInstallID(installID))
|
||||||
|
if err != nil {
|
||||||
|
global.LOG.Errorf("load local model accounts: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, account := range accounts {
|
||||||
|
if err := (AgentService{}).DeleteAccount(dto.AgentAccountDeleteReq{ID: account.ID}); err != nil {
|
||||||
|
global.LOG.Warnf("keep local model account %d after uninstall: %v", account.ID, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func ResolveLocalModelAccountBaseURL(addressType, customURL, containerName, containerPort string, hostPort int) (string, error) {
|
||||||
|
switch addressType {
|
||||||
|
case "custom":
|
||||||
|
baseURL := strings.TrimRight(strings.TrimSpace(customURL), "/")
|
||||||
|
if !strings.HasPrefix(baseURL, "http://") && !strings.HasPrefix(baseURL, "https://") {
|
||||||
|
return "", fmt.Errorf("model account base URL must start with http:// or https://")
|
||||||
|
}
|
||||||
|
return baseURL, nil
|
||||||
|
case "localhost":
|
||||||
|
return fmt.Sprintf("http://127.0.0.1:%d/v1", hostPort), nil
|
||||||
|
case "systemIP":
|
||||||
|
systemIP, err := settingRepo.GetValueByKey("SystemIP")
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
systemIP = strings.TrimSpace(systemIP)
|
||||||
|
if systemIP == "" {
|
||||||
|
systemIP = "127.0.0.1"
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("http://%s:%d/v1", systemIP, hostPort), nil
|
||||||
|
default:
|
||||||
|
return fmt.Sprintf("http://%s:%s/v1", containerName, containerPort), nil
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -107,6 +107,9 @@ func (a AgentService) InstallMarketPlugin(req dto.AgentPluginMarketInstallReq) e
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if isOpenclawBundledFeishuVersion(install.Version) && (strings.TrimSpace(req.Package) == "@larksuite/openclaw-lark" || strings.TrimSpace(req.Package) == "@openclaw/feishu") {
|
||||||
|
return buserr.New("ErrFeishuManaged")
|
||||||
|
}
|
||||||
if err := task.CheckScopeTaskIsExecuting(task.TaskScopeAI, req.AgentID); err != nil {
|
if err := task.CheckScopeTaskIsExecuting(task.TaskScopeAI, req.AgentID); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -132,6 +135,9 @@ func (a AgentService) OperatePlugin(req dto.AgentPluginOperateReq) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if isOpenclawBundledFeishuVersion(install.Version) && (req.PluginID == "openclaw-lark" || req.PluginID == "feishu") {
|
||||||
|
return buserr.New("ErrFeishuManaged")
|
||||||
|
}
|
||||||
if err := task.CheckScopeTaskIsExecuting(task.TaskScopeAI, req.AgentID); err != nil {
|
if err := task.CheckScopeTaskIsExecuting(task.TaskScopeAI, req.AgentID); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ func ensureContainerRunning(containerName string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func resolveAgentAccountInput(provider, apiType, authMode, apiKey, baseURL, modelID string, validateAvailability bool) (resolvedAgentAccountInput, error) {
|
func resolveAgentAccountInput(provider, apiType, authMode, apiKey, baseURL, modelID string, validateAvailability, allowEmptyModel bool) (resolvedAgentAccountInput, error) {
|
||||||
resolvedAPIKey := strings.TrimSpace(apiKey)
|
resolvedAPIKey := strings.TrimSpace(apiKey)
|
||||||
resolvedAPIType := strings.TrimSpace(apiType)
|
resolvedAPIType := strings.TrimSpace(apiType)
|
||||||
resolvedAuthMode, err := providercatalog.ResolveAuthMode(provider, resolvedAPIType, authMode)
|
resolvedAuthMode, err := providercatalog.ResolveAuthMode(provider, resolvedAPIType, authMode)
|
||||||
@@ -113,7 +113,7 @@ func resolveAgentAccountInput(provider, apiType, authMode, apiKey, baseURL, mode
|
|||||||
return resolvedAgentAccountInput{}, err
|
return resolvedAgentAccountInput{}, err
|
||||||
}
|
}
|
||||||
modelID = strings.TrimSpace(modelID)
|
modelID = strings.TrimSpace(modelID)
|
||||||
if modelID == "" {
|
if modelID == "" && !allowEmptyModel {
|
||||||
return resolvedAgentAccountInput{}, buserr.New("ErrAgentAccountModelsRequired")
|
return resolvedAgentAccountInput{}, buserr.New("ErrAgentAccountModelsRequired")
|
||||||
}
|
}
|
||||||
imageAPI := providercatalog.IsImageAPIType(resolvedAPIType)
|
imageAPI := providercatalog.IsImageAPIType(resolvedAPIType)
|
||||||
@@ -148,6 +148,10 @@ func readOpenclawConfig(configPath string) (map[string]interface{}, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func writeOpenclawConfigRaw(configPath string, conf map[string]interface{}) error {
|
func writeOpenclawConfigRaw(configPath string, conf map[string]interface{}) error {
|
||||||
|
if _, busy := feishuSwitches.LoadOrStore(configPath, true); busy {
|
||||||
|
return buserr.New("TaskIsExecuting")
|
||||||
|
}
|
||||||
|
defer feishuSwitches.Delete(configPath)
|
||||||
ensureGatewaySecurityDefaults(conf)
|
ensureGatewaySecurityDefaults(conf)
|
||||||
ensureOpenclawUpdateDefaults(conf)
|
ensureOpenclawUpdateDefaults(conf)
|
||||||
payload, err := json.MarshalIndent(conf, "", " ")
|
payload, err := json.MarshalIndent(conf, "", " ")
|
||||||
|
|||||||
+107
-47
@@ -8,6 +8,7 @@ import (
|
|||||||
"os/exec"
|
"os/exec"
|
||||||
"path"
|
"path"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -28,13 +29,15 @@ import (
|
|||||||
|
|
||||||
type AIToolService struct{}
|
type AIToolService struct{}
|
||||||
|
|
||||||
|
var ollamaModelMu sync.Mutex
|
||||||
|
|
||||||
type IAIToolService interface {
|
type IAIToolService interface {
|
||||||
Search(search dto.SearchWithPage) (int64, []dto.OllamaModelInfo, error)
|
Search(search dto.SearchWithPage) (int64, []dto.OllamaModelInfo, error)
|
||||||
Create(req dto.OllamaModelName) error
|
Create(req dto.OllamaModelName) error
|
||||||
Close(name string) error
|
Close(name string) error
|
||||||
Recreate(req dto.OllamaModelName) error
|
Recreate(req dto.OllamaModelName) error
|
||||||
Delete(req dto.ForceDelete) error
|
Delete(req dto.ForceDelete) error
|
||||||
Sync() ([]dto.OllamaModelDropList, error)
|
SyncAccount(req dto.OllamaModelAccountSync) error
|
||||||
LoadDetail(name string) (string, error)
|
LoadDetail(name string) (string, error)
|
||||||
BindDomain(req dto.OllamaBindDomain) error
|
BindDomain(req dto.OllamaBindDomain) error
|
||||||
GetBindDomain(req dto.OllamaBindDomainReq) (*dto.OllamaBindDomainRes, error)
|
GetBindDomain(req dto.OllamaBindDomainReq) (*dto.OllamaBindDomainRes, error)
|
||||||
@@ -46,6 +49,7 @@ func NewIAIToolService() IAIToolService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *AIToolService) Search(req dto.SearchWithPage) (int64, []dto.OllamaModelInfo, error) {
|
func (u *AIToolService) Search(req dto.SearchWithPage) (int64, []dto.OllamaModelInfo, error) {
|
||||||
|
syncErr := syncOllamaModels()
|
||||||
var options []repo.DBOption
|
var options []repo.DBOption
|
||||||
if len(req.Info) != 0 {
|
if len(req.Info) != 0 {
|
||||||
options = append(options, repo.WithByLikeName(req.Info))
|
options = append(options, repo.WithByLikeName(req.Info))
|
||||||
@@ -60,6 +64,11 @@ func (u *AIToolService) Search(req dto.SearchWithPage) (int64, []dto.OllamaModel
|
|||||||
if err := copier.Copy(&item, &itemModel); err != nil {
|
if err := copier.Copy(&item, &itemModel); err != nil {
|
||||||
return 0, nil, buserr.WithDetail("ErrStructTransform", err.Error(), nil)
|
return 0, nil, buserr.WithDetail("ErrStructTransform", err.Error(), nil)
|
||||||
}
|
}
|
||||||
|
if syncErr != nil && item.Status != constant.StatusWaiting {
|
||||||
|
item.Status = constant.StatusUnknown
|
||||||
|
item.Message = syncErr.Error()
|
||||||
|
item.Size = ""
|
||||||
|
}
|
||||||
taskModel, _ := taskRepo.GetFirst(taskRepo.WithResourceID(item.ID), repo.WithByType(task.TaskScopeAI))
|
taskModel, _ := taskRepo.GetFirst(taskRepo.WithResourceID(item.ID), repo.WithByType(task.TaskScopeAI))
|
||||||
if len(taskModel.ID) != 0 {
|
if len(taskModel.ID) != 0 {
|
||||||
item.LogFileExist = true
|
item.LogFileExist = true
|
||||||
@@ -85,6 +94,8 @@ func (u *AIToolService) LoadDetail(name string) (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *AIToolService) Create(req dto.OllamaModelName) error {
|
func (u *AIToolService) Create(req dto.OllamaModelName) error {
|
||||||
|
ollamaModelMu.Lock()
|
||||||
|
defer ollamaModelMu.Unlock()
|
||||||
if cmd.CheckIllegal(req.Name) {
|
if cmd.CheckIllegal(req.Name) {
|
||||||
return buserr.New("ErrCmdIllegal")
|
return buserr.New("ErrCmdIllegal")
|
||||||
}
|
}
|
||||||
@@ -125,6 +136,9 @@ func (u *AIToolService) Create(req dto.OllamaModelName) error {
|
|||||||
if err := taskItem.Execute(); err != nil {
|
if err := taskItem.Execute(); err != nil {
|
||||||
_ = aiRepo.Update(info.ID, map[string]interface{}{"status": constant.StatusFailed, "message": err.Error()})
|
_ = aiRepo.Update(info.ID, map[string]interface{}{"status": constant.StatusFailed, "message": err.Error()})
|
||||||
}
|
}
|
||||||
|
if err := SyncOllamaModelAccount(false); err != nil {
|
||||||
|
global.LOG.Errorf("sync Ollama model account after pull: %v", err)
|
||||||
|
}
|
||||||
}()
|
}()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -144,6 +158,8 @@ func (u *AIToolService) Close(name string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *AIToolService) Recreate(req dto.OllamaModelName) error {
|
func (u *AIToolService) Recreate(req dto.OllamaModelName) error {
|
||||||
|
ollamaModelMu.Lock()
|
||||||
|
defer ollamaModelMu.Unlock()
|
||||||
if cmd.CheckIllegal(req.Name) {
|
if cmd.CheckIllegal(req.Name) {
|
||||||
return buserr.New("ErrCmdIllegal")
|
return buserr.New("ErrCmdIllegal")
|
||||||
}
|
}
|
||||||
@@ -179,11 +195,16 @@ func (u *AIToolService) Recreate(req dto.OllamaModelName) error {
|
|||||||
if err := taskItem.Execute(); err != nil {
|
if err := taskItem.Execute(); err != nil {
|
||||||
_ = aiRepo.Update(modelInfo.ID, map[string]interface{}{"status": constant.StatusFailed, "message": err.Error()})
|
_ = aiRepo.Update(modelInfo.ID, map[string]interface{}{"status": constant.StatusFailed, "message": err.Error()})
|
||||||
}
|
}
|
||||||
|
if err := SyncOllamaModelAccount(false); err != nil {
|
||||||
|
global.LOG.Errorf("sync Ollama model account after pull: %v", err)
|
||||||
|
}
|
||||||
}()
|
}()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *AIToolService) Delete(req dto.ForceDelete) error {
|
func (u *AIToolService) Delete(req dto.ForceDelete) error {
|
||||||
|
ollamaModelMu.Lock()
|
||||||
|
defer ollamaModelMu.Unlock()
|
||||||
ollamaList, _ := aiRepo.List(repo.WithByIDs(req.IDs))
|
ollamaList, _ := aiRepo.List(repo.WithByIDs(req.IDs))
|
||||||
if len(ollamaList) == 0 {
|
if len(ollamaList) == 0 {
|
||||||
return buserr.New("ErrRecordNotFound")
|
return buserr.New("ErrRecordNotFound")
|
||||||
@@ -202,55 +223,28 @@ func (u *AIToolService) Delete(req dto.ForceDelete) error {
|
|||||||
logItem := path.Join(global.Dir.DataDir, "log", "AITools", item.Name)
|
logItem := path.Join(global.Dir.DataDir, "log", "AITools", item.Name)
|
||||||
_ = os.Remove(logItem)
|
_ = os.Remove(logItem)
|
||||||
}
|
}
|
||||||
return nil
|
return SyncOllamaModelAccount(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *AIToolService) Sync() ([]dto.OllamaModelDropList, error) {
|
func (u *AIToolService) SyncAccount(req dto.OllamaModelAccountSync) error {
|
||||||
containerName, err := LoadContainerName()
|
install, err := appInstallRepo.GetFirst(repo.WithByID(req.ID))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return err
|
||||||
}
|
}
|
||||||
stdout, err := cmd.RunDockerExecWithStdout(20*time.Second, containerName, "ollama", "list")
|
if install.App.Key != "ollama" {
|
||||||
|
return buserr.New("ErrInvalidParams")
|
||||||
|
}
|
||||||
|
baseURL, err := ResolveLocalModelAccountBaseURL(req.ModelAccountBaseURLType, req.ModelAccountBaseURL, install.ContainerName, "11434", install.HttpPort)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return err
|
||||||
}
|
}
|
||||||
var list []model.OllamaModel
|
if err := syncOllamaModelAccount(install, baseURL, true, true); err != nil {
|
||||||
lines := strings.Split(stdout, "\n")
|
return err
|
||||||
for _, line := range lines {
|
|
||||||
parts := strings.Fields(line)
|
|
||||||
if len(parts) < 5 {
|
|
||||||
continue
|
|
||||||
}
|
}
|
||||||
if parts[0] == "NAME" {
|
return appInstallRepo.BatchUpdateBy(map[string]interface{}{
|
||||||
continue
|
"model_account_base_url_type": req.ModelAccountBaseURLType,
|
||||||
}
|
"model_account_base_url": baseURL,
|
||||||
list = append(list, model.OllamaModel{Name: parts[0], Size: parts[2] + " " + parts[3]})
|
}, repo.WithByID(install.ID))
|
||||||
}
|
|
||||||
listInDB, _ := aiRepo.List()
|
|
||||||
var dropList []dto.OllamaModelDropList
|
|
||||||
for _, itemModel := range listInDB {
|
|
||||||
isExit := false
|
|
||||||
for i := 0; i < len(list); i++ {
|
|
||||||
if list[i].Name == itemModel.Name {
|
|
||||||
_ = aiRepo.Update(itemModel.ID, map[string]interface{}{"status": constant.StatusSuccess, "message": "", "size": list[i].Size})
|
|
||||||
list = append(list[:i], list[(i+1):]...)
|
|
||||||
isExit = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !isExit && itemModel.Status != constant.StatusWaiting {
|
|
||||||
_ = aiRepo.Update(itemModel.ID, map[string]interface{}{"status": constant.StatusDeleted, "message": "not exist", "size": ""})
|
|
||||||
dropList = append(dropList, dto.OllamaModelDropList{ID: itemModel.ID, Name: itemModel.Name})
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, item := range list {
|
|
||||||
item.Status = constant.StatusSuccess
|
|
||||||
item.From = "remote"
|
|
||||||
_ = aiRepo.Create(&item)
|
|
||||||
}
|
|
||||||
|
|
||||||
return dropList, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *AIToolService) BindDomain(req dto.OllamaBindDomain) error {
|
func (u *AIToolService) BindDomain(req dto.OllamaBindDomain) error {
|
||||||
@@ -370,6 +364,72 @@ func (u *AIToolService) UpdateBindDomain(req dto.OllamaBindDomain) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func syncOllamaModels() error {
|
||||||
|
ollamaModelMu.Lock()
|
||||||
|
defer ollamaModelMu.Unlock()
|
||||||
|
containerName, err := LoadContainerName()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
stdout, err := cmd.RunDockerExecWithStdout(20*time.Second, containerName, "ollama", "list")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
models := make(map[string]string)
|
||||||
|
lines := strings.Split(strings.TrimSpace(stdout), "\n")
|
||||||
|
if len(lines) == 0 || !strings.HasPrefix(strings.TrimSpace(lines[0]), "NAME") {
|
||||||
|
return fmt.Errorf("invalid ollama list output: %s", stdout)
|
||||||
|
}
|
||||||
|
for _, line := range lines[1:] {
|
||||||
|
if strings.TrimSpace(line) == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
parts := strings.Fields(line)
|
||||||
|
if len(parts) < 5 {
|
||||||
|
return fmt.Errorf("invalid ollama model entry: %s", line)
|
||||||
|
}
|
||||||
|
models[parts[0]] = parts[2] + " " + parts[3]
|
||||||
|
}
|
||||||
|
list, err := aiRepo.List()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
known := make(map[string]bool, len(list))
|
||||||
|
for _, item := range list {
|
||||||
|
name := item.Name
|
||||||
|
if !strings.Contains(path.Base(name), ":") {
|
||||||
|
name += ":latest"
|
||||||
|
}
|
||||||
|
size, exists := models[name]
|
||||||
|
known[name] = true
|
||||||
|
if item.Status == constant.StatusWaiting {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
status, message := constant.StatusSuccess, ""
|
||||||
|
if !exists {
|
||||||
|
if item.Status == constant.StatusFailed || item.Status == constant.StatusCanceled {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
status, message = constant.StatusDeleted, "not exist"
|
||||||
|
}
|
||||||
|
if item.Status != status || item.Size != size || item.Message != message {
|
||||||
|
if err := aiRepo.Update(item.ID, map[string]interface{}{"status": status, "size": size, "message": message}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for name, size := range models {
|
||||||
|
if known[name] {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
item := model.OllamaModel{Name: name, Size: size, From: "remote", Status: constant.StatusSuccess}
|
||||||
|
if err := aiRepo.Create(&item); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func LoadContainerName() (string, error) {
|
func LoadContainerName() (string, error) {
|
||||||
ollamaBaseInfo, err := appInstallRepo.LoadBaseInfo("ollama", "")
|
ollamaBaseInfo, err := appInstallRepo.LoadBaseInfo("ollama", "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -387,12 +447,12 @@ func loadModelSize(name string, containerName string) (string, error) {
|
|||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
lines := strings.Split(stdout, "\n")
|
lines := strings.Split(stdout, "\n")
|
||||||
for _, line := range lines {
|
if !strings.Contains(path.Base(name), ":") {
|
||||||
if !strings.Contains(line, name) {
|
name += ":latest"
|
||||||
continue
|
|
||||||
}
|
}
|
||||||
|
for _, line := range lines {
|
||||||
parts := strings.Fields(line)
|
parts := strings.Fields(line)
|
||||||
if len(parts) < 5 {
|
if len(parts) < 5 || parts[0] != name {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
return parts[2] + " " + parts[3], nil
|
return parts[2] + " " + parts[3], nil
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ type IAppService interface {
|
|||||||
|
|
||||||
type appInstallHooks struct {
|
type appInstallHooks struct {
|
||||||
AfterCopyData func(appInstall *model.AppInstall) error
|
AfterCopyData func(appInstall *model.AppInstall) error
|
||||||
|
PrepareSiteDir func(model.App, model.AppDetail, request.AppInstallCreate, *task.Task) error
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewIAppService() IAppService {
|
func NewIAppService() IAppService {
|
||||||
@@ -499,6 +500,22 @@ func (a AppService) installWithHooks(req request.AppInstallCreate, executeScript
|
|||||||
req.Params[constant.ContainerName] = containerName
|
req.Params[constant.ContainerName] = containerName
|
||||||
appInstall.ContainerName = containerName
|
appInstall.ContainerName = containerName
|
||||||
|
|
||||||
|
modelAccountBaseURL := ""
|
||||||
|
if app.Key == "ollama" {
|
||||||
|
appInstall.SyncModelAccount = req.SyncModelAccount == nil || *req.SyncModelAccount
|
||||||
|
appInstall.ModelAccountBaseURLType = req.ModelAccountBaseURLType
|
||||||
|
if appInstall.ModelAccountBaseURLType == "" {
|
||||||
|
appInstall.ModelAccountBaseURLType = "container"
|
||||||
|
}
|
||||||
|
appInstall.ModelAccountBaseURL = req.ModelAccountBaseURL
|
||||||
|
}
|
||||||
|
if app.Key == "ollama" && appInstall.SyncModelAccount {
|
||||||
|
modelAccountBaseURL, err = ResolveLocalModelAccountBaseURL(req.ModelAccountBaseURLType, req.ModelAccountBaseURL, containerName, "11434", httpPort)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
index := 0
|
index := 0
|
||||||
serviceName := ""
|
serviceName := ""
|
||||||
for k := range servicesMap {
|
for k := range servicesMap {
|
||||||
@@ -598,7 +615,7 @@ func (a AppService) installWithHooks(req request.AppInstallCreate, executeScript
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if app.Key == "openresty" {
|
if app.Key == "openresty" {
|
||||||
if err = handleSiteDir(app, appDetail, req, t); err != nil {
|
if err = prepareAppInstallSiteDirectory(app, appDetail, req, t, hooks); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err = handleOpenrestyFile(appInstall); err != nil {
|
if err = handleOpenrestyFile(appInstall); err != nil {
|
||||||
@@ -609,6 +626,10 @@ func (a AppService) installWithHooks(req request.AppInstallCreate, executeScript
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
updateToolApp(appInstall)
|
updateToolApp(appInstall)
|
||||||
|
if app.Key == "ollama" && appInstall.SyncModelAccount {
|
||||||
|
_, err := SyncLocalModelAccount(*appInstall, 0, modelAccountBaseURL, nil, false, true)
|
||||||
|
return err
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -159,6 +159,14 @@ func (a *AppInstallService) CheckExist(req request.AppInstalledInfo) (*response.
|
|||||||
}
|
}
|
||||||
|
|
||||||
res.ContainerName = appInstall.ContainerName
|
res.ContainerName = appInstall.ContainerName
|
||||||
|
res.ModelAccountBaseURLType = appInstall.ModelAccountBaseURLType
|
||||||
|
res.ModelAccountBaseURL = appInstall.ModelAccountBaseURL
|
||||||
|
if app.Key == "ollama" {
|
||||||
|
res.ModelAccountBaseURLType, res.ModelAccountBaseURL, err = loadOllamaModelAccountAddress(appInstall)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
res.Name = appInstall.Name
|
res.Name = appInstall.Name
|
||||||
res.Version = appInstall.Version
|
res.Version = appInstall.Version
|
||||||
res.CreatedAt = appInstall.CreatedAt
|
res.CreatedAt = appInstall.CreatedAt
|
||||||
@@ -297,6 +305,7 @@ func (a *AppInstallService) Operate(req request.AppInstalledOperate) error {
|
|||||||
return syncAppInstallStatus(&install, true)
|
return syncAppInstallStatus(&install, true)
|
||||||
case constant.Upgrade:
|
case constant.Upgrade:
|
||||||
upgradeReq := request.AppInstallUpgrade{
|
upgradeReq := request.AppInstallUpgrade{
|
||||||
|
FeishuTransition: req.FeishuTransition,
|
||||||
InstallID: install.ID,
|
InstallID: install.ID,
|
||||||
DetailID: req.DetailId,
|
DetailID: req.DetailId,
|
||||||
Backup: req.Backup,
|
Backup: req.Backup,
|
||||||
@@ -438,6 +447,32 @@ func (a *AppInstallService) Update(req request.AppInstalledUpdate) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
modelAccountBaseURL := ""
|
||||||
|
if installed.App.Key == "ollama" {
|
||||||
|
if req.SyncModelAccount != nil {
|
||||||
|
installed.SyncModelAccount = *req.SyncModelAccount
|
||||||
|
}
|
||||||
|
if req.ModelAccountBaseURLType != "" {
|
||||||
|
installed.ModelAccountBaseURLType = req.ModelAccountBaseURLType
|
||||||
|
installed.ModelAccountBaseURL = req.ModelAccountBaseURL
|
||||||
|
} else if installed.SyncModelAccount {
|
||||||
|
installed.ModelAccountBaseURLType, installed.ModelAccountBaseURL, err = loadOllamaModelAccountAddress(oldInstalled)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if installed.SyncModelAccount {
|
||||||
|
containerName := installed.ContainerName
|
||||||
|
if req.Advanced && req.ContainerName != "" {
|
||||||
|
containerName = req.ContainerName
|
||||||
|
}
|
||||||
|
modelAccountBaseURL, err = ResolveLocalModelAccountBaseURL(installed.ModelAccountBaseURLType, installed.ModelAccountBaseURL, containerName, "11434", installed.HttpPort)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
backupDockerCompose := installed.DockerCompose
|
backupDockerCompose := installed.DockerCompose
|
||||||
if req.Advanced {
|
if req.Advanced {
|
||||||
composeMap := make(map[string]interface{})
|
composeMap := make(map[string]interface{})
|
||||||
@@ -563,6 +598,9 @@ func (a *AppInstallService) Update(req request.AppInstalledUpdate) error {
|
|||||||
if proxyChanged && website.ID != 0 && currentProxyErr != nil {
|
if proxyChanged && website.ID != 0 && currentProxyErr != nil {
|
||||||
global.LOG.Error(buserr.WithErr("ErrUpdateBuWebsite", currentProxyErr).Error())
|
global.LOG.Error(buserr.WithErr("ErrUpdateBuWebsite", currentProxyErr).Error())
|
||||||
}
|
}
|
||||||
|
if installed.App.Key == "ollama" && installed.SyncModelAccount {
|
||||||
|
return syncOllamaModelAccount(installed, modelAccountBaseURL, true, true)
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -679,6 +717,7 @@ func (a *AppInstallService) GetUpdateVersions(req request.AppUpdateVersion) ([]d
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return versions, err
|
return versions, err
|
||||||
}
|
}
|
||||||
|
var feishuLegacy, feishuConfigured, feishuChecked bool
|
||||||
details, err := appDetailRepo.GetBy(appDetailRepo.WithAppId(app.ID))
|
details, err := appDetailRepo.GetBy(appDetailRepo.WithAppId(app.ID))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return versions, err
|
return versions, err
|
||||||
@@ -703,6 +742,18 @@ func (a *AppInstallService) GetUpdateVersions(req request.AppUpdateVersion) ([]d
|
|||||||
canUpgrade = isVllmUpgradeCandidate(install.Version, detail.Version, currentImage)
|
canUpgrade = isVllmUpgradeCandidate(install.Version, detail.Version, currentImage)
|
||||||
}
|
}
|
||||||
if canUpgrade {
|
if canUpgrade {
|
||||||
|
feishuTarget := app.Key == constant.AppOpenclaw && isOpenclawBundledFeishuVersion(detail.Version)
|
||||||
|
if feishuTarget && !feishuChecked {
|
||||||
|
conf, readErr := readOpenclawConfig(path.Join(install.GetPath(), "data/conf/openclaw.json"))
|
||||||
|
if readErr != nil {
|
||||||
|
return versions, readErr
|
||||||
|
}
|
||||||
|
feishuLegacy, feishuConfigured, err = classifyLegacyFeishu(conf, install.GetPath())
|
||||||
|
if err != nil {
|
||||||
|
return versions, err
|
||||||
|
}
|
||||||
|
feishuChecked = true
|
||||||
|
}
|
||||||
var newCompose string
|
var newCompose string
|
||||||
if req.UpdateVersion != "" && req.UpdateVersion == detail.Version && detail.DockerCompose == "" && !app.IsLocalApp() {
|
if req.UpdateVersion != "" && req.UpdateVersion == detail.Version && detail.DockerCompose == "" && !app.IsLocalApp() {
|
||||||
filename := filepath.Base(detail.DownloadUrl)
|
filename := filepath.Base(detail.DownloadUrl)
|
||||||
@@ -737,6 +788,8 @@ func (a *AppInstallService) GetUpdateVersions(req request.AppUpdateVersion) ([]d
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
versions = append(versions, dto.AppVersion{
|
versions = append(versions, dto.AppVersion{
|
||||||
|
FeishuLegacy: feishuTarget && feishuLegacy,
|
||||||
|
FeishuConfigured: feishuTarget && feishuConfigured,
|
||||||
Version: detail.Version,
|
Version: detail.Version,
|
||||||
DetailId: detail.ID,
|
DetailId: detail.ID,
|
||||||
DockerCompose: newCompose,
|
DockerCompose: newCompose,
|
||||||
@@ -934,6 +987,18 @@ func (a *AppInstallService) GetParams(id uint) (*response.AppConfig, error) {
|
|||||||
config := getAppCommonConfig(envs)
|
config := getAppCommonConfig(envs)
|
||||||
config.DockerCompose = install.DockerCompose
|
config.DockerCompose = install.DockerCompose
|
||||||
res.Params = params
|
res.Params = params
|
||||||
|
res.AppKey = install.App.Key
|
||||||
|
res.Name = install.Name
|
||||||
|
res.HttpPort = install.HttpPort
|
||||||
|
res.SyncModelAccount = install.SyncModelAccount
|
||||||
|
res.ModelAccountBaseURLType = install.ModelAccountBaseURLType
|
||||||
|
res.ModelAccountBaseURL = install.ModelAccountBaseURL
|
||||||
|
if install.App.Key == "ollama" {
|
||||||
|
res.ModelAccountBaseURLType, res.ModelAccountBaseURL, err = loadOllamaModelAccountAddress(install)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
if config.ContainerName == "" {
|
if config.ContainerName == "" {
|
||||||
config.ContainerName = install.ContainerName
|
config.ContainerName = install.ContainerName
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/task"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (a AppService) InstallForMCP(req request.AppInstallCreate, executeScript bool) (*model.AppInstall, error) {
|
||||||
|
return a.installWithHooks(req, executeScript, &appInstallHooks{PrepareSiteDir: prepareMCPInstallSiteDirectory})
|
||||||
|
}
|
||||||
|
|
||||||
|
func prepareMCPInstallSiteDirectory(app model.App, detail model.AppDetail, req request.AppInstallCreate, _ *task.Task) error {
|
||||||
|
if !managesOpenrestySiteDirectory(app, detail) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
directory, _ := req.Params["WEBSITE_DIR"].(string)
|
||||||
|
return ensureCurrentWebsiteDirectory(directory)
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"os"
|
||||||
|
"path"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
func ensureCurrentWebsiteDirectory(directory string) error {
|
||||||
|
changed := errors.New("website directory changed; inspect the installation before retrying")
|
||||||
|
if directory == "" || global.DB == nil {
|
||||||
|
return changed
|
||||||
|
}
|
||||||
|
return global.DB.Transaction(func(tx *gorm.DB) error {
|
||||||
|
ctx := context.WithValue(tx.Statement.Context, constant.DB, tx)
|
||||||
|
setting, err := settingRepo.GetWithContext(ctx, settingRepo.WithByKey("WEBSITE_DIR"))
|
||||||
|
missing := errors.Is(err, gorm.ErrRecordNotFound)
|
||||||
|
if err != nil && !missing {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
current := setting.Value
|
||||||
|
if current == "" {
|
||||||
|
current = path.Join(global.Dir.BaseDir, "1panel", "www")
|
||||||
|
}
|
||||||
|
if directory != current {
|
||||||
|
return changed
|
||||||
|
}
|
||||||
|
if missing {
|
||||||
|
if err := settingRepo.CreateWithContext(ctx, &model.Setting{Key: "WEBSITE_DIR", Value: directory}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else if setting.Value == "" {
|
||||||
|
updated, err := settingRepo.UpdateIfMatch(ctx, setting.ID, "", directory)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if updated != 1 {
|
||||||
|
return changed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return os.MkdirAll(path.Join(directory, "conf.d"), constant.DirPerm)
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -60,6 +60,12 @@ type upgradeFileSnapshot struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type appUpgradeContext struct {
|
type appUpgradeContext struct {
|
||||||
|
openclawOriginal []byte
|
||||||
|
feishuOriginal []byte
|
||||||
|
feishuImage string
|
||||||
|
feishuOldImage string
|
||||||
|
feishuEnabled bool
|
||||||
|
feishuLockPath string
|
||||||
req request.AppInstallUpgrade
|
req request.AppInstallUpgrade
|
||||||
original model.AppInstall
|
original model.AppInstall
|
||||||
candidate model.AppInstall
|
candidate model.AppInstall
|
||||||
@@ -102,6 +108,19 @@ func upgradeInstall(req request.AppInstallUpgrade) error {
|
|||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
feishuLockPath := ""
|
||||||
|
if install.App.Key == constant.AppOpenclaw {
|
||||||
|
feishuLockPath = path.Join(install.GetPath(), "data/conf/openclaw.json")
|
||||||
|
if _, busy := feishuSwitches.LoadOrStore(feishuLockPath, true); busy {
|
||||||
|
return buserr.New("TaskIsExecuting")
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
if releaseLock {
|
||||||
|
feishuSwitches.Delete(feishuLockPath)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
detail, err := appDetailRepo.GetFirst(repo.WithByID(req.DetailID))
|
detail, err := appDetailRepo.GetFirst(repo.WithByID(req.DetailID))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -129,6 +148,7 @@ func upgradeInstall(req request.AppInstallUpgrade) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
ctx := &appUpgradeContext{
|
ctx := &appUpgradeContext{
|
||||||
|
feishuLockPath: feishuLockPath,
|
||||||
req: req,
|
req: req,
|
||||||
original: install,
|
original: install,
|
||||||
candidate: install,
|
candidate: install,
|
||||||
@@ -222,6 +242,10 @@ func (u *appUpgradeContext) prepare(t *task.Task) error {
|
|||||||
if err = copyUpgradeStageFile(u.original.GetPath(), u.stageDir, path.Join("data", "conf", "openclaw.json")); err != nil {
|
if err = copyUpgradeStageFile(u.original.GetPath(), u.stageDir, path.Join("data", "conf", "openclaw.json")); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
u.openclawOriginal, err = os.ReadFile(path.Join(u.stageDir, "data/conf/openclaw.json"))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if u.original.App.Key == constant.AppOpenresty {
|
if u.original.App.Key == constant.AppOpenresty {
|
||||||
for _, relativePath := range []string{
|
for _, relativePath := range []string{
|
||||||
@@ -330,6 +354,9 @@ func (u *appUpgradeContext) prepare(t *task.Task) error {
|
|||||||
if u.original.App.Resource == constant.AppResourceRemote {
|
if u.original.App.Resource == constant.AppResourceRemote {
|
||||||
go RequestDownloadCallBack(u.detail.DownloadCallBackUrl)
|
go RequestDownloadCallBack(u.detail.DownloadCallBackUrl)
|
||||||
}
|
}
|
||||||
|
if err = u.prepareFeishuUpgrade(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
u.phase = appUpgradePrepared
|
u.phase = appUpgradePrepared
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -387,6 +414,9 @@ func (u *appUpgradeContext) cutover(t *task.Task) error {
|
|||||||
}
|
}
|
||||||
t.LogSuccess(i18n.GetMsgByKey("UpgradeStop"))
|
t.LogSuccess(i18n.GetMsgByKey("UpgradeStop"))
|
||||||
u.phase = appUpgradeStopped
|
u.phase = appUpgradeStopped
|
||||||
|
if err := u.checkFeishuUpgradeSource(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
if u.original.App.Key == constant.AppOpenresty {
|
if u.original.App.Key == constant.AppOpenresty {
|
||||||
@@ -454,6 +484,9 @@ func (u *appUpgradeContext) cutover(t *task.Task) error {
|
|||||||
} else {
|
} else {
|
||||||
t.Log("WARNING: no containers found for the upgraded application")
|
t.Log("WARNING: no containers found for the upgraded application")
|
||||||
}
|
}
|
||||||
|
if err = u.verifyFeishuUpgrade(t); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
u.candidate.Status = constant.StatusRunning
|
u.candidate.Status = constant.StatusRunning
|
||||||
u.candidate.Message = ""
|
u.candidate.Message = ""
|
||||||
|
|
||||||
@@ -579,8 +612,34 @@ func (u *appUpgradeContext) rollback(t *task.Task) (rollbackErr error) {
|
|||||||
if out != "" {
|
if out != "" {
|
||||||
err = fmt.Errorf("%s: %w", out, err)
|
err = fmt.Errorf("%s: %w", out, err)
|
||||||
}
|
}
|
||||||
|
if u.feishuOriginal != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
rollbackErr = err
|
rollbackErr = err
|
||||||
}
|
}
|
||||||
|
if u.feishuOriginal != nil {
|
||||||
|
if u.backupFile == "" {
|
||||||
|
return buserr.New("ErrFeishuUpgradeBackup")
|
||||||
|
}
|
||||||
|
if err := u.restoreManagedFiles(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := handleAppRecover(&u.original, t, u.backupFile, true, "", "", false); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := pinFeishuRollbackImage(u.original.GetComposePath(), u.feishuOldImage); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
restoredCompose, err := os.ReadFile(u.original.GetComposePath())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
u.original.DockerCompose = string(restoredCompose)
|
||||||
|
if _, err := compose.UpWithoutBuild(u.original.GetComposePath()); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return u.finishRollback()
|
||||||
|
}
|
||||||
if u.backupFile != "" {
|
if u.backupFile != "" {
|
||||||
_ = u.restoreManagedFiles()
|
_ = u.restoreManagedFiles()
|
||||||
if err := handleAppRecover(&u.original, t, u.backupFile, true, "", ""); err != nil {
|
if err := handleAppRecover(&u.original, t, u.backupFile, true, "", ""); err != nil {
|
||||||
@@ -602,6 +661,11 @@ func (u *appUpgradeContext) rollback(t *task.Task) (rollbackErr error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *appUpgradeContext) finishRollback() error {
|
func (u *appUpgradeContext) finishRollback() error {
|
||||||
|
if u.feishuOriginal != nil {
|
||||||
|
if err := waitOpenclawReady(u.original.ContainerName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
restored := u.original
|
restored := u.original
|
||||||
if err := appInstallRepo.Save(context.Background(), &restored); err != nil {
|
if err := appInstallRepo.Save(context.Background(), &restored); err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -643,6 +707,12 @@ func (u *appUpgradeContext) deleteOldImages(t *task.Task) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *appUpgradeContext) cleanup() {
|
func (u *appUpgradeContext) cleanup() {
|
||||||
|
if u.feishuLockPath != "" {
|
||||||
|
feishuSwitches.Delete(u.feishuLockPath)
|
||||||
|
}
|
||||||
|
if u.feishuOriginal != nil && u.rollbackErr != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
if u.snapshot != nil {
|
if u.snapshot != nil {
|
||||||
u.snapshot.Cleanup()
|
u.snapshot.Cleanup()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,336 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/task"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/buserr"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/i18n"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/cmd"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/docker"
|
||||||
|
"gopkg.in/yaml.v3"
|
||||||
|
)
|
||||||
|
|
||||||
|
func classifyLegacyFeishu(conf map[string]interface{}, installPath string) (legacy, configured bool, err error) {
|
||||||
|
for _, field := range []string{"channels", "channels.feishu", "plugins", "plugins.entries", "plugins.entries.openclaw-lark", "plugins.entries.feishu"} {
|
||||||
|
parts := strings.Split(field, ".")
|
||||||
|
parent := conf
|
||||||
|
for _, part := range parts[:len(parts)-1] {
|
||||||
|
parent = childMap(parent, part)
|
||||||
|
}
|
||||||
|
if raw, exists := parent[parts[len(parts)-1]]; exists {
|
||||||
|
if _, ok := raw.(map[string]interface{}); !ok {
|
||||||
|
return false, false, feishuConfigError(field)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
plugins := childMap(conf, "plugins")
|
||||||
|
for _, key := range []string{"allow", "deny"} {
|
||||||
|
if raw, exists := plugins[key]; exists {
|
||||||
|
if _, ok := raw.([]string); ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
ids, ok := raw.([]interface{})
|
||||||
|
if !ok {
|
||||||
|
return false, false, feishuConfigError("plugins." + key)
|
||||||
|
}
|
||||||
|
for _, id := range ids {
|
||||||
|
if _, ok := id.(string); !ok {
|
||||||
|
return false, false, feishuConfigError("plugins." + key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, id := range []string{"openclaw-lark", "feishu"} {
|
||||||
|
if raw, exists := childMap(childMap(plugins, "entries"), id)["enabled"]; exists {
|
||||||
|
if _, ok := raw.(bool); !ok {
|
||||||
|
return false, false, feishuConfigError("plugins.entries." + id + ".enabled")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if usesBundledFeishu(conf) {
|
||||||
|
return false, false, nil
|
||||||
|
}
|
||||||
|
f := getChannelConfig(conf, "feishu")
|
||||||
|
configured = len(f) > 0
|
||||||
|
if raw, exists := conf["bindings"]; exists {
|
||||||
|
bindings, ok := raw.([]interface{})
|
||||||
|
if !ok {
|
||||||
|
return false, false, feishuConfigError("bindings")
|
||||||
|
}
|
||||||
|
for _, raw := range bindings {
|
||||||
|
binding, ok := raw.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return false, false, feishuConfigError("bindings")
|
||||||
|
}
|
||||||
|
if match, exists := binding["match"]; exists {
|
||||||
|
if _, ok := match.(map[string]interface{}); !ok {
|
||||||
|
return false, false, feishuConfigError("bindings.match")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if extractStringValue(childMap(binding, "match")["channel"]) == "feishu" {
|
||||||
|
configured = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
entries := childMap(childMap(conf, "plugins"), "entries")
|
||||||
|
entry, selected := entries["openclaw-lark"]
|
||||||
|
if selected {
|
||||||
|
old, ok := entry.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return false, configured, feishuConfigError("plugins.entries.openclaw-lark")
|
||||||
|
}
|
||||||
|
// A completed disable-only repair must not repeat on every upgrade.
|
||||||
|
if enabled, ok := old["enabled"].(bool); ok && !enabled && !configured {
|
||||||
|
return false, false, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
installed, err := checkPluginInstalled(installPath, "feishu")
|
||||||
|
if err != nil {
|
||||||
|
return false, configured, err
|
||||||
|
}
|
||||||
|
_, oldThread := f["threadSession"]
|
||||||
|
_, oldReply := f["replyMode"]
|
||||||
|
_, oldStreaming := f["streaming"].(bool)
|
||||||
|
return selected || installed || oldThread || oldReply || oldStreaming, configured, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func prepareLegacyFeishu(conf map[string]interface{}, configured bool, transition *dto.AgentFeishuTransition) error {
|
||||||
|
if !configured {
|
||||||
|
ensureChildMap(ensureChildMap(ensureChildMap(conf, "plugins"), "entries"), "openclaw-lark")["enabled"] = false
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if transition == nil || !transition.Confirmed {
|
||||||
|
return buserr.New("ErrFeishuUpgradeConfirm")
|
||||||
|
}
|
||||||
|
if !validFeishuTransition(transition.GroupSessionScope, transition.RequireMention) {
|
||||||
|
return feishuConfigError("feishuTransition")
|
||||||
|
}
|
||||||
|
return convertLegacyFeishu(conf, dto.AgentFeishuSwitchReq{Streaming: transition.Streaming, GroupSessionScope: transition.GroupSessionScope, RequireMention: transition.RequireMention})
|
||||||
|
}
|
||||||
|
|
||||||
|
func validFeishuTransition(scope, mention string) bool {
|
||||||
|
return (scope == "group" || scope == "group_sender" || scope == "group_topic" || scope == "group_topic_sender") && (mention == "true" || mention == "false")
|
||||||
|
}
|
||||||
|
|
||||||
|
func feishuRecoveryPayload(candidate []byte, configured bool) ([]byte, error) {
|
||||||
|
var conf map[string]interface{}
|
||||||
|
if err := json.Unmarshal(candidate, &conf); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if configured {
|
||||||
|
ensureChildMap(ensureChildMap(conf, "channels"), "feishu")["enabled"] = false
|
||||||
|
selectBundledFeishu(conf, false)
|
||||||
|
}
|
||||||
|
ensureChildMap(ensureChildMap(ensureChildMap(conf, "plugins"), "entries"), "openclaw-lark")["enabled"] = false
|
||||||
|
return json.MarshalIndent(conf, "", " ")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (u *appUpgradeContext) prepareFeishuUpgrade() error {
|
||||||
|
if u.original.App.Key != constant.AppOpenclaw || !isOpenclawBundledFeishuVersion(u.candidate.Version) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
source := filepath.Join(u.original.GetPath(), "data/conf/openclaw.json")
|
||||||
|
staged := filepath.Join(u.stageDir, "data/conf/openclaw.json")
|
||||||
|
// The staged copy predates protocol migration and is the exact cutover comparison source.
|
||||||
|
original := u.openclawOriginal
|
||||||
|
current, err := os.ReadFile(source)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !bytes.Equal(original, current) {
|
||||||
|
return buserr.New("ErrFeishuConfigChanged")
|
||||||
|
}
|
||||||
|
_, conf, err := readFeishuConfigBytes(staged)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
legacy, configured, err := classifyLegacyFeishu(conf, u.original.GetPath())
|
||||||
|
if err != nil || !legacy {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !u.req.Backup {
|
||||||
|
return buserr.New("ErrFeishuUpgradeBackup")
|
||||||
|
}
|
||||||
|
if err = prepareLegacyFeishu(conf, configured, u.req.FeishuTransition); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
project, err := docker.GetComposeProject(u.original.Name, u.original.GetPath(), []byte(u.candidate.DockerCompose), u.envContent, false)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if len(project.Services) != 1 {
|
||||||
|
return buserr.New("ErrFeishuUpgradeMounts")
|
||||||
|
}
|
||||||
|
for _, service := range project.Services {
|
||||||
|
if service.Build != nil {
|
||||||
|
return buserr.New("ErrFeishuImageRequired")
|
||||||
|
}
|
||||||
|
u.feishuImage, err = bundledFeishuImage(service.Image)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
configMounted := false
|
||||||
|
for _, v := range service.Volumes {
|
||||||
|
if v.Target == "/etc/localtime" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if v.Type != "bind" {
|
||||||
|
return buserr.New("ErrFeishuUpgradeMounts")
|
||||||
|
}
|
||||||
|
if err = feishuBackupPath(u.original.GetPath(), v.Source); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if v.Target == "/home/node/.openclaw" {
|
||||||
|
configMounted = filepath.Clean(v.Source) == filepath.Dir(source)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !configMounted {
|
||||||
|
return buserr.New("ErrFeishuUpgradeMounts")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
cli, err := docker.NewDockerClient()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer cli.Close()
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
info, err := cli.ContainerInspect(ctx, u.original.ContainerName)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
u.feishuOldImage = info.Image
|
||||||
|
for _, m := range info.Mounts {
|
||||||
|
if m.Destination == "/etc/localtime" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if string(m.Type) != "bind" {
|
||||||
|
return buserr.New("ErrFeishuUpgradeMounts")
|
||||||
|
}
|
||||||
|
if err = feishuBackupPath(u.original.GetPath(), m.Source); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Tar preserves symlinks: an external target would not be in the application backup.
|
||||||
|
if err = filepath.WalkDir(filepath.Join(u.original.GetPath(), "data"), func(file string, d os.DirEntry, walkErr error) error {
|
||||||
|
if walkErr != nil {
|
||||||
|
return walkErr
|
||||||
|
}
|
||||||
|
if d.Type()&os.ModeSymlink != 0 {
|
||||||
|
return feishuBackupPath(u.original.GetPath(), file)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
u.feishuOriginal = original
|
||||||
|
u.feishuEnabled = configured && extractBoolValue(getChannelConfig(conf, "feishu")["enabled"], true)
|
||||||
|
payload, err := json.MarshalIndent(conf, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
before, err := os.ReadFile(staged)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err = replaceFeishuConfig(staged, before, payload); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
targetCompose := filepath.Join(u.stageDir, "docker-compose.yml")
|
||||||
|
if err = pinFeishuRollbackImage(targetCompose, u.feishuImage); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
pinned, err := os.ReadFile(targetCompose)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
u.candidate.DockerCompose = string(pinned)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func feishuBackupPath(root, source string) error {
|
||||||
|
root, err := filepath.EvalSymlinks(root)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
resolved, err := filepath.EvalSymlinks(source)
|
||||||
|
if err != nil {
|
||||||
|
return buserr.New("ErrFeishuUpgradeMounts")
|
||||||
|
}
|
||||||
|
rel, err := filepath.Rel(root, resolved)
|
||||||
|
if err != nil || rel == ".." || strings.HasPrefix(rel, ".."+string(filepath.Separator)) {
|
||||||
|
return buserr.New("ErrFeishuUpgradeMounts")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (u *appUpgradeContext) checkFeishuUpgradeSource() error {
|
||||||
|
if u.feishuOriginal == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
current, err := os.ReadFile(filepath.Join(u.original.GetPath(), "data/conf/openclaw.json"))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !bytes.Equal(current, u.feishuOriginal) {
|
||||||
|
return buserr.New("ErrFeishuConfigChanged")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (u *appUpgradeContext) verifyFeishuUpgrade(t *task.Task) error {
|
||||||
|
if u.feishuOriginal == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if err := verifyFeishuActivation(u.candidate.ContainerName, u.feishuEnabled); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if u.feishuEnabled {
|
||||||
|
probeFeishuConnection(u.candidate.ContainerName, t)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func probeFeishuConnection(name string, t *task.Task) {
|
||||||
|
output, err := cmd.RunDockerExecWithStdout(30*time.Second, name, "openclaw", "channels", "status", "--channel", "feishu", "--probe", "--json")
|
||||||
|
if err != nil || !feishuProbeOK(output) {
|
||||||
|
t.Log(i18n.GetMsgByKey("AgentFeishuProbeWarning"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pin the restored service to the actual old image, even if its registry tag moved.
|
||||||
|
func pinFeishuRollbackImage(composeFile string, image string) error {
|
||||||
|
raw, err := os.ReadFile(composeFile)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var conf map[string]interface{}
|
||||||
|
if err = yaml.Unmarshal(raw, &conf); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
services := childMap(conf, "services")
|
||||||
|
if len(services) != 1 {
|
||||||
|
return buserr.New("ErrFeishuUpgradeMounts")
|
||||||
|
}
|
||||||
|
for _, raw := range services {
|
||||||
|
service, ok := raw.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return buserr.New("ErrFeishuUpgradeMounts")
|
||||||
|
}
|
||||||
|
service["image"] = image
|
||||||
|
}
|
||||||
|
payload, err := yaml.Marshal(conf)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return writeUpgradeFile(composeFile, payload, constant.FilePerm)
|
||||||
|
}
|
||||||
@@ -391,12 +391,27 @@ func deleteAppInstall(deleteReq request.AppInstallDelete) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if install.App.Key == "ollama" {
|
||||||
|
ollamaModelMu.Lock()
|
||||||
|
defer ollamaModelMu.Unlock()
|
||||||
|
}
|
||||||
tx, ctx := helper.GetTxAndContext()
|
tx, ctx := helper.GetTxAndContext()
|
||||||
defer tx.Rollback()
|
defer tx.Rollback()
|
||||||
if err = appInstallRepo.Delete(ctx, install); err != nil {
|
if err = appInstallRepo.Delete(ctx, install); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
appKey := install.App.Key
|
appKey := install.App.Key
|
||||||
|
if appKey == "ollama" {
|
||||||
|
remaining, listErr := appInstallRepo.ListBy(ctx, appInstallRepo.WithAppId(install.AppId))
|
||||||
|
if listErr != nil {
|
||||||
|
return listErr
|
||||||
|
}
|
||||||
|
if len(remaining) == 0 {
|
||||||
|
if err = aiRepo.DeleteAll(ctx); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
if isAgentAppKey(appKey) {
|
if isAgentAppKey(appKey) {
|
||||||
_ = agentRepo.DeleteByAppInstallIDWithCtx(ctx, install.ID)
|
_ = agentRepo.DeleteByAppInstallIDWithCtx(ctx, install.ID)
|
||||||
}
|
}
|
||||||
@@ -469,7 +484,12 @@ func deleteAppInstall(deleteReq request.AppInstallDelete) error {
|
|||||||
if err == nil && len(entries) == 0 {
|
if err == nil && len(entries) == 0 {
|
||||||
_ = op.DeleteDir(parentDir)
|
_ = op.DeleteDir(parentDir)
|
||||||
}
|
}
|
||||||
tx.Commit()
|
if err := tx.Commit().Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if install.App.Key == "ollama" || install.App.Key == "vllm" {
|
||||||
|
CleanupLocalModelAccount(install.ID)
|
||||||
|
}
|
||||||
|
|
||||||
existApps, _ := appInstallRepo.ListBy(context.Background(), appInstallRepo.WithAppId(install.AppId))
|
existApps, _ := appInstallRepo.ListBy(context.Background(), appInstallRepo.WithAppId(install.AppId))
|
||||||
if len(existApps) == 0 {
|
if len(existApps) == 0 {
|
||||||
@@ -2013,8 +2033,19 @@ func getAppTags(appID uint, lang string) ([]response.TagDTO, error) {
|
|||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func prepareAppInstallSiteDirectory(app model.App, appDetail model.AppDetail, req request.AppInstallCreate, t *task.Task, hooks *appInstallHooks) error {
|
||||||
|
if hooks != nil && hooks.PrepareSiteDir != nil {
|
||||||
|
return hooks.PrepareSiteDir(app, appDetail, req, t)
|
||||||
|
}
|
||||||
|
return handleSiteDir(app, appDetail, req, t)
|
||||||
|
}
|
||||||
|
|
||||||
|
func managesOpenrestySiteDirectory(app model.App, appDetail model.AppDetail) bool {
|
||||||
|
return app.Key == "openresty" && (app.Resource == "remote" || app.Resource == "custom") && common.CompareVersion(appDetail.Version, "1.27")
|
||||||
|
}
|
||||||
|
|
||||||
func handleSiteDir(app model.App, appDetail model.AppDetail, req request.AppInstallCreate, t *task.Task) error {
|
func handleSiteDir(app model.App, appDetail model.AppDetail, req request.AppInstallCreate, t *task.Task) error {
|
||||||
if app.Key == "openresty" && (app.Resource == "remote" || app.Resource == "custom") && common.CompareVersion(appDetail.Version, "1.27") {
|
if managesOpenrestySiteDirectory(app, appDetail) {
|
||||||
if dir, ok := req.Params["WEBSITE_DIR"]; ok {
|
if dir, ok := req.Params["WEBSITE_DIR"]; ok {
|
||||||
siteDir := dir.(string)
|
siteDir := dir.(string)
|
||||||
if siteDir == "" || !strings.HasPrefix(siteDir, "/") {
|
if siteDir == "" || !strings.HasPrefix(siteDir, "/") {
|
||||||
|
|||||||
@@ -197,7 +197,8 @@ func handleAppBackup(install *model.AppInstall, parentTask *task.Task, recordID
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverFile string, isRollback bool, secret, taskID string) error {
|
func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverFile string, isRollback bool, secret, taskID string, startAfterRecover ...bool) error {
|
||||||
|
startAfter := len(startAfterRecover) == 0 || startAfterRecover[0]
|
||||||
// Validate AI Gateway backups before stopping the app, creating rollback
|
// Validate AI Gateway backups before stopping the app, creating rollback
|
||||||
// backups, or touching its files/database. Keep the validated extraction for
|
// backups, or touching its files/database. Keep the validated extraction for
|
||||||
// the restore so uploaded/encrypted archives are not unpacked twice.
|
// the restore so uploaded/encrypted archives are not unpacked twice.
|
||||||
@@ -246,12 +247,15 @@ func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverF
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
|
defer os.RemoveAll(tmpPath)
|
||||||
|
if !startAfter {
|
||||||
|
return
|
||||||
|
}
|
||||||
if isRollback {
|
if isRollback {
|
||||||
_, _ = compose.UpWithoutBuild(install.GetComposePath())
|
_, _ = compose.UpWithoutBuild(install.GetComposePath())
|
||||||
} else {
|
} else {
|
||||||
_, _ = compose.Up(install.GetComposePath())
|
_, _ = compose.Up(install.GetComposePath())
|
||||||
}
|
}
|
||||||
_ = os.RemoveAll(tmpPath)
|
|
||||||
}()
|
}()
|
||||||
|
|
||||||
if !fileOp.Stat(tmpPath+"/app.json") || !fileOp.Stat(tmpPath+"/app.tar.gz") {
|
if !fileOp.Stat(tmpPath+"/app.json") || !fileOp.Stat(tmpPath+"/app.tar.gz") {
|
||||||
@@ -352,8 +356,12 @@ func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverF
|
|||||||
|
|
||||||
appDir := install.GetPath()
|
appDir := install.GetPath()
|
||||||
backPath := fmt.Sprintf("%s_bak", appDir)
|
backPath := fmt.Sprintf("%s_bak", appDir)
|
||||||
_ = fileOp.Rename(appDir, backPath)
|
if err := fileOp.Rename(appDir, backPath); err != nil && !startAfter {
|
||||||
_ = fileOp.CreateDir(appDir, constant.DirPerm)
|
return err
|
||||||
|
}
|
||||||
|
if err := fileOp.CreateDir(appDir, constant.DirPerm); err != nil && !startAfter {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
deCompressName := i18n.GetWithName("DeCompressFile", "app.tar.gz")
|
deCompressName := i18n.GetWithName("DeCompressFile", "app.tar.gz")
|
||||||
t.LogStart(deCompressName)
|
t.LogStart(deCompressName)
|
||||||
@@ -376,6 +384,10 @@ func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverF
|
|||||||
_, _ = file.WriteString(mergedEnvContent)
|
_, _ = file.WriteString(mergedEnvContent)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The upgrade transaction verifies readiness before saving its restored install.
|
||||||
|
if !startAfter {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
backupInstall.ID = install.ID
|
backupInstall.ID = install.ID
|
||||||
backupInstall.Status = constant.StatusRunning
|
backupInstall.Status = constant.StatusRunning
|
||||||
backupInstall.AppId = install.AppId
|
backupInstall.AppId = install.AppId
|
||||||
|
|||||||
@@ -261,7 +261,7 @@ func doWebsiteBackup(website *model.Website, parentTask *task.Task, backupDir, f
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
nginxConfFile := GetWebsiteConfigPath(*website)
|
nginxConfFile := GetWebsiteConfigPath(*website)
|
||||||
if err := fileOp.CopyFile(nginxConfFile, tmpDir); err != nil {
|
if err := exportWebsiteNginxConfig(*website, nginxConfFile, tmpDir); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
parentTask.Log(i18n.GetMsgByKey("BackupNginxConfig"))
|
parentTask.Log(i18n.GetMsgByKey("BackupNginxConfig"))
|
||||||
|
|||||||
@@ -58,10 +58,10 @@ type ContainerService struct{}
|
|||||||
var containerLogAnsiRegex = regexp.MustCompile("\x1b\\[[0-9;?]*[A-Za-z]|\x1b=|\x1b>")
|
var containerLogAnsiRegex = regexp.MustCompile("\x1b\\[[0-9;?]*[A-Za-z]|\x1b=|\x1b>")
|
||||||
|
|
||||||
type IContainerService interface {
|
type IContainerService interface {
|
||||||
Page(req dto.PageContainer) (int64, interface{}, error)
|
Page(ctx context.Context, req dto.PageContainer) (int64, interface{}, error)
|
||||||
List() []dto.ContainerOptions
|
List() []dto.ContainerOptions
|
||||||
ListByImage(imageName string) []dto.ContainerOptions
|
ListByImage(imageName string) []dto.ContainerOptions
|
||||||
LoadStatus() (dto.ContainerStatus, error)
|
LoadStatus(ctx context.Context, containersOnly bool) (dto.ContainerStatus, error)
|
||||||
PageNetwork(req dto.SearchWithPage) (int64, interface{}, error)
|
PageNetwork(req dto.SearchWithPage) (int64, interface{}, error)
|
||||||
ListNetwork() ([]dto.Options, error)
|
ListNetwork() ([]dto.Options, error)
|
||||||
PageVolume(req dto.SearchWithPage) (int64, interface{}, error)
|
PageVolume(req dto.SearchWithPage) (int64, interface{}, error)
|
||||||
@@ -80,7 +80,7 @@ type IContainerService interface {
|
|||||||
ContainerUpdate(req dto.ContainerOperate) error
|
ContainerUpdate(req dto.ContainerOperate) error
|
||||||
ContainerUpgrade(req dto.ContainerUpgrade) error
|
ContainerUpgrade(req dto.ContainerUpgrade) error
|
||||||
ContainerInfo(req dto.OperationWithName) (*dto.ContainerOperate, error)
|
ContainerInfo(req dto.OperationWithName) (*dto.ContainerOperate, error)
|
||||||
ContainerListStats() ([]dto.ContainerListStats, error)
|
ContainerListStats(ctx context.Context, ids []string) ([]dto.ContainerListStats, error)
|
||||||
ContainerItemStats(ctx context.Context, req dto.OperationWithName) (dto.ContainerItemStats, error)
|
ContainerItemStats(ctx context.Context, req dto.OperationWithName) (dto.ContainerItemStats, error)
|
||||||
LoadResourceLimit() (*dto.ResourceLimit, error)
|
LoadResourceLimit() (*dto.ResourceLimit, error)
|
||||||
ContainerRename(req dto.ContainerRename) error
|
ContainerRename(req dto.ContainerRename) error
|
||||||
@@ -112,7 +112,7 @@ func NewIContainerService() IContainerService {
|
|||||||
return &ContainerService{}
|
return &ContainerService{}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *ContainerService) Page(req dto.PageContainer) (int64, interface{}, error) {
|
func (u *ContainerService) Page(ctx context.Context, req dto.PageContainer) (int64, interface{}, error) {
|
||||||
client, err := docker.NewDockerClient()
|
client, err := docker.NewDockerClient()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, nil, err
|
return 0, nil, err
|
||||||
@@ -123,7 +123,7 @@ func (u *ContainerService) Page(req dto.PageContainer) (int64, interface{}, erro
|
|||||||
options.Filters = filters.NewArgs()
|
options.Filters = filters.NewArgs()
|
||||||
options.Filters.Add("label", req.Filters)
|
options.Filters.Add("label", req.Filters)
|
||||||
}
|
}
|
||||||
containers, err := client.ContainerList(context.Background(), options)
|
containers, err := client.ContainerList(ctx, options)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, nil, err
|
return 0, nil, err
|
||||||
}
|
}
|
||||||
@@ -206,27 +206,30 @@ func (u *ContainerService) ListByImage(imageName string) []dto.ContainerOptions
|
|||||||
return options
|
return options
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *ContainerService) LoadStatus() (dto.ContainerStatus, error) {
|
func (u *ContainerService) LoadStatus(ctx context.Context, containersOnly bool) (dto.ContainerStatus, error) {
|
||||||
var data dto.ContainerStatus
|
var data dto.ContainerStatus
|
||||||
client, err := docker.NewDockerClient()
|
client, err := docker.NewDockerClient()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return data, err
|
return data, err
|
||||||
}
|
}
|
||||||
defer client.Close()
|
defer client.Close()
|
||||||
c := context.Background()
|
if !containersOnly {
|
||||||
|
images, _ := client.ImageList(ctx, image.ListOptions{All: true})
|
||||||
images, _ := client.ImageList(c, image.ListOptions{All: true})
|
|
||||||
data.ImageCount = len(images)
|
data.ImageCount = len(images)
|
||||||
repo, _ := imageRepoRepo.List()
|
repo, _ := imageRepoRepo.List()
|
||||||
data.RepoCount = len(repo)
|
data.RepoCount = len(repo)
|
||||||
templates, _ := composeRepo.List()
|
templates, _ := composeRepo.List()
|
||||||
data.ComposeTemplateCount = len(templates)
|
data.ComposeTemplateCount = len(templates)
|
||||||
networks, _ := client.NetworkList(c, network.ListOptions{})
|
networks, _ := client.NetworkList(ctx, network.ListOptions{})
|
||||||
data.NetworkCount = len(networks)
|
data.NetworkCount = len(networks)
|
||||||
volumes, _ := client.VolumeList(c, volume.ListOptions{})
|
volumes, _ := client.VolumeList(ctx, volume.ListOptions{})
|
||||||
data.VolumeCount = len(volumes.Volumes)
|
data.VolumeCount = len(volumes.Volumes)
|
||||||
data.ComposeCount = loadComposeCount(client)
|
data.ComposeCount = loadComposeCount(client)
|
||||||
containers, _ := client.ContainerList(c, container.ListOptions{All: true})
|
}
|
||||||
|
containers, err := client.ContainerList(ctx, container.ListOptions{All: true})
|
||||||
|
if err != nil {
|
||||||
|
return data, err
|
||||||
|
}
|
||||||
data.ContainerCount = len(containers)
|
data.ContainerCount = len(containers)
|
||||||
for _, item := range containers {
|
for _, item := range containers {
|
||||||
switch item.State {
|
switch item.State {
|
||||||
@@ -292,25 +295,48 @@ func (u *ContainerService) ContainerItemStats(ctx context.Context, req dto.Opera
|
|||||||
}
|
}
|
||||||
return data, nil
|
return data, nil
|
||||||
}
|
}
|
||||||
func (u *ContainerService) ContainerListStats() ([]dto.ContainerListStats, error) {
|
func (u *ContainerService) ContainerListStats(ctx context.Context, ids []string) ([]dto.ContainerListStats, error) {
|
||||||
client, err := docker.NewDockerClient()
|
client, err := docker.NewDockerClient()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer client.Close()
|
defer client.Close()
|
||||||
list, err := client.ContainerList(context.Background(), container.ListOptions{All: true})
|
options := container.ListOptions{All: true}
|
||||||
|
if ids != nil {
|
||||||
|
if len(ids) == 0 {
|
||||||
|
return []dto.ContainerListStats{}, nil
|
||||||
|
}
|
||||||
|
options.Filters = filters.NewArgs()
|
||||||
|
for _, id := range ids {
|
||||||
|
options.Filters.Add("id", id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
list, err := client.ContainerList(ctx, options)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
datas := make([]dto.ContainerListStats, len(list))
|
datas := make([]dto.ContainerListStats, len(list))
|
||||||
|
jobs := make(chan int)
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
wg.Add(len(list))
|
for worker := 0; worker < min(8, len(list)); worker++ {
|
||||||
for i := 0; i < len(list); i++ {
|
wg.Add(1)
|
||||||
go func(index int, item container.Summary) {
|
go func() {
|
||||||
datas[index] = loadCpuAndMem(client, item.ID)
|
defer wg.Done()
|
||||||
wg.Done()
|
for index := range jobs {
|
||||||
}(i, list[i])
|
datas[index].ContainerID = list[index].ID
|
||||||
|
if ctx.Err() == nil && list[index].State == "running" {
|
||||||
|
datas[index] = loadCpuAndMem(ctx, client, list[index].ID)
|
||||||
}
|
}
|
||||||
|
if len(list[index].Names) > 0 {
|
||||||
|
datas[index].ContainerName = strings.TrimPrefix(list[index].Names[0], "/")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
for index := range list {
|
||||||
|
jobs <- index
|
||||||
|
}
|
||||||
|
close(jobs)
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
return datas, nil
|
return datas, nil
|
||||||
}
|
}
|
||||||
@@ -1634,6 +1660,10 @@ func calculateNetwork(network map[string]container.NetworkStats) (float64, float
|
|||||||
}
|
}
|
||||||
|
|
||||||
func checkImageExist(client *client.Client, imageItem string) bool {
|
func checkImageExist(client *client.Client, imageItem string) bool {
|
||||||
|
return checkImageExistContext(context.Background(), client, imageItem)
|
||||||
|
}
|
||||||
|
|
||||||
|
func checkImageExistContext(ctx context.Context, client *client.Client, imageItem string) bool {
|
||||||
if client == nil {
|
if client == nil {
|
||||||
var err error
|
var err error
|
||||||
client, err = docker.NewDockerClient()
|
client, err = docker.NewDockerClient()
|
||||||
@@ -1641,7 +1671,7 @@ func checkImageExist(client *client.Client, imageItem string) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
images, err := client.ImageList(context.Background(), image.ListOptions{})
|
images, err := client.ImageList(ctx, image.ListOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
@@ -1683,6 +1713,10 @@ func checkImageLike(client *client.Client, imageName string) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func pullImages(task *task.Task, client *client.Client, imageName string) error {
|
func pullImages(task *task.Task, client *client.Client, imageName string) error {
|
||||||
|
return pullImagesContext(context.Background(), task, client, imageName)
|
||||||
|
}
|
||||||
|
|
||||||
|
func pullImagesContext(ctx context.Context, task *task.Task, client *client.Client, imageName string) error {
|
||||||
dockerCli := docker.NewClientWithExist(client)
|
dockerCli := docker.NewClientWithExist(client)
|
||||||
repos, err := imageRepoRepo.List()
|
repos, err := imageRepoRepo.List()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -1690,7 +1724,7 @@ func pullImages(task *task.Task, client *client.Client, imageName string) error
|
|||||||
}
|
}
|
||||||
imageRepo := selectImageRepo(imageName, repos)
|
imageRepo := selectImageRepo(imageName, repos)
|
||||||
if imageRepo == nil || !imageRepo.Auth {
|
if imageRepo == nil || !imageRepo.Auth {
|
||||||
return dockerCli.PullImageWithProcess(task, imageName)
|
return dockerCli.PullImageWithProcessContext(ctx, task, imageName)
|
||||||
}
|
}
|
||||||
|
|
||||||
options := image.PullOptions{}
|
options := image.PullOptions{}
|
||||||
@@ -1703,7 +1737,7 @@ func pullImages(task *task.Task, client *client.Client, imageName string) error
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
options.RegistryAuth = base64.URLEncoding.EncodeToString(encodedJSON)
|
options.RegistryAuth = base64.URLEncoding.EncodeToString(encodedJSON)
|
||||||
return dockerCli.PullImageWithProcessAndOptions(task, imageName, options)
|
return dockerCli.PullImageWithProcessAndOptionsContext(ctx, task, imageName, options)
|
||||||
}
|
}
|
||||||
|
|
||||||
func selectImageRepo(imageName string, repos []model.ImageRepo) *model.ImageRepo {
|
func selectImageRepo(imageName string, repos []model.ImageRepo) *model.ImageRepo {
|
||||||
@@ -1722,11 +1756,13 @@ func selectImageRepo(imageName string, repos []model.ImageRepo) *model.ImageRepo
|
|||||||
return selected
|
return selected
|
||||||
}
|
}
|
||||||
|
|
||||||
func loadCpuAndMem(client *client.Client, containerItem string) dto.ContainerListStats {
|
func loadCpuAndMem(ctx context.Context, client *client.Client, containerItem string) dto.ContainerListStats {
|
||||||
|
ctx, cancel := context.WithTimeout(ctx, 3*time.Second)
|
||||||
|
defer cancel()
|
||||||
data := dto.ContainerListStats{
|
data := dto.ContainerListStats{
|
||||||
ContainerID: containerItem,
|
ContainerID: containerItem,
|
||||||
}
|
}
|
||||||
res, err := client.ContainerStats(context.Background(), containerItem, false)
|
res, err := client.ContainerStats(ctx, containerItem, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return data
|
return data
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -91,28 +91,29 @@ func (u *ContainerService) ContainerUpdate(req dto.ContainerOperate) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const containerUpgradeConcurrency = 2
|
||||||
|
|
||||||
|
// Shared by all upgrade requests handled by this agent.
|
||||||
|
var containerUpgradeSlots = make(chan struct{}, containerUpgradeConcurrency)
|
||||||
|
|
||||||
func (u *ContainerService) ContainerUpgrade(req dto.ContainerUpgrade) error {
|
func (u *ContainerService) ContainerUpgrade(req dto.ContainerUpgrade) error {
|
||||||
client, err := docker.NewDockerClient()
|
client, err := docker.NewDockerClient()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
ctx := context.Background()
|
|
||||||
taskItem, err := task.NewTaskWithOps(req.Image, task.TaskUpgrade, task.TaskScopeImage, req.TaskID, 1)
|
taskItem, err := task.NewTaskWithOps(req.Image, task.TaskUpgrade, task.TaskScopeImage, req.TaskID, 1)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
_ = client.Close()
|
_ = client.Close()
|
||||||
global.LOG.Errorf("new task for create container failed, err: %v", err)
|
global.LOG.Errorf("new task for create container failed, err: %v", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
go func() {
|
|
||||||
defer client.Close()
|
|
||||||
taskItem.AddSubTask(i18n.GetWithName("ContainerImagePull", req.Image), func(t *task.Task) error {
|
taskItem.AddSubTask(i18n.GetWithName("ContainerImagePull", req.Image), func(t *task.Task) error {
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), containerUpgradePullTimeout)
|
||||||
|
defer cancel()
|
||||||
taskItem.LogStart(i18n.GetWithName("ContainerImagePull", req.Image))
|
taskItem.LogStart(i18n.GetWithName("ContainerImagePull", req.Image))
|
||||||
if !checkImageExist(client, req.Image) || req.ForcePull {
|
if req.ForcePull || !checkImageExistContext(ctx, client, req.Image) {
|
||||||
if err := pullImages(taskItem, client, req.Image); err != nil {
|
if err := pullImagesContext(ctx, taskItem, client, req.Image); err != nil {
|
||||||
if !req.ForcePull {
|
return fmt.Errorf("pull image %s failed: %w", req.Image, err)
|
||||||
return err
|
|
||||||
}
|
|
||||||
return fmt.Errorf("pull image %s failed, err: %v", req.Image, err)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
@@ -123,7 +124,13 @@ func (u *ContainerService) ContainerUpgrade(req dto.ContainerUpgrade) error {
|
|||||||
taskItem.AddSubTaskWithIgnoreErr(i18n.GetWithName("ContainerUpgradeItem", item), func(t *task.Task) error {
|
taskItem.AddSubTaskWithIgnoreErr(i18n.GetWithName("ContainerUpgradeItem", item), func(t *task.Task) error {
|
||||||
t.Logf("----------------- %s -----------------", item)
|
t.Logf("----------------- %s -----------------", item)
|
||||||
t.LogStart(i18n.GetWithName("ContainerAcquireLock", item))
|
t.LogStart(i18n.GetWithName("ContainerAcquireLock", item))
|
||||||
unlock := containerOperationLock.lock(item)
|
ctx, cancel := context.WithTimeout(context.Background(), containerUpgradeReplaceTimeout)
|
||||||
|
defer cancel()
|
||||||
|
unlock, lockErr := containerOperationLock.lockContext(ctx, item)
|
||||||
|
if lockErr != nil {
|
||||||
|
upgradeErrors = append(upgradeErrors, fmt.Errorf("wait for container %s lock: %w", item, lockErr))
|
||||||
|
return lockErr
|
||||||
|
}
|
||||||
defer unlock()
|
defer unlock()
|
||||||
t.LogWithStatus(i18n.GetWithName("ContainerAcquireLock", item), nil)
|
t.LogWithStatus(i18n.GetWithName("ContainerAcquireLock", item), nil)
|
||||||
|
|
||||||
@@ -136,6 +143,10 @@ func (u *ContainerService) ContainerUpgrade(req dto.ContainerUpgrade) error {
|
|||||||
}
|
}
|
||||||
config := cloneContainerConfig(oldContainer.Config)
|
config := cloneContainerConfig(oldContainer.Config)
|
||||||
config.Image = req.Image
|
config.Image = req.Image
|
||||||
|
if config.Labels == nil {
|
||||||
|
config.Labels = make(map[string]string)
|
||||||
|
}
|
||||||
|
config.Labels[containerUpgradeOwnerLabel] = oldContainer.ID
|
||||||
hostConf := cloneContainerHostConfig(oldContainer.HostConfig)
|
hostConf := cloneContainerHostConfig(oldContainer.HostConfig)
|
||||||
preserveContainerVolumeMounts(hostConf, oldContainer.Mounts)
|
preserveContainerVolumeMounts(hostConf, oldContainer.Mounts)
|
||||||
networkConf, extraNetworks := buildContainerRecoverNetworkConfig(oldContainer.NetworkSettings, hostConf)
|
networkConf, extraNetworks := buildContainerRecoverNetworkConfig(oldContainer.NetworkSettings, hostConf)
|
||||||
@@ -144,9 +155,9 @@ func (u *ContainerService) ContainerUpgrade(req dto.ContainerUpgrade) error {
|
|||||||
upgradeErrors = append(upgradeErrors, upgradeErr)
|
upgradeErrors = append(upgradeErrors, upgradeErr)
|
||||||
return upgradeErr
|
return upgradeErr
|
||||||
}
|
}
|
||||||
cleanupErr, err := switchContainer(ctx, client, item, oldContainer, func() (container.CreateResponse, error) {
|
cleanupErr, err := switchContainerWithRecovery(ctx, client, item, oldContainer, func() (container.CreateResponse, error) {
|
||||||
return createContainerWithNetworks(ctx, client, config, hostConf, networkConf, extraNetworks, item)
|
return createContainerWithNetworks(ctx, client, config, hostConf, networkConf, extraNetworks, item)
|
||||||
}, config.Tty, t)
|
}, config.Tty, t, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
upgradeErr := fmt.Errorf("upgrade container %s failed: %w", item, err)
|
upgradeErr := fmt.Errorf("upgrade container %s failed: %w", item, err)
|
||||||
upgradeErrors = append(upgradeErrors, upgradeErr)
|
upgradeErrors = append(upgradeErrors, upgradeErr)
|
||||||
@@ -161,11 +172,14 @@ func (u *ContainerService) ContainerUpgrade(req dto.ContainerUpgrade) error {
|
|||||||
taskItem.AddSubTask(i18n.GetMsgByKey("ContainerUpgradeSummary"), func(t *task.Task) error {
|
taskItem.AddSubTask(i18n.GetMsgByKey("ContainerUpgradeSummary"), func(t *task.Task) error {
|
||||||
return errors.Join(upgradeErrors...)
|
return errors.Join(upgradeErrors...)
|
||||||
}, nil)
|
}, nil)
|
||||||
if err := taskItem.Execute(); err != nil {
|
// Stage contexts own the deadlines, including a separate recovery budget.
|
||||||
global.LOG.Error(err.Error())
|
for _, subTask := range taskItem.SubTasks {
|
||||||
|
subTask.Timeout = 0
|
||||||
|
}
|
||||||
|
if err := taskItem.ExecuteQueued(containerUpgradeSlots, "ContainerUpgradeWaiting", func() { _ = client.Close() }); err != nil {
|
||||||
|
_ = client.Close()
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
}()
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -192,11 +206,16 @@ type containerOperationMutex struct {
|
|||||||
var containerOperationLock containerOperationMutex
|
var containerOperationLock containerOperationMutex
|
||||||
|
|
||||||
type containerOperationLockEntry struct {
|
type containerOperationLockEntry struct {
|
||||||
mutex sync.Mutex
|
token chan struct{}
|
||||||
references int
|
references int
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *containerOperationMutex) lock(names ...string) func() {
|
func (l *containerOperationMutex) lock(names ...string) func() {
|
||||||
|
unlock, _ := l.lockContext(context.Background(), names...)
|
||||||
|
return unlock
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *containerOperationMutex) lockContext(ctx context.Context, names ...string) (func(), error) {
|
||||||
nameSet := make(map[string]struct{}, len(names))
|
nameSet := make(map[string]struct{}, len(names))
|
||||||
for _, name := range names {
|
for _, name := range names {
|
||||||
if name != "" {
|
if name != "" {
|
||||||
@@ -209,7 +228,7 @@ func (l *containerOperationMutex) lock(names ...string) func() {
|
|||||||
}
|
}
|
||||||
sort.Strings(orderedNames)
|
sort.Strings(orderedNames)
|
||||||
if len(orderedNames) == 0 {
|
if len(orderedNames) == 0 {
|
||||||
return func() {}
|
return func() {}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
l.mutex.Lock()
|
l.mutex.Lock()
|
||||||
@@ -220,7 +239,7 @@ func (l *containerOperationMutex) lock(names ...string) func() {
|
|||||||
for _, name := range orderedNames {
|
for _, name := range orderedNames {
|
||||||
entry := l.locks[name]
|
entry := l.locks[name]
|
||||||
if entry == nil {
|
if entry == nil {
|
||||||
entry = &containerOperationLockEntry{}
|
entry = &containerOperationLockEntry{token: make(chan struct{}, 1)}
|
||||||
l.locks[name] = entry
|
l.locks[name] = entry
|
||||||
}
|
}
|
||||||
entry.references++
|
entry.references++
|
||||||
@@ -228,12 +247,10 @@ func (l *containerOperationMutex) lock(names ...string) func() {
|
|||||||
}
|
}
|
||||||
l.mutex.Unlock()
|
l.mutex.Unlock()
|
||||||
|
|
||||||
for _, entry := range entries {
|
acquired := 0
|
||||||
entry.mutex.Lock()
|
release := func() {
|
||||||
}
|
for index := acquired - 1; index >= 0; index-- {
|
||||||
return func() {
|
<-entries[index].token
|
||||||
for index := len(entries) - 1; index >= 0; index-- {
|
|
||||||
entries[index].mutex.Unlock()
|
|
||||||
}
|
}
|
||||||
l.mutex.Lock()
|
l.mutex.Lock()
|
||||||
defer l.mutex.Unlock()
|
defer l.mutex.Unlock()
|
||||||
@@ -245,6 +262,20 @@ func (l *containerOperationMutex) lock(names ...string) func() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
for _, entry := range entries {
|
||||||
|
select {
|
||||||
|
case entry.token <- struct{}{}:
|
||||||
|
acquired++
|
||||||
|
case <-ctx.Done():
|
||||||
|
release()
|
||||||
|
return nil, ctx.Err()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := ctx.Err(); err != nil {
|
||||||
|
release()
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return release, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
type containerNetworkAttachment struct {
|
type containerNetworkAttachment struct {
|
||||||
@@ -272,6 +303,131 @@ func switchContainer(
|
|||||||
createNew func() (container.CreateResponse, error),
|
createNew func() (container.CreateResponse, error),
|
||||||
tty bool,
|
tty bool,
|
||||||
logger containerSwitchLogger,
|
logger containerSwitchLogger,
|
||||||
|
) (cleanupErr error, err error) {
|
||||||
|
return switchContainerWithRecovery(ctx, cli, name, oldContainer, createNew, tty, logger, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
const (
|
||||||
|
containerUpgradePullTimeout = 30 * time.Minute
|
||||||
|
containerUpgradeReplaceTimeout = 15 * time.Minute
|
||||||
|
containerUpgradeRecoveryTimeout = 5 * time.Minute
|
||||||
|
containerUpgradeOwnerLabel = "io.1panel.upgrade.original-id"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Reconcile against Docker's actual state: a failed request may already have
|
||||||
|
// changed names, created a container, or disconnected a network on the daemon.
|
||||||
|
func recoverContainerUpgrade(ctx context.Context, cli containerSwitchClient, name string, old container.InspectResponse, newID string, logger containerSwitchLogger) error {
|
||||||
|
original, err := cli.ContainerInspect(ctx, old.ID)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("inspect original %s: %w", old.ID, err)
|
||||||
|
}
|
||||||
|
if original.State == nil {
|
||||||
|
return fmt.Errorf("original container state unavailable")
|
||||||
|
}
|
||||||
|
|
||||||
|
replacement, inspectErr := cli.ContainerInspect(ctx, name)
|
||||||
|
if inspectErr != nil && !client.IsErrNotFound(inspectErr) {
|
||||||
|
return fmt.Errorf("inspect replacement by name: %w", inspectErr)
|
||||||
|
}
|
||||||
|
if inspectErr == nil && replacement.ID != old.ID {
|
||||||
|
if replacement.Config == nil || replacement.Config.Labels[containerUpgradeOwnerLabel] != old.ID {
|
||||||
|
return fmt.Errorf("container %s belongs to another operation; refusing to remove it", name)
|
||||||
|
}
|
||||||
|
if newID != "" && replacement.ID != newID {
|
||||||
|
return fmt.Errorf("replacement ID changed; refusing to remove it")
|
||||||
|
}
|
||||||
|
newID = replacement.ID
|
||||||
|
}
|
||||||
|
if newID != "" {
|
||||||
|
replacement, inspectErr = cli.ContainerInspect(ctx, newID)
|
||||||
|
if inspectErr != nil && !client.IsErrNotFound(inspectErr) {
|
||||||
|
return fmt.Errorf("inspect replacement %s: %w", newID, inspectErr)
|
||||||
|
}
|
||||||
|
if inspectErr == nil {
|
||||||
|
if replacement.ID == old.ID || replacement.Config == nil || replacement.Config.Labels[containerUpgradeOwnerLabel] != old.ID {
|
||||||
|
return fmt.Errorf("replacement identity could not be confirmed")
|
||||||
|
}
|
||||||
|
err = cli.ContainerRemove(ctx, newID, container.RemoveOptions{Force: true, RemoveVolumes: false})
|
||||||
|
logContainerSwitchStep(logger, "ContainerRollbackRemoveReplacement", name, err)
|
||||||
|
if err != nil && !client.IsErrNotFound(err) {
|
||||||
|
return fmt.Errorf("remove replacement: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if strings.TrimPrefix(original.Name, "/") != name {
|
||||||
|
err = cli.ContainerRename(ctx, old.ID, name)
|
||||||
|
logContainerSwitchStep(logger, "ContainerRollbackRenameOld", name, err)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("restore original name: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Reload after mutations; connect only networks which are actually missing.
|
||||||
|
original, err = cli.ContainerInspect(ctx, old.ID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
primary, extras := buildContainerRecoverNetworkConfig(old.NetworkSettings, old.HostConfig)
|
||||||
|
wanted := make(map[string]*network.EndpointSettings)
|
||||||
|
if primary != nil {
|
||||||
|
for n, endpoint := range primary.EndpointsConfig {
|
||||||
|
if n != "bridge" {
|
||||||
|
wanted[n] = endpoint
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for n, endpoint := range extras {
|
||||||
|
if n != "bridge" {
|
||||||
|
wanted[n] = endpoint
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var reconnectErr error
|
||||||
|
for n, endpoint := range wanted {
|
||||||
|
if original.NetworkSettings != nil && original.NetworkSettings.Networks[n] != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
err = cli.NetworkConnect(ctx, n, old.ID, endpoint)
|
||||||
|
logContainerSwitchStep(logger, "ContainerRollbackReconnectOld", n, err)
|
||||||
|
if err != nil {
|
||||||
|
reconnectErr = errors.Join(reconnectErr, fmt.Errorf("reconnect network %s: %w", n, err))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if reconnectErr != nil {
|
||||||
|
return reconnectErr
|
||||||
|
}
|
||||||
|
if old.State != nil && old.State.Running {
|
||||||
|
if original.State == nil {
|
||||||
|
return fmt.Errorf("original state unavailable after recovery")
|
||||||
|
}
|
||||||
|
if !original.State.Running {
|
||||||
|
err = restartOriginalContainer(ctx, cli, old.ID)
|
||||||
|
logContainerSwitchStep(logger, "ContainerRollbackRestartOld", name, err)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
verified, err := cli.ContainerInspect(ctx, old.ID)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("verify recovery: %w", err)
|
||||||
|
}
|
||||||
|
if strings.TrimPrefix(verified.Name, "/") != name {
|
||||||
|
return fmt.Errorf("original name was not restored")
|
||||||
|
}
|
||||||
|
if old.State != nil && old.State.Running && (verified.State == nil || !verified.State.Running) {
|
||||||
|
return fmt.Errorf("original container is not running after recovery")
|
||||||
|
}
|
||||||
|
for n := range wanted {
|
||||||
|
if verified.NetworkSettings == nil || verified.NetworkSettings.Networks[n] == nil {
|
||||||
|
return fmt.Errorf("network %s was not restored", n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func switchContainerWithRecovery(ctx context.Context, cli containerSwitchClient, name string,
|
||||||
|
oldContainer container.InspectResponse, createNew func() (container.CreateResponse, error),
|
||||||
|
tty bool, logger containerSwitchLogger, boundedRecovery bool,
|
||||||
) (cleanupErr error, err error) {
|
) (cleanupErr error, err error) {
|
||||||
if oldContainer.ID == "" {
|
if oldContainer.ID == "" {
|
||||||
return nil, fmt.Errorf("original container ID is empty")
|
return nil, fmt.Errorf("original container ID is empty")
|
||||||
@@ -281,9 +437,32 @@ func switchContainer(
|
|||||||
return nil, fmt.Errorf("cannot safely replace container %s with auto-remove enabled", name)
|
return nil, fmt.Errorf("cannot safely replace container %s with auto-remove enabled", name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
recoverUpgrade := func(newID string, cause error) error {
|
||||||
|
recoveryCtx, cancel := context.WithTimeout(context.Background(), containerUpgradeRecoveryTimeout)
|
||||||
|
defer cancel()
|
||||||
|
if newID != "" {
|
||||||
|
logContainerStartupLogs(recoveryCtx, cli, newID, name, tty, logger)
|
||||||
|
}
|
||||||
|
recoveryErr := recoverContainerUpgrade(recoveryCtx, cli, name, oldContainer, newID, logger)
|
||||||
|
if ctx.Err() != nil {
|
||||||
|
recoveryErr = errors.Join(recoveryErr, fmt.Errorf("Docker request timed out or was canceled; daemon-side completion cannot be confirmed: %w", ctx.Err()))
|
||||||
|
}
|
||||||
|
if recoveryErr != nil {
|
||||||
|
message := fmt.Sprintf("Recovery unconfirmed for container %s (original ID %s, backup %s): %v", name, oldContainer.ID, containerSwitchBackupName(oldContainer.ID), recoveryErr)
|
||||||
|
if logger != nil {
|
||||||
|
logger.Log(message)
|
||||||
|
}
|
||||||
|
return errors.Join(cause, errors.New(message))
|
||||||
|
}
|
||||||
|
return cause
|
||||||
|
}
|
||||||
|
|
||||||
if wasRunning {
|
if wasRunning {
|
||||||
if err := cli.ContainerStop(ctx, oldContainer.ID, container.StopOptions{}); err != nil {
|
if err := cli.ContainerStop(ctx, oldContainer.ID, container.StopOptions{}); err != nil {
|
||||||
logContainerSwitchStep(logger, "ContainerStopOld", name, err)
|
logContainerSwitchStep(logger, "ContainerStopOld", name, err)
|
||||||
|
if boundedRecovery {
|
||||||
|
return nil, recoverUpgrade("", fmt.Errorf("stop original container failed: %w", err))
|
||||||
|
}
|
||||||
current, inspectErr := cli.ContainerInspect(ctx, oldContainer.ID)
|
current, inspectErr := cli.ContainerInspect(ctx, oldContainer.ID)
|
||||||
if inspectErr == nil && current.State != nil && !current.State.Running {
|
if inspectErr == nil && current.State != nil && !current.State.Running {
|
||||||
restartErr := restartOriginalContainer(ctx, cli, oldContainer.ID)
|
restartErr := restartOriginalContainer(ctx, cli, oldContainer.ID)
|
||||||
@@ -298,6 +477,9 @@ func switchContainer(
|
|||||||
backupName := containerSwitchBackupName(oldContainer.ID)
|
backupName := containerSwitchBackupName(oldContainer.ID)
|
||||||
if err := cli.ContainerRename(ctx, oldContainer.ID, backupName); err != nil {
|
if err := cli.ContainerRename(ctx, oldContainer.ID, backupName); err != nil {
|
||||||
logContainerSwitchStep(logger, "ContainerRenameOld", name, err)
|
logContainerSwitchStep(logger, "ContainerRenameOld", name, err)
|
||||||
|
if boundedRecovery {
|
||||||
|
return nil, recoverUpgrade("", fmt.Errorf("rename original container failed: %w", err))
|
||||||
|
}
|
||||||
if wasRunning {
|
if wasRunning {
|
||||||
restartErr := restartOriginalContainer(ctx, cli, oldContainer.ID)
|
restartErr := restartOriginalContainer(ctx, cli, oldContainer.ID)
|
||||||
logContainerSwitchStep(logger, "ContainerRollbackRestartOld", name, restartErr)
|
logContainerSwitchStep(logger, "ContainerRollbackRestartOld", name, restartErr)
|
||||||
@@ -309,6 +491,9 @@ func switchContainer(
|
|||||||
disconnectedNetworks, disconnectErr := disconnectOriginalContainerNetworks(ctx, cli, oldContainer)
|
disconnectedNetworks, disconnectErr := disconnectOriginalContainerNetworks(ctx, cli, oldContainer)
|
||||||
logContainerSwitchStep(logger, "ContainerDisconnectOld", backupName, disconnectErr)
|
logContainerSwitchStep(logger, "ContainerDisconnectOld", backupName, disconnectErr)
|
||||||
if disconnectErr != nil {
|
if disconnectErr != nil {
|
||||||
|
if boundedRecovery {
|
||||||
|
return nil, recoverUpgrade("", disconnectErr)
|
||||||
|
}
|
||||||
rollbackErr := restoreOriginalContainer(ctx, cli, oldContainer.ID, name, wasRunning, "", disconnectedNetworks, logger)
|
rollbackErr := restoreOriginalContainer(ctx, cli, oldContainer.ID, name, wasRunning, "", disconnectedNetworks, logger)
|
||||||
return nil, errors.Join(disconnectErr, rollbackErr)
|
return nil, errors.Join(disconnectErr, rollbackErr)
|
||||||
}
|
}
|
||||||
@@ -316,11 +501,17 @@ func switchContainer(
|
|||||||
created, createErr := createNew()
|
created, createErr := createNew()
|
||||||
logContainerSwitchStep(logger, "ContainerCreateReplacement", name, createErr)
|
logContainerSwitchStep(logger, "ContainerCreateReplacement", name, createErr)
|
||||||
if createErr != nil {
|
if createErr != nil {
|
||||||
|
if boundedRecovery {
|
||||||
|
return nil, recoverUpgrade(created.ID, createErr)
|
||||||
|
}
|
||||||
rollbackErr := restoreOriginalContainer(ctx, cli, oldContainer.ID, name, wasRunning, created.ID, disconnectedNetworks, logger)
|
rollbackErr := restoreOriginalContainer(ctx, cli, oldContainer.ID, name, wasRunning, created.ID, disconnectedNetworks, logger)
|
||||||
return nil, errors.Join(createErr, rollbackErr)
|
return nil, errors.Join(createErr, rollbackErr)
|
||||||
}
|
}
|
||||||
if err := cli.ContainerStart(ctx, created.ID, container.StartOptions{}); err != nil {
|
if err := cli.ContainerStart(ctx, created.ID, container.StartOptions{}); err != nil {
|
||||||
logContainerSwitchStep(logger, "ContainerStartReplacement", name, err)
|
logContainerSwitchStep(logger, "ContainerStartReplacement", name, err)
|
||||||
|
if boundedRecovery {
|
||||||
|
return nil, recoverUpgrade(created.ID, fmt.Errorf("start new container failed: %w", err))
|
||||||
|
}
|
||||||
logContainerStartupLogs(ctx, cli, created.ID, name, tty, logger)
|
logContainerStartupLogs(ctx, cli, created.ID, name, tty, logger)
|
||||||
rollbackErr := restoreOriginalContainer(ctx, cli, oldContainer.ID, name, wasRunning, created.ID, disconnectedNetworks, logger)
|
rollbackErr := restoreOriginalContainer(ctx, cli, oldContainer.ID, name, wasRunning, created.ID, disconnectedNetworks, logger)
|
||||||
return nil, errors.Join(fmt.Errorf("start new container failed: %w", err), rollbackErr)
|
return nil, errors.Join(fmt.Errorf("start new container failed: %w", err), rollbackErr)
|
||||||
@@ -329,6 +520,9 @@ func switchContainer(
|
|||||||
if wasRunning {
|
if wasRunning {
|
||||||
if err := waitContainerReady(ctx, cli, created.ID); err != nil {
|
if err := waitContainerReady(ctx, cli, created.ID); err != nil {
|
||||||
logContainerSwitchStep(logger, "ContainerWaitReplacement", name, err)
|
logContainerSwitchStep(logger, "ContainerWaitReplacement", name, err)
|
||||||
|
if boundedRecovery {
|
||||||
|
return nil, recoverUpgrade(created.ID, fmt.Errorf("new container readiness check failed: %w", err))
|
||||||
|
}
|
||||||
logContainerStartupLogs(ctx, cli, created.ID, name, tty, logger)
|
logContainerStartupLogs(ctx, cli, created.ID, name, tty, logger)
|
||||||
rollbackErr := restoreOriginalContainer(ctx, cli, oldContainer.ID, name, wasRunning, created.ID, disconnectedNetworks, logger)
|
rollbackErr := restoreOriginalContainer(ctx, cli, oldContainer.ID, name, wasRunning, created.ID, disconnectedNetworks, logger)
|
||||||
return nil, errors.Join(fmt.Errorf("new container readiness check failed: %w", err), rollbackErr)
|
return nil, errors.Join(fmt.Errorf("new container readiness check failed: %w", err), rollbackErr)
|
||||||
@@ -336,6 +530,11 @@ func switchContainer(
|
|||||||
logContainerSwitchStep(logger, "ContainerWaitReplacement", name, nil)
|
logContainerSwitchStep(logger, "ContainerWaitReplacement", name, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if boundedRecovery {
|
||||||
|
cleanupCtx, cancel := context.WithTimeout(context.Background(), containerUpgradeRecoveryTimeout)
|
||||||
|
defer cancel()
|
||||||
|
ctx = cleanupCtx
|
||||||
|
}
|
||||||
cleanupErr = cli.ContainerRemove(ctx, oldContainer.ID, container.RemoveOptions{Force: true, RemoveVolumes: false})
|
cleanupErr = cli.ContainerRemove(ctx, oldContainer.ID, container.RemoveOptions{Force: true, RemoveVolumes: false})
|
||||||
logContainerSwitchStep(logger, "ContainerRemoveOld", backupName, cleanupErr)
|
logContainerSwitchStep(logger, "ContainerRemoveOld", backupName, cleanupErr)
|
||||||
return cleanupErr, nil
|
return cleanupErr, nil
|
||||||
|
|||||||
@@ -5,12 +5,14 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/repo"
|
"github.com/1Panel-dev/1Panel/agent/app/repo"
|
||||||
"github.com/1Panel-dev/1Panel/agent/buserr"
|
"github.com/1Panel-dev/1Panel/agent/buserr"
|
||||||
"github.com/1Panel-dev/1Panel/agent/constant"
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
"github.com/1Panel-dev/1Panel/agent/global"
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/cmd"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/encrypt"
|
"github.com/1Panel-dev/1Panel/agent/utils/encrypt"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/mysql"
|
"github.com/1Panel-dev/1Panel/agent/utils/mysql"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/mysql/client"
|
"github.com/1Panel-dev/1Panel/agent/utils/mysql/client"
|
||||||
@@ -126,6 +128,9 @@ func (u *DatabaseService) LoadItems(dbType string) ([]dto.DatabaseItem, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *DatabaseService) CheckDatabase(req dto.DatabaseCreate) bool {
|
func (u *DatabaseService) CheckDatabase(req dto.DatabaseCreate) bool {
|
||||||
|
if (req.Type == constant.AppMysql || req.Type == constant.AppMariaDB || req.Type == constant.AppPostgresql || req.Type == constant.AppMongodb) && (cmd.CheckIllegal(req.Username, req.Password) || strings.Contains(req.Password, " ")) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
if req.Timeout == 0 {
|
if req.Timeout == 0 {
|
||||||
req.Timeout = 30
|
req.Timeout = 30
|
||||||
}
|
}
|
||||||
@@ -180,6 +185,9 @@ func (u *DatabaseService) CheckDatabase(req dto.DatabaseCreate) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *DatabaseService) Create(req dto.DatabaseCreate) error {
|
func (u *DatabaseService) Create(req dto.DatabaseCreate) error {
|
||||||
|
if (req.Type == constant.AppMysql || req.Type == constant.AppMariaDB || req.Type == constant.AppPostgresql || req.Type == constant.AppMongodb) && (cmd.CheckIllegal(req.Username, req.Password) || strings.Contains(req.Password, " ")) {
|
||||||
|
return buserr.New("ErrCmdIllegal")
|
||||||
|
}
|
||||||
if req.Timeout == 0 {
|
if req.Timeout == 0 {
|
||||||
req.Timeout = 30
|
req.Timeout = 30
|
||||||
}
|
}
|
||||||
@@ -303,6 +311,9 @@ func (u *DatabaseService) Delete(req dto.DatabaseDelete) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *DatabaseService) Update(req dto.DatabaseUpdate) error {
|
func (u *DatabaseService) Update(req dto.DatabaseUpdate) error {
|
||||||
|
if (req.Type == constant.AppMysql || req.Type == constant.AppMariaDB || req.Type == constant.AppPostgresql || req.Type == constant.AppMongodb) && (cmd.CheckIllegal(req.Username, req.Password) || strings.Contains(req.Password, " ")) {
|
||||||
|
return buserr.New("ErrCmdIllegal")
|
||||||
|
}
|
||||||
switch req.Type {
|
switch req.Type {
|
||||||
case constant.AppPostgresql:
|
case constant.AppPostgresql:
|
||||||
if _, err := postgresql.NewPostgresqlClient(pgclient.DBInfo{
|
if _, err := postgresql.NewPostgresqlClient(pgclient.DBInfo{
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ func (u *MongodbService) UpdateDescription(req dto.UpdateDescription) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *MongodbService) Create(ctx context.Context, req dto.MongodbDBCreate) (*model.DatabaseMongodb, error) {
|
func (u *MongodbService) Create(ctx context.Context, req dto.MongodbDBCreate) (*model.DatabaseMongodb, error) {
|
||||||
if cmd.CheckIllegal(req.Name, req.Username, req.Password) {
|
if cmd.CheckIllegal(req.Name, req.Username, req.Password) || strings.Contains(req.Password, " ") {
|
||||||
return nil, buserr.New("ErrCmdIllegal")
|
return nil, buserr.New("ErrCmdIllegal")
|
||||||
}
|
}
|
||||||
if !isSupportedMongodbPrivilege(req.Permission) {
|
if !isSupportedMongodbPrivilege(req.Permission) {
|
||||||
@@ -146,7 +146,7 @@ func (u *MongodbService) LoadFromRemote(req dto.MongodbLoadDB) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *MongodbService) BindUser(req dto.MongodbBind) error {
|
func (u *MongodbService) BindUser(req dto.MongodbBind) error {
|
||||||
if cmd.CheckIllegal(req.Database, req.Name, req.Username, req.Password) {
|
if cmd.CheckIllegal(req.Database, req.Name, req.Username, req.Password) || strings.Contains(req.Password, " ") {
|
||||||
return buserr.New("ErrCmdIllegal")
|
return buserr.New("ErrCmdIllegal")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -168,7 +168,7 @@ func (u *MongodbService) BindUser(req dto.MongodbBind) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *MongodbService) ChangePassword(req dto.MongodbPassword) error {
|
func (u *MongodbService) ChangePassword(req dto.MongodbPassword) error {
|
||||||
if cmd.CheckIllegal(req.Database, req.Name, req.Password) {
|
if cmd.CheckIllegal(req.Database, req.Name, req.Password) || strings.Contains(req.Password, " ") {
|
||||||
return buserr.New("ErrCmdIllegal")
|
return buserr.New("ErrCmdIllegal")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -190,7 +190,7 @@ func (u *MongodbService) ChangePassword(req dto.MongodbPassword) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *MongodbService) ChangeRootPassword(req dto.ChangeDBInfo) error {
|
func (u *MongodbService) ChangeRootPassword(req dto.ChangeDBInfo) error {
|
||||||
if cmd.CheckIllegal(req.Value) {
|
if cmd.CheckIllegal(req.Value) || strings.Contains(req.Value, " ") {
|
||||||
return buserr.New("ErrCmdIllegal")
|
return buserr.New("ErrCmdIllegal")
|
||||||
}
|
}
|
||||||
if req.From != constant.AppResourceLocal {
|
if req.From != constant.AppResourceLocal {
|
||||||
|
|||||||
@@ -433,7 +433,46 @@ func (u *MysqlService) ListDBOption() ([]dto.MysqlOption, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *MysqlService) Create(ctx context.Context, req dto.MysqlDBCreate) (*model.DatabaseMysql, error) {
|
func (u *MysqlService) Create(ctx context.Context, req dto.MysqlDBCreate) (*model.DatabaseMysql, error) {
|
||||||
if cmd.CheckIllegal(req.Name, req.Username, req.Password, req.Format, req.Collation, req.Permission) {
|
creation, err := prepareMysqlCreation(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
req = creation.request
|
||||||
|
cli, version, err := LoadMysqlClientByFrom(req.Database)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer cli.Close()
|
||||||
|
if err := cli.Create(creation.createInfo(version)); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(req.Username) != 0 {
|
||||||
|
if err := saveDatabaseUserCredentials(creation.dbType, req.Database, req.Username, req.Permission, req.Password, req.Description); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
for _, host := range creation.permissionHosts {
|
||||||
|
if err := saveDatabaseUserGrant(creation.dbType, req.Database, req.Name, req.Username, host); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
global.LOG.Infof("create database %s successful!", req.Name)
|
||||||
|
if err := mysqlRepo.Create(ctx, &creation.item); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &creation.item, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type mysqlCreation struct {
|
||||||
|
request dto.MysqlDBCreate
|
||||||
|
dbType string
|
||||||
|
permissionHosts []string
|
||||||
|
item model.DatabaseMysql
|
||||||
|
}
|
||||||
|
|
||||||
|
func prepareMysqlCreation(req dto.MysqlDBCreate) (*mysqlCreation, error) {
|
||||||
|
if cmd.CheckIllegal(req.Name, req.Username, req.Password, req.Format, req.Collation, req.Permission) || strings.Contains(req.Password, " ") {
|
||||||
return nil, buserr.New("ErrCmdIllegal")
|
return nil, buserr.New("ErrCmdIllegal")
|
||||||
}
|
}
|
||||||
if len(req.Username) != 0 && len(req.Password) == 0 {
|
if len(req.Username) != 0 && len(req.Password) == 0 {
|
||||||
@@ -470,13 +509,13 @@ func (u *MysqlService) Create(ctx context.Context, req dto.MysqlDBCreate) (*mode
|
|||||||
return nil, errors.New("cannot set root as user name")
|
return nil, errors.New("cannot set root as user name")
|
||||||
}
|
}
|
||||||
|
|
||||||
cli, version, err := LoadMysqlClientByFrom(req.Database)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
createItem.MysqlName = req.Database
|
createItem.MysqlName = req.Database
|
||||||
defer cli.Close()
|
return &mysqlCreation{request: req, dbType: dbType, permissionHosts: permissionHosts, item: createItem}, nil
|
||||||
if err := cli.Create(client.CreateInfo{
|
}
|
||||||
|
|
||||||
|
func (creation *mysqlCreation) createInfo(version string) client.CreateInfo {
|
||||||
|
req := creation.request
|
||||||
|
return client.CreateInfo{
|
||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
Format: req.Format,
|
Format: req.Format,
|
||||||
Collation: req.Collation,
|
Collation: req.Collation,
|
||||||
@@ -485,25 +524,46 @@ func (u *MysqlService) Create(ctx context.Context, req dto.MysqlDBCreate) (*mode
|
|||||||
Permission: req.Permission,
|
Permission: req.Permission,
|
||||||
Version: version,
|
Version: version,
|
||||||
Timeout: 300,
|
Timeout: 300,
|
||||||
}); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if len(req.Username) != 0 {
|
|
||||||
if err := saveDatabaseUserCredentials(dbType, req.Database, req.Username, req.Permission, req.Password, req.Description); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
for _, host := range permissionHosts {
|
|
||||||
if err := saveDatabaseUserGrant(dbType, req.Database, req.Name, req.Username, host); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
global.LOG.Infof("create database %s successful!", req.Name)
|
func saveMysqlCreationMetadata(ctx context.Context, req dto.MysqlDBCreate, hosts []string, item *model.DatabaseMysql) error {
|
||||||
if err := mysqlRepo.Create(ctx, &createItem); err != nil {
|
return global.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||||
return nil, err
|
txCtx := context.WithValue(ctx, constant.DB, tx)
|
||||||
|
if req.Username != "" {
|
||||||
|
key := global.CONF.Base.EncryptKey
|
||||||
|
if key == "" {
|
||||||
|
setting, err := settingRepo.GetWithContext(txCtx, repo.WithByKey("EncryptKey"))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
return &createItem, nil
|
key = setting.Value
|
||||||
|
}
|
||||||
|
password, err := encrypt.StringEncryptWithKey(req.Password, key)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, host := range hosts {
|
||||||
|
user, err := databaseUserRepo.GetEncryptedWithContext(txCtx, repo.WithByType("mysql"), databaseUserRepo.WithByDatabase(req.Database), databaseUserRepo.WithByUser(req.Username, host))
|
||||||
|
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
user.Type, user.Database, user.Username, user.Host = "mysql", req.Database, req.Username, host
|
||||||
|
user.Password, user.IsDelete = password, false
|
||||||
|
if req.Description != "" {
|
||||||
|
user.Description = req.Description
|
||||||
|
}
|
||||||
|
if err := databaseUserRepo.SaveEncryptedWithContext(txCtx, &user); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
grant := model.DatabaseUserGrant{Type: "mysql", Database: req.Database, DBName: req.Name, Username: req.Username, Host: host}
|
||||||
|
if err := databaseUserGrantRepo.CreateIfAbsent(txCtx, &grant); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return mysqlRepo.CreateMetadata(txCtx, item)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *MysqlService) ListUsers(req dto.MysqlUserSearch) ([]dto.MysqlUser, error) {
|
func (u *MysqlService) ListUsers(req dto.MysqlUserSearch) ([]dto.MysqlUser, error) {
|
||||||
@@ -615,7 +675,7 @@ func (u *MysqlService) ListGrantSummary(req dto.MysqlGrantSummarySearch) (map[st
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *MysqlService) CreateUser(req dto.MysqlUserCreate) error {
|
func (u *MysqlService) CreateUser(req dto.MysqlUserCreate) error {
|
||||||
if cmd.CheckIllegal(req.Username, req.Password, req.Host) {
|
if cmd.CheckIllegal(req.Username, req.Password, req.Host) || strings.Contains(req.Password, " ") {
|
||||||
return buserr.New("ErrCmdIllegal")
|
return buserr.New("ErrCmdIllegal")
|
||||||
}
|
}
|
||||||
dbs := make([]string, 0, len(req.DBs))
|
dbs := make([]string, 0, len(req.DBs))
|
||||||
@@ -818,7 +878,7 @@ func (u *MysqlService) UpdateUser(req dto.MysqlUserUpdate) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *MysqlService) ChangeUserPassword(req dto.MysqlUserPassword) error {
|
func (u *MysqlService) ChangeUserPassword(req dto.MysqlUserPassword) error {
|
||||||
if cmd.CheckIllegal(req.Username, req.Host, req.Password) {
|
if cmd.CheckIllegal(req.Username, req.Host, req.Password) || strings.Contains(req.Password, " ") {
|
||||||
return buserr.New("ErrCmdIllegal")
|
return buserr.New("ErrCmdIllegal")
|
||||||
}
|
}
|
||||||
if err := checkMysqlNormalUser(req.Username); err != nil {
|
if err := checkMysqlNormalUser(req.Username); err != nil {
|
||||||
@@ -871,7 +931,7 @@ func (u *MysqlService) ChangeUserPassword(req dto.MysqlUserPassword) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *MysqlService) SaveUserPassword(req dto.MysqlUserPassword) error {
|
func (u *MysqlService) SaveUserPassword(req dto.MysqlUserPassword) error {
|
||||||
if cmd.CheckIllegal(req.Username, req.Host, req.Password) {
|
if cmd.CheckIllegal(req.Username, req.Host, req.Password) || strings.Contains(req.Password, " ") {
|
||||||
return buserr.New("ErrCmdIllegal")
|
return buserr.New("ErrCmdIllegal")
|
||||||
}
|
}
|
||||||
if err := checkMysqlNormalUser(req.Username); err != nil {
|
if err := checkMysqlNormalUser(req.Username); err != nil {
|
||||||
@@ -1237,7 +1297,7 @@ func isMysqlDatabaseResourceInUseError(err error) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *MysqlService) ChangePassword(req dto.ChangeDBInfo) error {
|
func (u *MysqlService) ChangePassword(req dto.ChangeDBInfo) error {
|
||||||
if cmd.CheckIllegal(req.Value) {
|
if cmd.CheckIllegal(req.Value) || strings.Contains(req.Value, " ") {
|
||||||
return buserr.New("ErrCmdIllegal")
|
return buserr.New("ErrCmdIllegal")
|
||||||
}
|
}
|
||||||
cli, version, err := LoadMysqlClientByFrom(req.Database)
|
cli, version, err := LoadMysqlClientByFrom(req.Database)
|
||||||
@@ -1398,7 +1458,14 @@ func (u *MysqlService) LoadStatus(req dto.OperationWithNameAndType) (*dto.MysqlS
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
statusMap, err := executeSqlForMaps(app.ContainerName, app.Key, app.Password, "show global status;")
|
return loadMysqlStatus(req, app, executeSqlForMaps, executeSqlForRows)
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadMysqlStatus(req dto.OperationWithNameAndType, app *repo.RootInfo,
|
||||||
|
maps func(string, string, string, string) (map[string]string, error),
|
||||||
|
rowsQuery func(string, string, string, string) ([]string, error),
|
||||||
|
) (*dto.MysqlStatus, error) {
|
||||||
|
statusMap, err := maps(app.ContainerName, app.Key, app.Password, "show global status;")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -1426,7 +1493,7 @@ func (u *MysqlService) LoadStatus(req dto.OperationWithNameAndType) (*dto.MysqlS
|
|||||||
if common.CompareAppVersion(app.Version, "8.4.0") && (req.Type == constant.AppMysql || req.Type == constant.AppMysqlCluster) {
|
if common.CompareAppVersion(app.Version, "8.4.0") && (req.Type == constant.AppMysql || req.Type == constant.AppMysqlCluster) {
|
||||||
masterStatus = "show binary log status;"
|
masterStatus = "show binary log status;"
|
||||||
}
|
}
|
||||||
rows, err := executeSqlForRows(app.ContainerName, app.Key, app.Password, masterStatus)
|
rows, err := rowsQuery(app.ContainerName, app.Key, app.Password, masterStatus)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -1531,6 +1598,34 @@ func updateMyCnf(oldFiles []string, group string, param string, value interface{
|
|||||||
}
|
}
|
||||||
|
|
||||||
func LoadMysqlClientByFrom(database string) (mysql.MysqlClient, string, error) {
|
func LoadMysqlClientByFrom(database string) (mysql.MysqlClient, string, error) {
|
||||||
|
databaseItem, err := databaseRepo.Get(repo.WithByName(database))
|
||||||
|
if err != nil {
|
||||||
|
return nil, "", err
|
||||||
|
}
|
||||||
|
return newMysqlClientForDatabase(databaseItem, database)
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadInstalledLocalMysqlClient(database string) (*client.Local, string, error) {
|
||||||
|
databaseItem, err := databaseRepo.Get(repo.WithByName(database))
|
||||||
|
if err != nil {
|
||||||
|
return nil, "", err
|
||||||
|
}
|
||||||
|
if databaseItem.ID == 0 || databaseItem.From != "local" || databaseItem.Type != "mysql" || databaseItem.AppInstallID == 0 {
|
||||||
|
return nil, "", errors.New("an installed local MySQL instance is required")
|
||||||
|
}
|
||||||
|
cli, version, err := newMysqlClientForDatabase(databaseItem, database)
|
||||||
|
if err != nil {
|
||||||
|
return nil, "", err
|
||||||
|
}
|
||||||
|
local, ok := cli.(*client.Local)
|
||||||
|
if !ok {
|
||||||
|
cli.Close()
|
||||||
|
return nil, "", errors.New("an installed local MySQL instance is required")
|
||||||
|
}
|
||||||
|
return local, version, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func newMysqlClientForDatabase(databaseItem model.Database, database string) (mysql.MysqlClient, string, error) {
|
||||||
var (
|
var (
|
||||||
dbInfo client.DBInfo
|
dbInfo client.DBInfo
|
||||||
version string
|
version string
|
||||||
@@ -1538,10 +1633,6 @@ func LoadMysqlClientByFrom(database string) (mysql.MysqlClient, string, error) {
|
|||||||
)
|
)
|
||||||
|
|
||||||
dbInfo.Timeout = 300
|
dbInfo.Timeout = 300
|
||||||
databaseItem, err := databaseRepo.Get(repo.WithByName(database))
|
|
||||||
if err != nil {
|
|
||||||
return nil, "", err
|
|
||||||
}
|
|
||||||
dbInfo.Type = databaseItem.Type
|
dbInfo.Type = databaseItem.Type
|
||||||
dbInfo.From = databaseItem.From
|
dbInfo.From = databaseItem.From
|
||||||
dbInfo.Database = database
|
dbInfo.Database = database
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/mcpapi"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (u *MysqlService) CreateForMCP(ctx context.Context, req dto.MysqlDBCreate) (*model.DatabaseMysql, error) {
|
||||||
|
if req.From != "local" || ctx.Err() != nil {
|
||||||
|
return nil, errors.New("invalid MCP database target or request")
|
||||||
|
}
|
||||||
|
writeContext, cancel := context.WithTimeout(context.WithoutCancel(ctx), 310*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
created, err := createMCPMysqlDatabase(writeContext, req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, mcpapi.SanitizeBusinessError(err, "database creation failed; inspect the invocation before retrying")
|
||||||
|
}
|
||||||
|
return created, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func createMCPMysqlDatabase(ctx context.Context, req dto.MysqlDBCreate) (*model.DatabaseMysql, error) {
|
||||||
|
creation, err := prepareMysqlCreation(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
local, version, err := loadInstalledLocalMysqlClient(creation.request.Database)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer local.Close()
|
||||||
|
deadline := time.Now().Add(300 * time.Second)
|
||||||
|
if writeDeadline, ok := ctx.Deadline(); ok && writeDeadline.Add(-10*time.Second).Before(deadline) {
|
||||||
|
deadline = writeDeadline.Add(-10 * time.Second)
|
||||||
|
}
|
||||||
|
sqlContext, cancel := context.WithDeadline(ctx, deadline)
|
||||||
|
err = local.CreateWithContext(sqlContext, creation.createInfo(version))
|
||||||
|
cancel()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := saveMysqlCreationMetadata(ctx, creation.request, creation.permissionHosts, &creation.item); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &creation.item, nil
|
||||||
|
}
|
||||||
@@ -87,7 +87,7 @@ func (u *PostgresqlService) ListDBOption() ([]dto.PostgresqlOption, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *PostgresqlService) BindUser(req dto.PostgresqlBindUser) error {
|
func (u *PostgresqlService) BindUser(req dto.PostgresqlBindUser) error {
|
||||||
if cmd.CheckIllegal(req.Name, req.Username, req.Password) {
|
if cmd.CheckIllegal(req.Name, req.Username, req.Password) || strings.Contains(req.Password, " ") {
|
||||||
return buserr.New("ErrCmdIllegal")
|
return buserr.New("ErrCmdIllegal")
|
||||||
}
|
}
|
||||||
dbItem, err := postgresqlRepo.Get(postgresqlRepo.WithByPostgresqlName(req.Database), repo.WithByName(req.Name))
|
dbItem, err := postgresqlRepo.Get(postgresqlRepo.WithByPostgresqlName(req.Database), repo.WithByName(req.Name))
|
||||||
@@ -123,7 +123,7 @@ func (u *PostgresqlService) BindUser(req dto.PostgresqlBindUser) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *PostgresqlService) Create(ctx context.Context, req dto.PostgresqlDBCreate) (*model.DatabasePostgresql, error) {
|
func (u *PostgresqlService) Create(ctx context.Context, req dto.PostgresqlDBCreate) (*model.DatabasePostgresql, error) {
|
||||||
if cmd.CheckIllegal(req.Name, req.Username, req.Password, req.Format) {
|
if cmd.CheckIllegal(req.Name, req.Username, req.Password, req.Format) || strings.Contains(req.Password, " ") {
|
||||||
return nil, buserr.New("ErrCmdIllegal")
|
return nil, buserr.New("ErrCmdIllegal")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -366,7 +366,7 @@ func (u *PostgresqlService) ChangePrivileges(req dto.PostgresqlPrivileges) error
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *PostgresqlService) ChangePassword(req dto.ChangeDBInfo) error {
|
func (u *PostgresqlService) ChangePassword(req dto.ChangeDBInfo) error {
|
||||||
if cmd.CheckIllegal(req.Value) {
|
if cmd.CheckIllegal(req.Value) || strings.Contains(req.Value, " ") {
|
||||||
return buserr.New("ErrCmdIllegal")
|
return buserr.New("ErrCmdIllegal")
|
||||||
}
|
}
|
||||||
cli, err := LoadPostgresqlClientByFrom(req.Database)
|
cli, err := LoadPostgresqlClientByFrom(req.Database)
|
||||||
|
|||||||
@@ -882,6 +882,16 @@ func (f *FileService) ChangeName(req request.FileRename) error {
|
|||||||
if hasInvalidFileName(req.NewName) {
|
if hasInvalidFileName(req.NewName) {
|
||||||
return buserr.New("ErrInvalidChar")
|
return buserr.New("ErrInvalidChar")
|
||||||
}
|
}
|
||||||
|
if req.OldName == req.NewName {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// os.Rename silently replaces an existing target on Linux, so reject the
|
||||||
|
// rename here to avoid losing the target file without confirmation.
|
||||||
|
if _, err := os.Lstat(req.NewName); err == nil {
|
||||||
|
return buserr.New("ErrFileIsExist")
|
||||||
|
} else if !os.IsNotExist(err) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
fo := files.NewFileOp()
|
fo := files.NewFileOp()
|
||||||
content, mode, shouldRecordHistory := readEditableFileHistoryContent(req.OldName)
|
content, mode, shouldRecordHistory := readEditableFileHistoryContent(req.OldName)
|
||||||
if err := fo.Rename(req.OldName, req.NewName); err != nil {
|
if err := fo.Rename(req.OldName, req.NewName); err != nil {
|
||||||
|
|||||||
@@ -0,0 +1,63 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/buserr"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestChangeNameRejectsExistingTarget(t *testing.T) {
|
||||||
|
dir := t.TempDir()
|
||||||
|
oldPath := filepath.Join(dir, "old.txt")
|
||||||
|
targetPath := filepath.Join(dir, "target.txt")
|
||||||
|
// Binary source content keeps this test independent of the file-history DB.
|
||||||
|
if err := os.WriteFile(oldPath, []byte("old\x00"), 0644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := os.WriteFile(targetPath, []byte("target"), 0644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
err := (&FileService{}).ChangeName(request.FileRename{OldName: oldPath, NewName: targetPath})
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("expected an error when the target name already exists")
|
||||||
|
}
|
||||||
|
var bizErr buserr.BusinessError
|
||||||
|
if !errors.As(err, &bizErr) || bizErr.Msg != "ErrFileIsExist" {
|
||||||
|
t.Fatalf("expected ErrFileIsExist, got %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
content, err := os.ReadFile(targetPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if string(content) != "target" {
|
||||||
|
t.Fatalf("target file was overwritten, content = %q", content)
|
||||||
|
}
|
||||||
|
if _, err := os.Stat(oldPath); err != nil {
|
||||||
|
t.Fatalf("source file should still exist after a rejected rename: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestChangeNameRenamesToNewName(t *testing.T) {
|
||||||
|
dir := t.TempDir()
|
||||||
|
oldPath := filepath.Join(dir, "old")
|
||||||
|
newPath := filepath.Join(dir, "new")
|
||||||
|
if err := os.Mkdir(oldPath, 0755); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := (&FileService{}).ChangeName(request.FileRename{OldName: oldPath, NewName: newPath}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := os.Stat(newPath); err != nil {
|
||||||
|
t.Fatalf("renamed path does not exist: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := os.Stat(oldPath); !os.IsNotExist(err) {
|
||||||
|
t.Fatalf("old path should be gone, stat err = %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
"unicode"
|
||||||
|
"unicode/utf8"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/mcpapi"
|
||||||
|
)
|
||||||
|
|
||||||
|
const mcpMysqlStoppedMessage = "The selected MySQL instance is not running. Start the database service and try the query again."
|
||||||
|
const mcpMysqlConnectionFailedMessage = "Cannot connect to the selected MySQL instance. Check the database service, connection settings and panel logs."
|
||||||
|
|
||||||
|
var errMCPMysqlStopped = mcpapi.NewBusinessError(mcpapi.CodeMySQLStopped, mcpMysqlStoppedMessage)
|
||||||
|
var errMCPMysqlConnectionFailed = mcpapi.NewBusinessError(mcpapi.CodeMySQLConnectionFailed, mcpMysqlConnectionFailedMessage)
|
||||||
|
|
||||||
|
var mcpMysqlStoppedPattern = regexp.MustCompile(`^Error response from daemon: [Cc]ontainer [A-Za-z0-9][A-Za-z0-9_.-]{0,127} is not running$`)
|
||||||
|
var mcpMysqlConnectionPatterns = []*regexp.Regexp{
|
||||||
|
regexp.MustCompile(`^ERROR 2002 \(HY000\): Can't connect to local MySQL server through socket '[^'\r\n]{1,1000}' \([0-9]{1,10}\)$`),
|
||||||
|
regexp.MustCompile(`^ERROR 2003 \(HY000\): Can't connect to MySQL server on '[^'\r\n]{1,1000}' \([0-9]{1,10}\)$`),
|
||||||
|
regexp.MustCompile(`^ERROR 1045 \(28000\): Access denied for user '[^'\r\n]{1,128}'@'[^'\r\n]{1,255}' \(using password: (YES|NO)\)$`),
|
||||||
|
}
|
||||||
|
|
||||||
|
func classifyMCPMysqlReadFailure(stderr string) error {
|
||||||
|
generic := errors.New("local MySQL status query failed")
|
||||||
|
if len(stderr) == 0 || len(stderr) > 2048 || !utf8.ValidString(stderr) {
|
||||||
|
return generic
|
||||||
|
}
|
||||||
|
warning := "mysql: [Warning] Using a password on the command line interface can be insecure."
|
||||||
|
stderr = strings.TrimPrefix(stderr, warning+"\n")
|
||||||
|
if strings.HasSuffix(stderr, "\r\n") {
|
||||||
|
stderr = strings.TrimSuffix(stderr, "\r\n")
|
||||||
|
} else {
|
||||||
|
stderr = strings.TrimSuffix(stderr, "\n")
|
||||||
|
}
|
||||||
|
if strings.IndexFunc(stderr, unicode.IsControl) >= 0 {
|
||||||
|
return generic
|
||||||
|
}
|
||||||
|
if mcpMysqlStoppedPattern.MatchString(stderr) {
|
||||||
|
return errMCPMysqlStopped
|
||||||
|
}
|
||||||
|
for _, pattern := range mcpMysqlConnectionPatterns {
|
||||||
|
if pattern.MatchString(stderr) {
|
||||||
|
return errMCPMysqlConnectionFailed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return generic
|
||||||
|
}
|
||||||
@@ -0,0 +1,189 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"io"
|
||||||
|
"os/exec"
|
||||||
|
"sort"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto/response"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/repo"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
const mcpMysqlQueryTimeout = 30 * time.Second
|
||||||
|
const mcpMysqlQueryOutputLimit = 1 << 20
|
||||||
|
|
||||||
|
func mcpLocalMysqlQuery(ctx context.Context) *gorm.DB {
|
||||||
|
return global.DB.WithContext(ctx).Table("databases AS d").
|
||||||
|
Joins("JOIN app_installs AS ai ON ai.id = d.app_install_id AND ai.name = d.name").
|
||||||
|
Joins("JOIN apps AS a ON a.id = ai.app_id").
|
||||||
|
Where("d.type = ? AND d.\"from\" = ? AND a.key = ?", constant.AppMysql, "local", constant.AppMysql).
|
||||||
|
Where("ai.status <> ? AND ai.container_name <> ?", constant.StatusDeleted, "")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (u *DatabaseService) ListForMCP(ctx context.Context, dbType string) ([]dto.DatabaseOption, error) {
|
||||||
|
if dbType != constant.AppMysql {
|
||||||
|
return nil, errors.New("only installed local MySQL instances are supported")
|
||||||
|
}
|
||||||
|
result := make([]dto.DatabaseOption, 0)
|
||||||
|
err := mcpLocalMysqlQuery(ctx).Select("d.id, d.type, d.\"from\", d.name AS database, ai.version").Order("d.id").Scan(&result).Error
|
||||||
|
if err != nil {
|
||||||
|
return nil, errors.New("cannot read local MySQL instances")
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type mcpMysqlReadRunner func(context.Context, string, string, string) (string, error)
|
||||||
|
|
||||||
|
func (u *MysqlService) LoadStatusForMCP(ctx context.Context, req dto.OperationWithNameAndType) (*dto.MysqlStatus, error) {
|
||||||
|
return u.loadStatusForMCP(ctx, req, runMCPMysqlRead)
|
||||||
|
}
|
||||||
|
func (u *MysqlService) loadStatusForMCP(ctx context.Context, req dto.OperationWithNameAndType, run mcpMysqlReadRunner) (*dto.MysqlStatus, error) {
|
||||||
|
if req.Type != constant.AppMysql || req.Name == "" || len(req.Name) > 128 || strings.TrimSpace(req.Name) != req.Name || strings.ContainsAny(req.Name, "\x00\r\n/\\") || ctx.Err() != nil {
|
||||||
|
return nil, errors.New("an explicitly named installed local MySQL instance is required")
|
||||||
|
}
|
||||||
|
ctx, cancel := context.WithTimeout(ctx, mcpMysqlQueryTimeout)
|
||||||
|
defer cancel()
|
||||||
|
var target struct {
|
||||||
|
ID uint
|
||||||
|
ContainerName, Version, Env string
|
||||||
|
}
|
||||||
|
if err := mcpLocalMysqlQuery(ctx).Where("d.name = ?", req.Name).Select("d.id, ai.container_name, ai.version, ai.env").Take(&target).Error; err != nil || target.ID == 0 {
|
||||||
|
return nil, errors.New("the installed local MySQL instance is unavailable")
|
||||||
|
}
|
||||||
|
var env map[string]any
|
||||||
|
if json.Unmarshal([]byte(target.Env), &env) != nil {
|
||||||
|
return nil, errors.New("local MySQL configuration is unavailable")
|
||||||
|
}
|
||||||
|
password, ok := env["PANEL_DB_ROOT_PASSWORD"].(string)
|
||||||
|
if !ok || password == "" {
|
||||||
|
return nil, errors.New("local MySQL configuration is unavailable")
|
||||||
|
}
|
||||||
|
app := &repo.RootInfo{ContainerName: target.ContainerName, Version: target.Version, Key: constant.AppMysql, Password: password}
|
||||||
|
rows := func(container, _, password, sql string) ([]string, error) {
|
||||||
|
if ctx.Err() != nil {
|
||||||
|
return nil, errors.New("local MySQL status query failed")
|
||||||
|
}
|
||||||
|
output, err := run(ctx, container, password, sql)
|
||||||
|
if err != nil {
|
||||||
|
if err == errMCPMysqlStopped || err == errMCPMysqlConnectionFailed {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return nil, errors.New("local MySQL status query failed")
|
||||||
|
}
|
||||||
|
return strings.Split(output, "\n"), nil
|
||||||
|
}
|
||||||
|
maps := func(container, dbType, password, sql string) (map[string]string, error) {
|
||||||
|
lines, err := rows(container, dbType, password, sql)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
values := map[string]string{}
|
||||||
|
for _, line := range lines {
|
||||||
|
if pair := strings.Split(line, "\t"); len(pair) == 2 {
|
||||||
|
values[pair[0]] = pair[1]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return values, nil
|
||||||
|
}
|
||||||
|
return loadMysqlStatus(req, app, maps, rows)
|
||||||
|
}
|
||||||
|
|
||||||
|
type mcpQueryOutput struct {
|
||||||
|
buffer bytes.Buffer
|
||||||
|
mu sync.Mutex
|
||||||
|
exceeded bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *mcpQueryOutput) Write(data []byte) (int, error) {
|
||||||
|
b.mu.Lock()
|
||||||
|
defer b.mu.Unlock()
|
||||||
|
if len(data) > mcpMysqlQueryOutputLimit-b.buffer.Len() {
|
||||||
|
b.exceeded = true
|
||||||
|
return 0, errors.New("query output limit exceeded")
|
||||||
|
}
|
||||||
|
return b.buffer.Write(data)
|
||||||
|
}
|
||||||
|
func (b *mcpQueryOutput) Len() int {
|
||||||
|
b.mu.Lock()
|
||||||
|
defer b.mu.Unlock()
|
||||||
|
return b.buffer.Len()
|
||||||
|
}
|
||||||
|
func (b *mcpQueryOutput) String() string {
|
||||||
|
b.mu.Lock()
|
||||||
|
defer b.mu.Unlock()
|
||||||
|
return b.buffer.String()
|
||||||
|
}
|
||||||
|
func runMCPMysqlRead(ctx context.Context, container, password, sql string) (string, error) {
|
||||||
|
switch sql {
|
||||||
|
case "show global status;", "show master status;", "show binary log status;":
|
||||||
|
default:
|
||||||
|
return "", errors.New("unsupported MySQL monitoring query")
|
||||||
|
}
|
||||||
|
command := exec.CommandContext(ctx, "docker", "exec", container, "mysql", "-uroot", "-p"+password, "-e", sql)
|
||||||
|
output := &mcpQueryOutput{}
|
||||||
|
var stderr bytes.Buffer
|
||||||
|
command.Stdout, command.Stderr = output, io.MultiWriter(output, &stderr)
|
||||||
|
runErr := command.Run()
|
||||||
|
if ctx.Err() != nil || output.exceeded {
|
||||||
|
return "", errors.New("local MySQL status query failed")
|
||||||
|
}
|
||||||
|
if runErr != nil {
|
||||||
|
return "", classifyMCPMysqlReadFailure(stderr.String())
|
||||||
|
}
|
||||||
|
value := strings.ReplaceAll(output.String(), "mysql: [Warning] Using a password on the command line interface can be insecure.\n", "")
|
||||||
|
if strings.HasPrefix(value, "ERROR ") {
|
||||||
|
return "", errors.New("local MySQL status query failed")
|
||||||
|
}
|
||||||
|
return value, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *AppInstallService) GetAppInstallInfoForMCP(ctx context.Context, id uint) (*response.AppInstallInfo, error) {
|
||||||
|
var installed model.AppInstall
|
||||||
|
if id == 0 {
|
||||||
|
return nil, errors.New("invalid installed application")
|
||||||
|
}
|
||||||
|
err := global.DB.WithContext(ctx).Preload("App").Where("id = ?", id).First(&installed).Error
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return &response.AppInstallInfo{Status: constant.StatusDeleted}, nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, errors.New("installed application metadata is unavailable")
|
||||||
|
}
|
||||||
|
var env map[string]any
|
||||||
|
if json.Unmarshal([]byte(installed.Env), &env) != nil {
|
||||||
|
return nil, errors.New("installed application metadata is unavailable")
|
||||||
|
}
|
||||||
|
result := &response.AppInstallInfo{ID: installed.ID, Name: installed.Name, Version: installed.Version, Status: installed.Status, HttpPort: installed.HttpPort, AppKey: installed.App.Key, AppPorts: []int{}}
|
||||||
|
for key, value := range env {
|
||||||
|
if !strings.Contains(strings.ToUpper(key), "PANEL_APP_PORT") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
var port int
|
||||||
|
switch item := value.(type) {
|
||||||
|
case string:
|
||||||
|
port, _ = strconv.Atoi(item)
|
||||||
|
case float64:
|
||||||
|
if item == float64(int(item)) {
|
||||||
|
port = int(item)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if port > 0 && port <= 65535 {
|
||||||
|
result.AppPorts = append(result.AppPorts, port)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sort.Ints(result.AppPorts)
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/taskscope"
|
||||||
|
)
|
||||||
|
|
||||||
|
func ConfigurePanelMCPTasks() error {
|
||||||
|
return taskscope.Configure(taskscope.Rule{Scope: constant.TaskScopePanelMCP, Restricted: true, ExternalExecutor: true})
|
||||||
|
}
|
||||||
@@ -0,0 +1,821 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/sha256"
|
||||||
|
"crypto/tls"
|
||||||
|
"crypto/x509"
|
||||||
|
"encoding/hex"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"net/url"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"slices"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto/response"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/repo"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/docker"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/nginx"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/nginx/parser"
|
||||||
|
"github.com/docker/docker/api/types/container"
|
||||||
|
"github.com/google/uuid"
|
||||||
|
"golang.org/x/net/idna"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
mcpWebsitePrivateDir = ".1panel-mcp"
|
||||||
|
mcpWebsiteProxyName = "proxy.conf"
|
||||||
|
mcpWebsiteOwnerName = "binding.json"
|
||||||
|
)
|
||||||
|
|
||||||
|
var mcpWebsiteMutation sync.Mutex
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
configureWebsiteManagedConfig(websiteManagedConfigPolicy{
|
||||||
|
protectedDirectories: func() []string {
|
||||||
|
return []string{filepath.Join(GetWebSiteRootDir(), mcpWebsitePrivateDir)}
|
||||||
|
},
|
||||||
|
backupIncludes: mcpWebsiteBackupIncludes,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
type MCPWebsiteBindingService struct {
|
||||||
|
createWebsite func(request.WebsiteCreate) error
|
||||||
|
updateHTTPS func(context.Context, request.WebsiteHTTPSOp) error
|
||||||
|
applyInclude func(model.Website) error
|
||||||
|
removeInclude func(model.Website) error
|
||||||
|
checkReload func() error
|
||||||
|
openresty func() (model.AppInstall, error)
|
||||||
|
now func() time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewMCPWebsiteBindingService() *MCPWebsiteBindingService {
|
||||||
|
s := &MCPWebsiteBindingService{
|
||||||
|
createWebsite: func(req request.WebsiteCreate) error { return NewIWebsiteService().CreateWebsite(req) },
|
||||||
|
updateHTTPS: func(ctx context.Context, req request.WebsiteHTTPSOp) error {
|
||||||
|
if req.Enable {
|
||||||
|
current, err := NewIWebsiteService().GetWebsiteHTTPS(req.WebsiteID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defaults := newWebsiteCreateHTTPSOp(req.WebsiteSSLID)
|
||||||
|
if current.Enable {
|
||||||
|
req.SSLProtocol, req.Algorithm = current.SSLProtocol, current.Algorithm
|
||||||
|
req.Hsts, req.HstsIncludeSubDomains, req.Http3 = current.Hsts, current.HstsIncludeSubDomains, current.Http3
|
||||||
|
req.HttpConfig = current.HttpConfig
|
||||||
|
} else {
|
||||||
|
defaults.WebsiteID = req.WebsiteID
|
||||||
|
req = defaults
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_, err := NewIWebsiteService().OpWebsiteHTTPS(ctx, req)
|
||||||
|
return err
|
||||||
|
},
|
||||||
|
checkReload: func() error {
|
||||||
|
installed, err := getAppInstallByKey(constant.AppOpenresty)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if installed.Status != constant.StatusRunning {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if err = opNginx(installed.ContainerName, constant.NginxCheck); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return opNginx(installed.ContainerName, constant.NginxReload)
|
||||||
|
},
|
||||||
|
openresty: mcpWebsiteOpenresty,
|
||||||
|
now: time.Now,
|
||||||
|
}
|
||||||
|
s.applyInclude = func(site model.Website) error { return s.setInclude(site, true) }
|
||||||
|
s.removeInclude = func(site model.Website) error { return s.setInclude(site, false) }
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteOpenresty() (model.AppInstall, error) {
|
||||||
|
installed, err := getAppInstallByKey(constant.AppOpenresty)
|
||||||
|
if err != nil || installed.ID == 0 || installed.Status != constant.StatusRunning {
|
||||||
|
return installed, err
|
||||||
|
}
|
||||||
|
client, err := docker.NewDockerClient()
|
||||||
|
if err != nil {
|
||||||
|
return model.AppInstall{}, errors.New("OpenResty mount is unavailable")
|
||||||
|
}
|
||||||
|
defer client.Close()
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
inspected, err := client.ContainerInspect(ctx, installed.ContainerName)
|
||||||
|
if err != nil || !mcpWebsiteHasWWWMount(inspected.Mounts, GetWebSiteRootDir()) {
|
||||||
|
return model.AppInstall{}, errors.New("OpenResty mount is unavailable")
|
||||||
|
}
|
||||||
|
return installed, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteHasWWWMount(mounts []container.MountPoint, root string) bool {
|
||||||
|
resolvedRoot, err := filepath.EvalSymlinks(root)
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, mount := range mounts {
|
||||||
|
if filepath.Clean(mount.Destination) != "/www" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
resolvedSource, sourceErr := filepath.EvalSymlinks(mount.Source)
|
||||||
|
if sourceErr == nil && resolvedSource == resolvedRoot {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
type mcpWebsiteOwner struct {
|
||||||
|
BindingID string `json:"bindingId"`
|
||||||
|
WebsiteID uint `json:"websiteId"`
|
||||||
|
KeyHash string `json:"keyHash"`
|
||||||
|
BindHash string `json:"bindHash"`
|
||||||
|
ProxyHash string `json:"proxyHash"`
|
||||||
|
RequestID string `json:"requestId"`
|
||||||
|
RequestHash string `json:"requestHash"`
|
||||||
|
Operation string `json:"operation"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteHash(value string) string {
|
||||||
|
digest := sha256.Sum256([]byte(value))
|
||||||
|
return hex.EncodeToString(digest[:])
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteAlias(bindingID string) string { return "panel-mcp-" + bindingID }
|
||||||
|
func mcpWebsitePrivatePath(site model.Website, name string) string {
|
||||||
|
return filepath.Join(GetWebSiteRootDir(), mcpWebsitePrivateDir, strings.TrimPrefix(site.Alias, "panel-mcp-"), name)
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteInclude(site model.Website) string {
|
||||||
|
return "/www/" + mcpWebsitePrivateDir + "/" + strings.TrimPrefix(site.Alias, "panel-mcp-") + "/" + mcpWebsiteProxyName
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteBackupIncludes(site model.Website) []string {
|
||||||
|
bindingID := strings.TrimPrefix(site.Alias, "panel-mcp-")
|
||||||
|
if site.Alias != mcpWebsiteAlias(bindingID) || !validMCPWebsiteID(bindingID) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return []string{mcpWebsiteInclude(site)}
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsitePrivateDirectory(site model.Website, create bool) error {
|
||||||
|
for _, directory := range []string{filepath.Join(GetWebSiteRootDir(), mcpWebsitePrivateDir), filepath.Dir(mcpWebsitePrivatePath(site, mcpWebsiteProxyName))} {
|
||||||
|
info, err := os.Lstat(directory)
|
||||||
|
if os.IsNotExist(err) && create {
|
||||||
|
if err = os.Mkdir(directory, 0700); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
info, err = os.Lstat(directory)
|
||||||
|
}
|
||||||
|
if err != nil || !info.IsDir() || info.Mode()&os.ModeSymlink != 0 || info.Mode().Perm() != 0700 {
|
||||||
|
return errors.New("invalid MCP website private directory")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *MCPWebsiteBindingService) setInclude(site model.Website, enabled bool) error {
|
||||||
|
configPath := GetSitePath(site, SiteConf)
|
||||||
|
old, err := os.ReadFile(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
config, err := parser.NewStringParser(string(old)).Parse()
|
||||||
|
if err != nil || len(config.FindServers()) == 0 {
|
||||||
|
return errors.New("invalid website configuration")
|
||||||
|
}
|
||||||
|
server := config.FindServers()[0]
|
||||||
|
include := mcpWebsiteInclude(site)
|
||||||
|
for _, directive := range server.FindDirectives("include") {
|
||||||
|
parameters := directive.GetParameters()
|
||||||
|
if len(parameters) == 1 && strings.Trim(parameters[0], "\"'") == include {
|
||||||
|
server.RemoveDirective("include", parameters)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if enabled {
|
||||||
|
server.UpdateDirective("include", []string{include})
|
||||||
|
}
|
||||||
|
updated := []byte(nginx.DumpConfig(config, nginx.IndentedStyle))
|
||||||
|
if string(updated) == string(old) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if err = mcpWebsiteAtomicWrite(configPath, updated); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err = s.checkReload(); err != nil {
|
||||||
|
_ = mcpWebsiteAtomicWrite(configPath, old)
|
||||||
|
_ = s.checkReload()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteRemark(req request.MCPWebsiteBinding) string {
|
||||||
|
return "1Panel MCP " + req.BindingID + " " + mcpWebsiteHash(req.ProxyKey)
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteFailure(reason string, definitive, conflict bool) response.MCPWebsiteBinding {
|
||||||
|
code, message := "MCP_WEBSITE_UNAVAILABLE", "MCP website operation is unavailable"
|
||||||
|
if definitive {
|
||||||
|
code, message = "MCP_WEBSITE_INVALID_ARGUMENTS", "Invalid MCP website configuration"
|
||||||
|
}
|
||||||
|
if conflict {
|
||||||
|
code, message = "MCP_WEBSITE_CONFLICT", "MCP website configuration changed"
|
||||||
|
}
|
||||||
|
return response.MCPWebsiteBinding{State: "unavailable", Reason: reason, Code: code, Error: message, Definitive: definitive}
|
||||||
|
}
|
||||||
|
|
||||||
|
func validMCPWebsiteID(value string) bool {
|
||||||
|
parsed, err := uuid.Parse(value)
|
||||||
|
return err == nil && parsed != uuid.Nil && parsed.String() == value
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteDomain(value string) (string, int, error) {
|
||||||
|
if value == "" || len(value) > 320 || strings.TrimSpace(value) != value || strings.ContainsAny(value, "/\\?#@\r\n\t ;{}\"'$\x00") {
|
||||||
|
return "", 0, errors.New("invalid domain")
|
||||||
|
}
|
||||||
|
host, port := value, 0
|
||||||
|
if parsedHost, parsedPort, err := net.SplitHostPort(value); err == nil {
|
||||||
|
host = parsedHost
|
||||||
|
port, err = strconv.Atoi(parsedPort)
|
||||||
|
if err != nil || port < 1 || port > 65535 {
|
||||||
|
return "", 0, errors.New("invalid port")
|
||||||
|
}
|
||||||
|
} else if strings.ContainsAny(value, ":[]") {
|
||||||
|
return "", 0, errors.New("invalid domain")
|
||||||
|
}
|
||||||
|
host, err := idna.Lookup.ToASCII(strings.ToLower(host))
|
||||||
|
if err != nil || len(host) > 253 || net.ParseIP(host) != nil {
|
||||||
|
return "", 0, errors.New("invalid domain")
|
||||||
|
}
|
||||||
|
for _, label := range strings.Split(host, ".") {
|
||||||
|
if label == "" || len(label) > 63 || label[0] == '-' || label[len(label)-1] == '-' {
|
||||||
|
return "", 0, errors.New("invalid domain")
|
||||||
|
}
|
||||||
|
for _, char := range label {
|
||||||
|
if char != '-' && (char < 'a' || char > 'z') && (char < '0' || char > '9') {
|
||||||
|
return "", 0, errors.New("invalid domain")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return host, port, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Core can select a locally bound panel IP, but an external upstream is never
|
||||||
|
// accepted even on this private API. Host/SNI is a literal hostname, not Nginx code.
|
||||||
|
func validateMCPWebsiteUpstream(req request.MCPWebsiteBinding) bool {
|
||||||
|
if strings.ContainsAny(req.Upstream, "\r\n\t ;{}\"'$#?") {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
u, err := url.Parse(req.Upstream)
|
||||||
|
if err != nil || (u.Scheme != "http" && u.Scheme != "https") || u.Path != "/mcp" || u.RawPath != "" || u.User != nil || u.RawQuery != "" || u.Fragment != "" || u.Port() == "" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
ip := net.ParseIP(u.Hostname())
|
||||||
|
if ip == nil || ip.IsUnspecified() {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
port, err := strconv.Atoi(u.Port())
|
||||||
|
if err != nil || port < 1 || port > 65535 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
local := ip.IsLoopback()
|
||||||
|
if !local {
|
||||||
|
addresses, err := net.InterfaceAddrs()
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, address := range addresses {
|
||||||
|
if network, ok := address.(*net.IPNet); ok && network.IP.Equal(ip) {
|
||||||
|
local = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !local || len(req.ProxyKey) != 64 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if _, err = hex.DecodeString(req.ProxyKey); err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if req.CoreHost == "" || len(req.CoreHost) > 320 || strings.ContainsAny(req.CoreHost, "/\\?#@\r\n\t ;{}\"'$\x00") {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
host := req.CoreHost
|
||||||
|
if parsed, _, splitErr := net.SplitHostPort(host); splitErr == nil {
|
||||||
|
host = parsed
|
||||||
|
}
|
||||||
|
if strings.HasPrefix(host, "[") && strings.HasSuffix(host, "]") {
|
||||||
|
host = strings.Trim(host, "[]")
|
||||||
|
}
|
||||||
|
if net.ParseIP(host) == nil {
|
||||||
|
if _, _, domainErr := mcpWebsiteDomain(host); domainErr != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteProxy(req request.MCPWebsiteBinding) []byte {
|
||||||
|
host := req.CoreHost
|
||||||
|
if parsed, _, err := net.SplitHostPort(host); err == nil {
|
||||||
|
host = parsed
|
||||||
|
}
|
||||||
|
host = strings.Trim(host, "[]")
|
||||||
|
var tlsDirectives string
|
||||||
|
if strings.HasPrefix(req.Upstream, "https://") {
|
||||||
|
tlsDirectives = " proxy_ssl_server_name on;\n proxy_ssl_name " + host + ";\n"
|
||||||
|
}
|
||||||
|
return []byte("# Managed by 1Panel MCP: " + req.BindingID + "\n" +
|
||||||
|
"location = /mcp {\n" +
|
||||||
|
" proxy_pass " + req.Upstream + ";\n" +
|
||||||
|
" proxy_http_version 1.1;\n" +
|
||||||
|
" proxy_set_header Host " + req.CoreHost + ";\n" +
|
||||||
|
" proxy_set_header Connection \"\";\n" +
|
||||||
|
" proxy_set_header X-Panel-MCP-Website-Key " + req.ProxyKey + ";\n" +
|
||||||
|
" proxy_set_header X-Panel-MCP-Website-Peer $realip_remote_addr;\n" +
|
||||||
|
" proxy_set_header X-Forwarded-For $http_x_forwarded_for;\n" +
|
||||||
|
" proxy_set_header X-Real-IP $http_x_real_ip;\n" +
|
||||||
|
" proxy_set_header Forwarded $http_forwarded;\n" +
|
||||||
|
" proxy_set_header Authorization $http_authorization;\n" +
|
||||||
|
" proxy_set_header Origin $http_origin;\n" +
|
||||||
|
" proxy_set_header Accept $http_accept;\n" +
|
||||||
|
" proxy_set_header Content-Type $http_content_type;\n" +
|
||||||
|
" proxy_set_header MCP-Protocol-Version $http_mcp_protocol_version;\n" +
|
||||||
|
" proxy_buffering off;\n proxy_request_buffering off;\n proxy_cache off;\n" +
|
||||||
|
" proxy_read_timeout 360s;\n proxy_send_timeout 360s;\n proxy_connect_timeout 5s;\n" +
|
||||||
|
" proxy_next_upstream off;\n client_max_body_size 1m;\n" + tlsDirectives + "}\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *MCPWebsiteBindingService) validCertificate(id uint, domain string) bool {
|
||||||
|
certificate, err := websiteSSLRepo.GetFirst(repo.WithByID(id))
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
pair, err := tls.X509KeyPair([]byte(certificate.Pem), []byte(certificate.PrivateKey))
|
||||||
|
if err != nil || len(pair.Certificate) == 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
leaf, err := x509.ParseCertificate(pair.Certificate[0])
|
||||||
|
if err != nil || s.now().Before(leaf.NotBefore) || !s.now().Before(leaf.NotAfter) || leaf.VerifyHostname(domain) != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if len(leaf.ExtKeyUsage) == 0 {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
for _, usage := range leaf.ExtKeyUsage {
|
||||||
|
if usage == x509.ExtKeyUsageServerAuth || usage == x509.ExtKeyUsageAny {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteReadOwner(site model.Website) (mcpWebsiteOwner, error) {
|
||||||
|
var owner mcpWebsiteOwner
|
||||||
|
if err := mcpWebsitePrivateDirectory(site, false); err != nil {
|
||||||
|
return owner, err
|
||||||
|
}
|
||||||
|
path := mcpWebsitePrivatePath(site, mcpWebsiteOwnerName)
|
||||||
|
info, err := os.Lstat(path)
|
||||||
|
if err != nil || !info.Mode().IsRegular() || info.Size() > 8192 {
|
||||||
|
return owner, errors.New("invalid MCP website ownership")
|
||||||
|
}
|
||||||
|
data, err := os.ReadFile(path)
|
||||||
|
if err != nil || json.Unmarshal(data, &owner) != nil {
|
||||||
|
return owner, errors.New("invalid MCP website ownership")
|
||||||
|
}
|
||||||
|
return owner, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteWriteOwner(site model.Website, owner mcpWebsiteOwner) error {
|
||||||
|
data, err := json.Marshal(owner)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return mcpWebsiteAtomicWrite(mcpWebsitePrivatePath(site, mcpWebsiteOwnerName), data)
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteAtomicWrite(path string, data []byte) error {
|
||||||
|
if info, err := os.Lstat(path); err == nil && !info.Mode().IsRegular() {
|
||||||
|
return errors.New("managed file is not regular")
|
||||||
|
} else if err != nil && !os.IsNotExist(err) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
temp, err := os.CreateTemp(filepath.Dir(path), ".panel-mcp-*")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer os.Remove(temp.Name())
|
||||||
|
if err = temp.Chmod(0600); err == nil {
|
||||||
|
_, err = temp.Write(data)
|
||||||
|
}
|
||||||
|
if closeErr := temp.Close(); err == nil {
|
||||||
|
err = closeErr
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return os.Rename(temp.Name(), path)
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteCurrentProxy(site model.Website, owner mcpWebsiteOwner) ([]byte, error) {
|
||||||
|
if err := mcpWebsitePrivateDirectory(site, false); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
path := mcpWebsitePrivatePath(site, mcpWebsiteProxyName)
|
||||||
|
info, err := os.Lstat(path)
|
||||||
|
if err != nil || !info.Mode().IsRegular() || info.Size() > 16<<10 {
|
||||||
|
return nil, errors.New("managed proxy is missing or invalid")
|
||||||
|
}
|
||||||
|
data, err := os.ReadFile(path)
|
||||||
|
if err != nil || mcpWebsiteHash(string(data)) != owner.ProxyHash {
|
||||||
|
return nil, errors.New("managed proxy was modified")
|
||||||
|
}
|
||||||
|
return data, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteReadProxy(path string) ([]byte, error) {
|
||||||
|
info, err := os.Lstat(path)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if !info.Mode().IsRegular() || info.Size() > 16<<10 {
|
||||||
|
return nil, errors.New("managed proxy is not a regular file")
|
||||||
|
}
|
||||||
|
return os.ReadFile(path)
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsitePayloadHash(req request.MCPWebsiteBinding) string {
|
||||||
|
return mcpWebsiteHash(fmt.Sprintf("%s\n%s\n%t\n%d", req.Operation, req.Domain, req.EnableSSL, req.SSLID))
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteBindHash(req request.MCPWebsiteBinding) string {
|
||||||
|
return mcpWebsiteHash(fmt.Sprintf("%s\n%t\n%d", req.Domain, req.EnableSSL, req.SSLID))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *MCPWebsiteBindingService) matchesInitialSite(req request.MCPWebsiteBinding, site model.Website) bool {
|
||||||
|
host, port, err := mcpWebsiteDomain(req.Domain)
|
||||||
|
if err != nil || (site.Protocol == constant.ProtocolHTTPS) != req.EnableSSL || site.WebsiteSSLID != req.SSLID {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if port == 0 {
|
||||||
|
installed, installErr := s.openresty()
|
||||||
|
if installErr != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
port = installed.HttpPort
|
||||||
|
if req.EnableSSL {
|
||||||
|
port = installed.HttpsPort
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, domain := range site.Domains {
|
||||||
|
if domain.Domain == host && domain.Port == port {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *MCPWebsiteBindingService) load(req request.MCPWebsiteBinding) (model.Website, error) {
|
||||||
|
if req.WebsiteID > 0 {
|
||||||
|
return websiteRepo.GetFirst(repo.WithByID(req.WebsiteID))
|
||||||
|
}
|
||||||
|
return websiteRepo.GetFirst(websiteRepo.WithAlias(mcpWebsiteAlias(req.BindingID)))
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteProxyIncluded(site model.Website) bool {
|
||||||
|
server, err := getServer(site)
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
include := mcpWebsiteInclude(site)
|
||||||
|
for _, directive := range server.FindDirectives("include") {
|
||||||
|
parameters := directive.GetParameters()
|
||||||
|
if len(parameters) == 1 && strings.Trim(parameters[0], "\"'") == include {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *MCPWebsiteBindingService) status(req request.MCPWebsiteBinding, site model.Website, owner mcpWebsiteOwner) response.MCPWebsiteBinding {
|
||||||
|
result := response.MCPWebsiteBinding{State: "bound", WebsiteID: site.ID, BindingID: req.BindingID, RequestID: owner.RequestID,
|
||||||
|
Domain: site.PrimaryDomain, EnableSSL: site.Protocol == constant.ProtocolHTTPS, SSLID: site.WebsiteSSLID, WebsiteStatus: site.Status}
|
||||||
|
if !result.EnableSSL {
|
||||||
|
result.SSLID = 0
|
||||||
|
}
|
||||||
|
if owner.Operation == "unbind" {
|
||||||
|
result.State = "unbound"
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
if _, err := mcpWebsiteCurrentProxy(site, owner); err != nil {
|
||||||
|
result.State, result.Reason = "unavailable", "proxy_modified"
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
if mcpWebsiteHash(string(mcpWebsiteProxy(req))) != owner.ProxyHash {
|
||||||
|
result.State, result.Reason = "unavailable", "upstream_changed"
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
if site.Status != constant.WebRunning {
|
||||||
|
result.State, result.Reason = "unavailable", "website_stopped"
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
if !mcpWebsiteProxyIncluded(site) {
|
||||||
|
result.State, result.Reason = "unavailable", "proxy_not_loaded"
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
host, _, err := mcpWebsiteDomain(site.PrimaryDomain)
|
||||||
|
if err != nil {
|
||||||
|
result.State, result.Reason = "unavailable", "website_modified"
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
if result.EnableSSL && !s.validCertificate(site.WebsiteSSLID, host) {
|
||||||
|
result.State, result.Reason = "unavailable", "certificate_invalid"
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
installed, err := s.openresty()
|
||||||
|
if err != nil || installed.ID == 0 || installed.Status != constant.StatusRunning {
|
||||||
|
result.State, result.Reason = "unavailable", "openresty_unavailable"
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
matching, matchingSSL := 0, 0
|
||||||
|
for _, domain := range site.Domains {
|
||||||
|
if domain.Domain != host || domain.Port < 1 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if matching == 0 || !domain.SSL {
|
||||||
|
matching = domain.Port
|
||||||
|
}
|
||||||
|
if domain.SSL {
|
||||||
|
matchingSSL = domain.Port
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if matching == 0 {
|
||||||
|
result.State, result.Reason = "unavailable", "website_modified"
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
port := matching
|
||||||
|
if result.EnableSSL {
|
||||||
|
port = matchingSSL
|
||||||
|
if port == 0 {
|
||||||
|
plan := buildWebsiteTLSPlan(site.Domains, installed.HttpPort, installed.HttpsPort)
|
||||||
|
if slices.Contains(plan.httpsPorts, installed.HttpsPort) {
|
||||||
|
port = installed.HttpsPort
|
||||||
|
} else if len(plan.httpsPorts) > 0 {
|
||||||
|
port = plan.httpsPorts[0]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if port == 0 {
|
||||||
|
result.State, result.Reason = "unavailable", "website_modified"
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
scheme := "http"
|
||||||
|
if result.EnableSSL {
|
||||||
|
scheme = "https"
|
||||||
|
}
|
||||||
|
address := host
|
||||||
|
if result.EnableSSL && port != 443 || !result.EnableSSL && port != 80 {
|
||||||
|
address = net.JoinHostPort(host, strconv.Itoa(port))
|
||||||
|
}
|
||||||
|
result.Endpoint = (&url.URL{Scheme: scheme, Host: address, Path: "/mcp"}).String()
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *MCPWebsiteBindingService) Handle(ctx context.Context, req request.MCPWebsiteBinding) (result response.MCPWebsiteBinding) {
|
||||||
|
mcpWebsiteMutation.Lock()
|
||||||
|
defer mcpWebsiteMutation.Unlock()
|
||||||
|
mutationStarted := false
|
||||||
|
defer func() {
|
||||||
|
if mutationStarted && result.Error != "" {
|
||||||
|
result.Definitive = false
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
if req.Operation == "bind" && validMCPWebsiteID(req.BindingID) {
|
||||||
|
_, existingErr := websiteRepo.GetFirst(websiteRepo.WithAlias(mcpWebsiteAlias(req.BindingID)))
|
||||||
|
_, privateErr := os.Lstat(filepath.Join(GetWebSiteRootDir(), mcpWebsitePrivateDir, req.BindingID))
|
||||||
|
mutationStarted = !errors.Is(existingErr, gorm.ErrRecordNotFound) || !os.IsNotExist(privateErr)
|
||||||
|
}
|
||||||
|
if ctx.Err() != nil {
|
||||||
|
return mcpWebsiteFailure("request_cancelled", true, false)
|
||||||
|
}
|
||||||
|
if req.Operation != "status" && req.Operation != "bind" && req.Operation != "update" && req.Operation != "unbind" && req.Operation != "sync" {
|
||||||
|
return mcpWebsiteFailure("invalid_operation", true, false)
|
||||||
|
}
|
||||||
|
if req.BindingID == "" && req.WebsiteID == 0 && req.Operation == "status" {
|
||||||
|
return response.MCPWebsiteBinding{State: "unbound"}
|
||||||
|
}
|
||||||
|
if !validMCPWebsiteID(req.BindingID) || !validateMCPWebsiteUpstream(req) {
|
||||||
|
return mcpWebsiteFailure("invalid_configuration", true, false)
|
||||||
|
}
|
||||||
|
if req.Operation != "status" && req.Operation != "sync" && !validMCPWebsiteID(req.RequestID) {
|
||||||
|
return mcpWebsiteFailure("invalid_request", true, false)
|
||||||
|
}
|
||||||
|
if req.Operation == "bind" {
|
||||||
|
host, port, err := mcpWebsiteDomain(req.Domain)
|
||||||
|
if err != nil || (!req.EnableSSL && req.SSLID != 0) || (req.EnableSSL && (req.SSLID == 0 || !s.validCertificate(req.SSLID, host))) {
|
||||||
|
return mcpWebsiteFailure("invalid_domain_or_certificate", true, false)
|
||||||
|
}
|
||||||
|
req.Domain = host
|
||||||
|
if port != 0 {
|
||||||
|
req.Domain = net.JoinHostPort(host, strconv.Itoa(port))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
site, err := s.load(req)
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
if req.Operation == "status" || req.Operation == "unbind" {
|
||||||
|
if req.WebsiteID == 0 || req.Operation == "unbind" {
|
||||||
|
return response.MCPWebsiteBinding{State: "unbound", BindingID: req.BindingID, RequestID: req.RequestID}
|
||||||
|
}
|
||||||
|
return response.MCPWebsiteBinding{State: "unavailable", WebsiteID: req.WebsiteID, BindingID: req.BindingID, Reason: "website_missing"}
|
||||||
|
}
|
||||||
|
if req.Operation != "bind" {
|
||||||
|
return mcpWebsiteFailure("website_missing", true, true)
|
||||||
|
}
|
||||||
|
installed, installErr := s.openresty()
|
||||||
|
if installErr != nil || installed.ID == 0 || installed.Status != constant.StatusRunning {
|
||||||
|
return mcpWebsiteFailure("openresty_unavailable", true, false)
|
||||||
|
}
|
||||||
|
group, groupErr := groupRepo.Get(groupRepo.WithByWebsiteDefault())
|
||||||
|
if groupErr != nil || group.ID == 0 {
|
||||||
|
return mcpWebsiteFailure("website_group_unavailable", true, false)
|
||||||
|
}
|
||||||
|
domain, port, _ := mcpWebsiteDomain(req.Domain)
|
||||||
|
if port == 0 {
|
||||||
|
port = installed.HttpPort
|
||||||
|
if req.EnableSSL {
|
||||||
|
port = installed.HttpsPort
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if existing, conflictErr := websiteDomainRepo.GetFirst(websiteDomainRepo.WithDomain(domain), websiteDomainRepo.WithPort(port)); conflictErr == nil && existing.ID > 0 {
|
||||||
|
return mcpWebsiteFailure("domain_conflict", true, true)
|
||||||
|
} else if conflictErr != nil && !errors.Is(conflictErr, gorm.ErrRecordNotFound) {
|
||||||
|
return mcpWebsiteFailure("website_unavailable", false, false)
|
||||||
|
}
|
||||||
|
create := request.WebsiteCreate{Alias: mcpWebsiteAlias(req.BindingID), Type: constant.Static, Remark: mcpWebsiteRemark(req), WebsiteGroupID: group.ID,
|
||||||
|
Domains: []request.WebsiteDomain{{Domain: domain, Port: port, SSL: req.EnableSSL}}, SSLConfig: request.SSLConfig{EnableSSL: req.EnableSSL, WebsiteSSLID: req.SSLID}}
|
||||||
|
mutationStarted = true
|
||||||
|
if createErr := s.createWebsite(create); createErr != nil {
|
||||||
|
return mcpWebsiteFailure("website_create_failed", false, false)
|
||||||
|
}
|
||||||
|
site, err = s.load(req)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return mcpWebsiteFailure("website_unavailable", false, false)
|
||||||
|
}
|
||||||
|
if site.Alias != mcpWebsiteAlias(req.BindingID) {
|
||||||
|
return mcpWebsiteFailure("website_ownership_changed", true, true)
|
||||||
|
}
|
||||||
|
owner, ownerErr := mcpWebsiteReadOwner(site)
|
||||||
|
if ownerErr == nil && owner.RequestID == req.RequestID && req.RequestID != "" {
|
||||||
|
mutationStarted = true
|
||||||
|
}
|
||||||
|
if req.Operation == "update" {
|
||||||
|
if req.Domain != "" && req.Domain != site.PrimaryDomain {
|
||||||
|
return mcpWebsiteFailure("domain_changed", true, true)
|
||||||
|
}
|
||||||
|
req.Domain = site.PrimaryDomain
|
||||||
|
host, _, domainErr := mcpWebsiteDomain(req.Domain)
|
||||||
|
if domainErr != nil || (!req.EnableSSL && req.SSLID != 0) || (req.EnableSSL && (req.SSLID == 0 || !s.validCertificate(req.SSLID, host))) {
|
||||||
|
return mcpWebsiteFailure("invalid_domain_or_certificate", true, false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if info, dirErr := os.Lstat(GetSitePath(site, SiteDir)); dirErr == nil && (!info.IsDir() || info.Mode()&os.ModeSymlink != 0) {
|
||||||
|
return mcpWebsiteFailure("website_directory_changed", true, true)
|
||||||
|
} else if dirErr != nil && !os.IsNotExist(dirErr) {
|
||||||
|
return mcpWebsiteFailure("website_unavailable", false, false)
|
||||||
|
}
|
||||||
|
if ownerErr != nil {
|
||||||
|
if (req.Operation != "bind" && req.Operation != "unbind") || site.Remark != mcpWebsiteRemark(req) {
|
||||||
|
return mcpWebsiteFailure("website_ownership_changed", true, true)
|
||||||
|
}
|
||||||
|
if req.Operation == "bind" && !s.matchesInitialSite(req, site) {
|
||||||
|
return mcpWebsiteFailure("binding_request_changed", true, true)
|
||||||
|
}
|
||||||
|
owner = mcpWebsiteOwner{BindingID: req.BindingID, WebsiteID: site.ID, KeyHash: mcpWebsiteHash(req.ProxyKey), BindHash: mcpWebsiteBindHash(req)}
|
||||||
|
} else if owner.BindingID != req.BindingID || owner.WebsiteID != site.ID || owner.KeyHash != mcpWebsiteHash(req.ProxyKey) {
|
||||||
|
return mcpWebsiteFailure("website_ownership_changed", true, true)
|
||||||
|
}
|
||||||
|
if req.Operation == "status" {
|
||||||
|
return s.status(req, site, owner)
|
||||||
|
}
|
||||||
|
operationHash := mcpWebsitePayloadHash(req)
|
||||||
|
if owner.RequestID == req.RequestID && req.RequestID != "" {
|
||||||
|
if owner.RequestHash != operationHash {
|
||||||
|
return mcpWebsiteFailure("operation_request_changed", true, true)
|
||||||
|
}
|
||||||
|
if owner.Operation == "unbind" || owner.ProxyHash == mcpWebsiteHash(string(mcpWebsiteProxy(req))) {
|
||||||
|
return s.status(req, site, owner)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if req.Operation == "bind" && owner.BindHash != mcpWebsiteBindHash(req) {
|
||||||
|
return mcpWebsiteFailure("binding_request_changed", true, true)
|
||||||
|
}
|
||||||
|
if owner.ProxyHash != "" && owner.Operation != "unbind" && req.Operation != "unbind" && !mcpWebsiteProxyIncluded(site) {
|
||||||
|
return mcpWebsiteFailure("proxy_not_loaded", true, true)
|
||||||
|
}
|
||||||
|
proxyPath := mcpWebsitePrivatePath(site, mcpWebsiteProxyName)
|
||||||
|
if err = mcpWebsitePrivateDirectory(site, true); err != nil {
|
||||||
|
return mcpWebsiteFailure("proxy_directory_changed", true, true)
|
||||||
|
}
|
||||||
|
if ownerErr != nil {
|
||||||
|
mutationStarted = true
|
||||||
|
if err = mcpWebsiteWriteOwner(site, owner); err != nil {
|
||||||
|
return mcpWebsiteFailure("ownership_write_failed", false, false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var oldProxy []byte
|
||||||
|
if owner.ProxyHash != "" && owner.Operation != "unbind" {
|
||||||
|
oldProxy, err = mcpWebsiteCurrentProxy(site, owner)
|
||||||
|
if err != nil {
|
||||||
|
actual, readErr := mcpWebsiteReadProxy(proxyPath)
|
||||||
|
if req.Operation == "unbind" && os.IsNotExist(readErr) {
|
||||||
|
oldProxy = nil
|
||||||
|
} else if readErr == nil && string(actual) == string(mcpWebsiteProxy(req)) {
|
||||||
|
oldProxy = actual
|
||||||
|
} else {
|
||||||
|
return mcpWebsiteFailure("proxy_modified", true, true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if _, statErr := os.Lstat(proxyPath); statErr == nil {
|
||||||
|
actual, readErr := mcpWebsiteReadProxy(proxyPath)
|
||||||
|
if readErr != nil || string(actual) != string(mcpWebsiteProxy(req)) {
|
||||||
|
return mcpWebsiteFailure("proxy_already_exists", true, true)
|
||||||
|
}
|
||||||
|
oldProxy = actual
|
||||||
|
} else if !os.IsNotExist(statErr) {
|
||||||
|
return mcpWebsiteFailure("proxy_unavailable", false, false)
|
||||||
|
}
|
||||||
|
if req.Operation == "unbind" {
|
||||||
|
if mcpWebsiteProxyIncluded(site) {
|
||||||
|
mutationStarted = true
|
||||||
|
if err = s.removeInclude(site); err != nil {
|
||||||
|
return mcpWebsiteFailure("proxy_reload_failed", false, false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(oldProxy) > 0 {
|
||||||
|
mutationStarted = true
|
||||||
|
if err = os.Remove(proxyPath); err != nil {
|
||||||
|
return mcpWebsiteFailure("proxy_remove_failed", false, false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
owner.Operation, owner.RequestID, owner.RequestHash = "unbind", req.RequestID, operationHash
|
||||||
|
mutationStarted = true
|
||||||
|
if err = mcpWebsiteWriteOwner(site, owner); err != nil {
|
||||||
|
return mcpWebsiteFailure("ownership_write_failed", false, false)
|
||||||
|
}
|
||||||
|
return s.status(req, site, owner)
|
||||||
|
}
|
||||||
|
if req.Operation == "update" {
|
||||||
|
if req.Domain != site.PrimaryDomain {
|
||||||
|
return mcpWebsiteFailure("domain_changed", true, true)
|
||||||
|
}
|
||||||
|
if site.Protocol == constant.ProtocolHTTPS && !req.EnableSSL || site.Protocol != constant.ProtocolHTTPS && req.EnableSSL || req.EnableSSL && site.WebsiteSSLID != req.SSLID {
|
||||||
|
mutationStarted = true
|
||||||
|
if err = s.updateHTTPS(context.WithoutCancel(ctx), request.WebsiteHTTPSOp{WebsiteID: site.ID, Enable: req.EnableSSL, Type: constant.SSLExisted, WebsiteSSLID: req.SSLID, HttpConfig: constant.HTTPSOnly}); err != nil {
|
||||||
|
return mcpWebsiteFailure("certificate_update_failed", false, false)
|
||||||
|
}
|
||||||
|
site, err = s.load(req)
|
||||||
|
if err != nil {
|
||||||
|
return mcpWebsiteFailure("website_unavailable", false, false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
newProxy := mcpWebsiteProxy(req)
|
||||||
|
mutationStarted = true
|
||||||
|
if err = mcpWebsiteAtomicWrite(proxyPath, newProxy); err != nil {
|
||||||
|
return mcpWebsiteFailure("proxy_write_failed", false, false)
|
||||||
|
}
|
||||||
|
if err = s.applyInclude(site); err != nil {
|
||||||
|
if len(oldProxy) == 0 {
|
||||||
|
_ = os.Remove(proxyPath)
|
||||||
|
} else {
|
||||||
|
_ = mcpWebsiteAtomicWrite(proxyPath, oldProxy)
|
||||||
|
}
|
||||||
|
_ = s.checkReload()
|
||||||
|
return mcpWebsiteFailure("proxy_reload_failed", false, false)
|
||||||
|
}
|
||||||
|
owner.ProxyHash = mcpWebsiteHash(string(newProxy))
|
||||||
|
if req.Operation != "sync" || req.RequestID != "" {
|
||||||
|
owner.RequestID, owner.RequestHash, owner.Operation = req.RequestID, operationHash, req.Operation
|
||||||
|
}
|
||||||
|
if err = mcpWebsiteWriteOwner(site, owner); err != nil {
|
||||||
|
return mcpWebsiteFailure("ownership_write_failed", false, false)
|
||||||
|
}
|
||||||
|
return s.status(req, site, owner)
|
||||||
|
}
|
||||||
@@ -78,9 +78,17 @@ func getNginxParamsByKeys(scope string, keys []string, website *model.Website) (
|
|||||||
var res []response.NginxParam
|
var res []response.NginxParam
|
||||||
var block components.IBlock
|
var block components.IBlock
|
||||||
if scope == constant.NginxScopeHttp {
|
if scope == constant.NginxScopeHttp {
|
||||||
block = nginxFull.RootConfig.Config.FindHttp()
|
httpBlock := nginxFull.RootConfig.Config.FindHttp()
|
||||||
|
if httpBlock == nil {
|
||||||
|
return nil, fmt.Errorf("nginx HTTP configuration block is missing")
|
||||||
|
}
|
||||||
|
block = httpBlock
|
||||||
} else {
|
} else {
|
||||||
block = nginxFull.SiteConfig.Config.FindServers()[0]
|
servers := nginxFull.SiteConfig.Config.FindServers()
|
||||||
|
if len(servers) == 0 {
|
||||||
|
return nil, fmt.Errorf("website nginx server block is missing")
|
||||||
|
}
|
||||||
|
block = servers[0]
|
||||||
}
|
}
|
||||||
for _, key := range keys {
|
for _, key := range keys {
|
||||||
dirs := block.FindDirectives(key)
|
dirs := block.FindDirectives(key)
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import (
|
|||||||
"os/exec"
|
"os/exec"
|
||||||
"path"
|
"path"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"slices"
|
||||||
"sort"
|
"sort"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -46,7 +47,7 @@ type RuntimeService struct {
|
|||||||
type IRuntimeService interface {
|
type IRuntimeService interface {
|
||||||
Page(req request.RuntimeSearch) (int64, []response.RuntimeDTO, error)
|
Page(req request.RuntimeSearch) (int64, []response.RuntimeDTO, error)
|
||||||
Create(create request.RuntimeCreate) (*model.Runtime, error)
|
Create(create request.RuntimeCreate) (*model.Runtime, error)
|
||||||
Delete(delete request.RuntimeDelete) error
|
Delete(delete request.RuntimeDelete) (string, error)
|
||||||
Update(req request.RuntimeUpdate) error
|
Update(req request.RuntimeUpdate) error
|
||||||
Get(id uint) (res *response.RuntimeDTO, err error)
|
Get(id uint) (res *response.RuntimeDTO, err error)
|
||||||
GetNodePackageRunScript(req request.NodePackageReq) ([]response.PackageScripts, error)
|
GetNodePackageRunScript(req request.NodePackageReq) ([]response.PackageScripts, error)
|
||||||
@@ -376,16 +377,16 @@ func (r *RuntimeService) DeleteCheck(runTimeId uint) ([]dto.AppResource, error)
|
|||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *RuntimeService) Delete(runtimeDelete request.RuntimeDelete) error {
|
func (r *RuntimeService) Delete(runtimeDelete request.RuntimeDelete) (string, error) {
|
||||||
runtime, err := runtimeRepo.GetFirst(context.Background(), repo.WithByID(runtimeDelete.ID))
|
runtime, err := runtimeRepo.GetFirst(context.Background(), repo.WithByID(runtimeDelete.ID))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return "", err
|
||||||
}
|
}
|
||||||
website, _ := websiteRepo.GetFirst(websiteRepo.WithRuntimeID(runtimeDelete.ID))
|
website, _ := websiteRepo.GetFirst(websiteRepo.WithRuntimeID(runtimeDelete.ID))
|
||||||
if website.ID > 0 {
|
if website.ID > 0 {
|
||||||
return buserr.New("ErrDelWithWebsite")
|
return runtime.Name, buserr.New("ErrDelWithWebsite")
|
||||||
}
|
}
|
||||||
return startRuntimeDeleteTask(runtimeDelete, runtime)
|
return runtime.Name, startRuntimeDeleteTask(runtimeDelete, runtime)
|
||||||
}
|
}
|
||||||
|
|
||||||
func startRuntimeDeleteTask(runtimeDelete request.RuntimeDelete, runtime *model.Runtime) error {
|
func startRuntimeDeleteTask(runtimeDelete request.RuntimeDelete, runtime *model.Runtime) error {
|
||||||
@@ -584,6 +585,21 @@ func (r *RuntimeService) Get(id uint) (*response.RuntimeDTO, error) {
|
|||||||
|
|
||||||
for _, form := range appForm.FormFields {
|
for _, form := range appForm.FormFields {
|
||||||
if v, ok := envs[form.EnvKey]; ok {
|
if v, ok := envs[form.EnvKey]; ok {
|
||||||
|
if form.EnvKey == "PHP_VERSION" {
|
||||||
|
// Refresh only version choices; keep the saved form if synchronized metadata is unavailable.
|
||||||
|
var latestForm dto.AppForm
|
||||||
|
if json.Unmarshal([]byte(appDetail.Params), &latestForm) == nil {
|
||||||
|
for _, latest := range latestForm.FormFields {
|
||||||
|
if latest.EnvKey == form.EnvKey && len(latest.Values) > 0 {
|
||||||
|
form.Values = latest.Values
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if v != "" && !slices.ContainsFunc(form.Values, func(value dto.AppFormValue) bool { return value.Value == v }) {
|
||||||
|
form.Values = append(form.Values, dto.AppFormValue{Label: v, Value: v})
|
||||||
|
}
|
||||||
|
}
|
||||||
appParam := response.AppParam{
|
appParam := response.AppParam{
|
||||||
Edit: false,
|
Edit: false,
|
||||||
Key: form.EnvKey,
|
Key: form.EnvKey,
|
||||||
@@ -631,7 +647,7 @@ func (r *RuntimeService) Get(id uint) (*response.RuntimeDTO, error) {
|
|||||||
return &res, nil
|
return &res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *RuntimeService) Update(req request.RuntimeUpdate) error {
|
func (r *RuntimeService) Update(req request.RuntimeUpdate) (err error) {
|
||||||
runtime, err := runtimeRepo.GetFirst(context.Background(), repo.WithByID(req.ID))
|
runtime, err := runtimeRepo.GetFirst(context.Background(), repo.WithByID(req.ID))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -640,6 +656,7 @@ func (r *RuntimeService) Update(req request.RuntimeUpdate) error {
|
|||||||
runtime.Version = req.Version
|
runtime.Version = req.Version
|
||||||
return runtimeRepo.Save(runtime)
|
return runtimeRepo.Save(runtime)
|
||||||
}
|
}
|
||||||
|
oldRuntime := *runtime
|
||||||
appDetail, err := getRuntimeUpdateAppDetail(runtime, req)
|
appDetail, err := getRuntimeUpdateAppDetail(runtime, req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -684,6 +701,20 @@ func (r *RuntimeService) Update(req request.RuntimeUpdate) error {
|
|||||||
if err = downloadApp(app, appDetail, nil, nil); err != nil {
|
if err = downloadApp(app, appDetail, nil, nil); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
var snapshot *runtimeUpdateSnapshot
|
||||||
|
if runtime.Type != constant.RuntimePHP {
|
||||||
|
snapshot, err = snapshotRuntimeUpdate(&oldRuntime)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
if err != nil {
|
||||||
|
if restoreErr := snapshot.restoreFiles(); restoreErr != nil {
|
||||||
|
err = fmt.Errorf("%w; restore runtime configuration: %v", err, restoreErr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
if versionChanged {
|
if versionChanged {
|
||||||
if err = updateRuntimeVersionFiles(runtime, appVersionDir); err != nil {
|
if err = updateRuntimeVersionFiles(runtime, appVersionDir); err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -757,7 +788,13 @@ func (r *RuntimeService) Update(req request.RuntimeUpdate) error {
|
|||||||
if err = runtimeRepo.Save(runtime); err != nil {
|
if err = runtimeRepo.Save(runtime); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
go reCreateRuntime(runtime)
|
go func() {
|
||||||
|
if err := prepareRuntimeUpdate(runtime, snapshot); err != nil {
|
||||||
|
global.LOG.Errorf("prepare runtime [%s] update failed: %v", runtime.Name, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
reCreateRuntime(runtime)
|
||||||
|
}()
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
package service
|
package service
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
||||||
@@ -12,6 +15,89 @@ import (
|
|||||||
"gopkg.in/yaml.v3"
|
"gopkg.in/yaml.v3"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Keep the on-disk configuration as well as the model: files may contain edits
|
||||||
|
// that have not been reflected in the database.
|
||||||
|
type runtimeUpdateSnapshot struct {
|
||||||
|
runtime model.Runtime
|
||||||
|
files []runtimeUpdateFile
|
||||||
|
}
|
||||||
|
|
||||||
|
type runtimeUpdateFile struct {
|
||||||
|
path string
|
||||||
|
content []byte
|
||||||
|
mode os.FileMode
|
||||||
|
exists bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func snapshotRuntimeUpdate(runtime *model.Runtime) (*runtimeUpdateSnapshot, error) {
|
||||||
|
snapshot := &runtimeUpdateSnapshot{runtime: *runtime}
|
||||||
|
for _, name := range []string{"docker-compose.yml", ".env", "run.sh"} {
|
||||||
|
file := runtimeUpdateFile{path: filepath.Join(runtime.GetPath(), name)}
|
||||||
|
info, err := os.Stat(file.path)
|
||||||
|
if errors.Is(err, os.ErrNotExist) {
|
||||||
|
snapshot.files = append(snapshot.files, file)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
file.content, err = os.ReadFile(file.path)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
file.exists, file.mode = true, info.Mode().Perm()
|
||||||
|
snapshot.files = append(snapshot.files, file)
|
||||||
|
}
|
||||||
|
return snapshot, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *runtimeUpdateSnapshot) restoreFiles() error {
|
||||||
|
var result error
|
||||||
|
for _, file := range s.files {
|
||||||
|
var err error
|
||||||
|
if file.exists {
|
||||||
|
err = os.WriteFile(file.path, file.content, file.mode)
|
||||||
|
if err == nil {
|
||||||
|
err = os.Chmod(file.path, file.mode)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
err = os.Remove(file.path)
|
||||||
|
if errors.Is(err, os.ErrNotExist) {
|
||||||
|
err = nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
result = errors.Join(result, fmt.Errorf("restore %s: %w", file.path, err))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
// This must finish before reCreateRuntime stops the existing container. A
|
||||||
|
// failed preparation restores the previous version without touching Docker.
|
||||||
|
func prepareRuntimeUpdate(runtime *model.Runtime, snapshot *runtimeUpdateSnapshot) error {
|
||||||
|
if err := pullRuntimeComposeImages(runtime.GetComposePath(), false, nil); err != nil {
|
||||||
|
result := fmt.Errorf("prepare runtime images: %w", err)
|
||||||
|
restoreErr := snapshot.restoreFiles()
|
||||||
|
*runtime = snapshot.runtime
|
||||||
|
if restoreErr != nil {
|
||||||
|
result = errors.Join(result, restoreErr)
|
||||||
|
runtime.Status = constant.StatusError
|
||||||
|
}
|
||||||
|
runtime.Message = result.Error()
|
||||||
|
if saveErr := runtimeRepo.Save(runtime); saveErr != nil {
|
||||||
|
result = errors.Join(result, fmt.Errorf("restore runtime record: %w", saveErr))
|
||||||
|
}
|
||||||
|
logFile, logErr := os.OpenFile(runtime.GetLogPath(), os.O_CREATE|os.O_WRONLY|os.O_APPEND, constant.FilePerm)
|
||||||
|
if logErr == nil {
|
||||||
|
_, logErr = fmt.Fprintln(logFile, result.Error())
|
||||||
|
logErr = errors.Join(logErr, logFile.Close())
|
||||||
|
}
|
||||||
|
return errors.Join(result, logErr)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func getRuntimeUpdateAppDetail(runtime *model.Runtime, req request.RuntimeUpdate) (model.AppDetail, error) {
|
func getRuntimeUpdateAppDetail(runtime *model.Runtime, req request.RuntimeUpdate) (model.AppDetail, error) {
|
||||||
current, err := appDetailRepo.GetFirst(repo.WithByID(runtime.AppDetailID))
|
current, err := appDetailRepo.GetFirst(repo.WithByID(runtime.AppDetailID))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -8,9 +8,12 @@ import (
|
|||||||
"github.com/1Panel-dev/1Panel/agent/app/dto/response"
|
"github.com/1Panel-dev/1Panel/agent/app/dto/response"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/repo"
|
"github.com/1Panel-dev/1Panel/agent/app/repo"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/files"
|
"github.com/1Panel-dev/1Panel/agent/utils/files"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/taskscope"
|
||||||
)
|
)
|
||||||
|
|
||||||
type TaskLogService struct{}
|
type TaskLogService struct {
|
||||||
|
grantedScopes []string
|
||||||
|
}
|
||||||
|
|
||||||
type ITaskLogService interface {
|
type ITaskLogService interface {
|
||||||
Page(req dto.SearchTaskLogReq) (int64, []dto.TaskDTO, error)
|
Page(req dto.SearchTaskLogReq) (int64, []dto.TaskDTO, error)
|
||||||
@@ -19,13 +22,18 @@ type ITaskLogService interface {
|
|||||||
CountExecutingTask() (int64, error)
|
CountExecutingTask() (int64, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewITaskService() ITaskLogService {
|
func NewITaskService(grantedScopes ...string) ITaskLogService {
|
||||||
return &TaskLogService{}
|
return &TaskLogService{grantedScopes: append([]string(nil), grantedScopes...)}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *TaskLogService) Page(req dto.SearchTaskLogReq) (int64, []dto.TaskDTO, error) {
|
func (u *TaskLogService) Page(req dto.SearchTaskLogReq) (int64, []dto.TaskDTO, error) {
|
||||||
|
excluded, err := taskscope.ReadExclusions(u.grantedScopes...)
|
||||||
|
if err != nil {
|
||||||
|
return 0, nil, err
|
||||||
|
}
|
||||||
opts := []repo.DBOption{
|
opts := []repo.DBOption{
|
||||||
repo.WithOrderDesc("created_at"),
|
repo.WithOrderDesc("created_at"),
|
||||||
|
taskRepo.WithoutScopes(excluded...),
|
||||||
}
|
}
|
||||||
if req.TaskID != "" {
|
if req.TaskID != "" {
|
||||||
opts = append(opts, taskRepo.WithByID(req.TaskID))
|
opts = append(opts, taskRepo.WithByID(req.TaskID))
|
||||||
@@ -53,7 +61,11 @@ func (u *TaskLogService) Page(req dto.SearchTaskLogReq) (int64, []dto.TaskDTO, e
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *TaskLogService) ReadByLine(req request.TaskLogReadReq) (*response.FileLineContent, error) {
|
func (u *TaskLogService) ReadByLine(req request.TaskLogReadReq) (*response.FileLineContent, error) {
|
||||||
opts := []repo.DBOption{}
|
excluded, err := taskscope.ReadExclusions(u.grantedScopes...)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
opts := []repo.DBOption{taskRepo.WithoutScopes(excluded...)}
|
||||||
if req.TaskID != "" {
|
if req.TaskID != "" {
|
||||||
opts = append(opts, taskRepo.WithByID(req.TaskID))
|
opts = append(opts, taskRepo.WithByID(req.TaskID))
|
||||||
} else {
|
} else {
|
||||||
@@ -112,9 +124,17 @@ func (u *TaskLogService) ReadByLine(req request.TaskLogReadReq) (*response.FileL
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *TaskLogService) SyncForRestart() error {
|
func (u *TaskLogService) SyncForRestart() error {
|
||||||
return taskRepo.UpdateRunningTaskToFailed()
|
excluded, err := taskscope.RecoveryExclusions()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return taskRepo.UpdateRunningTaskToFailed(taskRepo.WithoutScopes(excluded...))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *TaskLogService) CountExecutingTask() (int64, error) {
|
func (u *TaskLogService) CountExecutingTask() (int64, error) {
|
||||||
return taskRepo.CountExecutingTask()
|
excluded, err := taskscope.ReadExclusions(u.grantedScopes...)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
return taskRepo.CountExecutingTask(taskRepo.WithoutScopes(excluded...))
|
||||||
}
|
}
|
||||||
|
|||||||
+116
-37
@@ -3,6 +3,7 @@ package service
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
|
"database/sql"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
@@ -973,11 +974,16 @@ func (w WebsiteService) GetWebsiteHTTPS(websiteId uint) (response.WebsiteHTTPS,
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
|
applyWebsiteHTTPSParams(&res, params)
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func applyWebsiteHTTPSParams(res *response.WebsiteHTTPS, params []response.NginxParam) {
|
||||||
for _, p := range params {
|
for _, p := range params {
|
||||||
if p.Name == "ssl_protocols" {
|
if p.Name == "ssl_protocols" {
|
||||||
res.SSLProtocol = p.Params
|
res.SSLProtocol = p.Params
|
||||||
}
|
}
|
||||||
if p.Name == "ssl_ciphers" {
|
if p.Name == "ssl_ciphers" && len(p.Params) > 0 {
|
||||||
res.Algorithm = p.Params[0]
|
res.Algorithm = p.Params[0]
|
||||||
}
|
}
|
||||||
if p.Name == "add_header" && len(p.Params) > 0 {
|
if p.Name == "add_header" && len(p.Params) > 0 {
|
||||||
@@ -995,7 +1001,6 @@ func (w WebsiteService) GetWebsiteHTTPS(websiteId uint) (response.WebsiteHTTPS,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return res, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w WebsiteService) OpWebsiteHTTPS(ctx context.Context, req request.WebsiteHTTPSOp) (*response.WebsiteHTTPS, error) {
|
func (w WebsiteService) OpWebsiteHTTPS(ctx context.Context, req request.WebsiteHTTPSOp) (*response.WebsiteHTTPS, error) {
|
||||||
@@ -1325,11 +1330,12 @@ func (w WebsiteService) ChangeDefaultServer(id uint) error {
|
|||||||
return websiteRepo.Save(context.Background(), &website)
|
return websiteRepo.Save(context.Background(), &website)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w WebsiteService) ChangePHPVersion(req request.WebsitePHPVersionReq) error {
|
func (w WebsiteService) ChangePHPVersion(req request.WebsitePHPVersionReq) (err error) {
|
||||||
website, err := websiteRepo.GetFirst(repo.WithByID(req.WebsiteID))
|
website, err := websiteRepo.GetFirst(repo.WithByID(req.WebsiteID))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
wasPHP := website.Type == constant.Runtime
|
||||||
if website.Type == constant.Runtime {
|
if website.Type == constant.Runtime {
|
||||||
oldRuntime, err := runtimeRepo.GetFirst(context.Background(), repo.WithByID(website.RuntimeID))
|
oldRuntime, err := runtimeRepo.GetFirst(context.Background(), repo.WithByID(website.RuntimeID))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -1347,12 +1353,45 @@ func (w WebsiteService) ChangePHPVersion(req request.WebsitePHPVersionReq) error
|
|||||||
return buserr.WithName("ErrImageNotExist", oldRuntime.Name)
|
return buserr.WithName("ErrImageNotExist", oldRuntime.Name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
configPath := GetSitePath(website, SiteConf)
|
|
||||||
nginxContent, err := files.NewFileOp().GetContent(configPath)
|
if req.RuntimeID > 0 {
|
||||||
|
runtime, err := runtimeRepo.GetFirst(context.Background(), repo.WithByID(req.RuntimeID))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
config, err := parser.NewStringParser(string(nginxContent)).Parse()
|
if runtime.Resource == constant.ResourceLocal {
|
||||||
|
return buserr.New("ErrPHPResource")
|
||||||
|
}
|
||||||
|
website.RuntimeID = runtime.ID
|
||||||
|
website.AppInstallID = 0
|
||||||
|
website.Proxy = fmt.Sprintf("127.0.0.1:%s", runtime.Port)
|
||||||
|
website.Type = constant.Runtime
|
||||||
|
} else {
|
||||||
|
website.RuntimeID = 0
|
||||||
|
website.Type = constant.Static
|
||||||
|
website.Proxy = ""
|
||||||
|
}
|
||||||
|
|
||||||
|
subsites, err := websiteRepo.List(websiteRepo.WithParentID(website.ID), websiteRepo.WithType(constant.Subsite))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
websites := append([]model.Website{website}, subsites...)
|
||||||
|
configs := make([]*components.Config, 0, len(websites))
|
||||||
|
oldContents := make(map[string][]byte, len(websites))
|
||||||
|
fileOp := files.NewFileOp()
|
||||||
|
for i := range websites {
|
||||||
|
site := &websites[i]
|
||||||
|
if i > 0 {
|
||||||
|
site.RuntimeID = website.RuntimeID
|
||||||
|
site.Proxy = website.Proxy
|
||||||
|
}
|
||||||
|
configPath := GetSitePath(*site, SiteConf)
|
||||||
|
content, err := fileOp.GetContent(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
config, err := parser.NewStringParser(string(content)).Parse()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -1361,51 +1400,91 @@ func (w WebsiteService) ChangePHPVersion(req request.WebsitePHPVersionReq) error
|
|||||||
return errors.New("nginx config is not valid")
|
return errors.New("nginx config is not valid")
|
||||||
}
|
}
|
||||||
server := servers[0]
|
server := servers[0]
|
||||||
fileOp := files.NewFileOp()
|
if i == 0 || wasPHP != (req.RuntimeID > 0) {
|
||||||
indexPHPPath := path.Join(GetSitePath(website, SiteIndexDir), "index.php")
|
|
||||||
indexHtmlPath := path.Join(GetSitePath(website, SiteIndexDir), "index.html")
|
|
||||||
if req.RuntimeID > 0 {
|
if req.RuntimeID > 0 {
|
||||||
server.UpdateDirective("index", []string{"index.php index.html index.htm default.php default.htm default.html"})
|
server.UpdateDirective("index", []string{"index.php index.html index.htm default.php default.htm default.html"})
|
||||||
server.RemoveDirective("location", []string{"~", "[^/]\\.php(/|$)"})
|
|
||||||
runtime, err := runtimeRepo.GetFirst(context.Background(), repo.WithByID(req.RuntimeID))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if runtime.Resource == constant.ResourceLocal {
|
|
||||||
return buserr.New("ErrPHPResource")
|
|
||||||
}
|
|
||||||
website.RuntimeID = req.RuntimeID
|
|
||||||
website.AppInstallID = 0
|
|
||||||
phpProxy := fmt.Sprintf("127.0.0.1:%s", runtime.Port)
|
|
||||||
website.Proxy = phpProxy
|
|
||||||
server.UpdatePHPProxy([]string{website.Proxy}, "")
|
|
||||||
website.Type = constant.Runtime
|
|
||||||
if !fileOp.Stat(indexPHPPath) {
|
|
||||||
_ = fileOp.WriteFile(indexPHPPath, strings.NewReader(string(nginx_conf.IndexPHP)), constant.FilePerm)
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
server.UpdateDirective("index", []string{"index.html index.php index.htm default.php default.htm default.html"})
|
server.UpdateDirective("index", []string{"index.html index.php index.htm default.php default.htm default.html"})
|
||||||
website.RuntimeID = 0
|
|
||||||
website.Type = constant.Static
|
|
||||||
website.Proxy = ""
|
|
||||||
server.RemoveDirective("location", []string{"~", "[^/]\\.php(/|$)"})
|
|
||||||
if !fileOp.Stat(indexHtmlPath) {
|
|
||||||
_ = fileOp.WriteFile(indexHtmlPath, strings.NewReader(string(nginx_conf.Index)), constant.FilePerm)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if req.RuntimeID > 0 && site.Status != constant.WebStopped {
|
||||||
|
updated := false
|
||||||
|
for _, location := range server.FindDirectives("location") {
|
||||||
|
if strings.Join(location.GetParameters(), " ") == "~ [^/]\\.php(/|$)" && location.GetBlock() != nil {
|
||||||
|
location.GetBlock().UpdateDirective("fastcgi_pass", []string{site.Proxy})
|
||||||
|
updated = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !updated {
|
||||||
|
server.UpdatePHPProxy([]string{site.Proxy}, "")
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
server.RemoveDirective("location", []string{"~", "[^/]\\.php(/|$)"})
|
||||||
|
}
|
||||||
|
config.FilePath = configPath
|
||||||
|
configs = append(configs, config)
|
||||||
|
oldContents[configPath] = content
|
||||||
|
}
|
||||||
|
|
||||||
config.FilePath = configPath
|
indexPath := path.Join(GetSitePath(website, SiteIndexDir), "index.html")
|
||||||
if err = nginx.WriteConfig(config, nginx.IndentedStyle); err != nil {
|
indexContent := nginx_conf.Index
|
||||||
return err
|
if req.RuntimeID > 0 {
|
||||||
|
indexPath = path.Join(GetSitePath(website, SiteIndexDir), "index.php")
|
||||||
|
indexContent = nginx_conf.IndexPHP
|
||||||
}
|
}
|
||||||
|
if !fileOp.Stat(indexPath) {
|
||||||
|
_ = fileOp.WriteFile(indexPath, strings.NewReader(string(indexContent)), constant.FilePerm)
|
||||||
|
}
|
||||||
|
|
||||||
nginxInstall, err := getAppInstallByKey(constant.AppOpenresty)
|
nginxInstall, err := getAppInstallByKey(constant.AppOpenresty)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err = nginxCheckAndReload(string(nginxContent), configPath, nginxInstall.ContainerName); err != nil {
|
tx, ctx := helper.GetTxAndContext()
|
||||||
|
if err = tx.Error; err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return websiteRepo.Save(context.Background(), &website)
|
written := 0
|
||||||
|
reloadAttempted := false
|
||||||
|
defer func() {
|
||||||
|
if err == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if rollbackErr := tx.Rollback().Error; rollbackErr != nil && !errors.Is(rollbackErr, sql.ErrTxDone) {
|
||||||
|
err = errors.Join(err, rollbackErr)
|
||||||
|
}
|
||||||
|
for _, config := range configs[:written] {
|
||||||
|
if restoreErr := fileOp.WriteFile(config.FilePath, strings.NewReader(string(oldContents[config.FilePath])), constant.FilePerm); restoreErr != nil {
|
||||||
|
err = errors.Join(err, fmt.Errorf("restore %s: %w", config.FilePath, restoreErr))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if reloadAttempted {
|
||||||
|
if checkErr := opNginx(nginxInstall.ContainerName, constant.NginxCheck); checkErr != nil {
|
||||||
|
err = errors.Join(err, fmt.Errorf("check restored nginx configuration: %w", checkErr))
|
||||||
|
} else if reloadErr := opNginx(nginxInstall.ContainerName, constant.NginxReload); reloadErr != nil {
|
||||||
|
err = errors.Join(err, fmt.Errorf("reload restored nginx configuration: %w", reloadErr))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
for i := range websites {
|
||||||
|
if err = websiteRepo.Save(ctx, &websites[i]); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, config := range configs {
|
||||||
|
written++
|
||||||
|
if err = nginx.WriteConfig(config, nginx.IndentedStyle); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err = opNginx(nginxInstall.ContainerName, constant.NginxCheck); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
reloadAttempted = true
|
||||||
|
if err = opNginx(nginxInstall.ContainerName, constant.NginxReload); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return tx.Commit().Error
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w WebsiteService) UpdateSiteDir(req request.WebsiteUpdateDir) error {
|
func (w WebsiteService) UpdateSiteDir(req request.WebsiteUpdateDir) error {
|
||||||
|
|||||||
@@ -1,15 +1,19 @@
|
|||||||
package service
|
package service
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"archive/zip"
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
"crypto/ecdsa"
|
"crypto/ecdsa"
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
"crypto/rsa"
|
"crypto/rsa"
|
||||||
|
"crypto/tls"
|
||||||
"crypto/x509"
|
"crypto/x509"
|
||||||
"crypto/x509/pkix"
|
"crypto/x509/pkix"
|
||||||
"encoding/pem"
|
"encoding/pem"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
"log"
|
"log"
|
||||||
"math/big"
|
"math/big"
|
||||||
"net"
|
"net"
|
||||||
@@ -18,25 +22,27 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/repo"
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/common"
|
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto/response"
|
"github.com/1Panel-dev/1Panel/agent/app/dto/response"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/model"
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/repo"
|
||||||
"github.com/1Panel-dev/1Panel/agent/buserr"
|
"github.com/1Panel-dev/1Panel/agent/buserr"
|
||||||
"github.com/1Panel-dev/1Panel/agent/constant"
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
"github.com/1Panel-dev/1Panel/agent/global"
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
"github.com/1Panel-dev/1Panel/agent/i18n"
|
"github.com/1Panel-dev/1Panel/agent/i18n"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/common"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/files"
|
"github.com/1Panel-dev/1Panel/agent/utils/files"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/ssl"
|
"github.com/1Panel-dev/1Panel/agent/utils/ssl"
|
||||||
"github.com/go-acme/lego/v5/certcrypto"
|
"github.com/go-acme/lego/v5/certcrypto"
|
||||||
|
"gorm.io/gorm"
|
||||||
)
|
)
|
||||||
|
|
||||||
type WebsiteCAService struct {
|
type WebsiteCAService struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
type IWebsiteCAService interface {
|
type IWebsiteCAService interface {
|
||||||
|
Import(req request.WebsiteCAImport) error
|
||||||
|
Upload(name string, archive []byte) error
|
||||||
Page(search request.WebsiteCASearch) (int64, []response.WebsiteCADTO, error)
|
Page(search request.WebsiteCASearch) (int64, []response.WebsiteCADTO, error)
|
||||||
Create(create request.WebsiteCACreate) (*request.WebsiteCACreate, error)
|
Create(create request.WebsiteCACreate) (*request.WebsiteCACreate, error)
|
||||||
GetCA(id uint) (*response.WebsiteCADTO, error)
|
GetCA(id uint) (*response.WebsiteCADTO, error)
|
||||||
@@ -334,7 +340,7 @@ func (w WebsiteCAService) ObtainSSL(req request.WebsiteCAObtain) (*model.Website
|
|||||||
websiteSSL.ExpireDate = cert.NotAfter
|
websiteSSL.ExpireDate = cert.NotAfter
|
||||||
websiteSSL.StartDate = cert.NotBefore
|
websiteSSL.StartDate = cert.NotBefore
|
||||||
websiteSSL.Type = cert.Issuer.CommonName
|
websiteSSL.Type = cert.Issuer.CommonName
|
||||||
websiteSSL.Organization = rootCsr.Subject.Organization[0]
|
websiteSSL.Organization = strings.Join(rootCsr.Subject.Organization, ",")
|
||||||
websiteSSL.Status = constant.SSLReady
|
websiteSSL.Status = constant.SSLReady
|
||||||
|
|
||||||
if req.Renew {
|
if req.Renew {
|
||||||
@@ -442,3 +448,150 @@ func (w WebsiteCAService) DownloadFile(id uint) (*os.File, error) {
|
|||||||
}
|
}
|
||||||
return os.Open(path.Join(dir, fileName))
|
return os.Open(path.Join(dir, fileName))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (w WebsiteCAService) Upload(name string, archive []byte) error {
|
||||||
|
ca, err := parseCAArchive(archive)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return saveImportedCA(name, ca)
|
||||||
|
}
|
||||||
|
|
||||||
|
func saveImportedCA(name string, ca *model.WebsiteCA) error {
|
||||||
|
name = strings.TrimSpace(name)
|
||||||
|
if name == "" || len(name) > 128 || name == "." || name == ".." || strings.ContainsAny(name, "/\\\x00") {
|
||||||
|
return buserr.WithDetail("ErrInvalidParams", "name", nil)
|
||||||
|
}
|
||||||
|
exist, err := websiteCARepo.GetFirst(repo.WithByName(name))
|
||||||
|
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if exist.ID > 0 {
|
||||||
|
return buserr.New("ErrNameIsExist")
|
||||||
|
}
|
||||||
|
ca.Name = name
|
||||||
|
return websiteCARepo.Create(context.Background(), ca)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Read only the certificate and key in memory; never extract user-supplied paths.
|
||||||
|
func parseCAArchive(archive []byte) (*model.WebsiteCA, error) {
|
||||||
|
invalid := func() (*model.WebsiteCA, error) { return nil, buserr.New("ErrCAUpload") }
|
||||||
|
if len(archive) > 10<<20 {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
reader, err := zip.NewReader(bytes.NewReader(archive), int64(len(archive)))
|
||||||
|
if err != nil || len(reader.File) > 16 {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
contents := make(map[string][]byte)
|
||||||
|
for _, file := range reader.File {
|
||||||
|
if file.FileInfo().IsDir() {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
name := path.Base(file.Name)
|
||||||
|
if (name != "ca.crt" && name != "ca.key") || contents[name] != nil || file.UncompressedSize64 > 1<<20 {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
stream, err := file.Open()
|
||||||
|
if err != nil {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
data, err := io.ReadAll(io.LimitReader(stream, (1<<20)+1))
|
||||||
|
stream.Close()
|
||||||
|
if err != nil || len(data) > 1<<20 {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
contents[name] = data
|
||||||
|
}
|
||||||
|
return parseAndValidateRootCA(contents["ca.crt"], contents["ca.key"])
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseAndValidateRootCA(certificate, privateKey []byte) (*model.WebsiteCA, error) {
|
||||||
|
invalid := func() (*model.WebsiteCA, error) { return nil, buserr.New("ErrCAImport") }
|
||||||
|
if len(certificate) > 1<<20 || len(privateKey) > 1<<20 {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
pair, err := tls.X509KeyPair(certificate, privateKey)
|
||||||
|
if err != nil || len(pair.Certificate) != 1 {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
cert := pair.Leaf
|
||||||
|
now := time.Now()
|
||||||
|
if cert == nil || !cert.IsCA || !cert.BasicConstraintsValid || cert.KeyUsage&x509.KeyUsageCertSign == 0 ||
|
||||||
|
!bytes.Equal(cert.RawIssuer, cert.RawSubject) || cert.CheckSignatureFrom(cert) != nil ||
|
||||||
|
now.Before(cert.NotBefore) || !now.Before(cert.NotAfter) {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
ca := &model.WebsiteCA{CSR: string(pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: cert.Raw}))}
|
||||||
|
// Normalize keys to the formats used by ObtainSSL, including PKCS#8 uploads.
|
||||||
|
switch key := pair.PrivateKey.(type) {
|
||||||
|
case *ecdsa.PrivateKey:
|
||||||
|
bits := key.Curve.Params().BitSize
|
||||||
|
if bits != 256 && bits != 384 {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
der, err := x509.MarshalECPrivateKey(key)
|
||||||
|
if err != nil {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
ca.KeyType = fmt.Sprintf("EC%d", bits)
|
||||||
|
ca.PrivateKey = string(pem.EncodeToMemory(&pem.Block{Type: "EC PRIVATE KEY", Bytes: der}))
|
||||||
|
case *rsa.PrivateKey:
|
||||||
|
bits := key.N.BitLen()
|
||||||
|
if bits != 2048 && bits != 3072 && bits != 4096 && bits != 8192 {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
ca.KeyType = fmt.Sprintf("RSA%d", bits)
|
||||||
|
ca.PrivateKey = string(pem.EncodeToMemory(&pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(key)}))
|
||||||
|
default:
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
return ca, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w WebsiteCAService) Import(req request.WebsiteCAImport) error {
|
||||||
|
certificate, privateKey := []byte(req.Certificate), []byte(req.PrivateKey)
|
||||||
|
switch req.Type {
|
||||||
|
case "local":
|
||||||
|
var err error
|
||||||
|
certificate, err = readCAImportFile(req.CertificatePath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
privateKey, err = readCAImportFile(req.PrivateKeyPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
case "paste":
|
||||||
|
default:
|
||||||
|
return buserr.New("ErrCAImport")
|
||||||
|
}
|
||||||
|
ca, err := parseAndValidateRootCA(certificate, privateKey)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return saveImportedCA(req.Name, ca)
|
||||||
|
}
|
||||||
|
|
||||||
|
func readCAImportFile(name string) ([]byte, error) {
|
||||||
|
info, err := os.Stat(name)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if !info.Mode().IsRegular() || info.Size() > 1<<20 {
|
||||||
|
return nil, buserr.New("ErrCAImport")
|
||||||
|
}
|
||||||
|
file, err := os.Open(name)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer file.Close()
|
||||||
|
content, err := io.ReadAll(io.LimitReader(file, (1<<20)+1))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(content) > 1<<20 {
|
||||||
|
return nil, buserr.New("ErrCAImport")
|
||||||
|
}
|
||||||
|
return content, nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,100 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/files"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/nginx"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/nginx/parser"
|
||||||
|
)
|
||||||
|
|
||||||
|
type websiteManagedConfigPolicy struct {
|
||||||
|
protectedDirectories func() []string
|
||||||
|
backupIncludes func(model.Website) []string
|
||||||
|
}
|
||||||
|
|
||||||
|
var websiteManagedConfigs websiteManagedConfigPolicy
|
||||||
|
|
||||||
|
func configureWebsiteManagedConfig(policy websiteManagedConfigPolicy) {
|
||||||
|
if !policy.configured() || websiteManagedConfigs.configured() {
|
||||||
|
panic("invalid website managed configuration policy")
|
||||||
|
}
|
||||||
|
websiteManagedConfigs = policy
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p websiteManagedConfigPolicy) configured() bool {
|
||||||
|
return p.protectedDirectories != nil && p.backupIncludes != nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p websiteManagedConfigPolicy) pathAllowed(target string) bool {
|
||||||
|
if !p.configured() {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
resolved, err := websiteProxyResolvePath(target)
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, directory := range p.protectedDirectories() {
|
||||||
|
if directory == "" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
root, err := websiteProxyResolvePath(directory)
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if relative, err := filepath.Rel(root, resolved); err != nil || relative != ".." && !strings.HasPrefix(relative, ".."+string(filepath.Separator)) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func exportWebsiteNginxConfig(site model.Website, source, destination string) error {
|
||||||
|
return websiteManagedConfigs.exportNginxConfig(site, source, destination)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p websiteManagedConfigPolicy) exportNginxConfig(site model.Website, source, destination string) error {
|
||||||
|
if !p.configured() {
|
||||||
|
return errors.New("website managed configuration policy is unavailable")
|
||||||
|
}
|
||||||
|
includes := p.backupIncludes(site)
|
||||||
|
if len(includes) == 0 {
|
||||||
|
return files.NewFileOp().CopyFile(source, destination)
|
||||||
|
}
|
||||||
|
excluded := make(map[string]struct{}, len(includes))
|
||||||
|
for _, include := range includes {
|
||||||
|
if include == "" {
|
||||||
|
return errors.New("invalid managed website backup include")
|
||||||
|
}
|
||||||
|
excluded[include] = struct{}{}
|
||||||
|
}
|
||||||
|
content, err := os.ReadFile(source)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
config, err := parser.NewStringParser(string(content)).Parse()
|
||||||
|
if err != nil {
|
||||||
|
return errors.New("invalid managed website backup configuration")
|
||||||
|
}
|
||||||
|
changed := false
|
||||||
|
for _, server := range config.FindServers() {
|
||||||
|
for _, directive := range server.FindDirectives("include") {
|
||||||
|
parameters := directive.GetParameters()
|
||||||
|
if len(parameters) != 1 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, found := excluded[strings.Trim(parameters[0], "\"'")]; found {
|
||||||
|
server.RemoveDirective("include", parameters)
|
||||||
|
changed = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if changed {
|
||||||
|
content = []byte(nginx.DumpConfig(config, nginx.IndentedStyle))
|
||||||
|
}
|
||||||
|
return os.WriteFile(filepath.Join(destination, filepath.Base(source)), content, 0600)
|
||||||
|
}
|
||||||
@@ -4,7 +4,9 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"os"
|
||||||
"path"
|
"path"
|
||||||
|
"path/filepath"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@@ -23,6 +25,63 @@ import (
|
|||||||
"github.com/1Panel-dev/1Panel/agent/utils/re"
|
"github.com/1Panel-dev/1Panel/agent/utils/re"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func websiteProxyPathAllowed(directory, name string) bool {
|
||||||
|
if name == "" || name == "." || name == ".." || strings.ContainsAny(name, "/\\\x00") {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
resolvedDirectory, err := websiteProxyResolvePath(directory)
|
||||||
|
if err != nil || !websiteManagedConfigs.pathAllowed(resolvedDirectory) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, extension := range []string{".conf", ".bak"} {
|
||||||
|
filename := filepath.Join(directory, name+extension)
|
||||||
|
if info, statErr := os.Lstat(filename); statErr == nil && info.Mode()&os.ModeSymlink != 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
resolved, resolveErr := websiteProxyResolvePath(filename)
|
||||||
|
if resolveErr != nil || !websiteProxyPathWithin(resolved, resolvedDirectory) || !websiteManagedConfigs.pathAllowed(resolved) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func websiteProxyDirectoryAllowed(directory string) bool {
|
||||||
|
resolved, err := websiteProxyResolvePath(directory)
|
||||||
|
return err == nil && websiteManagedConfigs.pathAllowed(resolved)
|
||||||
|
}
|
||||||
|
|
||||||
|
func websiteProxyPathWithin(target, directory string) bool {
|
||||||
|
resolvedDirectory, err := websiteProxyResolvePath(directory)
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
relative, err := filepath.Rel(resolvedDirectory, target)
|
||||||
|
return err == nil && relative != ".." && !strings.HasPrefix(relative, ".."+string(filepath.Separator))
|
||||||
|
}
|
||||||
|
|
||||||
|
func websiteProxyResolvePath(target string) (string, error) {
|
||||||
|
absolute, err := filepath.Abs(target)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
resolved, err := filepath.EvalSymlinks(absolute)
|
||||||
|
if err == nil {
|
||||||
|
return resolved, nil
|
||||||
|
}
|
||||||
|
if !os.IsNotExist(err) || filepath.Dir(absolute) == absolute {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if info, statErr := os.Lstat(absolute); statErr == nil && info.Mode()&os.ModeSymlink != 0 {
|
||||||
|
return "", errors.New("invalid proxy symlink")
|
||||||
|
}
|
||||||
|
parent, err := websiteProxyResolvePath(filepath.Dir(absolute))
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return filepath.Join(parent, filepath.Base(absolute)), nil
|
||||||
|
}
|
||||||
|
|
||||||
func (w WebsiteService) OperateProxy(req request.WebsiteProxyConfig) (err error) {
|
func (w WebsiteService) OperateProxy(req request.WebsiteProxyConfig) (err error) {
|
||||||
switch req.Operate {
|
switch req.Operate {
|
||||||
case "delete":
|
case "delete":
|
||||||
@@ -51,6 +110,9 @@ func (w WebsiteService) OperateProxy(req request.WebsiteProxyConfig) (err error)
|
|||||||
}
|
}
|
||||||
fileOp := files.NewFileOp()
|
fileOp := files.NewFileOp()
|
||||||
includeDir := GetSitePath(website, SiteProxyDir)
|
includeDir := GetSitePath(website, SiteProxyDir)
|
||||||
|
if !websiteProxyPathAllowed(includeDir, req.Name) {
|
||||||
|
return errors.New("invalid proxy path")
|
||||||
|
}
|
||||||
if !fileOp.Stat(includeDir) {
|
if !fileOp.Stat(includeDir) {
|
||||||
_ = fileOp.CreateDir(includeDir, constant.DirPerm)
|
_ = fileOp.CreateDir(includeDir, constant.DirPerm)
|
||||||
}
|
}
|
||||||
@@ -270,6 +332,9 @@ func (w WebsiteService) GetProxies(id uint) (res []request.WebsiteProxyConfig, e
|
|||||||
}
|
}
|
||||||
includeDir := GetSitePath(website, SiteProxyDir)
|
includeDir := GetSitePath(website, SiteProxyDir)
|
||||||
fileOp := files.NewFileOp()
|
fileOp := files.NewFileOp()
|
||||||
|
if !websiteProxyDirectoryAllowed(includeDir) {
|
||||||
|
return nil, errors.New("invalid proxy path")
|
||||||
|
}
|
||||||
if !fileOp.Stat(includeDir) {
|
if !fileOp.Stat(includeDir) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -282,12 +347,16 @@ func (w WebsiteService) GetProxies(id uint) (res []request.WebsiteProxyConfig, e
|
|||||||
config *components.Config
|
config *components.Config
|
||||||
)
|
)
|
||||||
for _, configFile := range fileList.Items {
|
for _, configFile := range fileList.Items {
|
||||||
|
extension := filepath.Ext(configFile.Name)
|
||||||
|
name := strings.TrimSuffix(configFile.Name, extension)
|
||||||
|
if configFile.IsDir || (extension != ".conf" && extension != ".bak") || !websiteProxyPathAllowed(includeDir, name) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
proxyConfig := request.WebsiteProxyConfig{
|
proxyConfig := request.WebsiteProxyConfig{
|
||||||
ID: website.ID,
|
ID: website.ID,
|
||||||
}
|
}
|
||||||
parts := strings.Split(configFile.Name, ".")
|
proxyConfig.Name = name
|
||||||
proxyConfig.Name = parts[0]
|
if extension == ".conf" {
|
||||||
if parts[1] == "conf" {
|
|
||||||
proxyConfig.Enable = true
|
proxyConfig.Enable = true
|
||||||
} else {
|
} else {
|
||||||
proxyConfig.Enable = false
|
proxyConfig.Enable = false
|
||||||
@@ -360,6 +429,9 @@ func (w WebsiteService) UpdateProxyFile(req request.NginxProxyUpdate) (err error
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if !websiteProxyPathAllowed(GetSitePath(website, SiteProxyDir), req.Name) {
|
||||||
|
return errors.New("invalid proxy path")
|
||||||
|
}
|
||||||
absolutePath := fmt.Sprintf("%s/%s.conf", GetSitePath(website, SiteProxyDir), req.Name)
|
absolutePath := fmt.Sprintf("%s/%s.conf", GetSitePath(website, SiteProxyDir), req.Name)
|
||||||
fileOp := files.NewFileOp()
|
fileOp := files.NewFileOp()
|
||||||
oldRewriteContent, err = fileOp.GetContent(absolutePath)
|
oldRewriteContent, err = fileOp.GetContent(absolutePath)
|
||||||
@@ -405,6 +477,9 @@ func (w WebsiteService) DeleteProxy(req request.WebsiteProxyDel) (err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
includeDir := GetSitePath(website, SiteProxyDir)
|
includeDir := GetSitePath(website, SiteProxyDir)
|
||||||
|
if !websiteProxyPathAllowed(includeDir, req.Name) {
|
||||||
|
return errors.New("invalid proxy path")
|
||||||
|
}
|
||||||
fileOp := files.NewFileOp()
|
fileOp := files.NewFileOp()
|
||||||
if !fileOp.Stat(includeDir) {
|
if !fileOp.Stat(includeDir) {
|
||||||
return
|
return
|
||||||
@@ -425,6 +500,9 @@ func (w WebsiteService) UpdateProxyStatus(req request.WebsiteProxyStatusUpdate)
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
includeDir := GetSitePath(website, SiteProxyDir)
|
includeDir := GetSitePath(website, SiteProxyDir)
|
||||||
|
if !websiteProxyPathAllowed(includeDir, req.Name) {
|
||||||
|
return errors.New("invalid proxy path")
|
||||||
|
}
|
||||||
fileOp := files.NewFileOp()
|
fileOp := files.NewFileOp()
|
||||||
if !fileOp.Stat(includeDir) {
|
if !fileOp.Stat(includeDir) {
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -1454,10 +1454,10 @@ func getWebsiteDomains(domains []request.WebsiteDomain, defaultHTTPPort, default
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
domainModel.Domain = strings.ToLower(domainModel.Domain)
|
domainModel.Domain = strings.ToLower(domainModel.Domain)
|
||||||
domainModel.Port = domain.Port
|
|
||||||
if domain.Port == 0 {
|
if domain.Port == 0 {
|
||||||
domain.Port = defaultHTTPPort
|
domain.Port = defaultHTTPPort
|
||||||
}
|
}
|
||||||
|
domainModel.Port = domain.Port
|
||||||
domainModel.SSL = domain.SSL
|
domainModel.SSL = domain.SSL
|
||||||
domainModel.WebsiteID = websiteID
|
domainModel.WebsiteID = websiteID
|
||||||
domainModels = append(domainModels, domainModel)
|
domainModels = append(domainModels, domainModel)
|
||||||
|
|||||||
@@ -292,10 +292,36 @@ func (t *Task) updateTask(task *model.Task) {
|
|||||||
_ = t.taskRepo.Update(context.Background(), task)
|
_ = t.taskRepo.Update(context.Background(), task)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ExecuteQueued registers the task before returning and limits concurrent execution.
|
||||||
|
// Subtasks must use Timeout = 0 and manage their own operation and recovery deadlines
|
||||||
|
// so that a slot is held until the action and its cleanup have actually returned.
|
||||||
|
func (t *Task) ExecuteQueued(slots chan struct{}, waitingStep string, onFinish func()) error {
|
||||||
|
t.Task.CurrentStep = waitingStep
|
||||||
|
if err := t.taskRepo.Save(context.Background(), t.Task); err != nil {
|
||||||
|
_ = t.logFile.Close()
|
||||||
|
global.RemoveTaskCancel(t.TaskID)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
t.Log(i18n.GetMsgByKey(waitingStep))
|
||||||
|
go func() {
|
||||||
|
slots <- struct{}{}
|
||||||
|
defer func() { <-slots }()
|
||||||
|
defer onFinish()
|
||||||
|
if err := t.executeRegistered(); err != nil {
|
||||||
|
global.LOG.Error(err.Error())
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (t *Task) Execute() error {
|
func (t *Task) Execute() error {
|
||||||
if err := t.taskRepo.Save(context.Background(), t.Task); err != nil {
|
if err := t.taskRepo.Save(context.Background(), t.Task); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
return t.executeRegistered()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *Task) executeRegistered() error {
|
||||||
var err error
|
var err error
|
||||||
t.Log(i18n.GetWithName("TaskStart", t.Name))
|
t.Log(i18n.GetWithName("TaskStart", t.Name))
|
||||||
for i := 0; i < len(t.SubTasks); i++ {
|
for i := 0; i < len(t.SubTasks); i++ {
|
||||||
|
|||||||
@@ -53,13 +53,6 @@
|
|||||||
"formatZH": "添加 Ollama 模型重试 [name]",
|
"formatZH": "添加 Ollama 模型重试 [name]",
|
||||||
"formatEN": "re-add Ollama model [name]"
|
"formatEN": "re-add Ollama model [name]"
|
||||||
},
|
},
|
||||||
"/ai/ollama/model/sync": {
|
|
||||||
"bodyKeys": [],
|
|
||||||
"paramKeys": [],
|
|
||||||
"beforeFunctions": [],
|
|
||||||
"formatZH": "同步 Ollama 模型列表",
|
|
||||||
"formatEN": "sync Ollama model list"
|
|
||||||
},
|
|
||||||
"/ai/tensorrt/create": {
|
"/ai/tensorrt/create": {
|
||||||
"bodyKeys": [
|
"bodyKeys": [
|
||||||
"name"
|
"name"
|
||||||
@@ -3740,13 +3733,11 @@
|
|||||||
"formatEN": "Create runtime [name]"
|
"formatEN": "Create runtime [name]"
|
||||||
},
|
},
|
||||||
"/runtimes/del": {
|
"/runtimes/del": {
|
||||||
"bodyKeys": [
|
"bodyKeys": [],
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"paramKeys": [],
|
"paramKeys": [],
|
||||||
"beforeFunctions": [],
|
"beforeFunctions": [],
|
||||||
"formatZH": "删除运行环境 [id]",
|
"formatZH": "删除运行环境 [name]",
|
||||||
"formatEN": "Delete runtime [id]"
|
"formatEN": "Delete runtime [name]"
|
||||||
},
|
},
|
||||||
"/runtimes/operate": {
|
"/runtimes/operate": {
|
||||||
"bodyKeys": [
|
"bodyKeys": [
|
||||||
@@ -4582,13 +4573,13 @@
|
|||||||
},
|
},
|
||||||
"/websites/php/version": {
|
"/websites/php/version": {
|
||||||
"bodyKeys": [
|
"bodyKeys": [
|
||||||
"websiteId"
|
"websiteID"
|
||||||
],
|
],
|
||||||
"paramKeys": [],
|
"paramKeys": [],
|
||||||
"beforeFunctions": [
|
"beforeFunctions": [
|
||||||
{
|
{
|
||||||
"input_column": "id",
|
"input_column": "id",
|
||||||
"input_value": "websiteId",
|
"input_value": "websiteID",
|
||||||
"isList": false,
|
"isList": false,
|
||||||
"db": "websites",
|
"db": "websites",
|
||||||
"output_column": "primary_domain",
|
"output_column": "primary_domain",
|
||||||
|
|||||||
@@ -4,3 +4,5 @@ const (
|
|||||||
TaskInstall = "installApp"
|
TaskInstall = "installApp"
|
||||||
TaskCreateWebsite = "createWebsite"
|
TaskCreateWebsite = "createWebsite"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const TaskScopePanelMCP = "PanelMCP"
|
||||||
|
|||||||
+1
-1
@@ -7,6 +7,7 @@ replace github.com/go-acme/lego/v5 => github.com/1Panel-dev/lego/v5 v5.3.1
|
|||||||
require (
|
require (
|
||||||
github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
|
github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
|
||||||
github.com/compose-spec/compose-go/v2 v2.15.0
|
github.com/compose-spec/compose-go/v2 v2.15.0
|
||||||
|
github.com/containerd/errdefs v1.0.0
|
||||||
github.com/creack/pty v1.1.24
|
github.com/creack/pty v1.1.24
|
||||||
github.com/docker/cli v29.9.0+incompatible
|
github.com/docker/cli v29.9.0+incompatible
|
||||||
github.com/docker/docker v28.5.2+incompatible
|
github.com/docker/docker v28.5.2+incompatible
|
||||||
@@ -104,7 +105,6 @@ require (
|
|||||||
github.com/clbanning/mxj v1.8.4 // indirect
|
github.com/clbanning/mxj v1.8.4 // indirect
|
||||||
github.com/clbanning/mxj/v2 v2.7.0 // indirect
|
github.com/clbanning/mxj/v2 v2.7.0 // indirect
|
||||||
github.com/cloudwego/base64x v0.1.6 // indirect
|
github.com/cloudwego/base64x v0.1.6 // indirect
|
||||||
github.com/containerd/errdefs v1.0.0 // indirect
|
|
||||||
github.com/containerd/errdefs/pkg v0.3.0 // indirect
|
github.com/containerd/errdefs/pkg v0.3.0 // indirect
|
||||||
github.com/containerd/log v0.1.0 // indirect
|
github.com/containerd/log v0.1.0 // indirect
|
||||||
github.com/distribution/reference v0.6.0 // indirect
|
github.com/distribution/reference v0.6.0 // indirect
|
||||||
|
|||||||
@@ -773,3 +773,32 @@ VMSnapshotRecoverTask: "Recover snapshot [{{ .snapshot }}] for virtual machine [
|
|||||||
VMSnapshotRecoverStep: "Recover virtual machine snapshot [{{ .snapshot }}]"
|
VMSnapshotRecoverStep: "Recover virtual machine snapshot [{{ .snapshot }}]"
|
||||||
VMSnapshotDeleteTask: "Delete snapshot [{{ .snapshot }}] for virtual machine [{{ .vm }}]"
|
VMSnapshotDeleteTask: "Delete snapshot [{{ .snapshot }}] for virtual machine [{{ .vm }}]"
|
||||||
VMSnapshotDeleteStep: "Delete virtual machine snapshot [{{ .snapshot }}]"
|
VMSnapshotDeleteStep: "Delete virtual machine snapshot [{{ .snapshot }}]"
|
||||||
|
|
||||||
|
ErrCAUpload: "Upload a ZIP (up to 10 MB) containing a valid self-signed CA certificate ca.crt and its matching private key ca.key, with a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
ErrCAImport: "Provide a valid self-signed root CA certificate and matching private key (up to 1 MB each), using a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
# Built-in Feishu
|
||||||
|
ErrFeishuConfig: "Resolve incompatible configuration before continuing: {{ .detail }}"
|
||||||
|
ErrFeishuConfigChanged: "Configuration changed during switching. Retry after reloading."
|
||||||
|
ErrFeishuImageRequired: "Use an image containing bundled Feishu."
|
||||||
|
ErrFeishuAlreadySwitched: "Feishu has already switched to the built-in plugin."
|
||||||
|
ErrFeishuSwitchRequired: "Switch to the built-in plugin from the Feishu channel page first."
|
||||||
|
ErrFeishuManaged: "Manage Feishu from its channel page; the plugin is updated with the image."
|
||||||
|
ErrFeishuRestore: "Failed to restore Feishu configuration: {{ .err }}"
|
||||||
|
ErrFeishuActivation: "The built-in Feishu plugin or gateway failed to start."
|
||||||
|
AgentFeishuSwitch: "Switch Feishu plugin"
|
||||||
|
AgentFeishuBackup: "Configuration backup: {{ .name }}"
|
||||||
|
AgentFeishuRestored: "Previous configuration restored."
|
||||||
|
AgentFeishuProbeWarning: "Feishu connection check failed. Check the network and credentials; the switch has been retained."
|
||||||
|
AgentFeishuVerifyMessages: "Local activation completed. Verify pairing, DMs, groups, bot routing and streaming in Feishu."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeConfirm: "Confirm the Feishu transition options on the upgrade page before retrying."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeBackup: "A full application backup is required for the Feishu compatibility upgrade."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeMounts: "These mounts cannot be fully backed up or restored. Use standard data mounts inside the application directory."
|
||||||
|
|
||||||
|
AgentFeishuRecoveryDisabled: "Gateway recovered with Feishu disabled; the original configuration backup is retained."
|
||||||
|
|
||||||
|
ContainerUpgradeWaiting: "Waiting for a container upgrade execution slot"
|
||||||
|
|||||||
@@ -773,3 +773,32 @@ VMSnapshotRecoverTask: "Restaurar instantánea [{{ .snapshot }}] para la máquin
|
|||||||
VMSnapshotRecoverStep: "Restaurar instantánea de máquina virtual [{{ .snapshot }}]"
|
VMSnapshotRecoverStep: "Restaurar instantánea de máquina virtual [{{ .snapshot }}]"
|
||||||
VMSnapshotDeleteTask: "Eliminar instantánea [{{ .snapshot }}] de la máquina virtual [{{ .vm }}]"
|
VMSnapshotDeleteTask: "Eliminar instantánea [{{ .snapshot }}] de la máquina virtual [{{ .vm }}]"
|
||||||
VMSnapshotDeleteStep: "Eliminar instantánea de máquina virtual [{{ .snapshot }}]"
|
VMSnapshotDeleteStep: "Eliminar instantánea de máquina virtual [{{ .snapshot }}]"
|
||||||
|
|
||||||
|
ErrCAUpload: "Upload a ZIP (up to 10 MB) containing a valid self-signed CA certificate ca.crt and its matching private key ca.key, with a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
ErrCAImport: "Provide a valid self-signed root CA certificate and matching private key (up to 1 MB each), using a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
# Built-in Feishu
|
||||||
|
ErrFeishuConfig: "Corrija la configuración incompatible antes de continuar: {{ .detail }}"
|
||||||
|
ErrFeishuConfigChanged: "La configuración cambió durante la transición. Recargue y reintente."
|
||||||
|
ErrFeishuImageRequired: "Use una imagen que incluya Feishu."
|
||||||
|
ErrFeishuAlreadySwitched: "Feishu ya utiliza el complemento integrado."
|
||||||
|
ErrFeishuSwitchRequired: "Cambie primero al complemento integrado desde la página del canal Feishu."
|
||||||
|
ErrFeishuManaged: "Gestione Feishu desde su canal; el complemento se actualiza con la imagen."
|
||||||
|
ErrFeishuRestore: "Error al restaurar la configuración de Feishu: {{ .err }}"
|
||||||
|
ErrFeishuActivation: "No se pudo iniciar el complemento Feishu integrado o la puerta de enlace."
|
||||||
|
AgentFeishuSwitch: "Cambiar el complemento Feishu"
|
||||||
|
AgentFeishuBackup: "Copia de configuración: {{ .name }}"
|
||||||
|
AgentFeishuRestored: "Se restauró la configuración anterior."
|
||||||
|
AgentFeishuProbeWarning: "Falló la comprobación de conexión de Feishu. Revise la red y las credenciales; se conservó el cambio."
|
||||||
|
AgentFeishuVerifyMessages: "Activación local completada. Verifique el emparejamiento, chats, grupos, rutas de bots y transmisión en Feishu."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeConfirm: "Confirme las opciones de transición de Feishu en la página de actualización."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeBackup: "La actualización de compatibilidad de Feishu requiere una copia completa de la aplicación."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeMounts: "Estos montajes no permiten una copia y restauración completas. Use los montajes de datos estándar dentro del directorio de la aplicación."
|
||||||
|
|
||||||
|
AgentFeishuRecoveryDisabled: "Puerta de enlace recuperada con Feishu desactivado; se conserva la copia de configuración original."
|
||||||
|
|
||||||
|
ContainerUpgradeWaiting: "Waiting for a container upgrade execution slot"
|
||||||
|
|||||||
@@ -774,3 +774,32 @@ VMSnapshotRecoverTask: "بازیابی اسنپشات [{{ .snapshot }}] بر
|
|||||||
VMSnapshotRecoverStep: "بازیابی اسنپشات ماشین مجازی [{{ .snapshot }}]"
|
VMSnapshotRecoverStep: "بازیابی اسنپشات ماشین مجازی [{{ .snapshot }}]"
|
||||||
VMSnapshotDeleteTask: "حذف اسنپشات [{{ .snapshot }}] برای ماشین مجازی [{{ .vm }}]"
|
VMSnapshotDeleteTask: "حذف اسنپشات [{{ .snapshot }}] برای ماشین مجازی [{{ .vm }}]"
|
||||||
VMSnapshotDeleteStep: "حذف اسنپشات ماشین مجازی [{{ .snapshot }}]"
|
VMSnapshotDeleteStep: "حذف اسنپشات ماشین مجازی [{{ .snapshot }}]"
|
||||||
|
|
||||||
|
ErrCAUpload: "Upload a ZIP (up to 10 MB) containing a valid self-signed CA certificate ca.crt and its matching private key ca.key, with a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
ErrCAImport: "Provide a valid self-signed root CA certificate and matching private key (up to 1 MB each), using a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
# Built-in Feishu
|
||||||
|
ErrFeishuConfig: "پیش از ادامه تنظیمات ناسازگار را اصلاح کنید: {{ .detail }}"
|
||||||
|
ErrFeishuConfigChanged: "تنظیمات هنگام تغییر عوض شد. صفحه را تازه و دوباره تلاش کنید."
|
||||||
|
ErrFeishuImageRequired: "از تصویری با Feishu داخلی استفاده کنید."
|
||||||
|
ErrFeishuAlreadySwitched: "Feishu قبلاً به افزونه داخلی تغییر کرده است."
|
||||||
|
ErrFeishuSwitchRequired: "ابتدا در صفحه کانال Feishu به افزونه داخلی تغییر دهید."
|
||||||
|
ErrFeishuManaged: "Feishu را از صفحه کانال مدیریت کنید؛ افزونه همراه تصویر بهروز میشود."
|
||||||
|
ErrFeishuRestore: "بازیابی تنظیمات Feishu ناموفق بود: {{ .err }}"
|
||||||
|
ErrFeishuActivation: "راهاندازی افزونه داخلی Feishu یا دروازه ناموفق بود."
|
||||||
|
AgentFeishuSwitch: "تغییر افزونه Feishu"
|
||||||
|
AgentFeishuBackup: "پشتیبان تنظیمات: {{ .name }}"
|
||||||
|
AgentFeishuRestored: "تنظیمات قبلی بازیابی شد."
|
||||||
|
AgentFeishuProbeWarning: "بررسی اتصال Feishu ناموفق بود. شبکه و اطلاعات ورود را بررسی کنید؛ تغییر حفظ شد."
|
||||||
|
AgentFeishuVerifyMessages: "فعالسازی محلی انجام شد. جفتسازی، پیام خصوصی و گروهی، مسیریابی ربات و پاسخ جریانی را در Feishu بررسی کنید."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeConfirm: "گزینههای انتقال Feishu را در صفحه ارتقا تأیید کنید."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeBackup: "ارتقای سازگاری Feishu به پشتیبان کامل برنامه نیاز دارد."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeMounts: "این اتصالهای ذخیرهسازی کاملاً قابل پشتیبانگیری و بازیابی نیستند. از مسیرهای استاندارد داده در پوشه برنامه استفاده کنید."
|
||||||
|
|
||||||
|
AgentFeishuRecoveryDisabled: "دروازه بازیابی شد و Feishu غیرفعال است؛ پشتیبان تنظیمات اصلی حفظ شد."
|
||||||
|
|
||||||
|
ContainerUpgradeWaiting: "Waiting for a container upgrade execution slot"
|
||||||
|
|||||||
@@ -773,3 +773,32 @@ VMSnapshotRecoverTask: "仮想マシン [{{ .vm }}] のスナップショット
|
|||||||
VMSnapshotRecoverStep: "仮想マシンのスナップショット [{{ .snapshot }}] を復元"
|
VMSnapshotRecoverStep: "仮想マシンのスナップショット [{{ .snapshot }}] を復元"
|
||||||
VMSnapshotDeleteTask: "仮想マシン [{{ .vm }}] のスナップショット [{{ .snapshot }}] を削除"
|
VMSnapshotDeleteTask: "仮想マシン [{{ .vm }}] のスナップショット [{{ .snapshot }}] を削除"
|
||||||
VMSnapshotDeleteStep: "仮想マシンのスナップショット [{{ .snapshot }}] を削除"
|
VMSnapshotDeleteStep: "仮想マシンのスナップショット [{{ .snapshot }}] を削除"
|
||||||
|
|
||||||
|
ErrCAUpload: "Upload a ZIP (up to 10 MB) containing a valid self-signed CA certificate ca.crt and its matching private key ca.key, with a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
ErrCAImport: "Provide a valid self-signed root CA certificate and matching private key (up to 1 MB each), using a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
# Built-in Feishu
|
||||||
|
ErrFeishuConfig: "続行前に互換性のない設定を修正してください:{{ .detail }}"
|
||||||
|
ErrFeishuConfigChanged: "切り替え中に設定が変更されました。再読み込みして再試行してください。"
|
||||||
|
ErrFeishuImageRequired: "Feishu を内蔵したイメージを使用してください。"
|
||||||
|
ErrFeishuAlreadySwitched: "Feishu は組み込みプラグインに切り替え済みです。"
|
||||||
|
ErrFeishuSwitchRequired: "先に Feishu チャネル画面で組み込みプラグインに切り替えてください。"
|
||||||
|
ErrFeishuManaged: "Feishu はチャネル画面で管理してください。プラグインはイメージとともに更新されます。"
|
||||||
|
ErrFeishuRestore: "Feishu 設定の復元に失敗しました:{{ .err }}"
|
||||||
|
ErrFeishuActivation: "組み込み Feishu プラグインまたはゲートウェイを起動できませんでした。"
|
||||||
|
AgentFeishuSwitch: "Feishu プラグインの切り替え"
|
||||||
|
AgentFeishuBackup: "設定のバックアップ:{{ .name }}"
|
||||||
|
AgentFeishuRestored: "以前の設定を復元しました。"
|
||||||
|
AgentFeishuProbeWarning: "Feishu の接続確認に失敗しました。ネットワークと認証情報を確認してください。切り替え結果は保持しています。"
|
||||||
|
AgentFeishuVerifyMessages: "ローカルの有効化が完了しました。Feishu でペアリング、個別・グループチャット、ボットルーティング、ストリーミングを確認してください。"
|
||||||
|
|
||||||
|
ErrFeishuUpgradeConfirm: "更新画面で Feishu の切り替え設定を確認してください。"
|
||||||
|
|
||||||
|
ErrFeishuUpgradeBackup: "Feishu 互換更新にはアプリ全体のバックアップが必要です。"
|
||||||
|
|
||||||
|
ErrFeishuUpgradeMounts: "現在のマウントは完全なバックアップ・復元に対応しません。アプリディレクトリ内の標準データマウントを使用してください。"
|
||||||
|
|
||||||
|
AgentFeishuRecoveryDisabled: "ゲートウェイを復旧しました。Feishu は無効のままで、元の設定のバックアップは保持しています。"
|
||||||
|
|
||||||
|
ContainerUpgradeWaiting: "Waiting for a container upgrade execution slot"
|
||||||
|
|||||||
@@ -773,3 +773,32 @@ VMSnapshotRecoverTask: "가상 머신 [{{ .vm }}] 스냅샷 [{{ .snapshot }}]
|
|||||||
VMSnapshotRecoverStep: "가상 머신 스냅샷 [{{ .snapshot }}] 복구"
|
VMSnapshotRecoverStep: "가상 머신 스냅샷 [{{ .snapshot }}] 복구"
|
||||||
VMSnapshotDeleteTask: "가상 머신 [{{ .vm }}] 스냅샷 [{{ .snapshot }}] 삭제"
|
VMSnapshotDeleteTask: "가상 머신 [{{ .vm }}] 스냅샷 [{{ .snapshot }}] 삭제"
|
||||||
VMSnapshotDeleteStep: "가상 머신 스냅샷 [{{ .snapshot }}] 삭제"
|
VMSnapshotDeleteStep: "가상 머신 스냅샷 [{{ .snapshot }}] 삭제"
|
||||||
|
|
||||||
|
ErrCAUpload: "Upload a ZIP (up to 10 MB) containing a valid self-signed CA certificate ca.crt and its matching private key ca.key, with a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
ErrCAImport: "Provide a valid self-signed root CA certificate and matching private key (up to 1 MB each), using a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
# Built-in Feishu
|
||||||
|
ErrFeishuConfig: "계속하기 전에 호환되지 않는 설정을 수정하세요: {{ .detail }}"
|
||||||
|
ErrFeishuConfigChanged: "전환 중 설정이 변경되었습니다. 새로고침 후 다시 시도하세요."
|
||||||
|
ErrFeishuImageRequired: "Feishu가 내장된 이미지를 사용하세요."
|
||||||
|
ErrFeishuAlreadySwitched: "이미 내장 Feishu 플러그인으로 전환했습니다."
|
||||||
|
ErrFeishuSwitchRequired: "먼저 Feishu 채널 페이지에서 내장 플러그인으로 전환하세요."
|
||||||
|
ErrFeishuManaged: "Feishu 채널 페이지에서 관리하세요. 플러그인은 이미지와 함께 업데이트됩니다."
|
||||||
|
ErrFeishuRestore: "Feishu 설정 복구 실패: {{ .err }}"
|
||||||
|
ErrFeishuActivation: "내장 Feishu 플러그인 또는 게이트웨이 시작에 실패했습니다."
|
||||||
|
AgentFeishuSwitch: "Feishu 플러그인 전환"
|
||||||
|
AgentFeishuBackup: "설정 백업: {{ .name }}"
|
||||||
|
AgentFeishuRestored: "이전 설정을 복구했습니다."
|
||||||
|
AgentFeishuProbeWarning: "Feishu 연결 확인에 실패했습니다. 네트워크와 자격 증명을 확인하세요. 전환 결과는 유지됩니다."
|
||||||
|
AgentFeishuVerifyMessages: "로컬 활성화가 완료되었습니다. Feishu에서 페어링, 개인 및 그룹 채팅, 봇 라우팅과 스트리밍을 확인하세요."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeConfirm: "업그레이드 화면에서 Feishu 전환 옵션을 확인하세요."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeBackup: "Feishu 호환 업그레이드에는 전체 앱 백업이 필요합니다."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeMounts: "현재 마운트는 전체 백업 및 복원을 지원하지 않습니다. 앱 디렉터리 내부의 표준 데이터 마운트를 사용하세요."
|
||||||
|
|
||||||
|
AgentFeishuRecoveryDisabled: "게이트웨이가 복구되었습니다. Feishu는 비활성 상태이며 원본 설정 백업은 유지됩니다."
|
||||||
|
|
||||||
|
ContainerUpgradeWaiting: "Waiting for a container upgrade execution slot"
|
||||||
|
|||||||
@@ -764,3 +764,32 @@ VMSnapshotRecoverTask: "ກູ້ຄືນສະແນັບຊັອດ [{{ .sn
|
|||||||
VMSnapshotRecoverStep: "ກູ້ຄືນສະແນັບຊັອດເຄື່ອງສະເໝືອນ [{{ .snapshot }}]"
|
VMSnapshotRecoverStep: "ກູ້ຄືນສະແນັບຊັອດເຄື່ອງສະເໝືອນ [{{ .snapshot }}]"
|
||||||
VMSnapshotDeleteTask: "ລຶບສະແນັບຊັອດ [{{ .snapshot }}] ຂອງເຄື່ອງສະເໝືອນ [{{ .vm }}]"
|
VMSnapshotDeleteTask: "ລຶບສະແນັບຊັອດ [{{ .snapshot }}] ຂອງເຄື່ອງສະເໝືອນ [{{ .vm }}]"
|
||||||
VMSnapshotDeleteStep: "ລຶບສະແນັບຊັອດເຄື່ອງສະເໝືອນ [{{ .snapshot }}]"
|
VMSnapshotDeleteStep: "ລຶບສະແນັບຊັອດເຄື່ອງສະເໝືອນ [{{ .snapshot }}]"
|
||||||
|
|
||||||
|
ErrCAUpload: "Upload a ZIP (up to 10 MB) containing a valid self-signed CA certificate ca.crt and its matching private key ca.key, with a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
ErrCAImport: "Provide a valid self-signed root CA certificate and matching private key (up to 1 MB each), using a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
# Built-in Feishu
|
||||||
|
ErrFeishuConfig: "ກະລຸນາແກ້ໄຂການຕັ້ງຄ່າທີ່ບໍ່ເຂົ້າກັນກ່ອນ: {{ .detail }}"
|
||||||
|
ErrFeishuConfigChanged: "ການຕັ້ງຄ່າປ່ຽນໃນລະຫວ່າງການສະຫຼັບ. ໂຫຼດໃໝ່ແລ້ວລອງອີກ."
|
||||||
|
ErrFeishuImageRequired: "ໃຊ້ອິມເມຈທີ່ມີ Feishu ໃນຕົວ."
|
||||||
|
ErrFeishuAlreadySwitched: "Feishu ໄດ້ສະຫຼັບເປັນປລັກອິນໃນຕົວແລ້ວ."
|
||||||
|
ErrFeishuSwitchRequired: "ກະລຸນາສະຫຼັບໃນໜ້າຊ່ອງ Feishu ກ່ອນ."
|
||||||
|
ErrFeishuManaged: "ຈັດການ Feishu ໃນໜ້າຊ່ອງ; ປລັກອິນອັບເດດພ້ອມອິມເມຈ."
|
||||||
|
ErrFeishuRestore: "ກູ້ຄືນການຕັ້ງຄ່າ Feishu ບໍ່ສຳເລັດ: {{ .err }}"
|
||||||
|
ErrFeishuActivation: "ປລັກອິນ Feishu ໃນຕົວ ຫຼື ເກດເວເລີ່ມບໍ່ສຳເລັດ."
|
||||||
|
AgentFeishuSwitch: "ສະຫຼັບປລັກອິນ Feishu"
|
||||||
|
AgentFeishuBackup: "ສຳຮອງການຕັ້ງຄ່າ: {{ .name }}"
|
||||||
|
AgentFeishuRestored: "ກູ້ຄືນການຕັ້ງຄ່າເດີມແລ້ວ."
|
||||||
|
AgentFeishuProbeWarning: "ກວດການເຊື່ອມຕໍ່ Feishu ບໍ່ຜ່ານ. ກວດເຄືອຂ່າຍ ແລະ ຂໍ້ມູນເຂົ້າໃຊ້; ຮັກສາຜົນການສະຫຼັບໄວ້."
|
||||||
|
AgentFeishuVerifyMessages: "ເປີດໃຊ້ພາຍໃນສຳເລັດ. ກວດການຈັບຄູ່, ແຊັດສ່ວນຕົວ, ກຸ່ມ, ເສັ້ນທາງບອດ ແລະ ສະຕຣີມໃນ Feishu."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeConfirm: "ຢືນຢັນຕົວເລືອກການປ່ຽນ Feishu ໃນໜ້າອັບເກຣດ."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeBackup: "ການອັບເກຣດ Feishu ຕ້ອງສຳຮອງແອັບທັງໝົດ."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeMounts: "ຈຸດເຊື່ອມຂໍ້ມູນນີ້ບໍ່ສາມາດສຳຮອງແລະກູ້ຄືນທັງໝົດໄດ້. ໃຊ້ຈຸດເຊື່ອມມາດຕະຖານພາຍໃນໂຟນເດີແອັບ."
|
||||||
|
|
||||||
|
AgentFeishuRecoveryDisabled: "ເກດເວກູ້ຄືນແລ້ວ ແຕ່ Feishu ຍັງປິດ; ສຳຮອງການຕັ້ງຄ່າເດີມຍັງຖືກເກັບໄວ້."
|
||||||
|
|
||||||
|
ContainerUpgradeWaiting: "Waiting for a container upgrade execution slot"
|
||||||
|
|||||||
@@ -773,3 +773,32 @@ VMSnapshotRecoverTask: "Pulihkan syot kilat [{{ .snapshot }}] untuk mesin maya [
|
|||||||
VMSnapshotRecoverStep: "Pulihkan syot kilat mesin maya [{{ .snapshot }}]"
|
VMSnapshotRecoverStep: "Pulihkan syot kilat mesin maya [{{ .snapshot }}]"
|
||||||
VMSnapshotDeleteTask: "Padam syot kilat [{{ .snapshot }}] untuk mesin maya [{{ .vm }}]"
|
VMSnapshotDeleteTask: "Padam syot kilat [{{ .snapshot }}] untuk mesin maya [{{ .vm }}]"
|
||||||
VMSnapshotDeleteStep: "Padam syot kilat mesin maya [{{ .snapshot }}]"
|
VMSnapshotDeleteStep: "Padam syot kilat mesin maya [{{ .snapshot }}]"
|
||||||
|
|
||||||
|
ErrCAUpload: "Upload a ZIP (up to 10 MB) containing a valid self-signed CA certificate ca.crt and its matching private key ca.key, with a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
ErrCAImport: "Provide a valid self-signed root CA certificate and matching private key (up to 1 MB each), using a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
# Built-in Feishu
|
||||||
|
ErrFeishuConfig: "Betulkan konfigurasi tidak serasi sebelum meneruskan: {{ .detail }}"
|
||||||
|
ErrFeishuConfigChanged: "Konfigurasi berubah semasa pertukaran. Muat semula dan cuba lagi."
|
||||||
|
ErrFeishuImageRequired: "Gunakan imej yang mengandungi Feishu terbina dalam."
|
||||||
|
ErrFeishuAlreadySwitched: "Feishu sudah menggunakan pemalam terbina dalam."
|
||||||
|
ErrFeishuSwitchRequired: "Tukar dahulu kepada pemalam terbina dalam pada halaman saluran Feishu."
|
||||||
|
ErrFeishuManaged: "Urus Feishu pada halaman salurannya; pemalam dikemas kini bersama imej."
|
||||||
|
ErrFeishuRestore: "Gagal memulihkan konfigurasi Feishu: {{ .err }}"
|
||||||
|
ErrFeishuActivation: "Pemalam Feishu terbina dalam atau gerbang gagal dimulakan."
|
||||||
|
AgentFeishuSwitch: "Tukar pemalam Feishu"
|
||||||
|
AgentFeishuBackup: "Sandaran konfigurasi: {{ .name }}"
|
||||||
|
AgentFeishuRestored: "Konfigurasi sebelumnya dipulihkan."
|
||||||
|
AgentFeishuProbeWarning: "Semakan sambungan Feishu gagal. Semak rangkaian dan kelayakan; pertukaran dikekalkan."
|
||||||
|
AgentFeishuVerifyMessages: "Pengaktifan setempat selesai. Sahkan pasangan, mesej peribadi, kumpulan, penghalaan bot dan penstriman dalam Feishu."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeConfirm: "Sahkan pilihan peralihan Feishu pada halaman naik taraf."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeBackup: "Naik taraf keserasian Feishu memerlukan sandaran aplikasi penuh."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeMounts: "Lekapan ini tidak boleh disandar dan dipulihkan sepenuhnya. Gunakan lekapan data standard dalam direktori aplikasi."
|
||||||
|
|
||||||
|
AgentFeishuRecoveryDisabled: "Gerbang dipulihkan dengan Feishu dinyahaktifkan; sandaran konfigurasi asal dikekalkan."
|
||||||
|
|
||||||
|
ContainerUpgradeWaiting: "Waiting for a container upgrade execution slot"
|
||||||
|
|||||||
@@ -773,3 +773,32 @@ VMSnapshotRecoverTask: "Restaurar snapshot [{{ .snapshot }}] da máquina virtual
|
|||||||
VMSnapshotRecoverStep: "Restaurar snapshot da máquina virtual [{{ .snapshot }}]"
|
VMSnapshotRecoverStep: "Restaurar snapshot da máquina virtual [{{ .snapshot }}]"
|
||||||
VMSnapshotDeleteTask: "Excluir snapshot [{{ .snapshot }}] da máquina virtual [{{ .vm }}]"
|
VMSnapshotDeleteTask: "Excluir snapshot [{{ .snapshot }}] da máquina virtual [{{ .vm }}]"
|
||||||
VMSnapshotDeleteStep: "Excluir snapshot da máquina virtual [{{ .snapshot }}]"
|
VMSnapshotDeleteStep: "Excluir snapshot da máquina virtual [{{ .snapshot }}]"
|
||||||
|
|
||||||
|
ErrCAUpload: "Upload a ZIP (up to 10 MB) containing a valid self-signed CA certificate ca.crt and its matching private key ca.key, with a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
ErrCAImport: "Provide a valid self-signed root CA certificate and matching private key (up to 1 MB each), using a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
# Built-in Feishu
|
||||||
|
ErrFeishuConfig: "Corrija a configuração incompatível antes de continuar: {{ .detail }}"
|
||||||
|
ErrFeishuConfigChanged: "A configuração mudou durante a troca. Recarregue e tente novamente."
|
||||||
|
ErrFeishuImageRequired: "Use uma imagem com Feishu integrado."
|
||||||
|
ErrFeishuAlreadySwitched: "O Feishu já usa o plugin integrado."
|
||||||
|
ErrFeishuSwitchRequired: "Primeiro troque para o plugin integrado na página do canal Feishu."
|
||||||
|
ErrFeishuManaged: "Gerencie o Feishu pela página do canal; o plugin é atualizado com a imagem."
|
||||||
|
ErrFeishuRestore: "Falha ao restaurar a configuração do Feishu: {{ .err }}"
|
||||||
|
ErrFeishuActivation: "Falha ao iniciar o plugin Feishu integrado ou o gateway."
|
||||||
|
AgentFeishuSwitch: "Trocar plugin Feishu"
|
||||||
|
AgentFeishuBackup: "Backup da configuração: {{ .name }}"
|
||||||
|
AgentFeishuRestored: "Configuração anterior restaurada."
|
||||||
|
AgentFeishuProbeWarning: "Falha na verificação de conexão do Feishu. Verifique a rede e as credenciais; a troca foi mantida."
|
||||||
|
AgentFeishuVerifyMessages: "Ativação local concluída. Verifique pareamento, conversas, grupos, rotas de bots e streaming no Feishu."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeConfirm: "Confirme as opções de transição do Feishu na página de atualização."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeBackup: "A atualização de compatibilidade do Feishu exige backup completo do aplicativo."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeMounts: "Estas montagens não permitem backup e restauração completos. Use montagens de dados padrão dentro do diretório do aplicativo."
|
||||||
|
|
||||||
|
AgentFeishuRecoveryDisabled: "Gateway recuperado com Feishu desativado; o backup da configuração original foi mantido."
|
||||||
|
|
||||||
|
ContainerUpgradeWaiting: "Waiting for a container upgrade execution slot"
|
||||||
|
|||||||
@@ -773,3 +773,32 @@ VMSnapshotRecoverTask: "Восстановить снимок [{{ .snapshot }}]
|
|||||||
VMSnapshotRecoverStep: "Восстановить снимок виртуальной машины [{{ .snapshot }}]"
|
VMSnapshotRecoverStep: "Восстановить снимок виртуальной машины [{{ .snapshot }}]"
|
||||||
VMSnapshotDeleteTask: "Удалить снимок [{{ .snapshot }}] виртуальной машины [{{ .vm }}]"
|
VMSnapshotDeleteTask: "Удалить снимок [{{ .snapshot }}] виртуальной машины [{{ .vm }}]"
|
||||||
VMSnapshotDeleteStep: "Удалить снимок виртуальной машины [{{ .snapshot }}]"
|
VMSnapshotDeleteStep: "Удалить снимок виртуальной машины [{{ .snapshot }}]"
|
||||||
|
|
||||||
|
ErrCAUpload: "Upload a ZIP (up to 10 MB) containing a valid self-signed CA certificate ca.crt and its matching private key ca.key, with a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
ErrCAImport: "Provide a valid self-signed root CA certificate and matching private key (up to 1 MB each), using a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
# Built-in Feishu
|
||||||
|
ErrFeishuConfig: "Исправьте несовместимые настройки перед продолжением: {{ .detail }}"
|
||||||
|
ErrFeishuConfigChanged: "Настройки изменились во время переключения. Обновите страницу и повторите."
|
||||||
|
ErrFeishuImageRequired: "Используйте образ со встроенным Feishu."
|
||||||
|
ErrFeishuAlreadySwitched: "Feishu уже переключён на встроенный плагин."
|
||||||
|
ErrFeishuSwitchRequired: "Сначала перейдите на встроенный плагин на странице канала Feishu."
|
||||||
|
ErrFeishuManaged: "Управляйте Feishu на странице канала; плагин обновляется с образом."
|
||||||
|
ErrFeishuRestore: "Не удалось восстановить настройки Feishu: {{ .err }}"
|
||||||
|
ErrFeishuActivation: "Не удалось запустить встроенный плагин Feishu или шлюз."
|
||||||
|
AgentFeishuSwitch: "Переключить плагин Feishu"
|
||||||
|
AgentFeishuBackup: "Резервная копия настроек: {{ .name }}"
|
||||||
|
AgentFeishuRestored: "Прежние настройки восстановлены."
|
||||||
|
AgentFeishuProbeWarning: "Проверка подключения Feishu не пройдена. Проверьте сеть и учётные данные; переключение сохранено."
|
||||||
|
AgentFeishuVerifyMessages: "Локальная активация завершена. Проверьте сопряжение, личные и групповые сообщения, маршрутизацию ботов и потоковые ответы в Feishu."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeConfirm: "Подтвердите параметры перехода Feishu на странице обновления."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeBackup: "Для обновления совместимости Feishu нужна полная резервная копия приложения."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeMounts: "Эти монтирования не поддерживают полное резервное копирование и восстановление. Используйте стандартные данные внутри каталога приложения."
|
||||||
|
|
||||||
|
AgentFeishuRecoveryDisabled: "Шлюз восстановлен, Feishu отключён; исходная резервная копия конфигурации сохранена."
|
||||||
|
|
||||||
|
ContainerUpgradeWaiting: "Waiting for a container upgrade execution slot"
|
||||||
|
|||||||
@@ -773,3 +773,32 @@ VMSnapshotRecoverTask: "Sanal makine [{{ .vm }}] anlık görüntüsü [{{ .snaps
|
|||||||
VMSnapshotRecoverStep: "Sanal makine anlık görüntüsü [{{ .snapshot }}] geri yükle"
|
VMSnapshotRecoverStep: "Sanal makine anlık görüntüsü [{{ .snapshot }}] geri yükle"
|
||||||
VMSnapshotDeleteTask: "Sanal makine [{{ .vm }}] anlık görüntüsü [{{ .snapshot }}] sil"
|
VMSnapshotDeleteTask: "Sanal makine [{{ .vm }}] anlık görüntüsü [{{ .snapshot }}] sil"
|
||||||
VMSnapshotDeleteStep: "Sanal makine anlık görüntüsü [{{ .snapshot }}] sil"
|
VMSnapshotDeleteStep: "Sanal makine anlık görüntüsü [{{ .snapshot }}] sil"
|
||||||
|
|
||||||
|
ErrCAUpload: "Upload a ZIP (up to 10 MB) containing a valid self-signed CA certificate ca.crt and its matching private key ca.key, with a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
ErrCAImport: "Provide a valid self-signed root CA certificate and matching private key (up to 1 MB each), using a supported RSA or EC algorithm."
|
||||||
|
|
||||||
|
# Built-in Feishu
|
||||||
|
ErrFeishuConfig: "Devam etmeden önce uyumsuz ayarları düzeltin: {{ .detail }}"
|
||||||
|
ErrFeishuConfigChanged: "Geçiş sırasında ayarlar değişti. Yenileyip tekrar deneyin."
|
||||||
|
ErrFeishuImageRequired: "Yerleşik Feishu içeren bir imaj kullanın."
|
||||||
|
ErrFeishuAlreadySwitched: "Feishu zaten yerleşik eklentiye geçti."
|
||||||
|
ErrFeishuSwitchRequired: "Önce Feishu kanal sayfasından yerleşik eklentiye geçin."
|
||||||
|
ErrFeishuManaged: "Feishu kanal sayfasından yönetin; eklenti imajla güncellenir."
|
||||||
|
ErrFeishuRestore: "Feishu ayarları geri yüklenemedi: {{ .err }}"
|
||||||
|
ErrFeishuActivation: "Yerleşik Feishu eklentisi veya ağ geçidi başlatılamadı."
|
||||||
|
AgentFeishuSwitch: "Feishu eklentisini değiştir"
|
||||||
|
AgentFeishuBackup: "Ayar yedeği: {{ .name }}"
|
||||||
|
AgentFeishuRestored: "Önceki ayarlar geri yüklendi."
|
||||||
|
AgentFeishuProbeWarning: "Feishu bağlantı kontrolü başarısız. Ağı ve kimlik bilgilerini kontrol edin; geçiş korundu."
|
||||||
|
AgentFeishuVerifyMessages: "Yerel etkinleştirme tamamlandı. Feishu üzerinden eşleştirmeyi, özel ve grup mesajlarını, bot yönlendirmesini ve akışı doğrulayın."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeConfirm: "Yükseltme sayfasında Feishu geçiş seçeneklerini onaylayın."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeBackup: "Feishu uyumluluk yükseltmesi tam uygulama yedeği gerektirir."
|
||||||
|
|
||||||
|
ErrFeishuUpgradeMounts: "Bu bağlamalar tam yedeklenip geri yüklenemiyor. Uygulama dizinindeki standart veri bağlamalarını kullanın."
|
||||||
|
|
||||||
|
AgentFeishuRecoveryDisabled: "Ağ geçidi kurtarıldı, Feishu kapalı; özgün yapılandırma yedeği korundu."
|
||||||
|
|
||||||
|
ContainerUpgradeWaiting: "Waiting for a container upgrade execution slot"
|
||||||
|
|||||||
@@ -773,3 +773,32 @@ VMSnapshotRecoverTask: "復原虛擬機 [{{ .vm }}] 快照 [{{ .snapshot }}]"
|
|||||||
VMSnapshotRecoverStep: "復原虛擬機快照 [{{ .snapshot }}]"
|
VMSnapshotRecoverStep: "復原虛擬機快照 [{{ .snapshot }}]"
|
||||||
VMSnapshotDeleteTask: "刪除虛擬機 [{{ .vm }}] 快照 [{{ .snapshot }}]"
|
VMSnapshotDeleteTask: "刪除虛擬機 [{{ .vm }}] 快照 [{{ .snapshot }}]"
|
||||||
VMSnapshotDeleteStep: "刪除虛擬機快照 [{{ .snapshot }}]"
|
VMSnapshotDeleteStep: "刪除虛擬機快照 [{{ .snapshot }}]"
|
||||||
|
|
||||||
|
ErrCAUpload: "請上傳包含有效自簽根憑證 ca.crt 及匹配私鑰 ca.key 的 ZIP 檔案(最大 10 MB),金鑰演算法須為支援的 RSA 或 EC。"
|
||||||
|
|
||||||
|
ErrCAImport: "請提供有效的自簽根憑證及匹配私鑰(每個最大 1 MB),金鑰演算法須為支援的 RSA 或 EC。"
|
||||||
|
|
||||||
|
# Built-in Feishu
|
||||||
|
ErrFeishuConfig: "請先處理不相容的設定:{{ .detail }}"
|
||||||
|
ErrFeishuConfigChanged: "切換期間設定已變更,請重新整理後重試。"
|
||||||
|
ErrFeishuImageRequired: "請使用包含內建飛書外掛的映像。"
|
||||||
|
ErrFeishuAlreadySwitched: "飛書已切換至內建外掛。"
|
||||||
|
ErrFeishuSwitchRequired: "請先在飛書管道頁面切換至內建外掛。"
|
||||||
|
ErrFeishuManaged: "請在飛書管道頁面管理,外掛隨映像更新。"
|
||||||
|
ErrFeishuRestore: "還原飛書設定失敗:{{ .err }}"
|
||||||
|
ErrFeishuActivation: "內建飛書外掛或閘道啟動失敗。"
|
||||||
|
AgentFeishuSwitch: "切換飛書外掛"
|
||||||
|
AgentFeishuBackup: "設定備份:{{ .name }}"
|
||||||
|
AgentFeishuRestored: "已還原切換前的設定。"
|
||||||
|
AgentFeishuProbeWarning: "飛書連線檢查未通過,請檢查網路和憑證;已保留切換結果。"
|
||||||
|
AgentFeishuVerifyMessages: "本機啟用完成,請在飛書驗證配對、私聊、群聊、機器人路由和串流回覆。"
|
||||||
|
|
||||||
|
ErrFeishuUpgradeConfirm: "請在升級頁面確認飛書切換選項後重試。"
|
||||||
|
|
||||||
|
ErrFeishuUpgradeBackup: "飛書相容升級必須開啟完整應用程式備份。"
|
||||||
|
|
||||||
|
ErrFeishuUpgradeMounts: "目前掛載無法完整備份或還原,請使用應用程式目錄內的標準資料掛載。"
|
||||||
|
|
||||||
|
AgentFeishuRecoveryDisabled: "閘道已恢復,飛書保持停用;原設定備份已保留。"
|
||||||
|
|
||||||
|
ContainerUpgradeWaiting: "等待容器升級任務執行名額"
|
||||||
|
|||||||
@@ -773,3 +773,32 @@ VMSnapshotRecoverTask: "恢复虚拟机 [{{ .vm }}] 快照 [{{ .snapshot }}]"
|
|||||||
VMSnapshotRecoverStep: "恢复虚拟机快照 [{{ .snapshot }}]"
|
VMSnapshotRecoverStep: "恢复虚拟机快照 [{{ .snapshot }}]"
|
||||||
VMSnapshotDeleteTask: "删除虚拟机 [{{ .vm }}] 快照 [{{ .snapshot }}]"
|
VMSnapshotDeleteTask: "删除虚拟机 [{{ .vm }}] 快照 [{{ .snapshot }}]"
|
||||||
VMSnapshotDeleteStep: "删除虚拟机快照 [{{ .snapshot }}]"
|
VMSnapshotDeleteStep: "删除虚拟机快照 [{{ .snapshot }}]"
|
||||||
|
|
||||||
|
ErrCAUpload: "请上传包含有效自签根证书 ca.crt 及匹配私钥 ca.key 的 ZIP 文件(最大 10 MB),密钥算法须为支持的 RSA 或 EC。"
|
||||||
|
|
||||||
|
ErrCAImport: "请提供有效的自签根证书及匹配私钥(每个最大 1 MB),密钥算法须为支持的 RSA 或 EC。"
|
||||||
|
|
||||||
|
# Built-in Feishu
|
||||||
|
ErrFeishuConfig: "请先处理不兼容的配置:{{ .detail }}"
|
||||||
|
ErrFeishuConfigChanged: "切换期间配置已改变,请刷新后重试。"
|
||||||
|
ErrFeishuImageRequired: "请使用包含内置飞书插件的镜像。"
|
||||||
|
ErrFeishuAlreadySwitched: "飞书已切换到内置插件。"
|
||||||
|
ErrFeishuSwitchRequired: "请先在飞书渠道页面切换到内置插件。"
|
||||||
|
ErrFeishuManaged: "请在飞书渠道页面管理,插件随镜像更新。"
|
||||||
|
ErrFeishuRestore: "恢复飞书配置失败:{{ .err }}"
|
||||||
|
ErrFeishuActivation: "内置飞书插件或网关启动失败。"
|
||||||
|
AgentFeishuSwitch: "切换飞书插件"
|
||||||
|
AgentFeishuBackup: "配置备份:{{ .name }}"
|
||||||
|
AgentFeishuRestored: "已恢复切换前的配置。"
|
||||||
|
AgentFeishuProbeWarning: "飞书连接检查未通过,请检查网络和凭据;已保留切换结果。"
|
||||||
|
AgentFeishuVerifyMessages: "本地启用完成,请在飞书中验证配对、私聊、群聊、机器人路由和流式回复。"
|
||||||
|
|
||||||
|
ErrFeishuUpgradeConfirm: "请在升级页面确认飞书切换选项后重试。"
|
||||||
|
|
||||||
|
ErrFeishuUpgradeBackup: "飞书兼容升级必须开启完整应用备份。"
|
||||||
|
|
||||||
|
ErrFeishuUpgradeMounts: "当前挂载无法完整备份或恢复,请使用应用目录内的标准数据挂载后重试。"
|
||||||
|
|
||||||
|
AgentFeishuRecoveryDisabled: "网关已恢复,飞书保持停用;原配置备份已保留。"
|
||||||
|
|
||||||
|
ContainerUpgradeWaiting: "等待容器升级任务执行名额"
|
||||||
|
|||||||
@@ -117,6 +117,8 @@ func agentDBMigrations() []*gormigrate.Migration {
|
|||||||
migrations.AddVLLMSampleInterval,
|
migrations.AddVLLMSampleInterval,
|
||||||
migrations.AddNativeAgentInstalls,
|
migrations.AddNativeAgentInstalls,
|
||||||
migrations.AddQuickDirectory,
|
migrations.AddQuickDirectory,
|
||||||
|
migrations.AddLocalModelAccountLink,
|
||||||
|
migrations.AddOllamaModelAccountSync,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1895,3 +1895,47 @@ var AddQuickDirectory = &gormigrate.Migration{
|
|||||||
return tx.AutoMigrate(&model.QuickDirectory{})
|
return tx.AutoMigrate(&model.QuickDirectory{})
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var AddLocalModelAccountLink = &gormigrate.Migration{
|
||||||
|
ID: "20261023-add-local-model-account-link",
|
||||||
|
Migrate: func(tx *gorm.DB) error {
|
||||||
|
return tx.AutoMigrate(&model.AgentAccount{})
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var AddOllamaModelAccountSync = &gormigrate.Migration{
|
||||||
|
ID: "20261026-add-ollama-model-account-sync",
|
||||||
|
Migrate: func(tx *gorm.DB) error {
|
||||||
|
if err := tx.AutoMigrate(&model.AppInstall{}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var accounts []model.AgentAccount
|
||||||
|
if err := tx.Where("provider = ? AND app_install_id > 0", "ollama").Find(&accounts).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, account := range accounts {
|
||||||
|
var install model.AppInstall
|
||||||
|
if err := tx.Preload("App").First(&install, account.AppInstallID).Error; err != nil {
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if install.App.Key != "ollama" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
addressType := "custom"
|
||||||
|
if strings.TrimRight(account.BaseURL, "/") == fmt.Sprintf("http://%s:11434/v1", install.ContainerName) {
|
||||||
|
addressType = "container"
|
||||||
|
}
|
||||||
|
if err := tx.Model(&model.AppInstall{}).Where("id = ?", account.AppInstallID).Updates(map[string]interface{}{
|
||||||
|
"sync_model_account": true,
|
||||||
|
"model_account_base_url_type": addressType,
|
||||||
|
"model_account_base_url": account.BaseURL,
|
||||||
|
}).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,123 @@
|
|||||||
|
package router
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"io"
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto/response"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/service"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/middleware"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/mcpapi"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/mcpruntime"
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
)
|
||||||
|
|
||||||
|
func registerMCPRuntime(engine *gin.Engine) {
|
||||||
|
controller := mcpruntime.New()
|
||||||
|
engine.POST("/internal/mcp/docker", mcpDockerHandler(controller))
|
||||||
|
engine.POST("/internal/mcp/website", mcpWebsiteHandler(service.NewMCPWebsiteBindingService()))
|
||||||
|
engine.GET(mcpapi.CapabilitiesPath, middleware.Certificate(), mcpCapabilitiesHandler())
|
||||||
|
}
|
||||||
|
|
||||||
|
type mcpWebsiteController interface {
|
||||||
|
Handle(context.Context, request.MCPWebsiteBinding) response.MCPWebsiteBinding
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpWebsiteHandler(controller mcpWebsiteController) gin.HandlerFunc {
|
||||||
|
return func(ctx *gin.Context) {
|
||||||
|
local, ok := ctx.Request.Context().Value(http.LocalAddrContextKey).(net.Addr)
|
||||||
|
if !global.IsMaster || !ok || local.Network() != "unix" {
|
||||||
|
ctx.AbortWithStatus(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
data, err := io.ReadAll(io.LimitReader(ctx.Request.Body, 16385))
|
||||||
|
if err != nil || len(data) > 16384 {
|
||||||
|
ctx.AbortWithStatus(http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var req request.MCPWebsiteBinding
|
||||||
|
decoder := json.NewDecoder(bytes.NewReader(data))
|
||||||
|
decoder.DisallowUnknownFields()
|
||||||
|
if decoder.Decode(&req) != nil || decoder.Decode(new(any)) != io.EOF {
|
||||||
|
ctx.AbortWithStatus(http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Header("Cache-Control", "no-store")
|
||||||
|
ctx.JSON(http.StatusOK, controller.Handle(ctx.Request.Context(), req))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpCapabilitiesHandler() gin.HandlerFunc {
|
||||||
|
return func(ctx *gin.Context) {
|
||||||
|
if !mcpapi.TrustedTransport(ctx.Request) {
|
||||||
|
ctx.AbortWithStatus(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.JSON(http.StatusOK, gin.H{"contractVersion": mcpapi.ContractVersion, "features": []string{
|
||||||
|
"operation-bound-identity", "stable-node-target", "resource-guards",
|
||||||
|
}})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type mcpDockerController interface {
|
||||||
|
Handle(context.Context, mcpruntime.Request) (mcpruntime.Response, error)
|
||||||
|
HandleWithProgress(context.Context, mcpruntime.Request, func(mcpruntime.PullProgress) error) (mcpruntime.Response, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpDockerHandler(controller mcpDockerController) gin.HandlerFunc {
|
||||||
|
return func(ctx *gin.Context) {
|
||||||
|
local, ok := ctx.Request.Context().Value(http.LocalAddrContextKey).(net.Addr)
|
||||||
|
if !global.IsMaster || !ok || local.Network() != "unix" {
|
||||||
|
ctx.AbortWithStatus(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
data, err := io.ReadAll(io.LimitReader(ctx.Request.Body, 8193))
|
||||||
|
if err != nil || len(data) > 8192 {
|
||||||
|
ctx.AbortWithStatus(http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var req mcpruntime.Request
|
||||||
|
decoder := json.NewDecoder(bytes.NewReader(data))
|
||||||
|
decoder.DisallowUnknownFields()
|
||||||
|
if decoder.Decode(&req) != nil || decoder.Decode(new(any)) != io.EOF {
|
||||||
|
ctx.AbortWithStatus(http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if req.StreamProgress {
|
||||||
|
if req.Operation != "pull" {
|
||||||
|
ctx.JSON(http.StatusBadRequest, mcpruntime.Response{Error: "MCP Docker progress is only available when pulling an image"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Header("Content-Type", "application/x-ndjson")
|
||||||
|
ctx.Header("Cache-Control", "no-store")
|
||||||
|
ctx.Status(http.StatusOK)
|
||||||
|
encoder := json.NewEncoder(ctx.Writer)
|
||||||
|
_, err := controller.HandleWithProgress(ctx.Request.Context(), req, func(progress mcpruntime.PullProgress) error {
|
||||||
|
if err := encoder.Encode(mcpruntime.PullEvent{Type: "progress", PullProgress: progress}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
ctx.Writer.Flush()
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
result := mcpruntime.PullEvent{Type: "result"}
|
||||||
|
if err != nil {
|
||||||
|
result.Error = err.Error()
|
||||||
|
}
|
||||||
|
_ = encoder.Encode(result)
|
||||||
|
ctx.Writer.Flush()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
response, err := controller.Handle(ctx.Request.Context(), req)
|
||||||
|
if err != nil {
|
||||||
|
ctx.JSON(http.StatusBadRequest, mcpruntime.Response{Error: err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.JSON(http.StatusOK, response)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@ package router
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
v2 "github.com/1Panel-dev/1Panel/agent/app/api/v2"
|
v2 "github.com/1Panel-dev/1Panel/agent/app/api/v2"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/service"
|
||||||
"github.com/1Panel-dev/1Panel/agent/global"
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
"github.com/1Panel-dev/1Panel/agent/i18n"
|
"github.com/1Panel-dev/1Panel/agent/i18n"
|
||||||
"github.com/1Panel-dev/1Panel/agent/middleware"
|
"github.com/1Panel-dev/1Panel/agent/middleware"
|
||||||
@@ -14,14 +15,20 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func Routers() *gin.Engine {
|
func Routers() *gin.Engine {
|
||||||
|
if err := service.ConfigurePanelMCPTasks(); err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
Router = gin.Default()
|
Router = gin.Default()
|
||||||
Router.Use(i18n.UseI18n())
|
Router.Use(i18n.UseI18n())
|
||||||
|
registerMCPRuntime(Router)
|
||||||
|
|
||||||
PrivateGroup := Router.Group("/api/v2")
|
PrivateGroup := Router.Group("/api/v2")
|
||||||
if !global.IsMaster {
|
if !global.IsMaster {
|
||||||
PrivateGroup.Use(middleware.Certificate())
|
PrivateGroup.Use(middleware.Certificate())
|
||||||
}
|
}
|
||||||
PrivateGroup.Use(middleware.OperationResolveMeta())
|
PrivateGroup.Use(middleware.OperationResolveMeta())
|
||||||
|
PrivateGroup.Use(v2.PanelMCPTaskAccess())
|
||||||
|
PrivateGroup.Use(v2.MCPBusinessDispatch())
|
||||||
for _, router := range rou.RouterGroupApp {
|
for _, router := range rou.RouterGroupApp {
|
||||||
router.InitRouter(PrivateGroup)
|
router.InitRouter(PrivateGroup)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,10 +10,15 @@ import (
|
|||||||
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
||||||
"github.com/1Panel-dev/1Panel/agent/global"
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/cmd"
|
"github.com/1Panel-dev/1Panel/agent/utils/cmd"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/mcpapi"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/xpack"
|
"github.com/1Panel-dev/1Panel/agent/utils/xpack"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var loadNodeProxyID = func() (string, error) {
|
||||||
|
return cmd.NewCommandMgr(cmd.WithTimeout(20*time.Second)).RunWithStdout("cat", "/etc/1panel/.nodeProxyID")
|
||||||
|
}
|
||||||
|
|
||||||
func Certificate() gin.HandlerFunc {
|
func Certificate() gin.HandlerFunc {
|
||||||
return func(c *gin.Context) {
|
return func(c *gin.Context) {
|
||||||
if global.IsMaster {
|
if global.IsMaster {
|
||||||
@@ -25,16 +30,23 @@ func Certificate() gin.HandlerFunc {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
conn := c.Request.Header.Get("Connection")
|
conn := c.Request.Header.Get("Connection")
|
||||||
if conn == "Upgrade" {
|
mcpRequest, _ := mcpapi.Check(c.Request)
|
||||||
|
mcpTransport := mcpRequest || c.Request.URL.Path == mcpapi.CapabilitiesPath
|
||||||
|
if conn == "Upgrade" && !mcpTransport {
|
||||||
c.Next()
|
c.Next()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
masterProxyID := c.Request.Header.Get("Proxy-Id")
|
masterProxyID := c.Request.Header.Get("Proxy-Id")
|
||||||
proxyID, err := cmd.NewCommandMgr(cmd.WithTimeout(20*time.Second)).RunWithStdout("cat", "/etc/1panel/.nodeProxyID")
|
proxyID, err := loadNodeProxyID()
|
||||||
|
if mcpTransport && (err != nil || strings.TrimSpace(proxyID) == "" || strings.TrimSpace(proxyID) != strings.TrimSpace(masterProxyID)) {
|
||||||
|
c.AbortWithStatus(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
if err == nil && len(proxyID) != 0 && strings.TrimSpace(proxyID) != strings.TrimSpace(masterProxyID) {
|
if err == nil && len(proxyID) != 0 && strings.TrimSpace(proxyID) != strings.TrimSpace(masterProxyID) {
|
||||||
helper.InternalServer(c, fmt.Errorf("err proxy id"))
|
helper.InternalServer(c, fmt.Errorf("err proxy id"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
c.Request = mcpapi.BindVerifiedNodeTransport(c.Request)
|
||||||
c.Next()
|
c.Next()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ func (a *AIToolsRouter) InitRouter(Router *gin.RouterGroup) {
|
|||||||
aiToolsRouter.POST("/ollama/model", baseApi.CreateOllamaModel)
|
aiToolsRouter.POST("/ollama/model", baseApi.CreateOllamaModel)
|
||||||
aiToolsRouter.POST("/ollama/model/recreate", baseApi.RecreateOllamaModel)
|
aiToolsRouter.POST("/ollama/model/recreate", baseApi.RecreateOllamaModel)
|
||||||
aiToolsRouter.POST("/ollama/model/search", baseApi.SearchOllamaModel)
|
aiToolsRouter.POST("/ollama/model/search", baseApi.SearchOllamaModel)
|
||||||
aiToolsRouter.POST("/ollama/model/sync", baseApi.SyncOllamaModel)
|
aiToolsRouter.POST("/ollama/account/sync", baseApi.SyncOllamaModelAccount)
|
||||||
aiToolsRouter.POST("/ollama/model/load", baseApi.LoadOllamaModelDetail)
|
aiToolsRouter.POST("/ollama/model/load", baseApi.LoadOllamaModelDetail)
|
||||||
aiToolsRouter.POST("/ollama/model/del", baseApi.DeleteOllamaModel)
|
aiToolsRouter.POST("/ollama/model/del", baseApi.DeleteOllamaModel)
|
||||||
aiToolsRouter.POST("/domain/bind", baseApi.BindDomain)
|
aiToolsRouter.POST("/domain/bind", baseApi.BindDomain)
|
||||||
@@ -91,6 +91,7 @@ func (a *AIToolsRouter) InitRouter(Router *gin.RouterGroup) {
|
|||||||
aiToolsRouter.POST("/agents/agent/md/update", baseApi.UpdateAgentRoleMarkdownFile)
|
aiToolsRouter.POST("/agents/agent/md/update", baseApi.UpdateAgentRoleMarkdownFile)
|
||||||
aiToolsRouter.POST("/agents/channel/feishu/get", baseApi.GetAgentFeishuConfig)
|
aiToolsRouter.POST("/agents/channel/feishu/get", baseApi.GetAgentFeishuConfig)
|
||||||
aiToolsRouter.POST("/agents/channel/feishu/update", baseApi.UpdateAgentFeishuConfig)
|
aiToolsRouter.POST("/agents/channel/feishu/update", baseApi.UpdateAgentFeishuConfig)
|
||||||
|
aiToolsRouter.POST("/agents/channel/feishu/switch", baseApi.SwitchAgentFeishuPlugin)
|
||||||
aiToolsRouter.POST("/agents/channel/telegram/get", baseApi.GetAgentTelegramConfig)
|
aiToolsRouter.POST("/agents/channel/telegram/get", baseApi.GetAgentTelegramConfig)
|
||||||
aiToolsRouter.POST("/agents/channel/telegram/update", baseApi.UpdateAgentTelegramConfig)
|
aiToolsRouter.POST("/agents/channel/telegram/update", baseApi.UpdateAgentTelegramConfig)
|
||||||
aiToolsRouter.POST("/agents/channel/discord/get", baseApi.GetAgentDiscordConfig)
|
aiToolsRouter.POST("/agents/channel/discord/get", baseApi.GetAgentDiscordConfig)
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ func (a *WebsiteCARouter) InitRouter(Router *gin.RouterGroup) {
|
|||||||
|
|
||||||
baseApi := v2.ApiGroupApp.BaseApi
|
baseApi := v2.ApiGroupApp.BaseApi
|
||||||
{
|
{
|
||||||
|
groupRouter.POST("/import", baseApi.ImportWebsiteCA)
|
||||||
|
groupRouter.POST("/upload", baseApi.UploadWebsiteCA)
|
||||||
groupRouter.POST("/search", baseApi.PageWebsiteCA)
|
groupRouter.POST("/search", baseApi.PageWebsiteCA)
|
||||||
groupRouter.POST("", baseApi.CreateWebsiteCA)
|
groupRouter.POST("", baseApi.CreateWebsiteCA)
|
||||||
groupRouter.POST("/del", baseApi.DeleteWebsiteCA)
|
groupRouter.POST("/del", baseApi.DeleteWebsiteCA)
|
||||||
|
|||||||
@@ -104,6 +104,7 @@ func pullComposeImages(filePath string, forcePull bool, task *task.Task, project
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
defer dockerCLi.Close()
|
||||||
for _, image := range images {
|
for _, image := range images {
|
||||||
if !forcePull {
|
if !forcePull {
|
||||||
if exist, _ := dockerCLi.ImageExists(image); exist {
|
if exist, _ := dockerCLi.ImageExists(image); exist {
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import (
|
|||||||
"github.com/1Panel-dev/1Panel/agent/app/model"
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/task"
|
"github.com/1Panel-dev/1Panel/agent/app/task"
|
||||||
"github.com/1Panel-dev/1Panel/agent/global"
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
|
"github.com/distribution/reference"
|
||||||
"github.com/docker/cli/cli/config"
|
"github.com/docker/cli/cli/config"
|
||||||
"github.com/docker/docker/api/types"
|
"github.com/docker/docker/api/types"
|
||||||
"github.com/docker/docker/api/types/container"
|
"github.com/docker/docker/api/types/container"
|
||||||
@@ -197,12 +198,22 @@ func setLog(id, newLastLine string, task *task.Task) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c Client) PullImageWithProcessAndOptions(task *task.Task, imageName string, options image.PullOptions) error {
|
func (c Client) PullImageWithProcessAndOptions(task *task.Task, imageName string, options image.PullOptions) error {
|
||||||
out, err := c.cli.ImagePull(context.Background(), imageName, options)
|
return c.PullImageWithProcessAndOptionsContext(context.Background(), task, imageName, options)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c Client) PullImageWithProcessAndOptionsContext(ctx context.Context, task *task.Task, imageName string, options image.PullOptions) error {
|
||||||
|
out, err := c.cli.ImagePull(ctx, imageName, options)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer out.Close()
|
defer out.Close()
|
||||||
return handlePullImageProcess(out, task)
|
stopClose := context.AfterFunc(ctx, func() { _ = out.Close() })
|
||||||
|
defer stopClose()
|
||||||
|
err = handlePullImageProcess(out, task)
|
||||||
|
if ctx.Err() != nil {
|
||||||
|
return ctx.Err()
|
||||||
|
}
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func handlePullImageProcess(out io.Reader, task *task.Task) error {
|
func handlePullImageProcess(out io.Reader, task *task.Task) error {
|
||||||
@@ -319,11 +330,15 @@ func (c Client) BuildImageWithProcessAndOptions(task *task.Task, tar io.ReadClos
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c Client) PullImageWithProcess(task *task.Task, imageName string) error {
|
func (c Client) PullImageWithProcess(task *task.Task, imageName string) error {
|
||||||
|
return c.PullImageWithProcessContext(context.Background(), task, imageName)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c Client) PullImageWithProcessContext(ctx context.Context, task *task.Task, imageName string) error {
|
||||||
options := image.PullOptions{}
|
options := image.PullOptions{}
|
||||||
if authStr, ok := loadRegistryAuthFromDockerConfig(imageName); ok {
|
if authStr, ok := RegistryAuthForImage(imageName); ok {
|
||||||
options.RegistryAuth = authStr
|
options.RegistryAuth = authStr
|
||||||
}
|
}
|
||||||
return c.PullImageWithProcessAndOptions(task, imageName, options)
|
return c.PullImageWithProcessAndOptionsContext(ctx, task, imageName, options)
|
||||||
}
|
}
|
||||||
|
|
||||||
func logProcess(progress map[string]interface{}, task *task.Task) {
|
func logProcess(progress map[string]interface{}, task *task.Task) {
|
||||||
@@ -342,26 +357,31 @@ func PullImage(imageName string) error {
|
|||||||
}
|
}
|
||||||
defer cli.Close()
|
defer cli.Close()
|
||||||
options := image.PullOptions{}
|
options := image.PullOptions{}
|
||||||
if authStr, ok := loadRegistryAuthFromDockerConfig(imageName); ok {
|
if authStr, ok := RegistryAuthForImage(imageName); ok {
|
||||||
options.RegistryAuth = authStr
|
options.RegistryAuth = authStr
|
||||||
}
|
}
|
||||||
if _, err := cli.ImagePull(context.Background(), imageName, options); err != nil {
|
out, err := cli.ImagePull(context.Background(), imageName, options)
|
||||||
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return nil
|
defer out.Close()
|
||||||
|
return handlePullImageProcess(out, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
func loadRegistryAuthFromDockerConfig(imageName string) (string, bool) {
|
func RegistryAuthForImage(imageName string) (string, bool) {
|
||||||
registryHost, hasRegistry := extractRegistryHost(imageName)
|
named, err := reference.ParseNormalizedNamed(imageName)
|
||||||
|
if err != nil {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
registryHost := normalizeRegistryHost(reference.Domain(named))
|
||||||
cfg := config.LoadDefaultConfigFile(io.Discard)
|
cfg := config.LoadDefaultConfigFile(io.Discard)
|
||||||
if cfg == nil {
|
if cfg == nil {
|
||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
candidates := make([]string, 0)
|
candidates := make([]string, 0)
|
||||||
if hasRegistry {
|
if !isDockerHubRegistry(registryHost) {
|
||||||
candidates = append(candidates, registryHost, "https://"+registryHost, "http://"+registryHost)
|
candidates = append(candidates, registryHost, "https://"+registryHost, "http://"+registryHost)
|
||||||
}
|
} else {
|
||||||
if !hasRegistry || isDockerHubRegistry(registryHost) {
|
|
||||||
candidates = append(candidates,
|
candidates = append(candidates,
|
||||||
"https://index.docker.io/v1/",
|
"https://index.docker.io/v1/",
|
||||||
"index.docker.io",
|
"index.docker.io",
|
||||||
@@ -411,18 +431,6 @@ func isDockerHubRegistry(host string) bool {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func extractRegistryHost(imageName string) (string, bool) {
|
|
||||||
parts := strings.Split(imageName, "/")
|
|
||||||
if len(parts) < 2 {
|
|
||||||
return "", false
|
|
||||||
}
|
|
||||||
first := parts[0]
|
|
||||||
if strings.Contains(first, ".") || strings.Contains(first, ":") || first == "localhost" {
|
|
||||||
return normalizeRegistryHost(first), true
|
|
||||||
}
|
|
||||||
return "", false
|
|
||||||
}
|
|
||||||
|
|
||||||
func normalizeRegistryHost(registryKey string) string {
|
func normalizeRegistryHost(registryKey string) string {
|
||||||
key := strings.TrimSpace(registryKey)
|
key := strings.TrimSpace(registryKey)
|
||||||
if key == "" {
|
if key == "" {
|
||||||
|
|||||||
Vendored
+9
-6
@@ -29,7 +29,7 @@ func Write(envMap map[string]string, filename string) error {
|
|||||||
func Marshal(envMap map[string]string) (string, error) {
|
func Marshal(envMap map[string]string) (string, error) {
|
||||||
lines := make([]string, 0, len(envMap))
|
lines := make([]string, 0, len(envMap))
|
||||||
for k, v := range envMap {
|
for k, v := range envMap {
|
||||||
if d, err := strconv.Atoi(v); err == nil && !isStartWithZero(v) {
|
if d, ok := canonicalInt(v); ok {
|
||||||
lines = append(lines, fmt.Sprintf(`%s=%d`, k, d))
|
lines = append(lines, fmt.Sprintf(`%s=%d`, k, d))
|
||||||
} else if shouldUseSingleQuotes(v) {
|
} else if shouldUseSingleQuotes(v) {
|
||||||
lines = append(lines, fmt.Sprintf(`%s='%s'`, k, v))
|
lines = append(lines, fmt.Sprintf(`%s='%s'`, k, v))
|
||||||
@@ -86,7 +86,7 @@ func MarshalWithOrder(envMap map[string]string, orders []string) (string, error)
|
|||||||
}
|
}
|
||||||
|
|
||||||
func formatEnvLine(k, v string) string {
|
func formatEnvLine(k, v string) string {
|
||||||
if d, err := strconv.Atoi(v); err == nil && !isStartWithZero(v) {
|
if d, ok := canonicalInt(v); ok {
|
||||||
return fmt.Sprintf(`%s=%d`, k, d)
|
return fmt.Sprintf(`%s=%d`, k, d)
|
||||||
} else if shouldUseSingleQuotes(v) {
|
} else if shouldUseSingleQuotes(v) {
|
||||||
return fmt.Sprintf(`%s='%s'`, k, v)
|
return fmt.Sprintf(`%s='%s'`, k, v)
|
||||||
@@ -107,11 +107,14 @@ func GetEnvValueByKey(envPath, key string) (string, error) {
|
|||||||
return value, nil
|
return value, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func isStartWithZero(value string) bool {
|
// canonicalInt reports whether value is an integer that formats back to the
|
||||||
if strings.HasPrefix(value, "0") && len(value) > 1 {
|
// same string, so values such as "007", "+1" or "-01" keep their exact text.
|
||||||
return true
|
func canonicalInt(value string) (int, bool) {
|
||||||
|
d, err := strconv.Atoi(value)
|
||||||
|
if err != nil || strconv.Itoa(d) != value {
|
||||||
|
return 0, false
|
||||||
}
|
}
|
||||||
return false
|
return d, true
|
||||||
}
|
}
|
||||||
|
|
||||||
func hasEvenDoubleQuotes(s string) bool {
|
func hasEvenDoubleQuotes(s string) bool {
|
||||||
|
|||||||
Vendored
+42
@@ -0,0 +1,42 @@
|
|||||||
|
package env
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/joho/godotenv"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestMarshalKeepsValuesExactly(t *testing.T) {
|
||||||
|
values := []string{"3306", "0", "-1", "007", "+123456", "-0123", "+0", "-0", "a'b", `a"b`, `a\b`}
|
||||||
|
for _, v := range values {
|
||||||
|
envMap := map[string]string{"PANEL_DB_ROOT_PASSWORD": v}
|
||||||
|
for name, marshal := range map[string]func(map[string]string) (string, error){
|
||||||
|
"Marshal": Marshal,
|
||||||
|
"MarshalWithOrder": func(m map[string]string) (string, error) {
|
||||||
|
return MarshalWithOrder(m, []string{"PANEL_DB_ROOT_PASSWORD"})
|
||||||
|
},
|
||||||
|
} {
|
||||||
|
content, err := marshal(envMap)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("%s(%q) returned error: %v", name, v, err)
|
||||||
|
}
|
||||||
|
parsed, err := godotenv.Unmarshal(content)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("%s(%q) produced unparsable content %q: %v", name, v, content, err)
|
||||||
|
}
|
||||||
|
if got := parsed["PANEL_DB_ROOT_PASSWORD"]; got != v {
|
||||||
|
t.Errorf("%s(%q) wrote %q, which reads back as %q", name, v, content, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMarshalWritesCanonicalIntegersUnquoted(t *testing.T) {
|
||||||
|
content, err := Marshal(map[string]string{"PANEL_APP_PORT_HTTP": "8080"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if content != "PANEL_APP_PORT_HTTP=8080" {
|
||||||
|
t.Fatalf("Marshal() = %q, want %q", content, "PANEL_APP_PORT_HTTP=8080")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
package mcpapi
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/buserr"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
BusinessCodeHeader = "X-Panel-MCP-Business-Code"
|
||||||
|
CodeMySQLStopped = "MCP_MYSQL_STOPPED"
|
||||||
|
CodeMySQLConnectionFailed = "MCP_MYSQL_CONNECTION_FAILED"
|
||||||
|
)
|
||||||
|
|
||||||
|
type codedError struct {
|
||||||
|
code string
|
||||||
|
message string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *codedError) Error() string { return e.message }
|
||||||
|
|
||||||
|
func allowedBusinessCode(code string) string {
|
||||||
|
switch code {
|
||||||
|
case "ErrAliasIsExist", "ErrDomainIsUsed", "ErrPortInUsed", "ErrPortInOtherApp", "ErrPortExist", "ErrRecordExist", "ErrDatabaseIsExist", CodeMySQLStopped, CodeMySQLConnectionFailed:
|
||||||
|
return code
|
||||||
|
default:
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func BusinessErrorCode(err error) string {
|
||||||
|
var coded *codedError
|
||||||
|
if errors.As(err, &coded) && coded != nil {
|
||||||
|
return allowedBusinessCode(coded.code)
|
||||||
|
}
|
||||||
|
var business buserr.BusinessError
|
||||||
|
if errors.As(err, &business) {
|
||||||
|
return allowedBusinessCode(business.Msg)
|
||||||
|
}
|
||||||
|
var businessPointer *buserr.BusinessError
|
||||||
|
if errors.As(err, &businessPointer) && businessPointer != nil {
|
||||||
|
return allowedBusinessCode(businessPointer.Msg)
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewBusinessError(code, message string) error {
|
||||||
|
return &codedError{code: allowedBusinessCode(code), message: message}
|
||||||
|
}
|
||||||
|
|
||||||
|
func SanitizeBusinessError(err error, safeMessage string) error {
|
||||||
|
return NewBusinessError(BusinessErrorCode(err), safeMessage)
|
||||||
|
}
|
||||||
|
|
||||||
|
func SetBusinessErrorHeader(request *http.Request, header http.Header, err error) {
|
||||||
|
if request == nil || header == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if present, trusted := Check(request); !present || !trusted {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
header.Del(BusinessCodeHeader)
|
||||||
|
if code := BusinessErrorCode(err); code != "" {
|
||||||
|
header.Set(BusinessCodeHeader, code)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
package mcpapi
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
|
"github.com/google/uuid"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
InvocationHeader = "X-Panel-MCP-Invocation"
|
||||||
|
NodeHeader = "X-Panel-MCP-Node"
|
||||||
|
MethodHeader = "X-Panel-MCP-Method"
|
||||||
|
PathHeader = "X-Panel-MCP-Path"
|
||||||
|
CapabilitiesPath = "/api/v2/internal/mcp/capabilities"
|
||||||
|
ContractVersion = 4
|
||||||
|
)
|
||||||
|
|
||||||
|
type verifiedNodeTransportKey struct{}
|
||||||
|
|
||||||
|
func BindVerifiedNodeTransport(request *http.Request) *http.Request {
|
||||||
|
if request.TLS == nil || !request.TLS.HandshakeComplete || len(request.TLS.VerifiedChains) == 0 {
|
||||||
|
return request
|
||||||
|
}
|
||||||
|
return request.WithContext(context.WithValue(request.Context(), verifiedNodeTransportKey{}, request.TLS))
|
||||||
|
}
|
||||||
|
|
||||||
|
func validNodeID(id string) bool {
|
||||||
|
if id == "local" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
value, err := strconv.ParseUint(id, 10, 64)
|
||||||
|
return err == nil && value != 0 && strconv.FormatUint(value, 10) == id
|
||||||
|
}
|
||||||
|
|
||||||
|
func TrustedTransport(request *http.Request) bool {
|
||||||
|
if global.IsMaster {
|
||||||
|
local, ok := request.Context().Value(http.LocalAddrContextKey).(net.Addr)
|
||||||
|
return ok && local.Network() == "unix"
|
||||||
|
}
|
||||||
|
verified := request.Context().Value(verifiedNodeTransportKey{})
|
||||||
|
return request.TLS != nil && verified == request.TLS
|
||||||
|
}
|
||||||
|
|
||||||
|
func Check(request *http.Request) (present, trusted bool) {
|
||||||
|
present = false
|
||||||
|
for _, name := range []string{InvocationHeader, NodeHeader, MethodHeader, PathHeader} {
|
||||||
|
if len(request.Header.Values(name)) != 0 {
|
||||||
|
present = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !present {
|
||||||
|
return false, false
|
||||||
|
}
|
||||||
|
for _, name := range []string{InvocationHeader, NodeHeader, MethodHeader, PathHeader} {
|
||||||
|
if len(request.Header.Values(name)) != 1 {
|
||||||
|
return true, false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if _, err := uuid.Parse(request.Header.Get(InvocationHeader)); err != nil {
|
||||||
|
return true, false
|
||||||
|
}
|
||||||
|
nodeID := request.Header.Get(NodeHeader)
|
||||||
|
if !validNodeID(nodeID) || request.Header.Get(MethodHeader) != request.Method || request.Header.Get(PathHeader) != request.URL.Path || request.URL.RawQuery != "" {
|
||||||
|
return true, false
|
||||||
|
}
|
||||||
|
return true, TrustedTransport(request) && ((nodeID == "local") == global.IsMaster)
|
||||||
|
}
|
||||||
|
|
||||||
|
func NodeID(request *http.Request) (string, bool) {
|
||||||
|
_, trusted := Check(request)
|
||||||
|
if !trusted {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
return request.Header.Get(NodeHeader), true
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user