Merge pull request #608 from elonzh/fix/log-password

lance6716 · web-flow · commit 75dfa5355429 · 2021-10-07T21:33:38.000+08:00
hidden mysql password in log
diff --git a/dump/dumper.go b/dump/dumper.go
@@ -164,7 +164,9 @@ func (d *Dumper) Dump(w io.Writer) error {
 	}
 
 	args = append(args, fmt.Sprintf("--user=%s", d.User))
-	args = append(args, fmt.Sprintf("--password=%s", d.Password))
+	passwordArg := fmt.Sprintf("--password=%s", d.Password)
+	args = append(args, passwordArg)
+	passwordArgIndex := len(args) - 1
 
 	if !d.masterDataSkipped {
 		args = append(args, "--master-data")
@@ -238,7 +240,9 @@ func (d *Dumper) Dump(w io.Writer) error {
 		}
 	}
 
+	args[passwordArgIndex] = "--password=******"
 	log.Infof("exec mysqldump with %v", args)
+	args[passwordArgIndex] = passwordArg
 	cmd := exec.Command(d.ExecutionPath, args...)
 
 	cmd.Stderr = d.ErrOut

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,9 @@ func (d *Dumper) Dump(w io.Writer) error {`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`args = append(args, fmt.Sprintf("--user=%s", d.User))`
`167`		`- args = append(args, fmt.Sprintf("--password=%s", d.Password))`
	`167`	`+ passwordArg := fmt.Sprintf("--password=%s", d.Password)`
	`168`	`+ args = append(args, passwordArg)`
	`169`	`+ passwordArgIndex := len(args) - 1`
`168`	`170`
`169`	`171`	`if !d.masterDataSkipped {`
`170`	`172`	`args = append(args, "--master-data")`
`@@ -238,7 +240,9 @@ func (d *Dumper) Dump(w io.Writer) error {`
`238`	`240`	`}`
`239`	`241`	`}`
`240`	`242`
	`243`	`+ args[passwordArgIndex] = "--password=******"`
`241`	`244`	`log.Infof("exec mysqldump with %v", args)`
	`245`	`+ args[passwordArgIndex] = passwordArg`
`242`	`246`	`cmd := exec.Command(d.ExecutionPath, args...)`
`243`	`247`
`244`	`248`	`cmd.Stderr = d.ErrOut`