Skip to content

Avoid global monitor on every bind in getDefaultPasswordPolicy #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vharseko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid global monitor on every bind in getDefaultPasswordPolicy #669

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
* Copyright 2006-2010 Sun Microsystems, Inc.
* Portions Copyright 2010-2016 ForgeRock AS.
* Portions Copyright 2022-2025 3A Systems, LLC.
* Portions Copyright 2022-2026 3A Systems, LLC.
* Portions Copyright 2025 Wren Security.
*/
package org.opends.server.core;
Expand Down Expand Up @@ -466,8 +466,12 @@ public final class DirectoryServer

/** The configuration handler used to manage the password generators. */
private PasswordGeneratorConfigManager passwordGeneratorConfigManager;
/** The default password policy for the Directory Server. */
private PasswordPolicy defaultPasswordPolicy;
/**
* The default password policy for the Directory Server. Volatile so that
* getDefaultPasswordPolicy() can read the cached value without taking the
* authenticationPolicies monitor; all mutations happen under that monitor.
*/
private volatile PasswordPolicy defaultPasswordPolicy;
/** The configuration handler used to manage the authentication policies. */
private PasswordPolicyConfigManager authenticationPolicyConfigManager;
/** The configuration handler used to manage the password storage schemes. */
Expand Down Expand Up @@ -2535,6 +2539,15 @@ public static void resetDefaultPasswordPolicy()
*/
public static PasswordPolicy getDefaultPasswordPolicy()
{
// This method is called on every authentication. Do not take the global
// monitor just to read the cached value: it is volatile and only mutated
// under the authenticationPolicies monitor.
PasswordPolicy cachedPolicy = directoryServer.defaultPasswordPolicy;
if (cachedPolicy != null)
{
return cachedPolicy;
}

// Ensure default policy is synchronized.
synchronized (directoryServer.authenticationPolicies)
{
Expand Down