From 0a9c4c1fe94354d74beb99d88c35d1fe0a61ce6e Mon Sep 17 00:00:00 2001 From: Maycon Santos Date: Thu, 18 Jan 2024 10:23:27 +0100 Subject: [PATCH 1/3] Just log ValidateExtraSettings and set input value to false --- additions/settings_validation.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/additions/settings_validation.go b/additions/settings_validation.go index b1aba5a..baf36f5 100644 --- a/additions/settings_validation.go +++ b/additions/settings_validation.go @@ -4,12 +4,16 @@ import ( "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/status" + 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 { - return status.Errorf(status.InvalidArgument, "extra settings are only supported on the cloud version of NetBird") + 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 } From 93592c0950a9b697c1977308730dd8c18525e4f4 Mon Sep 17 00:00:00 2001 From: Maycon Santos Date: Thu, 18 Jan 2024 10:35:57 +0100 Subject: [PATCH 2/3] check old extra settings before log --- additions/settings_validation.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/additions/settings_validation.go b/additions/settings_validation.go index baf36f5..6da32a4 100644 --- a/additions/settings_validation.go +++ b/additions/settings_validation.go @@ -9,7 +9,9 @@ import ( func ValidateExtraSettings(newExtraSettings *account.ExtraSettings, oldExtraSettings *account.ExtraSettings, peers map[string]*nbpeer.Peer, userID string, accountID string, eventStore activity.Store) error { if newExtraSettings != nil { - log.Info("extra settings are only supported on the cloud version of NetBird") + 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 From 82195480354c9395f13fb86610f131b3f6f6b9fd Mon Sep 17 00:00:00 2001 From: Maycon Santos Date: Thu, 18 Jan 2024 10:36:16 +0100 Subject: [PATCH 3/3] check old extra settings before log --- additions/settings_validation.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/additions/settings_validation.go b/additions/settings_validation.go index 6da32a4..f020480 100644 --- a/additions/settings_validation.go +++ b/additions/settings_validation.go @@ -9,7 +9,7 @@ import ( 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 { + if oldExtraSettings == nil { log.Info("extra settings are only supported on the cloud version of NetBird") } if newExtraSettings.PeerApprovalEnabled {