BytecodeDL · waderwu · Jan 2, 2024 · Dec 28, 2023 · Dec 28, 2023 · Dec 30, 2023
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,23 +1,16 @@
 version: '2.4'
 services:
   bytecodedl:
-    image: wuxxxxx/bytecodedl:1.0.0
+    image: wuxxxxx/bytecodedl:1.0.1
     restart: always
     command: sleep infinity
     volumes:
         - ./:/bytecodedl
   neo:
-    image: neo4j:4.4.4-community
+    image: wuxxxxx/neo4j-server:5.12.0-bytecodedl-pathfinder-1.0.1 
     restart: always
     ports:
       - "0.0.0.0:7474:7474"
       - "0.0.0.0:7687:7687"
-    environment:
-      - NEO4J_AUTH=neo4j/bytecodedl
-      - NEO4J_apoc_export_file_enabled=true
-      - NEO4J_apoc_import_file_enabled=true
-      - NEO4J_apoc_import_file_use__neo4j__config=true
-      - NEO4JLABS_PLUGINS=["apoc"]
-      - NEO4J_dbms_security_procedures_unrestricted=apoc.*
     volumes:
-        - ./:/bytecodedl
+        - ./:/bytecodedl
diff --git a/example/cha-log4shell.dl b/example/cha-log4shell.dl
@@ -0,0 +1,18 @@
+#define MAXSTEP 33
+#define CHAO 1
+
+#include "../logic/cha.dl"
+
+BanCaller(method) :-
+    MethodInfo(method, _, _, class, _, _, _),
+    !contains("org.apache.logging.log4j", class).
+
+
+SinkDesc("lookup", "javax.naming.Context").
+
+// init entrypoint 
+EntryPoint(simplename, descriptor, class) :-
+    MethodInfo(_, simplename, _, class, _, descriptor, _),
+    simplename = "error",
+    class = "org.apache.logging.log4j.spi.AbstractLogger",
+    descriptor = "(Ljava/lang/String;)V".
diff --git a/logic/cha.dl b/logic/cha.dl
@@ -123,10 +123,10 @@ CallNode(node, "entry") :-
     RefinedReachable(node),
     EntryMethod(node).
 
-.decl CallEdge(caller:Method, callee:Method)
+.decl CallEdge(caller:Method, insn:Insn, callee:Method)
 .output CallEdge
 
-CallEdge(caller, callee) :-
+CallEdge(caller, insn, callee) :-
     RefinedReachable(caller),
     RefinedReachable(callee),
-    CallGraph(_, caller, callee).
+    CallGraph(insn, caller, callee).
diff --git a/neo4j/CallEdgeHeader.csv b/neo4j/CallEdgeHeader.csv
@@ -1 +1 @@
-:START_ID(Method)	:END_ID(Method)
+:START_ID(Method)	insn	:END_ID(Method)
diff --git a/neoImportCall-4.4.sh b/neoImportCall-4.4.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+dbname=$1$(date "+%m%d%H%M")
+
+neo4j-admin database import full --relationships=Call="/bytecodedl/neo4j/CallEdgeHeader.csv,/bytecodedl/output/.*CallEdge.csv" --nodes="/bytecodedl/neo4j/CallNodeHeader.csv,/bytecodedl/output/.*CallNode.csv"  --delimiter="\t" $dbname
+
+if grep -q "dbms.active_database" /var/lib/neo4j/conf/neo4j.conf; then
+    sed -i -E "s/dbms.active_database=\w+/dbms.active_database=$dbname/g" /var/lib/neo4j/conf/neo4j.conf
+else
+    echo "dbms.active_database=$dbname" >> /var/lib/neo4j/conf/neo4j.conf
+fi
diff --git a/neoImportCall.sh b/neoImportCall.sh
@@ -2,10 +2,10 @@
 
 dbname=$1$(date "+%m%d%H%M")
 
-neo4j-admin import --relationships=Call="/bytecodedl/neo4j/CallEdgeHeader.csv,/bytecodedl/output/.*CallEdge.csv" --nodes="/bytecodedl/neo4j/CallNodeHeader.csv,/bytecodedl/output/.*CallNode.csv" --database=$dbname --delimiter="\t"
+neo4j-admin database import full --nodes="/bytecodedl/neo4j/CallNodeHeader.csv,/bytecodedl/output/.*CallNode.csv" --relationships=Call="/bytecodedl/neo4j/CallEdgeHeader.csv,/bytecodedl/output/CallEdge.csv" --delimiter="\t" $dbname
 
-if grep -q "dbms.active_database" /var/lib/neo4j/conf/neo4j.conf; then
-    sed -i -E "s/dbms.active_database=\w+/dbms.active_database=$dbname/g" /var/lib/neo4j/conf/neo4j.conf
+if grep -q "#initial.dbms.default_database" /var/lib/neo4j/conf/neo4j.conf; then
+    sed -i -E "s/#initial.dbms.default_database=\S+/initial.dbms.default_database=$dbname/g" /var/lib/neo4j/conf/neo4j.conf
 else
-    echo "dbms.active_database=$dbname" >> /var/lib/neo4j/conf/neo4j.conf
-fi
+    sed -i -E "s/initial.dbms.default_database=\S+/initial.dbms.default_database=$dbname/g" /var/lib/neo4j/conf/neo4j.conf
+fi
diff --git a/neoImportChaCall-4.4.sh b/neoImportChaCall-4.4.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+dbname=$1$(date "+%m%d%H%M")
+
+neo4j-admin database import --nodes=Method="/bytecodedl/neo4j/CallNodeHeader.csv,/bytecodedl/output/.*CallNode.csv" --relationships=Call="/bytecodedl/neo4j/CallEdgeHeader.csv,/bytecodedl/output/CallEdge.csv" --relationships=Cha="/bytecodedl/neo4j/ChaEdgeHeader.csv,/bytecodedl/output/ChaGraph.csv" --database=$dbname --delimiter="\t"
+
+if grep -q "dbms.active_database" /var/lib/neo4j/conf/neo4j.conf; then
+    sed -i -E "s/dbms.active_database=\w+/dbms.active_database=$dbname/g" /var/lib/neo4j/conf/neo4j.conf
+else
+    echo "dbms.active_database=$dbname" >> /var/lib/neo4j/conf/neo4j.conf
+fi
diff --git a/neoImportChaCall.sh b/neoImportChaCall.sh
@@ -2,10 +2,10 @@
 
 dbname=$1$(date "+%m%d%H%M")
 
-neo4j-admin import --nodes=Method="/bytecodedl/neo4j/CallNodeHeader.csv,/bytecodedl/output/.*CallNode.csv" --relationships=Call="/bytecodedl/neo4j/CallEdgeHeader.csv,/bytecodedl/output/CallEdge.csv" --relationships=Cha="/bytecodedl/neo4j/ChaEdgeHeader.csv,/bytecodedl/output/ChaGraph.csv" --database=$dbname --delimiter="\t"
+neo4j-admin database import full --nodes=Method="/bytecodedl/neo4j/CallNodeHeader.csv,/bytecodedl/output/.*CallNode.csv" --relationships=Call="/bytecodedl/neo4j/CallEdgeHeader.csv,/bytecodedl/output/CallEdge.csv" --relationships=Cha="/bytecodedl/neo4j/ChaEdgeHeader.csv,/bytecodedl/output/ChaEdge.csv" --delimiter="\t" $dbname
 
-if grep -q "dbms.active_database" /var/lib/neo4j/conf/neo4j.conf; then
-    sed -i -E "s/dbms.active_database=\w+/dbms.active_database=$dbname/g" /var/lib/neo4j/conf/neo4j.conf
+if grep -q "#initial.dbms.default_database" /var/lib/neo4j/conf/neo4j.conf; then
+    sed -i -E "s/#initial.dbms.default_database=\w+/initial.dbms.default_database=$dbname/g" /var/lib/neo4j/conf/neo4j.conf
 else
-    echo "dbms.active_database=$dbname" >> /var/lib/neo4j/conf/neo4j.conf
-fi
+    sed -i -E "s/initial.dbms.default_database=\w+/initial.dbms.default_database=$dbname/g" /var/lib/neo4j/conf/neo4j.conf
+fi
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		:START_ID(Method) :END_ID(Method)
		:START_ID(Method) insn :END_ID(Method)