aligned to 5.0.2, 4.1.7, 4.0.14

smiklosovic · smiklosovic · commit 08f15060b43d · 2024-10-25T16:26:58.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -24,7 +24,7 @@ jobs:
           key: m2-{{ checksum "pom.xml" }}
 
       - run: sudo apt-get update && sudo apt install openjdk-11-jdk
-      - run: mvn --version && whereis java && mvn clean install -Dversion.cassandra4=4.0.7 -Dversion.cassandra41=4.1.0 -Dversion.cassandra50=5.0.0
+      - run: mvn --version && whereis java && mvn clean install -Dversion.cassandra4=4.0.14 -Dversion.cassandra41=4.1.7 -Dversion.cassandra50=5.0.2
 
       - persist_to_workspace:
           root: ~/cassandra-ldap
@@ -53,7 +53,7 @@ jobs:
             - m2-
 
       - run: sudo apt-get update && sudo apt install openjdk-11-jdk
-      - run: mvn clean install -DoutputDirectory=/tmp/artifacts
+      - run: mvn clean install -DoutputDirectory=/tmp/artifacts -Dversion.cassandra4=4.0.14
 
       - save_cache:
           paths:
@@ -87,7 +87,7 @@ jobs:
             - m2-
 
       - run: sudo apt-get update && sudo apt install openjdk-11-jdk
-      - run: mvn clean install -DoutputDirectory=/tmp/artifacts
+      - run: mvn clean install -DoutputDirectory=/tmp/artifacts -Dversion.cassandra41=4.1.7
 
       - save_cache:
           paths:
@@ -121,7 +121,7 @@ jobs:
             - m2-
 
       - run: sudo apt-get update && sudo apt install openjdk-11-jdk
-      - run: mvn clean install -DoutputDirectory=/tmp/artifacts
+      - run: mvn clean install -DoutputDirectory=/tmp/artifacts -Dversion.cassandra50=5.0.2
 
       - save_cache:
           paths:
diff --git a/cassandra-4.0/pom.xml b/cassandra-4.0/pom.xml
@@ -10,14 +10,14 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>cassandra-ldap-4.0.7</artifactId>
-    <version>1.1.0</version>
+    <artifactId>cassandra-ldap-4.0.14</artifactId>
+    <version>1.0.0</version>
 
     <name>Cassandra LDAP Authenticator for Cassandra 4.0</name>
     <description>Pluggable LDAP authentication implementation for Apache Cassandra 4.0</description>
 
     <properties>
-        <version.cassandra4>4.0.7</version.cassandra4>
+        <version.cassandra4>4.0.14</version.cassandra4>
 
         <version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
         <version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
diff --git a/cassandra-4.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra40LDAPIntegrationTest.java b/cassandra-4.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra40LDAPIntegrationTest.java
@@ -5,12 +5,12 @@
 public class Cassandra40LDAPIntegrationTest extends AbstractLDAPTest {
     @Override
     public String getCassandraVersion() {
-        return System.getProperty("version.cassandra4", "4.0.7");
+        return System.getProperty("version.cassandra4", "4.0.14");
     }
 
     @Override
     public String getImplementationGAV() {
-        return "com.instaclustr:cassandra-ldap-" + getCassandraVersion() + ":1.1.0";
+        return "com.instaclustr:cassandra-ldap-" + getCassandraVersion() + ":1.0.0";
     }
 
     @Test
diff --git a/cassandra-4.1/pom.xml b/cassandra-4.1/pom.xml
@@ -10,14 +10,14 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>cassandra-ldap-4.1.0</artifactId>
-    <version>1.1.0</version>
+    <artifactId>cassandra-ldap-4.1.7</artifactId>
+    <version>1.0.0</version>
 
     <name>Cassandra LDAP Authenticator for Cassandra 4.1</name>
     <description>Pluggable LDAP authentication implementation for Apache Cassandra 4.1</description>
 
     <properties>
-        <version.cassandra41>4.1.0</version.cassandra41>
+        <version.cassandra41>4.1.7</version.cassandra41>
 
         <version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
         <version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
diff --git a/cassandra-4.1/src/main/java/com/instaclustr/cassandra/ldap/auth/Cassandra41SystemAuthRoles.java b/cassandra-4.1/src/main/java/com/instaclustr/cassandra/ldap/auth/Cassandra41SystemAuthRoles.java
@@ -40,6 +40,7 @@
 import org.apache.cassandra.exceptions.RequestValidationException;
 import org.apache.cassandra.service.ClientState;
 import org.apache.cassandra.service.QueryState;
+import org.apache.cassandra.transport.Dispatcher;
 import org.apache.cassandra.transport.messages.ResultMessage;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.slf4j.Logger;
@@ -134,7 +135,7 @@ public boolean roleMissing(String dn) {
 
         final ResultMessage.Rows rows = selStmt.execute(new QueryState(getClientState()),
                                                         QueryOptions.forInternalCalls(singletonList(ByteBufferUtil.bytes(dn))),
-                                                        System.nanoTime());
+                                                        Dispatcher.RequestTime.forImmediateExecution());
 
         return rows.result.isEmpty();
     }
@@ -148,7 +149,7 @@ public void createRole(String roleName, boolean superUser, String defaultRoleMem
 
         createStmt.execute(new QueryState(getClientState()),
                            QueryOptions.forInternalCalls(LOCAL_ONE, singletonList(ByteBufferUtil.bytes(roleName))),
-                           System.nanoTime());
+                           Dispatcher.RequestTime.forImmediateExecution());
 
         if (defaultRoleMembership != null)
         {
@@ -166,7 +167,7 @@ public void createRole(String roleName, boolean superUser, String defaultRoleMem
 
                 grantRoleStmt.execute(new QueryState(getClientState()),
                                       QueryOptions.forInternalCalls(LOCAL_ONE, singletonList(ByteBufferUtil.bytes(roleName))),
-                                      System.nanoTime());
+                                      Dispatcher.RequestTime.forImmediateExecution());
             }
         }
     }
@@ -180,7 +181,7 @@ public Role getRole(String name, ConsistencyLevel roleConsistencyLevel)
         ResultMessage.Rows rows = loadRoleStatement.execute(QueryState.forInternalCalls(),
                                                             QueryOptions.forInternalCalls(getConsistencyForRole("cassandra", name, roleConsistencyLevel),
                                                                                           Collections.singletonList(ByteBufferUtil.bytes(name))),
-                                                            System.nanoTime());
+                                                            Dispatcher.RequestTime.forImmediateExecution());
 
         if (rows.result.isEmpty()) {
             return NULL_ROLE;
diff --git a/cassandra-4.1/src/main/java/com/instaclustr/cassandra/ldap/auth/Cassandra41UserRetriever.java b/cassandra-4.1/src/main/java/com/instaclustr/cassandra/ldap/auth/Cassandra41UserRetriever.java
@@ -26,6 +26,7 @@
 import org.apache.cassandra.schema.Schema;
 import org.apache.cassandra.service.ClientState;
 import org.apache.cassandra.service.QueryState;
+import org.apache.cassandra.transport.Dispatcher;
 import org.apache.cassandra.transport.messages.ResultMessage.Rows;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
@@ -52,7 +53,7 @@ public Rows getRows(User user)
         return authenticationStatement(clientState, legacyTableExists).execute(QueryState.forInternalCalls(),
                                                                                QueryOptions.forInternalCalls(consistencyForRole(user.getUsername()),
                                                                                                              singletonList(ByteBufferUtil.bytes(user.getUsername()))),
-                                                                               System.nanoTime());
+                                                                               Dispatcher.RequestTime.forImmediateExecution());
     }
 
     @Override
diff --git a/cassandra-4.1/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra41LDAPIntegrationTest.java b/cassandra-4.1/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra41LDAPIntegrationTest.java
@@ -5,12 +5,12 @@
 public class Cassandra41LDAPIntegrationTest extends AbstractLDAPTest {
     @Override
     public String getCassandraVersion() {
-        return System.getProperty("version.cassandra41", "4.1.0");
+        return System.getProperty("version.cassandra41", "4.1.7");
     }
 
     @Override
     public String getImplementationGAV() {
-        return "com.instaclustr:cassandra-ldap-" + getCassandraVersion() + ":1.1.0";
+        return "com.instaclustr:cassandra-ldap-" + getCassandraVersion() + ":1.0.0";
     }
 
     @Test
diff --git a/cassandra-5.0/pom.xml b/cassandra-5.0/pom.xml
@@ -10,14 +10,14 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>cassandra-ldap-5.0.0</artifactId>
+    <artifactId>cassandra-ldap-5.0.2</artifactId>
     <version>1.0.0</version>
 
     <name>Cassandra LDAP Authenticator for Cassandra 5.0</name>
     <description>Pluggable LDAP authentication implementation for Apache Cassandra 5.0</description>
 
     <properties>
-        <version.cassandra50>5.0.0</version.cassandra50>
+        <version.cassandra50>5.0.2</version.cassandra50>
 
         <version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
         <version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
diff --git a/cassandra-5.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra50LDAPIntegrationTest.java b/cassandra-5.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra50LDAPIntegrationTest.java
@@ -5,7 +5,7 @@
 public class Cassandra50LDAPIntegrationTest extends AbstractLDAPTest {
     @Override
     public String getCassandraVersion() {
-        return System.getProperty("version.cassandra50", "5.0.0");
+        return System.getProperty("version.cassandra50", "5.0.2");
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@`
`5`	`5`	`public class Cassandra40LDAPIntegrationTest extends AbstractLDAPTest {`
`6`	`6`	`@Override`
`7`	`7`	`public String getCassandraVersion() {`
`8`		`- return System.getProperty("version.cassandra4", "4.0.7");`
	`8`	`+ return System.getProperty("version.cassandra4", "4.0.14");`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`@Override`
`12`	`12`	`public String getImplementationGAV() {`
`13`		`- return "com.instaclustr:cassandra-ldap-" + getCassandraVersion() + ":1.1.0";`
	`13`	`+ return "com.instaclustr:cassandra-ldap-" + getCassandraVersion() + ":1.0.0";`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@`
`5`	`5`	`public class Cassandra41LDAPIntegrationTest extends AbstractLDAPTest {`
`6`	`6`	`@Override`
`7`	`7`	`public String getCassandraVersion() {`
`8`		`- return System.getProperty("version.cassandra41", "4.1.0");`
	`8`	`+ return System.getProperty("version.cassandra41", "4.1.7");`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`@Override`
`12`	`12`	`public String getImplementationGAV() {`
`13`		`- return "com.instaclustr:cassandra-ldap-" + getCassandraVersion() + ":1.1.0";`
	`13`	`+ return "com.instaclustr:cassandra-ldap-" + getCassandraVersion() + ":1.0.0";`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`public class Cassandra50LDAPIntegrationTest extends AbstractLDAPTest {`
`6`	`6`	`@Override`
`7`	`7`	`public String getCassandraVersion() {`
`8`		`- return System.getProperty("version.cassandra50", "5.0.0");`
	`8`	`+ return System.getProperty("version.cassandra50", "5.0.2");`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`@Override`