From 9832b083096bd8562f4307a346b7e58e8069ba38 Mon Sep 17 00:00:00 2001
From: Harsh Chaturvedi <harsh.chaturvedi@snowflake.com>
Date: Fri, 7 Apr 2023 11:42:00 -0700
Subject: [PATCH] SNOW-761217 URL Encode OCSP Requests (#1332)

---
 src/main/java/net/snowflake/client/core/SFTrustManager.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/snowflake/client/core/SFTrustManager.java b/src/main/java/net/snowflake/client/core/SFTrustManager.java
index 43f74605e..09b9037ab 100644
--- a/src/main/java/net/snowflake/client/core/SFTrustManager.java
+++ b/src/main/java/net/snowflake/client/core/SFTrustManager.java
@@ -1116,6 +1116,7 @@ private OCSPResp fetchOcspResponse(
 
       URL url;
       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 =
@@ -1123,11 +1124,10 @@ private OCSPResp fetchOcspResponse(
                   String.format(
                       SF_OCSP_RESPONSE_CACHE_SERVER_RETRY_URL_PATTERN,
                       ocspUrl.getHost(),
-                      ocspReqDerBase64));
+                      urlEncodedOCSPReq));
         } else {
-          url = new URL(String.format("%s/%s", ocspUrlStr, ocspReqDerBase64));
+          url = new URL(String.format("%s/%s", ocspUrlStr, urlEncodedOCSPReq));
         }
-
         LOGGER.debug("not hit cache. Fetching OCSP response from CA OCSP server. {}", url);
       } else {
         url = new URL(ocspCacheServer.SF_OCSP_RESPONSE_RETRY_URL);