1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-12-17 12:58:51 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Fix permission errors when running script library as non-root User (#9370)

Browse source
This commit is contained in:
ssongliu 2025-07-02 12:25:34 +08:00 • committed by GitHub
parent 94d37eb68a
commit e855e7692e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/app/api/v2/script_library.go
View file

@ -3,7 +3,6 @@ package v2
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"path"
"strconv" "strconv"
"strings" "strings"
"time" "time"
@ -185,26 +184,33 @@ func (b *BaseApi) RunScript(c *gin.Context) {
tty.Start(quitChan) tty.Start(quitChan)
go slave.Wait(quitChan) go slave.Wait(quitChan)
} else { } else {
connInfo, installDir, err := xpack.LoadNodeInfo(currentNode) connInfo, _, err := xpack.LoadNodeInfo(currentNode)
if wshandleError(wsConn, errors.WithMessage(err, "invalid param rows in request")) { if wshandleError(wsConn, errors.WithMessage(err, "invalid param rows in request")) {
return return
} }
fileDir := path.Join(installDir, "1panel/tmp/script")
fileName := "" fileName := ""
var translations = make(map[string]string) var translations = make(map[string]string)
_ = json.Unmarshal([]byte(scriptItem.Name), &translations) _ = json.Unmarshal([]byte(scriptItem.Name), &translations)
if name, ok := translations["en"]; ok { if name, ok := translations["en"]; ok {
fileName = path.Join(fileDir, strings.ReplaceAll(name, " ", "_")) fileName = strings.ReplaceAll(name, " ", "_")
} else { } else {
fileName = path.Join(fileDir, strings.ReplaceAll(scriptItem.Name, " ", "_")) fileName = strings.ReplaceAll(scriptItem.Name, " ", "_")
} }
initCmd := fmt.Sprintf("mkdir -p %s && cat > %s <<'MYMARKER'\n%s\nMYMARKER\n bash %s", fileDir, fileName, scriptItem.Script, fileName)
client, err := ssh.NewClient(*connInfo) client, err := ssh.NewClient(*connInfo)
if wshandleError(wsConn, errors.WithMessage(err, "failed to set up the connection. Please check the host information")) { if wshandleError(wsConn, errors.WithMessage(err, "set up the connection failed. Please check the host information")) {
return return
} }
defer client.Close() sudoItem := client.SudoHandleCmd()
defer func() {
_, _ = client.Runf("%s rm -rf %s", sudoItem, fileName)
client.Close()
}()
std, err := client.Runf("%s touch %s && %s chmod 777 %s && %s cat > %s <<'MYMARKER'\n%s\nMYMARKER\n", sudoItem, fileName, sudoItem, fileName, sudoItem, fileName, scriptItem.Script)
if wshandleError(wsConn, errors.WithMessage(err, fmt.Sprintf("touch script file failed, err: %s. Please check and retry", std))) {
return
}
initCmd := fmt.Sprintf("%s bash %s", sudoItem, fileName)
sws, err := terminal.NewLogicSshWsSession(cols, rows, client.Client, wsConn, initCmd) sws, err := terminal.NewLogicSshWsSession(cols, rows, client.Client, wsConn, initCmd)
if wshandleError(wsConn, err) { if wshandleError(wsConn, err) {