Skip to content
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

Add timeout token for GetLocalGroups #153

Closed
wants to merge 1 commit into from
Closed

Add timeout token for GetLocalGroups #153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions src/CommonLib/Processors/LocalGroupProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Security.Principal;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using SharpHoundCommonLib.Enums;
Expand Down Expand Up @@ -52,6 +53,8 @@ public IAsyncEnumerable<LocalGroupAPIResult> GetLocalGroups(ResolvedSearchResult
public async IAsyncEnumerable<LocalGroupAPIResult> GetLocalGroups(string computerName, string computerObjectId,
string computerDomain, bool isDomainController)
{
using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(5));

//Open a handle to the server
var openServerResult = OpenSamServer(computerName);
if (openServerResult.IsFailed)
Expand All @@ -70,6 +73,10 @@ await SendComputerStatus(new CSVComputerStatus
var typeCache = new ConcurrentDictionary<string, CachedLocalItem>();

//Try to get the machine sid for the computer if its not already cached
if (cts.Token.IsCancellationRequested) {
yield break;
}

SecurityIdentifier machineSid;
if (!Cache.GetMachineSid(computerObjectId, out var tempMachineSid))
{
Expand Down Expand Up @@ -97,6 +104,10 @@ await SendComputerStatus(new CSVComputerStatus
}

//Get all available domains in the server
if (cts.Token.IsCancellationRequested) {
yield break;
}

var getDomainsResult = server.GetDomains();
if (getDomainsResult.IsFailed)
{
Expand All @@ -113,6 +124,10 @@ await SendComputerStatus(new CSVComputerStatus
//Loop over each domain result and process its member groups
foreach (var domainResult in getDomainsResult.Value)
{
if (cts.Token.IsCancellationRequested) {
yield break;
}

//Skip non-builtin domains on domain controllers
if (isDomainController && !domainResult.Name.Equals("builtin", StringComparison.OrdinalIgnoreCase))
continue;
Expand Down Expand Up @@ -150,6 +165,10 @@ await SendComputerStatus(new CSVComputerStatus

foreach (var alias in getAliasesResult.Value)
{
if (cts.Token.IsCancellationRequested) {
yield break;
}

_log.LogTrace("Opening alias {Alias} with RID {Rid} in domain {Domain} on computer {ComputerName}", alias.Name, alias.Rid, domainResult.Name, computerName);
//Try and resolve the group name using several different criteria
var resolvedName = await ResolveGroupName(alias.Name, computerName, computerObjectId, computerDomain, alias.Rid,
Expand Down Expand Up @@ -209,6 +228,10 @@ await SendComputerStatus(new CSVComputerStatus

foreach (var securityIdentifier in getMembersResult.Value)
{
if (cts.Token.IsCancellationRequested) {
yield break;
}

_log.LogTrace("Got member sid {Sid} in alias {Alias} with RID {Rid} in domain {Domain} on computer {ComputerName}", securityIdentifier.Value, alias.Name, alias.Rid, domainResult.Name, computerName);
//Check if the sid is one of our filtered ones. Throw it out if it is
if (Helpers.IsSidFiltered(securityIdentifier.Value))
Expand Down
Loading