update logic

Author: cokeBeer

.gitignore

@@ -81,6 +81,7 @@ gostd*.json
 init*.json
 callgraph.json
 passthrough.json
+additional.json
 
 # BENCH FILE #
 ######################

cmd/taintanalysis/main.go

@@ -9,16 +9,16 @@ import (
 func main() {
 	// the ../../ takes you back to root of the project
 	// and the ... means scan packages in package pkg recursively
-	runner := taint.NewRunner(taint.Gostd...)
+	runner := taint.NewRunner("../../pkg...")
 	// the module name is the name defined in go.mod
 	runner.ModuleName = "github.com/cokeBeer/goot"
-	runner.PassThroughSrcPath = ""
+	runner.PassThroughSrcPath = []string{}
 	runner.PassThroughDstPath = "passthrough.json"
 	runner.CallGraphDstPath = "callgraph.json"
-	runner.PassThroughOnly = true
+	runner.PassThroughOnly = false
 	runner.InitOnly = false
 	runner.Debug = true
-	runner.PersistToNeo4j = true
+	runner.PersistToNeo4j = false
 	runner.Neo4jURI = "bolt://localhost:7687"
 	runner.Neo4jUsername = "neo4j"
 	runner.Neo4jPassword = "password"

pkg/example/dataflow/taint/persist.go

@@ -86,18 +86,24 @@ func PersistToNeo4j(nodes *map[string]*Node, edges *map[string]*Edge, uri string
 }
 
 // FetchPassThrough loads passthrougth data from target source
-func FetchPassThrough(passThroughContainer *map[string][][]int, src string) error {
-	f, err := os.OpenFile(src, os.O_RDONLY|os.O_CREATE, 0666)
-	if err != nil {
-		return err
-	}
-	res, err := io.ReadAll(f)
-	if err != nil {
-		return err
-	}
-	err = json.Unmarshal(res, passThroughContainer)
-	if err != nil {
-		return err
+func FetchPassThrough(passThroughContainer *map[string][][]int, src []string) error {
+	for _, path := range src {
+		tmp := make(map[string][][]int)
+		f, err := os.OpenFile(path, os.O_RDONLY|os.O_CREATE, 0666)
+		if err != nil {
+			return err
+		}
+		res, err := io.ReadAll(f)
+		if err != nil {
+			return err
+		}
+		err = json.Unmarshal(res, &tmp)
+		if err != nil {
+			return err
+		}
+		for k, v := range tmp {
+			(*passThroughContainer)[k] = v
+		}
 	}
 	return nil
 }

pkg/example/dataflow/taint/runner.go

@@ -14,7 +14,7 @@ type Runner struct {
 	Debug              bool
 	InitOnly           bool
 	PassThroughOnly    bool
-	PassThroughSrcPath string
+	PassThroughSrcPath []string
 	PassThroughDstPath string
 	CallGraphDstPath   string
 	Ruler              rule.Ruler
@@ -27,7 +27,7 @@ type Runner struct {
 // NewRunner returns a *taint.Runner
 func NewRunner(PkgPath ...string) *Runner {
 	return &Runner{PkgPath: PkgPath, ModuleName: "",
-		PassThroughSrcPath: "", PassThroughDstPath: "",
+		PassThroughSrcPath: nil, PassThroughDstPath: "",
 		CallGraphDstPath: "", Ruler: nil,
 		Debug: false, InitOnly: false, PassThroughOnly: false,
 		PersistToNeo4j: false, Neo4jURI: "", Neo4jUsername: "", Neo4jPassword: ""}
@@ -65,10 +65,12 @@ func (r *Runner) Run() error {
 	callGraph := NewCallGraph(&funcs, ruler)
 
 	passThroughContainter := make(map[string][][]int)
-	if r.PassThroughSrcPath != "" {
+	if r.PassThroughSrcPath != nil {
 		FetchPassThrough(&passThroughContainter, r.PassThroughSrcPath)
 	}
 
+	passThroughContainter["github.com/cokeBeer/goot/pkg/bench/copy.Copy"] = [][]int{{0}, {0, 1}}
+
 	initMap := make(map[string]*ssa.Function)
 	history := make(map[string]bool)
 

pkg/example/dataflow/taint/switcher.go

@@ -1288,13 +1288,15 @@ func (s *TaintSwitcher) passStaticCallTaint(f *ssa.Function, inst *ssa.Call) {
 			}
 		} else {
 			// if the function has no receiver
-			if f.Signature.Results().Len() == 1 {
-				// if the function has one result
-				(*s.outMap)[inst.Name()] = newTaints[i]
-			} else if i < f.Signature.Results().Len() {
-				// else mark the variables as "inst.Name().X"
-				// e.g. t0.1, t0.2
-				(*s.outMap)[inst.Name()+"."+strconv.Itoa(i)] = newTaints[i]
+			if i < f.Signature.Results().Len() {
+				if f.Signature.Results().Len() == 1 {
+					// if the function has one result
+					(*s.outMap)[inst.Name()] = newTaints[i]
+				} else {
+					// else mark the variables as "inst.Name().X"
+					// e.g. t0.1, t0.2
+					(*s.outMap)[inst.Name()+"."+strconv.Itoa(i)] = newTaints[i]
+				}
 			} else {
 				// update args' taint
 				(*s.outMap)[inst.Call.Args[i-f.Signature.Results().Len()].Name()] = newTaints[i]
@@ -1519,13 +1521,15 @@ func (s *TaintSwitcher) passMethodTaint(f *ssa.Function, inst *ssa.Call) {
 				s.passPointTaint(newTaints[i], inst.Call.Value)
 			}
 		} else {
-			if f.Signature.Results().Len() == 1 {
-				// if the function has one result
-				(*s.outMap)[inst.Name()] = newTaints[i]
-			} else if i < 1+f.Signature.Results().Len() {
-				// else mark the variables as "inst.Name().X"
-				// e.g. t0.1, t0.2
-				(*s.outMap)[inst.Name()+"."+strconv.Itoa(i-1)] = newTaints[i]
+			if i < 1+f.Signature.Results().Len() {
+				if f.Signature.Results().Len() == 1 {
+					// if the function has one result
+					(*s.outMap)[inst.Name()] = newTaints[i]
+				} else {
+					// else mark the variables as "inst.Name().X"
+					// e.g. t0.1, t0.2
+					(*s.outMap)[inst.Name()+"."+strconv.Itoa(i-1)] = newTaints[i]
+				}
 			} else {
 				// update args' taint
 				(*s.outMap)[inst.Call.Args[i-f.Signature.Results().Len()-1].Name()] = newTaints[i]