first round of fixes from functional tests suites (#2741)

Signed-off-by: Henry Avetisyan <hga@yahooinc.com>
AthenZ · Sep 25, 2024 · eae9a80 · eae9a80
1 parent 613c261
commit eae9a80
Show file tree

Hide file tree

Showing 25 changed files with 169 additions and 1,265 deletions.
diff --git a/clients/java/zms/examples/tls-support/pom.xml b/clients/java/zms/examples/tls-support/pom.xml
@@ -27,7 +27,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <athenz.version>1.11.52</athenz.version>
+    <athenz.version>1.12.1</athenz.version>
   </properties>
 
   <dependencies>
@@ -49,12 +49,12 @@
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.6.0</version>
+      <version>1.9.0</version>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.5.2</version>
+      <version>1.5.8</version>
     </dependency>
   </dependencies>
 

diff --git a/clients/java/zts/examples/tls-support/pom.xml b/clients/java/zts/examples/tls-support/pom.xml
@@ -27,7 +27,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <athenz.version>1.11.52</athenz.version>
+    <athenz.version>1.12.1</athenz.version>
     <jjwt.version>0.11.5</jjwt.version>
   </properties>
 
@@ -62,31 +62,22 @@
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.6.0</version>
+      <version>1.9.0</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>2.0.12</version>
+      <version>2.0.16</version>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.5.2</version>
+      <version>1.5.8</version>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>

diff --git a/...upport/src/main/java/com/yahoo/athenz/example/zts/tls/client/ZTSTLSClientAccessToken.java b/...upport/src/main/java/com/yahoo/athenz/example/zts/tls/client/ZTSTLSClientAccessToken.java
@@ -26,7 +26,7 @@
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import org.apache.http.conn.DnsResolver;
+import org.apache.hc.client5.http.DnsResolver;
 
 import com.oath.auth.KeyRefresher;
 import com.oath.auth.Utils;
@@ -198,14 +198,24 @@ private static DnsResolver getDnsResolver(final String resolveHostname) throws U
         final String ipAddress = resolveHostname.substring(idx + 1);
 
         final InetAddress[] inetResponse = new InetAddress[1];
-        inetResponse[0] = InetAddress.getByName(resolveHostname.substring(idx + 1));
+        inetResponse[0] = InetAddress.getByName(ipAddress);
 
-        DnsResolver dnsResolver = host -> {
-            if (host.equalsIgnoreCase(hostname)) {
-                return inetResponse;
+        return new DnsResolver() {
+            @Override
+            public InetAddress[] resolve(String host) throws UnknownHostException {
+                if (host.equalsIgnoreCase(hostname)) {
+                    return inetResponse;
+                }
+                throw new UnknownHostException("unknown host: " + host);
+            }
+
+            @Override
+            public String resolveCanonicalHostname(String host) throws UnknownHostException {
+                if (host.equalsIgnoreCase(hostname)) {
+                    return hostname;
+                }
+                throw new UnknownHostException("unknown host: " + host);
             }
-            throw new UnknownHostException("unknown host: " + host);
         };
-        return dnsResolver;
     }
 }
diff --git a/clients/java/zts/pom.xml b/clients/java/zts/pom.xml
@@ -25,24 +25,6 @@
   <packaging>jar</packaging>
   <name>athenz-zts-java-client</name>
   <description>ZTS Java Client Library</description>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.amazonaws</groupId>
-        <artifactId>aws-java-sdk-bom</artifactId>
-        <version>${aws.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>bom</artifactId>
-        <version>${aws2.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
 
   <properties>
     <ehcache.version>3.10.8</ehcache.version>

diff --git a/containers/jetty/src/main/java/com/yahoo/athenz/container/AthenzJettyContainer.java b/containers/jetty/src/main/java/com/yahoo/athenz/container/AthenzJettyContainer.java
@@ -149,7 +149,7 @@ public void addRequestLogHandler() {
         }
     }
 
-    void addRewriteHandler(final String serverHostName) {
+    RewriteHandler createRewriteHandler(final String serverHostName) {
 
         RewriteHandler rewriteHandler = new RewriteHandler();
 
@@ -200,32 +200,46 @@ void addRewriteHandler(final String serverHostName) {
         hostNameRule.setHeaderValue(serverHostName);
         rewriteHandler.addRule(hostNameRule);
 
-        handlers.addHandler(rewriteHandler);
+        return rewriteHandler;
+    }
+
+    GzipHandler createGzipHandler() {
+        boolean gzipSupport = Boolean.parseBoolean(System.getProperty(AthenzConsts.ATHENZ_PROP_GZIP_SUPPORT, "false"));
+
+        if (!gzipSupport) {
+            return null;
+        }
+        int gzipMinSize = Integer.parseInt(System.getProperty(AthenzConsts.ATHENZ_PROP_GZIP_MIN_SIZE, "1024"));
+
+        GzipHandler gzipHandler = new GzipHandler();
+        gzipHandler.setMinGzipSize(gzipMinSize);
+        gzipHandler.setIncludedMimeTypes("application/json");
+        return gzipHandler;
     }
 
-    void addServletHandlers() {
+    void addServletHandlers(final String serverHostName) {
 
         Environment.ensure("ee10");
         Environment.get("ee10").setAttribute("contextHandlerClass", WebAppContext.class.getName());
 
+        // create our rewrite handler
+
+        RewriteHandler rewriteHandler = createRewriteHandler(serverHostName);
+        handlers.addHandler(rewriteHandler);
+
         // create our context handler connection
 
         ContextHandlerCollection contexts = new ContextHandlerCollection();
 
         // check to see if gzip support is enabled
 
-        boolean gzipSupport = Boolean.parseBoolean(System.getProperty(AthenzConsts.ATHENZ_PROP_GZIP_SUPPORT, "false"));
-
-        if (gzipSupport) {
-            int gzipMinSize = Integer.parseInt(
-                    System.getProperty(AthenzConsts.ATHENZ_PROP_GZIP_MIN_SIZE, "1024"));
-
-            GzipHandler gzipHandler = new GzipHandler();
-            gzipHandler.setMinGzipSize(gzipMinSize);
-            gzipHandler.setIncludedMimeTypes("application/json");
+        GzipHandler gzipHandler = createGzipHandler();
+        if (gzipHandler != null) {
             gzipHandler.setHandler(contexts);
-
             handlers.addHandler(gzipHandler);
+            rewriteHandler.setHandler(gzipHandler);
+        } else {
+            rewriteHandler.setHandler(contexts);
         }
 
         // check to see if graceful shutdown support is enabled
@@ -601,8 +615,7 @@ public static AthenzJettyContainer createJettyContainer() {
         HttpConfiguration httpConfig = container.newHttpConfiguration();
         container.addHTTPConnectors(httpConfig, httpPort, httpsPort, oidcPort, statusPort);
 
-        container.addRewriteHandler(serverHostName);
-        container.addServletHandlers();
+        container.addServletHandlers(serverHostName);
         container.addRequestLogHandler();
 
         return container;

diff --git a/containers/jetty/src/test/java/com/yahoo/athenz/container/AthenzJettyContainerTest.java b/containers/jetty/src/test/java/com/yahoo/athenz/container/AthenzJettyContainerTest.java
@@ -142,8 +142,7 @@ public void testAddServletHandlers() {
         System.setProperty(AthenzConsts.ATHENZ_PROP_KEEP_ALIVE, "false");
         AthenzJettyContainer container = new AthenzJettyContainer();
         container.createServer(100);
-        container.addRewriteHandler("localhost");
-        container.addServletHandlers();
+        container.addServletHandlers("localhost");
     }
 
     @Test
@@ -616,8 +615,7 @@ public void testGracefulShutdown() {
         // If the athenz.graceful_shutdown is not true.
         container = new AthenzJettyContainer();
         container.createServer(100);
-        container.addRewriteHandler("localhost");
-        container.addServletHandlers();
+        container.addServletHandlers("localhost");
 
         server = container.getServer();
         assertNotNull(server);
@@ -637,8 +635,7 @@ public void testGracefulShutdown() {
 
         container = new AthenzJettyContainer();
         container.createServer(100);
-        container.addRewriteHandler("localhost");
-        container.addServletHandlers();
+        container.addServletHandlers("localhost");
 
         server = container.getServer();
         assertNotNull(server);
@@ -656,8 +653,7 @@ public void testGracefulShutdown() {
 
         container = new AthenzJettyContainer();
         container.createServer(100);
-        container.addRewriteHandler("localhost");
-        container.addServletHandlers();
+        container.addServletHandlers("localhost");
 
         server = container.getServer();
         assertNotNull(server);
@@ -677,8 +673,7 @@ public void testGracefulShutdown() {
 
         container = new AthenzJettyContainer();
         container.createServer(100);
-        container.addRewriteHandler("localhost");
-        container.addServletHandlers();
+        container.addServletHandlers("localhost");
 
         server = container.getServer();
         assertNotNull(server);
@@ -698,8 +693,7 @@ public void testStatisticsHandler() {
         System.setProperty(AthenzConsts.ATHENZ_PROP_GRACEFUL_SHUTDOWN, "false");
         AthenzJettyContainer container = new AthenzJettyContainer();
         container.createServer(100);
-        container.addRewriteHandler("localhost");
-        container.addServletHandlers();
+        container.addServletHandlers("localhost");
 
         Handler.Sequence contextHandlerCollection = container.getHandlers();
         for (Handler handler : contextHandlerCollection.getHandlers()) {
@@ -718,8 +712,7 @@ public void testStatisticsHandler() {
         System.setProperty(AthenzConsts.ATHENZ_PROP_GRACEFUL_SHUTDOWN, "true");
         container = new AthenzJettyContainer();
         container.createServer(100);
-        container.addRewriteHandler("localhost");
-        container.addServletHandlers();
+        container.addServletHandlers("localhost");
 
         contextHandlerCollection = container.getHandlers();
         for (Handler handler : contextHandlerCollection.getHandlers()) {
@@ -740,8 +733,7 @@ public void testHttpResponseHeaders() {
 
         AthenzJettyContainer container = new AthenzJettyContainer();
         container.createServer(100);
-        container.addRewriteHandler("localhost");
-        container.addServletHandlers();
+        container.addServletHandlers("localhost");
 
         boolean header1Handled = false;
         boolean header2Handled = false;
@@ -775,8 +767,7 @@ public void testHttpResponseHeadersInvalidJson() {
         container.createServer(100);
 
         try {
-            container.addRewriteHandler("localhost");
-            container.addServletHandlers();
+            container.addServletHandlers("localhost");
             fail();
         } catch (Exception ex) {
             assertTrue(ex.getMessage().contains("must be a JSON object with string values"));

diff --git a/libs/java/cert_refresher/examples/tls-support/pom.xml b/libs/java/cert_refresher/examples/tls-support/pom.xml
@@ -27,7 +27,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <athenz.version>1.11.52</athenz.version>
+    <athenz.version>1.12.1</athenz.version>
   </properties>
 
   <dependencies>
@@ -39,12 +39,12 @@
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.6.0</version>
+      <version>1.9.0</version>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.5.2</version>
+      <version>1.5.8</version>
     </dependency>
   </dependencies>
 

diff --git a/libs/java/gcp_zts_creds/examples/gcp-sia-creds/pom.xml b/libs/java/gcp_zts_creds/examples/gcp-sia-creds/pom.xml
@@ -27,7 +27,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <athenz.version>1.11.58</athenz.version>
+    <athenz.version>1.12.1</athenz.version>
   </properties>
 
   <dependencies>
@@ -39,17 +39,17 @@
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.7.0</version>
+      <version>1.9.0</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>2.0.13</version>
+      <version>2.0.16</version>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.5.6</version>
+      <version>1.5.8</version>
     </dependency>
   </dependencies>
 

diff --git a/libs/java/gcp_zts_creds/examples/gcp-zts-creds/pom.xml b/libs/java/gcp_zts_creds/examples/gcp-zts-creds/pom.xml
@@ -27,8 +27,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <athenz.version>1.11.58</athenz.version>
-    <gcp.bom.version>26.37.0</gcp.bom.version>
+    <athenz.version>1.12.1</athenz.version>
+    <gcp.bom.version>26.47.0</gcp.bom.version>
   </properties>
 
   <dependencyManagement>
@@ -57,17 +57,17 @@
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.7.0</version>
+      <version>1.9.0</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>2.0.13</version>
+      <version>2.0.16</version>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.5.6</version>
+      <version>1.5.8</version>
     </dependency>
     <dependency>
       <groupId>com.google.auth</groupId>