From ceb1013bf86187d38f095b39d640ce929c4aaac0 Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Fri, 31 Jan 2025 13:27:30 +0100 Subject: [PATCH 01/21] add proxy controller --- integrations/go.mod | 14 +++++++------- integrations/go.sum | 8 ++++++++ integrations/port_forwarding.go | 27 +++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 integrations/port_forwarding.go diff --git a/integrations/go.mod b/integrations/go.mod index bb36e81..8103782 100644 --- a/integrations/go.mod +++ b/integrations/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.1 require ( github.com/gorilla/mux v1.8.0 - github.com/netbirdio/netbird v0.35.2 + github.com/netbirdio/netbird v0.36.6-0.20250131121451-1cbc620614c0 github.com/sirupsen/logrus v1.9.3 go.opentelemetry.io/otel/metric v1.26.0 ) @@ -85,7 +85,7 @@ require ( github.com/libdns/route53 v1.5.0 // indirect github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae // indirect github.com/magiconair/properties v1.8.7 // indirect - github.com/mattn/go-sqlite3 v1.14.19 // indirect + github.com/mattn/go-sqlite3 v1.14.22 // indirect github.com/mholt/acmez/v2 v2.0.1 // indirect github.com/miekg/dns v1.1.59 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect @@ -126,13 +126,13 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect goauthentik.io/api/v3 v3.2023051.3 // indirect - golang.org/x/crypto v0.31.0 // indirect + golang.org/x/crypto v0.32.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.30.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.19.0 // indirect golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.28.0 // indirect + golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 // indirect @@ -146,7 +146,7 @@ require ( gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/postgres v1.5.7 // indirect - gorm.io/driver/sqlite v1.5.3 // indirect - gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde // indirect + gorm.io/driver/sqlite v1.5.7 // indirect + gorm.io/gorm v1.25.12 // indirect k8s.io/apimachinery v0.26.2 // indirect ) diff --git a/integrations/go.sum b/integrations/go.sum index f9a13f9..982a65f 100644 --- a/integrations/go.sum +++ b/integrations/go.sum @@ -267,6 +267,7 @@ github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3v github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI= github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/mholt/acmez/v2 v2.0.1 h1:3/3N0u1pLjMK4sNEAFSI+bcvzbPhRpY383sy1kLHJ6k= github.com/mholt/acmez/v2 v2.0.1/go.mod h1:fX4c9r5jYwMyMsC+7tkYRxHibkOTgta5DIFGoe67e1U= github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs= @@ -292,6 +293,8 @@ github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8m github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/netbirdio/netbird v0.35.2 h1:nH7frDQ026boxpVmGhZ5N4qnNsCo19VrDkQAMxNzrDQ= github.com/netbirdio/netbird v0.35.2/go.mod h1:N2uzjKgovm3rBiwg1G8hHOh+y92PcOcPeKXqg0cE6cI= +github.com/netbirdio/netbird v0.36.6-0.20250131121451-1cbc620614c0 h1:OAi/LrXT113FGCqNUUeP6ISRM7PEvO8VMfT4I2CUnIU= +github.com/netbirdio/netbird v0.36.6-0.20250131121451-1cbc620614c0/go.mod h1:fCfS9irHLGOXoLWv23CcX3lJzVcqtDOVaalqGqUdAgc= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/okta/okta-sdk-golang/v2 v2.18.0 h1:cfDasMb7CShbZvOrF6n+DnLevWwiHgedWMGJ8M8xKDc= @@ -426,6 +429,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= @@ -458,6 +462,7 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= golang.org/x/oauth2 v0.19.0 h1:9+E/EZBCbTLNrbN35fHv/a/d/mOBatymz1zbtQrXpIg= @@ -495,6 +500,7 @@ golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -596,8 +602,10 @@ gorm.io/driver/postgres v1.5.7 h1:8ptbNJTDbEmhdr62uReG5BGkdQyeasu/FZHxI0IMGnM= gorm.io/driver/postgres v1.5.7/go.mod h1:3e019WlBaYI5o5LIdNV+LyxCMNtLOQETBXL2h4chKpA= gorm.io/driver/sqlite v1.5.3 h1:7/0dUgX28KAcopdfbRWWl68Rflh6osa4rDh+m51KL2g= gorm.io/driver/sqlite v1.5.3/go.mod h1:qxAuCol+2r6PannQDpOP1FP6ag3mKi4esLnB/jHed+4= +gorm.io/driver/sqlite v1.5.7/go.mod h1:U+J8craQU6Fzkcvu8oLeAQmi50TkwPEhHDEjQZXDah4= gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde h1:9DShaph9qhkIYw7QF91I/ynrr4cOO2PZra2PFD7Mfeg= gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= +gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ= gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/integrations/port_forwarding.go b/integrations/port_forwarding.go new file mode 100644 index 0000000..5ecc500 --- /dev/null +++ b/integrations/port_forwarding.go @@ -0,0 +1,27 @@ +package integrations + +import ( + "context" + + "github.com/netbirdio/netbird/management/server/integrations/port_forwarding" + "github.com/netbirdio/netbird/management/server/store" + "github.com/netbirdio/netbird/management/server/types" +) + +type controllerImpl struct { + store store.Store +} + +func NewController(store store.Store) port_forwarding.Controller { + return &controllerImpl{ + store: store, + } +} + +func (c *controllerImpl) SendUpdate(ctx context.Context, accountID string, affectedProxyID string, affectedPeerIDs []string) { + // noop +} + +func (c *controllerImpl) GetProxyNetworkMaps(ctx context.Context, accountID string) (map[string]*types.NetworkMap, error) { + return make(map[string]*types.NetworkMap), nil +} From 80566ab991b3f4e74a3f9f48fa95b45d8839fcbb Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Fri, 31 Jan 2025 13:32:17 +0100 Subject: [PATCH 02/21] fix validator --- integrations/integrations.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/integrations.go b/integrations/integrations.go index 516dd77..dc7fe4c 100644 --- a/integrations/integrations.go +++ b/integrations/integrations.go @@ -10,7 +10,7 @@ import ( "github.com/netbirdio/netbird/management/server" "github.com/netbirdio/netbird/management/server/activity" "github.com/netbirdio/netbird/management/server/activity/sqlite" - "github.com/netbirdio/netbird/management/server/integrated_validator" + "github.com/netbirdio/netbird/management/server/integrations/integrated_validator" "github.com/netbirdio/netbird/management/server/jwtclaims" ) From e2ad9f2cb38be67a337ac621853dfc1841bff1ae Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Fri, 31 Jan 2025 13:34:35 +0100 Subject: [PATCH 03/21] update api handler --- integrations/integrations.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/integrations/integrations.go b/integrations/integrations.go index dc7fe4c..5d68e30 100644 --- a/integrations/integrations.go +++ b/integrations/integrations.go @@ -4,6 +4,9 @@ import ( "context" "github.com/gorilla/mux" + "github.com/netbirdio/netbird/management/server/integrations/port_forwarding" + "github.com/netbirdio/netbird/management/server/peers" + "github.com/netbirdio/netbird/management/server/permissions" log "github.com/sirupsen/logrus" "go.opentelemetry.io/otel/metric" @@ -22,6 +25,9 @@ func RegisterHandlers( extractor *jwtclaims.ClaimsExtractor, integratedValidator integrated_validator.IntegratedValidator, meter metric.Meter, + permissionsManager permissions.Manager, + peersManager peers.Manager, + proxyController port_forwarding.Controller, ) (*mux.Router, error) { return router, nil } From 5648068fab25e6474ea21a4eb1b531d0bb20a445 Mon Sep 17 00:00:00 2001 From: bcmmbaga Date: Tue, 25 Feb 2025 10:41:54 +0000 Subject: [PATCH 04/21] fix merge --- integrations/integrations.go | 1 - 1 file changed, 1 deletion(-) diff --git a/integrations/integrations.go b/integrations/integrations.go index 6baf9cb..beb0187 100644 --- a/integrations/integrations.go +++ b/integrations/integrations.go @@ -13,7 +13,6 @@ import ( "github.com/netbirdio/netbird/management/server" "github.com/netbirdio/netbird/management/server/activity" "github.com/netbirdio/netbird/management/server/activity/sqlite" - "github.com/netbirdio/netbird/management/server/integrated_validator" "github.com/netbirdio/netbird/management/server/integrations/integrated_validator" ) From 330713ffb4e94d27420c227a7959084bc1bf9d17 Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Wed, 26 Feb 2025 11:46:25 +0100 Subject: [PATCH 05/21] add extra settings manager --- integrations/extra_settings.go | 24 ++++++++++++++++++++++++ integrations/go.mod | 2 +- integrations/go.sum | 2 ++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 integrations/extra_settings.go diff --git a/integrations/extra_settings.go b/integrations/extra_settings.go new file mode 100644 index 0000000..b3c8db8 --- /dev/null +++ b/integrations/extra_settings.go @@ -0,0 +1,24 @@ +package integrations + +import ( + "context" + + "github.com/netbirdio/netbird/management/server/account" + + "github.com/netbirdio/netbird/management/server/integrations/flow" +) + +type ManagerImpl struct { +} + +func NewManager() flow.Manager { + return &ManagerImpl{} +} + +func (m *ManagerImpl) GetExtraSettings(ctx context.Context, accountID string) (*account.ExtraSettings, error) { + return &account.ExtraSettings{}, nil +} + +func (m *ManagerImpl) UpdateExtraSettings(ctx context.Context, accountID string, accountExtraSettings *account.ExtraSettings) error { + return nil +} diff --git a/integrations/go.mod b/integrations/go.mod index 8103782..030fe76 100644 --- a/integrations/go.mod +++ b/integrations/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.1 require ( github.com/gorilla/mux v1.8.0 - github.com/netbirdio/netbird v0.36.6-0.20250131121451-1cbc620614c0 + github.com/netbirdio/netbird v0.37.2-0.20250226104302-59f0c88d9149 github.com/sirupsen/logrus v1.9.3 go.opentelemetry.io/otel/metric v1.26.0 ) diff --git a/integrations/go.sum b/integrations/go.sum index 982a65f..45d098c 100644 --- a/integrations/go.sum +++ b/integrations/go.sum @@ -295,6 +295,8 @@ github.com/netbirdio/netbird v0.35.2 h1:nH7frDQ026boxpVmGhZ5N4qnNsCo19VrDkQAMxNz github.com/netbirdio/netbird v0.35.2/go.mod h1:N2uzjKgovm3rBiwg1G8hHOh+y92PcOcPeKXqg0cE6cI= github.com/netbirdio/netbird v0.36.6-0.20250131121451-1cbc620614c0 h1:OAi/LrXT113FGCqNUUeP6ISRM7PEvO8VMfT4I2CUnIU= github.com/netbirdio/netbird v0.36.6-0.20250131121451-1cbc620614c0/go.mod h1:fCfS9irHLGOXoLWv23CcX3lJzVcqtDOVaalqGqUdAgc= +github.com/netbirdio/netbird v0.37.2-0.20250226104302-59f0c88d9149 h1:HNNZaja3u2h991rJJt3V/N5cDn1c/549fthZqHZvC7w= +github.com/netbirdio/netbird v0.37.2-0.20250226104302-59f0c88d9149/go.mod h1:FiWFoWGn9BBIQXI8RZz8CWuhtHTOEvZagkw2B4SP1A4= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/okta/okta-sdk-golang/v2 v2.18.0 h1:cfDasMb7CShbZvOrF6n+DnLevWwiHgedWMGJ8M8xKDc= From 921bdecbe2168857e2591f27c9e3024e58cd30b5 Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Wed, 26 Feb 2025 11:57:13 +0100 Subject: [PATCH 06/21] update extra settings --- integrations/extra_settings.go | 4 ++-- integrations/go.mod | 2 +- integrations/go.sum | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/integrations/extra_settings.go b/integrations/extra_settings.go index b3c8db8..3b4d79d 100644 --- a/integrations/extra_settings.go +++ b/integrations/extra_settings.go @@ -5,13 +5,13 @@ import ( "github.com/netbirdio/netbird/management/server/account" - "github.com/netbirdio/netbird/management/server/integrations/flow" + "github.com/netbirdio/netbird/management/server/integrations/extra_settings" ) type ManagerImpl struct { } -func NewManager() flow.Manager { +func NewManager() extra_settings.Manager { return &ManagerImpl{} } diff --git a/integrations/go.mod b/integrations/go.mod index 030fe76..9c05140 100644 --- a/integrations/go.mod +++ b/integrations/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.1 require ( github.com/gorilla/mux v1.8.0 - github.com/netbirdio/netbird v0.37.2-0.20250226104302-59f0c88d9149 + github.com/netbirdio/netbird v0.37.2-0.20250226105245-d8f246fbaeaf github.com/sirupsen/logrus v1.9.3 go.opentelemetry.io/otel/metric v1.26.0 ) diff --git a/integrations/go.sum b/integrations/go.sum index 45d098c..f474151 100644 --- a/integrations/go.sum +++ b/integrations/go.sum @@ -297,6 +297,10 @@ github.com/netbirdio/netbird v0.36.6-0.20250131121451-1cbc620614c0 h1:OAi/LrXT11 github.com/netbirdio/netbird v0.36.6-0.20250131121451-1cbc620614c0/go.mod h1:fCfS9irHLGOXoLWv23CcX3lJzVcqtDOVaalqGqUdAgc= github.com/netbirdio/netbird v0.37.2-0.20250226104302-59f0c88d9149 h1:HNNZaja3u2h991rJJt3V/N5cDn1c/549fthZqHZvC7w= github.com/netbirdio/netbird v0.37.2-0.20250226104302-59f0c88d9149/go.mod h1:FiWFoWGn9BBIQXI8RZz8CWuhtHTOEvZagkw2B4SP1A4= +github.com/netbirdio/netbird v0.37.2-0.20250226105025-467906913923 h1:a+b1BJdihAR0OO2gf/OjQgUz2K0JW8+e8ZMJ9u8oftY= +github.com/netbirdio/netbird v0.37.2-0.20250226105025-467906913923/go.mod h1:FiWFoWGn9BBIQXI8RZz8CWuhtHTOEvZagkw2B4SP1A4= +github.com/netbirdio/netbird v0.37.2-0.20250226105245-d8f246fbaeaf h1:J1W0lfe7HF4oPNqxsFLAaqX4Dgm23aUzYwENm/6WIbg= +github.com/netbirdio/netbird v0.37.2-0.20250226105245-d8f246fbaeaf/go.mod h1:FiWFoWGn9BBIQXI8RZz8CWuhtHTOEvZagkw2B4SP1A4= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/okta/okta-sdk-golang/v2 v2.18.0 h1:cfDasMb7CShbZvOrF6n+DnLevWwiHgedWMGJ8M8xKDc= From 21d4cd97a17b1eae6a565ca4cca3c1e6f11a25ce Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Wed, 26 Feb 2025 17:07:42 +0100 Subject: [PATCH 07/21] add config --- integrations/config.go | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 integrations/config.go diff --git a/integrations/config.go b/integrations/config.go new file mode 100644 index 0000000..fa227df --- /dev/null +++ b/integrations/config.go @@ -0,0 +1,10 @@ +package integrations + +import ( + "github.com/netbirdio/netbird/management/proto" + "github.com/netbirdio/netbird/management/server/account" +) + +func ExtendNetBirdConfig(config *proto.NetbirdConfig, extraSettings *account.ExtraSettings) { + return +} From 782907bdb8dde7dceb485d4e1d13e2b173724e7f Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Wed, 26 Feb 2025 17:42:45 +0100 Subject: [PATCH 08/21] extract account manager --- integrations/go.mod | 2 +- integrations/go.sum | 2 ++ integrations/integrations.go | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/integrations/go.mod b/integrations/go.mod index 9c05140..0d86eaa 100644 --- a/integrations/go.mod +++ b/integrations/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.1 require ( github.com/gorilla/mux v1.8.0 - github.com/netbirdio/netbird v0.37.2-0.20250226105245-d8f246fbaeaf + github.com/netbirdio/netbird v0.37.2-0.20250226164009-e6c62c023b78 github.com/sirupsen/logrus v1.9.3 go.opentelemetry.io/otel/metric v1.26.0 ) diff --git a/integrations/go.sum b/integrations/go.sum index f474151..5fd2b29 100644 --- a/integrations/go.sum +++ b/integrations/go.sum @@ -301,6 +301,8 @@ github.com/netbirdio/netbird v0.37.2-0.20250226105025-467906913923 h1:a+b1BJdihA github.com/netbirdio/netbird v0.37.2-0.20250226105025-467906913923/go.mod h1:FiWFoWGn9BBIQXI8RZz8CWuhtHTOEvZagkw2B4SP1A4= github.com/netbirdio/netbird v0.37.2-0.20250226105245-d8f246fbaeaf h1:J1W0lfe7HF4oPNqxsFLAaqX4Dgm23aUzYwENm/6WIbg= github.com/netbirdio/netbird v0.37.2-0.20250226105245-d8f246fbaeaf/go.mod h1:FiWFoWGn9BBIQXI8RZz8CWuhtHTOEvZagkw2B4SP1A4= +github.com/netbirdio/netbird v0.37.2-0.20250226164009-e6c62c023b78 h1:C3WNbntv1TdGLv5Z4G74+RHA2sHtAY/0i0c0l+QPRPo= +github.com/netbirdio/netbird v0.37.2-0.20250226164009-e6c62c023b78/go.mod h1:LPzGSNMW+yl2cCVLOLGCM2gh00raxbuR/Q8g0q9rams= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/okta/okta-sdk-golang/v2 v2.18.0 h1:cfDasMb7CShbZvOrF6n+DnLevWwiHgedWMGJ8M8xKDc= diff --git a/integrations/integrations.go b/integrations/integrations.go index beb0187..4826238 100644 --- a/integrations/integrations.go +++ b/integrations/integrations.go @@ -4,13 +4,13 @@ import ( "context" "github.com/gorilla/mux" + "github.com/netbirdio/netbird/management/server/account" "github.com/netbirdio/netbird/management/server/integrations/port_forwarding" "github.com/netbirdio/netbird/management/server/peers" "github.com/netbirdio/netbird/management/server/permissions" log "github.com/sirupsen/logrus" "go.opentelemetry.io/otel/metric" - "github.com/netbirdio/netbird/management/server" "github.com/netbirdio/netbird/management/server/activity" "github.com/netbirdio/netbird/management/server/activity/sqlite" "github.com/netbirdio/netbird/management/server/integrations/integrated_validator" @@ -20,7 +20,7 @@ func RegisterHandlers( ctx context.Context, prefix string, router *mux.Router, - accountManager server.AccountManager, + accountManager account.AccountManager, integratedValidator integrated_validator.IntegratedValidator, meter metric.Meter, permissionsManager permissions.Manager, From 4e54495b52cae1b37e536d2e0bd1dd177557cfe9 Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Wed, 26 Feb 2025 17:51:06 +0100 Subject: [PATCH 09/21] move extra settings --- integrations/config.go | 4 ++-- integrations/extra_settings.go | 8 ++++---- integrations/go.mod | 2 +- integrations/go.sum | 2 ++ integrations/validator.go | 11 +++++------ 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/integrations/config.go b/integrations/config.go index fa227df..fdb84be 100644 --- a/integrations/config.go +++ b/integrations/config.go @@ -2,9 +2,9 @@ package integrations import ( "github.com/netbirdio/netbird/management/proto" - "github.com/netbirdio/netbird/management/server/account" + "github.com/netbirdio/netbird/management/server/types" ) -func ExtendNetBirdConfig(config *proto.NetbirdConfig, extraSettings *account.ExtraSettings) { +func ExtendNetBirdConfig(config *proto.NetbirdConfig, extraSettings *types.ExtraSettings) { return } diff --git a/integrations/extra_settings.go b/integrations/extra_settings.go index 3b4d79d..784625a 100644 --- a/integrations/extra_settings.go +++ b/integrations/extra_settings.go @@ -3,7 +3,7 @@ package integrations import ( "context" - "github.com/netbirdio/netbird/management/server/account" + "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/management/server/integrations/extra_settings" ) @@ -15,10 +15,10 @@ func NewManager() extra_settings.Manager { return &ManagerImpl{} } -func (m *ManagerImpl) GetExtraSettings(ctx context.Context, accountID string) (*account.ExtraSettings, error) { - return &account.ExtraSettings{}, nil +func (m *ManagerImpl) GetExtraSettings(ctx context.Context, accountID string) (*types.ExtraSettings, error) { + return &types.ExtraSettings{}, nil } -func (m *ManagerImpl) UpdateExtraSettings(ctx context.Context, accountID string, accountExtraSettings *account.ExtraSettings) error { +func (m *ManagerImpl) UpdateExtraSettings(ctx context.Context, accountID string, accountExtraSettings *types.ExtraSettings) error { return nil } diff --git a/integrations/go.mod b/integrations/go.mod index 0d86eaa..c834409 100644 --- a/integrations/go.mod +++ b/integrations/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.1 require ( github.com/gorilla/mux v1.8.0 - github.com/netbirdio/netbird v0.37.2-0.20250226164009-e6c62c023b78 + github.com/netbirdio/netbird v0.37.2-0.20250226164836-b90c10191ea9 github.com/sirupsen/logrus v1.9.3 go.opentelemetry.io/otel/metric v1.26.0 ) diff --git a/integrations/go.sum b/integrations/go.sum index 5fd2b29..9f53336 100644 --- a/integrations/go.sum +++ b/integrations/go.sum @@ -303,6 +303,8 @@ github.com/netbirdio/netbird v0.37.2-0.20250226105245-d8f246fbaeaf h1:J1W0lfe7HF github.com/netbirdio/netbird v0.37.2-0.20250226105245-d8f246fbaeaf/go.mod h1:FiWFoWGn9BBIQXI8RZz8CWuhtHTOEvZagkw2B4SP1A4= github.com/netbirdio/netbird v0.37.2-0.20250226164009-e6c62c023b78 h1:C3WNbntv1TdGLv5Z4G74+RHA2sHtAY/0i0c0l+QPRPo= github.com/netbirdio/netbird v0.37.2-0.20250226164009-e6c62c023b78/go.mod h1:LPzGSNMW+yl2cCVLOLGCM2gh00raxbuR/Q8g0q9rams= +github.com/netbirdio/netbird v0.37.2-0.20250226164836-b90c10191ea9 h1:F51Z+pNSxhIvfDGJOeHGOFyh4JOv9mNdzOoiKEgjryo= +github.com/netbirdio/netbird v0.37.2-0.20250226164836-b90c10191ea9/go.mod h1:qbqfE9xtYEBW9loBBhqVV5PADHSfOlg45i9BO7gWD6c= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/okta/okta-sdk-golang/v2 v2.18.0 h1:cfDasMb7CShbZvOrF6n+DnLevWwiHgedWMGJ8M8xKDc= diff --git a/integrations/validator.go b/integrations/validator.go index eaf870e..a183787 100644 --- a/integrations/validator.go +++ b/integrations/validator.go @@ -3,7 +3,6 @@ package integrations import ( "context" - "github.com/netbirdio/netbird/management/server/account" "github.com/netbirdio/netbird/management/server/activity" nbpeer "github.com/netbirdio/netbird/management/server/peer" "github.com/netbirdio/netbird/management/server/types" @@ -16,23 +15,23 @@ func NewIntegratedValidator(_ context.Context, store activity.Store) (*Integrate return &IntegratedValidatorImpl{}, nil } -func (v *IntegratedValidatorImpl) ValidateExtraSettings(context.Context, *account.ExtraSettings, *account.ExtraSettings, map[string]*nbpeer.Peer, string, string) error { +func (v *IntegratedValidatorImpl) ValidateExtraSettings(context.Context, *types.ExtraSettings, *types.ExtraSettings, map[string]*nbpeer.Peer, string, string) error { return nil } -func (v *IntegratedValidatorImpl) ValidatePeer(_ context.Context, update *nbpeer.Peer, _ *nbpeer.Peer, _ string, _ string, _ string, _ []string, _ *account.ExtraSettings) (*nbpeer.Peer, bool, error) { +func (v *IntegratedValidatorImpl) ValidatePeer(_ context.Context, update *nbpeer.Peer, _ *nbpeer.Peer, _ string, _ string, _ string, _ []string, _ *types.ExtraSettings) (*nbpeer.Peer, bool, error) { return update, false, nil } -func (v *IntegratedValidatorImpl) PreparePeer(_ context.Context, _ string, peer *nbpeer.Peer, _ []string, _ *account.ExtraSettings) *nbpeer.Peer { +func (v *IntegratedValidatorImpl) PreparePeer(_ context.Context, _ string, peer *nbpeer.Peer, _ []string, _ *types.ExtraSettings) *nbpeer.Peer { return peer.Copy() } -func (v *IntegratedValidatorImpl) IsNotValidPeer(_ context.Context, _ string, _ *nbpeer.Peer, _ []string, _ *account.ExtraSettings) (bool, bool, error) { +func (v *IntegratedValidatorImpl) IsNotValidPeer(_ context.Context, _ string, _ *nbpeer.Peer, _ []string, _ *types.ExtraSettings) (bool, bool, error) { return false, false, nil } -func (v *IntegratedValidatorImpl) GetValidatedPeers(_ string, _ []*types.Group, peers []*nbpeer.Peer, _ *account.ExtraSettings) (map[string]struct{}, error) { +func (v *IntegratedValidatorImpl) GetValidatedPeers(_ string, _ []*types.Group, peers []*nbpeer.Peer, _ *types.ExtraSettings) (map[string]struct{}, error) { validatedPeers := make(map[string]struct{}) for _, p := range peers { validatedPeers[p.ID] = struct{}{} From 0ac3dc44326618357e3bd230965478eacd6a926a Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Wed, 26 Feb 2025 17:57:36 +0100 Subject: [PATCH 10/21] add settings manager --- integrations/integrations.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/integrations/integrations.go b/integrations/integrations.go index 4826238..03d9093 100644 --- a/integrations/integrations.go +++ b/integrations/integrations.go @@ -8,6 +8,7 @@ import ( "github.com/netbirdio/netbird/management/server/integrations/port_forwarding" "github.com/netbirdio/netbird/management/server/peers" "github.com/netbirdio/netbird/management/server/permissions" + "github.com/netbirdio/netbird/management/server/settings" log "github.com/sirupsen/logrus" "go.opentelemetry.io/otel/metric" @@ -26,6 +27,7 @@ func RegisterHandlers( permissionsManager permissions.Manager, peersManager peers.Manager, proxyController port_forwarding.Controller, + settingsManager settings.Manager, ) (*mux.Router, error) { return router, nil } From b1ea0079718633ab013ce52033f5ea4b0dea1e5b Mon Sep 17 00:00:00 2001 From: bcmmbaga Date: Fri, 7 Mar 2025 13:49:20 +0300 Subject: [PATCH 11/21] rename AccountManager type to Manager --- integrations/integrations.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/integrations.go b/integrations/integrations.go index 03d9093..990d497 100644 --- a/integrations/integrations.go +++ b/integrations/integrations.go @@ -21,7 +21,7 @@ func RegisterHandlers( ctx context.Context, prefix string, router *mux.Router, - accountManager account.AccountManager, + accountManager account.Manager, integratedValidator integrated_validator.IntegratedValidator, meter metric.Meter, permissionsManager permissions.Manager, From 40087efe8ec144b13887876535df624d45c41b34 Mon Sep 17 00:00:00 2001 From: bcmmbaga Date: Fri, 7 Mar 2025 13:49:35 +0300 Subject: [PATCH 12/21] go mod tidy --- integrations/go.mod | 41 ++++----------- integrations/go.sum | 124 ++++++++++---------------------------------- 2 files changed, 35 insertions(+), 130 deletions(-) diff --git a/integrations/go.mod b/integrations/go.mod index c834409..bdb022a 100644 --- a/integrations/go.mod +++ b/integrations/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.1 require ( github.com/gorilla/mux v1.8.0 - github.com/netbirdio/netbird v0.37.2-0.20250226164836-b90c10191ea9 + github.com/netbirdio/netbird v0.37.2-0.20250307102607-a50f0285b9fc github.com/sirupsen/logrus v1.9.3 go.opentelemetry.io/otel/metric v1.26.0 ) @@ -16,31 +16,16 @@ require ( cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect cloud.google.com/go/compute/metadata v0.3.0 // indirect dario.cat/mergo v1.0.0 // indirect + filippo.io/edwards25519 v1.1.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/BurntSushi/toml v1.4.0 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/Microsoft/hcsshim v0.12.3 // indirect github.com/TheJumpCloud/jcapi-go v3.0.0+incompatible // indirect github.com/XiaoMi/pegasus-go-client v0.0.0-20210427083443-f3b6b08bc4c2 // indirect - github.com/aws/aws-sdk-go-v2 v1.30.3 // indirect - github.com/aws/aws-sdk-go-v2/config v1.27.27 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.17.27 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 // indirect - github.com/aws/aws-sdk-go-v2/service/route53 v1.42.3 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 // indirect - github.com/aws/smithy-go v1.20.3 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d // indirect github.com/c-robinson/iplib v1.0.3 // indirect - github.com/caddyserver/certmagic v0.21.3 // indirect - github.com/caddyserver/zerossl v0.1.3 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/containerd/containerd v1.7.16 // indirect @@ -57,6 +42,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-redis/redis/v8 v8.11.5 // indirect + github.com/go-sql-driver/mysql v1.8.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -65,7 +51,6 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.3 // indirect - github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.2-0.20240212192251-757544f21357 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-secure-stdlib/base62 v0.1.2 // indirect @@ -77,16 +62,11 @@ require ( github.com/jackc/puddle/v2 v2.2.1 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/kelseyhightower/envconfig v1.4.0 // indirect github.com/klauspost/compress v1.17.8 // indirect - github.com/klauspost/cpuid/v2 v2.2.7 // indirect - github.com/libdns/libdns v0.2.2 // indirect - github.com/libdns/route53 v1.5.0 // indirect github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-sqlite3 v1.14.22 // indirect - github.com/mholt/acmez/v2 v2.0.1 // indirect github.com/miekg/dns v1.1.59 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/patternmatcher v0.6.0 // indirect @@ -97,7 +77,6 @@ require ( github.com/okta/okta-sdk-golang/v2 v2.18.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0 // indirect - github.com/oschwald/maxminddb-golang v1.12.0 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/pegasus-kv/thrift v0.13.0 // indirect github.com/pkg/errors v0.9.1 // indirect @@ -111,11 +90,11 @@ require ( github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/testcontainers/testcontainers-go v0.31.0 // indirect + github.com/testcontainers/testcontainers-go/modules/mysql v0.31.0 // indirect github.com/testcontainers/testcontainers-go/modules/postgres v0.31.0 // indirect github.com/tklauser/go-sysconf v0.3.14 // indirect github.com/tklauser/numcpus v0.8.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - github.com/zeebo/blake3 v0.2.3 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect go.opentelemetry.io/otel v1.26.0 // indirect @@ -123,19 +102,16 @@ require ( go.opentelemetry.io/otel/sdk v1.26.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.26.0 // indirect go.opentelemetry.io/otel/trace v1.26.0 // indirect - go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.27.0 // indirect goauthentik.io/api/v3 v3.2023051.3 // indirect - golang.org/x/crypto v0.32.0 // indirect + golang.org/x/crypto v0.35.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.19.0 // indirect - golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.29.0 // indirect - golang.org/x/text v0.21.0 // indirect + golang.org/x/sync v0.11.0 // indirect + golang.org/x/sys v0.30.0 // indirect + golang.org/x/text v0.22.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect - golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 // indirect golang.zx2c4.com/wireguard/windows v0.5.3 // indirect google.golang.org/api v0.177.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect @@ -145,6 +121,7 @@ require ( gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + gorm.io/driver/mysql v1.5.7 // indirect gorm.io/driver/postgres v1.5.7 // indirect gorm.io/driver/sqlite v1.5.7 // indirect gorm.io/gorm v1.25.12 // indirect diff --git a/integrations/go.sum b/integrations/go.sum index 9f53336..1786993 100644 --- a/integrations/go.sum +++ b/integrations/go.sum @@ -8,6 +8,8 @@ cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2Qx cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= @@ -28,44 +30,12 @@ github.com/XiaoMi/pegasus-go-client v0.0.0-20210427083443-f3b6b08bc4c2 h1:pami0o github.com/XiaoMi/pegasus-go-client v0.0.0-20210427083443-f3b6b08bc4c2/go.mod h1:jNIx5ykW1MroBuaTja9+VpglmaJOUzezumfhLlER3oY= github.com/allegro/bigcache/v3 v3.0.2 h1:AKZCw+5eAaVyNTBmI2fgyPVJhHkdWder3O9IrprcQfI= github.com/allegro/bigcache/v3 v3.0.2/go.mod h1:aPyh7jEvrog9zAwx5N7+JUQX5dZTSGpxF1LAR4dr35I= -github.com/aws/aws-sdk-go-v2 v1.30.3 h1:jUeBtG0Ih+ZIFH0F4UkmL9w3cSpaMv9tYYDbzILP8dY= -github.com/aws/aws-sdk-go-v2 v1.30.3/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc= -github.com/aws/aws-sdk-go-v2/config v1.27.27 h1:HdqgGt1OAP0HkEDDShEl0oSYa9ZZBSOmKpdpsDMdO90= -github.com/aws/aws-sdk-go-v2/config v1.27.27/go.mod h1:MVYamCg76dFNINkZFu4n4RjDixhVr51HLj4ErWzrVwg= -github.com/aws/aws-sdk-go-v2/credentials v1.17.27 h1:2raNba6gr2IfA0eqqiP2XiQ0UVOpGPgDSi0I9iAP+UI= -github.com/aws/aws-sdk-go-v2/credentials v1.17.27/go.mod h1:gniiwbGahQByxan6YjQUMcW4Aov6bLC3m+evgcoN4r4= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 h1:KreluoV8FZDEtI6Co2xuNk/UqI9iwMrOx/87PBNIKqw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11/go.mod h1:SeSUYBLsMYFoRvHE0Tjvn7kbxaUhl75CJi1sbfhMxkU= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 h1:SoNJ4RlFEQEbtDcCEt+QG56MY4fm4W8rYirAmq+/DdU= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15/go.mod h1:U9ke74k1n2bf+RIgoX1SXFed1HLs51OgUSs+Ph0KJP8= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 h1:C6WHdGnTDIYETAm5iErQUiVNsclNx9qbJVPIt03B6bI= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15/go.mod h1:ZQLZqhcu+JhSrA9/NXRm8SkDvsycE+JkV3WGY41e+IM= -github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= -github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 h1:dT3MqvGhSoaIhRseqw2I0yH81l7wiR2vjs57O51EAm8= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3/go.mod h1:GlAeCkHwugxdHaueRr4nhPuY+WW+gR8UjlcqzPr1SPI= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 h1:HGErhhrxZlQ044RiM+WdoZxp0p+EGM62y3L6pwA4olE= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17/go.mod h1:RkZEx4l0EHYDJpWppMJ3nD9wZJAa8/0lq9aVC+r2UII= -github.com/aws/aws-sdk-go-v2/service/route53 v1.42.3 h1:MmLCRqP4U4Cw9gJ4bNrCG0mWqEtBlmAVleyelcHARMU= -github.com/aws/aws-sdk-go-v2/service/route53 v1.42.3/go.mod h1:AMPjK2YnRh0YgOID3PqhJA1BRNfXDfGOnSsKHtAe8yA= -github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 h1:BXx0ZIxvrJdSgSvKTZ+yRBeSqqgPM89VPlulEcl37tM= -github.com/aws/aws-sdk-go-v2/service/sso v1.22.4/go.mod h1:ooyCOXjvJEsUw7x+ZDHeISPMhtwI3ZCB7ggFMcFfWLU= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 h1:yiwVzJW2ZxZTurVbYWA7QOrAaCYQR72t0wrSBfoesUE= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4/go.mod h1:0oxfLkpz3rQ/CHlx5hB7H69YUpFiI1tql6Q6Ne+1bCw= -github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 h1:ZsDKRLXGWHk8WdtyYMoGNO7bTudrvuKpDKgMVRlepGE= -github.com/aws/aws-sdk-go-v2/service/sts v1.30.3/go.mod h1:zwySh8fpFyXp9yOr/KVzxOl8SRqgf/IDw5aUt9UKFcQ= -github.com/aws/smithy-go v1.20.3 h1:ryHwveWzPV5BIof6fyDvor6V3iUL7nTfiTKXHiW05nE= -github.com/aws/smithy-go v1.20.3/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d h1:pVrfxiGfwelyab6n21ZBkbkmbevaf+WvMIiR7sr97hw= github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= github.com/c-robinson/iplib v1.0.3 h1:NG0UF0GoEsrC1/vyfX1Lx2Ss7CySWl3KqqXh3q4DdPU= github.com/c-robinson/iplib v1.0.3/go.mod h1:i3LuuFL1hRT5gFpBRnEydzw8R6yhGkF4szNDIbF8pgo= -github.com/caddyserver/certmagic v0.21.3 h1:pqRRry3yuB4CWBVq9+cUqu+Y6E2z8TswbhNx1AZeYm0= -github.com/caddyserver/certmagic v0.21.3/go.mod h1:Zq6pklO9nVRl3DIFUw9gVUfXKdpc/0qwTUAQMBlfgtI= -github.com/caddyserver/zerossl v0.1.3 h1:onS+pxp3M8HnHpN5MMbOMyNjmTheJyWRaZYwn+YTAyA= -github.com/caddyserver/zerossl v0.1.3/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4= github.com/cenkalti/backoff/v4 v4.1.0/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= @@ -137,6 +107,9 @@ github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nA github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= +github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= +github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= @@ -197,8 +170,6 @@ github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25d github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.2-0.20240212192251-757544f21357 h1:Fkzd8ktnpOR9h47SXHe2AYPwelXLH2GjGsjlAloiWfo= -github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.2-0.20240212192251-757544f21357/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -227,10 +198,6 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= -github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= @@ -242,9 +209,6 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= -github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= -github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= -github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -255,21 +219,14 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/libdns/libdns v0.2.2 h1:O6ws7bAfRPaBsgAYt8MDe2HcNBGC29hkZ9MX2eUSX3s= -github.com/libdns/libdns v0.2.2/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ= -github.com/libdns/route53 v1.5.0 h1:2SKdpPFl/qgWsXQvsLNJJAoX7rSxlk7zgoL4jnWdXVA= -github.com/libdns/route53 v1.5.0/go.mod h1:joT4hKmaTNKHEwb7GmZ65eoDz1whTu7KKYPS8ZqIh6Q= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae h1:dIZY4ULFcto4tAFlj1FYZl8ztUZ13bdq+PLY+NOfbyI= github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI= -github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= -github.com/mholt/acmez/v2 v2.0.1 h1:3/3N0u1pLjMK4sNEAFSI+bcvzbPhRpY383sy1kLHJ6k= -github.com/mholt/acmez/v2 v2.0.1/go.mod h1:fX4c9r5jYwMyMsC+7tkYRxHibkOTgta5DIFGoe67e1U= github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs= github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= @@ -291,20 +248,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/netbirdio/netbird v0.35.2 h1:nH7frDQ026boxpVmGhZ5N4qnNsCo19VrDkQAMxNzrDQ= -github.com/netbirdio/netbird v0.35.2/go.mod h1:N2uzjKgovm3rBiwg1G8hHOh+y92PcOcPeKXqg0cE6cI= -github.com/netbirdio/netbird v0.36.6-0.20250131121451-1cbc620614c0 h1:OAi/LrXT113FGCqNUUeP6ISRM7PEvO8VMfT4I2CUnIU= -github.com/netbirdio/netbird v0.36.6-0.20250131121451-1cbc620614c0/go.mod h1:fCfS9irHLGOXoLWv23CcX3lJzVcqtDOVaalqGqUdAgc= -github.com/netbirdio/netbird v0.37.2-0.20250226104302-59f0c88d9149 h1:HNNZaja3u2h991rJJt3V/N5cDn1c/549fthZqHZvC7w= -github.com/netbirdio/netbird v0.37.2-0.20250226104302-59f0c88d9149/go.mod h1:FiWFoWGn9BBIQXI8RZz8CWuhtHTOEvZagkw2B4SP1A4= -github.com/netbirdio/netbird v0.37.2-0.20250226105025-467906913923 h1:a+b1BJdihAR0OO2gf/OjQgUz2K0JW8+e8ZMJ9u8oftY= -github.com/netbirdio/netbird v0.37.2-0.20250226105025-467906913923/go.mod h1:FiWFoWGn9BBIQXI8RZz8CWuhtHTOEvZagkw2B4SP1A4= -github.com/netbirdio/netbird v0.37.2-0.20250226105245-d8f246fbaeaf h1:J1W0lfe7HF4oPNqxsFLAaqX4Dgm23aUzYwENm/6WIbg= -github.com/netbirdio/netbird v0.37.2-0.20250226105245-d8f246fbaeaf/go.mod h1:FiWFoWGn9BBIQXI8RZz8CWuhtHTOEvZagkw2B4SP1A4= -github.com/netbirdio/netbird v0.37.2-0.20250226164009-e6c62c023b78 h1:C3WNbntv1TdGLv5Z4G74+RHA2sHtAY/0i0c0l+QPRPo= -github.com/netbirdio/netbird v0.37.2-0.20250226164009-e6c62c023b78/go.mod h1:LPzGSNMW+yl2cCVLOLGCM2gh00raxbuR/Q8g0q9rams= -github.com/netbirdio/netbird v0.37.2-0.20250226164836-b90c10191ea9 h1:F51Z+pNSxhIvfDGJOeHGOFyh4JOv9mNdzOoiKEgjryo= -github.com/netbirdio/netbird v0.37.2-0.20250226164836-b90c10191ea9/go.mod h1:qbqfE9xtYEBW9loBBhqVV5PADHSfOlg45i9BO7gWD6c= +github.com/netbirdio/netbird v0.37.2-0.20250307102607-a50f0285b9fc h1:hk32Uw+RmcQL8JxcatLjEJ56GA+UKsj1FHQ6N5Je0kk= +github.com/netbirdio/netbird v0.37.2-0.20250307102607-a50f0285b9fc/go.mod h1:JkjoxOhkv+vf2sEb0NGmMbU6GtJDL745tWevj/W7eqg= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/okta/okta-sdk-golang/v2 v2.18.0 h1:cfDasMb7CShbZvOrF6n+DnLevWwiHgedWMGJ8M8xKDc= @@ -322,8 +267,6 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= -github.com/oschwald/maxminddb-golang v1.12.0 h1:9FnTOD0YOhP7DGxGsq4glzpGy5+w7pq50AS6wALUMYs= -github.com/oschwald/maxminddb-golang v1.12.0/go.mod h1:q0Nob5lTCqyQ8WT6FYgS1L7PXKVVbgiymefNwIjPzgY= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pegasus-kv/thrift v0.13.0 h1:4ESwaNoHImfbHa9RUGJiJZ4hrxorihZHk5aarYwY8d4= @@ -384,6 +327,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/testcontainers/testcontainers-go v0.31.0 h1:W0VwIhcEVhRflwL9as3dhY6jXjVCA27AkmbnZ+UTh3U= github.com/testcontainers/testcontainers-go v0.31.0/go.mod h1:D2lAoA0zUFiSY+eAflqK5mcUx/A5hrrORaEQrd0SefI= +github.com/testcontainers/testcontainers-go/modules/mysql v0.31.0 h1:790+S8ewZYCbG+o8IiFlZ8ZZ33XbNO6zV9qhU6xhlRk= +github.com/testcontainers/testcontainers-go/modules/mysql v0.31.0/go.mod h1:REFmO+lSG9S6uSBEwIMZCxeI36uhScjTwChYADeO3JA= github.com/testcontainers/testcontainers-go/modules/postgres v0.31.0 h1:isAwFS3KNKRbJMbWv+wolWqOFUECmjYZ+sIRZCIBc/E= github.com/testcontainers/testcontainers-go/modules/postgres v0.31.0/go.mod h1:ZNYY8vumNCEG9YI59A9d6/YaMY49uwRhmeU563EzFGw= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= @@ -397,12 +342,6 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -github.com/zeebo/assert v1.1.0 h1:hU1L1vLTHsnO8x8c9KAR5GmM5QscxHg5RNU5z5qbUWY= -github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= -github.com/zeebo/blake3 v0.2.3 h1:TFoLXsjeXqRNFxSbk35Dk4YtszE/MQQGK10BH4ptoTg= -github.com/zeebo/blake3 v0.2.3/go.mod h1:mjJjZpnsyIVtVgTOSpJ9vmRE4wgDeyt2HU3qXvvKCaQ= -github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= -github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 h1:Xs2Ncz0gNihqu9iosIZ5SkBbWo5T8JhhLJFMQL1qmLI= @@ -425,21 +364,14 @@ go.opentelemetry.io/otel/trace v1.26.0 h1:1ieeAUb4y0TE26jUFrCIXKpTuVK7uJGN9/Z/2L go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0= go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= -go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= -go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= -go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= -go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= goauthentik.io/api/v3 v3.2023051.3 h1:NebAhD/TeTWNo/9X3/Uj+rM5fG1HaiLOlKTNLQv9Qq4= goauthentik.io/api/v3 v3.2023051.3/go.mod h1:nYECml4jGbp/541hj8GcylKQG1gVBsKppHy4+7G8u4U= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= -golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= +golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= +golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= @@ -470,8 +402,7 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= @@ -484,8 +415,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -508,15 +439,14 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU= +golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -524,8 +454,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -546,8 +476,6 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 h1:CawjfCvYQH2OU3/TnxLx97WDSUDRABfT18pCOYwc2GE= -golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6/go.mod h1:3rxYc4HtVcSG9gVaTs2GEBdehh+sYPOwKtyUWEOTb80= golang.zx2c4.com/wireguard/windows v0.5.3 h1:On6j2Rpn3OEMXqBq00QEDC7bWSZrPIHKIus8eIuExIE= golang.zx2c4.com/wireguard/windows v0.5.3/go.mod h1:9TEe8TJmtwyQebdFwAkEWOPr3prrtqm+REGFifP60hI= google.golang.org/api v0.177.0 h1:8a0p/BbPa65GlqGWtUKxot4p0TV8OGOfyTjtmkXNXmk= @@ -602,19 +530,19 @@ gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637/go.mod h1:BHsqpu/nsuzkT5BpiH gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo= +gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM= gorm.io/driver/postgres v1.5.7 h1:8ptbNJTDbEmhdr62uReG5BGkdQyeasu/FZHxI0IMGnM= gorm.io/driver/postgres v1.5.7/go.mod h1:3e019WlBaYI5o5LIdNV+LyxCMNtLOQETBXL2h4chKpA= -gorm.io/driver/sqlite v1.5.3 h1:7/0dUgX28KAcopdfbRWWl68Rflh6osa4rDh+m51KL2g= -gorm.io/driver/sqlite v1.5.3/go.mod h1:qxAuCol+2r6PannQDpOP1FP6ag3mKi4esLnB/jHed+4= +gorm.io/driver/sqlite v1.5.7 h1:8NvsrhP0ifM7LX9G4zPB97NwovUakUxc+2V2uuf3Z1I= gorm.io/driver/sqlite v1.5.7/go.mod h1:U+J8craQU6Fzkcvu8oLeAQmi50TkwPEhHDEjQZXDah4= -gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde h1:9DShaph9qhkIYw7QF91I/ynrr4cOO2PZra2PFD7Mfeg= -gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= +gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= +gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8= gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ= gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= From dbf0bde540a10cff54ded1ade2cd6743ff072344 Mon Sep 17 00:00:00 2001 From: bcmmbaga Date: Fri, 7 Mar 2025 15:06:12 +0300 Subject: [PATCH 13/21] Move config to config package --- integrations/{ => config}/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename integrations/{ => config}/config.go (91%) diff --git a/integrations/config.go b/integrations/config/config.go similarity index 91% rename from integrations/config.go rename to integrations/config/config.go index fdb84be..b48e31a 100644 --- a/integrations/config.go +++ b/integrations/config/config.go @@ -1,4 +1,4 @@ -package integrations +package config import ( "github.com/netbirdio/netbird/management/proto" From 9d7eb4a284b020c5c472a7f103b54361d6c2c179 Mon Sep 17 00:00:00 2001 From: Maycon Santos Date: Sun, 9 Mar 2025 18:22:54 +0100 Subject: [PATCH 14/21] use correct interface name --- integrations/integrations.go | 2 +- integrations/port_forwarding.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/integrations/integrations.go b/integrations/integrations.go index 0ef62a7..f7c34d2 100644 --- a/integrations/integrations.go +++ b/integrations/integrations.go @@ -21,7 +21,7 @@ func RegisterHandlers( ctx context.Context, prefix string, router *mux.Router, - accountManager account.Manager, + accountManager account.AccountManager, integratedValidator integrated_validator.IntegratedValidator, meter metric.Meter, permissionsManager permissions.Manager, diff --git a/integrations/port_forwarding.go b/integrations/port_forwarding.go index 5ecc500..63932b1 100644 --- a/integrations/port_forwarding.go +++ b/integrations/port_forwarding.go @@ -25,3 +25,7 @@ func (c *controllerImpl) SendUpdate(ctx context.Context, accountID string, affec func (c *controllerImpl) GetProxyNetworkMaps(ctx context.Context, accountID string) (map[string]*types.NetworkMap, error) { return make(map[string]*types.NetworkMap), nil } + +func (c *controllerImpl) IsPeerInIngressPorts(ctx context.Context, accountID, peerID string) (bool, error) { + return false, nil +} From ee34714caafc86e342afd9ec46d8cd56d7724046 Mon Sep 17 00:00:00 2001 From: Maycon Santos Date: Sun, 9 Mar 2025 18:25:07 +0100 Subject: [PATCH 15/21] update netbird version --- integrations/go.mod | 2 +- integrations/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/integrations/go.mod b/integrations/go.mod index bdb022a..e1bc21b 100644 --- a/integrations/go.mod +++ b/integrations/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.1 require ( github.com/gorilla/mux v1.8.0 - github.com/netbirdio/netbird v0.37.2-0.20250307102607-a50f0285b9fc + github.com/netbirdio/netbird v0.37.2-0.20250307161910-36da4644134f github.com/sirupsen/logrus v1.9.3 go.opentelemetry.io/otel/metric v1.26.0 ) diff --git a/integrations/go.sum b/integrations/go.sum index 1786993..ccd1d02 100644 --- a/integrations/go.sum +++ b/integrations/go.sum @@ -250,6 +250,8 @@ github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8m github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/netbirdio/netbird v0.37.2-0.20250307102607-a50f0285b9fc h1:hk32Uw+RmcQL8JxcatLjEJ56GA+UKsj1FHQ6N5Je0kk= github.com/netbirdio/netbird v0.37.2-0.20250307102607-a50f0285b9fc/go.mod h1:JkjoxOhkv+vf2sEb0NGmMbU6GtJDL745tWevj/W7eqg= +github.com/netbirdio/netbird v0.37.2-0.20250307161910-36da4644134f h1:G/W354RYChk6slX3xXgGTLKpSznMQ9xzFiqP1mOQkVg= +github.com/netbirdio/netbird v0.37.2-0.20250307161910-36da4644134f/go.mod h1:JkjoxOhkv+vf2sEb0NGmMbU6GtJDL745tWevj/W7eqg= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/okta/okta-sdk-golang/v2 v2.18.0 h1:cfDasMb7CShbZvOrF6n+DnLevWwiHgedWMGJ8M8xKDc= From fe518506f9de21284be9122b6ae3d583e28e7da0 Mon Sep 17 00:00:00 2001 From: Maycon Santos Date: Sun, 9 Mar 2025 19:30:36 +0100 Subject: [PATCH 16/21] move config back --- integrations/{config => }/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename integrations/{config => }/config.go (91%) diff --git a/integrations/config/config.go b/integrations/config.go similarity index 91% rename from integrations/config/config.go rename to integrations/config.go index b48e31a..fdb84be 100644 --- a/integrations/config/config.go +++ b/integrations/config.go @@ -1,4 +1,4 @@ -package config +package integrations import ( "github.com/netbirdio/netbird/management/proto" From 4a444983b9aa87111bb18e3da5d6804fc8bd179e Mon Sep 17 00:00:00 2001 From: bcmmbaga Date: Mon, 10 Mar 2025 12:35:08 +0300 Subject: [PATCH 17/21] goi mod tidy --- integrations/go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/integrations/go.sum b/integrations/go.sum index ccd1d02..1a41c5c 100644 --- a/integrations/go.sum +++ b/integrations/go.sum @@ -248,8 +248,6 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/netbirdio/netbird v0.37.2-0.20250307102607-a50f0285b9fc h1:hk32Uw+RmcQL8JxcatLjEJ56GA+UKsj1FHQ6N5Je0kk= -github.com/netbirdio/netbird v0.37.2-0.20250307102607-a50f0285b9fc/go.mod h1:JkjoxOhkv+vf2sEb0NGmMbU6GtJDL745tWevj/W7eqg= github.com/netbirdio/netbird v0.37.2-0.20250307161910-36da4644134f h1:G/W354RYChk6slX3xXgGTLKpSznMQ9xzFiqP1mOQkVg= github.com/netbirdio/netbird v0.37.2-0.20250307161910-36da4644134f/go.mod h1:JkjoxOhkv+vf2sEb0NGmMbU6GtJDL745tWevj/W7eqg= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= From cb9e2bb4204d9f084cbea6ac6ae3a6b6d6afcee8 Mon Sep 17 00:00:00 2001 From: Bethuel Mmbaga Date: Mon, 10 Mar 2025 15:56:12 +0300 Subject: [PATCH 18/21] Fix circular dependency (#21) * Moved ExtendNetBirdConfig to config package * Updated accountManager type to account.Manager --- integrations/{ => config}/config.go | 2 +- integrations/go.mod | 2 +- integrations/go.sum | 4 ++-- integrations/integrations.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename integrations/{ => config}/config.go (91%) diff --git a/integrations/config.go b/integrations/config/config.go similarity index 91% rename from integrations/config.go rename to integrations/config/config.go index fdb84be..b48e31a 100644 --- a/integrations/config.go +++ b/integrations/config/config.go @@ -1,4 +1,4 @@ -package integrations +package config import ( "github.com/netbirdio/netbird/management/proto" diff --git a/integrations/go.mod b/integrations/go.mod index e1bc21b..4f2c4b8 100644 --- a/integrations/go.mod +++ b/integrations/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.1 require ( github.com/gorilla/mux v1.8.0 - github.com/netbirdio/netbird v0.37.2-0.20250307161910-36da4644134f + github.com/netbirdio/netbird v0.37.2-0.20250307162345-dd953022b02a github.com/sirupsen/logrus v1.9.3 go.opentelemetry.io/otel/metric v1.26.0 ) diff --git a/integrations/go.sum b/integrations/go.sum index 1a41c5c..c2eb8d1 100644 --- a/integrations/go.sum +++ b/integrations/go.sum @@ -248,8 +248,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/netbirdio/netbird v0.37.2-0.20250307161910-36da4644134f h1:G/W354RYChk6slX3xXgGTLKpSznMQ9xzFiqP1mOQkVg= -github.com/netbirdio/netbird v0.37.2-0.20250307161910-36da4644134f/go.mod h1:JkjoxOhkv+vf2sEb0NGmMbU6GtJDL745tWevj/W7eqg= +github.com/netbirdio/netbird v0.37.2-0.20250307162345-dd953022b02a h1:f3RkE+2ShzDFTZqlsMOPdeo9Vev74HMMdEUteya4eQE= +github.com/netbirdio/netbird v0.37.2-0.20250307162345-dd953022b02a/go.mod h1:jZQ50BQm4HHoWJu5SHD0UFAmRVgNrnJH9s0xwzoqi/M= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/okta/okta-sdk-golang/v2 v2.18.0 h1:cfDasMb7CShbZvOrF6n+DnLevWwiHgedWMGJ8M8xKDc= diff --git a/integrations/integrations.go b/integrations/integrations.go index f7c34d2..0ef62a7 100644 --- a/integrations/integrations.go +++ b/integrations/integrations.go @@ -21,7 +21,7 @@ func RegisterHandlers( ctx context.Context, prefix string, router *mux.Router, - accountManager account.AccountManager, + accountManager account.Manager, integratedValidator integrated_validator.IntegratedValidator, meter metric.Meter, permissionsManager permissions.Manager, From 5c5fee3a53bd03d17aacebedc45cbfc1688c6a9a Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Fri, 14 Mar 2025 16:19:07 +0100 Subject: [PATCH 19/21] add settings manager --- integrations/extra_settings.go | 2 +- integrations/go.mod | 10 +++++----- integrations/go.sum | 6 ++++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/integrations/extra_settings.go b/integrations/extra_settings.go index 784625a..f577380 100644 --- a/integrations/extra_settings.go +++ b/integrations/extra_settings.go @@ -19,6 +19,6 @@ func (m *ManagerImpl) GetExtraSettings(ctx context.Context, accountID string) (* return &types.ExtraSettings{}, nil } -func (m *ManagerImpl) UpdateExtraSettings(ctx context.Context, accountID string, accountExtraSettings *types.ExtraSettings) error { +func (m *ManagerImpl) UpdateExtraSettings(ctx context.Context, accountID, userID string, accountExtraSettings *types.ExtraSettings) error { return nil } diff --git a/integrations/go.mod b/integrations/go.mod index 4f2c4b8..41233a2 100644 --- a/integrations/go.mod +++ b/integrations/go.mod @@ -6,7 +6,6 @@ toolchain go1.23.1 require ( github.com/gorilla/mux v1.8.0 - github.com/netbirdio/netbird v0.37.2-0.20250307162345-dd953022b02a github.com/sirupsen/logrus v1.9.3 go.opentelemetry.io/otel/metric v1.26.0 ) @@ -74,6 +73,7 @@ require ( github.com/moby/sys/user v0.1.0 // indirect github.com/moby/term v0.5.0 // indirect github.com/morikuni/aec v1.0.0 // indirect + github.com/netbirdio/netbird v0.38.1-0.20250314145947-7af2a1769f07 // indirect github.com/okta/okta-sdk-golang/v2 v2.18.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0 // indirect @@ -103,14 +103,14 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.26.0 // indirect go.opentelemetry.io/otel/trace v1.26.0 // indirect goauthentik.io/api/v3 v3.2023051.3 // indirect - golang.org/x/crypto v0.35.0 // indirect + golang.org/x/crypto v0.36.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.19.0 // indirect - golang.org/x/sync v0.11.0 // indirect - golang.org/x/sys v0.30.0 // indirect - golang.org/x/text v0.22.0 // indirect + golang.org/x/sync v0.12.0 // indirect + golang.org/x/sys v0.31.0 // indirect + golang.org/x/text v0.23.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect golang.zx2c4.com/wireguard/windows v0.5.3 // indirect google.golang.org/api v0.177.0 // indirect diff --git a/integrations/go.sum b/integrations/go.sum index c2eb8d1..a928785 100644 --- a/integrations/go.sum +++ b/integrations/go.sum @@ -250,6 +250,8 @@ github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8m github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/netbirdio/netbird v0.37.2-0.20250307162345-dd953022b02a h1:f3RkE+2ShzDFTZqlsMOPdeo9Vev74HMMdEUteya4eQE= github.com/netbirdio/netbird v0.37.2-0.20250307162345-dd953022b02a/go.mod h1:jZQ50BQm4HHoWJu5SHD0UFAmRVgNrnJH9s0xwzoqi/M= +github.com/netbirdio/netbird v0.38.1-0.20250314145947-7af2a1769f07 h1:1M9UQrdUVWmuwvMv0tFAgkRxIY1X42JBBixKK7MiOMs= +github.com/netbirdio/netbird v0.38.1-0.20250314145947-7af2a1769f07/go.mod h1:CFf0ks0Ujpso43d3/FmUyUOiySMxarL9xQbWgR82hHE= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/okta/okta-sdk-golang/v2 v2.18.0 h1:cfDasMb7CShbZvOrF6n+DnLevWwiHgedWMGJ8M8xKDc= @@ -372,6 +374,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= +golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= @@ -417,6 +420,7 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -441,6 +445,7 @@ golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -456,6 +461,7 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From fccc423d1e7f7615ea303b6ea42854934d91eead Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Fri, 14 Mar 2025 16:24:38 +0100 Subject: [PATCH 20/21] fix settings manager --- integrations/extra_settings.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/integrations/extra_settings.go b/integrations/extra_settings.go index f577380..116958a 100644 --- a/integrations/extra_settings.go +++ b/integrations/extra_settings.go @@ -3,6 +3,7 @@ package integrations import ( "context" + "github.com/netbirdio/netbird/management/server/activity" "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/management/server/integrations/extra_settings" @@ -11,7 +12,7 @@ import ( type ManagerImpl struct { } -func NewManager() extra_settings.Manager { +func NewManager(eventStore activity.Store) extra_settings.Manager { return &ManagerImpl{} } From 5be625e48b11d47a08ca9214b834ff26568a4ce0 Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Sat, 15 Mar 2025 00:36:15 +0100 Subject: [PATCH 21/21] changed check --- integrations/extra_settings.go | 4 ++-- integrations/go.mod | 2 +- integrations/go.sum | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/integrations/extra_settings.go b/integrations/extra_settings.go index 116958a..1c5eb93 100644 --- a/integrations/extra_settings.go +++ b/integrations/extra_settings.go @@ -20,6 +20,6 @@ func (m *ManagerImpl) GetExtraSettings(ctx context.Context, accountID string) (* return &types.ExtraSettings{}, nil } -func (m *ManagerImpl) UpdateExtraSettings(ctx context.Context, accountID, userID string, accountExtraSettings *types.ExtraSettings) error { - return nil +func (m *ManagerImpl) UpdateExtraSettings(ctx context.Context, accountID, userID string, accountExtraSettings *types.ExtraSettings) (bool, error) { + return false, nil } diff --git a/integrations/go.mod b/integrations/go.mod index 41233a2..7171deb 100644 --- a/integrations/go.mod +++ b/integrations/go.mod @@ -73,7 +73,7 @@ require ( github.com/moby/sys/user v0.1.0 // indirect github.com/moby/term v0.5.0 // indirect github.com/morikuni/aec v1.0.0 // indirect - github.com/netbirdio/netbird v0.38.1-0.20250314145947-7af2a1769f07 // indirect + github.com/netbirdio/netbird v0.38.1-0.20250314233310-24a81222b369 // indirect github.com/okta/okta-sdk-golang/v2 v2.18.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0 // indirect diff --git a/integrations/go.sum b/integrations/go.sum index a928785..1a9659e 100644 --- a/integrations/go.sum +++ b/integrations/go.sum @@ -252,6 +252,8 @@ github.com/netbirdio/netbird v0.37.2-0.20250307162345-dd953022b02a h1:f3RkE+2Shz github.com/netbirdio/netbird v0.37.2-0.20250307162345-dd953022b02a/go.mod h1:jZQ50BQm4HHoWJu5SHD0UFAmRVgNrnJH9s0xwzoqi/M= github.com/netbirdio/netbird v0.38.1-0.20250314145947-7af2a1769f07 h1:1M9UQrdUVWmuwvMv0tFAgkRxIY1X42JBBixKK7MiOMs= github.com/netbirdio/netbird v0.38.1-0.20250314145947-7af2a1769f07/go.mod h1:CFf0ks0Ujpso43d3/FmUyUOiySMxarL9xQbWgR82hHE= +github.com/netbirdio/netbird v0.38.1-0.20250314233310-24a81222b369 h1:XL0+hrHRpnSydagooOmkhYEKgd3Csf5mf8eRo84679E= +github.com/netbirdio/netbird v0.38.1-0.20250314233310-24a81222b369/go.mod h1:N8mGytYNLokwwpAm0/3Gs4zsvakZ3ZQMOtBefnzb5Ig= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/okta/okta-sdk-golang/v2 v2.18.0 h1:cfDasMb7CShbZvOrF6n+DnLevWwiHgedWMGJ8M8xKDc=