From 853736615448df616a7b318199f5114f5b138d4d Mon Sep 17 00:00:00 2001 From: boltgolt Date: Fri, 29 Mar 2019 22:21:14 +0100 Subject: [PATCH] Remove dismiss_lockscreen config option --- debian/postinst | 7 +++++++ src/config.ini | 5 ----- src/pam.py | 5 ----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/debian/postinst b/debian/postinst index 7ceb41c..6da42db 100755 --- a/debian/postinst +++ b/debian/postinst @@ -70,6 +70,13 @@ if not os.path.exists("/tmp/howdy_picked_device"): if key == "timout": key = "timeout" + # MIGRATION 2.5.0 -> 2.5.1 + # Remove unsafe automatic dismissal of lock screen + if key == "dismiss_lockscreen": + if (value == "true"): + print("DEPRECATION: Config falue dismiss_lockscreen is no longer supported because of login loop issues.") + continue + try: newConf.set(section, key, value) # Add a new section where needed diff --git a/src/config.ini b/src/config.ini index 5274457..995516f 100644 --- a/src/config.ini +++ b/src/config.ini @@ -18,11 +18,6 @@ ignore_ssh = true # Disable Howdy if lid is closed ignore_closed_lid = true -# Auto dismiss lock screen on confirmation -# Will run loginctl unlock-sessions after every auth -# Experimental, can behave incorrectly on some systems -dismiss_lockscreen = false - # Disable howdy in the PAM # The howdy command will still function disabled = false diff --git a/src/pam.py b/src/pam.py index b127cc6..85eccdf 100644 --- a/src/pam.py +++ b/src/pam.py @@ -56,11 +56,6 @@ def doAuth(pamh): if not config.getboolean("core", "no_confirmation", fallback=False): pamh.conversation(pamh.Message(pamh.PAM_TEXT_INFO, "Identified face as " + pamh.get_user())) - # Try to dismiss the lock screen if enabled - if config.getboolean("core", "dismiss_lockscreen", fallback=False): - # Run it as root with a timeout of 1s, and never ask for a password through the UI - subprocess.Popen(["sudo", "timeout", "1", "loginctl", "unlock-sessions", "--no-ask-password"]) - return pamh.PAM_SUCCESS # Otherwise, we can't discribe what happend but it wasn't successful