test

edgedb · Nov 29, 2024 · 91336c2 · 91336c2
1 parent 0bae0fa
commit 91336c2
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 60 deletions.
diff --git a/deno.lock b/deno.lock
diff --git a/packages/driver/src/baseClient.ts b/packages/driver/src/baseClient.ts
@@ -431,7 +431,10 @@ export abstract class BaseClientPool {
       throw new errors.InterfaceError("The client is closed");
     }
 
+    console.log('! getNewConnection')
+    console.log(this.__normalizedConnectConfig)
     const config = await this._getNormalizedConnectConfig();
+    console.log(config.connectionParams)
     const connection = await retryingConnect(
       this._connectWithTimeout,
       config,

diff --git a/packages/driver/src/browserClient.ts b/packages/driver/src/browserClient.ts
@@ -24,6 +24,9 @@ export function createClient(): Client {
 export function createHttpClient(
   options?: string | ConnectOptions | null,
 ): Client {
+  console.log('! createHttpClient')
+  console.log('. options')
+  console.log(options)
   return new Client(
     new FetchClientPool(
       parseConnectArguments,

diff --git a/packages/driver/src/conUtils.ts b/packages/driver/src/conUtils.ts
@@ -534,6 +534,13 @@ async function parseConnectDsnAndArgs(
   config: ConnectConfig,
   serverUtils: ServerUtils | null,
 ): Promise<PartiallyNormalizedConfig> {
+  console.log('! parseConnectDsnAndArgs');
+  console.log('. config.tlsCA');
+  console.log(config.tlsCA);
+  console.log('. config.tlsCAFile');
+  console.log(config.tlsCAFile);
+  console.log(getEnv("EDGEDB_TLS_CA_FILE"));
+
   const resolvedConfig = new ResolvedConnectConfig();
   let fromEnv = false;
   let fromProject = false;
@@ -805,6 +812,9 @@ async function resolveConfigOptions<
     }
   }
 
+  console.warn('! resolveConfigOptions')
+  console.log('. resolvedConfig._tlsCAData')
+  console.log(resolvedConfig._tlsCAData)
   anyOptionsUsed =
     resolvedConfig.setUser(config.user ?? null, sources.user!) ||
     anyOptionsUsed;
@@ -819,15 +829,32 @@ async function resolveConfigOptions<
       config.cloudProfile ?? null,
       sources.cloudProfile!,
     ) || anyOptionsUsed;
+  console.log(': 1')
+  console.log('. resolvedConfig._tlsCAData')
+  console.log(resolvedConfig._tlsCAData)
+  console.log('. config.tlsCAFile')
+  console.log(config.tlsCA)
+  console.log('. sources.tlsCA')
+  console.log(sources.tlsCA)
   anyOptionsUsed =
     resolvedConfig.setTlsCAData(config.tlsCA ?? null, sources.tlsCA!) ||
     anyOptionsUsed;
+  console.log(': 2')
+  console.log('. resolvedConfig._tlsCAData')
+  console.log(resolvedConfig._tlsCAData)
+  console.log('. config.tlsCAFile')
+  console.log(config.tlsCAFile)
+  console.log('. sources.tlsCAFile')
+  console.log(sources.tlsCAFile)
   anyOptionsUsed =
     (await resolvedConfig.setTlsCAFile(
       config.tlsCAFile ?? null,
       sources.tlsCAFile!,
       readFile,
     )) || anyOptionsUsed;
+  console.log(': 3')
+  console.log('. resolvedConfig._tlsCAData')
+  console.log(resolvedConfig._tlsCAData)
   anyOptionsUsed =
     resolvedConfig.setTlsServerName(
       config.tlsServerName ?? null,
@@ -869,8 +896,11 @@ async function resolveConfigOptions<
           resolvedConfig.setPort(config.port, sources.port!);
         }
         const host = config.host != null ? validateHost(config.host) : "";
-        dsn = `edgedb://${host.includes(":") ? `[${encodeURI(host)}]` : host}`;
+        dsn = `gel://${host.includes(":") ? `[${encodeURI(host)}]` : host}`;
       }
+      console.log(': 4')
+      console.log('. resolvedConfig._tlsCAData')
+      console.log(resolvedConfig._tlsCAData)
       await parseDSNIntoConfig(
         dsn,
         resolvedConfig,
@@ -972,6 +1002,11 @@ async function parseDSNIntoConfig(
       );
   }
 
+  console.log('!!! parseDSNIntoConfig')
+  console.log('. dsnString')
+  console.log(dsnString)
+  console.log('. _tlsCAData')
+  console.log(config._tlsCAData)
   let parsed: URL;
   try {
     parsed = new URL(dsnString);
@@ -1125,6 +1160,8 @@ async function parseDSNIntoConfig(
     config.setSecretKey,
   );
 
+  console.log('. _tlsCAData')
+  console.log(config._tlsCAData)
   await handleDSNPart("tls_ca", null, config._tlsCAData, config.setTlsCAData);
   await handleDSNPart(
     "tls_ca_file",

diff --git a/packages/driver/src/httpScram.ts b/packages/driver/src/httpScram.ts
@@ -88,6 +88,8 @@ export function getHTTPSCRAMAuth(cryptoUtils: CryptoUtils): HttpSCRAMAuth {
       serverNonce,
     );
 
+    console.log('!!! getHTTPSCRAMAuth')
+    console.log(authUrl)
     const serverFinalRes = await fetch(authUrl, {
       headers: {
         Authorization: `SCRAM-SHA-256 sid=${sid}, data=${utf8ToB64(