Merge pull request hestiacp#1709 from jaapmarcus/fix/1708-invalid-format

Kristan Kenney · web-flow · commit 5d82dc83ff22 · 2021-04-01T14:30:26.000-03:00
Allow - as autorized keys
diff --git a/func/main.sh b/func/main.sh
@@ -922,7 +922,7 @@ is_service_format_valid() {
 }
 
 is_hash_format_valid() {
-  if ! [[ "$1" =~ ^[_A-Za-z0-9]{1,32}$ ]]; then
+  if ! [[ "$1" =~ ^[-_A-Za-z0-9]{1,32}$ ]]; then
         check_result $E_INVALID "invalid $2 format :: $1"
     fi    
 }

Original file line number	Diff line number	Diff line change
`@@ -922,7 +922,7 @@ is_service_format_valid() {`
`922`	`922`	`}`
`923`	`923`
`924`	`924`	`is_hash_format_valid() {`
`925`		`- if ! [[ "$1" =~ ^[_A-Za-z0-9]{1,32}$ ]]; then`
	`925`	`+ if ! [[ "$1" =~ ^[-_A-Za-z0-9]{1,32}$ ]]; then`
`926`	`926`	`check_result $E_INVALID "invalid $2 format :: $1"`
`927`	`927`	`fi`
`928`	`928`	`}`