Sync desktop with public relay and add verified device connection management
This commit is contained in:
1 parent
87e888af69
commit
51c4f86918
17 files changed
+1289
-118
No files matched your search
@@ -0,0 +1,115 @@
|
||||
using System.Net;
|
||||
using System.Net.Security;
|
||||
using System.Net.Sockets;
|
||||
using System.Security.Authentication;
|
||||
using System.Security.Cryptography;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
using Ads.Desktop;
|
||||
using Xunit;
|
||||
|
||||
namespace Ads.Desktop.Tests;
|
||||
|
||||
public class ConnectionTests
|
||||
{
|
||||
private const string Token = "client-test-token-that-is-at-least-32-characters";
|
||||
|
||||
[Theory]
|
||||
[InlineData("wss://ttstd.com/ads", "https://ttstd.com/ads/v1/devices")]
|
||||
[InlineData("wss://ttstd.com/ads/", "https://ttstd.com/ads/v1/devices")]
|
||||
[InlineData("wss://example.test:8443/prefix", "https://example.test:8443/prefix/v1/devices")]
|
||||
public void ApiPreservesPrefixAndPort(string server, string expected)
|
||||
{
|
||||
Assert.Equal(expected, RelayOptions.Parse(server, "", Token).DevicesUri.ToString());
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData("ws://ttstd.com/ads", "")]
|
||||
[InlineData("wss://user:password@ttstd.com", "")]
|
||||
[InlineData("wss://ttstd.com/ads?ticket=secret", "")]
|
||||
[InlineData("wss://ttstd.com/ads", "175.178.213.60")]
|
||||
[InlineData("wss://ttstd.com/ads", "example.test:443/extra")]
|
||||
public void UnsafeOrAmbiguousConfigurationIsRejected(string server, string origin)
|
||||
{
|
||||
Assert.Throws<InvalidOperationException>(() => RelayOptions.Parse(server, origin, Token));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void MigrateOldDefaultButPreserveCustomRelay()
|
||||
{
|
||||
var original = new DesktopSettings { Server = "wss://ads.ttstd.com" };
|
||||
original.Migrate();
|
||||
Assert.Equal(RelayOptions.DefaultServer, original.Server);
|
||||
Assert.Equal(RelayOptions.DefaultOrigin, original.Origin);
|
||||
var custom = new DesktopSettings { Server = "wss://private.example.test/path" };
|
||||
custom.Migrate();
|
||||
Assert.Equal("wss://private.example.test/path", custom.Server);
|
||||
Assert.Equal("", custom.Origin);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TokenIsAnEnvironmentValueNotACommandArgument()
|
||||
{
|
||||
var options = RelayOptions.Parse(RelayOptions.DefaultServer, RelayOptions.DefaultOrigin, Token);
|
||||
Assert.DoesNotContain(Token, options.ToString());
|
||||
Assert.DoesNotContain(Token, new ClientCredential(Token, null).ToString());
|
||||
var info = ProcessTools.ClientStartInfo("ads-client", "adb", options, "home-phone", "127.0.0.1:15555");
|
||||
Assert.Equal(Token, info.Environment["ADS_CLIENT_TOKEN"]);
|
||||
Assert.DoesNotContain(Token, info.ArgumentList);
|
||||
Assert.Contains("--connect-address", info.ArgumentList);
|
||||
Assert.Contains(RelayOptions.DefaultOrigin, info.ArgumentList);
|
||||
Assert.DoesNotContain("ADS_AGENT_TOKEN", info.Environment.Keys);
|
||||
Assert.DoesNotContain("ADB_SERVER_SOCKET", info.Environment.Keys);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ClientImportRejectsAgentRoleAndSettingsDoNotContainToken()
|
||||
{
|
||||
var folder = Path.Combine(DesktopPaths.ProjectRoot()!, "work", "desktop-tests", Guid.NewGuid().ToString("N"));
|
||||
Directory.CreateDirectory(folder);
|
||||
var agentFile = Path.Combine(folder, "agent.env");
|
||||
File.WriteAllText(agentFile, "ADS_AGENT_TOKEN=" + Token);
|
||||
Assert.Throws<InvalidOperationException>(() => ClientCredential.Read(agentFile));
|
||||
var clientFile = Path.Combine(folder, "client.env");
|
||||
File.WriteAllText(clientFile, "ADS_CLIENT_TOKEN=" + Token + "\nADS_CONNECT_ADDRESS=" + RelayOptions.DefaultOrigin);
|
||||
Assert.Equal(Token, ClientCredential.Read(clientFile).Token);
|
||||
var settingsFile = Path.Combine(folder, "settings.json");
|
||||
DesktopPaths.SaveSettings(settingsFile, new DesktopSettings { CredentialFile = clientFile });
|
||||
Assert.DoesNotContain(Token, File.ReadAllText(settingsFile));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task OriginOverrideStillRejectsAnUntrustedTlsCertificate()
|
||||
{
|
||||
using var key = RSA.Create(2048);
|
||||
var request = new CertificateRequest("CN=relay.example.test", key, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
|
||||
var names = new SubjectAlternativeNameBuilder(); names.AddDnsName("relay.example.test");
|
||||
request.CertificateExtensions.Add(names.Build());
|
||||
using var certificate = request.CreateSelfSigned(DateTimeOffset.UtcNow.AddMinutes(-1), DateTimeOffset.UtcNow.AddHours(1));
|
||||
var listener = new TcpListener(IPAddress.Loopback, 0);
|
||||
listener.Start();
|
||||
try
|
||||
{
|
||||
var port = ((IPEndPoint)listener.LocalEndpoint).Port;
|
||||
using var cancellation = new CancellationTokenSource(TimeSpan.FromSeconds(8));
|
||||
var peer = Task.Run(async () =>
|
||||
{
|
||||
using var socket = await listener.AcceptTcpClientAsync(cancellation.Token);
|
||||
using var tls = new SslStream(socket.GetStream());
|
||||
try
|
||||
{
|
||||
await tls.AuthenticateAsServerAsync(new SslServerAuthenticationOptions
|
||||
{
|
||||
ServerCertificate = certificate, EnabledSslProtocols = SslProtocols.Tls12 | SslProtocols.Tls13
|
||||
}, cancellation.Token);
|
||||
var buffer = new byte[1024];
|
||||
await tls.ReadAsync(buffer, cancellation.Token);
|
||||
}
|
||||
catch (Exception error) when (error is AuthenticationException or IOException or OperationCanceledException) { }
|
||||
});
|
||||
var options = RelayOptions.Parse("wss://relay.example.test/ads", $"127.0.0.1:{port}", Token);
|
||||
await Assert.ThrowsAsync<HttpRequestException>(() => RelayApi.GetDevicesAsync(options, cancellation.Token));
|
||||
await peer;
|
||||
}
|
||||
finally { listener.Stop(); }
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user