fix(server): public ports as settings, container port lock and client address; clients default to 8443 and name non-Chronos servers
The owner's Uploader could not connect: the panel showed the container's listening ports (8080/8443) as if clients used them, the public ports were only environment variables (CHRONOS_PUBLIC_HTTP_PORT not even in the Unraid template), and the clients mapped a bare host to 443, where another service answered. - Public HTTP/HTTPS ports are settings (server.json, or locked by CHRONOS_PUBLIC_*) and apply at once; ServerSettingsDto gains appended PublicHttpPort, PublicHttpsPort and InContainer members. - In a container the listening ports are fixed by the template: locked in the panel, and saved values from earlier versions are ignored with a warning. - Settings > Network and TLS shows the client address with a Copy button; the discovery tooltip says a container needs network type Host. - ChronosAddress (shared by Chronos and the Uploader): no scheme and no port is https on 8443, https:// keeps 443, a typed port is kept, IPv6 is bracketed. - GetInfoAsync throws NotChronosServerException for answers that are not a Chronos server; another service's certificate is never offered for trust and no credentials are sent to it. Both clients name the address asked. - Unraid template, compose file, user guide, README, BRIEF, DECISIONS, CHANGELOG (with an Unraid upgrade note) and ARCHITECTURE updated; en/it strings added. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
9b24cf74fc
commit
369e754bec
33 files changed
+862
-82
No files matched your search
@@ -20,11 +20,15 @@ public sealed class ChronosClient : IDisposable
|
||||
{
|
||||
private readonly HttpClient _http;
|
||||
private readonly CertificatePinning _pinning;
|
||||
|
||||
/// <summary>The client made its own handler, so TLS goes through <see cref="_pinning"/> (tests pass theirs).</summary>
|
||||
private readonly bool _ownsHandler;
|
||||
private string? _token;
|
||||
|
||||
public ChronosClient(Uri baseAddress, CertificatePinning pinning, string clientName, HttpMessageHandler? handler = null)
|
||||
{
|
||||
_pinning = pinning;
|
||||
_ownsHandler = handler is null;
|
||||
ClientName = clientName;
|
||||
BaseAddress = baseAddress;
|
||||
var socketsHandler = handler ?? new SocketsHttpHandler
|
||||
@@ -59,8 +63,76 @@ public sealed class ChronosClient : IDisposable
|
||||
|
||||
// ---------------- Server ----------------
|
||||
|
||||
/// <summary>Reads server info; throws <see cref="UntrustedCertificateException"/> when the TLS certificate needs confirmation.</summary>
|
||||
public Task<ServerInfo> GetInfoAsync(CancellationToken ct = default) => GetAsync("api/v1/server/info", ProtocolJson.Default.ServerInfo, ct);
|
||||
/// <summary>
|
||||
/// Reads server info; throws <see cref="UntrustedCertificateException"/> when the TLS certificate of a Chronos Server
|
||||
/// needs confirmation, and <see cref="NotChronosServerException"/> when the address answers as something else (owner
|
||||
/// review 3). Behind a certificate that is not trusted yet, the info is first read once more without checking the
|
||||
/// certificate and without credentials: only an answer that is Chronos's leads to the fingerprint question, so the
|
||||
/// certificate of another service on the host is never offered for trust. Nothing is trusted here.
|
||||
/// </summary>
|
||||
public async Task<ServerInfo> GetInfoAsync(CancellationToken ct = default)
|
||||
{
|
||||
ServerInfo info;
|
||||
try
|
||||
{
|
||||
info = await GetAsync(InfoPath, ProtocolJson.Default.ServerInfo, ct).ConfigureAwait(false);
|
||||
}
|
||||
catch (UntrustedCertificateException) when (_ownsHandler)
|
||||
{
|
||||
if (await AnswersAsChronosAsync(ct).ConfigureAwait(false) == false) throw new NotChronosServerException(BaseAddress);
|
||||
throw;
|
||||
}
|
||||
catch (ChronosApiException api) when (!api.IsTransient && (int)api.Status < 500 && !IsChronosError(api.Error))
|
||||
{
|
||||
throw new NotChronosServerException(BaseAddress, api);
|
||||
}
|
||||
catch (Exception ex) when (ex is JsonException or NotSupportedException)
|
||||
{
|
||||
throw new NotChronosServerException(BaseAddress, ex);
|
||||
}
|
||||
return IsChronos(info) ? info : throw new NotChronosServerException(BaseAddress);
|
||||
}
|
||||
|
||||
private const string InfoPath = "api/v1/server/info";
|
||||
|
||||
/// <summary>What every Chronos Server's info holds; JSON of another shape reads as nulls and zeros.</summary>
|
||||
private static bool IsChronos(ServerInfo? info) =>
|
||||
info is { Name.Length: > 0, Version.Length: > 0, ApiVersion: > 0, Capabilities: not null, Formats: not null, Limits: not null };
|
||||
|
||||
/// <summary>An error body Chronos wrote (<see cref="EnsureSuccessAsync"/> codes any other reply <c>http_<status></c>).</summary>
|
||||
private static bool IsChronosError(ApiError error) => error.Code is { Length: > 0 } code && !code.StartsWith("http_", StringComparison.Ordinal);
|
||||
|
||||
/// <summary>
|
||||
/// The info read without checking the certificate, by a client of its own that holds no token: true when it is
|
||||
/// Chronos's, false when the address answers as something else, null when it cannot tell (no answer, busy).
|
||||
/// </summary>
|
||||
private async Task<bool?> AnswersAsChronosAsync(CancellationToken ct)
|
||||
{
|
||||
using var handler = new SocketsHttpHandler
|
||||
{
|
||||
SslOptions = { RemoteCertificateValidationCallback = static (_, _, _, _) => true },
|
||||
ConnectTimeout = TimeSpan.FromSeconds(10),
|
||||
AutomaticDecompression = DecompressionMethods.None,
|
||||
};
|
||||
using var http = new HttpClient(handler) { BaseAddress = BaseAddress, Timeout = TimeSpan.FromSeconds(20), MaxResponseContentBufferSize = 1 << 20 };
|
||||
http.DefaultRequestHeaders.Add(ApiVersion.Header, ApiVersion.Current.ToString(System.Globalization.CultureInfo.InvariantCulture));
|
||||
try
|
||||
{
|
||||
using var response = await http.GetAsync(InfoPath, ct).ConfigureAwait(false);
|
||||
if (response.IsSuccessStatusCode) return IsChronos(await response.Content.ReadFromJsonAsync(ProtocolJson.Default.ServerInfo, ct).ConfigureAwait(false));
|
||||
if ((int)response.StatusCode is < 400 or >= 500 || ChronosApiException.IsTransientStatus(response.StatusCode)) return null;
|
||||
var error = await response.Content.ReadFromJsonAsync(ProtocolJson.Default.ApiError, ct).ConfigureAwait(false);
|
||||
return error is not null && IsChronosError(error);
|
||||
}
|
||||
catch (Exception ex) when (ex is JsonException or NotSupportedException)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
catch (Exception ex) when (ex is HttpRequestException or IOException || (ex is OperationCanceledException && !ct.IsCancellationRequested))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------- Auth ----------------
|
||||
|
||||
|
||||
Reference in new issue
Block a user