Skip to content
Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'jaapmarcus/fix/prevent-install-non-cont…
…rolled-package' into main
  • Loading branch information
Kristan Kenney committed Mar 30, 2021
2 parents 32ef8a2 + 9a1fccd commit 27556a9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions bin/v-update-sys-hestia
Expand Up @@ -32,6 +32,7 @@ source $HESTIA/conf/hestia.conf

# Checking arg number
check_args '1' "$#" 'PACKAGE'
is_hestia_package "hestia,hestia-nginx,hestia-php" "$package"

# Perform verification if read-only mode is enabled
check_hestia_demo_mode
Expand Down
6 changes: 6 additions & 0 deletions func/main.sh
Expand Up @@ -1154,6 +1154,12 @@ multiphp_default_version() {
echo "$sys_phpversion"
}

is_hestia_package(){
if [ -z "$(echo $1 | grep -w $2)" ]; then
check_result $E_INVALID "$2 package is not controlled by hestiacp"
fi
}

# Run arbitrary cli commands with dropped privileges
# Note: setpriv --init-groups is not available on debian9 (util-linux 2.29.2)
# Input:
Expand Down

0 comments on commit 27556a9

Please sign in to comment.