Merge branch 'master' into SNOW-896818-private-key-decrypt

Author: sfc-gh-wfateem

.github/workflows/build-test.yml

@@ -18,6 +18,12 @@ on:
             required: true
           tags:
             description: "Test scenario tags"
+
+concurrency:
+  # older builds for the same pull request numer or branch should be cancelled
+  cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+
 jobs:
     build:
         name: Build

CHANGELOG.rst

@@ -1,3 +1,7 @@
+**JDBC Driver 3.15.1**
+
+- \||Please Refer to Release Notes at https://docs.snowflake.com/en/release-notes/clients-drivers/jdbc
+
 **JDBC Driver 3.15.0**
 
 - \||Please Refer to Release Notes at https://docs.snowflake.com/en/release-notes/clients-drivers/jdbc

FIPS/pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>net.snowflake</groupId>
     <artifactId>snowflake-jdbc-parent</artifactId>
-    <version>3.15.1-SNAPSHOT</version>
+    <version>3.15.2-SNAPSHOT</version>
     <relativePath>../parent-pom.xml</relativePath>
   </parent>
 
   <artifactId>snowflake-jdbc-fips</artifactId>
-  <version>3.15.1-SNAPSHOT</version>
+  <version>3.15.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>snowflake-jdbc-fips</name>

SECURITY.md

@@ -0,0 +1,6 @@
+# Security Policy
+
+
+Please refer to the Snowflake [HackerOne program](https://hackerone.com/snowflake?type=team) for our security policies and for reporting any security vulnerabilities.
+
+For other security related questions and concerns, please contact the Snowflake security team at [email protected]

parent-pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>net.snowflake</groupId>
   <artifactId>snowflake-jdbc-parent</artifactId>
-  <version>3.15.1-SNAPSHOT</version>
+  <version>3.15.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -64,7 +64,7 @@
     <metrics.version>2.2.0</metrics.version>
     <mockito.version>4.11.0</mockito.version>
     <netty.version>4.1.100.Final</netty.version>
-    <nimbusds.version>9.21</nimbusds.version>
+    <nimbusds.version>9.37.3</nimbusds.version>
     <opencensus.version>0.31.1</opencensus.version>
     <plexus.container.version>1.0-alpha-9-stable-1</plexus.container.version>
     <plexus.utils.version>3.4.2</plexus.utils.version>

pom.xml

@@ -6,13 +6,13 @@
   <parent>
     <groupId>net.snowflake</groupId>
     <artifactId>snowflake-jdbc-parent</artifactId>
-    <version>3.15.1-SNAPSHOT</version>
+    <version>3.15.2-SNAPSHOT</version>
     <relativePath>./parent-pom.xml</relativePath>
   </parent>
 
   <!-- Maven complains about using property here, but it makes install and deploy process easier to override final package names and localization -->
   <artifactId>${artifactId}</artifactId>
-  <version>3.15.1-SNAPSHOT</version>
+  <version>3.15.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>${artifactId}</name>
@@ -668,6 +668,10 @@
                       <pattern>net.snowflake.common</pattern>
                       <shadedPattern>${shadeBase}.snowflake.common</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>mozilla</pattern>
+                      <shadedPattern>${shadeBase}.mozilla</shadedPattern>
+                    </relocation>
                     <relocation>
                       <pattern>org.apache.arrow</pattern>
                       <shadedPattern>${shadeBase}.apache.arrow</shadedPattern>
@@ -799,6 +803,10 @@
                 <phase>package</phase>
                 <configuration>
                   <relocations>
+                    <relocation>
+                      <pattern>mozilla</pattern>
+                      <shadedPattern>${shadeBase}.mozilla</shadedPattern>
+                    </relocation>
                     <relocation>
                       <pattern>net.snowflake.common</pattern>
                       <shadedPattern>${shadeBase}.snowflake.common</shadedPattern>

src/main/java/net/snowflake/client/config/SFClientConfigParser.java

@@ -8,6 +8,8 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import net.snowflake.client.jdbc.SnowflakeDriver;
 import net.snowflake.client.log.SFLogger;
 import net.snowflake.client.log.SFLoggerFactory;
@@ -85,20 +87,36 @@ public static String getConfigFilePathFromJDBCJarLocation() {
 
         if (systemGetProperty("os.name") != null
             && systemGetProperty("os.name").toLowerCase().startsWith("windows")) {
-          // Path translation for windows
-          if (updatedPath.startsWith("/")) {
-            updatedPath = updatedPath.substring(1);
-          } else if (updatedPath.startsWith("file:\\")) {
-            updatedPath = updatedPath.substring(6);
-          }
-          updatedPath = updatedPath.replace("/", "\\");
+          updatedPath = convertToWindowsPath(updatedPath);
         }
         return updatedPath;
       }
+
       return "";
     } catch (Exception ex) {
       // return empty path and move to step 4 of loadSFClientConfig()
       return "";
     }
   }
+
+  static String convertToWindowsPath(String filePath) {
+    // Find the Windows file path pattern: ex) C:\ or D:\
+    Pattern windowsFilePattern = Pattern.compile("[C-Z]:[\\\\/]");
+    Matcher matcher = windowsFilePattern.matcher(filePath);
+    String prefix = "";
+
+    // Path translation for windows
+    if (filePath.startsWith("/")) {
+      filePath = filePath.substring(1);
+    } else if (filePath.startsWith("file:\\")) {
+      filePath = filePath.substring(6);
+    } else if (filePath.startsWith("\\")) {
+      filePath = filePath.substring(2);
+    } else if (matcher.find() && matcher.start() != 0) {
+      prefix = filePath.substring(0, matcher.start());
+      filePath = filePath.substring(matcher.start());
+    }
+    filePath = prefix + filePath.replace("/", "\\");
+    return filePath;
+  }
 }