#include "net.h"
#include "daemon.h"
#include "string.h"
+#include "fd.h"
static RC4_KEY rc4_recv_key;
static RC4_KEY rc4_send_key;
ret = 1;
if (num == 1)
goto out;
- usleep(500000 * 100);
+ sleep(50);
+ if (getppid() == 1)
+ return -E_SERVER_CRASH;
}
out:
return ret;
char line[MAXLINE];
/* keyword, user, key, perms */
char w[MAXLINE], n[MAXLINE], k[MAXLINE], p[MAXLINE], tmp[4][MAXLINE];
- int num;
+ int num, ret;
file_ptr = open_user_list(user_list);
if (!file_ptr)
return -E_USERLIST;
- while (fgets(line, MAXLINE, file_ptr)) {
-// PARA_DEBUG_LOG("%s: Read line (%i bytes) "
-// "from config file\n", __func__, strlen(line));
+ for (;;) {
+ ret = para_fgets(line, MAXLINE, file_ptr);
+ if (ret < 0)
+ PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+ if (ret <= 0)
+ break;
if (sscanf(line,"%200s %200s %200s %200s", w, n, k, p) < 3)
continue;
- if (!strcmp(w, "user") && !strcmp(user->name, n)) {
- PARA_DEBUG_LOG("found entry for %s\n", n);
- strcpy(user->name, n);
- strcpy(user->pubkey_file, k);
- user->perms = 0;
- char_ptr = p;
- num = sscanf(char_ptr, "%200[A-Z_],%200[A-Z_],%200[A-Z_],%200[A-Z_]",
- tmp[0], tmp[1], tmp[2], tmp[3]);
- PARA_DEBUG_LOG("found %i perm entries\n",
- num);
- user->perms = 0;
- while (num > 0) {
- num--;
- //PARA_DEBUG_LOG("%s: tmp[%i]=%s\n", __func__,
- // num, tmp[num]);
- if (!strcmp(tmp[num], "AFS_READ"))
- user->perms =
- user->perms | AFS_READ;
- else if (!strcmp(tmp[num], "AFS_WRITE"))
- user->perms =
- user->perms | AFS_WRITE;
- else if (!strcmp(tmp[num], "DB_READ"))
- user->perms = user->perms | DB_READ;
- else if (!strcmp(tmp[num], "DB_WRITE"))
- user->perms = user->perms | DB_WRITE;
- else /* unknown permission */
- PARA_WARNING_LOG("unknown permission:"
- "%s\n", tmp[num]);
- }
- fclose(file_ptr);
- return 1;
+ if (strcmp(w, "user") || strcmp(user->name, n))
+ continue;
+ PARA_DEBUG_LOG("found entry for %s\n", n);
+ strcpy(user->name, n);
+ strcpy(user->pubkey_file, k);
+ user->perms = 0;
+ char_ptr = p;
+ num = sscanf(char_ptr, "%200[A-Z_],%200[A-Z_],%200[A-Z_],%200[A-Z_]",
+ tmp[0], tmp[1], tmp[2], tmp[3]);
+ PARA_DEBUG_LOG("found %i perm entries\n", num);
+ user->perms = 0;
+ while (num > 0) {
+ num--;
+ if (!strcmp(tmp[num], "AFS_READ"))
+ user->perms = user->perms | AFS_READ;
+ else if (!strcmp(tmp[num], "AFS_WRITE"))
+ user->perms = user->perms | AFS_WRITE;
+ else if (!strcmp(tmp[num], "DB_READ"))
+ user->perms = user->perms | DB_READ;
+ else if (!strcmp(tmp[num], "DB_WRITE"))
+ user->perms = user->perms | DB_WRITE;
+ else /* unknown permission */
+ PARA_WARNING_LOG("unknown permission: %s\n",
+ tmp[num]);
}
+ break;
}
fclose(file_ptr);
- return 0;
+ return ret;
}
static void init_rc4_keys(void)
int numbytes, ret, argc, use_rc4 = 0;
char buf[STRINGSIZE];
unsigned char crypt_buf[MAXLINE];
- struct user u;
+ struct _user u;
struct server_command *cmd = NULL;
long unsigned challenge_nr, chall_response;
char **argv = NULL;
goto err_out;
if (numbytes < 9 || strncmp(buf, "auth rc4 ", 9))
- strcpy(u.name, buf + 5); /* client version < 0.2.6 */
+ u.name = para_strdup(buf + 5); /* client version < 0.2.6 */
else {
- strcpy(u.name, buf + 9); /* client version >= 0.2.6 */
+ u.name = para_strdup(buf + 9); /* client version >= 0.2.6 */
use_rc4 = 1;
}
-// strcpy(u.name, buf + 5); /* ok, but ugly */
PARA_DEBUG_LOG("received %s request for user %s\n",
use_rc4? "rc4" : "auth", u.name);
- /* lookup user in list file */
- if ((ret = get_user(&u)) < 0)
+ if ((ret = _get_user(&u)) < 0)
goto err_out;
if (!ret) { /* user not found */
PARA_WARNING_LOG("auth request for unknown user %s\n", u.name);
ret = -E_BAD_USER;
goto err_out;
}
- ret = para_encrypt_challenge(u.pubkey_file, challenge_nr, crypt_buf);
+ ret = para_encrypt_challenge(u.rsa, challenge_nr, crypt_buf);
if (ret <= 0)
goto err_out;
numbytes = ret;
sprintf(buf, "%s", PROCEED_MSG);
if (use_rc4) {
init_rc4_keys();
- ret = para_encrypt_buffer(u.pubkey_file, rc4_buf, 2 * RC4_KEY_LEN,
+ ret = para_encrypt_buffer(u.rsa, rc4_buf, 2 * RC4_KEY_LEN,
(unsigned char *)buf + PROCEED_MSG_LEN + 1);
if (ret <= 0)
goto err_out;