Skip to content

ADCS ESC14 Scenario A coverage #1660

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
JonasBK wants to merge 9 commits into
base: main
Choose a base branch
from
+1,072 −70
Open

ADCS ESC14 Scenario A coverage #1660

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f2cd89d
add WriteAltSecurityIdentities and WritePublicInformation edges
JonasBK Jun 11, 2025
c5bf6fe
Add WriteSPN info under WritePublicInformation
JonasBK Jun 20, 2025
85654ce
add WritePublicInformation in ESC9/10 logic
JonasBK Jun 23, 2025
fd7b472
add ESC14 abuse text to existing edges
JonasBK Jun 23, 2025
3fdb7a6
esc14 improvements
JonasBK Jul 8, 2025
7910c24
prepare-codereview
JonasBK Jul 25, 2025
b853575
update abuse info to Certify 2.0
JonasBK Jul 29, 2025
8a8cfad
Update AdcsEsc14ScenarioA.tsx
JonasBK Jul 29, 2025
b83e0da
ADCS ESC14 snippet
JonasBK Sep 29, 2025
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
6 changes: 4 additions & 2 deletions cmd/api/src/analysis/ad/adcs_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1272,13 +1272,14 @@ func TestADCSESC9a(t *testing.T) {
})); err != nil {
t.Fatalf("error fetching esc9a edges in integration test; %v", err)
} else {
assert.Equal(t, 6, len(results))
assert.Equal(t, 7, len(results))

assert.True(t, results.Contains(harness.ESC9aPrincipalHarness.Group1))
assert.True(t, results.Contains(harness.ESC9aPrincipalHarness.Group2))
assert.True(t, results.Contains(harness.ESC9aPrincipalHarness.Group3))
assert.True(t, results.Contains(harness.ESC9aPrincipalHarness.Group4))
assert.True(t, results.Contains(harness.ESC9aPrincipalHarness.Group5))
assert.True(t, results.Contains(harness.ESC9aPrincipalHarness.Group6))
assert.True(t, results.Contains(harness.ESC9aPrincipalHarness.User2))
}
return nil
Expand Down Expand Up @@ -2658,13 +2659,14 @@ func TestADCSESC10a(t *testing.T) {
})); err != nil {
t.Fatalf("error fetching esc10a edges in integration test; %v", err)
} else {
require.Equal(t, 6, len(results))
require.Equal(t, 7, len(results))

require.True(t, results.Contains(harness.ESC10aPrincipalHarness.Group1))
require.True(t, results.Contains(harness.ESC10aPrincipalHarness.Group2))
require.True(t, results.Contains(harness.ESC10aPrincipalHarness.Group3))
require.True(t, results.Contains(harness.ESC10aPrincipalHarness.Group4))
require.True(t, results.Contains(harness.ESC10aPrincipalHarness.Group5))
require.True(t, results.Contains(harness.ESC10aPrincipalHarness.Group6))
require.True(t, results.Contains(harness.ESC10aPrincipalHarness.User2))

}
Expand Down
14 changes: 10 additions & 4 deletions cmd/api/src/test/integration/harnesses.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2210,6 +2210,7 @@ type ESC9aPrincipalHarness struct {
Group4 *graph.Node
Group5 *graph.Node
Group6 *graph.Node
Group7 *graph.Node
NTAuthStore *graph.Node
RootCA *graph.Node
User1 *graph.Node
Expand Down Expand Up @@ -2241,6 +2242,7 @@ func (s *ESC9aPrincipalHarness) Setup(graphTestContext *GraphTestContext) {
s.Group4 = graphTestContext.NewActiveDirectoryGroup("Group4", domainSid)
s.Group5 = graphTestContext.NewActiveDirectoryGroup("Group5", domainSid)
s.Group6 = graphTestContext.NewActiveDirectoryGroup("Group6", domainSid)
s.Group7 = graphTestContext.NewActiveDirectoryGroup("Group7", domainSid)
s.NTAuthStore = graphTestContext.NewActiveDirectoryNTAuthStore("NTAuthStore", domainSid)
s.RootCA = graphTestContext.NewActiveDirectoryRootCA("RootCA", domainSid)
s.User1 = graphTestContext.NewActiveDirectoryUser("User1", domainSid)
Expand All @@ -2256,7 +2258,8 @@ func (s *ESC9aPrincipalHarness) Setup(graphTestContext *GraphTestContext) {
graphTestContext.NewRelationship(s.Group6, s.User1, ad.AllExtendedRights)
graphTestContext.NewRelationship(s.Group3, s.User1, ad.WriteDACL)
graphTestContext.NewRelationship(s.Group4, s.User1, ad.WriteOwner)
graphTestContext.NewRelationship(s.Group5, s.User1, ad.WriteOwner)
graphTestContext.NewRelationship(s.Group5, s.User1, ad.Owns)
graphTestContext.NewRelationship(s.Group6, s.User1, ad.WritePublicInformation)
graphTestContext.NewRelationship(s.User2, s.User2, ad.GenericAll)
graphTestContext.NewRelationship(s.User1, s.Group0, ad.MemberOf)
graphTestContext.NewRelationship(s.User2, s.Group0, ad.MemberOf)
Expand Down Expand Up @@ -3747,10 +3750,11 @@ type ESC10aPrincipalHarness struct {
User1 *graph.Node
Group1 *graph.Node
Group2 *graph.Node
Group6 *graph.Node
Group3 *graph.Node
Group4 *graph.Node
Group5 *graph.Node
Group6 *graph.Node
Group7 *graph.Node
User2 *graph.Node
Group0 *graph.Node
}
Expand All @@ -3777,10 +3781,11 @@ func (s *ESC10aPrincipalHarness) Setup(graphTestContext *GraphTestContext) {
s.User1 = graphTestContext.NewActiveDirectoryUser("User1", domainSid)
s.Group1 = graphTestContext.NewActiveDirectoryGroup("Group1", domainSid)
s.Group2 = graphTestContext.NewActiveDirectoryGroup("Group2", domainSid)
s.Group6 = graphTestContext.NewActiveDirectoryGroup("Group6", domainSid)
s.Group3 = graphTestContext.NewActiveDirectoryGroup("Group3", domainSid)
s.Group4 = graphTestContext.NewActiveDirectoryGroup("Group4", domainSid)
s.Group5 = graphTestContext.NewActiveDirectoryGroup("Group5", domainSid)
s.Group6 = graphTestContext.NewActiveDirectoryGroup("Group6", domainSid)
s.Group7 = graphTestContext.NewActiveDirectoryGroup("Group7", domainSid)
s.User2 = graphTestContext.NewActiveDirectoryUser("User2", domainSid)
s.Group0 = graphTestContext.NewActiveDirectoryGroup("Group0", domainSid)
graphTestContext.NewRelationship(s.RootCA, s.Domain, ad.RootCAFor)
Expand All @@ -3794,7 +3799,8 @@ func (s *ESC10aPrincipalHarness) Setup(graphTestContext *GraphTestContext) {
graphTestContext.NewRelationship(s.Group6, s.User1, ad.AllExtendedRights)
graphTestContext.NewRelationship(s.Group3, s.User1, ad.WriteDACL)
graphTestContext.NewRelationship(s.Group4, s.User1, ad.WriteOwner)
graphTestContext.NewRelationship(s.Group5, s.User1, ad.WriteOwner)
graphTestContext.NewRelationship(s.Group5, s.User1, ad.Owns)
graphTestContext.NewRelationship(s.Group6, s.User1, ad.WritePublicInformation)
graphTestContext.NewRelationship(s.User2, s.User2, ad.GenericAll)
graphTestContext.NewRelationship(s.User1, s.Group0, ad.MemberOf)
graphTestContext.NewRelationship(s.User2, s.Group0, ad.MemberOf)
Expand Down
43 changes: 36 additions & 7 deletions cmd/api/src/test/integration/harnesses/esc10aprincipalharness.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@
{
"id": "n9",
"position": {
"x": 482.94623164792375,
"y": 657.1984889145978
"x": 654.085839099432,
"y": 633.957307655751
},
"caption": "Group6",
"caption": "Group7",
"labels": [],
"properties": {},
"style": {
Expand Down Expand Up @@ -264,6 +264,19 @@
"style": {
"node-color": "#fcdc00"
}
},
{
"id": "n15",
"position": {
"x": 495.7801848291077,
"y": 652.6385696871592
},
"caption": "Group6",
"style": {
"node-color": "#fcdc00"
},
"labels": [],
"properties": {}
}
],
"relationships": [
Expand Down Expand Up @@ -408,11 +421,11 @@
},
{
"id": "n16",
"fromId": "n12",
"toId": "n6",
"type": "WriteOwner",
"type": "Owns",
"style": {},
"properties": {},
"style": {}
"fromId": "n12",
"toId": "n6"
},
{
"id": "n17",
Expand Down Expand Up @@ -461,6 +474,22 @@
"type": "Enroll",
"properties": {},
"style": {}
},
{
"id": "n23",
"type": "ADCSESC10a",
"fromId": "n15",
"toId": "n0",
"style": {},
"properties": {}
},
{
"id": "n24",
"type": "Owns",
"fromId": "n15",
"toId": "n6",
"style": {},
"properties": {}
}
]
}
32 changes: 16 additions & 16 deletions cmd/api/src/test/integration/harnesses/esc10aprincipalharness.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
43 changes: 36 additions & 7 deletions cmd/api/src/test/integration/harnesses/esc9aprincipalharness.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@
{
"id": "n9",
"position": {
"x": 482.94623164792375,
"y": 657.1984889145978
"x": 660.4243430791171,
"y": 636.7404784228806
},
"caption": "Group6",
"caption": "Group7",
"labels": [],
"properties": {},
"style": {
Expand Down Expand Up @@ -265,6 +265,19 @@
"style": {
"node-color": "#fcdc00"
}
},
{
"id": "n15",
"position": {
"x": 463.0761473193729,
"y": 665.7935615621888
},
"caption": "Group6",
"style": {
"node-color": "#fcdc00"
},
"labels": [],
"properties": {}
}
],
"relationships": [
Expand Down Expand Up @@ -409,11 +422,11 @@
},
{
"id": "n16",
"fromId": "n12",
"toId": "n6",
"type": "WriteOwner",
"type": "Owns",
"style": {},
"properties": {},
"style": {}
"fromId": "n12",
"toId": "n6"
},
{
"id": "n17",
Expand Down Expand Up @@ -462,6 +475,22 @@
"type": "Enroll",
"properties": {},
"style": {}
},
{
"id": "n23",
"type": "ADCSESC9a",
"fromId": "n15",
"toId": "n0",
"style": {},
"properties": {}
},
{
"id": "n24",
"type": "WritePublicInformation",
"style": {},
"properties": {},
"fromId": "n15",
"toId": "n6"
}
]
}
32 changes: 16 additions & 16 deletions cmd/api/src/test/integration/harnesses/esc9aprincipalharness.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions packages/cue/bh/ad/ad.cue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1655,6 +1655,16 @@ CanApplyGPO: types.#Kind & {
schema: "active_directory"
}

WriteAltSecurityIdentities: types.#Kind & {
symbol: "WriteAltSecurityIdentities"
schema: "active_directory"
}

WritePublicInformation: types.#Kind & {
symbol: "WritePublicInformation"
schema: "active_directory"
}

// Relationship Kinds
RelationshipKinds: [
Owns,
Expand Down Expand Up @@ -1742,6 +1752,8 @@ RelationshipKinds: [
GPOAppliesTo,
CanApplyGPO,
HasTrustKeys,
WriteAltSecurityIdentities,
WritePublicInformation,
]

// ACL Relationships
Expand Down Expand Up @@ -1774,6 +1786,8 @@ ACLRelationships: [
WritePKINameFlag,
WriteOwnerLimitedRights,
OwnsLimitedRights,
WriteAltSecurityIdentities,
WritePublicInformation,
]

// these edges are common to inbound/outbound/pathfinding
Expand Down Expand Up @@ -1832,6 +1846,8 @@ SharedRelationshipKinds: [
GPOAppliesTo,
CanApplyGPO,
HasTrustKeys,
WriteAltSecurityIdentities,
WritePublicInformation,
]

// Edges that are used during inbound traversal
Expand Down
10 changes: 7 additions & 3 deletions packages/go/analysis/ad/queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1872,13 +1872,17 @@ func FetchAttackersForEscalations9and10(tx graph.Transaction, victimBitmap cardi
if attackers, err := ops.FetchStartNodeIDs(tx.Relationships().Filterf(func() graph.Criteria {
criteria := query.And(
query.KindIn(query.Start(), ad.Group, ad.User, ad.Computer),
query.KindIn(query.Relationship(), ad.GenericAll, ad.GenericWrite, ad.Owns, ad.WriteOwner, ad.WriteDACL),
query.InIDs(query.EndID(), graph.DuplexToGraphIDs(victimBitmap)...),
)
if scenarioB {
return query.And(criteria, query.KindIn(query.End(), ad.Computer))
return query.And(criteria,
query.KindIn(query.End(), ad.Computer),
query.KindIn(query.Relationship(), ad.GenericAll, ad.GenericWrite, ad.Owns, ad.WriteOwner, ad.WriteDACL),
)
} else {
return query.And(criteria,
query.KindIn(query.Relationship(), ad.GenericAll, ad.GenericWrite, ad.Owns, ad.WriteOwner, ad.WriteDACL, ad.WritePublicInformation))
}
return criteria
})); err != nil {
return nil, err
} else {
Expand Down
12 changes: 7 additions & 5 deletions packages/go/graphschema/ad/ad.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading