support require clauses in grant stmt (#666) (#698)

pingcap · Dec 24, 2019 · 93f4d5e · 93f4d5e
1 parent 7df8c2c
commit 93f4d5e
Show file tree

Hide file tree

Showing 5 changed files with 3,644 additions and 3,616 deletions.
diff --git a/ast/misc.go b/ast/misc.go
@@ -976,12 +976,12 @@ const (
 	Subject
 )
 
-type TslOption struct {
+type TLSOption struct {
 	Type  int
 	Value string
 }
 
-func (t *TslOption) Restore(ctx *RestoreCtx) error {
+func (t *TLSOption) Restore(ctx *RestoreCtx) error {
 	switch t.Type {
 	case TslNone:
 		ctx.WriteKeyWord("NONE")
@@ -996,10 +996,10 @@ func (t *TslOption) Restore(ctx *RestoreCtx) error {
 		ctx.WriteKeyWord("ISSUER ")
 		ctx.WriteString(t.Value)
 	case Subject:
-		ctx.WriteKeyWord("CIPHER")
+		ctx.WriteKeyWord("SUBJECT ")
 		ctx.WriteString(t.Value)
 	default:
-		return errors.Errorf("Unsupported TslOption.Type %d", t.Type)
+		return errors.Errorf("Unsupported TLSOption.Type %d", t.Type)
 	}
 	return nil
 }
@@ -1077,7 +1077,7 @@ type CreateUserStmt struct {
 	IsCreateRole          bool
 	IfNotExists           bool
 	Specs                 []*UserSpec
-	TslOptions            []*TslOption
+	TLSOptions            []*TLSOption
 	ResourceOptions       []*ResourceOption
 	PasswordOrLockOptions []*PasswordOrLockOption
 }
@@ -1101,19 +1101,16 @@ func (n *CreateUserStmt) Restore(ctx *RestoreCtx) error {
 		}
 	}
 
-	tslOptionLen := len(n.TslOptions)
-
-	if tslOptionLen != 0 {
+	if len(n.TLSOptions) != 0 {
 		ctx.WriteKeyWord(" REQUIRE ")
 	}
 
-	// Restore `tslOptions` reversely to keep order the same with original sql
-	for i := tslOptionLen; i > 0; i-- {
-		if i != tslOptionLen {
+	for i, option := range n.TLSOptions {
+		if i != 0 {
 			ctx.WriteKeyWord(" AND ")
 		}
-		if err := n.TslOptions[i-1].Restore(ctx); err != nil {
-			return errors.Annotatef(err, "An error occurred while restore CreateUserStmt.TslOptions[%d]", i)
+		if err := option.Restore(ctx); err != nil {
+			return errors.Annotatef(err, "An error occurred while restore CreateUserStmt.TLSOptions[%d]", i)
 		}
 	}
 
@@ -1166,7 +1163,7 @@ type AlterUserStmt struct {
 	IfExists              bool
 	CurrentAuth           *AuthOption
 	Specs                 []*UserSpec
-	TslOptions            []*TslOption
+	TLSOptions            []*TLSOption
 	ResourceOptions       []*ResourceOption
 	PasswordOrLockOptions []*PasswordOrLockOption
 }
@@ -1193,19 +1190,16 @@ func (n *AlterUserStmt) Restore(ctx *RestoreCtx) error {
 		}
 	}
 
-	tslOptionLen := len(n.TslOptions)
-
-	if tslOptionLen != 0 {
+	if len(n.TLSOptions) != 0 {
 		ctx.WriteKeyWord(" REQUIRE ")
 	}
 
-	// Restore `tslOptions` reversely to keep order the same with original sql
-	for i := tslOptionLen; i > 0; i-- {
-		if i != tslOptionLen {
+	for i, option := range n.TLSOptions {
+		if i != 0 {
 			ctx.WriteKeyWord(" AND ")
 		}
-		if err := n.TslOptions[i-1].Restore(ctx); err != nil {
-			return errors.Annotatef(err, "An error occurred while restore AlterUserStmt.TslOptions[%d]", i)
+		if err := option.Restore(ctx); err != nil {
+			return errors.Annotatef(err, "An error occurred while restore AlterUserStmt.TLSOptions[%d]", i)
 		}
 	}
 
@@ -1869,6 +1863,7 @@ type GrantStmt struct {
 	ObjectType ObjectTypeType
 	Level      *GrantLevel
 	Users      []*UserSpec
+	TLSOptions []*TLSOption
 	WithGrant  bool
 }
 
@@ -1904,6 +1899,19 @@ func (n *GrantStmt) Restore(ctx *RestoreCtx) error {
 			return errors.Annotatef(err, "An error occurred while restore GrantStmt.Users[%d]", i)
 		}
 	}
+	if n.TLSOptions != nil {
+		if len(n.TLSOptions) != 0 {
+			ctx.WriteKeyWord(" REQUIRE ")
+		}
+		for i, option := range n.TLSOptions {
+			if i != 0 {
+				ctx.WriteKeyWord(" AND ")
+			}
+			if err := option.Restore(ctx); err != nil {
+				return errors.Annotatef(err, "An error occurred while restore GrantStmt.TLSOptions[%d]", i)
+			}
+		}
+	}
 	if n.WithGrant {
 		ctx.WriteKeyWord(" WITH GRANT OPTION")
 	}

diff --git a/mysql/const.go b/mysql/const.go
@@ -168,6 +168,8 @@ const (
 const (
 	// SystemDB is the name of system database.
 	SystemDB = "mysql"
+	// GlobalPrivTable is the table in system db contains global scope privilege info.
+	GlobalPrivTable = "global_priv"
 	// UserTable is the table in system db contains user info.
 	UserTable = "User"
 	// DBTable is the table in system db contains db scope privilege info.