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

fix(pia): set port forward file owned with PUID and PGID

Browse Source
This commit is contained in:
Quentin McGaw
2022-06-25 15:44:29 +00:00
parent 2805c3388a
commit 62ad8bcd8f
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/portforward/fs.go
View File

@@ -16,22 +16,22 @@ func (l *Loop) removePortForwardedFile() {
func (l *Loop) writePortForwardedFile(port uint16) {
filepath := *l.state.GetSettings().Filepath
l.logger.Info("writing port file " + filepath)
if err := writePortForwardedToFile(filepath, port); err != nil {
l.logger.Error(err.Error())
if err := writePortForwardedToFile(filepath, port, l.puid, l.pgid); err != nil {
l.logger.Error("writing port forwarded to file: " + err.Error())
}
}
func writePortForwardedToFile(filepath string, port uint16) (err error) {
file, err := os.OpenFile(filepath, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644)
func writePortForwardedToFile(filepath string, port uint16, uid, gid int) (err error) {
const perms = os.FileMode(0644)
err = os.WriteFile(filepath, []byte(fmt.Sprint(port)), perms)
if err != nil {
return err
return fmt.Errorf("writing file: %w", err)
}
_, err = file.Write([]byte(fmt.Sprint(port)))
err = os.Chown(filepath, uid, gid)
if err != nil {
_ = file.Close()
return err
return fmt.Errorf("chowning file: %w", err)
}
return file.Close()
return nil
}