Преглед изворни кода

Block . in new user name (#4486)

* Block . in new user name

* Fix test
Jaap Marcus пре 1 година
родитељ
комит
70662beca5
2 измењених фајлова са 8 додато и 1 уклоњено
  1. 1 1
      func/main.sh
  2. 7 0
      test/test.bats

+ 1 - 1
func/main.sh

@@ -760,7 +760,7 @@ is_user_format_valid() {
 
 	# Only for new users
 	if [[ "$FROM_V_ADD_USER" == "true" ]]; then
-		if ! [[ "$1" =~ ^[a-zA-Z][-|.|_[:alnum:]]{0,28}[[:alnum:]]$ ]]; then
+		if ! [[ "$1" =~ ^[a-zA-Z][-|_[:alnum:]]{0,28}[[:alnum:]]$ ]]; then
 			check_result "$E_INVALID" "invalid $2 format :: $1"
 		fi
 	fi

+ 7 - 0
test/test.bats

@@ -402,6 +402,13 @@ function check_ip_not_banned(){
 	assert_output --partial 'Error: The user name'
 }
 
+@test "User: Add new user Failed 7" {
+	run v-add-user 'hello.com'  $user $user@hestiacp2.com default "Super Test"
+	assert_failure $E_INVALID
+	assert_output --partial 'Error: invalid user format'
+}
+
+
 @test "User: Add new user Success 1" {
 	run v-add-user 'jaap01'  $user $user@hestiacp2.com default "Super Test"
 	assert_success