Fix detection of rejected SOCKS5 proxy requests.
[tinc] / src / protocol.c
index 565087c..9ef9082 100644 (file)
@@ -1,7 +1,7 @@
 /*
     protocol.c -- handle the meta-protocol, basic functions
-    Copyright (C) 1999-2001 Ivo Timmermans <ivo@o2w.nl>,
-                  2000,2001 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans,
+                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: protocol.c,v 1.28.4.136 2002/09/09 21:24:41 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "config.h"
+#include "system.h"
 
-#include <sys/types.h>
+#include "conf.h"
+#include "connection.h"
+#include "logger.h"
+#include "meta.h"
+#include "protocol.h"
+#include "utils.h"
+#include "xalloc.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
+bool tunnelserver = false;
+bool strictsubnets = false;
 
-#include <utils.h>
-#include <xalloc.h>
+/* Jumptable for the request handlers */
 
-#include "conf.h"
-#include "protocol.h"
-#include "meta.h"
-#include "connection.h"
+static bool (*request_handlers[])(connection_t *) = {
+               id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
+               status_h, error_h, termreq_h,
+               ping_h, pong_h,
+               add_subnet_h, del_subnet_h,
+               add_edge_h, del_edge_h,
+               key_changed_h, req_key_h, ans_key_h, tcppacket_h,
+};
 
-#include "system.h"
+/* Request names */
 
-avl_tree_t *past_request_tree;
+static char (*request_name[]) = {
+               "ID", "METAKEY", "CHALLENGE", "CHAL_REPLY", "ACK",
+               "STATUS", "ERROR", "TERMREQ",
+               "PING", "PONG",
+               "ADD_SUBNET", "DEL_SUBNET",
+               "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET",
+};
 
-int check_id(char *id)
-{
-       int i;
+static avl_tree_t *past_request_tree;
 
-       for(i = 0; i < strlen(id); i++)
-               if(!isalnum(id[i]) && id[i] != '_')
-                       return -1;
+bool check_id(const char *id) {
+       for(; *id; id++)
+               if(!isalnum(*id) && *id != '_')
+                       return false;
 
-       return 0;
+       return true;
 }
 
 /* Generic request routines - takes care of logging and error
    detection as well */
 
-int send_request(connection_t * c, const char *format, ...)
-{
+bool send_request(connection_t *c, const char *format, ...) {
        va_list args;
        char buffer[MAXBUFSIZE];
-       int len, request;
-
-       cp();
+       int len, request = 0;
 
-       /* Use vsnprintf instead of vasprintf: faster, no memory
+       /* Use vsnprintf instead of vxasprintf: faster, no memory
           fragmentation, cleanup is automatic, and there is a limit on the
           input buffer anyway */
 
@@ -74,192 +79,162 @@ int send_request(connection_t * c, const char *format, ...)
        va_end(args);
 
        if(len < 0 || len > MAXBUFSIZE - 1) {
-               syslog(LOG_ERR, _("Output buffer overflow while sending request to %s (%s)"),
+               logger(LOG_ERR, "Output buffer overflow while sending request to %s (%s)",
                           c->name, c->hostname);
-               return -1;
+               return false;
        }
 
-       if(debug_lvl >= DEBUG_PROTOCOL) {
+       ifdebug(PROTOCOL) {
                sscanf(buffer, "%d", &request);
-               if(debug_lvl >= DEBUG_META)
-                       syslog(LOG_DEBUG, _("Sending %s to %s (%s): %s"),
+               ifdebug(META)
+                       logger(LOG_DEBUG, "Sending %s to %s (%s): %s",
                                   request_name[request], c->name, c->hostname, buffer);
                else
-                       syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request],
+                       logger(LOG_DEBUG, "Sending %s to %s (%s)", request_name[request],
                                   c->name, c->hostname);
        }
 
        buffer[len++] = '\n';
 
-       if(c == broadcast)
-               return broadcast_meta(NULL, buffer, len);
-       else
+       if(c == everyone) {
+               broadcast_meta(NULL, buffer, len);
+               return true;
+       } else
                return send_meta(c, buffer, len);
 }
 
-int forward_request(connection_t * from)
-{
+void forward_request(connection_t *from) {
        int request;
-       cp();
-
-       cp();
 
-       if(debug_lvl >= DEBUG_PROTOCOL) {
+       ifdebug(PROTOCOL) {
                sscanf(from->buffer, "%d", &request);
-               if(debug_lvl >= DEBUG_META)
-                       syslog(LOG_DEBUG, _("Forwarding %s from %s (%s): %s"),
+               ifdebug(META)
+                       logger(LOG_DEBUG, "Forwarding %s from %s (%s): %s",
                                   request_name[request], from->name, from->hostname,
                                   from->buffer);
                else
-                       syslog(LOG_DEBUG, _("Forwarding %s from %s (%s)"),
+                       logger(LOG_DEBUG, "Forwarding %s from %s (%s)",
                                   request_name[request], from->name, from->hostname);
        }
 
        from->buffer[from->reqlen - 1] = '\n';
 
-       return broadcast_meta(from, from->buffer, from->reqlen);
+       broadcast_meta(from, from->buffer, from->reqlen);
 }
 
-int receive_request(connection_t * c)
-{
+bool receive_request(connection_t *c) {
        int request;
 
-       cp();
+       if(c->outgoing && proxytype == PROXY_HTTP && c->allow_request == ID) {
+               if(!c->buffer[0] || c->buffer[0] == '\r')
+                       return true;
+               if(!strncasecmp(c->buffer, "HTTP/1.1 ", 9)) {
+                       if(!strncmp(c->buffer + 9, "200", 3)) {
+                               logger(LOG_DEBUG, "Proxy request granted");
+                               return true;
+                       } else {
+                               logger(LOG_DEBUG, "Proxy request rejected: %s", c->buffer + 9);
+                               return false;
+                       }
+               }
+       }
 
        if(sscanf(c->buffer, "%d", &request) == 1) {
                if((request < 0) || (request >= LAST) || !request_handlers[request]) {
-                       if(debug_lvl >= DEBUG_META)
-                               syslog(LOG_DEBUG, _("Unknown request from %s (%s): %s"),
+                       ifdebug(META)
+                               logger(LOG_DEBUG, "Unknown request from %s (%s): %s",
                                           c->name, c->hostname, c->buffer);
                        else
-                               syslog(LOG_ERR, _("Unknown request from %s (%s)"),
+                               logger(LOG_ERR, "Unknown request from %s (%s)",
                                           c->name, c->hostname);
 
-                       return -1;
+                       return false;
                } else {
-                       if(debug_lvl >= DEBUG_PROTOCOL) {
-                               if(debug_lvl >= DEBUG_META)
-                                       syslog(LOG_DEBUG, _("Got %s from %s (%s): %s"),
+                       ifdebug(PROTOCOL) {
+                               ifdebug(META)
+                                       logger(LOG_DEBUG, "Got %s from %s (%s): %s",
                                                   request_name[request], c->name, c->hostname,
                                                   c->buffer);
                                else
-                                       syslog(LOG_DEBUG, _("Got %s from %s (%s)"),
+                                       logger(LOG_DEBUG, "Got %s from %s (%s)",
                                                   request_name[request], c->name, c->hostname);
                        }
                }
 
                if((c->allow_request != ALL) && (c->allow_request != request)) {
-                       syslog(LOG_ERR, _("Unauthorized request from %s (%s)"), c->name,
+                       logger(LOG_ERR, "Unauthorized request from %s (%s)", c->name,
                                   c->hostname);
-                       return -1;
+                       return false;
                }
 
-               if(request_handlers[request] (c))
+               if(!request_handlers[request](c)) {
                        /* Something went wrong. Probably scriptkiddies. Terminate. */
-               {
-                       syslog(LOG_ERR, _("Error while processing %s from %s (%s)"),
+
+                       logger(LOG_ERR, "Error while processing %s from %s (%s)",
                                   request_name[request], c->name, c->hostname);
-                       return -1;
+                       return false;
                }
        } else {
-               syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
+               logger(LOG_ERR, "Bogus data received from %s (%s)",
                           c->name, c->hostname);
-               return -1;
+               return false;
        }
 
-       return 0;
+       return true;
 }
 
-int past_request_compare(past_request_t * a, past_request_t * b)
-{
+static int past_request_compare(const past_request_t *a, const past_request_t *b) {
        return strcmp(a->request, b->request);
 }
 
-void free_past_request(past_request_t * r)
-{
-       cp();
-
+static void free_past_request(past_request_t *r) {
        if(r->request)
                free(r->request);
 
        free(r);
 }
 
-void init_requests(void)
-{
-       cp();
-
+void init_requests(void) {
        past_request_tree = avl_alloc_tree((avl_compare_t) past_request_compare, (avl_action_t) free_past_request);
 }
 
-void exit_requests(void)
-{
-       cp();
-
+void exit_requests(void) {
        avl_delete_tree(past_request_tree);
 }
 
-int seen_request(char *request)
-{
-       past_request_t p, *new;
-
-       cp();
+bool seen_request(char *request) {
+       past_request_t *new, p = {NULL};
 
        p.request = request;
 
        if(avl_search(past_request_tree, &p)) {
-               if(debug_lvl >= DEBUG_SCARY_THINGS)
-                       syslog(LOG_DEBUG, _("Already seen request"));
-               return 1;
+               ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Already seen request");
+               return true;
        } else {
-               new = (past_request_t *) xmalloc(sizeof(*new));
+               new = xmalloc(sizeof(*new));
                new->request = xstrdup(request);
                new->firstseen = now;
                avl_insert(past_request_tree, new);
-               return 0;
+               return false;
        }
 }
 
-void age_past_requests(void)
-{
+void age_past_requests(void) {
        avl_node_t *node, *next;
        past_request_t *p;
        int left = 0, deleted = 0;
 
-       cp();
-
        for(node = past_request_tree->head; node; node = next) {
                next = node->next;
-               p = (past_request_t *) node->data;
+               p = node->data;
 
-               if(p->firstseen + pingtimeout < now)
+               if(p->firstseen + pinginterval <= now)
                        avl_delete_node(past_request_tree, node), deleted++;
                else
                        left++;
        }
 
-       if(debug_lvl >= DEBUG_SCARY_THINGS && left + deleted)
-               syslog(LOG_DEBUG, _("Aging past requests: deleted %d, left %d\n"),
+       if(left || deleted)
+               ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Aging past requests: deleted %d, left %d",
                           deleted, left);
 }
-
-/* Jumptable for the request handlers */
-
-int (*request_handlers[]) (connection_t *) = {
-               id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
-               status_h, error_h, termreq_h,
-               ping_h, pong_h,
-               add_subnet_h, del_subnet_h,
-               add_edge_h, del_edge_h,
-               key_changed_h, req_key_h, ans_key_h, tcppacket_h,
-};
-
-/* Request names */
-
-char (*request_name[]) = {
-               "ID", "METAKEY", "CHALLENGE", "CHAL_REPLY", "ACK",
-               "STATUS", "ERROR", "TERMREQ",
-               "PING", "PONG",
-               "ADD_SUBNET", "DEL_SUBNET",
-               "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET",
-};