Merge pull request #636 from signal18/user-management

User management
signal18 · Jun 11, 2024 · 1187ee1 · 1187ee1
2 parents 609335d + 43f5dd3
commit 1187ee1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/server/api.go b/server/api.go
@@ -305,7 +305,8 @@ func (repman *ReplicationManager) loginHandler(w http.ResponseWriter, r *http.Re
 		fmt.Fprintf(w, "Error in request")
 		return
 	}
-	if auth_try, ok := repman.UserAuthTry[user.Username]; ok {
+	if v, ok := repman.UserAuthTry.Load(user.Username); ok {
+		auth_try := v.(authTry)
 		if auth_try.Try == 3 {
 			if time.Now().Before(auth_try.Time.Add(3 * time.Minute)) {
 				fmt.Println("Time until last auth try : " + time.Until(auth_try.Time).String())
@@ -315,28 +316,32 @@ func (repman *ReplicationManager) loginHandler(w http.ResponseWriter, r *http.Re
 			} else {
 				auth_try.Try = 1
 				auth_try.Time = time.Now()
-				repman.UserAuthTry[user.Username] = auth_try
+				repman.UserAuthTry.Store(user.Username, auth_try)
 			}
 		} else {
 
 			auth_try.Try += 1
-			repman.UserAuthTry[user.Username] = auth_try
+			repman.UserAuthTry.Store(user.Username, auth_try)
 		}
 	} else {
-		var auth_try authTry
-		auth_try.User = user.Username
-		auth_try.Try = 1
-		auth_try.Time = time.Now()
-		repman.UserAuthTry[user.Username] = auth_try
+		var auth_try authTry = authTry{
+			User: user.Username,
+			Try:  1,
+			Time: time.Now(),
+		}
+		repman.UserAuthTry.Store(user.Username, auth_try)
 	}
 
 	for _, cluster := range repman.Clusters {
 		//validate user credentials
 		if cluster.IsValidACL(user.Username, user.Password, r.URL.Path, "password") {
-			var auth_try authTry
-			auth_try.Try = 1
-			auth_try.Time = time.Now()
-			repman.UserAuthTry[user.Username] = auth_try
+			var auth_try authTry = authTry{
+				User: user.Username,
+				Try:  1,
+				Time: time.Now(),
+			}
+			repman.UserAuthTry.Store(user.Username, auth_try)
+
 
 			signer := jwt.New(jwt.SigningMethodRS256)
 			claims := signer.Claims.(jwt.MapClaims)

diff --git a/server/server.go b/server/server.go
@@ -96,7 +96,7 @@ type ReplicationManager struct {
 	BackupBinlogList                                 map[string]bool             `json:"backupBinlogList"`
 	BinlogParseList                                  map[string]bool             `json:"binlogParseList"`
 	currentCluster                                   *cluster.Cluster            `json:"-"`
-	UserAuthTry                                      map[string]authTry          `json:"-"`
+	UserAuthTry                                      sync.Map                    `json:"-"`
 	OAuthAccessToken                                 *oauth2.Token               `json:"-"`
 	ViperConfig                                      *viper.Viper                `json:"-"`
 	tlog                                             s18log.TermLog
@@ -913,7 +913,7 @@ func (repman *ReplicationManager) InitConfig(conf config.Config) {
 	repman.DynamicFlagMaps = make(map[string]map[string]interface{})
 	ImmuableMap := make(map[string]interface{})
 	DynamicMap := make(map[string]interface{})
-	repman.UserAuthTry = make(map[string]authTry)
+	// repman.UserAuthTry = make(map[string]authTry)
 	repman.cloud18CheckSum = nil
 	// call after init if configuration file is provide