Skip to content

[BED-6027] - Filter GPOs with Computer Configuration Setting Disabled #241

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
mykeelium merged 9 commits into from
Oct 17, 2025
Merged

[BED-6027] - Filter GPOs with Computer Configuration Setting Disabled #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
41de791
WIP: Evaluated and Collect GPO Status on ReadGPOLocalGroups
mykeelium Aug 8, 2025
0462fb7
chore: WIP test
mykeelium Aug 18, 2025
94f7bc9
chore: WIP Update Unit Test with Computer Results
mykeelium Aug 19, 2025
8e3c830
fix: Add Flags to Query, Update Tests
mykeelium Aug 20, 2025
d919aa6
chore: Remove gpostatus Translation from Collection
mykeelium Aug 20, 2025
856fc85
Merge branch 'v4' into mcuomo/BED-6027
mikex777 Aug 27, 2025
b05db05
Merge branch 'v4' into mcuomo/BED-6027
mikex777 Sep 24, 2025
8704611
Merge branch 'v4' into mcuomo/BED-6027
mikex777 Oct 16, 2025
da36166
Merge branch 'v4' into mcuomo/BED-6027
mikex777 Oct 16, 2025
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
6 changes: 4 additions & 2 deletions src/CommonLib/Processors/GPOLocalGroupProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public async Task<ResultingGPOChanges> ReadGPOLocalGroups(string gpLink, string
var result = await _utils.Query(new LdapQueryParameters() {
LDAPFilter = new LdapFilter().AddAllObjects().GetFilter(),
SearchScope = SearchScope.Base,
Attributes = CommonProperties.GPCFileSysPath,
Attributes = [LDAPProperties.GPCFileSYSPath, LDAPProperties.Flags],
SearchBase = linkDn,
DomainName = gpoDomain
}).DefaultIfEmpty(LdapResult<IDirectoryObject>.Fail()).FirstOrDefaultAsync();
Expand All @@ -140,7 +140,9 @@ public async Task<ResultingGPOChanges> ReadGPOLocalGroups(string gpLink, string
continue;
}

if (!result.Value.TryGetProperty(LDAPProperties.GPCFileSYSPath, out var filePath)) {
if (!result.Value.TryGetProperty(LDAPProperties.GPCFileSYSPath, out var filePath) ||
// Filter out GPOs that are disabled or the computer configuration is disabled
(result.Value.TryGetProperty(LDAPProperties.Flags, out var flags) && flags is "2" or "3")) {
GpoActionCache.TryAdd(linkDn, actions);
continue;
}
Expand Down
2 changes: 2 additions & 0 deletions src/CommonLib/Processors/LdapPropertyProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,8 @@ public static Dictionary<string, object> ReadGPOProperties(IDirectoryObject entr
var props = GetCommonProps(entry);
entry.TryGetProperty(LDAPProperties.GPCFileSYSPath, out var path);
props.Add("gpcpath", path.ToUpper());
entry.TryGetProperty(LDAPProperties.Flags, out var flags);
props.Add("gpostatus", flags);
Comment thread
mykeelium marked this conversation as resolved.
return props;
}

Expand Down
140 changes: 140 additions & 0 deletions test/unit/GPOLocalGroupProcessorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,146 @@ public async Task GPOLocalGroupProcessor_ReadGPOLocalGroups_Null_Gpcfilesyspath(
Assert.Equal("teapot", actual.ObjectIdentifier);
}

[Fact]
public async Task GPOLocalGroupProcessor_ReadGPOLocalGroups_Does_Not_Skip_Enabled_And_Skips_Disabled_GPOs() {
// Setup
var mockLDAPUtils = new Mock<ILdapUtils>(MockBehavior.Loose);
var gpcFileSysPath = Path.GetTempPath();

var groupsXmlPath = Path.Join(gpcFileSysPath, "MACHINE", "Preferences", "Groups", "Groups.xml");
Directory.CreateDirectory(Path.GetDirectoryName(groupsXmlPath));
await File.WriteAllTextAsync(groupsXmlPath, GroupXmlContent);

var gptTmplPath = Path.Join(gpcFileSysPath, "MACHINE", "Microsoft", "Windows NT", "SecEdit", "GptTmpl.inf");
Directory.CreateDirectory(Path.GetDirectoryName(gptTmplPath));
await File.WriteAllTextAsync(gptTmplPath, GpttmplInfContent);

var mockComputerEntry = new Mock<IDirectoryObject>();
var mockSearchResultEntry = new Mock<IDirectoryObject>();
var sid = "teapot";
mockSearchResultEntry.Setup(x => x.TryGetSecurityIdentifier(out sid)).Returns(true);
var mockResult = LdapResult<IDirectoryObject>.Ok(mockSearchResultEntry.Object);
var mockSearchResults = new List<LdapResult<IDirectoryObject>> { mockResult };
mockLDAPUtils
.Setup(x => x.Query(
It.Is<LdapQueryParameters>(y =>
y.LDAPFilter.Equals(new LdapFilter().AddComputersNoMSAs().GetFilter()) &&
y.Attributes.Equals(CommonProperties.ObjectSID)),
It.IsAny<CancellationToken>())).Returns(mockSearchResults.ToAsyncEnumerable);
mockComputerEntry.Setup(x => x.TryGetSecurityIdentifier(out sid)).Returns(true);
mockLDAPUtils.Setup(x => x.ResolveAccountName(It.IsAny<string>(), It.IsAny<string>()))
.ReturnsAsync((true, new TypedPrincipal("S-1-5-21-3130019616-2776909439-2417379446-513", Label.User)));

// Enabled
var mockDirectory0 = new MockDirectoryObject("CN=Users,DC=testlab,DC=local", null, "",
"ECAD920E-8EB1-4E31-A80E-DD36367F81F4");
mockDirectory0.Properties = new Dictionary<string, string>() {
{ LDAPProperties.GPCFileSYSPath, gpcFileSysPath },
{ LDAPProperties.Flags, "0"}
};
var result0 = new List<LdapResult<IDirectoryObject>> {
LdapResult<IDirectoryObject>.Ok(mockDirectory0),
};
// User Configuration Disabled
var mockDirectory1 = new MockDirectoryObject("CN=Users,DC=testlab,DC=local", null, "",
"ECAD920E-8EB1-4E31-A80E-DD36367F81F4");
mockDirectory1.Properties = new Dictionary<string, string>() {
{ LDAPProperties.GPCFileSYSPath, gpcFileSysPath },
{ LDAPProperties.Flags, "1"}
};
var result1 = new List<LdapResult<IDirectoryObject>> {
LdapResult<IDirectoryObject>.Ok(mockDirectory1),
};
// Computer Configuration Disabled -- Skipped
var mockDirectory2 = new MockDirectoryObject("CN=Users,DC=testlab,DC=local", null, "",
"ECAD920E-8EB1-4E31-A80E-DD36367F81F4");
mockDirectory2.Properties = new Dictionary<string, string>() {
{ LDAPProperties.GPCFileSYSPath, gpcFileSysPath },
{ LDAPProperties.Flags, "2"}
};
var result2 = new List<LdapResult<IDirectoryObject>> {
LdapResult<IDirectoryObject>.Ok(mockDirectory2),
};
// Disabled -- Skipped
var mockDirectory3 = new MockDirectoryObject("CN=Users,DC=testlab,DC=local", null, "",
"ECAD920E-8EB1-4E31-A80E-DD36367F81F4");
mockDirectory3.Properties = new Dictionary<string, string>() {
{ LDAPProperties.GPCFileSYSPath, gpcFileSysPath },
{ LDAPProperties.Flags, "3"}
};
var result3 = new List<LdapResult<IDirectoryObject>> {
LdapResult<IDirectoryObject>.Ok(mockDirectory3),
};

mockLDAPUtils
.Setup(x => x.Query(
It.Is<LdapQueryParameters>(y =>
y.LDAPFilter.Equals(new LdapFilter().AddAllObjects().GetFilter()) &&
y.SearchScope.Equals(SearchScope.Base) &&
y.Attributes.Contains(LDAPProperties.GPCFileSYSPath) &&
y.Attributes.Contains(LDAPProperties.Flags) &&
y.SearchBase.Equals("cn=foouser (blah)123/dc=somedomain", StringComparison.OrdinalIgnoreCase) &&
y.DomainName.Equals("somedomain", StringComparison.OrdinalIgnoreCase)),
It.IsAny<CancellationToken>()))
.Returns(result0.ToAsyncEnumerable);
mockLDAPUtils
.Setup(x => x.Query(
It.Is<LdapQueryParameters>(y =>
y.LDAPFilter.Equals(new LdapFilter().AddAllObjects().GetFilter()) &&
y.SearchScope.Equals(SearchScope.Base) &&
y.Attributes.Contains(LDAPProperties.GPCFileSYSPath) &&
y.Attributes.Contains(LDAPProperties.Flags) &&
y.SearchBase.Equals("cn=foouser (blah)123/dc=someotherdomain", StringComparison.OrdinalIgnoreCase) &&
y.DomainName.Equals("someotherdomain", StringComparison.OrdinalIgnoreCase)),
It.IsAny<CancellationToken>()))
.Returns(result1.ToAsyncEnumerable);
mockLDAPUtils
.Setup(x => x.Query(
It.Is<LdapQueryParameters>(y =>
y.LDAPFilter.Equals(new LdapFilter().AddAllObjects().GetFilter()) &&
y.SearchScope.Equals(SearchScope.Base) &&
y.Attributes.Contains(LDAPProperties.GPCFileSYSPath) &&
y.Attributes.Contains(LDAPProperties.Flags) &&
y.SearchBase.Equals("cn=foouser (blah)123/dc=somethirddomain", StringComparison.OrdinalIgnoreCase) &&
y.DomainName.Equals("somethirddomain", StringComparison.OrdinalIgnoreCase)),
It.IsAny<CancellationToken>()))
.Returns(result2.ToAsyncEnumerable);
mockLDAPUtils
.Setup(x => x.Query(
It.Is<LdapQueryParameters>(y =>
y.LDAPFilter.Equals(new LdapFilter().AddAllObjects().GetFilter()) &&
y.SearchScope.Equals(SearchScope.Base) &&
y.Attributes.Contains(LDAPProperties.GPCFileSYSPath) &&
y.Attributes.Contains(LDAPProperties.Flags) &&
y.SearchBase.Equals("cn=foouser (blah)123/dc=somefourthdomain", StringComparison.OrdinalIgnoreCase) &&
y.DomainName.Equals("somefourthdomain", StringComparison.OrdinalIgnoreCase)),
It.IsAny<CancellationToken>()))
.Returns(result3.ToAsyncEnumerable);

var processor = new GPOLocalGroupProcessor(mockLDAPUtils.Object);
var testGPLinkProperty0 = "[LDAP:/o=foo/ou=foo Group (ABC123)/cn=foouser (blah)123/dc=somedomain;0;]";
var testGPLinkProperty1 = "[LDAP:/o=foo/ou=foo Group (ABC123)/cn=foouser (blah)123/dc=someotherdomain;0;]";
var testGPLinkProperty2 = "[LDAP:/o=foo/ou=foo Group (ABC123)/cn=foouser (blah)123/dc=somethirddomain;0;]";
var testGPLinkProperty3 = "[LDAP:/o=foo/ou=foo Group (ABC123)/cn=foouser (blah)123/dc=somefourthdomain;0;]";

// Act
var act0 = await processor.ReadGPOLocalGroups(testGPLinkProperty0, "DC=Testlab,DC=Local");
var act1 = await processor.ReadGPOLocalGroups(testGPLinkProperty1, "DC=Testlab,DC=Local");
var act2 = await processor.ReadGPOLocalGroups(testGPLinkProperty2, "DC=Testlab,DC=Local");
var act3 = await processor.ReadGPOLocalGroups(testGPLinkProperty3, "DC=Testlab,DC=Local");

// Assert
Assert.Single(act0.AffectedComputers);
Assert.Single(act1.AffectedComputers);
Assert.Single(act2.AffectedComputers);
Assert.Single(act3.AffectedComputers);

Assert.Single(act0.LocalAdmins);
Assert.Single(act1.LocalAdmins);
Assert.Empty(act2.LocalAdmins);
Assert.Empty(act3.LocalAdmins);
}

[WindowsOnlyFact]
public async Task GPOLocalGroupProcessor_ReadGPOLocalGroups() {
var mockLDAPUtils = new Mock<ILdapUtils>(MockBehavior.Loose);
Expand Down
Loading