Update bootstrap scripts to check for executable correctness

dannykopping · dannykopping · commit 1b7f9aff6446 · 2024-05-15T17:36:10.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/provisionersdk/scripts/bootstrap_darwin.sh b/provisionersdk/scripts/bootstrap_darwin.sh
@@ -4,7 +4,7 @@ set -eux
 # This is to allow folks to exec into a failed workspace and poke around to
 # troubleshoot.
 waitonexit() {
-	echo "=== Agent script exited with non-zero code. Sleeping 24h to preserve logs..."
+	echo "=== Agent script exited with non-zero code ($?). Sleeping 24h to preserve logs..."
 	sleep 86400
 }
 trap waitonexit EXIT
@@ -31,4 +31,13 @@ fi
 
 export CODER_AGENT_AUTH="${AUTH_TYPE}"
 export CODER_AGENT_URL="${ACCESS_URL}"
-exec ./$BINARY_NAME agent
+
+output=$(./${BINARY_NAME} --version | head -n1)
+echo "${output}" | grep -q Coder
+if [ $? -ne 0 ] ; then
+        echo >&2 "ERROR: Downloaded agent binary is invalid"
+        echo >&2 "Script output: '${output}'"
+        exit 2
+fi
+
+exec ./${BINARY_NAME} agent
diff --git a/provisionersdk/scripts/bootstrap_linux.sh b/provisionersdk/scripts/bootstrap_linux.sh
@@ -4,7 +4,7 @@ set -eux
 # This is to allow folks to exec into a failed workspace and poke around to
 # troubleshoot.
 waitonexit() {
-	echo "=== Agent script exited with non-zero code. Sleeping 24h to preserve logs..."
+	echo "=== Agent script exited with non-zero code ($?). Sleeping 24h to preserve logs..."
 	sleep 86400
 }
 trap waitonexit EXIT
@@ -86,4 +86,13 @@ fi
 
 export CODER_AGENT_AUTH="${AUTH_TYPE}"
 export CODER_AGENT_URL="${ACCESS_URL}"
-exec ./$BINARY_NAME agent
+
+output=$(./${BINARY_NAME} --version | head -n1)
+echo "${output}" | grep -q Coder
+if [ $? -ne 0 ] ; then
+        echo >&2 "ERROR: Downloaded agent binary is invalid"
+        echo >&2 "Script output: '${output}'"
+        exit 2
+fi
+
+exec ./${BINARY_NAME} agent
diff --git a/provisionersdk/scripts/bootstrap_windows.ps1 b/provisionersdk/scripts/bootstrap_windows.ps1
@@ -35,6 +35,19 @@ if (-not (Get-Command 'Set-MpPreference' -ErrorAction SilentlyContinue)) {
 $env:CODER_AGENT_AUTH = "${AUTH_TYPE}"
 $env:CODER_AGENT_URL = "${ACCESS_URL}"
 
+$psi = [System.Diagnostics.ProcessStartInfo]::new("$env:TEMP\sshd.exe", '--version')
+$psi.UseShellExecute = $false
+$psi.RedirectStandardOutput = $true
+$p = [System.Diagnostics.Process]::Start($psi)
+$output = $p.StandardOutput.ReadToEnd()
+$p.WaitForExit()
+
+if ($output -notlike "*Coder*") {
+  Write-Error "ERROR: Downloaded agent binary is invalid"
+  Write-Error "Script output: '$output'"
+  Exit 2
+}
+
 # Check if we're running inside a Windows container!
 $inContainer = $false
 if ((Get-ItemProperty 'HKLM:\SYSTEM\CurrentControlSet\Control' -Name 'ContainerType' -ErrorAction SilentlyContinue) -ne $null) {
