add test debug messages and check on host key path

Author: JacobBarthelmeh

.github/workflows/windows-cert-store-test.yml

@@ -225,22 +225,38 @@ jobs:
         if ("${{ matrix.server_key_source }}" -eq "store") {
             # Get server cert subject from environment
             $serverSubject = (Get-Content env:SERVER_CERT_SUBJECT)
+            if ([string]::IsNullOrEmpty($serverSubject)) {
+                Write-Host "ERROR: SERVER_CERT_SUBJECT not set"
+                exit 1
+            }
+            Write-Host "Using cert store host key with subject: $serverSubject"
             $configContent += @"
 
         HostKeyStore My
         HostKeyStoreSubject $serverSubject
         HostKeyStoreFlags CURRENT_USER
         "@
         } else {
+            # Use absolute path for file-based key
+            $keyPath = Join-Path "${{ github.workspace }}" "wolfssh\keys\server-key-rsa.der"
+            $keyPathFull = (Resolve-Path $keyPath -ErrorAction SilentlyContinue)
+            if (-not $keyPathFull) {
+                Write-Host "ERROR: Host key file not found at: $keyPath"
+                Write-Host "Checking for key files..."
+                Get-ChildItem -Path "${{ github.workspace }}\wolfssh\keys" -Filter "server-key*.der" | Select-Object FullName
+                exit 1
+            }
+            Write-Host "Using file-based host key: $($keyPathFull.Path)"
             $configContent += @"
 
-        HostKey keys\server-key-rsa.der
+        HostKey $($keyPathFull.Path)
         "@
         }
         
         $configContent | Out-File -FilePath sshd_config_test -Encoding ASCII
         Write-Host "=== wolfSSHd Config ==="
         Get-Content sshd_config_test
+        Write-Host "=== End Config ==="
 
     - name: Find wolfSSH executables
       working-directory: ${{ github.workspace }}\wolfssh
@@ -291,6 +307,126 @@ jobs:
             Write-Host "WARNING: wolfssh.exe not found (SSH client test will be skipped)"
         }
 
+    - name: Copy wolfSSL DLL to executable directory
+      working-directory: ${{ github.workspace }}
+      shell: pwsh
+      run: |
+        $sshdPath = (Get-Content env:SSHD_PATH)
+        if (-not (Test-Path $sshdPath)) {
+            Write-Host "ERROR: wolfsshd.exe path not found in environment"
+            exit 1
+        }
+        
+        $sshdDir = Split-Path -Parent $sshdPath
+        Write-Host "wolfsshd.exe directory: $sshdDir"
+        
+        # Find wolfssl.dll in wolfSSL build output
+        $searchRoot = "${{ github.workspace }}\wolfssl"
+        $wolfsslDll = Get-ChildItem -Path $searchRoot -Recurse -Filter "wolfssl.dll" -ErrorAction SilentlyContinue | 
+            Where-Object { $_.FullName -like "*Release*" -or $_.FullName -like "*Debug*" } | 
+            Select-Object -First 1
+        
+        if ($wolfsslDll) {
+            $targetDll = Join-Path $sshdDir "wolfssl.dll"
+            Write-Host "Found wolfssl.dll at: $($wolfsslDll.FullName)"
+            Write-Host "Copying to: $targetDll"
+            Copy-Item -Path $wolfsslDll.FullName -Destination $targetDll -Force
+            Write-Host "Successfully copied wolfssl.dll"
+        } else {
+            Write-Host "WARNING: wolfssl.dll not found - checking for static build"
+            # Check if it's a static build (no DLL needed)
+            $wolfsslLib = Get-ChildItem -Path $searchRoot -Recurse -Filter "wolfssl.lib" -ErrorAction SilentlyContinue | 
+                Where-Object { $_.FullName -like "*Release*" -or $_.FullName -like "*Debug*" } | 
+                Select-Object -First 1
+            if ($wolfsslLib) {
+                Write-Host "Found wolfssl.lib (static build) - DLL not needed at runtime"
+            } else {
+                Write-Host "WARNING: Neither wolfssl.dll nor wolfssl.lib found"
+                Write-Host "Searching for any wolfssl files..."
+                Get-ChildItem -Path $searchRoot -Recurse -Filter "wolfssl.*" -ErrorAction SilentlyContinue | 
+                    Select-Object FullName | Format-Table
+            }
+        }
+        
+        # Also check for wolfssl.lib if user specifically needs it
+        $wolfsslLib = Get-ChildItem -Path $searchRoot -Recurse -Filter "wolfssl.lib" -ErrorAction SilentlyContinue | 
+            Where-Object { $_.FullName -like "*Release*" -or $_.FullName -like "*Debug*" } | 
+            Select-Object -First 1
+        
+        if ($wolfsslLib) {
+            $targetLib = Join-Path $sshdDir "wolfssl.lib"
+            Write-Host "Found wolfssl.lib at: $($wolfsslLib.FullName)"
+            Write-Host "Copying to: $targetLib"
+            Copy-Item -Path $wolfsslLib.FullName -Destination $targetLib -Force
+            Write-Host "Successfully copied wolfssl.lib"
+        }
+
+    - name: Verify host key configuration
+      working-directory: ${{ github.workspace }}\wolfssh
+      shell: pwsh
+      run: |
+        Write-Host "=== Verifying Host Key Configuration ==="
+        $configPath = "sshd_config_test"
+        if (-not (Test-Path $configPath)) {
+            Write-Host "ERROR: Config file not found: $configPath"
+            exit 1
+        }
+        
+        $configContent = Get-Content $configPath -Raw
+        Write-Host "Config file content:"
+        Write-Host $configContent
+        
+        # Check if host key is configured
+        $hasHostKey = $false
+        if ($configContent -match "HostKey\s+") {
+            Write-Host "Found HostKey directive (file-based)"
+            $hasHostKey = $true
+            # Verify the key file exists
+            if ($configContent -match "HostKey\s+([^\r\n]+)") {
+                $keyPath = $matches[1].Trim()
+                Write-Host "Host key path: $keyPath"
+                if (Test-Path $keyPath) {
+                    Write-Host "Host key file exists: OK"
+                } else {
+                    Write-Host "ERROR: Host key file not found: $keyPath"
+                    exit 1
+                }
+            }
+        }
+        if ($configContent -match "HostKeyStore\s+") {
+            Write-Host "Found HostKeyStore directive (cert store-based)"
+            $hasHostKey = $true
+            # Verify cert store subject is set
+            if ($configContent -match "HostKeyStoreSubject\s+([^\r\n]+)") {
+                $subject = $matches[1].Trim()
+                Write-Host "Host key store subject: $subject"
+                if ([string]::IsNullOrEmpty($subject)) {
+                    Write-Host "ERROR: HostKeyStoreSubject is empty"
+                    exit 1
+                }
+                # Verify cert exists in store
+                $cert = Get-ChildItem -Path "Cert:\CurrentUser\My" | Where-Object { $_.Subject -eq $subject } | Select-Object -First 1
+                if ($cert) {
+                    Write-Host "Certificate found in store: OK (Thumbprint: $($cert.Thumbprint))"
+                } else {
+                    Write-Host "ERROR: Certificate not found in store with subject: $subject"
+                    Write-Host "Available certificates in Cert:\CurrentUser\My:"
+                    Get-ChildItem -Path "Cert:\CurrentUser\My" | Select-Object Subject, Thumbprint | Format-Table
+                    exit 1
+                }
+            } else {
+                Write-Host "ERROR: HostKeyStoreSubject not found in config"
+                exit 1
+            }
+        }
+        
+        if (-not $hasHostKey) {
+            Write-Host "ERROR: No host key configuration found in config file!"
+            exit 1
+        }
+        
+        Write-Host "Host key configuration verified: OK"
+
     - name: Start wolfSSHd as Windows service
       working-directory: ${{ github.workspace }}\wolfssh
       shell: pwsh
@@ -358,7 +494,20 @@ jobs:
         if ($service.Status -ne 'Running') {
             Write-Host "ERROR: Service is not running. Status: $($service.Status)"
             # Get more details
+            Write-Host "=== Service Query ==="
             sc.exe query $serviceName
+            Write-Host "=== Event Log (last 20 entries) ==="
+            Get-EventLog -LogName Application -Source "wolfsshd" -Newest 20 -ErrorAction SilentlyContinue | Format-List
+            Get-EventLog -LogName System -Source "Service Control Manager" -Newest 10 -ErrorAction SilentlyContinue | 
+                Where-Object { $_.Message -like "*wolfsshd*" } | Format-List
+            Write-Host "=== Checking if process is running ==="
+            $processes = Get-Process | Where-Object { $_.ProcessName -like "*wolfsshd*" }
+            if ($processes) {
+                Write-Host "Found processes:"
+                $processes | Format-Table Id, ProcessName, StartTime
+            } else {
+                Write-Host "No wolfsshd processes found"
+            }
             exit 1
         }