Release notes for 1.9.1

[blerg.git] / common / auth.c

diff --git a/common/auth.c b/common/auth.c
index a048c2f..ef548ec 100644 (file)
--- a/common/auth.c
+++ b/common/auth.c
@@ -7,17 +7,19 @@
 #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 "md5.h"
 
 int auth_set_password(const char *username, const char *password) {
        char filename[FILENAME_MAX];
-       unsigned char pwhash[SCRYPT_OUTPUT_SIZE];
-       unsigned char salt[SCRYPT_SALT_SIZE];
+       uint8_t pwhash[SCRYPT_OUTPUT_SIZE];
+       uint8_t salt[SCRYPT_SALT_SIZE];
        int fd, n, r;
 
        if (!valid_name(username) || !blerg_exists(username))
@@ -36,7 +38,7 @@ int auth_set_password(const char *username, const char *password) {
        read(fd, 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, 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;
@@ -67,7 +69,7 @@ int auth_get_password_version(const char *username) {
        char filename[FILENAME_MAX];
        int fd;
        char str[4];
-       int len;
+       int len = 0;
 
        snprintf(filename, FILENAME_MAX, "%s/%s/password_version", blergconf.data_path, username);
        if (access(filename, F_OK) != 0) {
@@ -75,9 +77,18 @@ int auth_get_password_version(const char *username) {
        }
 
        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);
 }
@@ -85,33 +96,47 @@ int auth_get_password_version(const char *username) {
 int auth_get_password(const char *username, char *password) {
        char filename[FILENAME_MAX];
        int fd;
+       int read_size;
        int len = 0;
 
        if (!valid_name(username))
                return 0;
 
-       snprintf(filename, FILENAME_MAX, "%s/%s/password", blergconf.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) {
+int auth_get_salt(const char *username, uint8_t *salt) {
        char filename[FILENAME_MAX];
-       int fd, len;
+       int fd;
+       int len = 0;
 
        if (!valid_name(username))
                return 0;
@@ -123,12 +148,20 @@ int auth_get_salt(const char *username, char *salt) {
        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)
@@ -137,7 +170,7 @@ int auth_check_password_v0(const char *username, const char *password) {
        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;
@@ -147,17 +180,17 @@ int auth_check_password_v0(const char *username, const char *password) {
 
 int auth_check_password_v1(const char *username, const char *password) {
        unsigned char epw[SCRYPT_OUTPUT_SIZE];
-       unsigned char esalt[SCRYPT_SALT_SIZE];
+       uint8_t esalt[SCRYPT_SALT_SIZE];
        unsigned char givenpw[SCRYPT_OUTPUT_SIZE];
        int r;
 
-       if (auth_get_password(username, epw) == 0)
+       if (auth_get_password(username, (char *)epw) == 0)
                return 0;
 
        if (auth_get_salt(username, esalt) == 0)
                return 0;
 
-       r = crypto_scrypt(password, strlen(password), esalt, SCRYPT_SALT_SIZE, SCRYPT_N, SCRYPT_r, SCRYPT_p, givenpw, SCRYPT_OUTPUT_SIZE);
+       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;
@@ -185,6 +218,8 @@ int auth_check_password(const char *username, const char *password) {
        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) {
@@ -198,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;