X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=ccb7976c2700813131a62206f8cd7d3d1443db75;hb=19be9cf7150858311f7898fa3fb525d692d02f64;hp=406ec4f9baffdf7593b052a1b5a2b598e036b987;hpb=1d9dacb1f26971e19463b5501c2410c57f780ecb;p=meshlink

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 406ec4f9..ccb7976c 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -42,6 +42,92 @@
 #include "utils.h"
 #include "xalloc.h"
 
+static bool send_proxyrequest(connection_t *c) {
+	switch(proxytype) {
+		case PROXY_HTTP: {
+			char *host;
+			char *port;
+
+			sockaddr2str(&c->address, &host, &port);
+			send_request(c, "CONNECT %s:%s HTTP/1.1\r\n\r", host, port);
+			free(host);
+			free(port);
+			return true;
+		}
+		case PROXY_SOCKS4: {
+			if(c->address.sa.sa_family != AF_INET) {
+				logger(DEBUG_ALWAYS, LOG_ERR, "Cannot connect to an IPv6 host through a SOCKS 4 proxy!");
+				return false;
+			}
+			char s4req[9 + (proxyuser ? strlen(proxyuser) : 0)];
+			s4req[0] = 4;
+			s4req[1] = 1;
+			memcpy(s4req + 2, &c->address.in.sin_port, 2);
+			memcpy(s4req + 4, &c->address.in.sin_addr, 4);
+			if(proxyuser)
+				strcpy(s4req + 8, proxyuser);
+			s4req[sizeof s4req - 1] = 0;
+			c->tcplen = 8;
+			return send_meta(c, s4req, sizeof s4req);
+		}
+		case PROXY_SOCKS5: {
+			int len = 3 + 6 + (c->address.sa.sa_family == AF_INET ? 4 : 16);
+			c->tcplen = 2;
+			if(proxypass)
+				len += 3 + strlen(proxyuser) + strlen(proxypass);
+			char s5req[len];
+			int i = 0;
+			s5req[i++] = 5;
+			s5req[i++] = 1;
+			if(proxypass) {
+				s5req[i++] = 2;
+				s5req[i++] = 1;
+				s5req[i++] = strlen(proxyuser);
+				strcpy(s5req + i, proxyuser);
+				i += strlen(proxyuser);
+				s5req[i++] = strlen(proxypass);
+				strcpy(s5req + i, proxypass);
+				i += strlen(proxypass);
+				c->tcplen += 2;
+			} else {
+				s5req[i++] = 0;
+			}
+			s5req[i++] = 5;
+			s5req[i++] = 1;
+			s5req[i++] = 0;
+			if(c->address.sa.sa_family == AF_INET) {
+				s5req[i++] = 1;
+				memcpy(s5req + i, &c->address.in.sin_addr, 4);
+				i += 4;
+				memcpy(s5req + i, &c->address.in.sin_port, 2);
+				i += 2;
+				c->tcplen += 10;
+			} else if(c->address.sa.sa_family == AF_INET6) {
+				s5req[i++] = 3;
+				memcpy(s5req + i, &c->address.in6.sin6_addr, 16);
+				i += 16;
+				memcpy(s5req + i, &c->address.in6.sin6_port, 2);
+				i += 2;
+				c->tcplen += 22;
+			} else {
+				logger(DEBUG_ALWAYS, LOG_ERR, "Address family %hx not supported for SOCKS 5 proxies!", c->address.sa.sa_family);
+				return false;
+			}
+			if(i > len)
+				abort();
+			return send_meta(c, s5req, sizeof s5req);
+		}
+		case PROXY_SOCKS4A:
+			logger(DEBUG_ALWAYS, LOG_ERR, "Proxy type not implemented yet");
+			return false;
+		case PROXY_EXEC:
+			return true;
+		default:
+			logger(DEBUG_ALWAYS, LOG_ERR, "Unknown proxy type");
+			return false;
+	}
+}
+
 bool send_id(connection_t *c) {
 	gettimeofday(&c->start, NULL);
 
@@ -54,10 +140,14 @@ bool send_id(connection_t *c) {
 			minor = myself->connection->protocol_minor;
 	}
 
+	if(proxytype)
+		if(!send_proxyrequest(c))
+			return false;
+
 	return send_request(c, "%d %s %d.%d", ID, myself->connection->name, myself->connection->protocol_major, minor);
 }
 
-bool id_h(connection_t *c, char *request) {
+bool id_h(connection_t *c, const char *request) {
 	char name[MAX_STRING_SIZE];
 
 	if(sscanf(request, "%*d " MAX_STRING " %d.%d", name, &c->protocol_major, &c->protocol_minor) < 2) {
@@ -72,6 +162,10 @@ bool id_h(connection_t *c, char *request) {
 		c->status.control = true;
 		c->allow_request = CONTROL;
 		c->last_ping_time = time(NULL) + 3600;
+
+	        free(c->name);
+                c->name = xstrdup("<control>");
+
 		return send_request(c, "%d %d %d", ACK, TINC_CTL_VERSION_CURRENT, getpid());
 	}
 
@@ -215,7 +309,7 @@ bool send_metakey(connection_t *c) {
 	return result;
 }
 
-bool metakey_h(connection_t *c, char *request) {
+bool metakey_h(connection_t *c, const char *request) {
 	char hexkey[MAX_STRING_SIZE];
 	int cipher, digest, maclength, compression;
 	size_t len = rsa_size(&myself->connection->rsa);
@@ -289,7 +383,7 @@ bool send_challenge(connection_t *c) {
 	return send_request(c, "%d %s", CHALLENGE, buffer);
 }
 
-bool challenge_h(connection_t *c, char *request) {
+bool challenge_h(connection_t *c, const char *request) {
 	char buffer[MAX_STRING_SIZE];
 	size_t len = rsa_size(&myself->connection->rsa);
 	size_t digestlen = digest_length(&c->indigest);
@@ -326,7 +420,7 @@ bool challenge_h(connection_t *c, char *request) {
 	return send_request(c, "%d %s", CHAL_REPLY, buffer);
 }
 
-bool chal_reply_h(connection_t *c, char *request) {
+bool chal_reply_h(connection_t *c, const char *request) {
 	char hishash[MAX_STRING_SIZE];
 
 	if(sscanf(request, "%*d " MAX_STRING, hishash) != 1) {
@@ -447,7 +541,7 @@ static void send_everything(connection_t *c) {
 	}
 }
 
-static bool upgrade_h(connection_t *c, char *request) {
+static bool upgrade_h(connection_t *c, const char *request) {
 	char pubkey[MAX_STRING_SIZE];
 
 	if(sscanf(request, "%*d " MAX_STRING, pubkey) != 1) {
@@ -466,7 +560,7 @@ static bool upgrade_h(connection_t *c, char *request) {
 	return send_termreq(c);
 }
 
-bool ack_h(connection_t *c, char *request) {
+bool ack_h(connection_t *c, const char *request) {
 	if(c->protocol_minor == 1)
 		return upgrade_h(c, request);