X-Git-Url: https://git.danieliu.xyz/?p=slock.git;a=blobdiff_plain;f=slock.c;h=12cd8ee865244fe53d2c0cb8f886c492f8a1acdc;hp=866400d3d4d401a781f01d223b0c4337d9803acb;hb=cc36050e44faa01b2783640ffb2323329d15f97d;hpb=0f1157d7e6cabe0394ffc35a0a58a30507af8ebd diff --git a/slock.c b/slock.c index 866400d..12cd8ee 100644 --- a/slock.c +++ b/slock.c @@ -1,14 +1,12 @@ -/* (C)opyright MMIV-MMV Anselm R. Garbe - * See LICENSE file for license details. - */ -#define _XOPEN_SOURCE - +/* See LICENSE file for license details. */ +#define _XOPEN_SOURCE 500 #if HAVE_SHADOW_H #include -#else -#include #endif +#include +#include +#include #include #include #include @@ -17,118 +15,163 @@ #include #include #include +#include + +#if HAVE_BSD_AUTH +#include +#include +#endif + +void +eprint(const char *errstr, ...) { + va_list ap; + + va_start(ap, errstr); + vfprintf(stderr, errstr, ap); + va_end(ap); + exit(EXIT_FAILURE); +} + +#ifndef HAVE_BSD_AUTH +const char * +get_password() { /* only run as root */ + const char *rval; + struct passwd *pw; + + if(geteuid() != 0) + eprint("slock: cannot retrieve password entry (make sure to suid slock)\n"); + pw = getpwuid(getuid()); + endpwent(); + rval = pw->pw_passwd; + +#if HAVE_SHADOW_H + { + struct spwd *sp; + sp = getspnam(getenv("USER")); + endspent(); + rval = sp->sp_pwdp; + } +#endif + + /* drop privileges */ + if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0) + eprint("slock: cannot drop privileges\n"); + return rval; +} +#endif int main(int argc, char **argv) { char curs[] = {0, 0, 0, 0, 0, 0, 0, 0}; char buf[32], passwd[256]; - int num, prev_nitem, screen; -#if HAVE_SHADOW_H - struct spwd *sp; -#else - struct passwd *pw; + int num, screen; + +#ifndef HAVE_BSD_AUTH + const char *pws; #endif - unsigned int i, len; + unsigned int len; Bool running = True; Cursor invisible; Display *dpy; KeySym ksym; Pixmap pmap; - Window w; + Window root, w; XColor black, dummy; XEvent ev; XSetWindowAttributes wa; - if((argc > 1) && !strncmp(argv[1], "-v", 3)) { - fputs("slock-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout); - exit(EXIT_SUCCESS); - } - if(geteuid() != 0) { - fputs("slock: cannot retrieve password entry (make sure to suid slock)\n", stderr); - exit(EXIT_FAILURE); - } -#if HAVE_SHADOW_H - sp = getspnam(getenv("USER")); - endspent(); -#else - pw = getpwuid(getuid()); - endpwent(); + if((argc == 2) && !strcmp("-v", argv[1])) + eprint("slock-"VERSION", © 2006-2008 Anselm R Garbe\n"); + else if(argc != 1) + eprint("usage: slock [-v]\n"); + +#ifndef HAVE_BSD_AUTH + pws = get_password(); #endif - if(!(dpy = XOpenDisplay(0))) { - fputs("slock: cannot open display\n", stderr); - exit(EXIT_FAILURE); - } + + if(!(dpy = XOpenDisplay(0))) + eprint("slock: cannot open display\n"); screen = DefaultScreen(dpy); + root = RootWindow(dpy, screen); /* init */ - passwd[0] = 0; - while(XGrabKeyboard(dpy, RootWindow(dpy, screen), True, GrabModeAsync, - GrabModeAsync, CurrentTime) != GrabSuccess) - usleep(1000); - wa.override_redirect = 1; wa.background_pixel = BlackPixel(dpy, screen); - w = XCreateWindow(dpy, RootWindow(dpy, screen), 0, 0, - DisplayWidth(dpy, screen), DisplayHeight(dpy, screen), + w = XCreateWindow(dpy, root, 0, 0, DisplayWidth(dpy, screen), DisplayHeight(dpy, screen), 0, DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixel, &wa); - XAllocNamedColor(dpy, DefaultColormap(dpy, screen), "black", &black, &dummy); pmap = XCreateBitmapFromData(dpy, w, curs, 8, 8); invisible = XCreatePixmapCursor(dpy, pmap, pmap, &black, &black, 0, 0); XDefineCursor(dpy, w, invisible); XMapRaised(dpy, w); + for(len = 1000; len; len--) { + if(XGrabPointer(dpy, root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask, + GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess) + break; + usleep(1000); + } + if((running = running && (len > 0))) { + for(len = 1000; len; len--) { + if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime) + == GrabSuccess) + break; + usleep(1000); + } + running = (len > 0); + } + len = 0; XSync(dpy, False); /* main event loop */ - while(running && !XNextEvent(dpy, &ev)) + while(running && !XNextEvent(dpy, &ev)) { + if(len == 0 && DPMSCapable(dpy)) { + DPMSEnabled(dpy); + DPMSForceLevel(dpy, DPMSModeOff); + } if(ev.type == KeyPress) { - len = strlen(passwd); buf[0] = 0; - num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0); + 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) + ksym = (ksym - XK_KP_0) + XK_0; if(IsFunctionKey(ksym) || IsKeypadKey(ksym) || IsMiscFunctionKey(ksym) || IsPFKey(ksym) || IsPrivateKeypadKey(ksym)) continue; - /* first check if a control mask is omitted */ - if(ev.xkey.state & ControlMask) { - switch (ksym) { - case XK_h: - case XK_H: ksym = XK_BackSpace; - break; - case XK_u: - case XK_U: passwd[0] = 0; - continue; - } - } switch(ksym) { case XK_Return: -#if HAVE_SHADOW_H - if((running = strncmp(crypt(passwd, sp->sp_pwdp), sp->sp_pwdp, sizeof(passwd)))) + passwd[len] = 0; + +#ifdef HAVE_BSD_AUTH + running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd); #else - if((running = strncmp(crypt(passwd, pw->pw_passwd), pw->pw_passwd, sizeof(passwd)))) + running = strcmp(crypt(passwd, pws), pws); #endif + + if (running != 0) XBell(dpy, 100); - passwd[0] = 0; + len = 0; break; case XK_Escape: - passwd[0] = 0; + len = 0; break; case XK_BackSpace: if(len) - passwd[--len] = 0; + --len; break; default: - if(num && !iscntrl((int) buf[0])) { - buf[num] = 0; - if(len) - strncat(passwd, buf, sizeof(passwd)); - else - strncpy(passwd, buf, sizeof(passwd)); + if(num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) { + memcpy(passwd + len, buf, num); + len += num; } break; } } + } + XUngrabPointer(dpy, CurrentTime); XFreePixmap(dpy, pmap); XDestroyWindow(dpy, w); XCloseDisplay(dpy);