backport of commit 2f8e59c (#23613)

Co-authored-by: davidadeleon <[email protected]>
hashicorp · Oct 11, 2023 · 5a6a777 · 5a6a777
1 parent 4ab5192
commit 5a6a777
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/vault/logical_system_user_lockout.go b/vault/logical_system_user_lockout.go
@@ -51,14 +51,16 @@ func unlockUser(ctx context.Context, core *Core, mountAccessor string, aliasName
 		return err
 	}
 
-	// Check if we have no more locked users and cancel any running lockout logger
-	core.userFailedLoginInfoLock.RLock()
-	numLockedUsers := len(core.userFailedLoginInfo)
-	core.userFailedLoginInfoLock.RUnlock()
-
-	if numLockedUsers == 0 {
-		core.Logger().Info("user lockout(s) cleared")
-		core.lockoutLoggerCancel()
+	if core.lockoutLoggerCancel != nil {
+		// Check if we have no more locked users and cancel any running lockout logger
+		core.userFailedLoginInfoLock.RLock()
+		numLockedUsers := len(core.userFailedLoginInfo)
+		core.userFailedLoginInfoLock.RUnlock()
+
+		if numLockedUsers == 0 {
+			core.Logger().Info("user lockout(s) cleared")
+			core.lockoutLoggerCancel()
+		}
 	}
 
 	return nil