X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fmeta.c;h=e60c127a82ad6123542d73f636dde6099a08ce83;hp=4c52464c33d2a62f663f54c2b920832b8a20e910;hb=4590ab63d93b1dd6e7df019b592f6dabc02a0f96;hpb=e00b44cb98e4d50a0d426048ba01dbd80bcb5941

diff --git a/src/meta.c b/src/meta.c
index 4c52464..e60c127 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -177,7 +177,45 @@ bool receive_meta(connection_t *c) {
 
 		if(c->tcplen) {
 			if(c->tcplen <= c->buflen) {
-				receive_tcppacket(c, c->buffer, c->tcplen);
+				if(!c->node) {
+					if(proxytype == PROXY_SOCKS4 && c->allow_request == ID) {
+						if(c->buffer[0] == 0 && c->buffer[1] == 0x5a) {
+							logger(LOG_DEBUG, "Proxy request granted");
+						} else {
+							logger(LOG_ERR, "Proxy request rejected");
+							return false;
+						}
+					} else if(proxytype == PROXY_SOCKS5 && c->allow_request == ID) {
+						if(c->buffer[0] != 5) {
+							logger(LOG_ERR, "Invalid response from proxy server");
+							return false;
+						}
+						if(c->buffer[1] == 0xff) {
+							logger(LOG_ERR, "Proxy request rejected: unsuitable authentication method");
+							return false;
+						}
+						if(c->buffer[2] != 5) {
+							logger(LOG_ERR, "Invalid response from proxy server");
+							return false;
+						}
+						if(c->buffer[3] == 0) {
+							logger(LOG_DEBUG, "Proxy request granted");
+						} else {
+							logger(LOG_DEBUG, "Proxy request rejected");
+							return false;
+						}
+					} else {
+						logger(LOG_ERR, "c->tcplen set but c->node is NULL!");
+						abort();
+					}
+				} else {
+					if(c->allow_request == ALL) {
+						receive_tcppacket(c, c->buffer, c->tcplen);
+					} else {
+						logger(LOG_ERR, "Got unauthorized TCP packet from %s (%s)", c->name, c->hostname);
+						return false;
+					}
+				}
 
 				c->buflen -= c->tcplen;
 				lenin -= c->tcplen - oldlen;