Skip to content

Commit

Permalink
*: add pattern validation for cluster
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhyass
zhyass committed Jul 27, 2021
1 parent 647aacb commit d85cece
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 18 deletions.
12 changes: 10 additions & 2 deletions api/v1alpha1/cluster_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,12 @@ type ClusterSpec struct {

// MysqlOpts defines the options of MySQL container.
type MysqlOpts struct {
// Password for the root user.
// Password for the root user, can be empty or 8~32 characters long.
// Only be a combination of uppercase letters, lowercase letters, numbers or special characters.
// Special characters are supported: @#$%^&*_+-=.
// +optional
// +kubebuilder:default:=""
// +kubebuilder:validation:Pattern="^$|^[A-Za-z0-9@#$%^&*_+\\-=]{8,32}$"
RootPassword string `json:"rootPassword,omitempty"`

// The root user's host.
Expand All @@ -81,13 +84,18 @@ type MysqlOpts struct {
RootHost string `json:"rootHost,omitempty"`

// Username of new user to create.
// Only be a combination of letters, numbers or underlines. The length can not exceed 26 characters.
// +optional
// +kubebuilder:default:="qc_usr"
// +kubebuilder:validation:Pattern="^[A-Za-z0-9_]{2,26}$"
User string `json:"user,omitempty"`

// Password for the new user.
// Password for the new user, must be 8~32 characters long.
// Only be a combination of uppercase letters, lowercase letters, numbers or special characters.
// Special characters are supported: @#$%^&*_+-=.
// +optional
// +kubebuilder:default:="Qing@123"
// +kubebuilder:validation:Pattern="^[A-Za-z0-9@#$%^&*_+\\-=]{8,32}$"
Password string `json:"password,omitempty"`

// Name for new database to create.
Expand Down
17 changes: 14 additions & 3 deletions charts/mysql-operator/crds/mysql.radondb.com_clusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ spec:
type: object
password:
default: Qing@123
description: Password for the new user.
description: 'Password for the new user, must be 8~32 characters
long. Only be a combination of uppercase letters, lowercase
letters, numbers or special characters. Special characters are
supported: @#$%^&*_+-=.'
pattern: ^[A-Za-z0-9@#$%^&*_+\-=]{8,32}$
type: string
resources:
default:
Expand Down Expand Up @@ -180,11 +184,18 @@ spec:
type: string
rootPassword:
default: ""
description: Password for the root user.
description: 'Password for the root user, can be empty or 8~32
characters long. Only be a combination of uppercase letters,
lowercase letters, numbers or special characters. Special characters
are supported: @#$%^&*_+-=.'
pattern: ^$|^[A-Za-z0-9@#$%^&*_+\-=]{8,32}$
type: string
user:
default: qc_usr
description: Username of new user to create.
description: Username of new user to create. Only be a combination
of letters, numbers or underlines. The length can not exceed
26 characters.
pattern: ^[A-Za-z0-9_]{2,26}$
type: string
type: object
mysqlVersion:
Expand Down
8 changes: 8 additions & 0 deletions cluster/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@ func (c *Cluster) Unwrap() *apiv1alpha1.Cluster {
return c.Cluster
}

func (c *Cluster) Validate() error {
if utils.StringInArray(c.Spec.MysqlOpts.User, []string{"root", utils.ReplicationUser, utils.OperatorUser, utils.MetricsUser}) {
return fmt.Errorf("spec.mysqlOpts.user cannot be root|%s|%s|%s", utils.ReplicationUser, utils.OperatorUser, utils.MetricsUser)
}

return nil
}

// GetLabels returns cluster labels
func (c *Cluster) GetLabels() labels.Set {
instance := c.Name
Expand Down
17 changes: 14 additions & 3 deletions config/crd/bases/mysql.radondb.com_clusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ spec:
type: object
password:
default: Qing@123
description: Password for the new user.
description: 'Password for the new user, must be 8~32 characters
long. Only be a combination of uppercase letters, lowercase
letters, numbers or special characters. Special characters are
supported: @#$%^&*_+-=.'
pattern: ^[A-Za-z0-9@#$%^&*_+\-=]{8,32}$
type: string
resources:
default:
Expand Down Expand Up @@ -180,11 +184,18 @@ spec:
type: string
rootPassword:
default: ""
description: Password for the root user.
description: 'Password for the root user, can be empty or 8~32
characters long. Only be a combination of uppercase letters,
lowercase letters, numbers or special characters. Special characters
are supported: @#$%^&*_+-=.'
pattern: ^$|^[A-Za-z0-9@#$%^&*_+\-=]{8,32}$
type: string
user:
default: qc_usr
description: Username of new user to create.
description: Username of new user to create. Only be a combination
of letters, numbers or underlines. The length can not exceed
26 characters.
pattern: ^[A-Za-z0-9_]{2,26}$
type: string
type: object
mysqlVersion:
Expand Down
4 changes: 4 additions & 0 deletions controllers/cluster_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ func (r *ClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
return ctrl.Result{}, err
}

if err = instance.Validate(); err != nil {
return ctrl.Result{}, err
}

status := *instance.Status.DeepCopy()
defer func() {
if !reflect.DeepEqual(status, instance.Status) {
Expand Down
12 changes: 3 additions & 9 deletions internal/sql_runner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ package internal
import (
"database/sql"
"fmt"
"sort"
"strconv"
"strings"
"time"

_ "github.com/go-sql-driver/mysql"
corev1 "k8s.io/api/core/v1"

"github.com/radondb/radondb-mysql-kubernetes/utils"
)

var (
Expand Down Expand Up @@ -118,7 +119,7 @@ func (s *SQLRunner) checkSlaveStatus() (isLagged, isReplicating corev1.Condition
lastSQLError := columnValue(scanArgs, cols, "Last_SQL_Error")
secondsBehindMaster := columnValue(scanArgs, cols, "Seconds_Behind_Master")

if stringInArray(slaveIOState, errorConnectionStates) {
if utils.StringInArray(slaveIOState, errorConnectionStates) {
return isLagged, corev1.ConditionFalse, fmt.Errorf("Slave_IO_State: %s", slaveIOState)
}

Expand Down Expand Up @@ -227,10 +228,3 @@ func columnValue(scanArgs []interface{}, slaveCols []string, colName string) str

return string(*scanArgs[columnIndex].(*sql.RawBytes))
}

// stringInArray check whether the str is in the strArray.
func stringInArray(str string, strArray []string) bool {
sort.Strings(strArray)
index := sort.SearchStrings(strArray, str)
return index < len(strArray) && strArray[index] == str
}
2 changes: 1 addition & 1 deletion sidecar/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func runInitCommand(cfg *Config) error {
return fmt.Errorf("failed to save client.conf: %s", err)
}

if err = os.Mkdir(extraConfPath, os.FileMode(0755)); err != nil {
if err = os.Mkdir(extraConfPath, os.FileMode(0644)); err != nil {
if !os.IsExist(err) {
return fmt.Errorf("error mkdir %s: %s", extraConfPath, err)
}
Expand Down
9 changes: 9 additions & 0 deletions utils/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ limitations under the License.

package utils

import "sort"

// Min returns the smallest int64 that was passed in the arguments.
func Min(a, b uint64) uint64 {
if a < b {
Expand All @@ -31,3 +33,10 @@ func Max(a, b uint64) uint64 {
}
return b
}

// StringInArray check whether the str is in the strArray.
func StringInArray(str string, strArray []string) bool {
sort.Strings(strArray)
index := sort.SearchStrings(strArray, str)
return index < len(strArray) && strArray[index] == str
}

0 comments on commit d85cece

Please sign in to comment.