7c44188130
- Openvpn and Unbound do not receive OS signals - Openvpn and Unbound run in a different process group than the entrypoint - Openvpn and Unbound are gracefully shutdown by the entrypoint - Update golibs with a modified command package - Update dns to v1.9.0 where Unbound is luanched in its own group
65 lines
1.6 KiB
Go
65 lines
1.6 KiB
Go
package openvpn
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"os/exec"
|
|
"strings"
|
|
"syscall"
|
|
|
|
"github.com/qdm12/gluetun/internal/constants"
|
|
)
|
|
|
|
var ErrVersionUnknown = errors.New("OpenVPN version is unknown")
|
|
|
|
const (
|
|
binOpenvpn24 = "openvpn2.4"
|
|
binOpenvpn25 = "openvpn"
|
|
)
|
|
|
|
func (c *configurator) Start(ctx context.Context, version string) (
|
|
stdoutLines, stderrLines chan string, waitError chan error, err error) {
|
|
var bin string
|
|
switch version {
|
|
case constants.Openvpn24:
|
|
bin = binOpenvpn24
|
|
case constants.Openvpn25:
|
|
bin = binOpenvpn25
|
|
default:
|
|
return nil, nil, nil, fmt.Errorf("%w: %s", ErrVersionUnknown, version)
|
|
}
|
|
|
|
c.logger.Info("starting OpenVPN " + version)
|
|
|
|
cmd := exec.CommandContext(ctx, bin, "--config", constants.OpenVPNConf)
|
|
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
|
|
|
|
return c.commander.Start(cmd)
|
|
}
|
|
|
|
func (c *configurator) Version24(ctx context.Context) (version string, err error) {
|
|
return c.version(ctx, binOpenvpn24)
|
|
}
|
|
|
|
func (c *configurator) Version25(ctx context.Context) (version string, err error) {
|
|
return c.version(ctx, binOpenvpn25)
|
|
}
|
|
|
|
var ErrVersionTooShort = errors.New("version output is too short")
|
|
|
|
func (c *configurator) version(ctx context.Context, binName string) (version string, err error) {
|
|
cmd := exec.CommandContext(ctx, binName, "--version")
|
|
output, err := c.commander.Run(cmd)
|
|
if err != nil && err.Error() != "exit status 1" {
|
|
return "", err
|
|
}
|
|
firstLine := strings.Split(output, "\n")[0]
|
|
words := strings.Fields(firstLine)
|
|
const minWords = 2
|
|
if len(words) < minWords {
|
|
return "", fmt.Errorf("%w: %s", ErrVersionTooShort, firstLine)
|
|
}
|
|
return words[1], nil
|
|
}
|