Report the rclone engine in storage requests

Author: alphasixtyfive

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## [0.3.12] - 2026-09-21
+
+- Include the verified bundled rclone version in ResoDrive's storage User-Agent so administrators can distinguish the client and storage engine versions.
+- Use the same client identity for mounts, sync jobs, setup checks and Nextcloud remote-wipe requests.
+
 ## [0.3.11] - 2026-09-21
 
 - Enable remote wipe for existing Nextcloud app-password connections after updating, without asking users to reconnect.
@@ -110,6 +115,7 @@ First public preview of ResoDrive.
 - Install through a small setup bundle that downloads the .NET Desktop Runtime
   only when it is missing.
 
+[0.3.12]: https://github.com/alphasixtyfive/ResoDrive/releases/tag/v0.3.12
 [0.3.11]: https://github.com/alphasixtyfive/ResoDrive/releases/tag/v0.3.11
 [0.3.10]: https://github.com/alphasixtyfive/ResoDrive/tree/v0.3.10
 [0.3.9]: https://github.com/alphasixtyfive/ResoDrive/releases/tag/v0.3.9

Directory.Build.props

@@ -9,7 +9,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Deterministic>true</Deterministic>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-    <VersionPrefix>0.3.11</VersionPrefix>
+    <VersionPrefix>0.3.12</VersionPrefix>
     <ProductDisplayName>ResoDrive</ProductDisplayName>
     <ExecutableBaseName>resodrive</ExecutableBaseName>
     <ProductDescription>Mount Nextcloud, other WebDAV storage, and SFTP servers as drives in Windows</ProductDescription>

RELEASE_NOTES.md

@@ -1,13 +1,5 @@
-ResoDrive 0.3.11 adds remote wipe to existing Nextcloud app-password connections after updating. Users do not need to sign in again or re-add their drives.
+ResoDrive 0.3.12 reports the bundled rclone version alongside the ResoDrive and Windows versions in storage requests. Nextcloud administrators can now see which storage engine a connected ResoDrive client is using without installing a separate reporting service.
 
-- Reuses the URL, username and app password already saved in ResoDrive.
-- Checks for a pending wipe before automatic drives start.
-- Shows whether remote wipe is configured or needs attention beside each drive.
+The same client identity is used by mounted drives, sync jobs, setup checks and remote-wipe traffic. ResoDrive reads the version from its verified private rclone installation once when the host starts; it does not run another version check for every request.
 
-This replaces the 0.3.10 downloads, which did not automatically include older connections.
-
-Nextcloud must explicitly request a wipe. It removes local ResoDrive accounts, cache and managed download folders; external folders, upload originals and server files are left alone. ResoDrive must be running and able to reach Nextcloud. This is not a whole-PC reset.
-
-See the [remote-wipe guide](https://github.com/alphasixtyfive/ResoDrive/blob/v0.3.11/docs/REMOTE-WIPE.md) for setup, scope and the live-server acceptance steps to complete before relying on it.
-
-Known limitation: the full desktop update from the previous public version, including cancellation and blocked shutdown, still needs checking on a disposable desktop.
+No hostname, account name, device identifier, file path or software inventory is added. Servers only see the header when the client makes an authenticated storage or wipe request.

docs/REMOTE-WIPE.md

@@ -1,6 +1,6 @@
 # Nextcloud remote wipe: administrator guide
 
-This guide describes ResoDrive 0.3.11. Earlier packages do not include all recovery
+This guide describes ResoDrive 0.3.12. Earlier packages do not include all recovery
 fixes listed in the [changelog](../CHANGELOG.md). Server commands and UI below
 were checked against Nextcloud's official documentation
 and `stable32` source on 21 September 2026; live server acceptance is still required.
@@ -134,8 +134,8 @@ until it runs and can reach Nextcloud again. Each account uses its own app token
 without shared session cookies. HTTPS origin and port must match the registered
 server, redirects are not followed, and installation subdirectories are preserved.
 
-These requests include the running ResoDrive version and available Windows
-edition/release/build details in their HTTP User-Agent. See
+These requests include the running ResoDrive version, verified private rclone version and available
+Windows edition/release/build details in their HTTP User-Agent. See
 [storage client identification](SECURITY.md#storage-client-identification) for
 the fields and server-log visibility. This does not add a separate reporting API.
 
@@ -267,7 +267,7 @@ distinguishes HTTP 200 from 404.
     junction and an outside sentinel; cleanup must refuse the redirected path
     and preserve the outside file.
 11. Repeat with an older ResoDrive connection whose app password is saved but has
-    no local wipe-check entry. Update to 0.3.11 and confirm **Remote wipe configured**
+    no local wipe-check entry. Update to 0.3.12 and confirm **Remote wipe configured**
     appears without another login. Also queue a wipe before starting the updated
     host: cleanup must begin before automatic drives mount. Existing external
     sync folders must remain outside the wipe scope.

docs/SECURITY.md

@@ -49,19 +49,21 @@ WebDAV setup, Nextcloud access/wipe checks and managed rclone storage requests
 identify the client with a `User-Agent` such as:
 
 ```text
-ResoDrive/0.3.11 (Windows 11; Edition: Professional; Release: 24H2; Build: 10.0.26100.9457; ClientArchitecture: x64; OSArchitecture: x64)
+ResoDrive/0.3.12 (Windows 11; Edition: Professional; Release: 25H2; Build: 10.0.26200.9457; ClientArchitecture: x64; OSArchitecture: x64; Rclone: v1.75.1)
 ```
 
 This is an example, not a minimum supported build. The product version comes from
-the running build. Windows details are read locally without elevation and cached
+the running build. The rclone version comes from ResoDrive's verified private
+runtime and is inspected once when the background host starts or setup begins,
+not once per request. Windows details are read locally without elevation and cached
 for the process lifetime; restart ResoDrive to refresh them after OS changes.
 Missing or unreadable optional registry details are omitted. Edition identifiers
 are preserved, including LTSC variants; Windows Server is distinguished from
 Windows 10/11 when its installation type is available. No hostname, account name,
 device identifier, file path or installed-software inventory is added to the
 header. Existing authenticated requests still carry the credentials they require.
 
-The additional OS details are sent to configured storage services. GitHub update
+The additional OS and rclone details are sent to configured storage services. GitHub update
 checks and component downloads do not use this enriched header. An inherited
 `RCLONE_USER_AGENT` override is respected by managed rclone processes. SFTP does
 not use HTTP User-Agent headers.

src/ResoDrive.Host/Worker.cs

@@ -41,18 +41,20 @@ public sealed partial class Worker : BackgroundService
     internal bool CanResumeRemoteWipe { get; private set; } = true;
     internal bool RestartForRemoteWipe { get; private set; }
     private bool _recoveringRemoteWipe;
+    private string _clientUserAgent = ClientUserAgent.Value;
+    private readonly bool _inspectRuntimeUserAgent;
 
     public Worker(
         ApplicationPaths paths,
         ILogger<Worker> logger,
         IHostApplicationLifetime applicationLifetime)
-        : this(paths, logger, applicationLifetime, new RemoteWipeClient())
+        : this(paths, logger, applicationLifetime, new RemoteWipeClient(), inspectRuntimeUserAgent: true)
     {
     }
 
     internal Worker(ApplicationPaths paths, ILogger<Worker> logger,
         IHostApplicationLifetime applicationLifetime, RemoteWipeClient remoteWipeClient,
-        RemoteWipeEnrollmentService? wipeEnrollment = null)
+        RemoteWipeEnrollmentService? wipeEnrollment = null, bool inspectRuntimeUserAgent = false)
     {
         _paths = paths;
         _logger = logger;
@@ -61,10 +63,18 @@ internal Worker(ApplicationPaths paths, ILogger<Worker> logger,
         _remoteWipe = new RemoteWipeStore(paths);
         _wipeCoordinator = new(paths, _remoteWipeClient);
         _wipeEnrollment = wipeEnrollment ?? new(paths);
+        _inspectRuntimeUserAgent = inspectRuntimeUserAgent;
     }
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
+        if (_inspectRuntimeUserAgent)
+        {
+            var runtime = await new RcloneRuntimeLocator(_paths).InspectAsync(stoppingToken).ConfigureAwait(false);
+            if (runtime.Succeeded)
+                _clientUserAgent = ClientUserAgent.WithRcloneVersion(runtime.Value?.Version);
+        }
+        _remoteWipeClient.SetClientUserAgent(_clientUserAgent);
         // Resume accepted commands before loading settings or starting any automatic work.
         if (new RemoteWipeStateStore(_paths).Read() is { Phase: not RemoteWipePhase.Completed })
         {
@@ -691,7 +701,7 @@ await CheckForRemoteWipeAsync(token).ConfigureAwait(false))
             _syncs?.Dispose();
             _syncs = null;
         }
-        _mounts ??= new(rclone, config, _paths, new MountTargetInventory());
+        _mounts ??= new(rclone, config, _paths, new MountTargetInventory(), _clientUserAgent);
         var mountCoordinator = _mounts;
         var reconciled = await mountCoordinator.ReconcileAsync(definitions, token).ConfigureAwait(false);
         if (!reconciled.Succeeded)
@@ -723,7 +733,7 @@ await CheckForRemoteWipeAsync(token).ConfigureAwait(false))
         {
             _lastRuns.TryRemove(obsoleteId, out _);
         }
-        _syncs ??= new(rclone, config, _paths, () => _definitions);
+        _syncs ??= new(rclone, config, _paths, () => _definitions, _clientUserAgent);
         _rclonePath = rclone;
         _configPath = config;
         var isFirstLoad = _settings is null;

src/ResoDrive.Windows/Mounting/RcloneMountCoordinator.cs

@@ -18,6 +18,7 @@ public sealed class RcloneMountCoordinator : IAsyncDisposable
     private readonly string _rclonePath;
     private readonly string _configPath;
     private readonly ApplicationPaths _paths;
+    private readonly string _clientUserAgent;
     private readonly IMountTargetInventory _inventory;
     private readonly MountOwnershipStore _ownership;
     private readonly ConcurrentDictionary<MountId, MountDefinition> _definitions = new();
@@ -30,11 +31,20 @@ public sealed class RcloneMountCoordinator : IAsyncDisposable
     private bool _recovered;
 
     public RcloneMountCoordinator(string rclonePath, string configPath, ApplicationPaths paths, IMountTargetInventory targetInventory)
+        : this(rclonePath, configPath, paths, targetInventory, ClientUserAgent.Value)
+    {
+    }
+
+    public RcloneMountCoordinator(string rclonePath, string configPath, ApplicationPaths paths,
+        IMountTargetInventory targetInventory, string clientUserAgent)
     {
         _rclonePath = Path.GetFullPath(rclonePath);
         _configPath = Path.GetFullPath(configPath);
         _paths = paths ?? throw new ArgumentNullException(nameof(paths));
         _inventory = targetInventory ?? throw new ArgumentNullException(nameof(targetInventory));
+        _clientUserAgent = string.IsNullOrWhiteSpace(clientUserAgent)
+            ? throw new ArgumentException("A client User-Agent is required.", nameof(clientUserAgent))
+            : clientUserAgent;
         _paths.EnsureCreated();
         _ownership = new(paths);
     }
@@ -570,7 +580,8 @@ private IEnumerable<string> Arguments(MountDefinition definition, RcloneControl
         yield return "--config";
         yield return _configPath;
         yield return "--ask-password=false";
-        foreach (var argument in RcloneUserAgentArguments.Create(definition.Arguments))
+        foreach (var argument in RcloneUserAgentArguments.Create(
+                     definition.Arguments, Environment.GetEnvironmentVariable("RCLONE_USER_AGENT"), _clientUserAgent))
             yield return argument;
         if (File.Exists(_paths.ConfigSecretFile))
         {

src/ResoDrive.Windows/Profiles/ProfileProvisioningService.cs

@@ -147,12 +147,13 @@ public async Task<OperationResult<ProfileProvisioningResult>> ProvisionAsync(
                 installation.Error?.Code ?? "rclone.bundled_invalid",
                 installation.Error?.Message ?? "The managed rclone component is not installed.",
                 installation.Error?.IsTransient ?? false);
+        var clientUserAgent = ClientUserAgent.WithRcloneVersion(installation.Value.Version);
 
         if (profile.Connection is WebDavConnectionDefinition)
         {
             progress?.Report("Checking account");
             var credentialCheck = await CheckWebDavCredentialsAsync(
-                endpoint, request.Username, normalizedPassword, cancellationToken).ConfigureAwait(false);
+                endpoint, request.Username, normalizedPassword, clientUserAgent, cancellationToken).ConfigureAwait(false);
             if (!credentialCheck.Succeeded)
                 return Failure(
                     credentialCheck.Error?.Code ?? "setup.credentials",
@@ -265,7 +266,9 @@ await _mutation.AppendSftpKeyFileRemoteAsync(
             var verification = await RunCheckedAsync(
                 installation.Value.ExecutablePath,
                 ["--config", stagedConfig, "--ask-password=false", "--password-command", configPasswordCommand,
-                    "lsf", source, "--max-depth", "1", .. RcloneUserAgentArguments.Create([])],
+                    "lsf", source, "--max-depth", "1",
+                    .. RcloneUserAgentArguments.Create([], Environment.GetEnvironmentVariable("RCLONE_USER_AGENT"),
+                        clientUserAgent)],
                 null, null, cancellationToken).ConfigureAwait(false);
             if (!verification.Succeeded)
                 return FailureFrom(verification, "setup.remote_check", "The configured remote could not be verified.");
@@ -384,11 +387,12 @@ internal static string ValidateSftpKeyFile(string path)
     }
 
     private async Task<OperationResult> CheckWebDavCredentialsAsync(
-        Uri endpoint, string username, string password, CancellationToken cancellationToken)
+        Uri endpoint, string username, string password, string clientUserAgent,
+        CancellationToken cancellationToken)
     {
         using var request = new HttpRequestMessage(new HttpMethod("PROPFIND"), endpoint);
         request.Headers.Add("Depth", "0");
-        request.Headers.UserAgent.ParseAdd(ClientUserAgent.Value);
+        request.Headers.UserAgent.ParseAdd(clientUserAgent);
         request.Headers.Authorization = new AuthenticationHeaderValue(
             "Basic", Convert.ToBase64String(Encoding.UTF8.GetBytes($"{username}:{password}")));
         try

src/ResoDrive.Windows/Rclone/RcloneUserAgentArguments.cs

@@ -3,9 +3,12 @@ namespace ResoDrive.Windows;
 internal static class RcloneUserAgentArguments
 {
     public static IReadOnlyList<string> Create(IEnumerable<string> arguments) =>
-        Create(arguments, Environment.GetEnvironmentVariable("RCLONE_USER_AGENT"));
+        Create(arguments, Environment.GetEnvironmentVariable("RCLONE_USER_AGENT"), ClientUserAgent.Value);
 
-    internal static IReadOnlyList<string> Create(IEnumerable<string> arguments, string? inheritedUserAgent)
+    internal static IReadOnlyList<string> Create(
+        IEnumerable<string> arguments,
+        string? inheritedUserAgent,
+        string? defaultUserAgent = null)
     {
         // Keep explicit rclone overrides. The manager's default is only for
         // requests that would otherwise use rclone's generic identification.
@@ -14,6 +17,6 @@ internal static IReadOnlyList<string> Create(IEnumerable<string> arguments, stri
                 argument.StartsWith("--user-agent=", StringComparison.OrdinalIgnoreCase)))
             return [];
 
-        return ["--user-agent", ClientUserAgent.Value];
+        return ["--user-agent", defaultUserAgent ?? ClientUserAgent.Value];
     }
 }

src/ResoDrive.Windows/Security/RemoteWipeClient.cs

@@ -11,11 +11,13 @@ public sealed class RemoteWipeClient : IDisposable
     private readonly HttpClient _httpClient;
     private readonly bool _ownsClient;
     private readonly TimeSpan _requestTimeout;
+    private string _clientUserAgent;
 
     public RemoteWipeClient(HttpClient? httpClient = null, TimeSpan? requestTimeout = null)
     {
         _ownsClient = httpClient is null;
         _requestTimeout = requestTimeout ?? TimeSpan.FromSeconds(15);
+        _clientUserAgent = ClientUserAgent.Value;
         // Injected clients must preserve the same redirect and cookie isolation.
         _httpClient = httpClient ?? CreateHttpClient();
     }
@@ -32,6 +34,12 @@ public RemoteWipeClient(HttpClient? httpClient = null, TimeSpan? requestTimeout
         Timeout = Timeout.InfiniteTimeSpan
     };
 
+    public void SetClientUserAgent(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        Volatile.Write(ref _clientUserAgent, value);
+    }
+
     public async Task<bool> IsWipeRequestedAsync(
         RemoteWipeRegistration registration,
         CancellationToken cancellationToken = default)
@@ -45,7 +53,7 @@ public async Task<bool> IsWipeRequestedAsync(
 
         using var probe = new HttpRequestMessage(new HttpMethod("PROPFIND"), probeEndpoint);
         probe.Headers.Add("Depth", "0");
-        probe.Headers.UserAgent.ParseAdd(ClientUserAgent.Value);
+        probe.Headers.UserAgent.ParseAdd(Volatile.Read(ref _clientUserAgent));
         AddBasicAuthentication(probe, registration.Username, registration.AppToken);
 
         try
@@ -57,7 +65,8 @@ public async Task<bool> IsWipeRequestedAsync(
                     return false;
             }
 
-            using var check = CreateTokenRequest(serverBase, "index.php/core/wipe/check", registration.AppToken);
+            using var check = CreateTokenRequest(
+                serverBase, "index.php/core/wipe/check", registration.AppToken, Volatile.Read(ref _clientUserAgent));
             using var checkResponse = await _httpClient.SendAsync(
                 check, HttpCompletionOption.ResponseHeadersRead, requestToken).ConfigureAwait(false);
             if (checkResponse.StatusCode != HttpStatusCode.OK)
@@ -95,7 +104,8 @@ public async Task<bool> SignalSuccessAsync(
             throw new InvalidOperationException("The remote-wipe registration is not a valid HTTPS endpoint.");
         using var deadline = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
         deadline.CancelAfter(_requestTimeout);
-        using var request = CreateTokenRequest(serverBase, "index.php/core/wipe/success", registration.AppToken);
+        using var request = CreateTokenRequest(
+            serverBase, "index.php/core/wipe/success", registration.AppToken, Volatile.Read(ref _clientUserAgent));
         using var response = await _httpClient.SendAsync(
             request, HttpCompletionOption.ResponseHeadersRead, deadline.Token).ConfigureAwait(false);
         // Nextcloud removes the token on acknowledgement. A retry after a lost response
@@ -109,13 +119,14 @@ public async Task<bool> SignalSuccessAsync(
         return true;
     }
 
-    private static HttpRequestMessage CreateTokenRequest(Uri serverBase, string path, string token)
+    private static HttpRequestMessage CreateTokenRequest(
+        Uri serverBase, string path, string token, string clientUserAgent)
     {
         var request = new HttpRequestMessage(HttpMethod.Post, new Uri(serverBase, path))
         {
             Content = new FormUrlEncodedContent([new KeyValuePair<string, string>("token", token)])
         };
-        request.Headers.UserAgent.ParseAdd(ClientUserAgent.Value);
+        request.Headers.UserAgent.ParseAdd(clientUserAgent);
         return request;
     }