X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=authfile.c;h=088036071d96fae2c0d5af7a5e10674dc3d15407;hp=923cb8824fb31db39089e451edb95120de02d780;hb=f6b4fd086473f179295386fb47fd422f47015d16;hpb=da2a84904dd17e4ed70a6497c0d18f69d004d453

diff --git a/authfile.c b/authfile.c
index 923cb88..0880360 100644
--- a/authfile.c
+++ b/authfile.c
@@ -34,6 +34,7 @@ freely, subject to the following restrictions:
 #include <unistd.h>
 #include <errno.h>
 #include <alloca.h>
+#include "base64.h"
 #include "authobj.h"
 #include "authfile.h"
 
@@ -57,49 +58,42 @@ void authfile_template(const char *str)
 	template = str;
 }
 
-static int path_size(const char *tokenid, const char *userid)
+/*
+  I know using these two functions and alloca() in between it ugly, but
+  I like the alternatives even less. =ec
+*/
+
+static int path_size(const char *tokenid, const struct passwd *pw)
 {
 	const char *usub;
 	const char *p, *q;
-	struct passwd *pw;
 
 	if ((p = strchr(template, '~')) != strrchr(template, '~')) return 0;
 	if ((q = strchr(template, '?')) != strrchr(template, '?')) return 0;
-	if (p && !userid) return 0;
+	if (p && !pw) return 0;
 	if (q && !tokenid) return 0;
-	if (p == template) {
-		pw = getpwnam(userid);
-		if (!pw) return 0;
-		usub = pw->pw_dir;
-	} else {
-		usub = userid;
-	}
+	if (p == template) usub = pw->pw_dir;
+	else usub = pw->pw_name;
 	return strlen(template)+(p?strlen(usub):0)+(q?strlen(tokenid):0)+1;
 }
 
-static void
-make_path(char * const path, const char *tokenid, const char *userid)
+static int
+make_path(char * const path, const char *tokenid, const struct passwd *pw)
 {
-	const char *usub;
 	const char *p;
 	char *q;
-	struct passwd *pw;
 
 	path[0] = '\0';
-	if (template[0] == '~') {
-		pw = getpwnam(userid);
-		if (!pw) return;
-		usub = pw->pw_dir;
-	} else {
-		usub = userid;
-	}
 	q = path;
 	for (p = template; *p; p++) switch (*p) {
 	case '~':
-		strcpy(q, usub);
+		if (!pw) return 1;
+		if (p == template) strcpy(q, pw->pw_dir);
+		else strcpy(q, pw->pw_name);
 		while (*q) q++;
 		break;
 	case '?':
+		if (!tokenid) return 1;
 		strcpy(q, tokenid);
 		while (*q) q++;
 		break;
@@ -108,6 +102,7 @@ make_path(char * const path, const char *tokenid, const char *userid)
 		break;
 	}
 	*q = '\0';
+	return 0;
 }
 
 int parse(char * const buf, const int argc, const char *argv[const])
@@ -132,10 +127,12 @@ struct _auth_obj authfile(const char *tokenid,
 						const int csize))
 {
 	struct _auth_obj ret = {0};
+	const struct passwd *pw = NULL;
 	mode_t oldmask;
 	FILE *fp = NULL;
 	char *fn, *nfn;
 	int fnl;
+	struct stat st = {0};
 	char *buf = NULL;
 	struct {
 		const char *tokenid;
@@ -149,20 +146,21 @@ struct _auth_obj authfile(const char *tokenid,
 	int nonsize;
 	struct _auth_obj ao;
 
-	if ((fnl = path_size(tokenid, userid)) == 0) {
-		ret.err = "authfile path impossible to build";
+	if (userid) pw = getpwnam(userid);
+	if ((fnl = path_size(tokenid, pw)) == 0) {
+		ret.err = "authfile path_size failed";
 		return ret;
 	}
 	fn = alloca(fnl);
-	make_path(fn, tokenid, userid);
+	if (make_path(fn, tokenid, pw)) {
+		ret.err = "authfile make_path failed";
+		return ret;
+	}
 	nfn = alloca(fnl+32);
 	snprintf(nfn, fnl+32, "%s.%d.%ld", fn, (int)getpid(), (long)time(NULL));
 	fp = fopen(fn, "r");
 	if (fp) {
-		struct stat st;
-		int fd = fileno(fp);
-
-		if (fstat(fd, &st)) st.st_size = 2047;
+		if (fstat(fileno(fp), &st)) st.st_size = 2047;
 		if (st.st_size > 2047) st.st_size = 2047;
 		buf = alloca(st.st_size + 1);
 		if (!fgets(buf, st.st_size + 1, fp)) {
@@ -176,20 +174,10 @@ struct _auth_obj authfile(const char *tokenid,
 	if (ret.err) return ret;
 
 	if (w.hablob) {
-		int hlen = strlen(w.hablob);
-		if (hlen % 32 != 0) {
-			ret.err = "error: auth string has wrong length";
-		} else if (hlen !=
-				strspn(w.hablob, "0123456789abcdefABCDEF")) {
-			ret.err = "error: auth string not hexadecimal";
-		} else {
-			int i;
-
-			blobsize = hlen/2;
-			ablob = alloca(blobsize);
-			for (i = 0; i < blobsize; i++)
-				sscanf(&w.hablob[i*2], "%2hhx", &ablob[i]);
-		}
+		blobsize = strlen(w.hablob)*3/4;
+		ablob = alloca(blobsize);
+		if (b64_decode(w.hablob, ablob, &blobsize))
+			ret.err = "error: undecodeable auth string";
 	}
 	if (ret.err) return ret;
 
@@ -215,16 +203,19 @@ struct _auth_obj authfile(const char *tokenid,
 
 	oldmask = umask(077);
 	if ((fp = fopen(nfn, "w"))) {
-		int i;
+		int bsize = ((ao.datasize-1)/3+1)*4+1;
+		char *b64 = alloca(bsize);
 
-		if (fprintf(fp, "%s:%s:%s:", tokenid?tokenid:w.tokenid,
-				userid?userid:w.userid, newnonce) < 0) {
-			ret.err = strerror(errno);
-		} else for (i = 0; i < ao.datasize; i++)
-		    if (fprintf(fp, "%02x", ao.data[i]) < 0) {
+		if (b64_encode(ao.data, ao.datasize, b64, &bsize)) {
+			ret.err = "error: could not encode auth string";
+		} else if (fprintf(fp, "%s:%s:%s:%s\n",
+				tokenid?tokenid:w.tokenid,
+				userid?userid:w.userid, newnonce, b64) < 0) {
 			ret.err = strerror(errno);
 		}
-		fprintf(fp, "\n");
+		if (st.st_uid || st.st_gid) {
+			if (fchown(fileno(fp), st.st_uid, st.st_gid)) /*ign*/;
+		}
 		if (fclose(fp) < 0) {
 			ret.err = strerror(errno);
 		}