Skip to content

fix: Process objectguid as common property - BED-7397 #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StephenHinck merged 6 commits into from
Feb 12, 2026
Merged

fix: Process objectguid as common property - BED-7397 #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
edbed08
fix: Process objectguid as common property - BED-7397
StephenHinck Feb 12, 2026
c81bf2a
wip
StephenHinck Feb 12, 2026
21ae19a
wip
StephenHinck Feb 12, 2026
e633e10
CR
StephenHinck Feb 12, 2026
8039a7b
wip
StephenHinck Feb 12, 2026
7b81b26
chore: add WindowsOnly to Security Identifier Tests
mykeelium Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions src/CommonLib/Processors/LdapPropertyProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,21 @@ private static Dictionary<string, object> GetCommonProps(IDirectoryObject entry)
ret["whencreated"] = Helpers.ConvertTimestampToUnixEpoch(wc);
}

if (entry.TryGetByteProperty(LDAPProperties.ObjectGUID, out var objectguid)) {
if (objectguid != null && objectguid.Length == 16)
{
try
{
Guid guid = new Guid(objectguid);
ret["objectguid"] = guid.ToString().ToUpperInvariant();
}
catch
{
// Skip malformed GUID bytes
}
}
}

return ret;
}

Expand Down Expand Up @@ -441,20 +456,6 @@ 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;
Expand Down
4 changes: 2 additions & 2 deletions test/unit/CommonLibHelperTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ public void DomainNameToDistinguishedName_DotsBecomeDcComponents()
Assert.Equal("DC=test,DC=local", result);
}

[Theory]
[WindowsOnlyTheory]
[InlineData("S-1-5-32-544", "\\01\\02\\00\\00\\00\\00\\00\\05\\20\\00\\00\\00\\20\\02\\00\\00")]
public void ConvertSidToHexSid_ValidSid_MatchesSecurityIdentifierBinaryForm(string sid, string expectedHexSid)
{
Expand All @@ -322,7 +322,7 @@ static string BuildExpectedHexSid(string sid)
}
}

[Fact]
[WindowsOnlyFact]
public void ConvertSidToHexSid_InvalidSid_Throws()
{
Assert.ThrowsAny<ArgumentException>(() => Helpers.ConvertSidToHexSid("NOT-A-SID"));
Expand Down
Loading