Harden endpoint reachability resolution
This commit is contained in:
@@ -29,9 +29,13 @@ namespace BizTalkCheckmkPulse.Tests
|
||||
Run("SendPortAllowlistSeparatesExpectedState", SendPortAllowlistSeparatesExpectedState);
|
||||
Run("ArtifactSummaryIsBounded", ArtifactSummaryIsBounded);
|
||||
Run("EndpointAddressesResolveWithoutSecrets", EndpointAddressesResolveWithoutSecrets);
|
||||
Run("AdapterSpecificEndpointAddressesResolve", AdapterSpecificEndpointAddressesResolve);
|
||||
Run("EndpointClassificationSeparatesExpectedAndUnresolved", EndpointClassificationSeparatesExpectedAndUnresolved);
|
||||
Run("EndpointCatalogPreservesManualOverrides", EndpointCatalogPreservesManualOverrides);
|
||||
Run("EndpointRuntimeUsesCurrentAddressAndManualOverrides", EndpointRuntimeUsesCurrentAddressAndManualOverrides);
|
||||
Run("EndpointCatalogRoundTrip", EndpointCatalogRoundTrip);
|
||||
Run("EndpointOutputListsOnlyUnavailableTargets", EndpointOutputListsOnlyUnavailableTargets);
|
||||
Run("EndpointOutputExplainsOnlyRealResolutionGaps", EndpointOutputExplainsOnlyRealResolutionGaps);
|
||||
Run("EndpointProbeBudgetFitsMinuteInterval", EndpointProbeBudgetFitsMinuteInterval);
|
||||
Run("InstallerUpdatePreservesExistingSettings", InstallerUpdatePreservesExistingSettings);
|
||||
Run("SnapshotRoundTripPreservesLines", SnapshotRoundTripPreservesLines);
|
||||
@@ -368,9 +372,94 @@ namespace BizTalkCheckmkPulse.Tests
|
||||
|
||||
candidate.Address = "/Orders/Receive.svc";
|
||||
candidate.AdapterName = "WCF-CustomIsolated";
|
||||
candidate.ArtifactType = "ReceiveLocation";
|
||||
candidate.TransportRole = "Inbound";
|
||||
Assert(!EndpointAddressParser.IsPotentialExternalEndpoint(candidate), "relative local receive address must not cause UNKNOWN");
|
||||
}
|
||||
|
||||
private static void AdapterSpecificEndpointAddressesResolve()
|
||||
{
|
||||
EndpointCatalogEntry endpoint;
|
||||
string reason;
|
||||
var candidate = new EndpointCandidate
|
||||
{
|
||||
ArtifactType = "SendPort",
|
||||
ApplicationName = "Orders",
|
||||
ArtifactName = "SP SQL",
|
||||
TransportRole = "Primary",
|
||||
AdapterName = "WCF-Custom",
|
||||
Address = "mssql://sql01/INSTANCE/Orders",
|
||||
Active = true
|
||||
};
|
||||
|
||||
Assert(EndpointAddressParser.TryCreate(candidate, out endpoint, out reason), "WCF-SQL URI should resolve: " + reason);
|
||||
AssertEqual("sql01", endpoint.Host, "WCF-SQL host");
|
||||
AssertEqual(1433, endpoint.Port, "WCF-SQL default port");
|
||||
|
||||
candidate.Address = "mssql://sql01:15433/INSTANCE/Orders";
|
||||
Assert(EndpointAddressParser.TryCreate(candidate, out endpoint, out reason), "WCF-SQL explicit port should resolve: " + reason);
|
||||
AssertEqual(15433, endpoint.Port, "WCF-SQL explicit port");
|
||||
|
||||
candidate.Address = "net.tcp://service01/Orders";
|
||||
candidate.AdapterName = "WCF-NetTcp";
|
||||
Assert(EndpointAddressParser.TryCreate(candidate, out endpoint, out reason), "net.tcp URI should resolve: " + reason);
|
||||
AssertEqual(808, endpoint.Port, "net.tcp default port");
|
||||
|
||||
candidate.Address = "oracledb://oracle01/ORDERS/Dedicated";
|
||||
candidate.AdapterName = "WCF-OracleDB";
|
||||
Assert(EndpointAddressParser.TryCreate(candidate, out endpoint, out reason), "direct Oracle DB URI should resolve: " + reason);
|
||||
AssertEqual("oracle01", endpoint.Host, "Oracle DB host");
|
||||
AssertEqual(1521, endpoint.Port, "Oracle DB default port");
|
||||
|
||||
candidate.Address = "oracledb://ORDERS_TNS";
|
||||
Assert(!EndpointAddressParser.TryCreate(candidate, out endpoint, out reason), "tnsnames alias must not be guessed as DNS host");
|
||||
|
||||
candidate.ArtifactType = "ReceiveLocation";
|
||||
candidate.TransportRole = "Inbound";
|
||||
candidate.Address = "http://+:8080/Orders";
|
||||
candidate.AdapterName = "WCF-WebHttp";
|
||||
Assert(EndpointAddressParser.TryCreate(candidate, out endpoint, out reason), "wildcard listener should resolve: " + reason);
|
||||
AssertEqual("127.0.0.1", endpoint.Host, "wildcard listener loopback host");
|
||||
AssertEqual(8080, endpoint.Port, "wildcard listener port");
|
||||
}
|
||||
|
||||
private static void EndpointClassificationSeparatesExpectedAndUnresolved()
|
||||
{
|
||||
var candidate = new EndpointCandidate
|
||||
{
|
||||
ArtifactType = "ReceiveLocation",
|
||||
ApplicationName = "Orders",
|
||||
ArtifactName = "RL HTTP",
|
||||
TransportRole = "Inbound",
|
||||
AdapterName = "WCF-CustomIsolated",
|
||||
Address = "/Orders/Receive.svc",
|
||||
Active = true
|
||||
};
|
||||
AssertEqual(
|
||||
EndpointResolutionStatus.ExpectedNonProbeable,
|
||||
EndpointAddressParser.Analyze(candidate).Status,
|
||||
"relative listener classification");
|
||||
|
||||
candidate.ArtifactType = "SendPort";
|
||||
candidate.TransportRole = "Primary";
|
||||
AssertEqual(
|
||||
EndpointResolutionStatus.Unresolved,
|
||||
EndpointAddressParser.Analyze(candidate).Status,
|
||||
"relative outbound address classification");
|
||||
|
||||
candidate.Address = "http://+:8080/Orders";
|
||||
AssertEqual(
|
||||
EndpointResolutionStatus.Unresolved,
|
||||
EndpointAddressParser.Analyze(candidate).Status,
|
||||
"outbound wildcard must not become a loopback target");
|
||||
|
||||
candidate.Dynamic = true;
|
||||
AssertEqual(
|
||||
EndpointResolutionStatus.ExpectedNonProbeable,
|
||||
EndpointAddressParser.Analyze(candidate).Status,
|
||||
"dynamic send port classification");
|
||||
}
|
||||
|
||||
private static void EndpointCatalogPreservesManualOverrides()
|
||||
{
|
||||
var candidate = new EndpointCandidate
|
||||
@@ -417,6 +506,42 @@ namespace BizTalkCheckmkPulse.Tests
|
||||
Assert(synchronized.Entries.All(x => x.ArtifactName != "RL Disabled"), "inactive receive location must not be added");
|
||||
}
|
||||
|
||||
private static void EndpointRuntimeUsesCurrentAddressAndManualOverrides()
|
||||
{
|
||||
var candidate = new EndpointCandidate
|
||||
{
|
||||
ArtifactType = "SendPort",
|
||||
ApplicationName = "Orders",
|
||||
ArtifactName = "SP Orders",
|
||||
TransportRole = "Primary",
|
||||
AdapterName = "WCF-Custom",
|
||||
Address = "https://new.example.test/orders",
|
||||
Active = true
|
||||
};
|
||||
var catalog = new EndpointCatalog();
|
||||
var stale = TestEndpoint("SP Orders", "old.example.test");
|
||||
stale.Key = candidate.Key;
|
||||
catalog.Entries.Add(stale);
|
||||
var state = new EndpointConnectivityState();
|
||||
var selected = EndpointConnectivityProbe.ResolveActiveEndpoints(catalog, new[] { candidate }, state);
|
||||
AssertEqual(1, selected.Length, "current endpoint selection count");
|
||||
AssertEqual("new.example.test", selected[0].Host, "current WMI address must replace stale catalog target");
|
||||
|
||||
candidate.Address = "adapter-specific-target-without-port";
|
||||
var manual = TestEndpoint("SP Orders", "manual.example.test");
|
||||
manual.Key = candidate.Key;
|
||||
manual.AutoDiscovered = false;
|
||||
manual.Port = 7443;
|
||||
catalog.Entries.Clear();
|
||||
catalog.Entries.Add(manual);
|
||||
state = new EndpointConnectivityState();
|
||||
selected = EndpointConnectivityProbe.ResolveActiveEndpoints(catalog, new[] { candidate }, state);
|
||||
AssertEqual(1, selected.Length, "manual endpoint selection count");
|
||||
AssertEqual("manual.example.test", selected[0].Host, "manual override host");
|
||||
AssertEqual(0, state.UnresolvedActive, "manual override must close resolution gap");
|
||||
AssertEqual(1, state.ManualOverridesActive, "manual override metric");
|
||||
}
|
||||
|
||||
private static void EndpointOutputListsOnlyUnavailableTargets()
|
||||
{
|
||||
var result = new ProbeResult();
|
||||
@@ -445,6 +570,27 @@ namespace BizTalkCheckmkPulse.Tests
|
||||
Assert(line.IndexOf("up.example.test", StringComparison.Ordinal) < 0, "reachable host must not clutter output");
|
||||
}
|
||||
|
||||
private static void EndpointOutputExplainsOnlyRealResolutionGaps()
|
||||
{
|
||||
var result = new ProbeResult();
|
||||
result.EndpointConnectivity.RuntimeStateAvailable = true;
|
||||
result.EndpointConnectivity.CatalogAvailable = true;
|
||||
result.EndpointConnectivity.RefreshSucceeded = true;
|
||||
result.EndpointConnectivity.ExpectedNonProbeableActive = 4;
|
||||
var line = FindServiceLine(result, "Endpoint Reachability");
|
||||
Assert(line.StartsWith("0 \"BizTalk Endpoint Reachability\"", StringComparison.Ordinal), "expected non-socket endpoints must remain OK");
|
||||
Assert(line.Contains("biztalk_endpoints_expected_non_socket=4"), "expected non-socket metric missing");
|
||||
Assert(line.IndexOf("unsupported", StringComparison.OrdinalIgnoreCase) < 0, "legacy unsupported wording must not be emitted");
|
||||
|
||||
result.EndpointConnectivity.UnresolvedActive = 1;
|
||||
result.EndpointConnectivity.ResolutionIssues.Add(
|
||||
"endpoint=SendPort:Orders\\SP Custom[Primary] adapter=WCF-Custom reason=Schema ohne Port");
|
||||
line = FindServiceLine(result, "Endpoint Reachability");
|
||||
Assert(line.StartsWith("3 \"BizTalk Endpoint Reachability\"", StringComparison.Ordinal), "real resolution gap must be UNKNOWN");
|
||||
Assert(line.Contains("unresolved_endpoints="), "resolution issue list missing");
|
||||
Assert(line.Contains("SP Custom"), "resolution issue artifact missing");
|
||||
}
|
||||
|
||||
private static void EndpointCatalogRoundTrip()
|
||||
{
|
||||
var directory = Path.Combine(Path.GetTempPath(), "BizTalkCheckmkPulse.CatalogTests." + Guid.NewGuid().ToString("N"));
|
||||
@@ -457,7 +603,7 @@ namespace BizTalkCheckmkPulse.Tests
|
||||
EnvironmentName = "ACC",
|
||||
SynchronizedUtc = DateTime.UtcNow,
|
||||
ActiveCandidates = 150,
|
||||
UnsupportedCandidates = 0
|
||||
UnresolvedCandidates = 7
|
||||
};
|
||||
catalog.Entries.Add(TestEndpoint("Orders", "api.example.test"));
|
||||
var store = new EndpointCatalogStore(path, 1048576, 100);
|
||||
@@ -467,6 +613,7 @@ namespace BizTalkCheckmkPulse.Tests
|
||||
AssertEqual(1, loaded.Entries.Count, "catalog entry count");
|
||||
AssertEqual("api.example.test", loaded.Entries[0].Host, "catalog host");
|
||||
AssertEqual(443, loaded.Entries[0].Port, "catalog port");
|
||||
AssertEqual(7, loaded.UnresolvedCandidates, "catalog unresolved candidate count");
|
||||
Assert(File.ReadAllText(path).IndexOf("top-secret", StringComparison.OrdinalIgnoreCase) < 0, "catalog must not contain URI secrets");
|
||||
}
|
||||
finally
|
||||
@@ -526,6 +673,7 @@ namespace BizTalkCheckmkPulse.Tests
|
||||
+ "<add key=\"EnvironmentName\" value=\"\" />"
|
||||
+ "<add key=\"EndpointProbeMaxConcurrency\" value=\"16\" />"
|
||||
+ "<add key=\"EndpointMaxCount\" value=\"100\" />"
|
||||
+ "<add key=\"EndpointCatalogMaxEntries\" value=\"1000\" />"
|
||||
+ "<add key=\"NewSetting\" value=\"new-default\" />"
|
||||
+ "</appSettings></configuration>",
|
||||
new UTF8Encoding(false));
|
||||
@@ -548,6 +696,7 @@ namespace BizTalkCheckmkPulse.Tests
|
||||
AssertEqual("ACC", effectiveEnvironment, "preserved installer environment");
|
||||
Assert(merged.Contains("key=\"EndpointProbeMaxConcurrency\" value=\"7\""), "existing operational value must be preserved");
|
||||
Assert(merged.Contains("key=\"EndpointMaxCount\" value=\"100\""), "superseded old default must migrate to new bounded default");
|
||||
Assert(merged.Contains("key=\"EndpointCatalogMaxEntries\" value=\"1000\""), "new catalog entry limit must be added");
|
||||
Assert(merged.Contains("key=\"NewSetting\" value=\"new-default\""), "new source setting must be added");
|
||||
Assert(merged.IndexOf("RemovedLegacySetting", StringComparison.Ordinal) < 0, "removed legacy key must not be resurrected");
|
||||
|
||||
@@ -713,6 +862,14 @@ namespace BizTalkCheckmkPulse.Tests
|
||||
}
|
||||
}
|
||||
|
||||
private static void AssertEqual(EndpointResolutionStatus expected, EndpointResolutionStatus actual, string label)
|
||||
{
|
||||
if (expected != actual)
|
||||
{
|
||||
throw new InvalidOperationException(label + ": expected " + expected + ", actual " + actual);
|
||||
}
|
||||
}
|
||||
|
||||
private static void AssertEqual(string expected, string actual, string label)
|
||||
{
|
||||
if (!string.Equals(expected, actual, StringComparison.Ordinal))
|
||||
|
||||
Reference in New Issue
Block a user