Skip to content

query bug fixes #15

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
d3vzer0 merged 9 commits into from
Jun 19, 2025
+12 −13
Merged

query bug fixes #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bf263f5
multi-version tier zero tag support
martinsohn Jun 18, 2025
6116470
Update combined queries
github-actions[bot] Jun 18, 2025
50da110
version bump
martinsohn Jun 18, 2025
7057e9f
Merge branch 'fix/query-tier-tag' of https://github.com/SpecterOps/Bl…
martinsohn Jun 18, 2025
0d79834
Update combined queries
github-actions[bot] Jun 18, 2025
5a18d6e
bug fix: include nested members
martinsohn Jun 18, 2025
936f555
Merge branch 'fix/query-tier-tag' of https://github.com/SpecterOps/Bl…
martinsohn Jun 18, 2025
b55b0ce
Update combined queries
github-actions[bot] Jun 18, 2025
bf2af49
Merge branch 'main' into fix/query-tier-tag
d3vzer0 Jun 19, 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
12 changes: 6 additions & 6 deletions Queries.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@
],
"category": "Dangerous Privileges",
"description": null,
"query": "MATCH p=(n:Base)-[:Owns]->(:Computer)\nWHERE NOT coalesce(n.system_tags, \"\") CONTAINS \"admin_tier_0\"\nRETURN p",
"revision": 1,
"query": "MATCH p=(n:Base)-[:Owns]->(:Computer)\nWHERE NOT ((n:Tag_Tier_Zero) OR COALESCE(n.system_tags, '') CONTAINS 'admin_tier_0')\nRETURN p",
"revision": 2,
"resources": [],
"acknowledgements": [
"Martin Sohn Christensen, @martinsohndk"
Expand Down Expand Up @@ -283,8 +283,8 @@
],
"category": "Domain Information",
"description": null,
"query": "MATCH p=(n:Base)-[r:MemberOf]->(m:Group)\nWHERE m.objectid ENDS WITH \"-571\"\nAND (n:User or n:Computer)\nRETURN p",
"revision": 1,
"query": "MATCH p=(:Base)-[:MemberOf*1..]->(m:Group)\nWHERE m.objectid ENDS WITH \"-571\"\nRETURN p",
"revision": 2,
"resources": [],
"acknowledgements": [
"Martin Sohn Christensen, @martinsohndk"
Expand Down Expand Up @@ -2613,8 +2613,8 @@
],
"category": "Active Directory Hygiene",
"description": null,
"query": "MATCH (n:Computer)\nWHERE n.enabled = true\nAND n.whencreated < (datetime().epochseconds - (60 * 3 * 86400))\nAND n.pwdlastset < (datetime().epochseconds - (60 * 3 * 86400))\nAND coalesce(n.system_tags, \"\") CONTAINS \"admin_tier_0\"\nRETURN n",
"revision": 1,
"query": "MATCH (n:Computer)\nWHERE n.enabled = true\nAND n.whencreated < (datetime().epochseconds - (60 * 3 * 86400))\nAND n.pwdlastset < (datetime().epochseconds - (60 * 3 * 86400))\nAND ((n:Tag_Tier_Zero) OR COALESCE(n.system_tags, '') CONTAINS 'admin_tier_0')\nRETURN n",
"revision": 2,
"resources": [],
"acknowledgements": [
"Martin Sohn Christensen, @martinsohndk"
Expand Down
5 changes: 2 additions & 3 deletions queries/Members of Allowed RODC Password Replication Group.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ platforms: Active Directory
category: Domain Information
description:
query: |-
MATCH p=(n:Base)-[r:MemberOf]->(m:Group)
MATCH p=(:Base)-[:MemberOf*1..]->(m:Group)
WHERE m.objectid ENDS WITH "-571"
AND (n:User or n:Computer)
RETURN p
revision: 1
revision: 2
resources:
acknowledgements: Martin Sohn Christensen, @martinsohndk

4 changes: 2 additions & 2 deletions queries/Tier Zero computers not owned by Tier Zero.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ category: Dangerous Privileges
description:
query: |-
MATCH p=(n:Base)-[:Owns]->(:Computer)
WHERE NOT coalesce(n.system_tags, "") CONTAINS "admin_tier_0"
WHERE NOT ((n:Tag_Tier_Zero) OR COALESCE(n.system_tags, '') CONTAINS 'admin_tier_0')
RETURN p
revision: 1
revision: 2
resources:
acknowledgements: Martin Sohn Christensen, @martinsohndk

4 changes: 2 additions & 2 deletions queries/Tier Zero computers with passwords older than the default maximum password age.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ query: |-
WHERE n.enabled = true
AND n.whencreated < (datetime().epochseconds - (60 * 3 * 86400))
AND n.pwdlastset < (datetime().epochseconds - (60 * 3 * 86400))
AND coalesce(n.system_tags, "") CONTAINS "admin_tier_0"
AND ((n:Tag_Tier_Zero) OR COALESCE(n.system_tags, '') CONTAINS 'admin_tier_0')
RETURN n
revision: 1
revision: 2
resources:
acknowledgements: Martin Sohn Christensen, @martinsohndk