X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=cdc42fa1a220662ac7413b52fc40aba0f56e14d8;hp=4a464ebf88c56ab4ed0257e39ae5767709819811;hb=e151dbb79eac16326585ec0a33cf48029f5f22f4;hpb=69b3a249fb8f0f4a01e26f7a414dbe79f480a78c;ds=sidebyside

diff --git a/command.c b/command.c
index 4a464ebf..cdc42fa1 100644
--- a/command.c
+++ b/command.c
@@ -43,8 +43,6 @@ extern struct misc_meta_data *mmd;
 extern struct sender senders[];
 int send_afs_status(struct command_context *cc, int parser_friendly);
 
-const char *status_item_list[] = {STATUS_ITEM_ARRAY};
-
 static void dummy(__a_unused int s)
 {
 }
@@ -703,6 +701,46 @@ 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)
+{
+	int ret;
+	char *p, *username, **features = NULL;
+	size_t auth_rq_len = strlen(AUTH_REQUEST_MSG);
+
+	*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)
+		return -E_AUTH_REQUEST;
+	username = buf + auth_rq_len;
+	p = strchr(username, ' ');
+	if (p) {
+		int i;
+		if (p == username)
+			return -E_AUTH_REQUEST;
+		*p = '\0';
+		p++;
+		create_argv(p, ",", &features);
+		for (i = 0; features[i]; i++) {
+			if (strcmp(features[i], "sideband") == 0)
+				*use_sideband = true;
+			else {
+				ret = -E_BAD_FEATURE;
+				goto out;
+			}
+		}
+	}
+	PARA_DEBUG_LOG("received auth request for user %s (sideband = %s)\n",
+		username, *use_sideband? "true" : "false");
+	*u = lookup_user(username);
+	ret = 1;
+out:
+	free_argv(features);
+	return ret;
+}
+
 /**
  * Perform user authentication and execute a command.
  *
@@ -748,19 +786,17 @@ __noreturn void handle_connect(int fd, const char *peername)
 		goto net_err;
 	/* send Welcome message */
 	ret = write_va_buffer(fd, "This is para_server, version "
-		PACKAGE_VERSION  ".\n" );
+		PACKAGE_VERSION  ".\n"
+		"Features: sideband,foo\n"
+	);
 	if (ret < 0)
 		goto net_err;
 	/* recv auth request line */
 	ret = recv_buffer(fd, buf, sizeof(buf));
 	if (ret < 0)
 		goto net_err;
-	if (ret < 10) {
-		ret = -E_AUTH_REQUEST;
-		goto net_err;
-	}
-	ret = -E_AUTH_REQUEST;
-	if (strncmp(buf, AUTH_REQUEST_MSG, strlen(AUTH_REQUEST_MSG)))
+	ret = parse_auth_request(buf, ret, &cc->u, &cc->use_sideband);
+	if (ret < 0)
 		goto net_err;
 	p = buf + strlen(AUTH_REQUEST_MSG);
 	PARA_DEBUG_LOG("received auth request for user %s\n", p);