Internal 172 canvas bug (#180)

* graphql query fixes * extended DGraph TTL to 13 months * remove console.log * cargo update
grapl-security · Jul 23, 2020 · 6bb2b0b · 6bb2b0b
1 parent 1e603a1
commit 6bb2b0b
Show file tree

Hide file tree

Showing 4 changed files with 362 additions and 272 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -278,7 +278,7 @@ services:
       - "IS_LOCAL=True"
       - MG_ALPHAS=master_graph:9080
       - GRAPL_LOG_LEVEL=${GRAPL_LOG_LEVEL:-ERROR}
-      - GRAPL_DGRAPH_TTL_S=${GRAPL_DGRAPH_TTL_S:-600}
+      - GRAPL_DGRAPH_TTL_S=${GRAPL_DGRAPH_TTL_S:-31536000}
       - GRAPL_TTL_DELETE_BATCH_SIZE=${GRAPL_TTL_DELETE_BATCH_SIZE:-10}
     tty: true
     links:

diff --git a/src/js/graphql_endpoint/modules/schema.js b/src/js/graphql_endpoint/modules/schema.js
@@ -317,7 +317,7 @@ const getLensByName = async (dg_client, lensName) => {
                 uid,
                 dgraph_type: dgraph.type,
                 lens_type,
-                scope {
+                scope @filter(has(node_key)) {
                     uid,
                     dgraph_type: dgraph.type,
                     expand(_all_)
@@ -364,13 +364,17 @@ const getRisksFromNode = async (dg_client, nodeUid) => {
     const query = `
     query all($a: string)
     {
-        all(func: uid($a))
+        all(func: uid($a)) @cascade
         {
             uid,
+            dgraph_type: dgraph.type
+            node_key
             risks {
-                uid,
+                uid
                 dgraph_type: dgraph.type
-                expand(_all_),
+                node_key
+                analyzer_name
+                risk_score
             }
         }
     }`;
@@ -416,8 +420,13 @@ const handleLensScope = async (parent, args) => {
     const lens_name = args.lens_name;
 
     const lens = await getLensByName(dg_client, lens_name);
+    lens["scope"] = lens["scope"] || [];
+
     for (const node of lens["scope"]) {
         // node.uid = parseInt(node.uid, 16);
+        if(!node.dgraph_type){
+            console.warn("No DGraph Type", node)
+        }
         // for every node in our lens scope, get its neighbors
 
         const nodeEdges = await getNeighborsFromNode(dg_client, node["uid"]);

diff --git a/src/python/grapl-model-plugin-deployer/src/grapl_model_plugin_deployer.py b/src/python/grapl-model-plugin-deployer/src/grapl_model_plugin_deployer.py
@@ -73,7 +73,7 @@
 
 ORIGIN_OVERRIDE = os.environ.get("ORIGIN_OVERRIDE", None)
 
-LOGGER.debug("Origin: ", origin)
+LOGGER.debug("Origin: ", ORIGIN)
 app = Chalice(app_name="model-plugin-deployer")