Skip to content

Fix NPE in LDAPAuthorizationBackend when rolesearch disabled #6112

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

Merged
cwperks merged 4 commits into from
Apr 30, 2026
+27 −8
Merged

Fix NPE in LDAPAuthorizationBackend when rolesearch disabled #6112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a78dc99
fix
tronboto Apr 23, 2026
055ae72
assign connection before if statement
tronboto Apr 27, 2026
f023305
remove another redundant call
tronboto Apr 29, 2026
aeeab94
Merge branch 'main' into fix-connection-npe
tronboto Apr 29, 2026
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
12 changes: 4 additions & 8 deletions src/main/java/org/opensearch/security/auth/ldap/backend/LDAPAuthorizationBackend.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,17 +832,17 @@ public User addRoles(User user, AuthenticationContext context) throws OpenSearch
userRoleAttributeValue = Utils.getSingleStringValue(userRoleAttribute);
}

if (connection == null) {
connection = getConnection(settings, configPath);
}

if (rolesearchEnabled) {
String escapedDn = dn;

if (isDebugEnabled) {
log.debug("DBGTRACE (8): escapedDn" + escapedDn);
}

if (connection == null) {
connection = getConnection(settings, configPath);
}

for (Map.Entry<String, Settings> roleSearchSettingsEntry : roleBaseSettings) {
Settings roleSearchSettings = roleSearchSettingsEntry.getValue();

Expand Down Expand Up @@ -902,10 +902,6 @@ public User addRoles(User user, AuthenticationContext context) throws OpenSearch
continue;
}

if (connection == null) {
connection = getConnection(settings, configPath);
}

final Set<LdapName> nestedRoles = resolveNestedRoles(
roleLdapName,
connection,
Expand Down
23 changes: 23 additions & 0 deletions src/test/java/org/opensearch/security/auth/ldap/LdapBackendTestNewStyleConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,29 @@ public void testLdapAuthorizationNestedAttrNoRoleSearch() throws Exception {
MatcherAssert.assertThat(user.getRoles(), hasItem("rolemo4"));
}

@Test
public void testLdapAuthorizationRolesearchDisabledWithLdapAuthContext() throws Exception {
final Settings settings = Settings.builder()
.putList(ConfigConstants.LDAP_HOSTS, "localhost:" + ldapPort)
.put("users.u1.search", "(uid={0})")
.put("users.u1.base", "ou=people,o=TEST")
.put("roles.g1.base", "ou=groups,o=TEST")
.put(ConfigConstants.LDAP_AUTHZ_ROLENAME, "cn")
.put(ConfigConstants.LDAP_AUTHZ_ROLESEARCH_ENABLED, false)
.put(ConfigConstants.LDAP_AUTHZ_USERROLENAME, "description")
.build();

AuthenticationContext context = ctx("spock", "spocksecret");
User user = new LDAPAuthenticationBackend(settings, null).authenticate(context);
user = new LDAPAuthorizationBackend(settings, null).addRoles(user, context);

Assert.assertNotNull(user);
assertThat(user.getName(), is("cn=Captain Spock,ou=people,o=TEST"));
assertThat(user.getRoles().size(), is(2));
Assert.assertTrue(user.getRoles().contains("dummyempty"));
Assert.assertTrue(user.getRoles().contains("rolemo4"));
}

@Test
public void testCustomAttributes() throws Exception {

Expand Down
Loading