implement tests with LDAP server in Docker

Author: smiklosovic

.circleci/config.yml

@@ -244,7 +244,7 @@ workflows:
             branches:
               ignore: /.*/
             tags:
-              only: /^v4.0-beta2-\d+\.\d+\.\d+$/
+              only: /^v4.0-rc2-\d+\.\d+\.\d+$/
       - publish-github-release-2-2:
           requires:
             - build-2-2
@@ -276,4 +276,4 @@ workflows:
             branches:
               ignore: /.*/
             tags:
-              only: /^v4.0-beta2-\d+\.\d+\.\d+$/
+              only: /^v4.0-rc2-\d+\.\d+\.\d+$/

base/pom.xml

@@ -1,95 +1,34 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>com.instaclustr</groupId>
         <artifactId>cassandra-ldap-parent</artifactId>
         <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
     <!--
         this artifact is reused in both Cassandra 3 and Cassandra 4 if applicable as interfaces are some for
         the most of the functionality and respective implementation differ where it is necessary
      -->
-    
+
     <artifactId>cassandra-ldap-base</artifactId>
     <version>1.1.1</version>
-    
+
     <name>Cassandra LDAP Authenticator common code</name>
     <description>Common code for Apache Cassandra LDAP plugin</description>
-    
-    <properties>
-        <embedded.cassandra.version>3.0.2</embedded.cassandra.version>
-        <cassandra.driver.version>4.6.0</cassandra.driver.version>
-        <testng.version>6.14.3</testng.version>
-        <version.awaitility>4.0.3</version.awaitility>
-        <version.instaclustr.common>1.3.7</version.instaclustr.common>
-    </properties>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.cassandra</groupId>
             <artifactId>cassandra-all</artifactId>
             <version>3.0.23</version>
             <scope>provided</scope>
         </dependency>
-        
-        <!-- test -->
-        
-        <dependency>
-            <groupId>com.github.nosan</groupId>
-            <artifactId>embedded-cassandra</artifactId>
-            <version>${embedded.cassandra.version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.datastax.oss</groupId>
-                    <artifactId>java-driver-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        
-        <dependency>
-            <groupId>com.datastax.cassandra</groupId>
-            <artifactId>cassandra-driver-core</artifactId>
-            <version>3.10.0</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>${testng.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>${version.awaitility}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>${maven.jar.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 
 </project>
 

base/src/main/java/com/instaclustr/cassandra/ldap/conf/LdapAuthenticatorConfiguration.java

@@ -139,8 +139,6 @@ public Properties parseProperties() throws ConfigurationException
 
         properties.setProperty(FILTER_TEMPLATE, filterTemplate);
 
-
-
         properties.put(LdapAuthenticatorConfiguration.CONTEXT_FACTORY_PROP, properties.getProperty(CONTEXT_FACTORY_PROP, DEFAULT_CONTEXT_FACTORY));
         properties.put(LdapAuthenticatorConfiguration.LDAP_URI_PROP, properties.getProperty(LDAP_URI_PROP));
 

base/src/main/java/org/apache/cassandra/auth/LDAPCassandraRoleManager.java

@@ -94,6 +94,10 @@ public void setup()
 
                 if (!canLogin(RoleResource.fromName("roles/" + dbaRole)))
                 {
+                    if (dbaRole.equals("cassandra"))
+                    {
+                        throw new IllegalStateException();
+                    }
                     logger.info("Role '" + dbaRole + "' can not log in, prematurely existing setup, not going to create LDAP admin role {}", ldapAdminRole);
                     return null;
                 }