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

Fix CollectAllProperties flag and clean up reserved attributes #67

Merged
merged 1 commit into from
Aug 16, 2023
Merged

Fix CollectAllProperties flag and clean up reserved attributes #67

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
32 changes: 14 additions & 18 deletions src/CommonLib/Processors/LDAPPropertyProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,19 @@
using System.Security.Principal;
using System.Threading.Tasks;
using SharpHoundCommonLib.Enums;
using SharpHoundCommonLib.LDAPQueries;
using SharpHoundCommonLib.OutputTypes;

namespace SharpHoundCommonLib.Processors
{
public class LDAPPropertyProcessor
{
private static readonly string[] ReservedAttributes =
{
"pwdlastset", "lastlogon", "lastlogontimestamp", "objectsid",
"sidhistory", "useraccountcontrol", "operatingsystem",
"operatingsystemservicepack", "serviceprincipalname", "displayname", "mail", "title",
"homedirectory", "description", "admincount", "userpassword", "gpcfilesyspath", "objectclass",
"msds-behavior-version", "objectguid", "name", "gpoptions", "msds-allowedtodelegateto",
"msDS-allowedtoactonbehalfofotheridentity", "displayname",
"sidhistory", "samaccountname", "samaccounttype", "objectsid", "objectguid", "objectclass",
"msds-groupmsamembership",
"distinguishedname", "memberof", "logonhours", "ntsecuritydescriptor", "dsasignature", "repluptodatevector",
"member", "whenCreated"
};
private static readonly string[] ReservedAttributes = CommonProperties.TypeResolutionProps
.Concat(CommonProperties.BaseQueryProps).Concat(CommonProperties.GroupResolutionProps)
.Concat(CommonProperties.ComputerMethodProps).Concat(CommonProperties.ACLProps)
.Concat(CommonProperties.ObjectPropsProps).Concat(CommonProperties.ContainerProps)
.Concat(CommonProperties.SPNTargetProps).Concat(CommonProperties.DomainTrustProps)
.Concat(CommonProperties.GPOLocalGroupProps).ToArray();

private readonly ILDAPUtils _utils;

Expand Down Expand Up @@ -404,12 +398,11 @@ public async Task<ComputerProperties> ReadComputerProperties(ISearchResultEntry
/// <param name="entry"></param>
public Dictionary<string, object> ParseAllProperties(ISearchResultEntry entry)
{
var flag = IsTextUnicodeFlags.IS_TEXT_UNICODE_STATISTICS;
var props = new Dictionary<string, object>();

foreach (var property in entry.PropertyNames())
{
if (ReservedAttributes.Contains(property))
if (ReservedAttributes.Contains(property, StringComparer.OrdinalIgnoreCase))
continue;

var collCount = entry.PropCount(property);
Expand All @@ -420,8 +413,7 @@ public Dictionary<string, object> ParseAllProperties(ISearchResultEntry entry)
{
var testBytes = entry.GetByteProperty(property);

if (testBytes == null || testBytes.Length == 0 ||
!IsTextUnicode(testBytes, testBytes.Length, ref flag)) continue;
if (testBytes == null || testBytes.Length == 0) continue;

var testString = entry.GetProperty(property);

Expand All @@ -434,7 +426,7 @@ public Dictionary<string, object> ParseAllProperties(ISearchResultEntry entry)
else
{
var arrBytes = entry.GetByteArrayProperty(property);
if (arrBytes.Length == 0 || !IsTextUnicode(arrBytes[0], arrBytes[0].Length, ref flag))
if (arrBytes.Length == 0)
continue;

var arr = entry.GetArrayProperty(property);
Expand All @@ -461,6 +453,10 @@ private static object BestGuessConvert(string property)
//This string corresponds to the max int, and is usually set in accountexpires
if (property == "9223372036854775807") return -1;

//Try parsing as an int
if (int.TryParse(property, out var num)) return num;

//Just return the property as a string
return property;
}

Expand Down