X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=d4955fb696d7ff88c6f6fd1d263fbf025bcaca73;hp=9b279f7d5eb142f61a76fc0ae3d780da93400c5e;hb=277ed4a605f68118aff9e671f16c0ac6edb1d55a;hpb=36ba180901dd97003208ee6c51b0795cf351cb03

diff --git a/command.c b/command.c
index 9b279f7d..d4955fb6 100644
--- a/command.c
+++ b/command.c
@@ -269,10 +269,7 @@ __printf_3_4 int send_sb_va(struct stream_cipher_context *scc, int band,
  */
 int send_strerror(struct command_context *cc, int err)
 {
-	return cc->use_sideband?
-		send_sb_va(&cc->scc, SBD_ERROR_LOG, "%s\n", para_strerror(err))
-	:
-		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(err));
+	return send_sb_va(&cc->scc, SBD_ERROR_LOG, "%s\n", para_strerror(err));
 }
 
 /**
@@ -339,23 +336,14 @@ static int com_sender(struct command_context *cc)
 			free(msg);
 			msg = tmp;
 		}
-		if (cc->use_sideband)
-			return send_sb(&cc->scc, msg, ret, SBD_OUTPUT, false);
-		ret = sc_send_buffer(&cc->scc, msg);
-		free(msg);
-		return ret;
+		return send_sb(&cc->scc, msg, ret, SBD_OUTPUT, false);
 	}
 	ret = check_sender_args(cc->argc, cc->argv, &scd);
 	if (ret < 0) {
 		if (scd.sender_num < 0)
 			return ret;
 		msg = senders[scd.sender_num].help();
-		if (cc->use_sideband)
-			return send_sb(&cc->scc, msg, strlen(msg), SBD_OUTPUT,
-				false);
-		ret = sc_send_buffer(&cc->scc, msg);
-		free(msg);
-		return ret;
+		return send_sb(&cc->scc, msg, strlen(msg), SBD_OUTPUT, false);
 	}
 
 	switch (scd.cmd_num) {
@@ -417,11 +405,7 @@ static int com_si(struct command_context *cc)
 	mutex_unlock(mmd_mutex);
 	free(ut);
 	free(sender_info);
-	if (cc->use_sideband)
-		return send_sb(&cc->scc, msg, ret, SBD_OUTPUT, false);
-	ret = sc_send_bin_buffer(&cc->scc, msg, ret);
-	free(msg);
-	return ret;
+	return send_sb(&cc->scc, msg, ret, SBD_OUTPUT, false);
 }
 
 /* version */
@@ -435,9 +419,7 @@ static int com_version(struct command_context *cc)
 	msg = VERSION_TEXT("server") "built: " BUILD_DATE "\n" UNAME_RS
 		", " CC_VERSION "\n";
 	len = strlen(msg);
-	if (cc->use_sideband)
-		return send_sb(&cc->scc, msg, len, SBD_OUTPUT, true);
-	return sc_send_bin_buffer(&cc->scc, msg, len);
+	return send_sb(&cc->scc, msg, len, SBD_OUTPUT, true);
 }
 
 #define EMPTY_STATUS_ITEMS \
@@ -541,21 +523,12 @@ static int com_stat(struct command_context *cc)
 	for (;;) {
 		mmd_dup(nmmd);
 		ret = get_status(nmmd, parser_friendly, &s);
-		if (cc->use_sideband)
-			ret = send_sb(&cc->scc, s, ret, SBD_OUTPUT, false);
-		else {
-			ret = sc_send_bin_buffer(&cc->scc, s, ret);
-			free(s);
-		}
+		ret = send_sb(&cc->scc, s, ret, SBD_OUTPUT, false);
 		if (ret < 0)
 			goto out;
 		if (nmmd->vss_status_flags & VSS_NEXT) {
 			ret = empty_status_items(parser_friendly, &esi);
-			if (cc->use_sideband)
-				ret = send_sb(&cc->scc, esi, ret, SBD_OUTPUT,
-					true);
-			else
-				ret = sc_send_bin_buffer(&cc->scc, esi, ret);
+			ret = send_sb(&cc->scc, esi, ret, SBD_OUTPUT, true);
 			if (ret < 0)
 				goto out;
 		} else
@@ -576,7 +549,6 @@ out:
 static int send_list_of_commands(struct command_context *cc, struct server_command *cmd,
 		const char *handler)
 {
-	int ret;
 	char *msg = NULL;
 
 	for (; cmd->name; cmd++) {
@@ -587,11 +559,7 @@ static int send_list_of_commands(struct command_context *cc, struct server_comma
 		msg = para_strcat(msg, tmp);
 		free(tmp);
 	}
-	if (cc->use_sideband)
-		return send_sb(&cc->scc, msg, strlen(msg), SBD_OUTPUT, false);
-	ret = sc_send_buffer(&cc->scc, msg);
-	free(msg);
-	return ret;
+	return send_sb(&cc->scc, msg, strlen(msg), SBD_OUTPUT, false);
 }
 
 /* returns string that must be freed by the caller */
@@ -647,11 +615,7 @@ static int com_help(struct command_context *cc)
 	);
 	free(perms);
 	free(handler);
-	if (cc->use_sideband)
-		return send_sb(&cc->scc, buf, ret, SBD_OUTPUT, false);
-	ret = sc_send_buffer(&cc->scc, buf);
-	free(buf);
-	return ret;
+	return send_sb(&cc->scc, buf, ret, SBD_OUTPUT, false);
 }
 
 /* hup */
@@ -813,58 +777,6 @@ static int check_perms(unsigned int perms, struct server_command *cmd_ptr)
 	return (cmd_ptr->perms & perms) < cmd_ptr->perms ? -E_PERM : 0;
 }
 
-/*
- * Parse first string from *cmd and lookup in table of valid commands.
- * On error, NULL is returned.
- */
-static struct server_command *parse_cmd(const char *cmdstr)
-{
-	char buf[255];
-	int n = 0;
-
-	sscanf(cmdstr, "%200s%n", buf, &n);
-	if (!n)
-		return NULL;
-	buf[n] = '\0';
-	return get_cmd_ptr(buf, NULL);
-}
-
-static int read_command(struct stream_cipher_context *scc, char **result)
-{
-	int ret;
-	char buf[4096];
-	char *command = NULL;
-
-	for (;;) {
-		size_t numbytes;
-		char *p;
-
-		ret = sc_recv_buffer(scc, buf, sizeof(buf));
-		if (ret < 0)
-			goto out;
-		if (!ret)
-			break;
-		numbytes = ret;
-		ret = -E_COMMAND_SYNTAX;
-		if (command && numbytes + strlen(command) > MAX_COMMAND_LEN) /* DOS */
-			goto out;
-		command = para_strcat(command, buf);
-		p = strstr(command, EOC_MSG);
-		if (p) {
-			*p = '\0';
-			break;
-		}
-	}
-	ret = command? 1 : -E_COMMAND_SYNTAX;
-out:
-	if (ret < 0)
-		free(command);
-	else
-		*result = command;
-	return ret;
-
-}
-
 static void reset_signals(void)
 {
 	para_sigaction(SIGCHLD, SIG_IGN);
@@ -873,15 +785,14 @@ static void reset_signals(void)
 	para_sigaction(SIGHUP, SIG_DFL);
 }
 
-static int parse_auth_request(char *buf, int len, struct user **u,
-		bool *use_sideband)
+static int parse_auth_request(char *buf, int len, struct user **u)
 {
 	int ret;
 	char *p, *username, **features = NULL;
 	size_t auth_rq_len = strlen(AUTH_REQUEST_MSG);
+	bool sideband_requested = false;
 
 	*u = NULL;
-	*use_sideband = false;
 	if (len < auth_rq_len + 2)
 		return -E_AUTH_REQUEST;
 	if (strncmp(buf, AUTH_REQUEST_MSG, auth_rq_len) != 0)
@@ -897,20 +808,19 @@ static int parse_auth_request(char *buf, int len, struct user **u,
 		create_argv(p, ",", &features);
 		for (i = 0; features[i]; i++) {
 			if (strcmp(features[i], "sideband") == 0)
-				*use_sideband = true;
+				sideband_requested = true;
 			else {
 				ret = -E_BAD_FEATURE;
 				goto out;
 			}
 		}
 	}
-	if (*use_sideband == false) { /* sideband is mandatory */
+	if (sideband_requested == false) { /* sideband is mandatory */
 		PARA_ERROR_LOG("client did not request sideband\n");
 		ret = -E_BAD_FEATURE;
 		goto out;
 	}
-	PARA_DEBUG_LOG("received auth request for user %s (sideband = %s)\n",
-		username, *use_sideband? "true" : "false");
+	PARA_DEBUG_LOG("received auth request for user %s\n", username);
 	*u = lookup_user(username);
 	ret = 1;
 out:
@@ -987,6 +897,7 @@ __noreturn void handle_connect(int fd, const char *peername)
 	char *p, *command = NULL, *buf = para_malloc(HANDSHAKE_BUFSIZE) /* must be on the heap */;
 	size_t numbytes;
 	struct command_context cc_struct = {.peer = peername}, *cc = &cc_struct;
+	struct iovec iov;
 
 	cc->scc.fd = fd;
 	reset_signals();
@@ -1005,7 +916,7 @@ __noreturn void handle_connect(int fd, const char *peername)
 	ret = recv_buffer(fd, buf, HANDSHAKE_BUFSIZE);
 	if (ret < 0)
 		goto net_err;
-	ret = parse_auth_request(buf, ret, &cc->u, &cc->use_sideband);
+	ret = parse_auth_request(buf, ret, &cc->u);
 	if (ret < 0)
 		goto net_err;
 	p = buf + strlen(AUTH_REQUEST_MSG);
@@ -1029,28 +940,16 @@ __noreturn void handle_connect(int fd, const char *peername)
 	}
 	PARA_DEBUG_LOG("sending %u byte challenge + rc4 keys (%zu bytes)\n",
 		CHALLENGE_SIZE, numbytes);
-	if (cc->use_sideband) {
-		struct iovec iov;
-		ret = send_sb(&cc->scc, buf, numbytes, SBD_CHALLENGE, false);
-		buf = NULL;
-		if (ret < 0)
-			goto net_err;
-		ret = recv_sb(&cc->scc, SBD_CHALLENGE_RESPONSE,
-			HANDSHAKE_BUFSIZE, &iov);
-		if (ret < 0)
-			goto net_err;
-		buf = iov.iov_base;
-		numbytes = iov.iov_len;
-	} else {
-		ret = write_all(fd, buf, numbytes);
-		if (ret < 0)
-			goto net_err;
-		/* recv challenge response */
-		ret = recv_bin_buffer(fd, buf, HASH_SIZE);
-		if (ret < 0)
-			goto net_err;
-		numbytes = ret;
-	}
+	ret = send_sb(&cc->scc, buf, numbytes, SBD_CHALLENGE, false);
+	buf = NULL;
+	if (ret < 0)
+		goto net_err;
+	ret = recv_sb(&cc->scc, SBD_CHALLENGE_RESPONSE,
+		HANDSHAKE_BUFSIZE, &iov);
+	if (ret < 0)
+		goto net_err;
+	buf = iov.iov_base;
+	numbytes = iov.iov_len;
 	PARA_DEBUG_LOG("received %zu bytes challenge response\n", numbytes);
 	ret = -E_BAD_USER;
 	if (!cc->u)
@@ -1071,41 +970,16 @@ __noreturn void handle_connect(int fd, const char *peername)
 	/* init stream cipher keys with the second part of the random buffer */
 	cc->scc.recv = sc_new(rand_buf + CHALLENGE_SIZE, SESSION_KEY_LEN);
 	cc->scc.send = sc_new(rand_buf + CHALLENGE_SIZE + SESSION_KEY_LEN, SESSION_KEY_LEN);
-	if (cc->use_sideband)
-		ret = send_sb(&cc->scc, NULL, 0, SBD_PROCEED, false);
-	else
-		ret = sc_send_buffer(&cc->scc, PROCEED_MSG);
+	ret = send_sb(&cc->scc, NULL, 0, SBD_PROCEED, false);
 	if (ret < 0)
 		goto net_err;
-	if (cc->use_sideband) {
-		struct iovec iov;
-		ret = recv_sb(&cc->scc, SBD_COMMAND, MAX_COMMAND_LEN, &iov);
-		if (ret < 0)
-			goto net_err;
-		ret = parse_sb_command(cc, &iov);
-		if (ret < 0)
-			goto err_out;
-		cc->argc = ret;
-	} else {
-		ret = read_command(&cc->scc, &command);
-		if (ret == -E_COMMAND_SYNTAX)
-			goto err_out;
-		if (ret < 0)
-			goto net_err;
-		ret = -E_BAD_CMD;
-		cc->cmd = parse_cmd(command);
-		if (!cc->cmd)
-			goto err_out;
-		/* valid command, check permissions */
-		ret = check_perms(cc->u->perms, cc->cmd);
-		if (ret < 0)
-			goto err_out;
-		/* valid command and sufficient perms */
-		ret = create_argv(command, "\n", &cc->argv);
-		if (ret < 0)
-			goto err_out;
-		cc->argc = ret;
-	}
+	ret = recv_sb(&cc->scc, SBD_COMMAND, MAX_COMMAND_LEN, &iov);
+	if (ret < 0)
+		goto net_err;
+	ret = parse_sb_command(cc, &iov);
+	if (ret < 0)
+		goto err_out;
+	cc->argc = ret;
 	PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cc->cmd->name,
 		cc->u->name, peername);
 	ret = cc->cmd->handler(cc);
@@ -1116,7 +990,7 @@ __noreturn void handle_connect(int fd, const char *peername)
 	if (ret >= 0)
 		goto out;
 err_out:
-	if (send_strerror(cc, -ret) >= 0 && cc->use_sideband)
+	if (send_strerror(cc, -ret) >= 0)
 		send_sb(&cc->scc, NULL, 0, SBD_EXIT__FAILURE, true);
 net_err:
 	PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
@@ -1128,7 +1002,7 @@ out:
 		mmd->events++;
 	mmd->active_connections--;
 	mutex_unlock(mmd_mutex);
-	if (ret >= 0 && cc->use_sideband) {
+	if (ret >= 0) {
 		ret = send_sb(&cc->scc, NULL, 0, SBD_EXIT__SUCCESS, true);
 		if (ret < 0)
 			PARA_NOTICE_LOG("%s\n", para_strerror(-ret));