diff --git a/additions/go.mod b/additions/go.mod deleted file mode 100644 index 10b2351..0000000 --- a/additions/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module github.com/netbirdio/management-integrations/additions - -go 1.20 - -require github.com/netbirdio/netbird v0.24.3-0.20231128133457-bab420ca7798 diff --git a/additions/go.sum b/additions/go.sum deleted file mode 100644 index d27173e..0000000 --- a/additions/go.sum +++ /dev/null @@ -1,2 +0,0 @@ -github.com/netbirdio/netbird v0.24.3-0.20231128133457-bab420ca7798 h1:k0FvU2kxsZC/rikDD2JdC5CjuX5s09wUue6xq87f/AE= -github.com/netbirdio/netbird v0.24.3-0.20231128133457-bab420ca7798/go.mod h1:5TrGRLGrGQZDEsGLQVR5KW8T82atu6J2WvOJcxQmtmE= diff --git a/additions/peer_validation.go b/additions/peer_validation.go deleted file mode 100644 index 7661386..0000000 --- a/additions/peer_validation.go +++ /dev/null @@ -1,14 +0,0 @@ -package additions - -import ( - "github.com/netbirdio/netbird/management/server/activity" - nbpeer "github.com/netbirdio/netbird/management/server/peer" -) - -func ValidatePeersUpdateRequest(update *nbpeer.Peer, peer *nbpeer.Peer, userID string, accountID string, eventStore activity.Store, dnsDomain string) (*nbpeer.Peer, error) { - return update, nil -} - -func ValidatePeers(peers []*nbpeer.Peer) []*nbpeer.Peer { - return peers -} diff --git a/additions/settings_validation.go b/additions/settings_validation.go deleted file mode 100644 index f020480..0000000 --- a/additions/settings_validation.go +++ /dev/null @@ -1,21 +0,0 @@ -package additions - -import ( - "github.com/netbirdio/netbird/management/server/account" - "github.com/netbirdio/netbird/management/server/activity" - nbpeer "github.com/netbirdio/netbird/management/server/peer" - log "github.com/sirupsen/logrus" -) - -func ValidateExtraSettings(newExtraSettings *account.ExtraSettings, oldExtraSettings *account.ExtraSettings, peers map[string]*nbpeer.Peer, userID string, accountID string, eventStore activity.Store) error { - if newExtraSettings != nil { - if oldExtraSettings == nil { - log.Info("extra settings are only supported on the cloud version of NetBird") - } - if newExtraSettings.PeerApprovalEnabled { - log.Info("setting peer approval to false") - newExtraSettings.PeerApprovalEnabled = false - } - } - return nil -} diff --git a/integrations/approval.go b/integrations/approval.go index 0227c3a..0d66df5 100644 --- a/integrations/approval.go +++ b/integrations/approval.go @@ -13,13 +13,29 @@ func NewIntegratedApproval(activity.Store) (*IntegratedApprovalImpl, error) { return &IntegratedApprovalImpl{}, nil } +func (v *IntegratedApprovalImpl) UpdatePeerApprovalSetting(*account.ExtraSettings, *account.ExtraSettings, map[string]*nbpeer.Peer, string, string) error { + return nil +} + +func (v *IntegratedApprovalImpl) ApprovePeer(update *nbpeer.Peer, _ *nbpeer.Peer, _ string, _ string, _ string, _ []string, _ *account.ExtraSettings) (*nbpeer.Peer, error) { + return update, nil +} + func (v *IntegratedApprovalImpl) PreparePeer(_ string, peer *nbpeer.Peer, _ []string, _ *account.ExtraSettings) *nbpeer.Peer { return peer.Copy() } -func (v *IntegratedApprovalImpl) IsRequiresApproval(accountID string, peer *nbpeer.Peer, peersGroup []string, extraSettings *account.ExtraSettings) bool { +func (v *IntegratedApprovalImpl) IsRequiresApproval(_ string, _ *nbpeer.Peer, _ []string, _ *account.ExtraSettings) bool { return false } +func (v *IntegratedApprovalImpl) GetApprovedPeers(_ string, peers map[string]*nbpeer.Peer, _ *account.ExtraSettings) (map[string]struct{}, error) { + approvedPeers := make(map[string]struct{}) + for p := range peers { + approvedPeers[p] = struct{}{} + } + return approvedPeers, nil +} + func (v *IntegratedApprovalImpl) Stop() { }