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.

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

4.2 #568

Merged
merged 152 commits into from
Aug 3, 2022
Merged

4.2 #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
152 commits
Select commit Hold shift + click to select a range
de0a0c7
chore: add azure ingestion types
rvazarkar Jul 11, 2022
fd0c862
wip: new azure ingestion logic
rvazarkar Jul 11, 2022
cad82d9
wip: finish out ingestion for azurehound
rvazarkar Jul 12, 2022
f458ef6
wip: add azure post-processing
rvazarkar Jul 12, 2022
d83a08d
wip: some entity panel updates
rvazarkar Jul 13, 2022
b21c2ec
Add new AZ edge help modal directories
urangel Jul 14, 2022
51dcb31
Include new edge types in AppContainer and HelpModal components
urangel Jul 14, 2022
57d6380
General and References for AZAddSecret, AZAvereContributor, and AZVMA…
urangel Jul 14, 2022
876ede1
Update inbound control edge types
andyrobbins Jul 14, 2022
9b962c9
Update device execution privilege queries
andyrobbins Jul 14, 2022
bef8935
Update group inbound/outbound control queries
andyrobbins Jul 14, 2022
3a8bc73
fix: meta regex not taking the last instance
rvazarkar Jul 18, 2022
7338bac
Merge remote-tracking branch 'origin/4.2' into 4.2
rvazarkar Jul 18, 2022
d1e8a4c
fix: AZApp serviceprincipal runs as using wrong cypher
rvazarkar Jul 18, 2022
f489700
Fix UserAccountAdmin post-process cypher
andyrobbins Jul 18, 2022
1ef5cf8
Fix explicit VM controllers cypher
andyrobbins Jul 18, 2022
d56b4b6
Fix AZUser outbound control cypher queries
andyrobbins Jul 18, 2022
49858a5
Fix AZUser session cypher query
andyrobbins Jul 18, 2022
68b9b43
Fix AZUser inbound control cypher queries
andyrobbins Jul 18, 2022
8dba81f
Fix AZGroup members and memberships cypher queries
andyrobbins Jul 18, 2022
d0187b6
Fix AZGroup inbound and outbound control cypher queries
andyrobbins Jul 18, 2022
a2e00d9
Fix AZUser outbound control cypher query
andyrobbins Jul 18, 2022
c4a8c38
Fix AZServicePrincipal cypher queries
andyrobbins Jul 18, 2022
853290b
Fix AZApp inbound control cypher queries
andyrobbins Jul 18, 2022
edc4ef1
fix: AZVM not showing OS because of falling out of bounds
rvazarkar Jul 19, 2022
b612fc0
Merge remote-tracking branch 'origin/4.2' into 4.2
rvazarkar Jul 19, 2022
5ac83e4
feat: show os info on AZDevice
rvazarkar Jul 19, 2022
e1845c0
fix: encode all parameters passed to helpmodals to prevent XSS.
rvazarkar Jul 19, 2022
cbbdba1
feat: post-process DCSync into a new edge, update the prebuilt to inc…
rvazarkar Jul 19, 2022
3eb06b8
fix: add AZManagementGroup node definition
rvazarkar Jul 19, 2022
d9990e0
feat: add basic AZManagementGroup node tab
rvazarkar Jul 19, 2022
e4b2104
fix: filter out AZBase from node labels on the graph
rvazarkar Jul 19, 2022
7584633
fix: filter AZBase label in search functions
rvazarkar Jul 19, 2022
7ae670a
feat: add basic AZRoleNode tab
rvazarkar Jul 19, 2022
58e8eff
fix: mislabeled property on AZVM ingestion
rvazarkar Jul 19, 2022
b5494e2
feat: add managed identities to AZVM node panel
rvazarkar Jul 20, 2022
15ca47e
fix: null check keyvault access policies
rvazarkar Jul 20, 2022
ee14ba1
feat: add Azure AD Admin Roles to panels, add missing Overview to AZD…
rvazarkar Jul 20, 2022
9460265
chore: update GpLink to GPLink
rvazarkar Jul 20, 2022
e3a9008
chore: add login script to rename all GpLink edges to GPLink
rvazarkar Jul 20, 2022
1d05d3f
docs: update sharphound commands with the proper collectionmethod param
rvazarkar Jul 20, 2022
50b8311
docs: add edge documentation for ReadLAPSPassword and ReadGMSAPassword
rvazarkar Jul 20, 2022
d63dbb4
docs: add Active/PIM Assignments to AZRole
rvazarkar Jul 20, 2022
e84b1a7
feat: add a bunch of properties to mapped properties for azure stuff
rvazarkar Jul 20, 2022
8864800
chore: fix formatting on some files
rvazarkar Jul 20, 2022
da44b51
feat: add HelpText for DCSync edge
rvazarkar Jul 20, 2022
3582a3c
docs: add DCSync edge to RTD
rvazarkar Jul 20, 2022
0e22048
fix: error in extranodeprops arrays
rvazarkar Jul 20, 2022
5d51cb8
fix: fix id error in QueryCustomCreate
rvazarkar Jul 20, 2022
8148037
better display descriptions for links, added more references
urangel Jul 21, 2022
a1b3250
Merge branch '4.2' of github.com:BloodHoundAD/BloodHound into az_help…
urangel Jul 21, 2022
ceb1851
Merge pull request #558 from BloodHoundAD/az_help_modals
urangel Jul 21, 2022
3d311ab
fix: center alert container
urangel Jul 22, 2022
f34d642
fix: blast post-processed edges before starting post-processing
rvazarkar Jul 22, 2022
c0634a6
Compress app and cloud app admin post processing
andyrobbins Jul 23, 2022
baacb29
Remove :AZUser node label requirement on password reset logic
andyrobbins Jul 23, 2022
7c6cc98
Ingest AZDevice MDM identifier
andyrobbins Jul 23, 2022
6ce0669
Fix Azure post processed edge removal query
andyrobbins Jul 23, 2022
31a434b
Fix Azure post process edge removal (attempt numero dos)
andyrobbins Jul 23, 2022
0c4c7eb
Fix some post-process bugs
andyrobbins Jul 23, 2022
3209a76
Don't need :auto when executing call {} via bolt
andyrobbins Jul 23, 2022
35b4e8d
objectids are case sensitive
andyrobbins Jul 24, 2022
0f11186
Fix AZExecuteCommand false positive edges
andyrobbins Jul 24, 2022
4ea15cd
feat: use neo4j 4.4+ batch statements for ingest
rvazarkar Jul 25, 2022
ddaf088
Update AZRole entity panel
andyrobbins Jul 25, 2022
b12f7d4
Fix assignment queries to include group nested members
andyrobbins Jul 25, 2022
ade7fa7
feat: add eslint
rvazarkar Jul 25, 2022
b44fe74
Merge remote-tracking branch 'origin/4.2' into 4.2
rvazarkar Jul 25, 2022
67e07f0
Fix inbound control queries on mgmt group
andyrobbins Jul 25, 2022
800fca3
Add descendent objects section to mgmt group
andyrobbins Jul 25, 2022
cfee1f0
Add inbound object control to AZSubscription panel
andyrobbins Jul 25, 2022
da3568e
Need to import NodePlayCypherLink
andyrobbins Jul 25, 2022
537e2ab
Use consistent collapsible section header casing
andyrobbins Jul 25, 2022
8f17664
Fix unrolled controllers query
andyrobbins Jul 25, 2022
ca8341c
Use consistent casing in collapsible section headers
andyrobbins Jul 25, 2022
17339af
Fix AZVM cypher queries
andyrobbins Jul 25, 2022
e6ed7fc
Use consistent casing in collapsible section headers
andyrobbins Jul 25, 2022
7fa8656
Fix key vault cypher queries
andyrobbins Jul 25, 2022
600811a
Fix keyvault unrolled controllers intermediary label
andyrobbins Jul 25, 2022
b54241a
Remove node label restriction on AZResetPassword logic
andyrobbins Jul 25, 2022
32905ce
Add AZGlobalAdmin and AZPrivilegedRoleAdmin post process logic
andyrobbins Jul 25, 2022
299c1d9
fix: fix styling for azrole
rvazarkar Jul 25, 2022
68fbc85
Merge remote-tracking branch 'origin/4.2' into 4.2
rvazarkar Jul 25, 2022
7b64145
Fix XSS by rewriting help text modals as JSX
Jul 20, 2022
3470e86
fix: distinct Role assignments for AZUser
rvazarkar Jul 26, 2022
6760f5c
chore: bump version to 4.2.0
rvazarkar Jul 26, 2022
3877701
Merge remote-tracking branch 'rtpt-jonaslieb/xss_fix_jsx' into 4.2
rvazarkar Jul 26, 2022
dad9741
Merge remote-tracking branch 'origin/master' into 4.2
rvazarkar Jul 26, 2022
abdaa1c
Merge remote-tracking branch 'origin/master' into 4.2
rvazarkar Jul 26, 2022
9a2893e
fix: keyvault ingestion bug
rvazarkar Jul 26, 2022
5fb2ef8
fix: ingestion contains bug
rvazarkar Jul 26, 2022
85b0624
Revert "feat: use neo4j 4.4+ batch statements for ingest"
rvazarkar Jul 26, 2022
f1cbce3
convert remaining help texts to jsx
Jan-Kruse Jul 26, 2022
8fc27b1
Merge pull request #561 from Jan-Kruse/azure-help-jsx
rvazarkar Jul 26, 2022
edc98ea
feat: added post process progress element
urangel Jul 26, 2022
3dc9ad6
fix: add missing edgefilter stuff
rvazarkar Jul 29, 2022
de8e566
Merge remote-tracking branch 'origin/master' into 4.2
rvazarkar Jul 29, 2022
12e85c1
Merge branch 'master' of github.com:BloodHoundAD/BloodHound into 4.2
urangel Jul 29, 2022
cfd1e4a
Merge branch '4.2' of github.com:BloodHoundAD/BloodHound into 4.2
urangel Jul 29, 2022
379802c
fix: make roles unique across tenants during ingestion
urangel Jul 29, 2022
febdbf1
Added the SyncLAPSPassword edge with its documentation
simondotsh Jul 30, 2022
ee0831d
refactor post process functions to loop through array of post process…
urangel Aug 1, 2022
68bfaf5
Merge remote-tracking branch 'simondotsh/add_synclapspassword' into 4.2
rvazarkar Aug 1, 2022
5c332c8
chore: update SyncLAPSPassword modal to new format
rvazarkar Aug 1, 2022
07af1e2
chore: update SyncLAPSPassword post-processing to new format
rvazarkar Aug 1, 2022
12bf3d4
fix: node editor panel was broken
rvazarkar Aug 1, 2022
b3257c4
fix: post-processing for was wrong for SLP
rvazarkar Aug 1, 2022
f2819fa
feats: add hotkeys for expand/collapse search bar and for going back …
urangel Aug 1, 2022
cd44614
Update AZAddSecret abuse modal copy
andyrobbins Aug 1, 2022
4184b8d
Update AZAddSecret opsec modal text
andyrobbins Aug 1, 2022
b6d6465
Update AZResetPassword abuse modal text
andyrobbins Aug 1, 2022
3d4f26c
fix: abuse panel broken
rvazarkar Aug 1, 2022
0032f84
Merge remote-tracking branch 'origin/4.2' into 4.2
rvazarkar Aug 1, 2022
ea730ea
Update AZResetPassword opsec modal text
andyrobbins Aug 1, 2022
fa7193c
Update AZVMContributor abuse modal text
andyrobbins Aug 1, 2022
d69f92e
Update AZAvereContributor abuse modal text
andyrobbins Aug 1, 2022
6320b67
Update AZAvereContributor opsec modal text
andyrobbins Aug 1, 2022
26e5607
Update MenuContainer.jsx
andyrobbins Aug 1, 2022
fb61577
Update AZExecuteCommand general text
andyrobbins Aug 1, 2022
c5e5096
Update AZExecuteCommand abuse modal text
andyrobbins Aug 1, 2022
c45bf8f
Update AZExecuteCommand opsec modal text
andyrobbins Aug 1, 2022
427eff7
Update AZExecuteCommand references modal text
andyrobbins Aug 1, 2022
181493e
Update AZHasRole abuse modal text
andyrobbins Aug 1, 2022
7af20be
Update AZHasRole general modal text
andyrobbins Aug 1, 2022
0c35068
Update AZHasRole opsec modal text
andyrobbins Aug 1, 2022
7965f81
Update AZMemberOf general modal text
andyrobbins Aug 1, 2022
83e4458
Update AZMemberOf abuse modal text
andyrobbins Aug 1, 2022
ee6dfae
Update AZMemberOf opsec modal text
andyrobbins Aug 1, 2022
20a63b6
Update AZMemberOf references modal text
andyrobbins Aug 1, 2022
fdb59b0
Update AZVMAdminLogin abuse modal text
andyrobbins Aug 1, 2022
c5c4678
Update AZVMAdminLogin opsec modal text
andyrobbins Aug 1, 2022
01be9ca
fix: broken help modals
rvazarkar Aug 1, 2022
58356d7
feat: add WriteAccountRestrictions help modal based off AddAllowedToAct
rvazarkar Aug 2, 2022
0c36f64
chore: add prettierrc
rvazarkar Aug 2, 2022
7e45a47
fix: rename new help modal, add it to the help modal
rvazarkar Aug 2, 2022
8dc903b
chore: update eslintrc, random stuff
rvazarkar Aug 2, 2022
2406e57
fix: add new shortcuts to docs, fix some rst formatting
urangel Aug 2, 2022
7334c17
fix: don't create AZContains edges to ext users
rvazarkar Aug 2, 2022
fe7416b
Merge remote-tracking branch 'origin/4.2' into 4.2
rvazarkar Aug 2, 2022
e70f149
Small change to help text for WriteAccountRestrictions
dirkjanm Aug 2, 2022
871baa2
Merge pull request #567 from dirkjanm/patch-3
rvazarkar Aug 2, 2022
8ed8f99
Merge remote-tracking branch 'origin/master' into 4.2
rvazarkar Aug 2, 2022
4a20049
fix: upcase templateids in post
rvazarkar Aug 2, 2022
735f94b
chore: add timer for postprocessing
rvazarkar Aug 2, 2022
da9446e
chore: use correct header for user/group outbound control
rvazarkar Aug 2, 2022
88f0cf3
fix: wrong case for MDMAppId
rvazarkar Aug 2, 2022
d4326bc
chore: change dangerous rights to dangerous privileges
rvazarkar Aug 2, 2022
e25c440
Update AzureHound help rst
andyrobbins Aug 2, 2022
09cf125
Create azurehound-all-flags.rst
andyrobbins Aug 3, 2022
d6a5a29
Update index.rst
andyrobbins Aug 3, 2022
8123780
fix: bad cypher for SyncLAPSPassword
rvazarkar Aug 3, 2022
24a8887
Update copyright year and author info
andyrobbins Aug 3, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
35 changes: 35 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"env": {
"browser": true,
"node":true,
"es2021": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"prettier",
"plugin:react-hooks/recommended"
],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": [
"react"
],
"rules": {
},
"globals": {
"emitter": "writable",
"appStore": "writable",
"closeTooltip": "readonly",
"$": "readonly",
"sigma": "readonly",
"driver": "readonly",
"conf": "readonly",
"jQuery": "readonly"
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ npm-debug.log
*.csv
graph.json
.DS_Store
.idea
9 changes: 9 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"tabWidth": 4,
"trailingComma": "es5",
"semi": true,
"singleQuote": true,
"jsxSingleQuote": true,
"jsxBracketSameLine": true,
"printWidth": 120
}
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
# -- Project information -----------------------------------------------------

project = 'BloodHound'
copyright = '2020, Andy Robbins, Rohan Vazarkar, Will Schroeder'
author = 'Andy Robbins, Rohan Vazarkar, Will Schroeder'
copyright = '2016-2022, Andy Robbins, Rohan Vazarkar, Will Schroeder'
author = 'The BloodHound Enterprise Team'

# The full version, including alpha/beta/rc tags
release = '3.0.3'
release = '4.2.0'


# -- General configuration ---------------------------------------------------
Expand Down
35 changes: 31 additions & 4 deletions docs/data-analysis/bloodhound-gui.rst
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,21 @@ any particular attack primitive:
:width: 900px
:alt: Right click edge and get help

Finally, there are two keyboard shortcuts when the graph rendering area has
Finally, there are four keyboard shortcuts when the graph rendering area has
focus:

* **CTRL**: Pressing CTRL will cycle through the three different node label
* **CTRL**: Pressing `CTRL` will cycle through the three different node label
display settings - default, always show, always hide.
* **Spacebar**: Pressing spacebar will bring up the spotlight window, which
* **Spacebar**: Pressing `spacebar` will bring up the spotlight window, which
lists all nodes that are currently drawn. Click an item in the list and the
GUI will zoom into and briefly highlight that node.
* **Backspace**: Pressing `backspace` will go back to the previous graph result
rendering. This is the same functionality as clicking the `Back` button in
the search bar.
* **S**: Pressing the letter `s` will toggle the expansion or collapse of
the information panel below the search bar. This is the same functionality
as clicking the `More Info` button in the search bar.


Search Bar
----------
Expand All @@ -142,12 +149,32 @@ groups with the word "Admin" in them with this search:

You can prepend your search with the following node types:

Active Directory
++++++++++++++++

* Group
* Domain
* Computer
* User
* OU
* GPO
* Container

Azure
++++++

* AZApp
* AZRole
* AZDevice
* AZGroup
* AZKeyVault
* AZManagementGroup
* AZResourceGroup
* AZServicePrincipal
* AZSubscription
* AZTenant
* AZUser
* AZVM

Pathfinding
-----------
Expand Down Expand Up @@ -206,7 +233,7 @@ going down:
* **Refresh**: Re-run the last query and display the results
* **Export Graph**: Export the currently rendered graph in JSON format
* **Import Graph**: Select a JSON formatted graph for the GUI to render
* **Upload Data**: Select your SharpHound data to upload to neo4j
* **Upload Data**: Select your SharpHound or AzureHound data to upload to neo4j
* **Change Layout Type**: Switch between hierarchial or force directed layout
* **Settings**: Configure node and edge display settings, as well as query debug mode,
low detail mode, and dark mode here.
Expand Down
Loading