improve console lockdown info output

This commit is contained in:
Patrick Schleizer 2019-12-31 02:53:02 -05:00
parent 788914de95
commit 20697db3ee
No known key found for this signature in database
GPG Key ID: CB8D50BB77BB3C48

View File

@ -5,28 +5,37 @@
grep_result="$(grep "accessfile=/etc/security/access-security-misc.conf" /etc/pam.d/common-account 2>/dev/null)" grep_result="$(grep "accessfile=/etc/security/access-security-misc.conf" /etc/pam.d/common-account 2>/dev/null)"
if ! echo "$grep_result" | grep -q "#" ; then ## Check if grep matched something.
## https://forums.whonix.org/t/etc-security-hardening-console-lockdown/8592 if [ ! "$grep_result" = "" ]; then
## Yes, grep matched.
if id --name --groups --zero "$PAM_USER" | grep --quiet --null-data --line-regexp --fixed-strings "console"; then ## Check if not out commented.
console_allowed=true if ! echo "$grep_result" | grep -q "#" ; then
fi ## Not out commented indeed.
if id --name --groups --zero "$PAM_USER" | grep --quiet --null-data --line-regexp --fixed-strings "console-unrestricted"; then
console_allowed=true ## https://forums.whonix.org/t/etc-security-hardening-console-lockdown/8592
fi
if [ ! "$console_allowed" = "true" ]; then if id --name --groups --zero "$PAM_USER" | grep --quiet --null-data --line-regexp --fixed-strings "console"; then
echo "$0: ERROR: PAM_USER: '$PAM_USER' is not a member of group 'console'" >&2 console_allowed=true
echo "$0: To unlock, run the following command as superuser:" >&2 fi
echo "$0: (If you still have a sudo/root shell somewhere.)" >&2 if id --name --groups --zero "$PAM_USER" | grep --quiet --null-data --line-regexp --fixed-strings "console-unrestricted"; then
echo "" >&2 console_allowed=true
echo "addgroup $PAM_USER console" >&2 fi
echo "" >&2
echo "$0: However, possibly unlock procedure is required." >&2 if [ ! "$console_allowed" = "true" ]; then
echo "$0: First boot into recovery mode at grub boot menu and then run above command." >&2 echo "$0: ERROR: PAM_USER: '$PAM_USER' is not a member of group 'console'" >&2
echo "$0: See also:" >&2 echo "$0: To unlock, run the following command as superuser:" >&2
echo "https://www.whonix.org/wiki/root#console" >&2 echo "$0: (If you still have a sudo/root shell somewhere.)" >&2
echo "" >&2 echo "" >&2
exit 0 echo "addgroup $PAM_USER console" >&2
echo "" >&2
echo "$0: However, possibly unlock procedure is required." >&2
echo "$0: First boot into recovery mode at grub boot menu and then run above command." >&2
echo "$0: See also:" >&2
echo "https://www.whonix.org/wiki/root#console" >&2
echo "" >&2
exit 0
fi
fi fi
fi fi