Refactors/fixes. See description. (#58)

* Add DataRedaction library references and apply ProtectedDataClassification attributes

* Remove unneeded BusyCounter.

* Round MinCanvasScale.

* Remove unused using directives from DesktopClientRpcService and StaticServiceProvider.

* Fix XDG initialization.

* File system path and installer refactors.

* Fix member order.

* Refactor permission handling for macOS in DesktopClient components

* Add prod-release workflow.

* Add MacPermissionStaleHint localization and update permission status handling

* Refactor permission status handling in ManagedDeviceViewModelFake and update UI bindings in ManagedDeviceView

* Swap StackPanel with Grid.

* Fix extraction path.

* Update .gitignore

* Refactor NavigationProvider to activate main window if already visible; update ManagedDeviceView design dimensions and binding layout; adjust MacInterop key mapping for Alt and Meta keys.

* Refactor WindowsMessagePump to handle cancellation token correctly and log thread cancellation events.

Author: bitbound

.github/workflows/docker-deploy.yml

@@ -17,6 +17,16 @@ on:
         description: "Build workflow run ID (leave empty to use latest)"
         required: false
         type: string
+  workflow_call:
+    inputs:
+      docker_tag:
+        description: "Docker tag to deploy"
+        required: true
+        type: string
+      run_id:
+        description: "Build workflow run ID (leave empty to use latest)"
+        required: false
+        type: string
 
 permissions:
   actions: read

.github/workflows/github-release.yml

@@ -13,6 +13,17 @@ on:
         description: "Build workflow run ID (leave empty to use latest)"
         required: false
         type: string
+  workflow_call:
+    inputs:
+      prerelease:
+        description: "Mark as pre-release"
+        required: true
+        type: boolean
+        default: false
+      run_id:
+        description: "Build workflow run ID (leave empty to use latest)"
+        required: false
+        type: string
 
 permissions:
   contents: write

.github/workflows/prod-release.yml

@@ -0,0 +1,50 @@
+name: Production Release
+run-name: "Production Release (Run ID: ${{ inputs.run_id || 'latest build' }})"
+
+on:
+  workflow_dispatch:
+    inputs:
+      run_id:
+        description: "Build workflow run ID (leave empty to use latest)"
+        required: false
+        type: string
+      prerelease:
+        description: "Mark GitHub release as pre-release"
+        required: true
+        type: boolean
+        default: false
+
+permissions:
+  actions: read
+  contents: write
+
+jobs:
+  docker-deploy:
+    name: Deploy to Docker Hub
+    uses: ./.github/workflows/docker-deploy.yml
+    with:
+      docker_tag: latest
+      run_id: ${{ inputs.run_id }}
+    permissions:
+      actions: read
+      contents: read
+
+  github-release:
+    name: Create GitHub Release
+    needs: docker-deploy
+    uses: ./.github/workflows/github-release.yml
+    with:
+      prerelease: ${{ inputs.prerelease }}
+      run_id: ${{ inputs.run_id }}
+    permissions:
+      contents: write
+
+  publish-nugets:
+    name: Publish NuGet Packages
+    needs: docker-deploy
+    uses: ./.github/workflows/publish-nugets.yml
+    with:
+      run_id: ${{ inputs.run_id }}
+    permissions:
+      actions: read
+      contents: read

.github/workflows/publish-nugets.yml

@@ -8,6 +8,12 @@ on:
         description: "Build workflow run ID (leave empty to use latest)"
         required: false
         type: string
+  workflow_call:
+    inputs:
+      run_id:
+        description: "Build workflow run ID (leave empty to use latest)"
+        required: false
+        type: string
 
 permissions:
   actions: read

.gitignore

@@ -375,3 +375,4 @@ FodyWeavers.xsd
 /.build/staging-desktop
 ControlR.Agent.Common/Resources/ControlR.DesktopClient.zip
 ControlR.ApiClient/Output/.kiota.log
+ControlR.Agent.Common/Resources/ControlR.app.zip

ControlR.Agent.Common/Services/Base/AgentInstallerBase.cs

@@ -1,8 +1,6 @@
 using ControlR.Agent.Common.Interfaces;
-using ControlR.Agent.Common.Models;
 using ControlR.Libraries.DevicesCommon.Services.Processes;
 using ControlR.Libraries.Shared.Constants;
-using ControlR.Libraries.Shared.Dtos.ServerApi;
 using ControlR.Libraries.Shared.Services.Http;
 using Microsoft.Extensions.Options;
 
@@ -20,6 +18,7 @@ internal abstract class AgentInstallerBase(
   private readonly IControlrApi _controlrApi = controlrApi;
   private readonly IDeviceInfoProvider _deviceDataGenerator = deviceDataGenerator;
   private readonly ISettingsProvider _settingsProvider = settingsProvider;
+
   protected IOptionsMonitor<AgentAppOptions> AppOptions { get; } = appOptions;
   protected IFileSystem FileSystem { get; } = fileSystem;
   protected ILogger<AgentInstallerBase> Logger { get; } = logger;
@@ -98,6 +97,46 @@ protected Result StopProcesses()
     }
   }
 
+  /// <summary>
+  /// Attempts to clear old .NET extraction directories to free up space.
+  /// </summary>
+  /// <param name="agentTempDirBase">
+  ///   The base directory where .NET extracts files for the agent (e.g. "C:\Windows\SystemTemp\.net\ControlR.Agent").
+  /// </param>
+  protected void TryClearDotnetExtractDir(string agentTempDirBase)
+  {
+    try
+    {
+      if (!FileSystem.DirectoryExists(agentTempDirBase))
+      {
+        return;
+      }
+
+      var subdirs = FileSystem
+        .GetDirectories(agentTempDirBase)
+        .Select(x => new DirectoryInfo(x))
+        .OrderByDescending(x => x.CreationTime)
+        .Skip(3)
+        .ToArray();
+
+      foreach (var subdir in subdirs)
+      {
+        try
+        {
+          subdir.Delete(true);
+        }
+        catch (Exception ex)
+        {
+          Logger.LogError(ex, "Failed to delete directory {SubDir}.", subdir);
+        }
+      }
+    }
+    catch (Exception ex)
+    {
+      Logger.LogError(ex, "Error while cleaning up .net extraction directory.");
+    }
+  }
+
   protected async Task UpdateAppSettings(Uri? serverUri, Guid? tenantId, Guid? deviceId)
   {
     using var _ = Logger.BeginMemberScope();

ControlR.Agent.Common/Services/DesktopClientUpdater.cs

@@ -15,20 +15,22 @@ internal class DesktopClientUpdater(
   IControlrMutationLock mutationLock,
   IProcessManager processManager,
   IDesktopSessionProvider desktopSessionProvider,
+  IFileSystemPathProvider fileSystemPathProvider,
   IEmbeddedDesktopClientProvider embeddedDesktopClientProvider,
   ILogger<DesktopClientUpdater> logger) : BackgroundService, IDesktopClientUpdater
 {
   private readonly IDesktopSessionProvider _desktopSessionProvider = desktopSessionProvider;
   private readonly IEmbeddedDesktopClientProvider _embeddedDesktopClientProvider = embeddedDesktopClientProvider;
   private readonly IFileSystem _fileSystem = fileSystem;
+  private readonly IFileSystemPathProvider _fileSystemPathProvider = fileSystemPathProvider;
   private readonly ILogger<DesktopClientUpdater> _logger = logger;
   private readonly IControlrMutationLock _mutationLock = mutationLock;
   private readonly IProcessManager _processManager = processManager;
   private readonly IServiceControl _serviceControl = serviceControl;
   private readonly ISettingsProvider _settings = settings;
   private readonly ISystemEnvironment _systemEnvironment = systemEnvironment;
   private readonly SemaphoreSlim _updateLock = new(1, 1);
-  
+
   public async Task<bool> EnsureLatestVersion(
     bool acquireGlobalLock,
     CancellationToken cancellationToken)
@@ -49,8 +51,8 @@ public async Task<bool> EnsureLatestVersion(
       _logger.LogInformation("Ensuring latest version of desktop client.");
 
       var startupDir = _systemEnvironment.StartupDirectory;
-      var desktopDir = Path.Combine(startupDir, "DesktopClient");
-      var binaryPath = AppConstants.GetDesktopExecutablePath(startupDir);
+      var desktopDir = _fileSystemPathProvider.GetDesktopClientDirectory();
+      var binaryPath = _fileSystemPathProvider.GetDesktopExecutablePath();
       var extractedZipPath = Path.Combine(startupDir, AppConstants.DesktopClientZipFileName);
 
       // 1) Compute embedded zip hash
@@ -174,7 +176,7 @@ private async Task<bool> ExtractDesktopClient(string desktopDir)
 
       _fileSystem.ExtractZipArchive(targetPath, desktopDir, true);
 
-      await SetDesktopClientPermissions(desktopDir);
+      await SetDesktopClientFileAttributes(desktopDir);
 
       if (_systemEnvironment.Platform == SystemPlatform.MacOs || _systemEnvironment.Platform == SystemPlatform.Linux)
       {
@@ -205,14 +207,14 @@ private async Task<Result<string>> GetEmbeddedZipHash(CancellationToken cancella
 
   private async Task<string?> GetFileHash(string path, CancellationToken cancellationToken)
   {
-    if (!_fileSystem.FileExists(path))
-    {
-      _logger.LogInformation("Extracted desktop client ZIP not found. Update required.");
-      return null;
-    }
-
     try
     {
+      if (!_fileSystem.FileExists(path))
+      {
+        _logger.LogInformation("Extracted desktop client ZIP not found. Update required.");
+        return null;
+      }
+      
       await using var fileStream = _fileSystem.OpenFileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
       var hashBytes = await SHA256.HashDataAsync(fileStream, cancellationToken);
       var extractedHash = Convert.ToHexString(hashBytes);
@@ -226,41 +228,47 @@ private async Task<Result<string>> GetEmbeddedZipHash(CancellationToken cancella
     }
   }
 
-
   private bool IsUpToDate(string? extractedHash, string embeddedHash, string binaryPath)
   {
     return !string.IsNullOrWhiteSpace(extractedHash)
            && string.Equals(extractedHash, embeddedHash, StringComparison.OrdinalIgnoreCase)
            && _fileSystem.FileExists(binaryPath);
   }
 
-  private async Task SetDesktopClientPermissions(string desktopDir)
+  private async Task SetDesktopClientFileAttributes(string desktopDir)
   {
-    if (_systemEnvironment.Platform == SystemPlatform.MacOs)
+    try
     {
-      // Ensure the Mac app bundle executable has correct permissions
-      var appBundleExecutablePath = Path.Combine(desktopDir, "ControlR.app", "Contents", "MacOS", "ControlR.DesktopClient");
-      if (_fileSystem.FileExists(appBundleExecutablePath))
+      if (_systemEnvironment.Platform == SystemPlatform.MacOs)
       {
-        var chmodResult = await _processManager.GetProcessOutput("chmod", "+x " + appBundleExecutablePath, 5000);
-        if (!chmodResult.IsSuccess)
+        // Ensure the Mac app bundle executable has correct file attributes.
+        var appBundleExecutablePath = Path.Combine(desktopDir, "ControlR.app", "Contents", "MacOS", "ControlR.DesktopClient");
+        if (_fileSystem.FileExists(appBundleExecutablePath))
         {
-          _logger.LogWarning("Failed to set executable permissions on Mac app bundle: {Error}", chmodResult.Reason);
+          var chmodResult = await _processManager.GetProcessOutput("chmod", "+x " + appBundleExecutablePath, 5000);
+          if (!chmodResult.IsSuccess)
+          {
+            _logger.LogWarning("Failed to set executable permissions on Mac app bundle: {Error}", chmodResult.Reason);
+          }
         }
       }
-    }
-    else if (_systemEnvironment.Platform == SystemPlatform.Linux)
-    {
-      // Ensure the Linux executable has correct permissions
-      var linuxExecutablePath = Path.Combine(desktopDir, AppConstants.DesktopClientFileName);
-      if (_fileSystem.FileExists(linuxExecutablePath))
+      else if (_systemEnvironment.Platform == SystemPlatform.Linux)
       {
-        var chmodResult = await _processManager.GetProcessOutput("chmod", "+x " + linuxExecutablePath, 5000);
-        if (!chmodResult.IsSuccess)
+        // Ensure the Linux executable has correct file attributes.
+        var linuxExecutablePath = Path.Combine(desktopDir, AppConstants.DesktopClientFileName);
+        if (_fileSystem.FileExists(linuxExecutablePath))
         {
-          _logger.LogWarning("Failed to set executable permissions on Linux executable: {Error}", chmodResult.Reason);
+          var chmodResult = await _processManager.GetProcessOutput("chmod", "+x " + linuxExecutablePath, 5000);
+          if (!chmodResult.IsSuccess)
+          {
+            _logger.LogWarning("Failed to set executable file attributes on Linux executable: {Error}", chmodResult.Reason);
+          }
         }
       }
     }
+    catch (Exception ex)
+    {
+      _logger.LogError(ex, "Error setting desktop client file attributes.");
+    }
   }
 }

ControlR.Agent.Common/Services/FileSystemPathProvider.cs

@@ -1,6 +1,5 @@
 using ControlR.Agent.Common.Interfaces;
-using ControlR.Agent.Common.Startup;
-using ControlR.Libraries.DevicesCommon.Services;
+using ControlR.Libraries.Shared.Constants;
 using Microsoft.Extensions.Options;
 
 namespace ControlR.Agent.Common.Services;
@@ -13,6 +12,10 @@ public interface IFileSystemPathProvider
 
   string GetAgentLogsDirectoryPath();
 
+  string GetDesktopClientDirectory();
+
+  string GetDesktopExecutablePath();
+
   string GetUnixDesktopClientLogsDirectory(string username);
 
   string GetUnixDesktopClientLogsDirectoryForRoot();
@@ -68,6 +71,23 @@ public string GetAgentLogsDirectoryPath()
     throw new PlatformNotSupportedException();
   }
 
+  public string GetDesktopClientDirectory()
+  {
+    var startupDir = _systemEnvironment.StartupDirectory;
+    return Path.Combine(startupDir, "DesktopClient");
+  }
+
+  public string GetDesktopExecutablePath()
+  {
+    var desktopDir = GetDesktopClientDirectory();
+
+    return SystemEnvironment.Instance.Platform switch
+    {
+      SystemPlatform.MacOs => Path.Combine(desktopDir, "ControlR.app", "Contents", "MacOS", AppConstants.DesktopClientFileName),
+      _ => Path.Combine(desktopDir, AppConstants.DesktopClientFileName)
+    };
+  }
+
   public string GetUnixDesktopClientLogsDirectory(string username)
   {
     if (!_systemEnvironment.IsLinux() && !_systemEnvironment.IsMacOS())

ControlR.Agent.Common/Services/IpcClientAuthenticator.cs

@@ -18,19 +18,20 @@ public class IpcClientAuthenticator(
   IClientCredentialsProvider credentialsProvider,
   ISystemEnvironment systemEnvironment,
   IDesktopClientFileVerifier fileVerifier,
+  IFileSystemPathProvider pathProvider,
   ILogger<IpcClientAuthenticator> logger) : IIpcClientAuthenticator
 {
   private const int MaxFailuresPerMinute = 5;
 
-
   private readonly IClientCredentialsProvider _credentialsProvider = credentialsProvider;
   private readonly ConcurrentDictionary<string, List<DateTimeOffset>> _failedAttempts = new();
   private readonly IDesktopClientFileVerifier _fileVerifier = fileVerifier;
   private readonly ILogger<IpcClientAuthenticator> _logger = logger;
+  private readonly IFileSystemPathProvider _pathProvider = pathProvider;
   private readonly SemaphoreSlim _rateLimitLock = new(1, 1);
   private readonly ISystemEnvironment _systemEnvironment = systemEnvironment;
   private readonly TimeProvider _timeProvider = timeProvider;
-  
+
   public async Task<Result<ClientCredentials>> AuthenticateConnection(IIpcServer server)
   {
     try
@@ -169,7 +170,6 @@ public async Task RecordFailedAttempt(string executablePath)
     }
   }
 
-
   private Result ValidateExecutablePath(string executablePath)
   {
     if (string.IsNullOrWhiteSpace(executablePath))
@@ -183,6 +183,7 @@ private Result ValidateExecutablePath(string executablePath)
       return ValidateExecutablePathDebug(executablePath);
     }
 
+    // Release mode validation
     return ValidateExecutablePathRelease(executablePath);
   }
 
@@ -229,9 +230,7 @@ private Result ValidateExecutablePathDebug(string executablePath)
 
   private Result ValidateExecutablePathRelease(string executablePath)
   {
-    // Production/Release mode: strict validation
-    var expectedPath = AppConstants.GetDesktopExecutablePath(_systemEnvironment.StartupDirectory);
-
+    var expectedPath = _pathProvider.GetDesktopExecutablePath();
     if (executablePath.Equals(expectedPath, StringComparison.OrdinalIgnoreCase))
     {
       return Result.Ok();