Add some missing includes

[blerg.git] / common / auth.c

diff --git a/common/auth.c b/common/auth.c
index 439e2ad..a4a40cd 100644 (file)
--- a/common/auth.c
+++ b/common/auth.c
@@ -7,16 +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[512];
+       char filename[FILENAME_MAX];
        unsigned char pwhash[SCRYPT_OUTPUT_SIZE];
-       unsigned char salt[SCRYPT_SALT_SIZE];
+       uint8_t salt[SCRYPT_SALT_SIZE];
        int fd, n, r;
 
        if (!valid_name(username) || !blerg_exists(username))
@@ -35,26 +38,26 @@ 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;
        }
 
        /* Write the password */
-       snprintf(filename, 512, "%s/%s/password", DATA_PATH, username);
+       snprintf(filename, FILENAME_MAX, "%s/%s/password", blergconf.data_path, username);
        fd = open(filename, O_WRONLY | O_CREAT, 0600);
        write(fd, pwhash, SCRYPT_OUTPUT_SIZE);
        close(fd);
 
        /* Write the salt */
-       snprintf(filename, 512, "%s/%s/password_salt", DATA_PATH, username);
+       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, 512, "%s/%s/password_version", DATA_PATH, username);
+       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);
@@ -63,12 +66,12 @@ int auth_set_password(const char *username, const char *password) {
 }
 
 int auth_get_password_version(const char *username) {
-       char filename[512];
+       char filename[FILENAME_MAX];
        int fd;
        char str[4];
        int len;
 
-       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;
        }
@@ -82,14 +85,14 @@ int auth_get_password_version(const char *username) {
 }
 
 int auth_get_password(const char *username, char *password) {
-       char filename[512];
+       char filename[FILENAME_MAX];
        int fd;
        int len = 0;
 
        if (!valid_name(username))
                return 0;
 
-       sprintf(filename, "%s/%s/password", DATA_PATH, username);
+       snprintf(filename, FILENAME_MAX, "%s/%s/password", blergconf.data_path, username);
        fd = open(filename, O_RDONLY);
        if (fd == -1)
                return 0;
@@ -108,14 +111,14 @@ int auth_get_password(const char *username, char *password) {
        return 1;
 }
 
-int auth_get_salt(const char *username, char *salt) {
-       char filename[512];
+int auth_get_salt(const char *username, uint8_t *salt) {
+       char filename[FILENAME_MAX];
        int fd, len;
 
        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;
@@ -127,7 +130,7 @@ int auth_get_salt(const char *username, char *salt) {
 
 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)
@@ -136,7 +139,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;
@@ -146,7 +149,7 @@ 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;
 
@@ -217,7 +220,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))
@@ -225,7 +228,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");
@@ -233,7 +236,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");
@@ -245,17 +248,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;
 
@@ -263,9 +266,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);
 }