1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2026-01-13 02:24:25 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: Simplify PHP config update logic by replacing regex with a dedicated function for key matching (#10956)

Browse source
This commit is contained in:
KOMATA 2025-11-14 13:39:39 +08:00 • committed by GitHub
parent e4fbd3cf86
commit 282e196534
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
agent/app/service/runtime.go
View file

@ -10,7 +10,6 @@ import (
"os/exec"
"path"
"path/filepath"
"regexp"
"sort"
"strconv"
"strings"
@ -894,33 +893,27 @@ func (r *RuntimeService) UpdatePHPConfig(req request.PHPConfigUpdate) (err error
switch req.Scope {
case "params":
for key, value := range req.Params {
pattern := "^" + regexp.QuoteMeta(key) + "\\s*=\\s*.*$"
if matched, _ := regexp.MatchString(pattern, line); matched {
lines[i] = key + " = " + value
if phpConfigLineMatchesKey(line, key) {
lines[i] = fmt.Sprintf("%s = %s", key, value)
}
}
case "disable_functions":
pattern := "^" + regexp.QuoteMeta("disable_functions") + "\\s*=\\s*.*$"
if matched, _ := regexp.MatchString(pattern, line); matched {
lines[i] = "disable_functions" + " = " + strings.Join(req.DisableFunctions, ",")
if phpConfigLineMatchesKey(line, "disable_functions") {
lines[i] = fmt.Sprintf("disable_functions = %s", strings.Join(req.DisableFunctions, ","))
}
case "upload_max_filesize":
pattern := "^" + regexp.QuoteMeta("post_max_size") + "\\s*=\\s*.*$"
if matched, _ := regexp.MatchString(pattern, line); matched {
lines[i] = "post_max_size" + " = " + req.UploadMaxSize
if phpConfigLineMatchesKey(line, "post_max_size") {
lines[i] = fmt.Sprintf("post_max_size = %s", req.UploadMaxSize)
}
patternUpload := "^" + regexp.QuoteMeta("upload_max_filesize") + "\\s*=\\s*.*$"
if matched, _ := regexp.MatchString(patternUpload, line); matched {
lines[i] = "upload_max_filesize" + " = " + req.UploadMaxSize
if phpConfigLineMatchesKey(line, "upload_max_filesize") {
lines[i] = fmt.Sprintf("upload_max_filesize = %s", req.UploadMaxSize)
}
case "max_execution_time":
pattern := "^" + regexp.QuoteMeta("max_execution_time") + "\\s*=\\s*.*$"
if matched, _ := regexp.MatchString(pattern, line); matched {
lines[i] = "max_execution_time" + " = " + req.MaxExecutionTime
if phpConfigLineMatchesKey(line, "max_execution_time") {
lines[i] = fmt.Sprintf("max_execution_time = %s", req.MaxExecutionTime)
}
patternInput := "^" + regexp.QuoteMeta("max_input_time") + "\\s*=\\s*.*$"
if matched, _ := regexp.MatchString(patternInput, line); matched {
lines[i] = "max_input_time" + " = " + req.MaxExecutionTime
if phpConfigLineMatchesKey(line, "max_input_time") {
lines[i] = fmt.Sprintf("max_input_time = %s", req.MaxExecutionTime)
}
}
}
@ -959,6 +952,17 @@ func (r *RuntimeService) GetPHPConfigFile(req request.PHPFileReq) (*response.Fil
return &response.FileInfo{FileInfo: *info}, nil
}
func phpConfigLineMatchesKey(line, key string) bool {
trim := strings.TrimSpace(line)
idx := strings.Index(trim, "=")
if idx == -1 {
return false
}
currentKey := strings.TrimSpace(trim[:idx])
return currentKey == key
}
func (r *RuntimeService) UpdatePHPConfigFile(req request.PHPFileUpdate) error {
runtime, err := runtimeRepo.GetFirst(context.Background(), repo.WithByID(req.ID))
if err != nil {