ftpd/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

I don't want fingerprint in slock.

Browse source
This commit is contained in:
Bartek Stalewski 2021-07-21 15:20:09 +02:00
parent a82c8cd2e8
commit e437b906b5
5 changed files with 12 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

63
_suckless/slock/slock.c
View file

@ -23,23 +23,17 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xft/Xft.h>
#include <security/pam_appl.h>
#include <security/pam_misc.h>
#include "arg.h"
#include "util.h"
char *argv0;
static int pam_conv(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr);
struct pam_conv pamc = {pam_conv, NULL};
char passwd[256];
enum {
BACKGROUND,
INIT,
INPUT,
FAILED,
PAM,
NUMCOLS
};
@ -74,31 +68,6 @@ die(const char *errstr, ...)
exit(1);
}
static int
pam_conv(int num_msg, const struct pam_message **msg,
struct pam_response **resp, void *appdata_ptr)
{
int retval = PAM_CONV_ERR;
for(int i=0; i<num_msg; i++) {
if (msg[i]->msg_style == PAM_PROMPT_ECHO_OFF &&
strncmp(msg[i]->msg, "Password: ", 10) == 0) {
struct pam_response *resp_msg = malloc(sizeof(struct pam_response));
if (!resp_msg)
die("malloc failed\n");
char *password = malloc(strlen(passwd) + 1);
if (!password)
die("malloc failed\n");
memset(password, 0, strlen(passwd) + 1);
strcpy(password, passwd);
resp_msg->resp_retcode = 0;
resp_msg->resp = password;
resp[i] = resp_msg;
retval = PAM_SUCCESS;
}
}
return retval;
}
#ifdef __linux__
#include <fcntl.h>
#include <linux/oom.h>
@ -163,8 +132,6 @@ gethash(void)
}
#endif /* HAVE_SHADOW_H */
/* pam, store user name */
hash = pw->pw_name;
return hash;
}
@ -199,12 +166,11 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
const char *hash)
{
XRRScreenChangeNotifyEvent *rre;
char buf[32];
int num, screen, running, failure, oldc, retval;
char buf[32], passwd[256], *inputhash;
int num, screen, running, failure, oldc;
unsigned int len, color;
KeySym ksym;
XEvent ev;
pam_handle_t *pamh;
len = 0;
running = 1;
@ -231,26 +197,10 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
case XK_Return:
passwd[len] = '\0';
errno = 0;
retval = pam_start(pam_service, hash, &pamc, &pamh);
color = PAM;
for (screen = 0; screen < nscreens; screen++) {
XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[color]);
XClearWindow(dpy, locks[screen]->win);
XRaiseWindow(dpy, locks[screen]->win);
}
XSync(dpy, False);
if (retval == PAM_SUCCESS)
retval = pam_authenticate(pamh, 0);
if (retval == PAM_SUCCESS)
retval = pam_acct_mgmt(pamh, 0);
running = 1;
if (retval == PAM_SUCCESS)
running = 0;
if (!(inputhash = crypt(passwd, hash)))
fprintf(stderr, "slock: crypt: %s\n", strerror(errno));
else
fprintf(stderr, "slock: %s\n", pam_strerror(pamh, retval));
pam_end(pamh, retval);
running = !!strcmp(inputhash, hash);
if (running) {
XBell(dpy, 100);
failure = 1;
@ -449,9 +399,10 @@ main(int argc, char **argv) {
dontkillme();
#endif
/* the contents of hash are used to transport the current user name */
hash = gethash();
errno = 0;
if (!crypt("", hash))
die("slock: crypt: %s\n", strerror(errno));
if (!(dpy = XOpenDisplay(NULL)))
die("slock: cannot open display\n");