BED-6619 collection of objectguid (#253)

* Adding object guid to collection

* Fixing up unit tests

* Ensuring that GUID as all uppercase

* Adding more robust unit tests to appease code rabbit

* Removing unncessary property adds

Author: hotnops

src/CommonLib/LdapQueries/CommonProperties.cs

@@ -31,7 +31,7 @@ public static class CommonProperties
         {
             LDAPProperties.SAMAccountName, LDAPProperties.DistinguishedName, LDAPProperties.DNSHostName,
             LDAPProperties.SAMAccountType, LDAPProperties.OperatingSystem, LDAPProperties.PasswordLastSet,
-            LDAPProperties.LastLogonTimestamp
+            LDAPProperties.LastLogonTimestamp, LDAPProperties.ObjectGUID
         };
 
         public static readonly string[] ACLProps =

src/CommonLib/Processors/LdapPropertyProcessor.cs

@@ -436,6 +436,20 @@ await SendComputerStatus(new CSVComputerStatus {
                 }
             }
 
+            var objectGuidBytes = entry.GetByteProperty(LDAPProperties.ObjectGUID);
+            if (objectGuidBytes != null && objectGuidBytes.Length == 16)
+            {
+                try
+                {
+                    Guid guid = new Guid(objectGuidBytes);
+                    props.Add(LDAPProperties.ObjectGUID, guid.ToString().ToUpper());
+                }
+                catch
+                {
+                    // Skip malformed GUID bytes
+                }
+            }
+
             compProps.DumpSMSAPassword = smsaPrincipals.ToArray();
 
             compProps.Props = props;

test/unit/LdapPropertyTests.cs

@@ -446,6 +446,7 @@ public async Task LDAPPropertyProcessor_ReadComputerProperties_HappyPath()
                     {"lastlogon", "132673011142753043"},
                     {"lastlogontimestamp", "132670318095676525"},
                     {"operatingsystem", "Windows 10 Enterprise"},
+                    {"objectguid", Guid.Parse("a6f75ba4-f1ae-4b47-a606-e3a0a69aec83").ToByteArray()},
                     {"operatingsystemservicepack", "1607"},
                     {"mail", "test@testdomain.com"},
                     {"admincount", "c"},
@@ -542,6 +543,9 @@ public async Task LDAPPropertyProcessor_ReadComputerProperties_HappyPath()
             {
                 Assert.Equal("Success", status.Status);
             }
+            Assert.Contains("objectguid", keys);
+            Assert.Equal("A6F75BA4-F1AE-4B47-A606-E3A0A69AEC83", props["objectguid"]);
+
         }
 
         [Fact]
@@ -597,6 +601,7 @@ public async Task LDAPPropertyProcessor_ReadComputerProperties_TestBadPaths()
             Assert.False((bool)props["trustedtoauth"]);
             Assert.Contains("sidhistory", keys);
             Assert.Empty(props["sidhistory"] as string[]);
+            Assert.DoesNotContain("objectguid", keys);
         }
 
 
@@ -668,7 +673,6 @@ public async Task LDAPPropertyProcessor_ReadComputerProperties_TestDumpSMSAPassw
             var testDumpSMSAPassword = test.DumpSMSAPassword;
             Assert.Equal(2, testDumpSMSAPassword.Length);
             Assert.Equal(expected, testDumpSMSAPassword);
-
         }
 
         [Fact]
@@ -1380,6 +1384,7 @@ public async Task LDAPPropertyProcessor_ReadComputerProperties_TestDelegatesNull
                     {"operatingsystem", "Windows 10 Enterprise"},
                     {"operatingsystemservicepack", "1607"},
                     {"mail", "test@testdomain.com"},
+                    {"objectguid", Guid.Parse("a6f75ba4-f1ae-4b47-a606-e3a0a69aec83").ToByteArray()},
                     {"admincount", "c"},
                     {
                         "sidhistory", new[]
@@ -1425,6 +1430,9 @@ public async Task LDAPPropertyProcessor_ReadComputerProperties_TestDelegatesNull
                 ObjectIdentifier = "S-1-5-21-3130019616-2776909439-2417379446-1001",
                 ObjectType = Label.Computer
             }, test.AllowedToDelegate);
+
+            Assert.Contains("objectguid", keys);
+            Assert.Equal("A6F75BA4-F1AE-4B47-A606-E3A0A69AEC83", props["objectguid"]);
         }
 
         [WindowsOnlyFact]
@@ -1445,13 +1453,14 @@ public async Task LDAPPropertyProcessor_ReadComputerProperties_AllowedToActOnBeh
                     {"lastlogontimestamp", "132670318095676525"},
                     {"operatingsystem", "Windows 10 Enterprise"},
                     {"operatingsystemservicepack", "1607"},
+                    {"objectguid", Guid.Parse("a6f75ba4-f1ae-4b47-a606-e3a0a69aec83").ToByteArray()},
                     {"mail", "test@testdomain.com"},
                     {"admincount", "c"},
                     {
-                        "msds-allowedtoactonbehalfofotheridentity", 
-                        
+                        "msds-allowedtoactonbehalfofotheridentity",
+
                             Utils.B64ToBytes("AQUAAAAAAAUVAAAAIE+Qun9GhKV2SBaQUQQAAA==")
-                        
+
                     }
                 }, "S-1-5-21-3130019616-2776909439-2417379446-1101","");