X-Git-Url: https://git.armaanb.net/?p=slock.git;a=blobdiff_plain;f=slock.c;h=08ada6f62c6c61f626ebaafcda311124366ee36d;hp=d281965809db3017767aa5f12cbd99dd31c97482;hb=a55594fdd69fcfcc10b8c9624d5aba298969d713;hpb=4339b507af01421e2deab63ca9ac3c5bdae5f4cc diff --git a/slock.c b/slock.c index d281965..08ada6f 100644 --- a/slock.c +++ b/slock.c @@ -1,4 +1,3 @@ - /* See LICENSE file for license details. */ #define _XOPEN_SOURCE 500 #if HAVE_SHADOW_H @@ -14,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -23,72 +23,101 @@ #include #endif +#include "arg.h" +#include "util.h" + +char *argv0; + +enum { + INIT, + INPUT, + FAILED, + NUMCOLS +}; + +#include "config.h" + typedef struct { int screen; Window root, win; Pixmap pmap; - unsigned long colors[2]; + unsigned long colors[NUMCOLS]; } Lock; static Lock **locks; static int nscreens; -static Bool running = True; +static Bool rr; +static int rrevbase; +static int rrerrbase; static void -die(const char *errstr, ...) { +die(const char *errstr, ...) +{ va_list ap; va_start(ap, errstr); vfprintf(stderr, errstr, ap); va_end(ap); - exit(EXIT_FAILURE); + exit(1); } #ifdef __linux__ #include +#include static void -dontkillme(void) { - int fd; +dontkillme(void) +{ + FILE *f; + const char oomfile[] = "/proc/self/oom_score_adj"; - fd = open("/proc/self/oom_score_adj", O_WRONLY); - if (fd < 0 && errno == ENOENT) - return; - if (fd < 0 || write(fd, "-1000\n", 6) != 6 || close(fd) != 0) - die("cannot disable the out-of-memory killer for this process\n"); + if (!(f = fopen(oomfile, "w"))) { + if (errno == ENOENT) + return; + die("slock: fopen %s: %s\n", oomfile, strerror(errno)); + } + fprintf(f, "%d", OOM_SCORE_ADJ_MIN); + if (fclose(f)) { + if (errno == EACCES) + die("slock: unable to disable OOM killer. " + "suid or sgid set?\n"); + else + die("slock: fclose %s: %s\n", oomfile, + strerror(errno)); + } } #endif #ifndef HAVE_BSD_AUTH +/* only run as root */ static const char * -getpw(void) { /* only run as root */ +getpw(void) +{ const char *rval; struct passwd *pw; errno = 0; - pw = getpwuid(getuid()); - if (!pw) { + if (!(pw = getpwuid(getuid()))) { if (errno) - die("slock: getpwuid: %s\n", strerror(errno)); + die("getpwuid: %s\n", strerror(errno)); else - die("slock: cannot retrieve password entry (make sure to suid or sgid slock)\n"); + die("cannot retrieve password entry\n"); } - rval = pw->pw_passwd; + rval = pw->pw_passwd; #if HAVE_SHADOW_H if (rval[0] == 'x' && rval[1] == '\0') { struct spwd *sp; - sp = getspnam(getenv("USER")); - if(!sp) - die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n"); + if (!(sp = getspnam(getenv("USER")))) + die("cannot retrieve shadow entry (make sure to suid or sgid slock)\n"); rval = sp->sp_pwdp; } #endif /* drop privileges */ - if (geteuid() == 0 - && ((getegid() != pw->pw_gid && setgid(pw->pw_gid) < 0) || setuid(pw->pw_uid) < 0)) - die("slock: cannot drop privileges\n"); + if (geteuid() == 0 && + ((getegid() != pw->pw_gid && setgid(pw->pw_gid) < 0) || setuid(pw->pw_uid) < 0)) + die("cannot drop privileges\n"); return rval; } #endif @@ -100,154 +129,193 @@ readpw(Display *dpy) readpw(Display *dpy, const char *pws) #endif { - char buf[32], passwd[256]; - int num, screen; - unsigned int len, llen; + char buf[32], passwd[256], *encrypted; + int num, screen, running, failure; + unsigned int len, color; KeySym ksym; XEvent ev; + static int oldc = INIT; - len = llen = 0; - running = True; + len = 0; + running = 1; + failure = 0; /* As "slock" stands for "Simple X display locker", the DPMS settings * had been removed and you can set it with "xset" or some other * utility. This way the user can easily set a customized DPMS * timeout. */ - while(running && !XNextEvent(dpy, &ev)) { - if(ev.type == KeyPress) { - buf[0] = 0; - num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0); - if(IsKeypadKey(ksym)) { - if(ksym == XK_KP_Enter) + while (running && !XNextEvent(dpy, &ev)) { + if (ev.type == KeyPress) { + explicit_bzero(&buf, sizeof(buf)); + num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0); + if (IsKeypadKey(ksym)) { + if (ksym == XK_KP_Enter) ksym = XK_Return; - else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) + else if (ksym >= XK_KP_0 && ksym <= XK_KP_9) ksym = (ksym - XK_KP_0) + XK_0; } - if(IsFunctionKey(ksym) || IsKeypadKey(ksym) - || IsMiscFunctionKey(ksym) || IsPFKey(ksym) - || IsPrivateKeypadKey(ksym)) + if (IsFunctionKey(ksym) || + IsKeypadKey(ksym) || + IsMiscFunctionKey(ksym) || + IsPFKey(ksym) || + IsPrivateKeypadKey(ksym)) continue; - switch(ksym) { + switch (ksym) { case XK_Return: passwd[len] = 0; #ifdef HAVE_BSD_AUTH - running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd); + running = !auth_userokay(getlogin(), NULL, "auth-slock", passwd); #else - running = !!strcmp(crypt(passwd, pws), pws); + errno = 0; + if (!(encrypted = crypt(passwd, pws))) + fprintf(stderr, "slock: crypt: %s\n", strerror(errno)); + else + running = !!strcmp(encrypted, pws); #endif - if(running) + if (running) { XBell(dpy, 100); + failure = True; + } + explicit_bzero(&passwd, sizeof(passwd)); len = 0; break; case XK_Escape: + explicit_bzero(&passwd, sizeof(passwd)); len = 0; break; case XK_BackSpace: - if(len) - --len; + if (len) + passwd[len--] = 0; break; default: - if(num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) { + if (num && !iscntrl((int)buf[0]) && (len + num < sizeof(passwd))) { memcpy(passwd + len, buf, num); len += num; } break; } - if(llen == 0 && len != 0) { - for(screen = 0; screen < nscreens; screen++) { - XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[1]); + color = len ? INPUT : (failure || failonclear ? FAILED : INIT); + if (running && oldc != color) { + for (screen = 0; screen < nscreens; screen++) { + XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[color]); XClearWindow(dpy, locks[screen]->win); } - } else if(llen != 0 && len == 0) { - for(screen = 0; screen < nscreens; screen++) { - XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[0]); + oldc = color; + } + } else if (rr && ev.type == rrevbase + RRScreenChangeNotify) { + XRRScreenChangeNotifyEvent *rre = (XRRScreenChangeNotifyEvent*)&ev; + for (screen = 0; screen < nscreens; screen++) { + if (locks[screen]->win == rre->window) { + XResizeWindow(dpy, locks[screen]->win, rre->width, rre->height); XClearWindow(dpy, locks[screen]->win); } } - llen = len; - } - else for(screen = 0; screen < nscreens; screen++) + } else for (screen = 0; screen < nscreens; screen++) XRaiseWindow(dpy, locks[screen]->win); } } static void -unlockscreen(Display *dpy, Lock *lock) { +unlockscreen(Display *dpy, Lock *lock) +{ if(dpy == NULL || lock == NULL) return; XUngrabPointer(dpy, CurrentTime); - XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, 2, 0); + XUngrabKeyboard(dpy, CurrentTime); + XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, NUMCOLS, 0); XFreePixmap(dpy, lock->pmap); XDestroyWindow(dpy, lock->win); free(lock); } +static void +cleanup(Display *dpy) +{ + int s; + + for (s = 0; s < nscreens; ++s) + unlockscreen(dpy, locks[s]); + + free(locks); + XCloseDisplay(dpy); +} + static Lock * -lockscreen(Display *dpy, int screen) { +lockscreen(Display *dpy, int screen) +{ char curs[] = {0, 0, 0, 0, 0, 0, 0, 0}; - unsigned int len; + int i, ptgrab, kbgrab; Lock *lock; XColor color, dummy; XSetWindowAttributes wa; Cursor invisible; - if(dpy == NULL || screen < 0) - return NULL; - - lock = malloc(sizeof(Lock)); - if(lock == NULL) + if (dpy == NULL || screen < 0 || !(lock = malloc(sizeof(Lock)))) return NULL; lock->screen = screen; - lock->root = RootWindow(dpy, lock->screen); + for (i = 0; i < NUMCOLS; i++) { + XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), colorname[i], &color, &dummy); + lock->colors[i] = color.pixel; + } + /* init */ wa.override_redirect = 1; - wa.background_pixel = BlackPixel(dpy, lock->screen); + wa.background_pixel = lock->colors[INIT]; lock->win = XCreateWindow(dpy, lock->root, 0, 0, DisplayWidth(dpy, lock->screen), DisplayHeight(dpy, lock->screen), - 0, DefaultDepth(dpy, lock->screen), CopyFromParent, - DefaultVisual(dpy, lock->screen), CWOverrideRedirect | CWBackPixel, &wa); - XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR2, &color, &dummy); - lock->colors[1] = color.pixel; - XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR1, &color, &dummy); - lock->colors[0] = color.pixel; + 0, DefaultDepth(dpy, lock->screen), CopyFromParent, + DefaultVisual(dpy, lock->screen), CWOverrideRedirect | CWBackPixel, &wa); lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8); invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &color, &color, 0, 0); XDefineCursor(dpy, lock->win, invisible); - XMapRaised(dpy, lock->win); - for(len = 1000; len; len--) { - if(XGrabPointer(dpy, lock->root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask, - GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess) - break; - usleep(1000); - } - if(running && (len > 0)) { - for(len = 1000; len; len--) { - if(XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, CurrentTime) - == GrabSuccess) - break; - usleep(1000); + + /* Try to grab mouse pointer *and* keyboard for 600ms, else fail the lock */ + for (i = 0, ptgrab = kbgrab = -1; i < 6; i++) { + if (ptgrab != GrabSuccess) { + ptgrab = XGrabPointer(dpy, lock->root, False, + ButtonPressMask | ButtonReleaseMask | + PointerMotionMask, GrabModeAsync, + GrabModeAsync, None, invisible, CurrentTime); + } + if (kbgrab != GrabSuccess) { + kbgrab = XGrabKeyboard(dpy, lock->root, True, + GrabModeAsync, GrabModeAsync, CurrentTime); } - } - running &= (len > 0); - if(!running) { - unlockscreen(dpy, lock); - lock = NULL; + /* input is grabbed: we can lock the screen */ + if (ptgrab == GrabSuccess && kbgrab == GrabSuccess) { + XMapRaised(dpy, lock->win); + if (rr) + XRRSelectInput(dpy, lock->win, RRScreenChangeNotifyMask); + + XSelectInput(dpy, lock->root, SubstructureNotifyMask); + return lock; + } + + /* retry on AlreadyGrabbed but fail on other errors */ + if ((ptgrab != AlreadyGrabbed && ptgrab != GrabSuccess) || + (kbgrab != AlreadyGrabbed && kbgrab != GrabSuccess)) + break; + + usleep(100000); } - else - XSelectInput(dpy, lock->root, SubstructureNotifyMask); - return lock; + /* we couldn't grab all input: fail out */ + if (ptgrab != GrabSuccess) + fprintf(stderr, "slock: unable to grab mouse pointer for screen %d\n", screen); + if (kbgrab != GrabSuccess) + fprintf(stderr, "slock: unable to grab keyboard for screen %d\n", screen); + return NULL; } static void -usage(void) { - fprintf(stderr, "usage: slock [-v]\n"); - exit(EXIT_FAILURE); +usage(void) +{ + die("usage: slock [-v] [cmd [arg ...]]\n"); } int @@ -256,58 +324,86 @@ main(int argc, char **argv) { const char *pws; #endif Display *dpy; - int screen; + int s, nlocks; - if((argc == 2) && !strcmp("-v", argv[1])) - die("slock-%s, © 2006-2012 Anselm R Garbe\n", VERSION); - else if(argc != 1) + ARGBEGIN { + case 'v': + fprintf(stderr, "slock-"VERSION"\n"); + return 0; + default: usage(); + } ARGEND #ifdef __linux__ dontkillme(); #endif - if(!getpwuid(getuid())) - die("slock: no passwd entry for you\n"); + /* Check if the current user has a password entry */ + errno = 0; + if (!getpwuid(getuid())) { + if (errno == 0) + die("slock: no password entry for current user\n"); + else + die("slock: getpwuid: %s\n", strerror(errno)); + } #ifndef HAVE_BSD_AUTH pws = getpw(); + if (strlen(pws) < 2) + die("slock: failed to get user password hash.\n"); #endif - if(!(dpy = XOpenDisplay(0))) + if (!(dpy = XOpenDisplay(NULL))) die("slock: cannot open display\n"); - /* Get the number of screens in display "dpy" and blank them all. */ + + /* check for Xrandr support */ + rr = XRRQueryExtension(dpy, &rrevbase, &rrerrbase); + + /* get number of screens in display "dpy" and blank them */ nscreens = ScreenCount(dpy); - locks = malloc(sizeof(Lock *) * nscreens); - if(locks == NULL) - die("slock: malloc: %s\n", strerror(errno)); - int nlocks = 0; - for(screen = 0; screen < nscreens; screen++) { - if ( (locks[screen] = lockscreen(dpy, screen)) != NULL) + if (!(locks = calloc(nscreens, sizeof(Lock *)))) { + XCloseDisplay(dpy); + die("slock: out of memory\n"); + } + for (nlocks = 0, s = 0; s < nscreens; s++) { + if ((locks[s] = lockscreen(dpy, s)) != NULL) nlocks++; + else + break; } - XSync(dpy, False); + XSync(dpy, 0); - /* Did we actually manage to lock something? */ - if (nlocks == 0) { // nothing to protect - free(locks); - XCloseDisplay(dpy); + /* did we manage to lock everything? */ + if (nlocks != nscreens) { + cleanup(dpy); return 1; } - /* Everything is now blank. Now wait for the correct password. */ + /* run post-lock command */ + if (argc > 0) { + switch (fork()) { + case -1: + cleanup(dpy); + die("slock: fork failed: %s\n", strerror(errno)); + case 0: + if (close(ConnectionNumber(dpy)) < 0) + die("slock: close: %s\n", strerror(errno)); + execvp(argv[0], argv); + fprintf(stderr, "slock: execvp %s: %s\n", argv[0], + strerror(errno)); + _exit(1); + } + } + + /* everything is now blank. Wait for the correct password */ #ifdef HAVE_BSD_AUTH readpw(dpy); #else readpw(dpy, pws); #endif - /* Password ok, unlock everything and quit. */ - for(screen = 0; screen < nscreens; screen++) - unlockscreen(dpy, locks[screen]); - - free(locks); - XCloseDisplay(dpy); + /* password ok, unlock everything and quit */ + cleanup(dpy); return 0; }