X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=ca042e12606a70e38b6c3e1907140b26a6faf972;hb=ea294dac41365a08a77b64c62c0ba630292d7a07;hp=85a0fbe16237bfad1c01e9fb9553f39815b44a68;hpb=1da7f28315be17a4ed854cdceb97a870f16a511e;p=meshlink diff --git a/src/protocol_auth.c b/src/protocol_auth.c index 85a0fbe1..ca042e12 100644 --- a/src/protocol_auth.c +++ b/src/protocol_auth.c @@ -37,94 +37,96 @@ #include "xalloc.h" #include "ed25519/sha512.h" +#include + +extern bool node_write_devclass(meshlink_handle_t *mesh, node_t *n); + 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(mesh, 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(mesh, MESHLINK_ERROR, "Cannot connect to an IPv6 host through a SOCKS 4 proxy!"); - return false; - } - 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(mesh->proxyuser) - memcpy(s4req + 8, mesh->proxyuser, strlen(mesh->proxyuser)); - s4req[sizeof s4req - 1] = 0; - c->tcplen = 8; - return send_meta(mesh, c, s4req, sizeof s4req); + case PROXY_HTTP: { + char *host; + char *port; + + sockaddr2str(&c->address, &host, &port); + send_request(mesh, 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(mesh, MESHLINK_ERROR, "Cannot connect to an IPv6 host through a SOCKS 4 proxy!"); + return false; } - case PROXY_SOCKS5: { - int len = 3 + 6 + (c->address.sa.sa_family == AF_INET ? 4 : 16); - c->tcplen = 2; - if(mesh->proxypass) - len += 3 + strlen(mesh->proxyuser) + strlen(mesh->proxypass); - char s5req[len]; - int i = 0; - s5req[i++] = 5; - s5req[i++] = 1; - if(mesh->proxypass) { - s5req[i++] = 2; - s5req[i++] = 1; - 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; - } - s5req[i++] = 5; + 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(mesh->proxyuser) + memcpy(s4req + 8, mesh->proxyuser, strlen(mesh->proxyuser)); + s4req[sizeof(s4req) - 1] = 0; + c->tcplen = 8; + 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(mesh->proxypass) + len += 3 + strlen(mesh->proxyuser) + strlen(mesh->proxypass); + char s5req[len]; + int i = 0; + s5req[i++] = 5; + s5req[i++] = 1; + if(mesh->proxypass) { + s5req[i++] = 2; s5req[i++] = 1; + 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; - 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(mesh, MESHLINK_ERROR, "Address family %hx not supported for SOCKS 5 proxies!", c->address.sa.sa_family); - return false; - } - if(i > len) - abort(); - return send_meta(mesh, c, s5req, sizeof s5req); - } - case PROXY_SOCKS4A: - logger(mesh, MESHLINK_ERROR, "Proxy type not implemented yet"); - return false; - case PROXY_EXEC: - return true; - default: - logger(mesh, MESHLINK_ERROR, "Unknown proxy type"); + 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(mesh, MESHLINK_ERROR, "Address family %hx not supported for SOCKS 5 proxies!", c->address.sa.sa_family); return false; + } + if(i > len) + abort(); + return send_meta(mesh, c, s5req, sizeof(s5req)); + } + case PROXY_SOCKS4A: + logger(mesh, MESHLINK_ERROR, "Proxy type not implemented yet"); + return false; + case PROXY_EXEC: + return true; + default: + logger(mesh, MESHLINK_ERROR, "Unknown proxy type"); + return false; } } bool send_id(meshlink_handle_t *mesh, connection_t *c) { - gettimeofday(&c->start, NULL); int minor = mesh->self->connection->protocol_minor; @@ -137,15 +139,15 @@ bool send_id(meshlink_handle_t *mesh, connection_t *c) { static bool finalize_invitation(meshlink_handle_t *mesh, connection_t *c, const void *data, uint16_t len) { if(strchr(data, '\n')) { - logger(mesh, MESHLINK_ERROR, "Received invalid key from invited node %s (%s)!\n", c->name, c->hostname); + logger(mesh, MESHLINK_ERROR, "Received invalid key from invited node %s!\n", c->name); return false; } // Create a new host config file char filename[PATH_MAX]; - snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, c->name); + snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, c->name); if(!access(filename, F_OK)) { - logger(mesh, MESHLINK_ERROR, "Host config file for %s (%s) already exists!\n", c->name, c->hostname); + logger(mesh, MESHLINK_ERROR, "Host config file for %s already exists!\n", c->name); return false; } @@ -158,7 +160,7 @@ static bool finalize_invitation(meshlink_handle_t *mesh, connection_t *c, const fprintf(f, "ECDSAPublicKey = %s\n", (const char *)data); fclose(f); - logger(mesh, MESHLINK_INFO, "Key succesfully received from %s (%s)", c->name, c->hostname); + logger(mesh, MESHLINK_INFO, "Key succesfully received from %s", c->name); //TODO: callback to application to inform of an accepted invitation @@ -188,19 +190,19 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat char hashbuf[18 + strlen(fingerprint)]; char cookie[25]; memcpy(hashbuf, data, 18); - memcpy(hashbuf + 18, fingerprint, sizeof hashbuf - 18); - sha512(hashbuf, sizeof hashbuf, hash); + memcpy(hashbuf + 18, fingerprint, sizeof(hashbuf) - 18); + sha512(hashbuf, sizeof(hashbuf), hash); b64encode_urlsafe(hash, cookie, 18); free(fingerprint); char filename[PATH_MAX], usedname[PATH_MAX]; - snprintf(filename, sizeof filename, "%s" SLASH "invitations" SLASH "%s", mesh->confbase, cookie); - snprintf(usedname, sizeof usedname, "%s" SLASH "invitations" SLASH "%s.used", mesh->confbase, cookie); + snprintf(filename, sizeof(filename), "%s" SLASH "invitations" SLASH "%s", mesh->confbase, cookie); + snprintf(usedname, sizeof(usedname), "%s" SLASH "invitations" SLASH "%s.used", mesh->confbase, cookie); // Atomically rename the invitation file if(rename(filename, usedname)) { if(errno == ENOENT) - logger(mesh, MESHLINK_ERROR, "Peer %s tried to use non-existing invitation %s\n", c->hostname, cookie); + logger(mesh, MESHLINK_ERROR, "Peer %s tried to use non-existing invitation %s\n", c->name, cookie); else logger(mesh, MESHLINK_ERROR, "Error trying to rename invitation %s\n", cookie); return false; @@ -215,7 +217,7 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat // Read the new node's Name from the file char buf[1024]; - fgets(buf, sizeof buf, f); + fgets(buf, sizeof(buf), f); if(*buf) buf[strlen(buf) - 1] = 0; @@ -240,7 +242,7 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat // Send the node the contents of the invitation file rewind(f); size_t result; - while((result = fread(buf, 1, sizeof buf, f))) + while((result = fread(buf, 1, sizeof(buf), f))) sptps_send_record(&c->sptps, 0, buf, result); sptps_send_record(&c->sptps, 1, buf, 0); fclose(f); @@ -248,7 +250,7 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat c->status.invitation_used = true; - logger(mesh, MESHLINK_INFO, "Invitation %s succesfully sent to %s (%s)", cookie, c->name, c->hostname); + logger(mesh, MESHLINK_INFO, "Invitation %s succesfully sent to %s", cookie, c->name); return true; } @@ -256,8 +258,7 @@ 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) { - logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s)", "ID", c->name, - c->hostname); + logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "ID", c->name); return false; } @@ -265,13 +266,13 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { if(name[0] == '?') { if(!mesh->invitation_key) { - logger(mesh, MESHLINK_ERROR, "Got invitation from %s but we don't have an invitation key", c->hostname); + logger(mesh, MESHLINK_ERROR, "Got invitation from %s but we don't have an invitation key", c->name); return false; } c->ecdsa = ecdsa_set_base64_public_key(name + 1); if(!c->ecdsa) { - logger(mesh, MESHLINK_ERROR, "Got bad invitation from %s", c->hostname); + logger(mesh, MESHLINK_ERROR, "Got bad invitation from %s", c->name); return false; } @@ -286,14 +287,13 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { c->protocol_minor = 2; c->allow_request = 1; - return sptps_start(&c->sptps, c, false, false, mesh->invitation_key, c->ecdsa, "meshlink invitation", 15, send_meta_sptps, receive_invitation_sptps); + return sptps_start(&c->sptps, c, false, false, mesh->invitation_key, c->ecdsa, meshlink_invitation_label, sizeof(meshlink_invitation_label), send_meta_sptps, receive_invitation_sptps); } /* Check if identity is a valid name */ if(!check_id(name)) { - logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ID", c->name, - c->hostname, "invalid name"); + logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ID", c->name, "invalid name"); return false; } @@ -301,8 +301,7 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { if(c->outgoing) { if(strcmp(c->name, name)) { - logger(mesh, MESHLINK_ERROR, "Peer %s is %s instead of %s", c->hostname, name, - c->name); + logger(mesh, MESHLINK_ERROR, "Peer is %s instead of %s", name, c->name); return false; } } else { @@ -314,8 +313,8 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { /* Check if version matches */ if(c->protocol_major != mesh->self->connection->protocol_major) { - logger(mesh, MESHLINK_ERROR, "Peer %s (%s) uses incompatible version %d.%d", - c->name, c->hostname, c->protocol_major, c->protocol_minor); + logger(mesh, MESHLINK_ERROR, "Peer %s uses incompatible version %d.%d", + c->name, c->protocol_major, c->protocol_minor); return false; } @@ -323,52 +322,52 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { init_configuration(&c->config_tree); if(!read_host_config(mesh, c->config_tree, c->name)) { - logger(mesh, MESHLINK_ERROR, "Peer %s had unknown identity (%s)", c->hostname, c->name); + logger(mesh, MESHLINK_ERROR, "Peer %s has unknown identity", c->name); return false; } + } - read_ecdsa_public_key(mesh, c); - } else { - if(c->protocol_minor && !ecdsa_active(c->ecdsa)) - c->protocol_minor = 1; + read_ecdsa_public_key(mesh, c); + + if(!ecdsa_active(c->ecdsa)) { + logger(mesh, MESHLINK_ERROR, "No key known for peer %s", c->name); + + node_t *n = lookup_node(mesh, c->name); + if(n && !n->status.waitingforkey) { + logger(mesh, MESHLINK_INFO, "Requesting key from peer %s", c->name); + send_req_key(mesh, n); + } + + return false; } /* Forbid version rollback for nodes whose ECDSA key we know */ if(ecdsa_active(c->ecdsa) && c->protocol_minor < 2) { - logger(mesh, MESHLINK_ERROR, "Peer %s (%s) tries to roll back protocol version to %d.%d", - c->name, c->hostname, c->protocol_major, c->protocol_minor); + logger(mesh, MESHLINK_ERROR, "Peer %s tries to roll back protocol version to %d.%d", + c->name, c->protocol_major, c->protocol_minor); return false; } c->allow_request = ACK; - char label[25 + strlen(mesh->self->name) + strlen(c->name)]; + char label[sizeof(meshlink_tcp_label) + strlen(mesh->self->name) + strlen(c->name) + 2]; if(c->outgoing) - snprintf(label, sizeof label, "meshlink TCP key expansion %s %s", mesh->self->name, c->name); + snprintf(label, sizeof(label), "%s %s %s", meshlink_tcp_label, mesh->self->name, c->name); else - snprintf(label, sizeof label, "meshlink TCP key expansion %s %s", c->name, mesh->self->name); + snprintf(label, sizeof(label), "%s %s %s", meshlink_tcp_label, 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); + return sptps_start(&c->sptps, c, c->outgoing, false, mesh->self->connection->ecdsa, c->ecdsa, label, sizeof(label) - 1, send_meta_sptps, receive_meta_sptps); } 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. */ - - struct timeval now; - - /* Estimate weight */ - - gettimeofday(&now, NULL); - c->estimated_weight = (now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000; /* Check some options */ if(mesh->self->options & OPTION_PMTU_DISCOVERY) c->options |= OPTION_PMTU_DISCOVERY; - return send_request(mesh, c, "%d %s %d %x", ACK, mesh->myport, c->estimated_weight, (c->options & 0xffffff) | (PROT_MINOR << 24)); + return send_request(mesh, c, "%d %s %d %x", ACK, mesh->myport, mesh->devclass, (c->options & 0xffffff) | (PROT_MINOR << 24)); } static void send_everything(meshlink_handle_t *mesh, connection_t *c) { @@ -383,13 +382,17 @@ static void send_everything(meshlink_handle_t *mesh, connection_t *c) { bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { char hisport[MAX_STRING_SIZE]; char *hisaddress; - int weight; + int devclass; uint32_t options; node_t *n; - if(sscanf(request, "%*d " MAX_STRING " %d %x", hisport, &weight, &options) != 3) { - logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s)", "ACK", c->name, - c->hostname); + if(sscanf(request, "%*d " MAX_STRING " %d %x", hisport, &devclass, &options) != 3) { + logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "ACK", c->name); + return false; + } + + if(devclass < 0 || devclass > _DEV_CLASS_MAX) { + logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ACK", c->name, "devclass invalid"); return false; } @@ -404,7 +407,7 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { } else { if(n->connection) { /* Oh dear, we already have a connection to this node. */ - logger(mesh, MESHLINK_DEBUG, "Established a second connection with %s (%s), closing old connection", n->connection->name, n->connection->hostname); + logger(mesh, MESHLINK_DEBUG, "Established a second connection with %s, closing old connection", n->connection->name); if(n->connection->outgoing) { if(c->outgoing) @@ -421,6 +424,11 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { } } + n->devclass = devclass; + node_write_devclass(mesh, n); + + n->last_successfull_connection = time(NULL); + n->connection = c; c->node = n; if(!(c->options & options & OPTION_PMTU_DISCOVERY)) { @@ -434,8 +442,7 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { c->allow_request = ALL; c->status.active = true; - logger(mesh, MESHLINK_INFO, "Connection with %s (%s) activated", c->name, - c->hostname); + logger(mesh, MESHLINK_INFO, "Connection with %s activated", c->name); /* Send him everything we know */ @@ -443,13 +450,15 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { /* Create an edge_t for this connection */ + assert(devclass >= 0 && devclass <= _DEV_CLASS_MAX); + c->edge = new_edge(); c->edge->from = mesh->self; c->edge->to = n; sockaddr2str(&c->address, &hisaddress, NULL); c->edge->address = str2sockaddr(hisaddress, hisport); free(hisaddress); - c->edge->weight = (weight + c->estimated_weight) / 2; + c->edge->weight = dev_class_traits[devclass].edge_weight; c->edge->connection = c; c->edge->options = c->options;