X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=common%2Fauth.c;h=e2f7407d9cbf8ce69c7b5a6908ceeb424e9d0d5f;hb=d67dd1bf5a247e20141b9907f5a452da73624235;hp=9053a2678245e0f92a6b69f319accbd172c856ae;hpb=b97aaf62ec7989362d563df202d5a62db68e3e0a;p=blerg.git diff --git a/common/auth.c b/common/auth.c index 9053a26..e2f7407 100644 --- a/common/auth.c +++ b/common/auth.c @@ -1,6 +1,7 @@ /* Blerg is (C) 2011 The Dominion of Awesome, and is distributed under a * BSD-style license. Please see the COPYING file for details. */ +#include #include #include #include @@ -14,12 +15,12 @@ #include "database.h" #include "auth.h" #include "util.h" +#include "stringring.h" #include "md5.h" int auth_set_password(const char *username, const char *password) { char filename[FILENAME_MAX]; - unsigned char pwhash[SCRYPT_OUTPUT_SIZE]; - uint8_t salt[SCRYPT_SALT_SIZE]; + struct auth_v2 auth; int fd, n, r; if (!valid_name(username) || !blerg_exists(username)) @@ -29,39 +30,35 @@ int auth_set_password(const char *username, const char *password) { if (n > MAX_PASSWORD_LENGTH) return 0; + /* Clear the auth structure */ + memset(&auth, 0, sizeof(struct auth_v2)); + + /* Set the auth version */ + auth.header.version = 2; + /* Gather some salt */ fd = open("/dev/urandom", O_RDONLY); if (fd == -1) { - perror("Could not open /dev/urandom\n"); + perror("Could not open /dev/urandom"); return 0; } - read(fd, salt, SCRYPT_SALT_SIZE); + read(fd, auth.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); + r = crypto_scrypt((const uint8_t *)password, n, auth.salt, SCRYPT_SALT_SIZE, SCRYPT_N, SCRYPT_r, SCRYPT_p, auth.password, 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); + /* Write the data */ + snprintf(filename, FILENAME_MAX, "%s/%s/auth", blergconf.data_path, username); fd = open(filename, O_WRONLY | O_CREAT, 0600); - write(fd, pwhash, SCRYPT_OUTPUT_SIZE); + flock(fd, LOCK_EX); + write(fd, &auth, sizeof(struct auth_v2)); + flock(fd, LOCK_UN); 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; } @@ -69,8 +66,28 @@ int auth_get_password_version(const char *username) { char filename[FILENAME_MAX]; int fd; char str[4]; + struct auth_header ah; int len = 0; + snprintf(filename, FILENAME_MAX, "%s/%s/auth", blergconf.data_path, username); + if (access(filename, F_OK) == 0) { + fd = open(filename, O_RDONLY); + if (fd == -1) + return -1; + len = read(fd, &ah, sizeof(struct auth_header)); + close(fd); + + if (len < 0) { + perror("reading auth file"); + return -1; + } else if (len < sizeof(struct auth_header)) { + fprintf(stderr, "Short read on while determining auth version for %s", username); + return -1; + } + + return ah.version; + } + snprintf(filename, FILENAME_MAX, "%s/%s/password_version", blergconf.data_path, username); if (access(filename, F_OK) != 0) { return 0; @@ -82,7 +99,7 @@ int auth_get_password_version(const char *username) { len = read(fd, str, 4); close(fd); - if (len < -1) { + if (len < 0) { perror("auth_get_password_version"); return -1; } @@ -178,30 +195,71 @@ int auth_check_password_v0(const char *username, const char *password) { 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; +int auth_get_data(const char *username, void *data, size_t data_len) { + char filename[FILENAME_MAX]; + int fd; + int len = 0; - if (auth_get_password(username, epw) == 0) + if (!valid_name(username)) return 0; - if (auth_get_salt(username, esalt) == 0) + snprintf(filename, FILENAME_MAX, "%s/%s/auth", blergconf.data_path, username); + fd = open(filename, O_RDONLY); + if (fd == -1) return 0; + flock(fd, LOCK_SH); + len = read(fd, data, data_len); + flock(fd, LOCK_UN); + close(fd); - r = crypto_scrypt(password, strlen(password), esalt, SCRYPT_SALT_SIZE, SCRYPT_N, SCRYPT_r, SCRYPT_p, givenpw, SCRYPT_OUTPUT_SIZE); + if (len < 0) { + perror("auth_get_data"); + return 0; + } else if (len < data_len) { + fprintf(stderr, "Short read getting auth data\n"); + return 0; + } + + return 1; +} + +int auth_check_scrypt(struct auth_v2 *auth, const char *username, const char *password) { + unsigned char givenpw[SCRYPT_OUTPUT_SIZE]; + int r; + + r = crypto_scrypt((const uint8_t *)password, strlen(password), auth->salt, 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) + if (memcmp(givenpw, auth->password, SCRYPT_OUTPUT_SIZE) == 0) return 1; else return 0; } +int auth_check_password_v1(const char *username, const char *password) { + struct auth_v2 auth; + + if (auth_get_password(username, (char *)auth.password) == 0) + return 0; + + if (auth_get_salt(username, auth.salt) == 0) + return 0; + + return auth_check_scrypt(&auth, username, password); +} + +int auth_check_password_v2(const char *username, const char *password) { + struct auth_v2 auth; + + if (auth_get_data(username, (void *) &auth, sizeof(struct auth_v2)) == 0) + return 0; + + return auth_check_scrypt(&auth, username, password); +} + int auth_check_password(const char *username, const char *password) { int version = auth_get_password_version(username); @@ -216,8 +274,19 @@ int auth_check_password(const char *username, const char *password) { } break; case 1: - return auth_check_password_v1(username, password); + if (auth_check_password_v1(username, password)) { + /* Refresh to the newest version */ + auth_set_password(username, password); + return 1; + } else { + return 0; + } + break; + case 2: + return auth_check_password_v2(username, password); } + fprintf(stderr, "auth_check_password fell through. Bad password version?\n"); + return 0; } void hexify(char *dst, char *src, int len) { @@ -231,7 +300,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; @@ -252,34 +321,33 @@ char *create_random_token() { char * auth_login(const char *username, const char *password) { char filename[FILENAME_MAX]; - int token_fd; + struct stringring *sr; + char *token; + if (!auth_check_password(username, password)) return NULL; - char *token = create_random_token(); - 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"); - return NULL; - } + sr = stringring_open(filename); + if (sr == NULL) { + return NULL; } - - 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"); + token = create_random_token(); + if (!stringring_add(sr, token)) { + free(token); + stringring_close(sr); return NULL; } - close(token_fd); + stringring_close(sr); return token; } int auth_logout(const char *username, const char *token) { char filename[FILENAME_MAX]; + struct stringring *sr; + int ret; if (!valid_name(username)) return 0; @@ -288,18 +356,60 @@ int auth_logout(const char *username, const char *token) { if (access(filename, F_OK) != 0) { return 0; } - - snprintf(filename, FILENAME_MAX, "%s/%s/tokens/%s", blergconf.data_path, username, token); - if (unlink(filename) == -1) + sr = stringring_open(filename); + if (sr == NULL) { return 0; + } + ret = stringring_remove(sr, token); + stringring_close(sr); - return 1; + return ret; } int auth_check_token(const char *username, const char *given_token) { char filename[FILENAME_MAX]; + struct stringring *sr; + int ret; - snprintf(filename, FILENAME_MAX, "%s/%s/tokens/%s", blergconf.data_path, username, given_token); + snprintf(filename, FILENAME_MAX, "%s/%s/tokens", blergconf.data_path, username); + if (access(filename, F_OK) != 0) { + return 0; + } + sr = stringring_open(filename); + if (sr == NULL) { + return 0; + } + ret = (stringring_find(sr, given_token, AUTHENTICATION_TIMEOUT) != -1); + if (ret == 1) { + /* Update token timestamp */ + stringring_touch(sr, given_token); + } + stringring_close(sr); - return (access(filename, F_OK) == 0); + return ret; +} + +/* Return a 32-bit integer "counter" that will change when the password is + * updated. Used to invalidate password recovery schemes after the password is + * updated. Returns the counter in the "counter" argument, and returns + * true/false on success/failure. */ +int auth_get_counter(const char *username, uint32_t *counter) { + struct auth_v2 auth; + struct MD5Context ctx; + uint8_t md5hash[MD5_DIGEST_SIZE]; + + if (auth_get_data(username, (void *) &auth, sizeof(struct auth_v2)) == 0) + return 0; + + /* There's probably going to be some question about using MD5 here. + * All I really need is to quickly and repeatably scramble some bits. + * MD5 can still do that. */ + MD5Init(&ctx); + MD5Update(&ctx, auth.password, SCRYPT_OUTPUT_SIZE); + MD5Update(&ctx, auth.salt, SCRYPT_SALT_SIZE); + MD5Final((unsigned char *)md5hash, &ctx); + + *counter = ((uint32_t *)md5hash)[0]; + + return 1; }