norn-cli 1.10.2 → 1.10.3

package/dist/cli.js

@@ -109460,6 +109460,9 @@ function getConnectionValue(values, ...keys) {
 function getConnectionString(values) {
   return getConnectionValue(values, "connectionString");
 }
+function usesWindowsIntegratedSqlServerAuth(connectionString) {
+  return /(?:^|;)\s*Integrated\s+Security\s*=\s*(?:true|yes|sspi)\s*(?:;|$)/i.test(connectionString) || /(?:^|;)\s*Trusted_Connection\s*=\s*(?:true|yes|sspi)\s*(?:;|$)/i.test(connectionString);
+}
 function buildMissingConnectionError(adapterLabel, profile) {
   return `Missing required ${adapterLabel} connection string. Expected 'connectionString ${profile} = ...' in .nornenv.`;
 }
@@ -109517,7 +109520,7 @@ if ([string]::IsNullOrWhiteSpace($raw)) {
     throw 'Missing SQL adapter payload.'
 }
 
-$payload = $raw | ConvertFrom-Json -Depth 100
+$payload = $raw | ConvertFrom-Json
 $connectionString = [string]$payload.connection.values.connectionString
 if ([string]::IsNullOrWhiteSpace($connectionString)) {
     throw 'Missing SQL Server Integrated Auth connection string.'
@@ -109548,9 +109551,13 @@ $resolveHandler = [System.ResolveEventHandler]{
 $sqlText = [string]$payload.operation.sql
 $mode = [string]$payload.mode
 $paramsObject = $payload.params
+$connectionStringHasUserId = $connectionString -match '(?i)(?:^|;)s*(?:User ID|UID)s*='
+$connectionStringHasPassword = $connectionString -match '(?i)(?:^|;)s*(?:Password|PWD)s*='
 
 $connection = $null
+$connectionBuilder = $null
 try {
+    $connectionBuilder = New-Object Microsoft.Data.SqlClient.SqlConnectionStringBuilder $connectionString
     $connection = New-Object Microsoft.Data.SqlClient.SqlConnection $connectionString
     $command = $connection.CreateCommand()
     $command.CommandText = $sqlText
@@ -109622,18 +109629,97 @@ try {
     $response | ConvertTo-Json -Depth 100 -Compress
 }
 catch {
-    $details = @()
+    $details = New-Object System.Collections.Generic.List[string]
     if ($_.Exception -and $_.Exception.GetType()) {
-        $details += "type: $($_.Exception.GetType().FullName)"
+        $details.Add("type: $($_.Exception.GetType().FullName)")
     }
     if ($_.InvocationInfo -and $_.InvocationInfo.ScriptLineNumber) {
-        $details += "line: $($_.InvocationInfo.ScriptLineNumber)"
+        $details.Add("line: $($_.InvocationInfo.ScriptLineNumber)")
     }
     if ($_.FullyQualifiedErrorId) {
-        $details += "id: $($_.FullyQualifiedErrorId)"
+        $details.Add("id: $($_.FullyQualifiedErrorId)")
+    }
+
+    try {
+        $details.Add("adapter: sqlserver-windows")
+        $details.Add("powershell: $($PSVersionTable.PSVersion)")
+        $details.Add("sqlClientVersion: $(([Microsoft.Data.SqlClient.SqlConnection]).Assembly.GetName().Version)")
+        $details.Add("windowsIdentity: $([System.Security.Principal.WindowsIdentity]::GetCurrent().Name)")
+    } catch {
+    }
+
+    if ($null -ne $connectionBuilder) {
+        if (-not [string]::IsNullOrWhiteSpace([string]$connectionBuilder.DataSource)) {
+            $details.Add("dataSource: $($connectionBuilder.DataSource)")
+        }
+        if (-not [string]::IsNullOrWhiteSpace([string]$connectionBuilder.InitialCatalog)) {
+            $details.Add("database: $($connectionBuilder.InitialCatalog)")
+        }
+        $details.Add("integratedSecurity: $($connectionBuilder.IntegratedSecurity)")
+        $details.Add("encrypt: $($connectionBuilder.Encrypt)")
+        $details.Add("trustServerCertificate: $($connectionBuilder.TrustServerCertificate)")
+        $details.Add("applicationIntent: $($connectionBuilder.ApplicationIntent)")
+        $details.Add("multiSubnetFailover: $($connectionBuilder.MultiSubnetFailover)")
+
+        try {
+            $hostNameInCertificate = [string]$connectionBuilder['HostNameInCertificate']
+            if (-not [string]::IsNullOrWhiteSpace($hostNameInCertificate)) {
+                $details.Add("hostNameInCertificate: $hostNameInCertificate")
+            }
+        } catch {
+        }
+    }
+
+    $details.Add("userIdPresent: $connectionStringHasUserId")
+    $details.Add("passwordPresent: $connectionStringHasPassword")
+
+    $sqlException = $null
+    if ($_.Exception -is [Microsoft.Data.SqlClient.SqlException]) {
+        $sqlException = [Microsoft.Data.SqlClient.SqlException]$_.Exception
+    } elseif ($_.Exception -and $_.Exception.InnerException -is [Microsoft.Data.SqlClient.SqlException]) {
+        $sqlException = [Microsoft.Data.SqlClient.SqlException]$_.Exception.InnerException
+    }
+
+    if ($null -ne $sqlException) {
+        $details.Add("sqlNumber: $($sqlException.Number)")
+        $details.Add("sqlState: $($sqlException.State)")
+        $details.Add("sqlClass: $($sqlException.Class)")
+        if (-not [string]::IsNullOrWhiteSpace([string]$sqlException.Server)) {
+            $details.Add("sqlServer: $($sqlException.Server)")
+        }
+        if (-not [string]::IsNullOrWhiteSpace([string]$sqlException.Procedure)) {
+            $details.Add("sqlProcedure: $($sqlException.Procedure)")
+        }
+        if ($sqlException.LineNumber -gt 0) {
+            $details.Add("sqlLineNumber: $($sqlException.LineNumber)")
+        }
+        if ($sqlException.ClientConnectionId -ne [guid]::Empty) {
+            $details.Add("clientConnectionId: $($sqlException.ClientConnectionId)")
+        }
+        if ($sqlException.Errors -and $sqlException.Errors.Count -gt 0) {
+            $messages = @()
+            foreach ($sqlError in $sqlException.Errors) {
+                if ($sqlError -and -not [string]::IsNullOrWhiteSpace([string]$sqlError.Message)) {
+                    $messages += [string]$sqlError.Message
+                }
+            }
+            if ($messages.Count -gt 0) {
+                $details.Add("sqlErrors: $($messages -join ' | ')")
+            }
+        }
+    }
+
+    if ($_.Exception -and $_.Exception.InnerException) {
+        $details.Add("innerType: $($_.Exception.InnerException.GetType().FullName)")
+        if (-not [string]::IsNullOrWhiteSpace([string]$_.Exception.InnerException.Message)) {
+            $details.Add("innerMessage: $($_.Exception.InnerException.Message)")
+        }
+    }
+
+    [Console]::Error.WriteLine("$($_.Exception.Message)")
+    foreach ($detail in $details) {
+        [Console]::Error.WriteLine("  $detail")
     }
-    $suffix = if ($details.Count -gt 0) { " ($($details -join ', '))" } else { '' }
-    [Console]::Error.WriteLine("$($_.Exception.Message)$suffix")
     exit 1
 }
 finally {
@@ -109794,6 +109880,9 @@ async function runBuiltInSqlServerAdapter(request) {
   if (!connectionString) {
     fail(buildMissingConnectionError("SQL Server", request.connection.profile));
   }
+  if (usesWindowsIntegratedSqlServerAuth(connectionString)) {
+    fail("This SQL Server connection string uses Windows/Integrated authentication. Use adapter 'sqlserver-windows' in norn.sql.json.");
+  }
   const pool = new mssql.ConnectionPool(connectionString);
   try {
     await pool.connect();
@@ -109832,7 +109921,7 @@ async function runBuiltInSqlServerIntegratedAdapter(request) {
   const values = request.connection.values;
   const connectionString = getConnectionString(values);
   if (!connectionString) {
-    fail(buildMissingConnectionError("SQL Server Integrated Auth", request.connection.profile));
+    fail(buildMissingConnectionError("SQL Server (Windows)", request.connection.profile));
   }
   const compiled = compileSqlServerSql(request.operation.sql, request.params || {});
   const compiledRequest = {
@@ -109846,7 +109935,7 @@ async function runBuiltInSqlServerIntegratedAdapter(request) {
   try {
     return await runSqlServerIntegratedViaPowerShell(compiledRequest);
   } catch (error) {
-    throw formatBuiltInDriverError("SQL Server Integrated Auth", error);
+    throw formatBuiltInDriverError("SQL Server (Windows)", error);
   }
 }
 function isBuiltInSqlAdapter(adapterId) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "norn-cli",
   "displayName": "Norn - REST Client",
   "description": "A powerful REST client for making HTTP requests with sequences, variables, scripts, and cookie support",
-  "version": "1.10.2",
+  "version": "1.10.3",
   "publisher": "Norn-PeterKrustanov",
   "author": {
     "name": "Peter Krastanov"