chore: update dependencies, refactor option types

go.mod

@@ -11,14 +11,14 @@ require (
 	github.com/glebarez/sqlite v1.11.0
 	github.com/go-ldap/ldap/v3 v3.4.8
 	github.com/prometheus-community/pro-bing v0.4.1
-	github.com/prometheus/client_golang v1.20.4
+	github.com/prometheus/client_golang v1.20.5
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.9.0
 	github.com/swaggo/swag v1.16.3
 	github.com/toorop/gin-logrus v0.0.0-20210225092905-2c785434f26f
 	github.com/utrack/gin-csrf v0.0.0-20190424104817-40fb8d2c8fca
 	github.com/vardius/message-bus v1.1.5
-	github.com/vishvananda/netlink v1.1.0
+	github.com/vishvananda/netlink v1.3.0
 	github.com/xhit/go-simple-mail/v2 v2.16.0
 	github.com/yeqown/go-qrcode/v2 v2.2.4
 	golang.org/x/crypto v0.28.0

go.sum

@@ -232,8 +232,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus-community/pro-bing v0.4.1 h1:aMaJwyifHZO0y+h8+icUz0xbToHbia0wdmzdVZ+Kl3w=
 github.com/prometheus-community/pro-bing v0.4.1/go.mod h1:aLsw+zqCaDoa2RLVVSX3+UiCkBBXTMtZC3c7EkfWnAE=
-github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI=
-github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
+github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
+github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
@@ -281,9 +281,8 @@ github.com/utrack/gin-csrf v0.0.0-20190424104817-40fb8d2c8fca h1:lpvAjPK+PcxnbcB
 github.com/utrack/gin-csrf v0.0.0-20190424104817-40fb8d2c8fca/go.mod h1:XXKxNbpoLihvvT7orUZbs/iZayg1n4ip7iJakJPAwA8=
 github.com/vardius/message-bus v1.1.5 h1:YSAC2WB4HRlwc4neFPTmT88kzzoiQ+9WRRbej/E/LZc=
 github.com/vardius/message-bus v1.1.5/go.mod h1:6xladCV2lMkUAE4bzzS85qKOiB5miV7aBVRafiTJGqw=
-github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0=
-github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
-github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
+github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk=
+github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs=
 github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
 github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/xhit/go-simple-mail/v2 v2.16.0 h1:ouGy/Ww4kuaqu2E2UrDw7SvLaziWTB60ICLkIkNVccA=
@@ -337,17 +336,18 @@ golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

internal/adapters/wireguard.go

@@ -4,12 +4,13 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"os"
+
 	"github.com/h44z/wg-portal/internal/domain"
 	"github.com/h44z/wg-portal/internal/lowlevel"
 	"github.com/vishvananda/netlink"
 	"golang.zx2c4.com/wireguard/wgctrl"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
-	"os"
 )
 
 // WgRepo implements all low-level WireGuard interactions.
@@ -74,7 +75,11 @@ func (r *WgRepo) GetPeers(_ context.Context, deviceId domain.InterfaceIdentifier
 	return peers, nil
 }
 
-func (r *WgRepo) GetPeer(_ context.Context, deviceId domain.InterfaceIdentifier, id domain.PeerIdentifier) (*domain.PhysicalPeer, error) {
+func (r *WgRepo) GetPeer(
+	_ context.Context,
+	deviceId domain.InterfaceIdentifier,
+	id domain.PeerIdentifier,
+) (*domain.PhysicalPeer, error) {
 	return r.getPeer(deviceId, id)
 }
 
@@ -90,7 +95,7 @@ func (r *WgRepo) convertWireGuardInterface(device *wgtypes.Device) (domain.Physi
 		ListenPort:    device.ListenPort,
 		Addresses:     nil,
 		Mtu:           0,
-		FirewallMark:  int32(device.FirewallMark),
+		FirewallMark:  uint32(device.FirewallMark),
 		DeviceUp:      false,
 		ImportSource:  "wgctrl",
 		DeviceType:    device.Type.String(),
@@ -151,7 +156,11 @@ func (r *WgRepo) convertWireGuardPeer(peer *wgtypes.Peer) (domain.PhysicalPeer,
 	return peerModel, nil
 }
 
-func (r *WgRepo) SaveInterface(_ context.Context, id domain.InterfaceIdentifier, updateFunc func(pi *domain.PhysicalInterface) (*domain.PhysicalInterface, error)) error {
+func (r *WgRepo) SaveInterface(
+	_ context.Context,
+	id domain.InterfaceIdentifier,
+	updateFunc func(pi *domain.PhysicalInterface) (*domain.PhysicalInterface, error),
+) error {
 	physicalInterface, err := r.getOrCreateInterface(id)
 	if err != nil {
 		return err
@@ -324,7 +333,12 @@ func (r *WgRepo) deleteLowLevelInterface(id domain.InterfaceIdentifier) error {
 	return nil
 }
 
-func (r *WgRepo) SavePeer(_ context.Context, deviceId domain.InterfaceIdentifier, id domain.PeerIdentifier, updateFunc func(pp *domain.PhysicalPeer) (*domain.PhysicalPeer, error)) error {
+func (r *WgRepo) SavePeer(
+	_ context.Context,
+	deviceId domain.InterfaceIdentifier,
+	id domain.PeerIdentifier,
+	updateFunc func(pp *domain.PhysicalPeer) (*domain.PhysicalPeer, error),
+) error {
 	physicalPeer, err := r.getOrCreatePeer(deviceId, id)
 	if err != nil {
 		return err
@@ -342,7 +356,10 @@ func (r *WgRepo) SavePeer(_ context.Context, deviceId domain.InterfaceIdentifier
 	return nil
 }
 
-func (r *WgRepo) getOrCreatePeer(deviceId domain.InterfaceIdentifier, id domain.PeerIdentifier) (*domain.PhysicalPeer, error) {
+func (r *WgRepo) getOrCreatePeer(deviceId domain.InterfaceIdentifier, id domain.PeerIdentifier) (
+	*domain.PhysicalPeer,
+	error,
+) {
 	peer, err := r.getPeer(deviceId, id)
 	if err == nil {
 		return peer, nil
@@ -352,9 +369,13 @@ func (r *WgRepo) getOrCreatePeer(deviceId domain.InterfaceIdentifier, id domain.
 	}
 
 	// create new peer
-	err = r.wg.ConfigureDevice(string(deviceId), wgtypes.Config{Peers: []wgtypes.PeerConfig{{
-		PublicKey: id.ToPublicKey(),
-	}}})
+	err = r.wg.ConfigureDevice(string(deviceId), wgtypes.Config{
+		Peers: []wgtypes.PeerConfig{
+			{
+				PublicKey: id.ToPublicKey(),
+			},
+		},
+	})
 
 	peer, err = r.getPeer(deviceId, id)
 	return peer, nil

internal/app/api/v0/model/model_options.go

@@ -5,132 +5,42 @@ import (
 	"github.com/h44z/wg-portal/internal/domain"
 )
 
-type StringConfigOption struct {
-	Value       string `json:"Value"`
-	Overridable bool   `json:"Overridable"`
+type ConfigOption[T any] struct {
+	Value       T    `json:"Value"`
+	Overridable bool `json:"Overridable"`
 }
 
-func NewStringConfigOption(value string, overridable bool) StringConfigOption {
-	return StringConfigOption{
+func NewConfigOption[T any](value T, overridable bool) ConfigOption[T] {
+	return ConfigOption[T]{
 		Value:       value,
 		Overridable: overridable,
 	}
 }
 
-func StringConfigOptionFromDomain(opt domain.StringConfigOption) StringConfigOption {
-	return StringConfigOption{
+func ConfigOptionFromDomain[T any](opt domain.ConfigOption[T]) ConfigOption[T] {
+	return ConfigOption[T]{
 		Value:       opt.Value,
 		Overridable: opt.Overridable,
 	}
 }
 
-func StringConfigOptionToDomain(opt StringConfigOption) domain.StringConfigOption {
-	return domain.StringConfigOption{
+func ConfigOptionToDomain[T any](opt ConfigOption[T]) domain.ConfigOption[T] {
+	return domain.ConfigOption[T]{
 		Value:       opt.Value,
 		Overridable: opt.Overridable,
 	}
 }
 
-type StringSliceConfigOption struct {
-	Value       []string `json:"Value"`
-	Overridable bool     `json:"Overridable"`
-}
-
-func NewStringSliceConfigOption(value []string, overridable bool) StringSliceConfigOption {
-	return StringSliceConfigOption{
-		Value:       value,
-		Overridable: overridable,
-	}
-}
-
-func StringSliceConfigOptionFromDomain(opt domain.StringConfigOption) StringSliceConfigOption {
-	return StringSliceConfigOption{
+func StringSliceConfigOptionFromDomain(opt domain.ConfigOption[string]) ConfigOption[[]string] {
+	return ConfigOption[[]string]{
 		Value:       internal.SliceString(opt.Value),
 		Overridable: opt.Overridable,
 	}
 }
 
-func StringSliceConfigOptionToDomain(opt StringSliceConfigOption) domain.StringConfigOption {
-	return domain.StringConfigOption{
+func StringSliceConfigOptionToDomain(opt ConfigOption[[]string]) domain.ConfigOption[string] {
+	return domain.ConfigOption[string]{
 		Value:       internal.SliceToString(opt.Value),
 		Overridable: opt.Overridable,
 	}
 }
-
-type IntConfigOption struct {
-	Value       int  `json:"Value"`
-	Overridable bool `json:"Overridable"`
-}
-
-func NewIntConfigOption(value int, overridable bool) IntConfigOption {
-	return IntConfigOption{
-		Value:       value,
-		Overridable: overridable,
-	}
-}
-
-func IntConfigOptionFromDomain(opt domain.IntConfigOption) IntConfigOption {
-	return IntConfigOption{
-		Value:       opt.Value,
-		Overridable: opt.Overridable,
-	}
-}
-
-func IntConfigOptionToDomain(opt IntConfigOption) domain.IntConfigOption {
-	return domain.IntConfigOption{
-		Value:       opt.Value,
-		Overridable: opt.Overridable,
-	}
-}
-
-type Int32ConfigOption struct {
-	Value       int32 `json:"Value"`
-	Overridable bool  `json:"Overridable"`
-}
-
-func NewInt32ConfigOption(value int32, overridable bool) Int32ConfigOption {
-	return Int32ConfigOption{
-		Value:       value,
-		Overridable: overridable,
-	}
-}
-
-func Int32ConfigOptionFromDomain(opt domain.Int32ConfigOption) Int32ConfigOption {
-	return Int32ConfigOption{
-		Value:       opt.Value,
-		Overridable: opt.Overridable,
-	}
-}
-
-func Int32ConfigOptionToDomain(opt Int32ConfigOption) domain.Int32ConfigOption {
-	return domain.Int32ConfigOption{
-		Value:       opt.Value,
-		Overridable: opt.Overridable,
-	}
-}
-
-type BoolConfigOption struct {
-	Value       bool `json:"Value"`
-	Overridable bool `json:"Overridable"`
-}
-
-func NewBoolConfigOption(value bool, overridable bool) BoolConfigOption {
-	return BoolConfigOption{
-		Value:       value,
-		Overridable: overridable,
-	}
-}
-
-func BoolConfigOptionFromDomain(opt domain.BoolConfigOption) BoolConfigOption {
-	return BoolConfigOption{
-		Value:       opt.Value,
-		Overridable: opt.Overridable,
-	}
-}
-
-func BoolConfigOptionToDomain(opt BoolConfigOption) domain.BoolConfigOption {
-	return domain.BoolConfigOption{
-		Value:       opt.Value,
-		Overridable: opt.Overridable,
-	}
-}

internal/app/api/v0/model/models_interface.go

@@ -1,9 +1,10 @@
 package model
 
 import (
-	"github.com/h44z/wg-portal/internal"
 	"time"
 
+	"github.com/h44z/wg-portal/internal"
+
 	"github.com/h44z/wg-portal/internal/domain"
 )
 
@@ -22,7 +23,7 @@ type Interface struct {
 	Dns          []string `json:"Dns"`          // the dns server that should be set if the interface is up, comma separated
 	DnsSearch    []string `json:"DnsSearch"`    // the dns search option string that should be set if the interface is up, will be appended to DnsStr
 	Mtu          int      `json:"Mtu"`          // the device MTU
-	FirewallMark int32    `json:"FirewallMark"` // a firewall mark
+	FirewallMark uint32   `json:"FirewallMark"` // a firewall mark
 	RoutingTable string   `json:"RoutingTable"` // the routing table
 
 	PreUp    string `json:"PreUp"`    // action that is executed before the device is up
@@ -37,7 +38,7 @@ type Interface struct {
 	PeerDefAllowedIPs          []string `json:"PeerDefAllowedIPs"`          // the default allowed IP string for the peer
 	PeerDefMtu                 int      `json:"PeerDefMtu"`                 // the default device MTU
 	PeerDefPersistentKeepalive int      `json:"PeerDefPersistentKeepalive"` // the default persistent keep-alive Value
-	PeerDefFirewallMark        int32    `json:"PeerDefFirewallMark"`        // default firewall mark
+	PeerDefFirewallMark        uint32   `json:"PeerDefFirewallMark"`        // default firewall mark
 	PeerDefRoutingTable        string   `json:"PeerDefRoutingTable"`        // the default routing table
 
 	PeerDefPreUp    string `json:"PeerDefPreUp"`    // default action that is executed before the device is up