X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=common%2Fauth.c;h=ef548ec8a312e23c9a7ec212c821b97dac29adc8;hb=abeaeafe6860bef22ab8469261d3198efc8358c1;hp=0dbe6a4a12094bd1cf2e5d1eee8da0d1fd5f9cb2;hpb=30465019b067284f33ffe514e970edcf3ca6f1e5;p=blerg.git

diff --git a/common/auth.c b/common/auth.c
index 0dbe6a4..ef548ec 100644
--- a/common/auth.c
+++ b/common/auth.c
@@ -7,16 +7,20 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
+#include <crypto_scrypt.h>
 #include "config.h"
+#include "configuration.h"
+#include "database.h"
 #include "auth.h"
 #include "util.h"
-
-#define TOKEN_SIZE 16
-#define MAX_PASSWORD_LENGTH 64
+#include "md5.h"
 
 int auth_set_password(const char *username, const char *password) {
-	char filename[512];
-	int fd, n;
+	char filename[FILENAME_MAX];
+	uint8_t pwhash[SCRYPT_OUTPUT_SIZE];
+	uint8_t salt[SCRYPT_SALT_SIZE];
+	int fd, n, r;
 
 	if (!valid_name(username) || !blerg_exists(username))
 		return 0;
@@ -25,46 +29,199 @@ int auth_set_password(const char *username, const char *password) {
 	if (n > MAX_PASSWORD_LENGTH)
 		return 0;
 
-	snprintf(filename, 512, "%s/%s/password", DATA_PATH, username);
+	/* Gather some salt */
+	fd = open("/dev/urandom", O_RDONLY);
+	if (fd == -1) {
+		perror("Could not open /dev/urandom\n");
+		return 0;
+	}
+	read(fd, salt, SCRYPT_SALT_SIZE);
+	close(fd);
+
+	r = crypto_scrypt((const uint8_t *)password, n, salt, SCRYPT_SALT_SIZE, SCRYPT_N, SCRYPT_r, SCRYPT_p, pwhash, SCRYPT_OUTPUT_SIZE);
+	if (r != 0) {
+		fprintf(stderr, "Failure in scrypt for %s\n", username);
+		return 0;
+	}
+
+	/* Write the password */
+	snprintf(filename, FILENAME_MAX, "%s/%s/password", blergconf.data_path, username);
 	fd = open(filename, O_WRONLY | O_CREAT, 0600);
-	write(fd, password, n);
+	write(fd, pwhash, SCRYPT_OUTPUT_SIZE);
+	close(fd);
+
+	/* Write the salt */
+	snprintf(filename, FILENAME_MAX, "%s/%s/password_salt", blergconf.data_path, username);
+	fd = open(filename, O_WRONLY | O_CREAT, 0600);
+	write(fd, salt, SCRYPT_SALT_SIZE);
+	close(fd);
+
+	/* Mark this as a version 1 password */
+	snprintf(filename, FILENAME_MAX, "%s/%s/password_version", blergconf.data_path, username);
+	fd = open(filename, O_WRONLY | O_CREAT, 0600);
+	write(fd, "1\n", 2);
 	close(fd);
 	
 	return 1;
 }
 
+int auth_get_password_version(const char *username) {
+	char filename[FILENAME_MAX];
+	int fd;
+	char str[4];
+	int len = 0;
+
+	snprintf(filename, FILENAME_MAX, "%s/%s/password_version", blergconf.data_path, username);
+	if (access(filename, F_OK) != 0) {
+		return 0;
+	}
+
+	fd = open(filename, O_RDONLY);
+	if (fd == -1)
+		return -1;
+	len = read(fd, str, 4);
+	close(fd);
+
+	if (len < -1) {
+		perror("auth_get_password_version");
+		return -1;
+	}
+
+	str[len] = 0;
+
+	/* strtol returns zero if there isn't a number */
+	return strtol(str, NULL, 10);
+}
+
 int auth_get_password(const char *username, char *password) {
-	char filename[512];
+	char filename[FILENAME_MAX];
 	int fd;
+	int read_size;
 	int len = 0;
 
 	if (!valid_name(username))
 		return 0;
 
-	sprintf(filename, "%s/%s/password", DATA_PATH, username);
+	switch(auth_get_password_version(username)) {
+	case 0:
+		read_size = MD5_DIGEST_SIZE;
+		break;
+	case 1:
+		read_size = SCRYPT_OUTPUT_SIZE;
+		break;
+	default:
+		return 0;
+	}
+
+	snprintf(filename, FILENAME_MAX, "%s/%s/password", blergconf.data_path, username);
 	fd = open(filename, O_RDONLY);
 	if (fd == -1)
 		return 0;
-	len = read(fd, password, MAX_PASSWORD_LENGTH);
+	len = read(fd, password, read_size);
 	close(fd);
 
+	if (len < 0) {
+		perror("auth_get_password");
+		return 0;
+	} else if (len < read_size) {
+		fprintf(stderr, "Short read getting password\n");
+		return 0;
+	}
+
 	password[len] = 0;
 
 	return 1;
 }
 
-int auth_check_password(const char *username, const char *password) {
-	char epw[33];
+int auth_get_salt(const char *username, uint8_t *salt) {
+	char filename[FILENAME_MAX];
+	int fd;
+	int len = 0;
+
+	if (!valid_name(username))
+		return 0;
+
+	snprintf(filename, FILENAME_MAX, "%s/%s/password_salt", blergconf.data_path, username);
+	fd = open(filename, O_RDONLY);
+	if (fd == -1)
+		return 0;
+	len = read(fd, salt, SCRYPT_SALT_SIZE);
+	close(fd);
+
+	if (len < 0) {
+		perror("auth_get_salt");
+		return 0;
+	} else if (len < SCRYPT_SALT_SIZE) {
+		fprintf(stderr, "Short read getting salt\n");
+		return 0;
+	}
+
+	return 1;
+}
+
+int auth_check_password_v0(const char *username, const char *password) {
+	char epw[MD5_DIGEST_SIZE + 1];
+	char givenpw[MD5_DIGEST_SIZE];
+	struct MD5Context ctx;
 
 	if (auth_get_password(username, epw) == 0)
 		return 0;
 
-	if (strncmp(password, epw, MAX_PASSWORD_LENGTH) == 0)
+	MD5Init(&ctx);
+	MD5Update(&ctx, username, strlen(username));
+	MD5Update(&ctx, password, strlen(password));
+	MD5Final((unsigned char *)givenpw, &ctx);
+
+	if (strncmp(givenpw, epw, MD5_DIGEST_SIZE) == 0)
 		return 1;
 	else
 		return 0;
 }
 
+int auth_check_password_v1(const char *username, const char *password) {
+	unsigned char epw[SCRYPT_OUTPUT_SIZE];
+	uint8_t esalt[SCRYPT_SALT_SIZE];
+	unsigned char givenpw[SCRYPT_OUTPUT_SIZE];
+	int r;
+
+	if (auth_get_password(username, (char *)epw) == 0)
+		return 0;
+
+	if (auth_get_salt(username, esalt) == 0)
+		return 0;
+
+	r = crypto_scrypt((const uint8_t *)password, strlen(password), esalt, SCRYPT_SALT_SIZE, SCRYPT_N, SCRYPT_r, SCRYPT_p, givenpw, SCRYPT_OUTPUT_SIZE);
+	if (r != 0) {
+		fprintf(stderr, "Failure in scrypt for %s\n", username);
+		return 0;
+	}
+
+	if (memcmp(givenpw, epw, SCRYPT_OUTPUT_SIZE) == 0)
+		return 1;
+	else
+		return 0;
+}
+
+int auth_check_password(const char *username, const char *password) {
+	int version = auth_get_password_version(username);
+
+	switch(version) {
+	case 0:
+		if (auth_check_password_v0(username, password)) {
+			/* Refresh to the newest version */
+			auth_set_password(username, password);
+			return 1;
+		} else {
+			return 0;
+		}
+		break;
+	case 1:
+		return auth_check_password_v1(username, password);
+	}
+	fprintf(stderr, "auth_check_password fell through. Bad password version?\n");
+	return 0;
+}
+
 void hexify(char *dst, char *src, int len) {
 	static char hex[] = "0123456789abcdef";
 	int i;
@@ -76,7 +233,7 @@ void hexify(char *dst, char *src, int len) {
 }
 
 char *create_random_token() {
-	unsigned char buf[TOKEN_SIZE];
+	char buf[TOKEN_SIZE];
 	char *token;
 	int rand_fd;
 
@@ -96,7 +253,7 @@ char *create_random_token() {
 }
 
 char * auth_login(const char *username, const char *password) {
-	char filename[512];
+	char filename[FILENAME_MAX];
 	int token_fd;
 
 	if (!auth_check_password(username, password))
@@ -104,7 +261,7 @@ char * auth_login(const char *username, const char *password) {
 
 	char *token = create_random_token();
 
-	sprintf(filename, "%s/%s/tokens", DATA_PATH, username);
+	snprintf(filename, FILENAME_MAX, "%s/%s/tokens", blergconf.data_path, username);
 	if (access(filename, F_OK) != 0) {
 		if (mkdir(filename, 0700) == -1) {
 			perror("Could not create auth token dir");
@@ -112,7 +269,7 @@ char * auth_login(const char *username, const char *password) {
 		}
 	}
 
-	sprintf(filename, "%s/%s/tokens/%s", DATA_PATH, username, token);
+	snprintf(filename, FILENAME_MAX, "%s/%s/tokens/%s", blergconf.data_path, username, token);
 	token_fd = open(filename, O_WRONLY | O_CREAT, 0600);
 	if (token_fd == -1) {
 		perror("Could not open token");
@@ -124,17 +281,17 @@ char * auth_login(const char *username, const char *password) {
 }
 
 int auth_logout(const char *username, const char *token) {
-	char filename[512];
+	char filename[FILENAME_MAX];
 
 	if (!valid_name(username))
 		return 0;
 
-	sprintf(filename, "%s/%s/tokens", DATA_PATH, username);
+	snprintf(filename, FILENAME_MAX, "%s/%s/tokens", blergconf.data_path, username);
 	if (access(filename, F_OK) != 0) {
 		return 0;
 	}
 
-	sprintf(filename, "%s/%s/tokens/%s", DATA_PATH, username, token);
+	snprintf(filename, FILENAME_MAX, "%s/%s/tokens/%s", blergconf.data_path, username, token);
 	if (unlink(filename) == -1)
 		return 0;
 
@@ -142,9 +299,9 @@ int auth_logout(const char *username, const char *token) {
 }
 
 int auth_check_token(const char *username, const char *given_token) {
-	char filename[512];
+	char filename[FILENAME_MAX];
 
-	sprintf(filename, "%s/%s/tokens/%s", DATA_PATH, username, given_token);
+	snprintf(filename, FILENAME_MAX, "%s/%s/tokens/%s", blergconf.data_path, username, given_token);
 
 	return (access(filename, F_OK) == 0);
 }