remove UID and PWD from URL

Author: KSDaemon

packages/cubejs-databricks-jdbc-driver/src/DatabricksDriver.ts

@@ -18,7 +18,10 @@ import {
 } from '@cubejs-backend/base-driver';
 import { JDBCDriver, JDBCDriverConfiguration, } from '@cubejs-backend/jdbc-driver';
 import { DatabricksQuery } from './DatabricksQuery';
-import { extractUidFromJdbcUrl, resolveJDBCDriver } from './helpers';
+import {
+  extractAndRemoveUidPwdFromJdbcUrl,
+  resolveJDBCDriver
+} from './helpers';
 
 export type DatabricksDriverConfiguration = JDBCDriverConfiguration &
   {
@@ -180,20 +183,20 @@ export class DatabricksDriver extends JDBCDriver {
       url = url.replace('jdbc:spark://', 'jdbc:databricks://');
     }
 
+    const [uid, pwd, cleanedUrl] = extractAndRemoveUidPwdFromJdbcUrl(url);
+
     const config: DatabricksDriverConfiguration = {
       ...conf,
-      url,
+      url: cleanedUrl,
       dbType: 'databricks',
       drivername: 'com.databricks.client.jdbc.Driver',
       customClassPath: undefined,
       properties: {
-        UID: extractUidFromJdbcUrl(url),
-        // PWD-parameter passed to the connection string has higher priority,
-        // so we can set this one to an empty string to avoid a Java error.
+        UID: uid,
         PWD:
           conf?.token ||
           getEnv('databrickToken', { dataSource }) ||
-          '',
+          pwd,
         UserAgentEntry: 'CubeDev_Cube',
       },
       catalog:
@@ -520,7 +523,7 @@ export class DatabricksDriver extends JDBCDriver {
    * Returns table columns types.
    */
   public override async tableColumnTypes(table: string): Promise<TableColumn[]> {
-    let tableFullName = '';
+    let tableFullName: string;
     const tableArray = table.split('.');
 
     if (tableArray.length === 3) {

packages/cubejs-databricks-jdbc-driver/src/helpers.ts

@@ -32,9 +32,20 @@ export async function resolveJDBCDriver(): Promise<string> {
   );
 }
 
-export function extractUidFromJdbcUrl(jdbcUrl: string): string {
-  const { pathname } = new URL(jdbcUrl);
-  const [_, ...params] = pathname.split(';');
-  const searchParams = new URLSearchParams(params.join('&'));
-  return searchParams.get('UID') || 'token';
+/**
+ * Extract if exist UID and PWD from URL and return UID, PWD and URL without these params
+ * @param jdbcUrl
+ */
+export function extractAndRemoveUidPwdFromJdbcUrl(jdbcUrl: string): [string, string, string] {
+  const uidMatch = jdbcUrl.match(/UID=([^;]*)/);
+  const pwdMatch = jdbcUrl.match(/PWD=([^;]*)/);
+
+  const uid = uidMatch?.[1] || 'token';
+  const pwd = pwdMatch?.[1] || '';
+
+  const cleanedUrl = jdbcUrl
+    .replace(/;?UID=[^;]*/i, '')
+    .replace(/;?PWD=[^;]*/i, '');
+
+  return [uid, pwd, cleanedUrl];
 }