Bug fix: Call clear_input() when the password is wrong.

[i3/i3lock] / i3lock.c

diff --git a/i3lock.c b/i3lock.c
index 9b68be5e652c1d25c6682aab4d90c1a4cc2948b6..2d8a580e9b905dc2045dea56526c7ddfd2512ffa 100644 (file)
--- a/i3lock.c
+++ b/i3lock.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * © 2010-2012 Michael Stapelberg
+ * © 2010-2013 Michael Stapelberg
  *
  * See LICENSE for licensing information
  *
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <ev.h>
 #include <sys/mman.h>
+#include <sys/wait.h>
 #include <X11/XKBlib.h>
 #include <X11/extensions/XKBfile.h>
 #include <xkbcommon/xkbcommon.h>
@@ -81,6 +82,9 @@ void u8_dec(char *s, int *i) {
  * Ideally, xkbcommon would ship something like this itself, but as of now
  * (version 0.2.0), it doesn’t.
  *
+ * TODO: Once xcb-xkb is enabled by default and released, we should port this
+ * code to xcb-xkb. See also https://github.com/xkbcommon/libxkbcommon/issues/1
+ *
  */
 static bool load_keymap(void) {
     bool ret = false;
@@ -127,6 +131,16 @@ static bool load_keymap(void) {
         goto out;
     }
 
+    /* Get the initial modifier state to be in sync with the X server.
+     * See https://github.com/xkbcommon/libxkbcommon/issues/1 for why we ignore
+     * the base and latched fields. */
+    XkbStateRec state_rec;
+    XkbGetState(display, XkbUseCoreKbd, &state_rec);
+
+    xkb_state_update_mask(new_state,
+        0, 0, state_rec.locked_mods,
+        0, 0, state_rec.locked_group);
+
     if (xkb_state != NULL)
         xkb_state_unref(xkb_state);
     xkb_state = new_state;
@@ -186,22 +200,7 @@ static void clear_input(void) {
     unlock_state = STATE_KEY_PRESSED;
 }
 
-static void input_done(void) {
-    if (clear_pam_wrong_timeout) {
-        ev_timer_stop(main_loop, clear_pam_wrong_timeout);
-        free(clear_pam_wrong_timeout);
-        clear_pam_wrong_timeout = NULL;
-    }
-
-    pam_state = STATE_PAM_VERIFY;
-    redraw_screen();
-
-    if (pam_authenticate(pam_handle, 0) == PAM_SUCCESS) {
-        DEBUG("successfully authenticated\n");
-        clear_password_memory();
-        exit(0);
-    }
-
+static void auth_failed(void) {
     if (debug_mode)
         fprintf(stderr, "Authentication failure\n");
 
@@ -228,6 +227,53 @@ static void input_done(void) {
     }
 }
 
+static void child_cb(EV_P_ ev_child *child_watcher, int revents) {
+    if (child_watcher->rstatus != 0) {
+        DEBUG("Authentication successfull\n");
+        clear_password_memory();
+
+        exit(0);
+    } else {
+        auth_failed();
+    }
+    ev_child_stop(main_loop, child_watcher);
+    free(child_watcher);
+}
+
+static void input_done(void) {
+    if (pam_state == STATE_PAM_VERIFY) {
+        return;
+    }
+
+    if (clear_pam_wrong_timeout) {
+        ev_timer_stop(main_loop, clear_pam_wrong_timeout);
+        free(clear_pam_wrong_timeout);
+        clear_pam_wrong_timeout = NULL;
+    }
+
+    pam_state = STATE_PAM_VERIFY;
+    redraw_screen();
+
+    /* fork to unblock pam_authenticate */
+    pid_t cpid = fork();
+    if (cpid == 0) {
+        exit(pam_authenticate(pam_handle, 0) == PAM_SUCCESS);
+    } else if (cpid > 0) {
+        struct ev_child *child_watcher = calloc(sizeof(struct ev_io), 1);
+        ev_child_init(child_watcher, child_cb, cpid, 0);
+        ev_child_set(child_watcher, cpid, 0);
+        ev_child_start(EV_DEFAULT_ child_watcher);
+    } else if (cpid < 0) {
+        DEBUG("Could not fork");
+        if (pam_authenticate(pam_handle, 0) == PAM_SUCCESS) {
+            DEBUG("successfully authenticated\n");
+            clear_password_memory();
+            exit(0);
+        }
+        auth_failed();
+    }
+}
+
 /*
  * Called when the user releases a key. We need to leave the Mode_switch
  * state when the user releases the Mode_switch key.
@@ -682,6 +728,11 @@ int main(int argc, char *argv[]) {
     cursor = create_cursor(conn, screen, win, curs_choice);
 
     grab_pointer_and_keyboard(conn, screen, cursor);
+    /* Load the keymap again to sync the current modifier state. Since we first
+     * loaded the keymap, there might have been changes, but starting from now,
+     * we should get all key presses/releases due to having grabbed the
+     * keyboard. */
+    (void)load_keymap();
 
     if (dpms)
         dpms_turn_off_screen(conn);