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

Additional Organizational Units ACLs #118

Merged
merged 5 commits into from
Aug 26, 2024
Merged

Additional Organizational Units ACLs #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1054777
Adding Organizational Units GenericWrite and ManageGPLink permissions
q-roland Apr 18, 2024
1f2d509
Renaming ManageGPLink permission to WriteGPLink
q-roland May 8, 2024
95ca1de
fix: gPLink guid
JonasBK May 8, 2024
eb3af9a
feat: add GenericWrite and WriteGPLink for Domain
JonasBK May 13, 2024
e3ebe45
Merge branch 'v3' into additionalOUACLs
rvazarkar Jul 24, 2024
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
1 change: 1 addition & 0 deletions src/CommonLib/EdgeNames.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public static class EdgeNames
public const string AddKeyCredentialLink = "AddKeyCredentialLink";
public const string SQLAdmin = "SQLAdmin";
public const string WriteAccountRestrictions = "WriteAccountRestrictions";
public const string WriteGPLink = "WriteGPLink";

//CertAbuse edges
public const string WritePKIEnrollmentFlag = "WritePKIEnrollmentFlag";
Expand Down
4 changes: 3 additions & 1 deletion src/CommonLib/Processors/ACEGuids.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ public class ACEGuids
public const string WriteSPN = "f3a64788-5306-11d1-a9c5-0000f80367c1";
public const string AddKeyPrincipal = "5b47d60f-6090-40b2-9f37-2a4de88f3063";
public const string UserAccountRestrictions = "4c164200-20c0-11d0-a768-00aa006e0529";
public const string WriteGPLink = "f30e3bbe-9ff0-11d1-b603-0000f80367c1";


//Cert abuse ACEs
public const string PKINameFlag = "ea1dddc4-60ff-416e-8cc0-17cee534bce7";
public const string PKIEnrollmentFlag = "d15ef7d8-f226-46db-ae79-b34e560bd12c";
public const string Enroll = "0e10c968-78fb-11d2-90d4-00c04f79dc55";
public const string AutoEnroll = "a05b8cc2-17bc-4802-a710-e7c15ab866a2"; //TODO: Add this if it becomes abusable
}
}
}
12 changes: 11 additions & 1 deletion src/CommonLib/Processors/ACLProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,8 @@ public IEnumerable<ACE> ProcessACL(byte[] ntSecurityDescriptor, string objectDom
or Label.Group
or Label.Computer
or Label.GPO
or Label.OU
or Label.Domain
or Label.CertTemplate
or Label.RootCA
or Label.EnterpriseCA
Expand Down Expand Up @@ -419,6 +421,14 @@ or Label.NTAuthStore
IsInherited = inherited,
RightName = EdgeNames.WriteAccountRestrictions
};
else if (objectType is Label.OU or Label.Domain && aceType == ACEGuids.WriteGPLink)
yield return new ACE
{
PrincipalType = resolvedPrincipal.ObjectType,
PrincipalSID = resolvedPrincipal.ObjectIdentifier,
IsInherited = inherited,
RightName = EdgeNames.WriteGPLink
};
else if (objectType == Label.Group && aceType == ACEGuids.WriteMember)
yield return new ACE
{
Expand Down Expand Up @@ -593,4 +603,4 @@ public IEnumerable<ACE> ProcessGMSAReaders(byte[] groupMSAMembership, string obj
}
}
}
}
}
Loading