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

fix(firewall): query iptables version for iptables found

Browse Source
This commit is contained in:
Quentin McGaw
2024-05-04 16:19:30 +00:00
parent 29bc60bc35
commit ef6874fe57
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/gluetun/main.go
View File

@@ -279,9 +279,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
{name: "OpenVPN 2.5", getVersion: ovpnConf.Version25}, {name: "OpenVPN 2.5", getVersion: ovpnConf.Version25},
{name: "OpenVPN 2.6", getVersion: ovpnConf.Version26}, {name: "OpenVPN 2.6", getVersion: ovpnConf.Version26},
{name: "Unbound", getVersion: dnsConf.Version}, {name: "Unbound", getVersion: dnsConf.Version},
{name: "IPtables", getVersion: func(ctx context.Context) (version string, err error) { {name: "IPtables", getVersion: firewallConf.Version},
return firewall.Version(ctx, cmder)
}},
}) })
if err != nil { if err != nil {
return err return err

7
internal/firewall/iptables.go
View File

@@ -11,7 +11,6 @@ import (
"strings" "strings"
"github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/golibs/command"
) )
var ( var (
@@ -44,9 +43,9 @@ func flipRule(rule string) string {
} }
// Version obtains the version of the installed iptables. // Version obtains the version of the installed iptables.
func Version(ctx context.Context, runner command.Runner) (string, error) { func (c *Config) Version(ctx context.Context) (string, error) {
cmd := exec.CommandContext(ctx, "iptables", "--version") cmd := exec.CommandContext(ctx, c.ipTables, "--version") //nolint:gosec
output, err := runner.Run(cmd) output, err := c.runner.Run(cmd)
if err != nil { if err != nil {
return "", err return "", err
} }