SNOW-872558: add path to private link OCSP retry url (#1495)

* add path to private link OCSP retry url * use path variable * fix syntax error in drop table query --------- Co-authored-by: sfc-gh-ext-simba-lb <[email protected]>
snowflakedb · Aug 19, 2023 · 3bffa14 · 3bffa14
1 parent c97a5de
commit 3bffa14
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/src/main/java/net/snowflake/client/core/SFTrustManager.java b/src/main/java/net/snowflake/client/core/SFTrustManager.java
@@ -1115,16 +1115,30 @@ private OCSPResp fetchOcspResponse(
       telemetryData.setOcspReq(ocspReqDerBase64);
 
       URL url;
+      String path = "";
       if (!ocspCacheServer.new_endpoint_enabled) {
         String urlEncodedOCSPReq = URLUtil.urlEncode(ocspReqDerBase64);
         if (SF_OCSP_RESPONSE_CACHE_SERVER_RETRY_URL_PATTERN != null) {
           URL ocspUrl = new URL(ocspUrlStr);
-          url =
-              new URL(
-                  String.format(
-                      SF_OCSP_RESPONSE_CACHE_SERVER_RETRY_URL_PATTERN,
-                      ocspUrl.getHost(),
-                      urlEncodedOCSPReq));
+          if (!Strings.isNullOrEmpty(ocspUrl.getPath())) {
+            path = ocspUrl.getPath();
+          }
+          if (ocspUrl.getPort() > 0) {
+            url =
+                new URL(
+                    String.format(
+                        SF_OCSP_RESPONSE_CACHE_SERVER_RETRY_URL_PATTERN,
+                        ocspUrl.getHost() + ":" + ocspUrl.getPort() + path,
+                        urlEncodedOCSPReq));
+          } else {
+            url =
+                new URL(
+                    String.format(
+                        SF_OCSP_RESPONSE_CACHE_SERVER_RETRY_URL_PATTERN,
+                        ocspUrl.getHost() + path,
+                        urlEncodedOCSPReq));
+          }
+
         } else {
           url = new URL(String.format("%s/%s", ocspUrlStr, urlEncodedOCSPReq));
         }

diff --git a/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverLatestIT.java b/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverLatestIT.java
@@ -1665,7 +1665,7 @@ public void testHTAPStatementParameterCaching() throws SQLException {
     resultSet.next();
     // Verify it matches the new statement parameter specified output format
     assertEquals("08/17/2023", resultSet.getString(3));
-    statement.execute("drop table timetable if exists");
+    statement.execute("drop table if exists timetable");
     statement.close();
     con.close();
     // cleanup