Merge pull request #6 from kloeckner-i/apply_mysql_password_policy

METAL-1670 password upper and lower case has to be mixed

Author: hyunysmile

.gitignore

@@ -113,3 +113,5 @@ tags
 
 
 # End of https://www.gitignore.io/api/go,vim,emacs,visualstudiocode
+
+my-image.tar

pkg/utils/database/postgres.go

@@ -10,6 +10,8 @@ import (
 	"github.com/lib/pq"
 	"github.com/sirupsen/logrus"
 
+	// Don't delete below package. Used for driver "postgres"
+	_ "github.com/lib/pq"
 	// Don't delete below package. Used for driver "cloudsqlpostgres"
 	_ "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/dialers/postgres"
 )
@@ -117,7 +119,7 @@ func (p Postgres) isRowExist(database, query, user, password string) bool {
 	var name string
 	err = db.QueryRow(query).Scan(&name)
 	if err != nil {
-		logrus.Debug(err)
+		logrus.Debugf("failed executing query %s - %s", query, err)
 		return false
 	}
 	return true
@@ -129,12 +131,14 @@ func (p Postgres) createDatabase(admin AdminCredentials) error {
 	if !p.isDbExist(admin) {
 		err := p.executeQuery("postgres", create, admin)
 		if err != nil {
+			logrus.Errorf("failed creating postgres database %s", err)
 			return err
 		}
 	}
 
 	err := p.addExtensions(admin)
 	if err != nil {
+		logrus.Errorf("failed creating postgres extensions %s", err)
 		return err
 	}
 
@@ -149,17 +153,20 @@ func (p Postgres) createUser(admin AdminCredentials) error {
 	if !p.isUserExist(admin) {
 		err := p.executeQuery("postgres", create, admin)
 		if err != nil {
+			logrus.Errorf("failed creating postgres user - %s", err)
 			return err
 		}
 	} else {
 		err := p.executeQuery("postgres", update, admin)
 		if err != nil {
+			logrus.Errorf("failed updating postgres user %s - %s", update, err)
 			return err
 		}
 	}
 
 	err := p.executeQuery("postgres", grant, admin)
 	if err != nil {
+		logrus.Errorf("failed granting postgres user %s - %s", grant, err)
 		return err
 	}
 
@@ -173,6 +180,7 @@ func (p Postgres) deleteDatabase(admin AdminCredentials) error {
 	if p.isDbExist(admin) {
 		err := p.executeQuery("postgres", revoke, admin)
 		if err != nil {
+			logrus.Errorf("failed revoking connection on database %s - %s", revoke, err)
 			return err
 		}
 
@@ -226,6 +234,7 @@ func (p Postgres) addExtensions(admin AdminCredentials) error {
 		query := fmt.Sprintf("CREATE EXTENSION IF NOT EXISTS \"%s\";", ext)
 		err := p.executeExec(p.Database, query, admin)
 		if err != nil {
+			logrus.Errorf("failed creating extensions %s - %s", query, err)
 			return err
 		}
 	}

pkg/utils/kci/helper.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/mitchellh/hashstructure"
-	"github.com/sethvargo/go-password/password"
 	"github.com/sirupsen/logrus"
 )
 
@@ -33,22 +32,6 @@ func removeItem(slice []string, s string) []string {
 	return newslice
 }
 
-// GeneratePass generates secure password string
-func GeneratePass() string {
-	// include only uri safe special charactors
-	generatorInput := password.GeneratorInput{Symbols: "-_"}
-	pwGenerator, err := password.NewGenerator(&generatorInput)
-	if err != nil {
-		logrus.Fatalf("Failed to create Password Generator: %v", err)
-	}
-	password, err := pwGenerator.Generate(20, 8, 2, false, false)
-	if err != nil {
-		logrus.Fatalf("Failed to generate new password: %v", err)
-	}
-
-	return password
-}
-
 // StringNotEmpty return the first not empty string
 func StringNotEmpty(values ...string) string {
 	for _, value := range values {

pkg/utils/kci/password.go

@@ -0,0 +1,84 @@
+package kci
+
+import (
+	"errors"
+	"fmt"
+	"math/rand"
+	"time"
+
+	"github.com/sirupsen/logrus"
+)
+
+// GeneratePass generates secure password string
+func GeneratePass() string {
+	password, err := generatePass(10, 8, 2, true)
+	if err != nil {
+		logrus.Fatalf("can not generate password - %s", err)
+	}
+	return password
+}
+
+func generatePass(numLetters, numDigits, numSpecials int, mixCase bool) (string, error) {
+	const (
+		mininumLength = 8
+		digits        = "0123456789"
+		specials      = "-_" // include only uri safe special charactors
+		uppers        = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+		lowers        = "abcdefghijklmnopqrstuvwxyz"
+	)
+	length := numLetters + numDigits + numSpecials
+
+	if length < mininumLength {
+		return "", fmt.Errorf("total length of the password should be at least bigger than %d", mininumLength)
+	}
+
+	if mixCase && (numLetters < 2) {
+		return "", errors.New("can not mix case when the length of letters is smaller than 2")
+	}
+
+	rand.Seed(time.Now().UnixNano())
+	var bufAll []byte
+
+	if numDigits != 0 {
+		bufDigits := randomElement(numDigits, digits)
+		bufAll = append(bufAll, bufDigits...)
+	}
+
+	if numSpecials != 0 {
+		bufSpecials := randomElement(numSpecials, specials)
+		bufAll = append(bufAll, bufSpecials...)
+	}
+
+	numUppers := rand.Intn(numLetters)
+	if numUppers == 0 && mixCase {
+		numUppers = numUppers + 1
+	}
+
+	if numUppers != 0 {
+		bufUppers := randomElement(numUppers, uppers)
+		bufAll = append(bufAll, bufUppers...)
+	}
+
+	numLowers := numLetters - numUppers
+	if numLowers != 0 {
+		bufLowers := randomElement(numLowers, lowers)
+		bufAll = append(bufAll, bufLowers...)
+	}
+
+	rand.Shuffle(len(bufAll), func(i, j int) {
+		bufAll[i], bufAll[j] = bufAll[j], bufAll[i]
+	})
+
+	password := string(bufAll)
+
+	return password, nil
+}
+
+func randomElement(length int, element string) []byte {
+	buf := make([]byte, length)
+	for i := 0; i < length; i++ {
+		buf[i] = element[rand.Intn(len(element))]
+	}
+
+	return buf
+}