X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmeta.c;h=4282a4e6bd7a63d25b42b3cade4cb1d2eb37b433;hb=d6b45d005530496e48325a6174ecdd889a17bfc1;hp=28c85cf0e6b9615866771857e8a201b6fccadb8b;hpb=ee63f2a32be398c31301e9ce9154511b24089d8d;p=tinc diff --git a/src/meta.c b/src/meta.c index 28c85cf0..4282a4e6 100644 --- a/src/meta.c +++ b/src/meta.c @@ -1,6 +1,6 @@ /* meta.c -- handle the meta communication - Copyright (C) 2000-2012 Guus Sliepen , + Copyright (C) 2000-2018 Guus Sliepen , 2000-2005 Ivo Timmermans 2006 Scott Lamb @@ -30,7 +30,14 @@ #include "utils.h" #include "xalloc.h" -bool send_meta_sptps(void *handle, uint8_t type, const char *buffer, size_t length) { +#ifndef MIN +static ssize_t MIN(ssize_t x, ssize_t y) { + return x < y ? x : y; +} +#endif + +bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t length) { + (void)type; connection_t *c = handle; if(!c) { @@ -44,27 +51,41 @@ bool send_meta_sptps(void *handle, uint8_t type, const char *buffer, size_t leng return true; } -bool send_meta(connection_t *c, const char *buffer, int length) { +bool send_meta(connection_t *c, const char *buffer, size_t length) { if(!c) { logger(DEBUG_ALWAYS, LOG_ERR, "send_meta() called with NULL pointer!"); abort(); } - logger(DEBUG_META, LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length, - c->name, c->hostname); + logger(DEBUG_META, LOG_DEBUG, "Sending %lu bytes of metadata to %s (%s)", (unsigned long)length, + c->name, c->hostname); - if(c->protocol_minor >= 2) + if(c->protocol_minor >= 2) { return sptps_send_record(&c->sptps, 0, buffer, length); + } /* Add our data to buffer */ if(c->status.encryptout) { +#ifdef DISABLE_LEGACY + return false; +#else + + if(length > c->outbudget) { + logger(DEBUG_META, LOG_ERR, "Byte limit exceeded for encryption to %s (%s)", c->name, c->hostname); + return false; + } else { + c->outbudget -= length; + } + size_t outlen = length; - if(!cipher_encrypt(&c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) { + if(!cipher_encrypt(c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) { logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting metadata to %s (%s)", - c->name, c->hostname); + c->name, c->hostname); return false; } + +#endif } else { buffer_add(&c->outbuf, buffer, length); } @@ -74,13 +95,29 @@ bool send_meta(connection_t *c, const char *buffer, int length) { return true; } -void broadcast_meta(connection_t *from, const char *buffer, int length) { +void send_meta_raw(connection_t *c, const char *buffer, size_t length) { + if(!c) { + logger(DEBUG_ALWAYS, LOG_ERR, "send_meta() called with NULL pointer!"); + abort(); + } + + logger(DEBUG_META, LOG_DEBUG, "Sending %lu bytes of raw metadata to %s (%s)", (unsigned long)length, + c->name, c->hostname); + + buffer_add(&c->outbuf, buffer, length); + + io_set(&c->io, IO_READ | IO_WRITE); +} + +void broadcast_meta(connection_t *from, const char *buffer, size_t length) { for list_each(connection_t, c, connection_list) - if(c != from && c->status.active) + if(c != from && c->edge) { send_meta(c, buffer, length); + } } -bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t length) { +bool receive_meta_sptps(void *handle, uint8_t type, const void *vdata, uint16_t length) { + const char *data = vdata; connection_t *c = handle; if(!c) { @@ -89,20 +126,24 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l } if(type == SPTPS_HANDSHAKE) { - if(c->allow_request == ACK) + if(c->allow_request == ACK) { return send_ack(c); - else + } else { return true; + } } - if(!data) + if(!data) { return true; + } /* Are we receiving a TCPpacket? */ if(c->tcplen) { - if(length != c->tcplen) + if(length != c->tcplen) { return false; + } + receive_tcppacket(c, data, length); c->tcplen = 0; return true; @@ -110,8 +151,9 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l /* Change newline to null byte, just like non-SPTPS requests */ - if(data[length - 1] == '\n') + if(data[length - 1] == '\n') { ((char *)data)[length - 1] = 0; + } /* Otherwise we are waiting for a request */ @@ -119,7 +161,7 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l } bool receive_meta(connection_t *c) { - int inlen; + ssize_t inlen; char inbuf[MAXBUFSIZE]; char *bufp = inbuf, *endp; @@ -134,50 +176,97 @@ bool receive_meta(connection_t *c) { buffer_compact(&c->inbuf, MAXBUFSIZE); - if(sizeof inbuf <= c->inbuf.len) { + if(sizeof(inbuf) <= c->inbuf.len) { logger(DEBUG_ALWAYS, LOG_ERR, "Input buffer full for %s (%s)", c->name, c->hostname); return false; } - inlen = recv(c->socket, inbuf, sizeof inbuf - c->inbuf.len, 0); + inlen = recv(c->socket, inbuf, sizeof(inbuf) - c->inbuf.len, 0); if(inlen <= 0) { - if(!inlen || !errno) { + if(!inlen || !sockerrno) { logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection closed by %s (%s)", - c->name, c->hostname); - } else if(sockwouldblock(sockerrno)) + c->name, c->hostname); + } else if(sockwouldblock(sockerrno)) { return true; - else + } else logger(DEBUG_ALWAYS, LOG_ERR, "Metadata socket read error for %s (%s): %s", - c->name, c->hostname, sockstrerror(sockerrno)); + c->name, c->hostname, sockstrerror(sockerrno)); + return false; } do { - if(c->protocol_minor >= 2) - return sptps_receive_data(&c->sptps, bufp, inlen); + /* Are we receiving a SPTPS packet? */ + + if(c->sptpslen) { + ssize_t len = MIN(inlen, c->sptpslen - c->inbuf.len); + buffer_add(&c->inbuf, bufp, len); + + char *sptpspacket = buffer_read(&c->inbuf, c->sptpslen); + + if(!sptpspacket) { + return true; + } + + if(!receive_tcppacket_sptps(c, sptpspacket, c->sptpslen)) { + return false; + } + + c->sptpslen = 0; + + bufp += len; + inlen -= len; + continue; + } + + if(c->protocol_minor >= 2) { + size_t len = sptps_receive_data(&c->sptps, bufp, inlen); + + if(!len) { + return false; + } + + bufp += len; + inlen -= len; + continue; + } if(!c->status.decryptin) { endp = memchr(bufp, '\n', inlen); - if(endp) + + if(endp) { endp++; - else + } else { endp = bufp + inlen; + } buffer_add(&c->inbuf, bufp, endp - bufp); inlen -= endp - bufp; bufp = endp; } else { +#ifdef DISABLE_LEGACY + return false; +#else + + if((size_t)inlen > c->inbudget) { + logger(DEBUG_META, LOG_ERR, "Byte limit exceeded for decryption from %s (%s)", c->name, c->hostname); + return false; + } else { + c->inbudget -= inlen; + } + size_t outlen = inlen; - if(!cipher_decrypt(&c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) { + if(!cipher_decrypt(c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || (size_t)inlen != outlen) { logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting metadata from %s (%s)", - c->name, c->hostname); + c->name, c->hostname); return false; } inlen = 0; +#endif } while(c->inbuf.len) { @@ -185,30 +274,35 @@ bool receive_meta(connection_t *c) { if(c->tcplen) { char *tcpbuffer = buffer_read(&c->inbuf, c->tcplen); - if(!tcpbuffer) + + if(!tcpbuffer) { break; + } if(!c->node) { - if(proxytype == PROXY_SOCKS4 && c->allow_request == ID) { + if(c->outgoing && proxytype == PROXY_SOCKS4 && c->allow_request == ID) { if(tcpbuffer[0] == 0 && tcpbuffer[1] == 0x5a) { logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted"); } else { logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected"); return false; } - } else if(proxytype == PROXY_SOCKS5 && c->allow_request == ID) { + } else if(c->outgoing && proxytype == PROXY_SOCKS5 && c->allow_request == ID) { if(tcpbuffer[0] != 5) { logger(DEBUG_CONNECTIONS, LOG_ERR, "Invalid response from proxy server"); return false; } - if(tcpbuffer[1] == 0xff) { + + if(tcpbuffer[1] == (char)0xff) { logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected: unsuitable authentication method"); return false; } + if(tcpbuffer[2] != 5) { logger(DEBUG_CONNECTIONS, LOG_ERR, "Invalid response from proxy server"); return false; } + if(tcpbuffer[3] == 0) { logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted"); } else { @@ -234,10 +328,14 @@ bool receive_meta(connection_t *c) { /* Otherwise we are waiting for a request */ char *request = buffer_readline(&c->inbuf); + if(request) { bool result = receive_request(c, request); - if(!result) + + if(!result) { return false; + } + continue; } else { break;