/* Blerg is (C) 2011 The Dominion of Awesome, and is distributed under a
* BSD-style license. Please see the COPYING file for details.
*/
+#include <sys/file.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#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"
+#include "stringring.h"
#include "md5.h"
int auth_set_password(const char *username, const char *password) {
- char filename[512];
- unsigned char pwhash[SCRYPT_OUTPUT_SIZE];
- unsigned char salt[SCRYPT_SALT_SIZE];
+ char filename[FILENAME_MAX];
+ struct auth_v2 auth;
int fd, n, r;
if (!valid_name(username) || !blerg_exists(username))
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(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) {
- printf("Failure in scrypt for %s\n", username);
+ fprintf(stderr, "Failure in scrypt for %s\n", username);
return 0;
}
- /* Write the password */
- snprintf(filename, 512, "%s/%s/password", 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, 512, "%s/%s/password_salt", 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, 512, "%s/%s/password_version", 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[512];
+ char filename[FILENAME_MAX];
int fd;
char str[4];
- int version;
+ 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;
+ }
- sprintf(filename, "%s/%s/password_version", DATA_PATH, username);
+ 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);
- read(fd, str, 4);
+ if (fd == -1)
+ return -1;
+ len = read(fd, str, 4);
close(fd);
+
+ if (len < 0) {
+ 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);
- fd = open(filename, O_RDONLY);
- if (fd == -1)
- return 0;
switch(auth_get_password_version(username)) {
case 0:
- len = read(fd, password, MD5_DIGEST_SIZE);
+ read_size = MD5_DIGEST_SIZE;
break;
case 1:
- len = read(fd, password, SCRYPT_OUTPUT_SIZE);
+ 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, 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_get_salt(const char *username, char *salt) {
- char filename[512];
- int fd, len;
+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;
- sprintf(filename, "%s/%s/password_salt", DATA_PATH, username);
+ 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];
- unsigned char givenpw[MD5_DIGEST_SIZE];
+ char givenpw[MD5_DIGEST_SIZE];
struct MD5Context ctx;
if (auth_get_password(username, epw) == 0)
MD5Init(&ctx);
MD5Update(&ctx, username, strlen(username));
MD5Update(&ctx, password, strlen(password));
- MD5Final(givenpw, &ctx);
+ MD5Final((unsigned char *)givenpw, &ctx);
if (strncmp(givenpw, epw, MD5_DIGEST_SIZE) == 0)
return 1;
return 0;
}
-int auth_check_password_v1(const char *username, const char *password) {
- unsigned char epw[SCRYPT_OUTPUT_SIZE];
- unsigned char 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;
+
+ 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);
- if (auth_get_salt(username, esalt) == 0)
+ 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;
+}
- r = crypto_scrypt(password, strlen(password), esalt, SCRYPT_SALT_SIZE, SCRYPT_N, SCRYPT_r, SCRYPT_p, givenpw, SCRYPT_OUTPUT_SIZE);
+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) {
- printf("Failure in scrypt for %s\n", username);
+ 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);
}
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) {
}
char *create_random_token() {
- unsigned char buf[TOKEN_SIZE];
+ char buf[TOKEN_SIZE];
char *token;
int rand_fd;
}
char * auth_login(const char *username, const char *password) {
- char filename[512];
- int token_fd;
+ char filename[FILENAME_MAX];
+ struct stringring *sr;
+ char *token;
+
if (!auth_check_password(username, password))
return NULL;
- char *token = create_random_token();
-
- sprintf(filename, "%s/%s/tokens", DATA_PATH, username);
- if (access(filename, F_OK) != 0) {
- if (mkdir(filename, 0700) == -1) {
- perror("Could not create auth token dir");
- return NULL;
- }
+ snprintf(filename, FILENAME_MAX, "%s/%s/tokens", blergconf.data_path, username);
+ sr = stringring_open(filename);
+ if (sr == NULL) {
+ return NULL;
}
-
- sprintf(filename, "%s/%s/tokens/%s", 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[512];
+ char filename[FILENAME_MAX];
+ struct stringring *sr;
+ int ret;
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);
- 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[512];
+ char filename[FILENAME_MAX];
+ struct stringring *sr;
+ int ret;
- sprintf(filename, "%s/%s/tokens/%s", 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 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];
- return (access(filename, F_OK) == 0);
+ 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;
}
projects / blerg.git / blobdiff