Fixes #254 new variable FIREWALL_INPUT_PORTS (#260)

This commit is contained in:
Quentin McGaw
2020-10-18 09:22:28 -04:00
committed by GitHub
parent 84c1f46ae4
commit c932f48a95
6 changed files with 45 additions and 0 deletions

View File

@@ -12,6 +12,7 @@ import (
type Firewall struct {
AllowedSubnets []net.IPNet
VPNInputPorts []uint16
InputPorts []uint16
Enabled bool
Debug bool
}
@@ -28,11 +29,16 @@ func (f *Firewall) String() string {
for i, port := range f.VPNInputPorts {
vpnInputPorts[i] = fmt.Sprintf("%d", port)
}
inputPorts := make([]string, len(f.InputPorts))
for i, port := range f.InputPorts {
inputPorts[i] = fmt.Sprintf("%d", port)
}
settingsList := []string{
"Firewall settings:",
"Allowed subnets: " + strings.Join(allowedSubnets, ", "),
"VPN input ports: " + strings.Join(vpnInputPorts, ", "),
"Input ports: " + strings.Join(inputPorts, ", "),
}
if f.Debug {
settingsList = append(settingsList, "Debug: on")
@@ -50,6 +56,10 @@ func GetFirewallSettings(paramsReader params.Reader) (settings Firewall, err err
if err != nil {
return settings, err
}
settings.InputPorts, err = paramsReader.GetInputPorts()
if err != nil {
return settings, err
}
settings.Enabled, err = paramsReader.GetFirewall()
if err != nil {
return settings, err