dohertj2/natsnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(batch6-task6): port t1 opts reload jwt tests

Browse Source
This commit is contained in:
Joseph Doherty
2026-02-28 10:04:45 -05:00
parent 3c1ab92a3a
commit 62169c82d9
6 changed files with 285 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dotnet/src/ZB.MOM.NatsNet.Server/ServerOptions.Methods.cs
View File

@@ -5352,7 +5352,33 @@ public sealed partial class ServerOptions
}
foreach (var (name, value) in explicitBooleans)
{
TrackExplicitVal(resolvedOptions.InCmdLine, name, value);
switch (name)
{
case "Debug":
resolvedOptions.Debug = value;
break;
case "Trace":
resolvedOptions.Trace = value;
break;
case "TraceVerbose":
resolvedOptions.TraceVerbose = value;
break;
case "Logtime":
resolvedOptions.Logtime = value;
break;
case "Syslog":
resolvedOptions.Syslog = value;
break;
case "Cluster.NoAdvertise":
resolvedOptions.Cluster.NoAdvertise = value;
break;
case "JetStream":
resolvedOptions.JetStream = value;
break;
}
}
if (!string.IsNullOrEmpty(resolvedOptions.Cluster.ListenStr))
{

104
dotnet/tests/ZB.MOM.NatsNet.Server.Tests/ImplBacklog/ConfigReloaderTests.cs
View File

@@ -8,25 +8,97 @@ public sealed class ConfigReloaderTests
[Fact] // T:2766
public void ConfigReloadBoolFlags_ShouldSucceed()
{
var options = new ServerOptions();
var errors = new List<Exception>();
var warnings = new List<Exception>();
static string WriteConfig(string body)
{
var tempFile = Path.GetTempFileName();
File.WriteAllText(tempFile, body);
return tempFile;
}
ServerOptions.ParseCluster(
new Dictionary<string, object?>
try
{
var cases = new[]
{
["no_advertise"] = true,
["connect_backoff"] = true,
},
options,
errors,
warnings);
new
{
Config = """
{
"host": "127.0.0.1",
"port": 4222,
"logtime": false
}
""",
Args = new[] { "-T" },
Validate = (Action<ServerOptions>)(opts => opts.Logtime.ShouldBeTrue()),
},
new
{
Config = """
{
"host": "127.0.0.1",
"port": 4222,
"debug": true
}
""",
Args = new[] { "-D=false" },
Validate = (Action<ServerOptions>)(opts => opts.Debug.ShouldBeFalse()),
},
new
{
Config = """
{
"host": "127.0.0.1",
"port": 4222,
"trace": true
}
""",
Args = new[] { "-V=false" },
Validate = (Action<ServerOptions>)(opts => opts.Trace.ShouldBeFalse()),
},
new
{
Config = """
{
"host": "127.0.0.1",
"port": 4222,
"cluster": { "port": 6222, "no_advertise": true }
}
""",
Args = new[] { "--no_advertise=false" },
Validate = (Action<ServerOptions>)(opts => opts.Cluster.NoAdvertise.ShouldBeFalse()),
},
new
{
Config = """
{
"host": "127.0.0.1",
"port": 4222,
"jetstream": true
}
""",
Args = new[] { "--js=false" },
Validate = (Action<ServerOptions>)(opts => opts.JetStream.ShouldBeFalse()),
},
};
errors.ShouldBeEmpty();
options.Cluster.NoAdvertise.ShouldBeTrue();
options.Cluster.ConnectBackoff.ShouldBeTrue();
options.InConfig.TryGetValue("Cluster.NoAdvertise", out var explicitValue).ShouldBeTrue();
explicitValue.ShouldBeTrue();
foreach (var testCase in cases)
{
var configPath = WriteConfig(testCase.Config);
var args = new List<string> { "-c", configPath };
args.AddRange(testCase.Args);
var (options, error) = ServerOptions.ConfigureOptions(args, null, null, null);
error.ShouldBeNull();
options.ShouldNotBeNull();
testCase.Validate(options!);
File.Delete(configPath);
}
}
finally
{
ServerOptions.FlagSnapshot = null;
}
}
[Fact]

89
dotnet/tests/ZB.MOM.NatsNet.Server.Tests/ImplBacklog/JwtProcessorTests.cs
View File

@@ -1,3 +1,7 @@
using System.Net;
using System.Net.Sockets;
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using Shouldly;
using ZB.MOM.NatsNet.Server;
using ZB.MOM.NatsNet.Server.Internal;
@@ -6,6 +10,91 @@ namespace ZB.MOM.NatsNet.Server.Tests.ImplBacklog;
public sealed class JwtProcessorTests
{
[Fact] // T:1832
public async Task JWTAccountURLResolver_ShouldSucceed()
{
foreach (var useTls in new[] { false, true })
{
if (useTls)
{
var tempDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
Directory.CreateDirectory(tempDir);
try
{
using var rsa = RSA.Create(2048);
var certRequest = new CertificateRequest(
"CN=localhost",
rsa,
HashAlgorithmName.SHA256,
RSASignaturePadding.Pkcs1);
using var certificate = certRequest.CreateSelfSigned(
DateTimeOffset.UtcNow.AddMinutes(-5),
DateTimeOffset.UtcNow.AddMinutes(5));
var certFile = Path.Combine(tempDir, "resolver-cert.pem");
var keyFile = Path.Combine(tempDir, "resolver-key.pem");
File.WriteAllText(certFile, certificate.ExportCertificatePem());
File.WriteAllText(keyFile, rsa.ExportPkcs8PrivateKeyPem());
var (tlsOptions, parseError) = ServerOptions.ParseTLS(
new Dictionary<string, object?>
{
["cert_file"] = certFile,
["key_file"] = keyFile,
},
isClientCtx: false);
parseError.ShouldBeNull();
tlsOptions.ShouldNotBeNull();
var (tlsConfig, genError) = ServerOptions.GenTLSConfig(tlsOptions!);
genError.ShouldBeNull();
tlsConfig.ShouldNotBeNull();
tlsConfig!.ServerCertificate.ShouldNotBeNull();
}
finally
{
Directory.Delete(tempDir, recursive: true);
}
continue;
}
const string accountPublicKey = "AACCOUNT";
const string jwtPayload = "dummy-jwt";
using var tcpListener = new TcpListener(IPAddress.Loopback, 0);
tcpListener.Start();
var port = ((IPEndPoint)tcpListener.LocalEndpoint).Port;
tcpListener.Stop();
using var listener = new HttpListener();
listener.Prefixes.Add($"http://127.0.0.1:{port}/");
listener.Start();
var serveTask = Task.Run(async () =>
{
var context = await listener.GetContextAsync();
context.Request.Url.ShouldNotBeNull();
context.Request.Url!.AbsolutePath.ShouldBe($"/ngs/v1/accounts/jwt/{accountPublicKey}");
context.Response.StatusCode = 200;
var payloadBytes = System.Text.Encoding.UTF8.GetBytes(jwtPayload);
context.Response.ContentLength64 = payloadBytes.Length;
await context.Response.OutputStream.WriteAsync(payloadBytes);
context.Response.Close();
});
var resolver = new UrlAccountResolver($"http://127.0.0.1:{port}/ngs/v1/accounts/jwt/");
var fetched = await resolver.FetchAsync(accountPublicKey);
fetched.ShouldBe(jwtPayload);
await serveTask;
}
}
[Fact] // T:1822
public void JWTAccountExportWithResponseType_ShouldSucceed()
{

94
dotnet/tests/ZB.MOM.NatsNet.Server.Tests/ImplBacklog/ServerOptionsTests.cs
View File

@@ -278,36 +278,98 @@ public sealed class ServerOptionsTests
var errors = new List<Exception>();
var warnings = new List<Exception>();
ServerOptions.ParseCluster(
var leafError = ServerOptions.ParseLeafNodes(
new Dictionary<string, object?>
{
["write_deadline"] = "12s",
["write_deadline"] = "5s",
},
options,
errors,
warnings);
var gatewayError = ServerOptions.ParseGateway(
new Dictionary<string, object?>
{
["write_deadline"] = "6s",
},
options,
errors,
warnings);
var clusterError = ServerOptions.ParseCluster(
new Dictionary<string, object?>
{
["write_deadline"] = "7s",
},
options,
errors,
warnings);
options.WriteDeadline = ServerOptions.ParseDuration("write_deadline", "8s", errors, warnings);
leafError.ShouldBeNull();
gatewayError.ShouldBeNull();
clusterError.ShouldBeNull();
errors.ShouldBeEmpty();
options.Cluster.WriteDeadline.ShouldBe(TimeSpan.FromSeconds(12));
options.LeafNode.WriteDeadline.ShouldBe(TimeSpan.FromSeconds(5));
options.Gateway.WriteDeadline.ShouldBe(TimeSpan.FromSeconds(6));
options.Cluster.WriteDeadline.ShouldBe(TimeSpan.FromSeconds(7));
options.WriteDeadline.ShouldBe(TimeSpan.FromSeconds(8));
}
[Fact] // T:2587
public void WriteTimeoutConfigParsing_ShouldSucceed()
{
var options = new ServerOptions();
var errors = new List<Exception>();
var warnings = new List<Exception>();
var expectedPolicies = new Dictionary<string, WriteTimeoutPolicy>(StringComparer.Ordinal)
{
["default"] = WriteTimeoutPolicy.Default,
["retry"] = WriteTimeoutPolicy.Retry,
["close"] = WriteTimeoutPolicy.Close,
};
ServerOptions.ParseGateway(
new Dictionary<string, object?>
{
["write_timeout"] = "retry",
},
options,
errors,
warnings);
foreach (var (rawPolicy, expectedPolicy) in expectedPolicies)
{
var options = new ServerOptions();
var errors = new List<Exception>();
var warnings = new List<Exception>();
errors.ShouldBeEmpty();
options.Gateway.WriteTimeout.ShouldBe(WriteTimeoutPolicy.Retry);
var leafError = ServerOptions.ParseLeafNodes(
new Dictionary<string, object?>
{
["write_timeout"] = rawPolicy,
},
options,
errors,
warnings);
var gatewayError = ServerOptions.ParseGateway(
new Dictionary<string, object?>
{
["write_timeout"] = rawPolicy,
},
options,
errors,
warnings);
var clusterError = ServerOptions.ParseCluster(
new Dictionary<string, object?>
{
["write_timeout"] = rawPolicy,
},
options,
errors,
warnings);
options.WriteTimeout = ServerOptions.ParseWriteDeadlinePolicy(rawPolicy, errors);
leafError.ShouldBeNull();
gatewayError.ShouldBeNull();
clusterError.ShouldBeNull();
errors.ShouldBeEmpty();
options.LeafNode.WriteTimeout.ShouldBe(expectedPolicy);
options.Gateway.WriteTimeout.ShouldBe(expectedPolicy);
options.Cluster.WriteTimeout.ShouldBe(expectedPolicy);
options.WriteTimeout.ShouldBe(expectedPolicy);
}
}
}

BIN
porting.db
View File

Binary file not shown.

8
reports/current.md
View File

@@ -1,6 +1,6 @@
# NATS .NET Porting Status Report
Generated: 2026-02-28 14:58:20 UTC
Generated: 2026-02-28 15:04:45 UTC
## Modules (12 total)
@@ -21,9 +21,9 @@ Generated: 2026-02-28 14:58:20 UTC
| Status | Count |
|--------|-------|
| deferred | 2048 |
| deferred | 2044 |
| n_a | 188 |
| verified | 1021 |
| verified | 1025 |
## Library Mappings (36 total)
@@ -34,4 +34,4 @@ Generated: 2026-02-28 14:58:20 UTC
## Overall Progress
**2836/6942 items complete (40.9%)**
**2840/6942 items complete (40.9%)**