mirrors
/
i3lock
mirror of https://github.com/i3/i3lock.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename all PAM-independant variables/comments. 

there is nothing PAM-specific about pam_state or pam_state_t. therefore
rename them to be authenticator independant.
pull/123/head
Jasper Lievisse Adriaanse 2017-04-15 09:39:13 +02:00
parent 512c10f1dd
commit c1de117825
4 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
i3lock.c
View File

@ -59,11 +59,11 @@ bool unlock_indicator = true;
char *modifier_string = NULL; char *modifier_string = NULL;
static bool dont_fork = false; static bool dont_fork = false;
struct ev_loop *main_loop; struct ev_loop *main_loop;
static struct ev_timer *clear_pam_wrong_timeout; static struct ev_timer *clear_auth_wrong_timeout;
static struct ev_timer *clear_indicator_timeout; static struct ev_timer *clear_indicator_timeout;
static struct ev_timer *discard_passwd_timeout; static struct ev_timer *discard_passwd_timeout;
extern unlock_state_t unlock_state; extern unlock_state_t unlock_state;
extern pam_state_t pam_state; extern auth_state_t auth_state;
int failed_attempts = 0; int failed_attempts = 0;
bool show_failed_attempts = false; bool show_failed_attempts = false;
bool retry_verification = false; bool retry_verification = false;
@ -206,13 +206,13 @@ static void finish_input(void) {
} }
/* /*
* Resets pam_state to STATE_PAM_IDLE 2 seconds after an unsuccessful * Resets auth_state to STATE_AUTH_IDLE 2 seconds after an unsuccessful
* authentication event. * authentication event.
* *
*/ */
static void clear_pam_wrong(EV_P_ ev_timer *w, int revents) { static void clear_auth_wrong(EV_P_ ev_timer *w, int revents) {
DEBUG("clearing pam wrong\n"); DEBUG("clearing auth wrong\n");
pam_state = STATE_PAM_IDLE; auth_state = STATE_AUTH_IDLE;
redraw_screen(); redraw_screen();
/* Clear modifier string. */ /* Clear modifier string. */
@ -222,9 +222,9 @@ static void clear_pam_wrong(EV_P_ ev_timer *w, int revents) {
} }
/* Now free this timeout. */ /* Now free this timeout. */
STOP_TIMER(clear_pam_wrong_timeout); STOP_TIMER(clear_auth_wrong_timeout);
/* retry with input done during pam verification */ /* retry with input done during auth verification */
if (retry_verification) { if (retry_verification) {
retry_verification = false; retry_verification = false;
finish_input(); finish_input();
@ -248,8 +248,8 @@ static void discard_passwd_cb(EV_P_ ev_timer *w, int revents) {
} }
static void input_done(void) { static void input_done(void) {
STOP_TIMER(clear_pam_wrong_timeout); STOP_TIMER(clear_auth_wrong_timeout);
pam_state = STATE_PAM_VERIFY; auth_state = STATE_AUTH_VERIFY;
unlock_state = STATE_STARTED; unlock_state = STATE_STARTED;
redraw_screen(); redraw_screen();
@ -271,7 +271,7 @@ static void input_done(void) {
fprintf(stderr, "Authentication failure\n"); fprintf(stderr, "Authentication failure\n");
/* Get state of Caps and Num lock modifiers, to be displayed in /* Get state of Caps and Num lock modifiers, to be displayed in
* STATE_PAM_WRONG state */ * STATE_AUTH_WRONG state */
xkb_mod_index_t idx, num_mods; xkb_mod_index_t idx, num_mods;
const char *mod_name; const char *mod_name;
@ -305,7 +305,7 @@ static void input_done(void) {
} }
} }
pam_state = STATE_PAM_WRONG; auth_state = STATE_AUTH_WRONG;
failed_attempts += 1; failed_attempts += 1;
clear_input(); clear_input();
if (unlock_indicator) if (unlock_indicator)
@ -314,7 +314,7 @@ static void input_done(void) {
/* Clear this state after 2 seconds (unless the user enters another /* Clear this state after 2 seconds (unless the user enters another
* password during that time). */ * password during that time). */
ev_now_update(main_loop); ev_now_update(main_loop);
START_TIMER(clear_pam_wrong_timeout, TSTAMP_N_SECS(2), clear_pam_wrong); START_TIMER(clear_auth_wrong_timeout, TSTAMP_N_SECS(2), clear_auth_wrong);
/* Cancel the clear_indicator_timeout, it would hide the unlock indicator /* Cancel the clear_indicator_timeout, it would hide the unlock indicator
* too early. */ * too early. */
@ -393,7 +393,7 @@ static void handle_key_press(xcb_key_press_event_t *event) {
if ((ksym == XKB_KEY_j || ksym == XKB_KEY_m) && !ctrl) if ((ksym == XKB_KEY_j || ksym == XKB_KEY_m) && !ctrl)
break; break;
if (pam_state == STATE_PAM_WRONG) { if (auth_state == STATE_AUTH_WRONG) {
retry_verification = true; retry_verification = true;
return; return;
} }
@ -725,7 +725,7 @@ static void xcb_check_cb(EV_P_ ev_check *w, int revents) {
/* /*
* This function is called from a fork()ed child and will raise the i3lock * This function is called from a fork()ed child and will raise the i3lock
* window when the window is obscured, even when the main i3lock process is * window when the window is obscured, even when the main i3lock process is
* blocked due to PAM. * blocked due to the authentication backend.
* *
*/ */
static void raise_loop(xcb_window_t window) { static void raise_loop(xcb_window_t window) {
@ -985,7 +985,7 @@ int main(int argc, char *argv[]) {
cursor = create_cursor(conn, screen, win, curs_choice); cursor = create_cursor(conn, screen, win, curs_choice);
/* Display the "locking…" message while trying to grab the pointer/keyboard. */ /* Display the "locking…" message while trying to grab the pointer/keyboard. */
pam_state = STATE_PAM_LOCK; auth_state = STATE_AUTH_LOCK;
grab_pointer_and_keyboard(conn, screen, cursor); grab_pointer_and_keyboard(conn, screen, cursor);
pid_t pid = fork(); pid_t pid = fork();
@ -1012,7 +1012,7 @@ int main(int argc, char *argv[]) {
errx(EXIT_FAILURE, "Could not initialize libev. Bad LIBEV_FLAGS?\n"); errx(EXIT_FAILURE, "Could not initialize libev. Bad LIBEV_FLAGS?\n");
/* Explicitly call the screen redraw in case "locking…" message was displayed */ /* Explicitly call the screen redraw in case "locking…" message was displayed */
pam_state = STATE_PAM_IDLE; auth_state = STATE_AUTH_IDLE;
redraw_screen(); redraw_screen();
struct ev_io *xcb_watcher = calloc(sizeof(struct ev_io), 1); struct ev_io *xcb_watcher = calloc(sizeof(struct ev_io), 1);

34
unlock_indicator.c
View File

@ -78,7 +78,7 @@ static xcb_visualtype_t *vistype;
/* Maintain the current unlock/PAM state to draw the appropriate unlock /* Maintain the current unlock/PAM state to draw the appropriate unlock
* indicator. */ * indicator. */
unlock_state_t unlock_state; unlock_state_t unlock_state;
pam_state_t pam_state; auth_state_t auth_state;
/* /*
* Returns the scaling factor of the current screen. E.g., on a 227 DPI MacBook * Returns the scaling factor of the current screen. E.g., on a 227 DPI MacBook
@ -141,7 +141,7 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
} }
if (unlock_indicator && if (unlock_indicator &&
(unlock_state >= STATE_KEY_PRESSED || pam_state > STATE_PAM_IDLE)) { (unlock_state >= STATE_KEY_PRESSED || auth_state > STATE_AUTH_IDLE)) {
cairo_scale(ctx, scaling_factor(), scaling_factor()); cairo_scale(ctx, scaling_factor(), scaling_factor());
/* Draw a (centered) circle with transparent background. */ /* Draw a (centered) circle with transparent background. */
cairo_set_line_width(ctx, 10.0); cairo_set_line_width(ctx, 10.0);
@ -154,12 +154,12 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
/* Use the appropriate color for the different PAM states /* Use the appropriate color for the different PAM states
* (currently verifying, wrong password, or default) */ * (currently verifying, wrong password, or default) */
switch (pam_state) { switch (auth_state) {
case STATE_PAM_VERIFY: case STATE_AUTH_VERIFY:
case STATE_PAM_LOCK: case STATE_AUTH_LOCK:
cairo_set_source_rgba(ctx, 0, 114.0 / 255, 255.0 / 255, 0.75); cairo_set_source_rgba(ctx, 0, 114.0 / 255, 255.0 / 255, 0.75);
break; break;
case STATE_PAM_WRONG: case STATE_AUTH_WRONG:
case STATE_I3LOCK_LOCK_FAILED: case STATE_I3LOCK_LOCK_FAILED:
cairo_set_source_rgba(ctx, 250.0 / 255, 0, 0, 0.75); cairo_set_source_rgba(ctx, 250.0 / 255, 0, 0, 0.75);
break; break;
@ -169,16 +169,16 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
} }
cairo_fill_preserve(ctx); cairo_fill_preserve(ctx);
switch (pam_state) { switch (auth_state) {
case STATE_PAM_VERIFY: case STATE_AUTH_VERIFY:
case STATE_PAM_LOCK: case STATE_AUTH_LOCK:
cairo_set_source_rgb(ctx, 51.0 / 255, 0, 250.0 / 255); cairo_set_source_rgb(ctx, 51.0 / 255, 0, 250.0 / 255);
break; break;
case STATE_PAM_WRONG: case STATE_AUTH_WRONG:
case STATE_I3LOCK_LOCK_FAILED: case STATE_I3LOCK_LOCK_FAILED:
cairo_set_source_rgb(ctx, 125.0 / 255, 51.0 / 255, 0); cairo_set_source_rgb(ctx, 125.0 / 255, 51.0 / 255, 0);
break; break;
case STATE_PAM_IDLE: case STATE_AUTH_IDLE:
cairo_set_source_rgb(ctx, 51.0 / 255, 125.0 / 255, 0); cairo_set_source_rgb(ctx, 51.0 / 255, 125.0 / 255, 0);
break; break;
} }
@ -205,14 +205,14 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
cairo_set_source_rgb(ctx, 0, 0, 0); cairo_set_source_rgb(ctx, 0, 0, 0);
cairo_select_font_face(ctx, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); cairo_select_font_face(ctx, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size(ctx, 28.0); cairo_set_font_size(ctx, 28.0);
switch (pam_state) { switch (auth_state) {
case STATE_PAM_VERIFY: case STATE_AUTH_VERIFY:
text = "verifying…"; text = "verifying…";
break; break;
case STATE_PAM_LOCK: case STATE_AUTH_LOCK:
text = "locking…"; text = "locking…";
break; break;
case STATE_PAM_WRONG: case STATE_AUTH_WRONG:
text = "wrong!"; text = "wrong!";
break; break;
case STATE_I3LOCK_LOCK_FAILED: case STATE_I3LOCK_LOCK_FAILED:
@ -245,7 +245,7 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
cairo_close_path(ctx); cairo_close_path(ctx);
} }
if (pam_state == STATE_PAM_WRONG && (modifier_string != NULL)) { if (auth_state == STATE_AUTH_WRONG && (modifier_string != NULL)) {
cairo_text_extents_t extents; cairo_text_extents_t extents;
double x, y; double x, y;
@ -334,7 +334,7 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
* *
*/ */
void redraw_screen(void) { void redraw_screen(void) {
DEBUG("redraw_screen(unlock_state = %d, pam_state = %d)\n", unlock_state, pam_state); DEBUG("redraw_screen(unlock_state = %d, auth_state = %d)\n", unlock_state, auth_state);
xcb_pixmap_t bg_pixmap = draw_image(last_resolution); xcb_pixmap_t bg_pixmap = draw_image(last_resolution);
xcb_change_window_attributes(conn, win, XCB_CW_BACK_PIXMAP, (uint32_t[1]){bg_pixmap}); xcb_change_window_attributes(conn, win, XCB_CW_BACK_PIXMAP, (uint32_t[1]){bg_pixmap});
/* XXX: Possible optimization: Only update the area in the middle of the /* XXX: Possible optimization: Only update the area in the middle of the

10
unlock_indicator.h
View File

@ -11,12 +11,12 @@ typedef enum {
} unlock_state_t; } unlock_state_t;
typedef enum { typedef enum {
STATE_PAM_IDLE = 0, /* no PAM interaction at the moment */ STATE_AUTH_IDLE = 0, /* no authenticator interaction at the moment */
STATE_PAM_VERIFY = 1, /* currently verifying the password via PAM */ STATE_AUTH_VERIFY = 1, /* currently verifying the password via authenticator */
STATE_PAM_LOCK = 2, /* currently locking the screen */ STATE_AUTH_LOCK = 2, /* currently locking the screen */
STATE_PAM_WRONG = 3, /* the password was wrong */ STATE_AUTH_WRONG = 3, /* the password was wrong */
STATE_I3LOCK_LOCK_FAILED = 4 /* i3lock failed to load */ STATE_I3LOCK_LOCK_FAILED = 4 /* i3lock failed to load */
} pam_state_t; } auth_state_t;
xcb_pixmap_t draw_image(uint32_t* resolution); xcb_pixmap_t draw_image(uint32_t* resolution);
void redraw_screen(void); void redraw_screen(void);

4
xcb.c
View File

@ -24,7 +24,7 @@
#include "cursors.h" #include "cursors.h"
#include "unlock_indicator.h" #include "unlock_indicator.h"
extern pam_state_t pam_state; extern auth_state_t auth_state;
xcb_connection_t *conn; xcb_connection_t *conn;
xcb_screen_t *screen; xcb_screen_t *screen;
@ -262,7 +262,7 @@ void grab_pointer_and_keyboard(xcb_connection_t *conn, xcb_screen_t *screen, xcb
/* After trying for 10000 times, i3lock will display an error message /* After trying for 10000 times, i3lock will display an error message
* for 2 sec prior to terminate. */ * for 2 sec prior to terminate. */
if (tries <= 0) { if (tries <= 0) {
pam_state = STATE_I3LOCK_LOCK_FAILED; auth_state = STATE_I3LOCK_LOCK_FAILED;
redraw_screen(); redraw_screen();
sleep(1); sleep(1);
errx(EXIT_FAILURE, "Cannot grab pointer/keyboard"); errx(EXIT_FAILURE, "Cannot grab pointer/keyboard");