admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using UID and GID given for Tinyproxy, fixes #118

Browse Source
This commit is contained in:
Quentin McGaw
2020-03-30 11:56:38 +00:00
parent d2117cd043
commit f251c6aa4d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/tinyproxy/conf.go
View File

@@ -11,17 +11,17 @@ import (
func (c *configurator) MakeConf(logLevel models.TinyProxyLogLevel, port uint16, user, password string, uid, gid int) error { func (c *configurator) MakeConf(logLevel models.TinyProxyLogLevel, port uint16, user, password string, uid, gid int) error {
c.logger.Info("%s: generating tinyproxy configuration file", logPrefix) c.logger.Info("%s: generating tinyproxy configuration file", logPrefix)
lines := generateConf(logLevel, port, user, password) lines := generateConf(logLevel, port, user, password, uid, gid)
return c.fileManager.WriteLinesToFile(string(constants.TinyProxyConf), return c.fileManager.WriteLinesToFile(string(constants.TinyProxyConf),
lines, lines,
files.Ownership(uid, gid), files.Ownership(uid, gid),
files.Permissions(0400)) files.Permissions(0400))
} }
func generateConf(logLevel models.TinyProxyLogLevel, port uint16, user, password string) (lines []string) { func generateConf(logLevel models.TinyProxyLogLevel, port uint16, user, password string, uid, gid int) (lines []string) {
confMapping := map[string]string{ confMapping := map[string]string{
"User": "nonrootuser", "User": fmt.Sprintf("%d", uid),
"Group": "tinyproxy", "Group": fmt.Sprintf("%d", gid),
"Port": fmt.Sprintf("%d", port), "Port": fmt.Sprintf("%d", port),
"Timeout": "600", "Timeout": "600",
"DefaultErrorFile": "\"/usr/share/tinyproxy/default.html\"", "DefaultErrorFile": "\"/usr/share/tinyproxy/default.html\"",