chore: update dependencies, refactor option types

internal/domain/interface.go

@@ -2,13 +2,14 @@ package domain
 
 import (
 	"fmt"
-	"github.com/h44z/wg-portal/internal"
-	"github.com/sirupsen/logrus"
 	"math"
 	"regexp"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/h44z/wg-portal/internal"
+	"github.com/sirupsen/logrus"
 )
 
 const (
@@ -34,7 +35,7 @@ type Interface struct {
 	DnsSearchStr string // the dns search option string that should be set if the interface is up, will be appended to DnsStr
 
 	Mtu          int    // the device MTU
-	FirewallMark int32  // a firewall mark
+	FirewallMark uint32 // a firewall mark
 	RoutingTable string // the routing table number or "off" if the routing table should not be managed
 
 	PreUp    string // action that is executed before the device is up
@@ -61,7 +62,7 @@ type Interface struct {
 	PeerDefAllowedIPsStr       string // the default allowed IP string for the peer
 	PeerDefMtu                 int    // the default device MTU
 	PeerDefPersistentKeepalive int    // the default persistent keep-alive Value
-	PeerDefFirewallMark        int32  // default firewall mark
+	PeerDefFirewallMark        uint32 // default firewall mark
 	PeerDefRoutingTable        string // the default routing table
 
 	PeerDefPreUp    string // default action that is executed before the device is up
@@ -161,8 +162,8 @@ type PhysicalInterface struct {
 
 	Addresses []Cidr // the interface ip addresses
 
-	Mtu          int   // the device MTU
-	FirewallMark int32 // a firewall mark
+	Mtu          int    // the device MTU
+	FirewallMark uint32 // a firewall mark
 
 	DeviceUp bool // device status
 
@@ -223,7 +224,7 @@ func MergeToPhysicalInterface(pi *PhysicalInterface, i *Interface) {
 }
 
 type RoutingTableInfo struct {
-	FwMark int
+	FwMark uint32
 	Table  int
 }
 
@@ -241,7 +242,7 @@ func (r RoutingTableInfo) ManagementEnabled() bool {
 
 func (r RoutingTableInfo) GetRoutingTable() int {
 	if r.Table <= 0 {
-		return r.FwMark // use the dynamic routing table which has the same number as the firewall mark
+		return int(r.FwMark) // use the dynamic routing table which has the same number as the firewall mark
 	}
 
 	return r.Table

internal/domain/options.go

@@ -1,47 +1,19 @@
 package domain
 
-type StringConfigOption struct {
-	Value       string `gorm:"column:v"`
-	Overridable bool   `gorm:"column:o"`
-}
-
-func (o StringConfigOption) GetValue() string {
-	return o.Value
-}
-
-func (o *StringConfigOption) SetValue(value string) {
-	o.Value = value
-}
-
-func (o *StringConfigOption) TrySetValue(value string) bool {
-	if o.Overridable {
-		o.Value = value
-		return true
-	}
-	return false
-}
-
-func NewStringConfigOption(value string, overridable bool) StringConfigOption {
-	return StringConfigOption{
-		Value:       value,
-		Overridable: overridable,
-	}
-}
-
-type IntConfigOption struct {
-	Value       int  `gorm:"column:v"`
+type ConfigOption[T any] struct {
+	Value       T    `gorm:"column:v"`
 	Overridable bool `gorm:"column:o"`
 }
 
-func (o IntConfigOption) GetValue() int {
+func (o *ConfigOption[T]) GetValue() T {
 	return o.Value
 }
 
-func (o *IntConfigOption) SetValue(value int) {
+func (o *ConfigOption[T]) SetValue(value T) {
 	o.Value = value
 }
 
-func (o *IntConfigOption) TrySetValue(value int) bool {
+func (o *ConfigOption[T]) TrySetValue(value T) bool {
 	if o.Overridable {
 		o.Value = value
 		return true
@@ -49,64 +21,8 @@ func (o *IntConfigOption) TrySetValue(value int) bool {
 	return false
 }
 
-func NewIntConfigOption(value int, overridable bool) IntConfigOption {
-	return IntConfigOption{
-		Value:       value,
-		Overridable: overridable,
-	}
-}
-
-type Int32ConfigOption struct {
-	Value       int32 `gorm:"column:v"`
-	Overridable bool  `gorm:"column:o"`
-}
-
-func (o Int32ConfigOption) GetValue() int32 {
-	return o.Value
-}
-
-func (o *Int32ConfigOption) SetValue(value int32) {
-	o.Value = value
-}
-
-func (o *Int32ConfigOption) TrySetValue(value int32) bool {
-	if o.Overridable {
-		o.Value = value
-		return true
-	}
-	return false
-}
-
-func NewInt32ConfigOption(value int32, overridable bool) Int32ConfigOption {
-	return Int32ConfigOption{
-		Value:       value,
-		Overridable: overridable,
-	}
-}
-
-type BoolConfigOption struct {
-	Value       bool `gorm:"column:v"`
-	Overridable bool `gorm:"column:o"`
-}
-
-func (o BoolConfigOption) GetValue() bool {
-	return o.Value
-}
-
-func (o *BoolConfigOption) SetValue(value bool) {
-	o.Value = value
-}
-
-func (o *BoolConfigOption) TrySetValue(value bool) bool {
-	if o.Overridable {
-		o.Value = value
-		return true
-	}
-	return false
-}
-
-func NewBoolConfigOption(value bool, overridable bool) BoolConfigOption {
-	return BoolConfigOption{
+func NewConfigOption[T any](value T, overridable bool) ConfigOption[T] {
+	return ConfigOption[T]{
 		Value:       value,
 		Overridable: overridable,
 	}

internal/domain/peer.go

@@ -2,12 +2,13 @@ package domain
 
 import (
 	"fmt"
-	"github.com/h44z/wg-portal/internal"
 	"net"
 	"regexp"
 	"strings"
 	"time"
 
+	"github.com/h44z/wg-portal/internal"
+
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
@@ -31,12 +32,12 @@ type Peer struct {
 
 	// WireGuard specific (for the [peer] section of the config file)
 
-	Endpoint            StringConfigOption `gorm:"embedded;embeddedPrefix:endpoint_"`        // the endpoint address
-	EndpointPublicKey   StringConfigOption `gorm:"embedded;embeddedPrefix:endpoint_pubkey_"` // the endpoint public key
-	AllowedIPsStr       StringConfigOption `gorm:"embedded;embeddedPrefix:allowed_ips_str_"` // all allowed ip subnets, comma seperated
-	ExtraAllowedIPsStr  string             // all allowed ip subnets on the server side, comma seperated
-	PresharedKey        PreSharedKey       // the pre-shared Key of the peer
-	PersistentKeepalive IntConfigOption    `gorm:"embedded;embeddedPrefix:persistent_keep_alive_"` // the persistent keep-alive interval
+	Endpoint            ConfigOption[string] `gorm:"embedded;embeddedPrefix:endpoint_"`        // the endpoint address
+	EndpointPublicKey   ConfigOption[string] `gorm:"embedded;embeddedPrefix:endpoint_pubkey_"` // the endpoint public key
+	AllowedIPsStr       ConfigOption[string] `gorm:"embedded;embeddedPrefix:allowed_ips_str_"` // all allowed ip subnets, comma seperated
+	ExtraAllowedIPsStr  string               // all allowed ip subnets on the server side, comma seperated
+	PresharedKey        PreSharedKey         // the pre-shared Key of the peer
+	PersistentKeepalive ConfigOption[int]    `gorm:"embedded;embeddedPrefix:persistent_keep_alive_"` // the persistent keep-alive interval
 
 	// WG Portal specific
 
@@ -124,18 +125,18 @@ type PeerInterfaceConfig struct {
 
 	Type InterfaceType `gorm:"column:iface_type"` // the interface type (server, client, any)
 
-	Addresses         []Cidr             `gorm:"many2many:peer_addresses;"`                     // the interface ip addresses
-	CheckAliveAddress string             `gorm:"column:check_alive_address"`                    // optional ip address or DNS name that is used for ping checks
-	DnsStr            StringConfigOption `gorm:"embedded;embeddedPrefix:iface_dns_str_"`        // the dns server that should be set if the interface is up, comma separated
-	DnsSearchStr      StringConfigOption `gorm:"embedded;embeddedPrefix:iface_dns_search_str_"` // the dns search option string that should be set if the interface is up, will be appended to DnsStr
-	Mtu               IntConfigOption    `gorm:"embedded;embeddedPrefix:iface_mtu_"`            // the device MTU
-	FirewallMark      Int32ConfigOption  `gorm:"embedded;embeddedPrefix:iface_firewall_mark_"`  // a firewall mark
-	RoutingTable      StringConfigOption `gorm:"embedded;embeddedPrefix:iface_routing_table_"`  // the routing table
+	Addresses         []Cidr               `gorm:"many2many:peer_addresses;"`                     // the interface ip addresses
+	CheckAliveAddress string               `gorm:"column:check_alive_address"`                    // optional ip address or DNS name that is used for ping checks
+	DnsStr            ConfigOption[string] `gorm:"embedded;embeddedPrefix:iface_dns_str_"`        // the dns server that should be set if the interface is up, comma separated
+	DnsSearchStr      ConfigOption[string] `gorm:"embedded;embeddedPrefix:iface_dns_search_str_"` // the dns search option string that should be set if the interface is up, will be appended to DnsStr
+	Mtu               ConfigOption[int]    `gorm:"embedded;embeddedPrefix:iface_mtu_"`            // the device MTU
+	FirewallMark      ConfigOption[uint32] `gorm:"embedded;embeddedPrefix:iface_firewall_mark_"`  // a firewall mark
+	RoutingTable      ConfigOption[string] `gorm:"embedded;embeddedPrefix:iface_routing_table_"`  // the routing table
 
-	PreUp    StringConfigOption `gorm:"embedded;embeddedPrefix:iface_pre_up_"`    // action that is executed before the device is up
-	PostUp   StringConfigOption `gorm:"embedded;embeddedPrefix:iface_post_up_"`   // action that is executed after the device is up
-	PreDown  StringConfigOption `gorm:"embedded;embeddedPrefix:iface_pre_down_"`  // action that is executed before the device is down
-	PostDown StringConfigOption `gorm:"embedded;embeddedPrefix:iface_post_down_"` // action that is executed after the device is down
+	PreUp    ConfigOption[string] `gorm:"embedded;embeddedPrefix:iface_pre_up_"`    // action that is executed before the device is up
+	PostUp   ConfigOption[string] `gorm:"embedded;embeddedPrefix:iface_post_up_"`   // action that is executed after the device is up
+	PreDown  ConfigOption[string] `gorm:"embedded;embeddedPrefix:iface_pre_down_"`  // action that is executed before the device is down
+	PostDown ConfigOption[string] `gorm:"embedded;embeddedPrefix:iface_post_down_"` // action that is executed after the device is down
 }
 
 func (p *PeerInterfaceConfig) AddressStr() string {
@@ -202,12 +203,12 @@ func (p PhysicalPeer) GetAllowedIPs() []net.IPNet {
 
 func ConvertPhysicalPeer(pp *PhysicalPeer) *Peer {
 	peer := &Peer{
-		Endpoint:            StringConfigOption{Value: pp.Endpoint, Overridable: true},
-		EndpointPublicKey:   StringConfigOption{Value: "", Overridable: true},
-		AllowedIPsStr:       StringConfigOption{Value: "", Overridable: true},
+		Endpoint:            NewConfigOption(pp.Endpoint, true),
+		EndpointPublicKey:   NewConfigOption("", true),
+		AllowedIPsStr:       NewConfigOption("", true),
 		ExtraAllowedIPsStr:  "",
 		PresharedKey:        pp.PresharedKey,
-		PersistentKeepalive: IntConfigOption{Value: pp.PersistentKeepalive, Overridable: true},
+		PersistentKeepalive: NewConfigOption(pp.PersistentKeepalive, true),
 		DisplayName:         string(pp.Identifier),
 		Identifier:          pp.Identifier,
 		UserIdentifier:      "",