From ea712bbbe8bb66ceb439dad0ddbb10da18a19c22 Mon Sep 17 00:00:00 2001 From: Aleksey Yeschenko Date: Fri, 16 Aug 2013 04:52:30 +0300 Subject: [PATCH 1/2] Skip auth setup if AllowAllAuthenticator is used --- src/java/org/apache/cassandra/auth/Auth.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/java/org/apache/cassandra/auth/Auth.java b/src/java/org/apache/cassandra/auth/Auth.java index c561aab6ff..c9a42a2724 100644 --- a/src/java/org/apache/cassandra/auth/Auth.java +++ b/src/java/org/apache/cassandra/auth/Auth.java @@ -122,6 +122,9 @@ public class Auth */ public static void setup() { + if (DatabaseDescriptor.getAuthenticator() instanceof AllowAllAuthenticator) + return; + setupAuthKeyspace(); setupUsersTable(); From ebab9d39196384f2b9f37cb241b276f8112ab281 Mon Sep 17 00:00:00 2001 From: Aleksey Yeschenko Date: Fri, 16 Aug 2013 05:00:35 +0300 Subject: [PATCH 2/2] Authorizer+authenticator configuration sanity check --- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 7df2b2ff86..c1ced941a8 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -219,6 +219,9 @@ public class DatabaseDescriptor if (conf.authorizer != null) authorizer = FBUtilities.newAuthorizer(conf.authorizer); + if (authenticator instanceof AllowAllAuthenticator && !(authorizer instanceof AllowAllAuthorizer)) + throw new ConfigurationException("AllowAllAuthenticator can't be used with " + conf.authorizer); + if (conf.internode_authenticator != null) internodeAuthenticator = FBUtilities.construct(conf.internode_authenticator, "internode_authenticator"); else