X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=common%2Fauth.c;fp=common%2Fauth.c;h=a048c2f0836397bfb65e93b23017630313c560f2;hb=299baeb1e1f2599aec5f6d2dd229f2bf0a1922b7;hp=439e2ad2b80343ce836cdcadb94c469dd175048f;hpb=e6dca775a923fa76d62b3ea420fd8b7bae3c420b;p=blerg.git

diff --git a/common/auth.c b/common/auth.c
index 439e2ad..a048c2f 100644
--- a/common/auth.c
+++ b/common/auth.c
@@ -9,12 +9,13 @@
 #include <stdlib.h>
 #include <crypto_scrypt.h>
 #include "config.h"
+#include "configuration.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];
 	int fd, n, r;
@@ -42,19 +43,19 @@ int auth_set_password(const char *username, const char *password) {
 	}
 
 	/* 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 +64,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 +83,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;
@@ -109,13 +110,13 @@ int auth_get_password(const char *username, char *password) {
 }
 
 int auth_get_salt(const char *username, char *salt) {
-	char filename[512];
+	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;
@@ -217,7 +218,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 +226,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 +234,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 +246,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 +264,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);
 }