update

wh1t3p1g · wh1t3p1g · commit 5c293e120bdb · 2023-11-21T22:07:13.000+08:00
diff --git a/src/main/java/tabby/algo/beta/PathFinding.java b/src/main/java/tabby/algo/beta/PathFinding.java
@@ -1,4 +1,4 @@
-package tabby.algo;
+package tabby.algo.beta;
 
 import org.neo4j.graphalgo.BasicEvaluationContext;
 import org.neo4j.graphalgo.impl.path.TraversalPathFinder;
@@ -20,7 +20,7 @@
  * @author wh1t3p1g
  * @since 2022/1/6
  */
-public class NewPathFinding {
+public class PathFinding {
 
     @Context
     public GraphDatabaseService db;
@@ -62,7 +62,7 @@ public Stream<PathResult> findPathWithState(@Name("source") Node sourceNode,
     }
 
     @Procedure("tabby.beta.findPathWithAuth")
-    @Description("tabby.beta.findPath(source, sink, maxNodeLength, isDepthFirst) YIELD path, weight" +
+    @Description("tabby.beta.findPathWithAuth(source, sink, maxNodeLength, isDepthFirst) YIELD path, weight" +
             " - using findPath to get source-sink path with maxNodeLength")
     public Stream<PathResult> findPathWithAuth(@Name("source") Node sourceNode,
                                                 @Name("sink") Node sinkNode,
diff --git a/src/main/java/tabby/algo/release/JavaGadgetPathFinding.java b/src/main/java/tabby/algo/release/JavaGadgetPathFinding.java
@@ -1,4 +1,4 @@
-package tabby.algo;
+package tabby.algo.release;
 
 import org.neo4j.graphalgo.BasicEvaluationContext;
 import org.neo4j.graphdb.*;
diff --git a/src/main/java/tabby/algo/release/PathFinding.java b/src/main/java/tabby/algo/release/PathFinding.java
@@ -1,4 +1,4 @@
-package tabby.algo;
+package tabby.algo.release;
 
 import org.neo4j.graphalgo.BasicEvaluationContext;
 import org.neo4j.graphalgo.impl.path.TraversalPathFinder;
diff --git a/src/main/java/tabby/data/Pollution.java b/src/main/java/tabby/data/Pollution.java
@@ -52,7 +52,7 @@ public Set<Integer> getFlatPolluted(){
     }
 
     public Set<String> getTypes(int index){
-        if(types.size() < index) return new HashSet<>();
+        if(types.size() <= index) return new HashSet<>();
         return types.get(index);
     }
 
@@ -99,8 +99,11 @@ public static Pollution getNextPollution(Pollution pre, Pollution cur){
                         next.add(Set.of(index-1));
                         flag = false;
                     }
-                    int pos = p+1;
-                    if(pos < pre.getTypes().size() && pos >= 0 && !cur.isCallerInstanceObj()){
+                }
+
+                int pos = p+1;
+                if(pos < pre.getTypes().size() && pos >= 0){
+                    if(index != 0 || !cur.isCallerInstanceObj()){
                         newTypes.addAll(pre.getTypes(pos));
                     }
                 }
@@ -224,7 +227,7 @@ public static Pollution pure(Node start, Node end, Pollution cur){
 
         if(!types.isEmpty()){
             Set<String> baseObjTypes = types.get(0);
-            if(baseObjTypes.size() > 0){
+            if(baseObjTypes.size() > 0 && !baseObjTypes.contains("java.lang.Object")){
                 try{
                     String startNodeClazz = (String) start.getProperty("CLASSNAME");
                     if(startNodeClazz != null && !startNodeClazz.isBlank()){

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package tabby.algo;`
	`1`	`+package tabby.algo.release;`
`2`	`2`
`3`	`3`	`import org.neo4j.graphalgo.BasicEvaluationContext;`
`4`	`4`	`import org.neo4j.graphdb.*;`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public Set<Integer> getFlatPolluted(){`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public Set<String> getTypes(int index){`
`55`		`- if(types.size() < index) return new HashSet<>();`
	`55`	`+ if(types.size() <= index) return new HashSet<>();`
`56`	`56`	`return types.get(index);`
`57`	`57`	`}`
`58`	`58`
`@@ -99,8 +99,11 @@ public static Pollution getNextPollution(Pollution pre, Pollution cur){`
`99`	`99`	`next.add(Set.of(index-1));`
`100`	`100`	`flag = false;`
`101`	`101`	`}`
`102`		`- int pos = p+1;`
`103`		`- if(pos < pre.getTypes().size() && pos >= 0 && !cur.isCallerInstanceObj()){`
	`102`	`+ }`
	`103`	`+`
	`104`	`+ int pos = p+1;`
	`105`	`+ if(pos < pre.getTypes().size() && pos >= 0){`
	`106`	`+ if(index != 0 \|\| !cur.isCallerInstanceObj()){`
`104`	`107`	`newTypes.addAll(pre.getTypes(pos));`
`105`	`108`	`}`
`106`	`109`	`}`
`@@ -224,7 +227,7 @@ public static Pollution pure(Node start, Node end, Pollution cur){`
`224`	`227`
`225`	`228`	`if(!types.isEmpty()){`
`226`	`229`	`Set<String> baseObjTypes = types.get(0);`
`227`		`- if(baseObjTypes.size() > 0){`
	`230`	`+ if(baseObjTypes.size() > 0 && !baseObjTypes.contains("java.lang.Object")){`
`228`	`231`	`try{`
`229`	`232`	`String startNodeClazz = (String) start.getProperty("CLASSNAME");`
`230`	`233`	`if(startNodeClazz != null && !startNodeClazz.isBlank()){`