From a2ded50291e1cd7a20c0bec432fbd7ab74ea0b3d Mon Sep 17 00:00:00 2001 From: Stefan Miklosovic Date: Mon, 24 Feb 2025 22:38:16 +0100 Subject: [PATCH] improvements for 664032 --- .../java/org/apache/cassandra/auth/LDAPAuthenticator.java | 2 +- .../org/apache/cassandra/auth/LDAPCassandraRoleManager.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/src/main/java/org/apache/cassandra/auth/LDAPAuthenticator.java b/base/src/main/java/org/apache/cassandra/auth/LDAPAuthenticator.java index 34213c1..4ced617 100644 --- a/base/src/main/java/org/apache/cassandra/auth/LDAPAuthenticator.java +++ b/base/src/main/java/org/apache/cassandra/auth/LDAPAuthenticator.java @@ -96,7 +96,7 @@ public void setup() { try { - if (!systemAuthRoles.hasAdminRole()) + if (!systemAuthRoles.hasAdminRole(adminRole)) { throw new IllegalStateException("Waiting for " + adminRole + " role!"); } diff --git a/base/src/main/java/org/apache/cassandra/auth/LDAPCassandraRoleManager.java b/base/src/main/java/org/apache/cassandra/auth/LDAPCassandraRoleManager.java index 08f4e70..221bd36 100644 --- a/base/src/main/java/org/apache/cassandra/auth/LDAPCassandraRoleManager.java +++ b/base/src/main/java/org/apache/cassandra/auth/LDAPCassandraRoleManager.java @@ -97,7 +97,7 @@ public void setup() { if (dbaRole.equals("cassandra")) { - throw new IllegalStateException(); + throw new IllegalStateException("Role 'cassandra' can not log in"); } logger.info("Role '" + dbaRole + "' can not log in, prematurely existing setup, not going to create LDAP admin role {}", ldapAdminRole); return null; @@ -181,7 +181,7 @@ public boolean canLogin(RoleResource role) } catch (RequestExecutionException e) { - logger.debug("Failed to authorize {} for login permission", role.getRoleName()); + logger.debug("Failed to authorize " + role.getRoleName() + " for login permission ", e); throw new UnauthorizedException("Unable to perform authorization of login permission: " + e.getMessage()); } }