Release v2026.02.11

dlamanna · dlamanna · commit 54c9d83a3ef8 · 2026-02-11T22:05:34.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -52,10 +52,6 @@ ipch/
 # Local diagnostic scripts (not for version control)
 check-all-env-vars.ps1
 check-mohm-setup.ps1
-check-mohm-network.ps1
-fix-mohm-config.ps1
-set-missing-env-vars.ps1
-set-queue-url.ps1
 *.aps
 *.ncb
 *.opensdf
diff --git a/DesktopShell/Forms/ShellForm.cs b/DesktopShell/Forms/ShellForm.cs
@@ -165,6 +165,11 @@ public Shell()
 
         if (Settings.EnableTCPServer)
         {
+            if (GlobalVar.IsDefaultPassPhrase)
+            {
+                GlobalVar.Log("### TCP server enabled but DESKTOPSHELL_PASSPHRASE is missing/using default. Remote commands are insecure.");
+                GlobalVar.ToolTip("Security", "DESKTOPSHELL_PASSPHRASE is missing or default. Remote commands are insecure.");
+            }
             GlobalVar.ServerInstance = new TCPServer();
         }
         else
@@ -203,6 +208,11 @@ private bool PopulateCombos()
         browserList.Clear();
 
         //Populate Combinations
+        if (!File.Exists("shortcuts.txt"))
+        {
+            GlobalVar.Log("### shortcuts.txt not found. No shortcut combos loaded.");
+            return false;
+        }
         using (StreamReader? sr = new("shortcuts.txt"))
         {
             while (!sr.EndOfStream)
@@ -233,6 +243,11 @@ private bool PopulateCombos()
         }
 
         //Populate WebBrowsers
+        if (!File.Exists("webbrowsers.txt"))
+        {
+            GlobalVar.Log("### webbrowsers.txt not found. No browser mappings loaded.");
+            return false;
+        }
         using (StreamReader? sr = new("webbrowsers.txt"))
         {
             bool isDefault = true;
@@ -252,6 +267,11 @@ private bool PopulateCombos()
     private void PopulateWebSites()
     {
         webSiteList.Clear();
+        if (!File.Exists("websites.txt"))
+        {
+            GlobalVar.Log("### websites.txt not found. No website mappings loaded.");
+            return;
+        }
         using var sr = new StreamReader("websites.txt");
         while (!sr.EndOfStream)
         {
@@ -311,6 +331,10 @@ public void ProcessCommand(string command)
         //Command Formatting
         string? originalCMD = command;
         lastCMD.Add(originalCMD);
+        if (string.IsNullOrWhiteSpace(originalCMD))
+        {
+            return;
+        }
         string[] splitWords = SplitWords(originalCMD);
         GlobalVar.Log($"!!! Processing Command: {originalCMD}");
 
@@ -633,6 +657,7 @@ private static void MusicSearcher(string originalCMD)
 
     private void MovieSearcher(string originalCMD)
     {
+        // TODO: Rework movie search now that the server drive is no longer mapped.
         string? rawSearch = MovieSearch().Replace(originalCMD, "");
         GlobalVar.FileChoices.Clear();
         List<FileInfo> tempList2 = [];
@@ -1027,4 +1052,4 @@ public void ChangeBackgroundColor()
     }
 
     #endregion Change font/background Colors
-}
+}
diff --git a/DesktopShell/GlobalVar.cs b/DesktopShell/GlobalVar.cs
@@ -38,7 +38,9 @@ public static partial class GlobalVar
 
     // Security: PassPhrase is loaded from environment variable DESKTOPSHELL_PASSPHRASE
     // Fallback to "default" if not set (should be changed in production)
-    public static readonly string PassPhrase = Environment.GetEnvironmentVariable("DESKTOPSHELL_PASSPHRASE") ?? "default";
+    public static string PassPhrase => GetEnvValue("DESKTOPSHELL_PASSPHRASE") ?? "default";
+    public static bool IsDefaultPassPhrase =>
+        string.Equals(PassPhrase, "default", StringComparison.Ordinal);
 
     // Optional TLS for TCP remote commands.
     // Enable with DESKTOPSHELL_TCP_TLS=1 and provide server cert via DESKTOPSHELL_TCP_TLS_PFX + DESKTOPSHELL_TCP_TLS_PFX_PASSWORD.
@@ -56,6 +58,7 @@ public static partial class GlobalVar
     public const string EnvQueueEnabled = "DESKTOPSHELL_QUEUE_ENABLED";
     public const string EnvQueueBaseUrl = "DESKTOPSHELL_QUEUE_BASEURL";
     public const string EnvQueueKeyBase64 = "DESKTOPSHELL_QUEUE_KEY_B64";
+    public const string EnvQueueSharedSecret = "DESKTOPSHELL_QUEUE_SHARED_SECRET";
     public const string EnvCfAccessClientId = "DESKTOPSHELL_CF_ACCESS_CLIENT_ID";
     public const string EnvCfAccessClientSecret = "DESKTOPSHELL_CF_ACCESS_CLIENT_SECRET";
 
@@ -127,10 +130,14 @@ public static void LogQueueEnvSummary()
         string enabledRaw = GetEnvValue(EnvQueueEnabled) ?? "";
         string? id = GetEnvValue(EnvCfAccessClientId);
         string? secret = GetEnvValue(EnvCfAccessClientSecret);
+        string? sharedEnv = GetEnvValue(EnvQueueSharedSecret);
+        string? shared = sharedEnv ?? "TUF@D^w3:xYsm,aLtY@ySCCo]%";
+        string sharedSource = sharedEnv != null ? GetEnvSource(EnvQueueSharedSecret) : "code";
 
         Log($"^^^ Queue env: {EnvQueueEnabled}='{enabledRaw}' (source={GetEnvSource(EnvQueueEnabled)}), " +
             $"{EnvCfAccessClientId}={(string.IsNullOrWhiteSpace(id) ? "missing" : "set")} (len={(id ?? "").Length}, source={GetEnvSource(EnvCfAccessClientId)}), " +
-            $"{EnvCfAccessClientSecret}={(string.IsNullOrWhiteSpace(secret) ? "missing" : "set")} (len={(secret ?? "").Length}, source={GetEnvSource(EnvCfAccessClientSecret)})");
+            $"{EnvCfAccessClientSecret}={(string.IsNullOrWhiteSpace(secret) ? "missing" : "set")} (len={(secret ?? "").Length}, source={GetEnvSource(EnvCfAccessClientSecret)}), " +
+            $"{EnvQueueSharedSecret}={(string.IsNullOrWhiteSpace(shared) ? "missing" : "set")} (len={(shared ?? "").Length}, source={sharedSource})");
     }
 
     public static void LogTcpEnvSummary()
@@ -149,6 +156,7 @@ public static void LogTcpEnvSummary()
     public static bool QueueEnabled => string.Equals(GetEnvValue(EnvQueueEnabled), "1", StringComparison.OrdinalIgnoreCase);
     public static string QueueBaseUrl => (GetEnvValue(EnvQueueBaseUrl) ?? "https://queue.dlamanna.com").TrimEnd('/');
     public static string? QueueKeyBase64 => GetEnvValue(EnvQueueKeyBase64);
+    public static string? QueueSharedSecret => GetEnvValue(EnvQueueSharedSecret) ?? "TUF@D^w3:xYsm,aLtY@ySCCo]%";
     public static string? CfAccessClientId => GetEnvValue(EnvCfAccessClientId);
     public static string? CfAccessClientSecret => GetEnvValue(EnvCfAccessClientSecret);
 
@@ -1153,4 +1161,4 @@ public static void ToolTip(string title, string body)
         Run($@"{CurrentAssemblyDirectory}\Bin\ToolTipper.exe", $"{title} {body}");
     }
     #endregion
-}
+}
diff --git a/DesktopShell/MessageQueueClient.cs b/DesktopShell/MessageQueueClient.cs
@@ -268,6 +268,11 @@ private static void AddAuthHeaders(HttpRequestMessage request)
     {
         request.Headers.TryAddWithoutValidation(GlobalVar.HeaderCfAccessClientId, GlobalVar.CfAccessClientId);
         request.Headers.TryAddWithoutValidation(GlobalVar.HeaderCfAccessClientSecret, GlobalVar.CfAccessClientSecret);
+
+        if (!string.IsNullOrWhiteSpace(GlobalVar.QueueSharedSecret))
+        {
+            request.Headers.TryAddWithoutValidation("X-Queue-Token", GlobalVar.QueueSharedSecret);
+        }
     }
 
     private static string? DecodeCommand(PulledMessage msg)
diff --git a/README.md b/README.md
@@ -21,6 +21,24 @@ ____
 - `DESKTOPSHELL_QUEUE_KEY_B64` (optional): Base64-encoded AES key for queue message encryption.
 - `DESKTOPSHELL_CF_ACCESS_CLIENT_ID` / `DESKTOPSHELL_CF_ACCESS_CLIENT_SECRET` (required if queue enabled): Cloudflare Access service token credentials.
 
+### Linux Harness Commands
+
+When running in a sandboxed Linux harness (where the repo path is not writable), use these wrappers instead of calling `dotnet` directly:
+
+```bash
+# Test wrapper (writes obj/bin/results under /tmp/desktopshell-harness)
+./scripts/test-harness-linux.sh
+
+# Publish wrapper for win-x64 single-file
+./scripts/publish-win-x64-singlefile-harness-linux.sh
+```
+
+Notes:
+- Wrappers force `BaseIntermediateOutputPath` and `BaseOutputPath` into `/tmp`.
+- Wrappers set `EnableWindowsTargeting=true` and clear/override fallback package behavior.
+- If package restore is blocked by network restrictions and required packages are missing from cache, restore/publish can still fail.
+- `DesktopShell.Tests` targets `net8.0-windows`; test execution itself may still require Windows behavior depending on test content.
+
 This is mostly meant as a code example since many of the features of this program launch other programs I coded which are not bundled in this repository. If you want to try it anyways, add your [regular expression](https://regexr.com/), program executable path, and commandline arguments in separate lines in the shortcuts.txt file. Add one line spacing between statements, and if no commandline arguments are required, put a dash on the third line. To use your new regex either re-open the DesktopShell.exe program or type the command "rescan".
 
 ***
diff --git a/scripts/publish-win-x64-singlefile-harness-linux.sh b/scripts/publish-win-x64-singlefile-harness-linux.sh
@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+repo_root="$(cd "$script_dir/.." && pwd)"
+project_path="$repo_root/DesktopShell/DesktopShell.csproj"
+
+configuration="${CONFIGURATION:-Release}"
+runtime="${RUNTIME:-win-x64}"
+self_contained="${SELF_CONTAINED:-true}"
+include_native="${INCLUDE_NATIVE_LIBRARIES_FOR_SELF_EXTRACT:-true}"
+
+tmp_root="${DESKTOPSHELL_HARNESS_TMP:-/tmp/desktopshell-harness}"
+mkdir -p "$tmp_root" "$tmp_root/obj" "$tmp_root/bin" "$tmp_root/publish" "$tmp_root/nuget/packages" "$tmp_root/.dotnet"
+
+export DOTNET_CLI_HOME="$tmp_root/.dotnet"
+export NUGET_PACKAGES="$tmp_root/nuget/packages"
+export NUGET_HTTP_CACHE_PATH="$tmp_root/nuget/http-cache"
+export NUGET_SCRATCH="$tmp_root/nuget/scratch"
+mkdir -p "$NUGET_HTTP_CACHE_PATH" "$NUGET_SCRATCH"
+
+fallback_packages=""
+for d in /mnt/c/Users/*/.nuget/packages; do
+  if [[ -d "$d" ]]; then
+    fallback_packages="$d"
+    break
+  fi
+done
+
+common_props=(
+  "-p:EnableWindowsTargeting=true"
+  "-p:BaseIntermediateOutputPath=$tmp_root/obj/"
+  "-p:BaseOutputPath=$tmp_root/bin/"
+  "-p:RestorePackagesPath=$NUGET_PACKAGES"
+)
+
+if [[ -n "$fallback_packages" ]]; then
+  common_props+=("-p:RestoreFallbackFolders=$fallback_packages")
+else
+  common_props+=("-p:RestoreFallbackFolders=")
+fi
+
+common_msbuild_flags=(
+  "--disable-build-servers"
+  "-m:1"
+  "/nodeReuse:false"
+)
+
+cd "$repo_root"
+
+echo "[harness] restoring DesktopShell"
+dotnet restore "$project_path" \
+  "${common_props[@]}" \
+  "${common_msbuild_flags[@]}" \
+  --ignore-failed-sources
+
+echo "[harness] publishing single-file win-x64"
+dotnet publish "$project_path" \
+  -c "$configuration" \
+  -r "$runtime" \
+  --self-contained "$self_contained" \
+  -p:PublishSingleFile=true \
+  "-p:IncludeNativeLibrariesForSelfExtract=$include_native" \
+  "-p:PublishDir=$tmp_root/publish/" \
+  --no-restore \
+  "${common_props[@]}" \
+  "${common_msbuild_flags[@]}" \
+  "$@"
+
+echo "[harness] publish output: $tmp_root/publish"
diff --git a/scripts/publish-win-x64-singlefile.ps1 b/scripts/publish-win-x64-singlefile.ps1
@@ -0,0 +1,32 @@
+[CmdletBinding()]
+param(
+    [string]$Configuration = 'Release',
+    [string]$Runtime = 'win-x64',
+    [switch]$SelfContained = $true,
+    [switch]$IncludeNativeLibrariesForSelfExtract = $true
+)
+
+$ErrorActionPreference = 'Stop'
+
+$repoRoot = Split-Path -Parent $PSScriptRoot
+$projectPath = Join-Path $repoRoot 'DesktopShell\DesktopShell.csproj'
+
+if (-not (Test-Path $projectPath)) {
+    throw "Project not found: $projectPath"
+}
+
+$sc = if ($SelfContained) { 'true' } else { 'false' }
+$includeNative = if ($IncludeNativeLibrariesForSelfExtract) { 'true' } else { 'false' }
+
+$publishArgs = @(
+    'publish',
+    $projectPath,
+    '-c', $Configuration,
+    '-r', $Runtime,
+    "--self-contained", $sc,
+    "-p:PublishSingleFile=true",
+    "-p:IncludeNativeLibrariesForSelfExtract=$includeNative"
+)
+
+Write-Host "Running: dotnet $($publishArgs -join ' ')"
+& dotnet @publishArgs
diff --git a/scripts/test-harness-linux.sh b/scripts/test-harness-linux.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+repo_root="$(cd "$script_dir/.." && pwd)"
+
+tmp_root="${DESKTOPSHELL_HARNESS_TMP:-/tmp/desktopshell-harness}"
+mkdir -p "$tmp_root" "$tmp_root/obj" "$tmp_root/bin" "$tmp_root/TestResults" "$tmp_root/nuget/packages" "$tmp_root/.dotnet"
+
+export DOTNET_CLI_HOME="$tmp_root/.dotnet"
+export NUGET_PACKAGES="$tmp_root/nuget/packages"
+export NUGET_HTTP_CACHE_PATH="$tmp_root/nuget/http-cache"
+export NUGET_SCRATCH="$tmp_root/nuget/scratch"
+mkdir -p "$NUGET_HTTP_CACHE_PATH" "$NUGET_SCRATCH"
+
+fallback_packages=""
+for d in /mnt/c/Users/*/.nuget/packages; do
+  if [[ -d "$d" ]]; then
+    fallback_packages="$d"
+    break
+  fi
+done
+
+common_props=(
+  "-p:EnableWindowsTargeting=true"
+  "-p:BaseIntermediateOutputPath=$tmp_root/obj/"
+  "-p:BaseOutputPath=$tmp_root/bin/"
+  "-p:RestorePackagesPath=$NUGET_PACKAGES"
+)
+
+if [[ -n "$fallback_packages" ]]; then
+  common_props+=("-p:RestoreFallbackFolders=$fallback_packages")
+else
+  common_props+=("-p:RestoreFallbackFolders=")
+fi
+
+common_msbuild_flags=(
+  "--disable-build-servers"
+  "-m:1"
+  "/nodeReuse:false"
+)
+
+cd "$repo_root"
+
+echo "[harness] restoring DesktopShell.sln"
+dotnet restore DesktopShell.sln \
+  "${common_props[@]}" \
+  "${common_msbuild_flags[@]}" \
+  --ignore-failed-sources
+
+echo "[harness] running tests"
+dotnet test DesktopShell.Tests/DesktopShell.Tests.csproj \
+  -c Release \
+  --no-restore \
+  --results-directory "$tmp_root/TestResults" \
+  "${common_props[@]}" \
+  "${common_msbuild_flags[@]}" \
+  "$@"

Original file line number	Diff line number	Diff line change
`@@ -268,6 +268,11 @@ private static void AddAuthHeaders(HttpRequestMessage request)`
`268`	`268`	`{`
`269`	`269`	`request.Headers.TryAddWithoutValidation(GlobalVar.HeaderCfAccessClientId, GlobalVar.CfAccessClientId);`
`270`	`270`	`request.Headers.TryAddWithoutValidation(GlobalVar.HeaderCfAccessClientSecret, GlobalVar.CfAccessClientSecret);`
	`271`	`+`
	`272`	`+ if (!string.IsNullOrWhiteSpace(GlobalVar.QueueSharedSecret))`
	`273`	`+ {`
	`274`	`+ request.Headers.TryAddWithoutValidation("X-Queue-Token", GlobalVar.QueueSharedSecret);`
	`275`	`+ }`
`271`	`276`	`}`
`272`	`277`
`273`	`278`	`private static string? DecodeCommand(PulledMessage msg)`