Skip to content

Filter empty hosts in host resolution #99

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
rvazarkar merged 1 commit into from
Feb 1, 2024
+13 −0
Merged

Filter empty hosts in host resolution #99

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions src/CommonLib/LDAPUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,10 @@ public IEnumerable<string> DoRangedRetrieval(string distinguishedName, string at
public async Task<string> ResolveHostToSid(string hostname, string domain)
{
var strippedHost = Helpers.StripServicePrincipalName(hostname).ToUpper().TrimEnd('$');
if (string.IsNullOrEmpty(strippedHost))
{
return null;
}

if (_hostResolutionMap.TryGetValue(strippedHost, out var sid)) return sid;

Expand Down
9 changes: 9 additions & 0 deletions test/unit/CommonLibHelperTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,15 @@ public void StripServicePrincipalName_InValidServicePrincipal_ExpectedHostName()
var actual = SharpHoundCommonLib.Helpers.StripServicePrincipalName(testString);
Assert.Equal(expected, actual);
}

[Fact]
public void StripServicePrincipalName_EmptyHost_Valid()
{
var testString = "MSSQLSvc/:1433";
var expected = "";
var actual = SharpHoundCommonLib.Helpers.StripServicePrincipalName(testString);
Assert.Equal(expected, actual);
}

[Fact]
public void B64ToBytes_String_ValidBase64String()
Expand Down