This commit is contained in:
Patrick Schleizer 2022-11-24 06:14:04 -05:00
parent d7222b5678
commit 497b5b4544
No known key found for this signature in database
GPG key ID: CB8D50BB77BB3C48
2 changed files with 12 additions and 12 deletions

View file

@ -10,6 +10,12 @@ fi
who_ami="$(whoami)" who_ami="$(whoami)"
if [ "$SUDO_USER" = "" ]; then
user_to_check="$who_ami"
else
user_to_check="$SUDO_USER"
fi
if [ "$(id -u)" = "0" ]; then if [ "$(id -u)" = "0" ]; then
faillock_program="/usr/sbin/faillock" faillock_program="/usr/sbin/faillock"
else else
@ -30,6 +36,6 @@ else
faillock_program="sudo --non-interactive /usr/sbin/faillock" faillock_program="sudo --non-interactive /usr/sbin/faillock"
fi fi
$faillock_program --user "$who_ami" $faillock_program --user "$user_to_check"
exit $? exit $?

View file

@ -21,14 +21,14 @@ true "$0: START PHASE 2"
set -o pipefail set -o pipefail
## Debugging.
who_ami="$(whoami)"
if [ "$PAM_USER" = "" ]; then if [ "$PAM_USER" = "" ]; then
true "$0: ERROR: Environment variable PAM_USER is unset!" true "$0: ERROR: Environment variable PAM_USER is unset!"
exit 0 exit 0
fi fi
## Debugging.
who_ami="$(whoami)"
if ! command -v "/usr/bin/faillock-user" &>/dev/null; then if ! command -v "/usr/bin/faillock-user" &>/dev/null; then
true "$0: The /usr/bin/faillock-user wrapper is unavailable, exiting." true "$0: The /usr/bin/faillock-user wrapper is unavailable, exiting."
exit 0 exit 0
@ -123,13 +123,7 @@ true "pam_faillock_output_first_line: '$pam_faillock_output_first_line'"
user_name="$(echo "$pam_faillock_output_first_line" | LANG=C str_replace ":" "")" user_name="$(echo "$pam_faillock_output_first_line" | LANG=C str_replace ":" "")"
## example user_name: ## example user_name:
## user ## user
## root
if [ ! "$PAM_USER" = "$user_name" ]; then
echo "$0: ERROR: PAM_USER: '$PAM_USER' does not equal user_name: '$user_name'." >&2
echo "$0: ERROR: Please report this bug." >&2
echo "" >&2
exit 0
fi
pam_faillock_output_count="$(echo "$pam_faillock_output" | wc -l)" pam_faillock_output_count="$(echo "$pam_faillock_output" | wc -l)"
## example pam_faillock_output_count: ## example pam_faillock_output_count:
@ -183,7 +177,7 @@ if [ "$remaining_attempts" -le "0" ]; then
exit 0 exit 0
fi fi
echo "$0: WARNING: $failed_login_counter failed login attempts." >&2 echo "$0: WARNING: $failed_login_counter failed login attempts for user_name '$user_name'." >&2
echo "$0: Login will be blocked after $deny attempts." >&2 echo "$0: Login will be blocked after $deny attempts." >&2
echo "$0: You have $remaining_attempts more attempts before unlock procedure is required." >&2 echo "$0: You have $remaining_attempts more attempts before unlock procedure is required." >&2
echo "" >&2 echo "" >&2