fix(pia): set port forward file owned with PUID and PGID
This commit is contained in:
@@ -347,7 +347,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
|
|||||||
|
|
||||||
portForwardLogger := logger.New(log.SetComponent("port forwarding"))
|
portForwardLogger := logger.New(log.SetComponent("port forwarding"))
|
||||||
portForwardLooper := portforward.NewLoop(allSettings.VPN.Provider.PortForwarding,
|
portForwardLooper := portforward.NewLoop(allSettings.VPN.Provider.PortForwarding,
|
||||||
httpClient, firewallConf, portForwardLogger)
|
httpClient, firewallConf, portForwardLogger, puid, pgid)
|
||||||
portForwardHandler, portForwardCtx, portForwardDone := goshutdown.NewGoRoutineHandler(
|
portForwardHandler, portForwardCtx, portForwardDone := goshutdown.NewGoRoutineHandler(
|
||||||
"port forwarding", goroutine.OptionTimeout(time.Second))
|
"port forwarding", goroutine.OptionTimeout(time.Second))
|
||||||
go portForwardLooper.Run(portForwardCtx, portForwardDone)
|
go portForwardLooper.Run(portForwardCtx, portForwardDone)
|
||||||
|
|||||||
@@ -16,22 +16,22 @@ func (l *Loop) removePortForwardedFile() {
|
|||||||
func (l *Loop) writePortForwardedFile(port uint16) {
|
func (l *Loop) writePortForwardedFile(port uint16) {
|
||||||
filepath := *l.state.GetSettings().Filepath
|
filepath := *l.state.GetSettings().Filepath
|
||||||
l.logger.Info("writing port file " + filepath)
|
l.logger.Info("writing port file " + filepath)
|
||||||
if err := writePortForwardedToFile(filepath, port); err != nil {
|
if err := writePortForwardedToFile(filepath, port, l.puid, l.pgid); err != nil {
|
||||||
l.logger.Error(err.Error())
|
l.logger.Error("writing port forwarded to file: " + err.Error())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func writePortForwardedToFile(filepath string, port uint16) (err error) {
|
func writePortForwardedToFile(filepath string, port uint16, uid, gid int) (err error) {
|
||||||
file, err := os.OpenFile(filepath, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644)
|
const perms = os.FileMode(0644)
|
||||||
|
err = os.WriteFile(filepath, []byte(fmt.Sprint(port)), perms)
|
||||||
if err != nil {
|
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 {
|
if err != nil {
|
||||||
_ = file.Close()
|
return fmt.Errorf("chowning file: %w", err)
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return file.Close()
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,9 @@ import (
|
|||||||
type Loop struct {
|
type Loop struct {
|
||||||
statusManager *loopstate.State
|
statusManager *loopstate.State
|
||||||
state *state.State
|
state *state.State
|
||||||
|
// Fixed parameters
|
||||||
|
puid int
|
||||||
|
pgid int
|
||||||
// Objects
|
// Objects
|
||||||
client *http.Client
|
client *http.Client
|
||||||
portAllower PortAllower
|
portAllower PortAllower
|
||||||
@@ -33,7 +36,7 @@ const defaultBackoffTime = 5 * time.Second
|
|||||||
|
|
||||||
func NewLoop(settings settings.PortForwarding,
|
func NewLoop(settings settings.PortForwarding,
|
||||||
client *http.Client, portAllower PortAllower,
|
client *http.Client, portAllower PortAllower,
|
||||||
logger Logger) *Loop {
|
logger Logger, puid, pgid int) *Loop {
|
||||||
start := make(chan struct{})
|
start := make(chan struct{})
|
||||||
running := make(chan models.LoopStatus)
|
running := make(chan models.LoopStatus)
|
||||||
stop := make(chan struct{})
|
stop := make(chan struct{})
|
||||||
@@ -45,6 +48,8 @@ func NewLoop(settings settings.PortForwarding,
|
|||||||
return &Loop{
|
return &Loop{
|
||||||
statusManager: statusManager,
|
statusManager: statusManager,
|
||||||
state: state,
|
state: state,
|
||||||
|
puid: puid,
|
||||||
|
pgid: pgid,
|
||||||
// Objects
|
// Objects
|
||||||
client: client,
|
client: client,
|
||||||
portAllower: portAllower,
|
portAllower: portAllower,
|
||||||
|
|||||||
Reference in New Issue
Block a user