Correct config print output (#152)

* Correct config print output * Ldap config print output keys should match with json config keys --------- Co-authored-by: Rohan Vazarkar <[email protected]>
BloodHoundAD · Aug 15, 2024 · 094ee16 · 094ee16
1 parent 5feaed1
commit 094ee16
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/src/CommonLib/LdapConfig.cs b/src/CommonLib/LdapConfig.cs
@@ -38,9 +38,9 @@ public int GetGCPort(bool ssl)
         public override string ToString() {
             var sb = new StringBuilder();
             sb.AppendLine($"Server: {Server}");
-            sb.AppendLine($"Port: {Port}");
-            sb.AppendLine($"SSLPort: {GetPort(true)}");
-            sb.AppendLine($"ForceSSL: {GetPort(false)}");
+            sb.AppendLine($"LdapPort: {GetPort(false)}");
+            sb.AppendLine($"LdapSSLPort: {GetPort(true)}");
+            sb.AppendLine($"ForceSSL: {ForceSSL}");
             sb.AppendLine($"AuthType: {AuthType.ToString()}");
             sb.AppendLine($"MaxConcurrentQueries: {MaxConcurrentQueries}");
             if (!string.IsNullOrWhiteSpace(Username)) {

diff --git a/test/unit/ComputerSessionProcessorTest.cs b/test/unit/ComputerSessionProcessorTest.cs
@@ -235,11 +235,8 @@ public async Task ComputerSessionProcessor_ReadUserSessionsPrivileged_FilteringW
         public async Task ComputerSessionProcessor_TestTimeout() {
             var nativeMethods = new Mock<NativeMethods>();
             nativeMethods.Setup(x => x.NetSessionEnum(It.IsAny<string>())).Callback(() => {
-                Thread.Sleep(200);
+                Task.Delay(1000).Wait();
             }).Returns(Array.Empty<NetSessionEnumResults>());
-            nativeMethods.Setup(x => x.NetWkstaUserEnum(It.IsAny<string>())).Callback(() => {
-                Thread.Sleep(200);
-            }).Returns(Array.Empty<NetWkstaUserEnumResults>());
             var processor = new ComputerSessionProcessor(new MockLdapUtils(),"", nativeMethods.Object);
             var receivedStatus = new List<CSVComputerStatus>();
             var machineDomainSid = $"{Consts.MockDomainSid}-1000";
@@ -252,14 +249,26 @@ public async Task ComputerSessionProcessor_TestTimeout() {
             Assert.Single(receivedStatus);
             var status = receivedStatus[0];
             Assert.Equal("Timeout", status.Status);
+        }
+
+        [Fact]
+        public async Task ComputerSessionProcessor_TestTimeoutPrivileged() {
+            var nativeMethods = new Mock<NativeMethods>();
+            nativeMethods.Setup(x => x.NetWkstaUserEnum(It.IsAny<string>())).Callback(() => {
+                Task.Delay(1000).Wait();
+            }).Returns(Array.Empty<NetWkstaUserEnumResults>());
+            var processor = new ComputerSessionProcessor(new MockLdapUtils(),"", nativeMethods.Object);
+            var receivedStatus = new List<CSVComputerStatus>();
+            var machineDomainSid = $"{Consts.MockDomainSid}-1000";
+            processor.ComputerStatusEvent += async status =>  {
+                receivedStatus.Add(status);
+            };
 
-            receivedStatus.Clear();
-
-            results = await processor.ReadUserSessionsPrivileged("primary.testlab.local", machineDomainSid, "testlab.local",
+            var results = await processor.ReadUserSessionsPrivileged("primary.testlab.local", machineDomainSid, "testlab.local",
                 TimeSpan.FromMilliseconds(1));
             Assert.Empty(results.Results);
             Assert.Single(receivedStatus);
-            status = receivedStatus[0];
+            var status = receivedStatus[0];
             Assert.Equal("Timeout", status.Status);
         }
     }