github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: correct count check for user-auth trigger

Browse Source 
There are cases where the user-auth plugin exists but the events plugin is not enabled, and this accounts for that.
This commit is contained in:
Jose Diaz-Gonzalez
2021-08-07 17:55:56 -04:00
parent ca680c3aeb
commit f0ca3fef54
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/common/functions
View File

@@ -795,8 +795,15 @@ dokku_auth() {
export SSH_USER=${SSH_USER:=$USER} export SSH_USER=${SSH_USER:=$USER}
export SSH_NAME=${NAME:="default"} export SSH_NAME=${NAME:="default"}
local user_auth_count=$(find "$PLUGIN_PATH"/enabled/*/user-auth 2>/dev/null | wc -l)
# no plugin trigger exists
if [[ $user_auth_count == 0 ]]; then
return 0
fi
# this plugin trigger exists in the core `20_events` plugin # this plugin trigger exists in the core `20_events` plugin
if [[ $(find "$PLUGIN_PATH"/enabled/*/user-auth 2>/dev/null | wc -l) == 1 ]]; then if [[ "$user_auth_count" == 1 ]] && [[ -f "$PLUGIN_PATH"/enabled/20_events/user-auth ]]; then
return 0 return 0
fi fi