From f251c6aa4d5a37b399248843b4dbe2fc5370ab2a Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Mon, 30 Mar 2020 11:56:38 +0000 Subject: [PATCH] Using UID and GID given for Tinyproxy, fixes #118 --- internal/tinyproxy/conf.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/tinyproxy/conf.go b/internal/tinyproxy/conf.go index 963a3b3f..122a7f35 100644 --- a/internal/tinyproxy/conf.go +++ b/internal/tinyproxy/conf.go @@ -11,17 +11,17 @@ import ( 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) - lines := generateConf(logLevel, port, user, password) + lines := generateConf(logLevel, port, user, password, uid, gid) return c.fileManager.WriteLinesToFile(string(constants.TinyProxyConf), lines, files.Ownership(uid, gid), 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{ - "User": "nonrootuser", - "Group": "tinyproxy", + "User": fmt.Sprintf("%d", uid), + "Group": fmt.Sprintf("%d", gid), "Port": fmt.Sprintf("%d", port), "Timeout": "600", "DefaultErrorFile": "\"/usr/share/tinyproxy/default.html\"",