Fixed Arbitrary code execution in Apache Commons Text

Author: Nikolai Kolesnikov

pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>groupId</groupId>
-    <artifactId>LightweightQueryAggregator</artifactId>
+    <artifactId>amazon-aggregation-query-proxy</artifactId>
     <version>1.0-SNAPSHOT</version>
     <dependencies>
         <dependency>

query-app/pom.xml

@@ -3,12 +3,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <groupId>groupId</groupId>
     <artifactId>query-app</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
-        <picocli.version>4.6.1</picocli.version>
-        <datastax.version>4.14.0</datastax.version>
+        <datastax.version>4.15.0</datastax.version>
         <dropwizard.version>2.0.29</dropwizard.version>
         <kotlin.version>1.7.0</kotlin.version>
         <partiql.version>0.7.0</partiql.version>
@@ -19,7 +19,7 @@
         <dropwizard-auth.version>2.0.29</dropwizard-auth.version>
         <okta.version>0.3.0</okta.version>
         <unirest.version>3.13.6</unirest.version>
-        <commons-text.version>1.9</commons-text.version>
+        <commons-text.version>1.10.0</commons-text.version>
     </properties>
     <build>
         <plugins>
@@ -155,6 +155,11 @@
             <artifactId>jackson-annotations</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>dynamodb</artifactId>

query-app/src/main/java/com/aws/aqp/application/App.java

@@ -43,13 +43,17 @@ public void run(AppConfiguration appConfiguration, Environment environment) {
 
         if (appConfiguration.getServiceName().equals(DatabaseType.KEYSPACES.toString())) {
             environment.healthChecks().register("keyspaces-tcp-dependency", new ConnectionHealthCheck(appConfiguration));
-            extractor = new CassandraExtractor(appConfiguration);
+            if (environment.healthChecks().runHealthCheck("keyspaces-tcp-dependency").isHealthy()) {
+                extractor = new CassandraExtractor(appConfiguration);
+            }
         }
         if (appConfiguration.getServiceName().equals(DatabaseType.DYNAMODB.toString())) {
             String ddbEndpoint = System.getProperty("dynamodb-endpoint",String.format("https://dynamodb.%s.amazonaws.com", appConfiguration.getAwsRegion().toLowerCase()));
             environment.healthChecks().register("ddb-http-dependency",
                     new HttpHealthCheck(ddbEndpoint));
-            extractor = new DynamodbExtractor(appConfiguration);
+            if (environment.healthChecks().runHealthCheck("dynamodb-endpoint").isHealthy()) {
+                extractor = new DynamodbExtractor(appConfiguration);
+            }
         }
 
         environment.jersey().register(new AuthDynamicFeature(new BasicCredentialAuthFilter.Builder<AqpUser>()

query-app/src/main/java/com/aws/aqp/connectors/ConnectionKeyspacesFactory.java

@@ -26,7 +26,6 @@ public class ConnectionKeyspacesFactory {
 
     public ConnectionKeyspacesFactory(AppConfiguration appConfiguration) {
         this.appConfiguration = appConfiguration;
-
     }
 
     public CqlSession buildSession() {