Skip to content

Improve NTLM Collection Logging BED-7374 #196

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

Open
lrfalslev wants to merge 4 commits into
base: 2.X
Choose a base branch
from
Open

Improve NTLM Collection Logging BED-7374 #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
430eb1d
add compstatus handler to registryprocessors
lrfalslev Feb 13, 2026
2a44168
supply StrategyExecutor to RegistryProcessor
lrfalslev Feb 19, 2026
80c17fb
use getOrAdd to fetch processors from ConcurrentDictionary
lrfalslev Feb 20, 2026
959a27e
lazily construct registry processors
lrfalslev Feb 23, 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
3 changes: 3 additions & 0 deletions Sharphound.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
<!-- <Reference Include="SharpHoundCommon">-->
<!-- <HintPath>..\SharpHoundCommon\src\CommonLib\bin\Debug\net472\SharpHoundCommonLib.dll</HintPath>-->
<!-- </Reference>-->
<!-- <Reference Include="SharpHoundRPC">-->
<!-- <HintPath>..\SharpHoundCommon\src\SharpHoundRPC\bin\Debug\net472\SharpHoundRPC.dll</HintPath>-->
<!-- </Reference>-->
<Reference Include="System.DirectoryServices" />
<Reference Include="System.DirectoryServices.Protocols" />
<Reference Include="System.IO.Compression" />
Expand Down
22 changes: 14 additions & 8 deletions src/Runtime/ObjectProcessors.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using SharpHoundCommonLib.Enums;
using SharpHoundCommonLib.OutputTypes;
using SharpHoundCommonLib.Processors;
using SharpHoundRPC.Registry;
using SharpHoundRPC.Wrappers;
using Container = SharpHoundCommonLib.OutputTypes.Container;
using Group = SharpHoundCommonLib.OutputTypes.Group;
Expand Down Expand Up @@ -40,7 +41,7 @@ public class ObjectProcessors {
private readonly SPNProcessors _spnProcessor;
private readonly WebClientServiceProcessor _webClientProcessor;
private readonly SmbProcessor _smbProcessor;
private readonly ConcurrentDictionary<string, RegistryProcessor> _registryProcessorMap = new();
private readonly ConcurrentDictionary<string, Lazy<RegistryProcessor>> _registryProcessorMap = new();
private readonly Channel<CSVComputerStatus> _compStatusChannel;

public ObjectProcessors(IContext context, ILogger log, Channel<CSVComputerStatus> compStatusChannel) {
Expand Down Expand Up @@ -85,6 +86,10 @@ internal void ClearEventHandlers() {
_spnProcessor.ComputerStatusEvent -= HandleCompStatusEvent;
_ldapPropertyProcessor.ComputerStatusEvent -= HandleCompStatusEvent;
_certAbuseProcessor.ComputerStatusEvent -= HandleCompStatusEvent;
foreach (var lazy in _registryProcessorMap.Values) {
if (lazy.IsValueCreated)
lazy.Value.ComputerStatusEvent -= HandleCompStatusEvent;
}
}

private async Task HandleCompStatusEvent(CSVComputerStatus status) {
Expand Down Expand Up @@ -372,13 +377,14 @@ await HandleCompStatusEvent(new CSVComputerStatus {

if (_methods.HasFlag(CollectionMethod.NTLMRegistry)) {
await _context.DoDelay();
if (_registryProcessorMap.TryGetValue(resolvedSearchResult.DomainSid, out var processor)) {
ret.NTLMRegistryData = await processor.ReadRegistrySettings(resolvedSearchResult.DisplayName);
} else {
var newProcessor = new RegistryProcessor(null, resolvedSearchResult.Domain);
_registryProcessorMap.TryAdd(resolvedSearchResult.DomainSid, newProcessor);
ret.NTLMRegistryData = await newProcessor.ReadRegistrySettings(resolvedSearchResult.DisplayName);
}
var processor = _registryProcessorMap.GetOrAdd(
resolvedSearchResult.DomainSid,
_ => new Lazy<RegistryProcessor>(() => {
var newProcessor = new RegistryProcessor(null, new StrategyExecutor(), resolvedSearchResult.Domain);
newProcessor.ComputerStatusEvent += HandleCompStatusEvent;
return newProcessor;
})).Value;
ret.NTLMRegistryData = await processor.ReadRegistrySettings(resolvedSearchResult.DisplayName);
}

if (_methods.HasFlag(CollectionMethod.WebClientService)) {
Expand Down