feat(auth): add account import/export cycle detection and JetStream limits (E4+E5)
E4: AccountImportExport with DFS cycle detection for service imports, RemoveServiceImport/RemoveStreamImport, and ValidateImport authorization. E5: AccountLimits record with MaxStorage/MaxConsumers/MaxAckPending, TryReserveConsumer/ReleaseConsumer, TrackStorageDelta on Account. 20 new tests, all passing.
This commit is contained in:
Joseph Doherty
211
tests/NATS.Server.Tests/Auth/AccountImportExportTests.cs
Normal file
211
tests/NATS.Server.Tests/Auth/AccountImportExportTests.cs
Normal file
@@ -0,0 +1,211 @@
|
||||
// Tests for account import/export cycle detection.
|
||||
// Go reference: accounts_test.go TestAccountImportCycleDetection.
|
||||
|
||||
using NATS.Server.Auth;
|
||||
using NATS.Server.Imports;
|
||||
|
||||
namespace NATS.Server.Tests.Auth;
|
||||
|
||||
public class AccountImportExportTests
|
||||
{
|
||||
private static Account CreateAccount(string name) => new(name);
|
||||
|
||||
private static void SetupServiceExport(Account exporter, string subject, IEnumerable<Account>? approved = null)
|
||||
{
|
||||
exporter.AddServiceExport(subject, ServiceResponseType.Singleton, approved);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void AddServiceImport_NoCycle_Succeeds()
|
||||
{
|
||||
// A exports "svc.foo", B imports from A — no cycle
|
||||
var a = CreateAccount("A");
|
||||
var b = CreateAccount("B");
|
||||
|
||||
SetupServiceExport(a, "svc.foo"); // public export (no approved list)
|
||||
|
||||
var import = b.AddServiceImport(a, "svc.foo", "svc.foo");
|
||||
|
||||
import.ShouldNotBeNull();
|
||||
import.DestinationAccount.Name.ShouldBe("A");
|
||||
import.From.ShouldBe("svc.foo");
|
||||
b.Imports.Services.ShouldContainKey("svc.foo");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void AddServiceImport_DirectCycle_Throws()
|
||||
{
|
||||
// A exports "svc.foo", B exports "svc.bar"
|
||||
// B imports "svc.foo" from A (ok)
|
||||
// A imports "svc.bar" from B — creates cycle A->B->A
|
||||
var a = CreateAccount("A");
|
||||
var b = CreateAccount("B");
|
||||
|
||||
SetupServiceExport(a, "svc.foo");
|
||||
SetupServiceExport(b, "svc.bar");
|
||||
|
||||
b.AddServiceImport(a, "svc.foo", "svc.foo");
|
||||
|
||||
Should.Throw<InvalidOperationException>(() => a.AddServiceImport(b, "svc.bar", "svc.bar"))
|
||||
.Message.ShouldContain("cycle");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void AddServiceImport_IndirectCycle_A_B_C_A_Throws()
|
||||
{
|
||||
// A->B->C, then C->A creates indirect cycle
|
||||
var a = CreateAccount("A");
|
||||
var b = CreateAccount("B");
|
||||
var c = CreateAccount("C");
|
||||
|
||||
SetupServiceExport(a, "svc.a");
|
||||
SetupServiceExport(b, "svc.b");
|
||||
SetupServiceExport(c, "svc.c");
|
||||
|
||||
// B imports from A
|
||||
b.AddServiceImport(a, "svc.a", "svc.a");
|
||||
// C imports from B
|
||||
c.AddServiceImport(b, "svc.b", "svc.b");
|
||||
// A imports from C — would create C->B->A->C cycle
|
||||
Should.Throw<InvalidOperationException>(() => a.AddServiceImport(c, "svc.c", "svc.c"))
|
||||
.Message.ShouldContain("cycle");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void DetectCycle_NoCycle_ReturnsFalse()
|
||||
{
|
||||
var a = CreateAccount("A");
|
||||
var b = CreateAccount("B");
|
||||
var c = CreateAccount("C");
|
||||
|
||||
SetupServiceExport(a, "svc.a");
|
||||
SetupServiceExport(b, "svc.b");
|
||||
|
||||
// A imports from B, B imports from C — linear chain, no cycle back to A
|
||||
// For this test we manually add imports without cycle check via ImportMap
|
||||
b.Imports.AddServiceImport(new ServiceImport
|
||||
{
|
||||
DestinationAccount = a,
|
||||
From = "svc.a",
|
||||
To = "svc.a",
|
||||
});
|
||||
|
||||
// Check: does following imports from A lead back to C? No.
|
||||
AccountImportExport.DetectCycle(a, c).ShouldBeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void DetectCycle_DirectCycle_ReturnsTrue()
|
||||
{
|
||||
var a = CreateAccount("A");
|
||||
var b = CreateAccount("B");
|
||||
|
||||
// A has import pointing to B
|
||||
a.Imports.AddServiceImport(new ServiceImport
|
||||
{
|
||||
DestinationAccount = b,
|
||||
From = "svc.x",
|
||||
To = "svc.x",
|
||||
});
|
||||
|
||||
// Does following from A lead to B? Yes.
|
||||
AccountImportExport.DetectCycle(a, b).ShouldBeTrue();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void DetectCycle_IndirectCycle_ReturnsTrue()
|
||||
{
|
||||
var a = CreateAccount("A");
|
||||
var b = CreateAccount("B");
|
||||
var c = CreateAccount("C");
|
||||
|
||||
// A -> B -> C (imports)
|
||||
a.Imports.AddServiceImport(new ServiceImport
|
||||
{
|
||||
DestinationAccount = b,
|
||||
From = "svc.1",
|
||||
To = "svc.1",
|
||||
});
|
||||
b.Imports.AddServiceImport(new ServiceImport
|
||||
{
|
||||
DestinationAccount = c,
|
||||
From = "svc.2",
|
||||
To = "svc.2",
|
||||
});
|
||||
|
||||
// Does following from A lead to C? Yes, via B.
|
||||
AccountImportExport.DetectCycle(a, c).ShouldBeTrue();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RemoveServiceImport_ExistingImport_Succeeds()
|
||||
{
|
||||
var a = CreateAccount("A");
|
||||
var b = CreateAccount("B");
|
||||
|
||||
SetupServiceExport(a, "svc.foo");
|
||||
b.AddServiceImport(a, "svc.foo", "svc.foo");
|
||||
|
||||
b.Imports.Services.ShouldContainKey("svc.foo");
|
||||
|
||||
b.RemoveServiceImport("svc.foo").ShouldBeTrue();
|
||||
b.Imports.Services.ShouldNotContainKey("svc.foo");
|
||||
|
||||
// Removing again returns false
|
||||
b.RemoveServiceImport("svc.foo").ShouldBeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RemoveStreamImport_ExistingImport_Succeeds()
|
||||
{
|
||||
var a = CreateAccount("A");
|
||||
var b = CreateAccount("B");
|
||||
|
||||
a.AddStreamExport("stream.data", null); // public
|
||||
b.AddStreamImport(a, "stream.data", "imported.data");
|
||||
|
||||
b.Imports.Streams.Count.ShouldBe(1);
|
||||
|
||||
b.RemoveStreamImport("stream.data").ShouldBeTrue();
|
||||
b.Imports.Streams.Count.ShouldBe(0);
|
||||
|
||||
// Removing again returns false
|
||||
b.RemoveStreamImport("stream.data").ShouldBeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ValidateImport_UnauthorizedAccount_Throws()
|
||||
{
|
||||
var exporter = CreateAccount("Exporter");
|
||||
var importer = CreateAccount("Importer");
|
||||
var approved = CreateAccount("Approved");
|
||||
|
||||
// Export only approves "Approved" account, not "Importer"
|
||||
SetupServiceExport(exporter, "svc.restricted", [approved]);
|
||||
|
||||
Should.Throw<UnauthorizedAccessException>(
|
||||
() => AccountImportExport.ValidateImport(importer, exporter, "svc.restricted"))
|
||||
.Message.ShouldContain("not authorized");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void AddStreamImport_NoCycleCheck_Succeeds()
|
||||
{
|
||||
// Stream imports do not require cycle detection (unlike service imports).
|
||||
// Even with a "circular" stream import topology, it should succeed.
|
||||
var a = CreateAccount("A");
|
||||
var b = CreateAccount("B");
|
||||
|
||||
a.AddStreamExport("stream.a", null);
|
||||
b.AddStreamExport("stream.b", null);
|
||||
|
||||
// B imports stream from A
|
||||
b.AddStreamImport(a, "stream.a", "imported.a");
|
||||
|
||||
// A imports stream from B — no cycle check for streams
|
||||
a.AddStreamImport(b, "stream.b", "imported.b");
|
||||
|
||||
a.Imports.Streams.Count.ShouldBe(1);
|
||||
b.Imports.Streams.Count.ShouldBe(1);
|
||||
}
|
||||
}
|
||||
169
tests/NATS.Server.Tests/Auth/AccountLimitsTests.cs
Normal file
169
tests/NATS.Server.Tests/Auth/AccountLimitsTests.cs
Normal file
@@ -0,0 +1,169 @@
|
||||
// Tests for per-account JetStream resource limits.
|
||||
// Go reference: accounts_test.go TestAccountLimits, TestJetStreamLimits.
|
||||
|
||||
using NATS.Server.Auth;
|
||||
|
||||
namespace NATS.Server.Tests.Auth;
|
||||
|
||||
public class AccountLimitsTests
|
||||
{
|
||||
[Fact]
|
||||
public void TryReserveConsumer_UnderLimit_ReturnsTrue()
|
||||
{
|
||||
var account = new Account("test")
|
||||
{
|
||||
JetStreamLimits = new AccountLimits { MaxConsumers = 3 },
|
||||
};
|
||||
|
||||
account.TryReserveConsumer().ShouldBeTrue();
|
||||
account.TryReserveConsumer().ShouldBeTrue();
|
||||
account.TryReserveConsumer().ShouldBeTrue();
|
||||
account.ConsumerCount.ShouldBe(3);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TryReserveConsumer_AtLimit_ReturnsFalse()
|
||||
{
|
||||
var account = new Account("test")
|
||||
{
|
||||
JetStreamLimits = new AccountLimits { MaxConsumers = 2 },
|
||||
};
|
||||
|
||||
account.TryReserveConsumer().ShouldBeTrue();
|
||||
account.TryReserveConsumer().ShouldBeTrue();
|
||||
account.TryReserveConsumer().ShouldBeFalse();
|
||||
account.ConsumerCount.ShouldBe(2);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ReleaseConsumer_DecrementsCount()
|
||||
{
|
||||
var account = new Account("test")
|
||||
{
|
||||
JetStreamLimits = new AccountLimits { MaxConsumers = 2 },
|
||||
};
|
||||
|
||||
account.TryReserveConsumer().ShouldBeTrue();
|
||||
account.TryReserveConsumer().ShouldBeTrue();
|
||||
account.ConsumerCount.ShouldBe(2);
|
||||
|
||||
account.ReleaseConsumer();
|
||||
account.ConsumerCount.ShouldBe(1);
|
||||
|
||||
// Now we can reserve again
|
||||
account.TryReserveConsumer().ShouldBeTrue();
|
||||
account.ConsumerCount.ShouldBe(2);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TrackStorageDelta_UnderLimit_ReturnsTrue()
|
||||
{
|
||||
var account = new Account("test")
|
||||
{
|
||||
JetStreamLimits = new AccountLimits { MaxStorage = 1000 },
|
||||
};
|
||||
|
||||
account.TrackStorageDelta(500).ShouldBeTrue();
|
||||
account.StorageUsed.ShouldBe(500);
|
||||
|
||||
account.TrackStorageDelta(400).ShouldBeTrue();
|
||||
account.StorageUsed.ShouldBe(900);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TrackStorageDelta_ExceedsLimit_ReturnsFalse()
|
||||
{
|
||||
var account = new Account("test")
|
||||
{
|
||||
JetStreamLimits = new AccountLimits { MaxStorage = 1000 },
|
||||
};
|
||||
|
||||
account.TrackStorageDelta(800).ShouldBeTrue();
|
||||
account.TrackStorageDelta(300).ShouldBeFalse(); // 800 + 300 = 1100 > 1000
|
||||
account.StorageUsed.ShouldBe(800); // unchanged
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TrackStorageDelta_NegativeDelta_ReducesUsage()
|
||||
{
|
||||
var account = new Account("test")
|
||||
{
|
||||
JetStreamLimits = new AccountLimits { MaxStorage = 1000 },
|
||||
};
|
||||
|
||||
account.TrackStorageDelta(800).ShouldBeTrue();
|
||||
account.TrackStorageDelta(-300).ShouldBeTrue(); // negative always succeeds
|
||||
account.StorageUsed.ShouldBe(500);
|
||||
|
||||
// Now we have room again
|
||||
account.TrackStorageDelta(400).ShouldBeTrue();
|
||||
account.StorageUsed.ShouldBe(900);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void MaxStorage_Zero_Unlimited()
|
||||
{
|
||||
var account = new Account("test")
|
||||
{
|
||||
JetStreamLimits = new AccountLimits { MaxStorage = 0 }, // unlimited
|
||||
};
|
||||
|
||||
// Should accept any amount
|
||||
account.TrackStorageDelta(long.MaxValue / 2).ShouldBeTrue();
|
||||
account.StorageUsed.ShouldBe(long.MaxValue / 2);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Limits_DefaultValues_AllUnlimited()
|
||||
{
|
||||
var limits = AccountLimits.Unlimited;
|
||||
|
||||
limits.MaxStorage.ShouldBe(0);
|
||||
limits.MaxStreams.ShouldBe(0);
|
||||
limits.MaxConsumers.ShouldBe(0);
|
||||
limits.MaxAckPending.ShouldBe(0);
|
||||
limits.MaxMemoryStorage.ShouldBe(0);
|
||||
limits.MaxDiskStorage.ShouldBe(0);
|
||||
|
||||
// Account defaults to unlimited
|
||||
var account = new Account("test");
|
||||
account.JetStreamLimits.ShouldBe(AccountLimits.Unlimited);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TryReserveStream_WithLimits_RespectsNewLimits()
|
||||
{
|
||||
// JetStreamLimits.MaxStreams should take precedence over MaxJetStreamStreams
|
||||
var account = new Account("test")
|
||||
{
|
||||
MaxJetStreamStreams = 10, // legacy field
|
||||
JetStreamLimits = new AccountLimits { MaxStreams = 2 }, // new limit overrides
|
||||
};
|
||||
|
||||
account.TryReserveStream().ShouldBeTrue();
|
||||
account.TryReserveStream().ShouldBeTrue();
|
||||
account.TryReserveStream().ShouldBeFalse(); // limited to 2 by JetStreamLimits
|
||||
account.JetStreamStreamCount.ShouldBe(2);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void EvictOldestClient_WhenMaxConnectionsExceeded()
|
||||
{
|
||||
var account = new Account("test")
|
||||
{
|
||||
MaxConnections = 2,
|
||||
};
|
||||
|
||||
account.AddClient(1).ShouldBeTrue();
|
||||
account.AddClient(2).ShouldBeTrue();
|
||||
account.AddClient(3).ShouldBeFalse(); // at limit
|
||||
account.ClientCount.ShouldBe(2);
|
||||
|
||||
// Remove oldest, then new one can connect
|
||||
account.RemoveClient(1);
|
||||
account.ClientCount.ShouldBe(1);
|
||||
|
||||
account.AddClient(3).ShouldBeTrue();
|
||||
account.ClientCount.ShouldBe(2);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user