Skip to content

Commit 4cf70f3

Browse files
authored
Fix security issue with grep -w $2 (hestiacp#2889)
* Fix security issue with grep -w $2
1 parent 3590b70 commit 4cf70f3

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

bin/v-update-sys-hestia

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ source_conf "$HESTIA/conf/hestia.conf"
2828

2929
# Checking arg number
3030
check_args '1' "$#" 'PACKAGE'
31-
is_hestia_package "hestia,hestia-nginx,hestia-php" "$package"
31+
is_hestia_package "hestia hestia-nginx hestia-php" "$package"
3232

3333
# Perform verification if read-only mode is enabled
3434
check_hestia_demo_mode

func/main.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1502,8 +1502,14 @@ multiphp_default_version() {
15021502
}
15031503

15041504
is_hestia_package(){
1505-
if [ -z "$(echo $1 | grep -w $2)" ]; then
1506-
check_result "$E_INVALID" "$2 package is not controlled by hestiacp"
1505+
check=false;
1506+
for package in $1; do
1507+
if [ $package == "$2" ]; then
1508+
check="true";
1509+
fi
1510+
done
1511+
if [ "$check" != "true" ]; then
1512+
check_result $E_INVALID "$2 package is not controlled by hestiacp"
15071513
fi
15081514
}
15091515

0 commit comments

Comments
 (0)