*: hide secure information in SHOW PROCESSLIST

ast/ast.go

@@ -37,6 +37,8 @@ type Node interface {
 	Text() string
 	// SetText sets original text to the Node.
 	SetText(text string)
+	// SecureText is different from Text that it hide password information.
+	SecureText() string
 }
 
 // Flags indicates whether an expression contains certain types of expression.

ast/base.go

@@ -31,6 +31,11 @@ func (n *node) Text() string {
 	return n.text
 }
 
+// SecureText implements Node interface.
+func (n *node) SecureText() string {
+	return n.text
+}
+
 // stmtNode implements StmtNode interface.
 // Statement implementations should embed it in.
 type stmtNode struct {

ast/misc.go

@@ -14,7 +14,9 @@
 package ast
 
 import (
+	"bytes"
 	"fmt"
+	"strings"
 
 	"github.com/pingcap/tidb/context"
 	"github.com/pingcap/tidb/model"
@@ -406,6 +408,11 @@ type SetPwdStmt struct {
 	Password string
 }
 
+// SecureString overloads Node interface method.
+func (n *SetPwdStmt) SecureString() string {
+	return fmt.Sprintf("set password for user %s", n.User)
+}
+
 // Accept implements Node Accept interface.
 func (n *SetPwdStmt) Accept(v Visitor) (Node, bool) {
 	newNode, skipChildren := v.Enter(n)
@@ -455,6 +462,17 @@ func (n *CreateUserStmt) Accept(v Visitor) (Node, bool) {
 	return v.Leave(n)
 }
 
+// SecureString overloads Node interface method.
+func (n *CreateUserStmt) SecureString() string {
+	var buf bytes.Buffer
+	buf.WriteString("create user")
+	for _, user := range n.Specs {
+		buf.WriteString(" ")
+		buf.WriteString(user.SecurityString())
+	}
+	return buf.String()
+}
+
 // AlterUserStmt modifies user account.
 // See https://dev.mysql.com/doc/refman/5.7/en/alter-user.html
 type AlterUserStmt struct {
@@ -465,6 +483,17 @@ type AlterUserStmt struct {
 	Specs       []*UserSpec
 }
 
+// SecureString overloads Node interface method.
+func (n *AlterUserStmt) SecureString() string {
+	var buf bytes.Buffer
+	buf.WriteString("alter user")
+	for _, user := range n.Specs {
+		buf.WriteString(" ")
+		buf.WriteString(user.SecurityString())
+	}
+	return buf.String()
+}
+
 // Accept implements Node Accept interface.
 func (n *AlterUserStmt) Accept(v Visitor) (Node, bool) {
 	newNode, skipChildren := v.Enter(n)
@@ -649,6 +678,17 @@ type GrantStmt struct {
 	WithGrant  bool
 }
 
+// SecureString overloads Node interface method.
+func (n *GrantStmt) SecureString() string {
+	text := n.text
+	// Filter "identified by xxx" because it would expose password information.
+	idx := strings.Index(strings.ToLower(text), "identified")
+	if idx > 0 {
+		text = text[:idx]
+	}
+	return text
+}
+
 // Accept implements Node Accept interface.
 func (n *GrantStmt) Accept(v Visitor) (Node, bool) {
 	newNode, skipChildren := v.Enter(n)

executor/adapter.go

@@ -146,8 +146,13 @@ func (a *statement) Exec(ctx context.Context) (ast.RecordSet, error) {
 	var pi processinfoSetter
 	if raw, ok := ctx.(processinfoSetter); ok {
 		pi = raw
+		sql := a.OriginText()
+		if simple, ok := a.plan.(*plan.Simple); ok && simple.Statement != nil {
+			// Use SecureString to avoid leak password information.
+			sql = simple.Statement.SecureText()
+		}
 		// Update processinfo, ShowProcess() will use it.
-		pi.SetProcessInfo(a.OriginText())
+		pi.SetProcessInfo(sql)
 	}
 	// Fields or Schema are only used for statements that return result set.
 	if e.Schema().Len() == 0 {

session.go

@@ -1247,30 +1247,9 @@ func (s *session) ShowProcess() util.ProcessInfo {
 // logCrucialStmt logs some crucial SQL including: CREATE USER/GRANT PRIVILEGE/CHANGE PASSWORD/DDL etc.
 func logCrucialStmt(node ast.StmtNode) {
 	switch stmt := node.(type) {
-	case *ast.CreateUserStmt:
-		for _, user := range stmt.Specs {
-			log.Infof("[CRUCIAL OPERATION] create user %s.", user.SecurityString())
-		}
-	case *ast.DropUserStmt:
-		log.Infof("[CRUCIAL OPERATION] drop user %v.", stmt.UserList)
-	case *ast.AlterUserStmt:
-		for _, user := range stmt.Specs {
-			log.Infof("[CRUCIAL OPERATION] alter user %s.", user.SecurityString())
-		}
-	case *ast.SetPwdStmt:
-		log.Infof("[CRUCIAL OPERATION] set password for user %s.", stmt.User)
-	case *ast.GrantStmt:
-		text := stmt.Text()
-		// Filter "identified by xxx" because it would expose password information.
-		idx := strings.Index(strings.ToLower(text), "identified")
-		if idx > 0 {
-			text = text[:idx]
-		}
-		log.Infof("[CRUCIAL OPERATION] %s.", text)
-	case *ast.RevokeStmt:
-		log.Infof("[CRUCIAL OPERATION] %s.", stmt.Text())
-	case *ast.AlterTableStmt, *ast.CreateDatabaseStmt, *ast.CreateIndexStmt, *ast.CreateTableStmt,
+	case *ast.CreateUserStmt, *ast.DropUserStmt, *ast.AlterUserStmt, *ast.SetPwdStmt, *ast.GrantStmt,
+		*ast.RevokeStmt, *ast.AlterTableStmt, *ast.CreateDatabaseStmt, *ast.CreateIndexStmt, *ast.CreateTableStmt,
 		*ast.DropDatabaseStmt, *ast.DropIndexStmt, *ast.DropTableStmt, *ast.RenameTableStmt, *ast.TruncateTableStmt:
-		log.Infof("[CRUCIAL OPERATION] %s.", stmt.Text())
+		log.Infof("[CRUCIAL OPERATION] %s.", stmt.SecureText())
 	}
 }