acepanel/panel
2
0
Fork 0
mirror of https://github.com/acepanel/panel.git synced 2026-02-04 07:57:21 +08:00
Code Issues Packages Releases Activity

feat: escape log output

Browse Source
This commit is contained in:
耗子
2023-08-13 15:50:22 +08:00
parent 5d1fbb2e2b
commit 4dd99a149c
8 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/http/controllers/plugins/mysql57/mysql57_controller.go
View File

@@ -247,7 +247,7 @@ func (c *Mysql57Controller) ErrorLog(ctx http.Context) {
return
}
log := tools.ExecShell("tail -n 100 /www/server/mysql/mysql-error.log")
log := tools.Escape(tools.ExecShell("tail -n 100 /www/server/mysql/mysql-error.log"))
controllers.Success(ctx, log)
}
@@ -267,7 +267,7 @@ func (c *Mysql57Controller) SlowLog(ctx http.Context) {
return
}
log := tools.ExecShell("tail -n 100 /www/server/mysql/mysql-slow.log")
log := tools.Escape(tools.ExecShell("tail -n 100 /www/server/mysql/mysql-slow.log"))
controllers.Success(ctx, log)
}

4
app/http/controllers/plugins/mysql80/mysql80_controller.go
View File

@@ -247,7 +247,7 @@ func (c *Mysql80Controller) ErrorLog(ctx http.Context) {
return
}
log := tools.ExecShell("tail -n 100 /www/server/mysql/mysql-error.log")
log := tools.Escape(tools.ExecShell("tail -n 100 /www/server/mysql/mysql-error.log"))
controllers.Success(ctx, log)
}
@@ -267,7 +267,7 @@ func (c *Mysql80Controller) SlowLog(ctx http.Context) {
return
}
log := tools.ExecShell("tail -n 100 /www/server/mysql/mysql-slow.log")
log := tools.Escape(tools.ExecShell("tail -n 100 /www/server/mysql/mysql-slow.log"))
controllers.Success(ctx, log)
}

4
app/http/controllers/plugins/php74/php74_controller.go
View File

@@ -188,7 +188,7 @@ func (c *Php74Controller) ErrorLog(ctx http.Context) {
return
}
log := tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/php-fpm.log")
log := tools.Escape(tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/php-fpm.log"))
controllers.Success(ctx, log)
}
@@ -197,7 +197,7 @@ func (c *Php74Controller) SlowLog(ctx http.Context) {
return
}
log := tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/slow.log")
log := tools.Escape(tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/slow.log"))
controllers.Success(ctx, log)
}

4
app/http/controllers/plugins/php80/php80_controller.go
View File

@@ -188,7 +188,7 @@ func (c *Php80Controller) ErrorLog(ctx http.Context) {
return
}
log := tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/php-fpm.log")
log := tools.Escape(tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/php-fpm.log"))
controllers.Success(ctx, log)
}
@@ -197,7 +197,7 @@ func (c *Php80Controller) SlowLog(ctx http.Context) {
return
}
log := tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/slow.log")
log := tools.Escape(tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/slow.log"))
controllers.Success(ctx, log)
}

4
app/http/controllers/plugins/php81/php81_controller.go
View File

@@ -188,7 +188,7 @@ func (c *Php81Controller) ErrorLog(ctx http.Context) {
return
}
log := tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/php-fpm.log")
log := tools.Escape(tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/php-fpm.log"))
controllers.Success(ctx, log)
}
@@ -197,7 +197,7 @@ func (c *Php81Controller) SlowLog(ctx http.Context) {
return
}
log := tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/slow.log")
log := tools.Escape(tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/slow.log"))
controllers.Success(ctx, log)
}

4
app/http/controllers/plugins/php82/php82_controller.go
View File

@@ -188,7 +188,7 @@ func (c *Php82Controller) ErrorLog(ctx http.Context) {
return
}
log := tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/php-fpm.log")
log := tools.Escape(tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/php-fpm.log"))
controllers.Success(ctx, log)
}
@@ -197,7 +197,7 @@ func (c *Php82Controller) SlowLog(ctx http.Context) {
return
}
log := tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/slow.log")
log := tools.Escape(tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/slow.log"))
controllers.Success(ctx, log)
}

2
app/services/website.go
View File

@@ -340,7 +340,7 @@ func (r *WebsiteImpl) GetConfig(id int) (WebsiteSetting, error) {
}
setting.Rewrite = tools.ReadFile("/www/server/vhost/rewrite/" + website.Name + ".conf")
setting.Log = tools.ExecShell(`tail -n 100 '/www/wwwlogs/` + website.Name + `.log'`)
setting.Log = tools.Escape(tools.ExecShell(`tail -n 100 '/www/wwwlogs/` + website.Name + `.log'`))
return setting, nil
}

6
pkg/tools/string.go
View File

@@ -6,6 +6,7 @@ import (
"fmt"
"io"
"strings"
"text/template"
"unicode/utf8"
)
@@ -78,3 +79,8 @@ func Cut(str, begin, end string) string {
return string([]rune(str)[b:e])
}
// Escape 转义字符串
func Escape(str string) string {
return template.HTMLEscapeString(str)
}