X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=4910a930184e60cb4ced3b24cf905093724a2589;hb=0b07d0ad19634f8c28c852d64d1b22bab49924c4;hp=8b419bad8863c3e18bcf5a56afc2acb05a2a4f17;hpb=2a18ac20efd8ed3e1fd76f11f6f816e77c099e47;p=meshlink diff --git a/src/protocol_auth.c b/src/protocol_auth.c index 8b419bad..4910a930 100644 --- a/src/protocol_auth.c +++ b/src/protocol_auth.c @@ -21,9 +21,6 @@ #include "conf.h" #include "connection.h" -#include "cipher.h" -#include "crypto.h" -#include "digest.h" #include "ecdsa.h" #include "edge.h" #include "graph.h" @@ -40,16 +37,14 @@ #include "xalloc.h" #include "ed25519/sha512.h" -ecdsa_t *invitation_key = NULL; - -static bool send_proxyrequest(connection_t *c) { - switch(proxytype) { +static bool send_proxyrequest(meshlink_handle_t *mesh, connection_t *c) { + switch(mesh->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); + send_request(mesh, c, "CONNECT %s:%s HTTP/1.1\r\n\r", host, port); free(host); free(port); return true; @@ -59,35 +54,35 @@ static bool send_proxyrequest(connection_t *c) { 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)]; + char s4req[9 + (mesh->proxyuser ? strlen(mesh->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) - memcpy(s4req + 8, proxyuser, strlen(proxyuser)); + if(mesh->proxyuser) + memcpy(s4req + 8, mesh->proxyuser, strlen(mesh->proxyuser)); s4req[sizeof s4req - 1] = 0; c->tcplen = 8; - return send_meta(c, s4req, sizeof s4req); + return send_meta(mesh, 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); + if(mesh->proxypass) + len += 3 + strlen(mesh->proxyuser) + strlen(mesh->proxypass); char s5req[len]; int i = 0; s5req[i++] = 5; s5req[i++] = 1; - if(proxypass) { + if(mesh->proxypass) { s5req[i++] = 2; s5req[i++] = 1; - s5req[i++] = strlen(proxyuser); - memcpy(s5req + i, proxyuser, strlen(proxyuser)); - i += strlen(proxyuser); - s5req[i++] = strlen(proxypass); - memcpy(s5req + i, proxypass, strlen(proxypass)); - i += strlen(proxypass); + s5req[i++] = strlen(mesh->proxyuser); + memcpy(s5req + i, mesh->proxyuser, strlen(mesh->proxyuser)); + i += strlen(mesh->proxyuser); + s5req[i++] = strlen(mesh->proxypass); + memcpy(s5req + i, mesh->proxypass, strlen(mesh->proxypass)); + i += strlen(mesh->proxypass); c->tcplen += 2; } else { s5req[i++] = 0; @@ -115,7 +110,7 @@ static bool send_proxyrequest(connection_t *c) { } if(i > len) abort(); - return send_meta(c, s5req, sizeof s5req); + return send_meta(mesh, c, s5req, sizeof s5req); } case PROXY_SOCKS4A: logger(DEBUG_ALWAYS, LOG_ERR, "Proxy type not implemented yet"); @@ -128,19 +123,19 @@ static bool send_proxyrequest(connection_t *c) { } } -bool send_id(connection_t *c) { +bool send_id(meshlink_handle_t *mesh, connection_t *c) { gettimeofday(&c->start, NULL); int minor = mesh->self->connection->protocol_minor; - if(proxytype && c->outgoing) - if(!send_proxyrequest(c)) + if(mesh->proxytype && c->outgoing) + if(!send_proxyrequest(mesh, c)) return false; - return send_request(c, "%d %s %d.%d", ID, mesh->self->connection->name, mesh->self->connection->protocol_major, minor); + return send_request(mesh, c, "%d %s %d.%d", ID, mesh->self->connection->name, mesh->self->connection->protocol_major, minor); } -static bool finalize_invitation(connection_t *c, const char *data, uint16_t len) { +static bool finalize_invitation(meshlink_handle_t *mesh, connection_t *c, const char *data, uint16_t len) { if(strchr(data, '\n')) { logger(DEBUG_ALWAYS, LOG_ERR, "Received invalid key from invited node %s (%s)!\n", c->name, c->hostname); return false; @@ -173,18 +168,19 @@ static bool finalize_invitation(connection_t *c, const char *data, uint16_t len) static bool receive_invitation_sptps(void *handle, uint8_t type, const char *data, uint16_t len) { connection_t *c = handle; + meshlink_handle_t *mesh = c->mesh; if(type == 128) return true; if(type == 1 && c->status.invitation_used) - return finalize_invitation(c, data, len); + return finalize_invitation(mesh, c, data, len); if(type != 0 || len != 18 || c->status.invitation_used) return false; // Recover the filename from the cookie and the key - char *fingerprint = ecdsa_get_base64_public_key(invitation_key); + char *fingerprint = ecdsa_get_base64_public_key(mesh->invitation_key); char hash[64]; char hashbuf[18 + strlen(fingerprint)]; char cookie[25]; @@ -253,7 +249,7 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const char *dat return true; } -bool id_h(connection_t *c, const char *request) { +bool id_h(meshlink_handle_t *mesh, 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) { @@ -265,7 +261,7 @@ bool id_h(connection_t *c, const char *request) { /* Check if this is an invitation */ if(name[0] == '?') { - if(!invitation_key) { + if(!mesh->invitation_key) { logger(DEBUG_ALWAYS, LOG_ERR, "Got invitation from %s but we don't have an invitation key", c->hostname); return false; } @@ -277,16 +273,17 @@ bool id_h(connection_t *c, const char *request) { } c->status.invitation = true; - char *mykey = ecdsa_get_base64_public_key(invitation_key); + char *mykey = ecdsa_get_base64_public_key(mesh->invitation_key); if(!mykey) return false; - if(!send_request(c, "%d %s", ACK, mykey)) + if(!send_request(mesh, c, "%d %s", ACK, mykey)) return false; free(mykey); c->protocol_minor = 2; + c->allow_request = 1; - return sptps_start(&c->sptps, c, false, false, invitation_key, c->ecdsa, "tinc invitation", 15, send_meta_sptps, receive_invitation_sptps); + return sptps_start(&c->sptps, c, false, false, mesh->invitation_key, c->ecdsa, "meshlink invitation", 15, send_meta_sptps, receive_invitation_sptps); } /* Check if identity is a valid name */ @@ -319,22 +316,15 @@ bool id_h(connection_t *c, const char *request) { return false; } - if(bypass_security) { - if(!c->config_tree) - init_configuration(&c->config_tree); - c->allow_request = ACK; - return send_ack(c); - } - if(!c->config_tree) { init_configuration(&c->config_tree); - if(!read_host_config(c->config_tree, c->name)) { + if(!read_host_config(mesh, c->config_tree, c->name)) { logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s had unknown identity (%s)", c->hostname, c->name); return false; } - read_ecdsa_public_key(c); + read_ecdsa_public_key(mesh, c); } else { if(c->protocol_minor && !ecdsa_active(c->ecdsa)) c->protocol_minor = 1; @@ -352,14 +342,14 @@ bool id_h(connection_t *c, const char *request) { char label[25 + strlen(mesh->self->name) + strlen(c->name)]; if(c->outgoing) - snprintf(label, sizeof label, "tinc TCP key expansion %s %s", mesh->self->name, c->name); + snprintf(label, sizeof label, "meshlink TCP key expansion %s %s", mesh->self->name, c->name); else - snprintf(label, sizeof label, "tinc TCP key expansion %s %s", c->name, mesh->self->name); + snprintf(label, sizeof label, "meshlink TCP key expansion %s %s", c->name, mesh->self->name); return sptps_start(&c->sptps, c, c->outgoing, false, mesh->self->connection->ecdsa, c->ecdsa, label, sizeof label, send_meta_sptps, receive_meta_sptps); } -bool send_ack(connection_t *c) { +bool send_ack(meshlink_handle_t *mesh, connection_t *c) { /* ACK message contains rest of the information the other end needs to create node_t and edge_t structures. */ @@ -376,31 +366,19 @@ bool send_ack(connection_t *c) { if(mesh->self->options & OPTION_PMTU_DISCOVERY) c->options |= OPTION_PMTU_DISCOVERY; - return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, (c->options & 0xffffff) | (PROT_MINOR << 24)); + return send_request(mesh, c, "%d %s %d %x", ACK, mesh->myport, c->estimated_weight, (c->options & 0xffffff) | (PROT_MINOR << 24)); } -static void send_everything(connection_t *c) { +static void send_everything(meshlink_handle_t *mesh, connection_t *c) { /* Send all known subnets and edges */ - // TODO: remove this - if(disablebuggypeers) { - static struct { - vpn_packet_t pkt; - char pad[MAXBUFSIZE - MAXSIZE]; - } zeropkt; - - memset(&zeropkt, 0, sizeof zeropkt); - zeropkt.pkt.len = MAXBUFSIZE; - send_tcppacket(c, &zeropkt.pkt); - } - for splay_each(node_t, n, mesh->nodes) { for splay_each(edge_t, e, n->edge_tree) - send_add_edge(c, e); + send_add_edge(mesh, c, e); } } -bool ack_h(connection_t *c, const char *request) { +bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { char hisport[MAX_STRING_SIZE]; char *hisaddress; int weight, mtu; @@ -416,12 +394,12 @@ bool ack_h(connection_t *c, const char *request) { /* Check if we already have a node_t for him */ - n = lookup_node(c->name); + n = lookup_node(mesh, c->name); if(!n) { n = new_node(); n->name = xstrdup(c->name); - node_add(n); + node_add(mesh, n); } else { if(n->connection) { /* Oh dear, we already have a connection to this node. */ @@ -436,9 +414,9 @@ bool ack_h(connection_t *c, const char *request) { n->connection->outgoing = NULL; } - terminate_connection(n->connection, false); + terminate_connection(mesh, n->connection, false); /* Run graph algorithm to keep things in sync */ - graph(); + graph(mesh); } } @@ -460,7 +438,7 @@ bool ack_h(connection_t *c, const char *request) { /* Send him everything we know */ - send_everything(c); + send_everything(mesh, c); /* Create an edge_t for this connection */ @@ -474,15 +452,15 @@ bool ack_h(connection_t *c, const char *request) { c->edge->connection = c; c->edge->options = c->options; - edge_add(c->edge); + edge_add(mesh, c->edge); /* Notify everyone of the new edge */ - send_add_edge(everyone, c->edge); + send_add_edge(mesh, mesh->everyone, c->edge); /* Run MST and SSSP algorithms */ - graph(); + graph(mesh); return true; }