button text fix

skelsec · Mar 5, 2021 · a2611ff · a2611ff
1 parent 690ab3f
commit a2611ff
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 23 deletions.
diff --git a/jackdaw/nest/api/graph.py b/jackdaw/nest/api/graph.py
@@ -202,15 +202,8 @@ def query_path_da(graphid, exclude = None, format = 'vis'):
 		pathonly = True
 
 	exclude_edgetypes = __exclude_parse(exclude)
-	print(exclude_edgetypes)
 	da_sids = {}
-	#searching for domain admin SID
 
-	#for node in current_app.config['JACKDAW_GRAPH_DICT'][graphid].get_node():
-	#	print(node)
-	#	if node.id == current_app.config['JACKDAW_GRAPH_DICT'][graphid].domain_sid + '-512':
-	#		da_sids[node.id] = 1
-	#print(current_app.config['JACKDAW_GRAPH_DICT'][graphid].domain_id)
 	for domain_id in current_app.config['JACKDAW_GRAPH_DICT'][graphid].adids:
 		for res in current_app.db.session.query(Group).filter_by(ad_id = domain_id).filter(Group.objectSid.like('%-512')).all():
 			da_sids[res.objectSid] = 0

diff --git a/jackdaw/nest/site/nui/client/Pages/GraphPage/index.js b/jackdaw/nest/site/nui/client/Pages/GraphPage/index.js
@@ -735,22 +735,22 @@ class GraphPageComponent extends ApiClient {
                     <RequestModifier onChange={this.setModifiers}/>
                 </Box>
                 <VBox className="margin-top">
-                    <Box className="margin-top margin-bottom">
+					<Box className="margin-top">
                         <Button
                             color="primary"
                             variant="contained"
-                            onClick={() => this.fetchGraph('domainadmins')}
+                            onClick={() => this.fetchGraph('path')}
                         >
-                            Draw Domain Admins
+                            Shortest Path from SRC to DST
                         </Button>
                     </Box>
-                    <Box className="margin-top">
+                    <Box className="margin-top margin-bottom">
                         <Button
                             color="primary"
                             variant="contained"
-                            onClick={() => this.fetchGraph('path')}
+                            onClick={() => this.fetchGraph('domainadmins')}
                         >
-                            Draw Path
+                            Shortest Paths to Domain Admins
                         </Button>
                     </Box>
                     <Box className="margin-top">
@@ -759,7 +759,7 @@ class GraphPageComponent extends ApiClient {
                             variant="contained"
                             onClick={() => this.fetchGraph('ownedtoda')}
                         >
-                            Draw Path from Owned users to DA
+                            Shortest Paths from Owned users to DA
                         </Button>
                     </Box>
                     <Box className="margin-top">
@@ -768,7 +768,7 @@ class GraphPageComponent extends ApiClient {
                             variant="contained"
                             onClick={() => this.fetchGraph('fromowned')}
                         >
-                            Draw Path from Owned users to anywhere
+                            Shortest Paths from Owned users to Anywhere
                         </Button>
                     </Box>
                     <Box className="margin-top">
@@ -786,7 +786,7 @@ class GraphPageComponent extends ApiClient {
                             variant="contained"
                             onClick={() => this.fetchGraph('kerberoasttoda')}
                         >
-                            Drwaw Path from Kerberoastable users to DA
+                            Shortest Paths from Kerberoastable users to DA
                         </Button>
                     </Box>
                     <Box className="margin-top">
@@ -795,7 +795,7 @@ class GraphPageComponent extends ApiClient {
                             variant="contained"
                             onClick={() => this.fetchGraph('kerberoastany')}
                         >
-                            Drwaw Path from Kerberoastable users to anywhere
+                            Shortest Paths from Kerberoastable users to anywhere
                         </Button>
                     </Box>
                     <Box className="margin-top">
@@ -804,7 +804,7 @@ class GraphPageComponent extends ApiClient {
                             variant="contained"
                             onClick={() => this.fetchGraph('asreproastda')}
                         >
-                            Drwaw Path from ASREProastable users to DA
+                            Shortest Paths from ASREProastable users to DA
                         </Button>
                     </Box>
                     <Box className="margin-top">
@@ -813,7 +813,7 @@ class GraphPageComponent extends ApiClient {
                             variant="contained"
                             onClick={() => this.fetchGraph('asreproast')}
                         >
-                            Drwaw Path from ASREProastable users to DA
+                            Shortest Paths from ASREProastable users to DA
                         </Button>
                     </Box>
                     <Box className="margin-top">
@@ -822,7 +822,7 @@ class GraphPageComponent extends ApiClient {
                             variant="contained"
                             onClick={() => this.fetchGraph('highvalue')}
                         >
-                            Draw user paths to High Value targets
+                            Shortest Paths to High Value targets
                         </Button>
                     </Box>
 					<Box className="margin-top">
@@ -831,7 +831,7 @@ class GraphPageComponent extends ApiClient {
                             variant="contained"
                             onClick={() => this.fetchGraph('fromownedtohighvalue')}
                         >
-                            Draw paths from owned users to high value targets
+                            Shortest Paths from Owned users to High value targets
                         </Button>
                     </Box>
 					<Box className="margin-top">

diff --git a/jackdaw/nest/site/nui/dist/bundle.js b/jackdaw/nest/site/nui/dist/bundle.js