adding owned to hvt calc option

buildnode.sql

@@ -0,0 +1,6 @@
+.open /home/devel/Desktop/AD2.db
+.mode csv
+.output workdir/graphcache/1/networkx.csv
+.separator " "
+SELECT src,dst FROM adedges, adedgelookup WHERE adedges.graph_id = 1 AND adedgelookup.id = adedges.src AND adedgelookup.oid IS NOT NULL;
+.exit

jackdaw/nest/api/graph.py

@@ -399,6 +399,42 @@ def query_path_fromowned(graphid, exclude = None, format = 'vis'):
 
 	return res.to_dict(format = format)
 
+def query_path_fromowned_tohighvalue(graphid, exclude = None, format = 'vis'):
+	exclude_edgetypes = __exclude_parse(exclude)
+	if graphid not in current_app.config['JACKDAW_GRAPH_DICT']:
+		load(graphid)
+
+	source_sids = {}
+
+	for domain_id in current_app.config['JACKDAW_GRAPH_DICT'][graphid].adids:
+		for res in current_app.db.session.query(EdgeLookup.oid)\
+			.filter_by(ad_id = domain_id)\
+			.filter(EdgeLookup.oid == ADObjProps.oid)\
+			.filter(ADObjProps.graph_id == graphid)\
+			.filter(ADObjProps.prop == 'OWNED')\
+			.all():
+
+			source_sids[res[0]] = 0
+
+	target_sids = {}
+
+	for domain_id in current_app.config['JACKDAW_GRAPH_DICT'][graphid].adids:
+		for res in current_app.db.session.query(EdgeLookup.oid)\
+			.filter_by(ad_id = domain_id)\
+			.filter(EdgeLookup.oid == ADObjProps.oid)\
+			.filter(ADObjProps.graph_id == graphid)\
+			.filter(ADObjProps.prop == 'HVT')\
+			.all():
+
+			target_sids[res[0]] = 0
+
+	res = GraphData()
+	for src_sid in source_sids:
+		for dst_sid in target_sids:
+			res += current_app.config['JACKDAW_GRAPH_DICT'][graphid].shortest_paths(src_sid=src_sid, dst_sid=dst_sid, exclude = exclude_edgetypes)
+
+	return res.to_dict(format = format)
+
 
 def list_nodes(graphid, with_data = False):
 	if graphid not in current_app.config['JACKDAW_GRAPH_DICT']:

jackdaw/nest/api/swagger.yaml

@@ -484,6 +484,39 @@ paths:
                 type: string
                 description: TODO
 
+  /graph/{graphid}/query/path/fromownedtohighvalue/:
+    get:
+      operationId: jackdaw.nest.api.graph.query_path_fromowned_tohighvalue
+      tags:
+        - Graph
+      summary: Paths from owned users to highvalue targets
+      description: Paths from owned users to highvalue targets
+      parameters:
+        - name: graphid
+          in: path
+          description: ID of the graph view
+          type: integer
+          required: True
+        - name: format
+          in: query
+          description: return format. either vis or d3
+          type: string
+          required: False
+        - name: exclude
+          in: query
+          description: edge type to be excluded in the path calc
+          required: False
+          type: string
+      responses:
+        200:
+          description: TODO
+          schema:
+            type: object
+            properties:
+              graph:
+                type: string
+                description: TODO
+
   /graph/{graphid}/query/path/tohighvalue/:
     get:
       operationId: jackdaw.nest.api.graph.query_path_tohighvalue

jackdaw/nest/site/nui/client/Pages/GraphPage/index.js

@@ -431,6 +431,9 @@ class GraphPageComponent extends ApiClient {
             case "highvalue":
                 url = `/graph/${this.state.graph}/query/path/tohighvalue${excludeParameter}`;
                 break;
+			case "fromownedtohighvalue":
+				url = `/graph/${this.state.graph}/query/path/fromownedtohighvalue${excludeParameter}`;
+				break;
             default:
                 return;
         }
@@ -818,6 +821,15 @@ class GraphPageComponent extends ApiClient {
                         >
                             Draw user paths to High Value targets
                         </Button>
+                    </Box>
+					<Box className="margin-top">
+                        <Button
+                            color="primary"
+                            variant="contained"
+                            onClick={() => this.fetchGraph('fromownedtohighvalue')}
+                        >
+                            Draw paths from owned users to high value targets
+                        </Button>
                     </Box>
                 </VBox>
             </VBox>