Skip to content

Commit 88cf9ba

Browse files
authored
Strip some extra dots from user input (hestiacp#3048)
And prevent users entering invalid hostnames
1 parent 6f59944 commit 88cf9ba

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

install/hst-install-debian.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,9 @@ sort_config_file(){
171171

172172
# Validate hostname according to RFC1178
173173
validate_hostname () {
174+
# remove extra .
175+
servername = $(echo "$servername" |sed -e "s/[.]*$//g")
176+
servername = $(echo "$domain" |sed -e "s/^[.]*//")
174177
if [[ $(echo "$servername" | grep -o "\." | wc -l) -gt 1 ]] && [[ ! $servername =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
175178
# Hostname valid
176179
return 1

install/hst-install-ubuntu.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@ sort_config_file(){
169169

170170
# Validate hostname according to RFC1178
171171
validate_hostname () {
172+
# remove extra .
173+
servername = $(echo "$servername" |sed -e "s/[.]*$//g")
174+
servername = $(echo "$domain" |sed -e "s/^[.]*//")
172175
if [[ $(echo "$servername" | grep -o "\." | wc -l) -gt 1 ]] && [[ ! $servername =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
173176
# Hostname valid
174177
return 1

0 commit comments

Comments
 (0)