Merge pull request CanastaWiki#104 from naresh-kumar-babu/wikiPassword

Move password length validation to pre-create stage

internal/mediawiki/mediawiki.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strings"
 	"time"
 
 	"github.com/CanastaWiki/Canasta-CLI-Go/internal/canasta"
@@ -173,16 +172,6 @@ func RemoveDatabase(path, name, orchestrator string) error {
 	return nil
 }
 
-func passwordCheck(admin, password string) error {
-	if len(password) < 10 {
-		logging.Fatal(fmt.Errorf("Password must be at least 10 characters long "))
-	} else if strings.Contains(password, admin) || strings.Contains(admin, password) {
-		logging.Fatal(fmt.Errorf("Password should not be same as admin name"))
-	}
-
-	return nil
-}
-
 func fileExists(path string) (bool, error) {
 	_, err := os.Stat(path)
 	if err == nil {

internal/prompt/prompt.go

@@ -111,6 +111,15 @@ func promptForUserPassword(username, password string) (string, string, error) {
 	return username, password, nil
 }
 
+func passwordCheck(username string, password string) (error) {
+	if len(password) < 10 {
+		return fmt.Errorf("Password must be at least 10 characters long")
+	} else if strings.Contains(password, username) || strings.Contains(username, password) {
+		return fmt.Errorf("Password should not be similar to the username")
+	}
+	return nil
+}
+
 func getAndConfirmPassword(username string) (string, string, error) {
 	fmt.Print("Enter the admin password (Press Enter to get saved password or, if one does not exist, autogenerate a password): \n")
 	password, err := getPasswordInput()
@@ -125,6 +134,10 @@ func getAndConfirmPassword(username string) (string, string, error) {
 	if err != nil || password != confirmedPassword {
 		return "", "", fmt.Errorf("Passwords do not match, please try again.")
 	}
+	passErr := passwordCheck(username, password)
+	if passErr != nil {
+		return "", "", passErr
+	}
 	return username, password, nil
 }
 

internal/prompt/prompt_test.go

@@ -0,0 +1,29 @@
+package prompt
+
+import (
+	"testing"
+)
+
+func TestPasswordCheck(t *testing.T) {
+	tests := []struct {
+		username string
+		password string
+		wantErr  bool
+		errMsg   string
+	}{
+		{"user1", "short", true, "Password must be at least 10 characters long"},
+		{"user1", "user1password", true, "Password should not be similar to the username"},
+		{"password1234User", "password1234", true, "Password should not be similar to the username"},
+		{"user1", "securepassword", false, ""},
+	}
+
+	for _, tt := range tests {
+		err := passwordCheck(tt.username, tt.password)
+		if (err != nil) != tt.wantErr {
+			t.Errorf("passwordCheck(%q, %q) error = %v, wantErr %v", tt.username, tt.password, err, tt.wantErr)
+		}
+		if err != nil && err.Error() != tt.errMsg {
+			t.Errorf("passwordCheck(%q, %q) error message = %v, want %v", tt.username, tt.password, err.Error(), tt.errMsg)
+		}
+	}
+}