X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=4b9782f8e8505b3f7088b0a705a64e67cde411ce;hp=00f8dc31cdd8f0be3fbebfd9a9bf0e25650844f0;hb=a27ec6094608c05a9f87e445902c29d15ca11547;hpb=a87d4a87ac7418084eb78f0bcb3accff1388df3a

diff --git a/command.c b/command.c
index 00f8dc31..4b9782f8 100644
--- a/command.c
+++ b/command.c
@@ -31,6 +31,7 @@
 #include "net.h"
 #include "daemon.h"
 #include "string.h"
+#include "fd.h"
 
 static RC4_KEY rc4_recv_key;
 static RC4_KEY rc4_send_key;
@@ -38,7 +39,6 @@ static unsigned char rc4_buf[2 * RC4_KEY_LEN];
 
 extern const char *status_item_list[NUM_STAT_ITEMS];
 extern struct misc_meta_data *mmd;
-extern struct gengetopt_args_info conf;
 extern struct audio_file_selector selectors[];
 extern struct sender senders[];
 extern char *user_list;
@@ -604,7 +604,8 @@ static int com_version(int socket_fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
-	return send_buffer(socket_fd, "para_server-" VERSION ", \"" CODENAME "\"\n"
+	return send_buffer(socket_fd, "para_server-" PACKAGE_VERSION ", \""
+			CODENAME "\"\n"
 			COPYRIGHT "\n"
 			"built: " BUILD_DATE "\n"
 			SYSTEM ", " CC_VERSION "\n"
@@ -690,7 +691,9 @@ static int com_stat(int socket_fd, int argc, char **argv)
 		ret = 1;
 		if (num == 1)
 			goto out;
-		usleep(500000 * 100);
+		sleep(50);
+		if (getppid() == 1)
+			return -E_SERVER_CRASH;
 	}
 out:
 	return ret;
@@ -1009,51 +1012,48 @@ static int get_user(struct user *user) {
 	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)
@@ -1069,12 +1069,14 @@ static void init_rc4_keys(void)
 	RC4_set_key(&rc4_send_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
 }
 
-static void rc4_recv(unsigned long len, const unsigned char *indata, unsigned char *outdata)
+static void rc4_recv(unsigned long len, const unsigned char *indata,
+		unsigned char *outdata, __a_unused void *private_data)
 {
 	RC4(&rc4_recv_key, len, indata, outdata);
 }
 
-static void rc4_send(unsigned long len, const unsigned char *indata, unsigned char *outdata)
+static void rc4_send(unsigned long len, const unsigned char *indata,
+		unsigned char *outdata, __a_unused void *private_data)
 {
 	RC4(&rc4_send_key, len, indata, outdata);
 }
@@ -1084,7 +1086,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	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;
@@ -1099,7 +1101,8 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	in_addr = addr;
 	challenge_nr = random();
 	/* send Welcome message */
-	ret = send_va_buffer(fd, "This is para_server, version " VERSION  ".\n" );
+	ret = send_va_buffer(fd, "This is para_server, version "
+		PACKAGE_VERSION  ".\n" );
 	if (ret < 0)
 		goto err_out;
 	/* recv auth request line */
@@ -1116,23 +1119,21 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 		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;
@@ -1157,7 +1158,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	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;
@@ -1168,7 +1169,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	if (ret < 0)
 		goto err_out;
 	if (use_rc4)
-		enable_crypt(fd, rc4_recv, rc4_send);
+		enable_crypt(fd, rc4_recv, rc4_send, NULL);
 	/* read command */
 	while ((numbytes = recv_buffer(fd, buf, sizeof(buf))) > 0) {
 //		PARA_INFO_LOG("recvd: %s (%d)\n", buf, numbytes);