X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=2aa79def7d47c6762e01f30715cb14e277933991;hb=2cfd1205dc9c6e9d42cc569f415afe13f52357ec;hp=98761866455aa5061139c262e53eb741cb098746;hpb=94c2dc5ad88daa92b1a351c08acacd36ddb3ec64;p=meshlink diff --git a/src/meshlink.c b/src/meshlink.c index 98761866..2aa79def 100644 --- a/src/meshlink.c +++ b/src/meshlink.c @@ -179,9 +179,8 @@ static char *get_my_hostname(meshlink_handle_t* mesh) { FILE *f; // Use first Address statement in own host config file - snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name); + snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name); scan_for_hostname(filename, &hostname, &port); - scan_for_hostname(mesh->meshlink_conf, &hostname, &port); if(hostname) goto done; @@ -342,18 +341,6 @@ static char *get_value(const char *data, const char *var) { return NULL; return val; } -static FILE *fopenmask(const char *filename, const char *mode, mode_t perms) { - mode_t mask = umask(0); - perms &= ~mask; - umask(~perms); - FILE *f = fopen(filename, mode); -#ifdef HAVE_FCHMOD - if((perms & 0444) && f) - fchmod(fileno(f), perms); -#endif - umask(mask); - return f; -} static bool try_bind(int port) { struct addrinfo *ai = NULL; @@ -424,29 +411,22 @@ static bool finalize_join(meshlink_handle_t *mesh) { return false; } - if(mkdir(mesh->confbase, 0777) && errno != EEXIST) { - fprintf(stderr, "Could not create directory %s: %s\n", mesh->confbase, strerror(errno)); - return false; - } - - if(mkdir(mesh->hosts_dir, 0777) && errno != EEXIST) { - fprintf(stderr, "Could not create directory %s: %s\n", mesh->hosts_dir, strerror(errno)); - return false; - } + char filename[PATH_MAX]; + snprintf(filename, sizeof filename, "%s" SLASH "meshlink.conf", mesh->confbase); - FILE *f = fopen(mesh->meshlink_conf, "w"); + FILE *f = fopen(filename, "w"); if(!f) { - fprintf(stderr, "Could not create file %s: %s\n", mesh->meshlink_conf, strerror(errno)); + fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno)); return false; } fprintf(f, "Name = %s\n", name); - char filename[PATH_MAX]; - snprintf(filename,PATH_MAX, "%s" SLASH "%s", mesh->hosts_dir, name); + snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name); FILE *fh = fopen(filename, "w"); if(!fh) { fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno)); + fclose(f); return false; } @@ -515,7 +495,7 @@ static bool finalize_join(meshlink_handle_t *mesh) { return false; } - snprintf(filename,PATH_MAX, "%s" SLASH "%s", mesh->hosts_dir, value); + snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, value); f = fopen(filename, "w"); if(!f) { @@ -545,42 +525,31 @@ static bool finalize_join(meshlink_handle_t *mesh) { fclose(f); } - // Generate our key and send a copy to the server - ecdsa_t *key = ecdsa_generate(); - if(!key) - return false; - - char *b64key = ecdsa_get_base64_public_key(key); + char *b64key = ecdsa_get_base64_public_key(mesh->self->connection->ecdsa); if(!b64key) return false; - snprintf(filename,PATH_MAX, "%s" SLASH "ecdsa_key.priv", mesh->confbase); - f = fopenmask(filename, "w", 0600); - - if(!ecdsa_write_pem_private_key(key, f)) { - fprintf(stderr, "Error writing private key!\n"); - ecdsa_free(key); - fclose(f); - return false; - } - - fclose(f); - fprintf(fh, "ECDSAPublicKey = %s\n", b64key); + fprintf(fh, "Port = %s\n", mesh->myport); + + fclose(fh); sptps_send_record(&(mesh->sptps), 1, b64key, strlen(b64key)); free(b64key); - ecdsa_free(key); - - check_port(mesh); + free(mesh->self->name); + free(mesh->self->connection->name); + mesh->self->name = xstrdup(name); + mesh->self->connection->name = xstrdup(name); fprintf(stderr, "Configuration stored in: %s\n", mesh->confbase); + load_all_nodes(mesh); + return true; } -static bool invitation_send(void *handle, uint8_t type, const char *data, size_t len) { +static bool invitation_send(void *handle, uint8_t type, const void *data, size_t len) { meshlink_handle_t* mesh = handle; while(len) { int result = send(mesh->sock, data, len, 0); @@ -594,7 +563,7 @@ static bool invitation_send(void *handle, uint8_t type, const char *data, size_t return true; } -static bool invitation_receive(void *handle, uint8_t type, const char *msg, uint16_t len) { +static bool invitation_receive(void *handle, uint8_t type, const void *msg, uint16_t len) { meshlink_handle_t* mesh = handle; switch(type) { case SPTPS_HANDSHAKE: @@ -739,29 +708,29 @@ static bool ecdsa_keygen(meshlink_handle_t *mesh) { } static bool meshlink_setup(meshlink_handle_t *mesh) { - if(mkdir(mesh->confbase, 0777) && errno != EEXIST) { fprintf(stderr, "Could not create directory %s: %s\n", mesh->confbase, strerror(errno)); return false; } - snprintf(mesh->hosts_dir, sizeof mesh->hosts_dir, "%s" SLASH "hosts", mesh->confbase); + char filename[PATH_MAX]; + snprintf(filename, sizeof filename, "%s" SLASH "hosts", mesh->confbase); - if(mkdir(mesh->hosts_dir, 0777) && errno != EEXIST) { - fprintf(stderr, "Could not create directory %s: %s\n", mesh->hosts_dir, strerror(errno)); + if(mkdir(filename, 0777) && errno != EEXIST) { + fprintf(stderr, "Could not create directory %s: %s\n", filename, strerror(errno)); return false; } - snprintf(mesh->meshlink_conf, sizeof mesh->meshlink_conf, "%s" SLASH "meshlink.conf", mesh->confbase); + snprintf(filename, sizeof filename, "%s" SLASH "meshlink.conf", mesh->confbase); - if(!access(mesh->meshlink_conf, F_OK)) { - fprintf(stderr, "Configuration file %s already exists!\n", mesh->meshlink_conf); + if(!access(filename, F_OK)) { + fprintf(stderr, "Configuration file %s already exists!\n", filename); return false; } - FILE *f = fopen(mesh->meshlink_conf, "w"); + FILE *f = fopen(filename, "w"); if(!f) { - fprintf(stderr, "Could not create file %s: %s\n", mesh->meshlink_conf, strerror(errno)); + fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno)); return 1; } @@ -917,7 +886,15 @@ meshlink_node_t *meshlink_get_node(meshlink_handle_t *mesh, const char *name) { } size_t meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes, size_t nmemb) { - return 0; + size_t i = 0; + + for splay_each(node_t, n, mesh->nodes) { + if(i < nmemb) + nodes[i] = (meshlink_node_t *)n; + i++; + } + + return i; } char *meshlink_sign(meshlink_handle_t *mesh, const char *data, size_t len) { @@ -928,46 +905,10 @@ bool meshlink_verify(meshlink_handle_t *mesh, meshlink_node_t *source, const cha return false; } -char *meshlink_invite(meshlink_handle_t *mesh, const char *name) { - // Check validity of the new node's name - if(!check_id(name)) { - fprintf(stderr, "Invalid name for node.\n"); - return NULL; - } - - // Ensure no host configuration file with that name exists - char filename [PATH_MAX]; - snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name); - if(!access(filename, F_OK)) { - fprintf(stderr, "A host config file for %s already exists!\n", name); - return NULL; - } - - // If a daemon is running, ensure no other nodes know about this name - - //TODO: original tinc code connects to tincd cli and makes this check. How we want to implement this here ? - //bool found = false; - //if(connect_tincd(false)) { - // sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES); - - // while(recvline(fd, line, sizeof line)) { - // char node[4096]; - // int code, req; - // if(sscanf(line, "%d %d %s", &code, &req, node) != 3) - // break; - // if(!strcmp(node, name)) - // found = true; - // } - - // if(found) { - // fprintf(stderr, "A node with name %s is already known!\n", name); - // return 1; - // } - //} - - char hash[64]; +static bool refresh_invitation_key(meshlink_handle_t *mesh) { + char filename[PATH_MAX]; - snprintf(filename,PATH_MAX, "%s" SLASH "invitations", mesh->confbase); + snprintf(filename, sizeof filename, "%s" SLASH "invitations", mesh->confbase); if(mkdir(filename, 0700) && errno != EEXIST) { fprintf(stderr, "Could not create directory %s: %s\n", filename, strerror(errno)); return NULL; @@ -990,9 +931,9 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) { continue; char invname[PATH_MAX]; struct stat st; - snprintf(invname,PATH_MAX, "%s" SLASH "%s", filename, ent->d_name); + snprintf(invname, sizeof invname, "%s" SLASH "%s", filename, ent->d_name); if(!stat(invname, &st)) { - if(deadline < st.st_mtime) + if(mesh->invitation_key && deadline < st.st_mtime) count++; else unlink(invname); @@ -1005,17 +946,24 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) { if(errno) { fprintf(stderr, "Error while reading directory %s: %s\n", filename, strerror(errno)); closedir(dir); - return NULL; + return false; } closedir(dir); - ecdsa_t *key; - snprintf(filename,PATH_MAX, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase); + snprintf(filename, sizeof filename, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase); // Remove the key if there are no outstanding invitations. - if(!count) + if(!count) { unlink(filename); + if(mesh->invitation_key) { + ecdsa_free(mesh->invitation_key); + mesh->invitation_key = NULL; + } + } + + if(mesh->invitation_key) + return true; // Create a new key if necessary. FILE *f = fopen(filename, "r"); @@ -1025,8 +973,8 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) { return NULL; } - key = ecdsa_generate(); - if(!key) { + mesh->invitation_key = ecdsa_generate(); + if(!mesh->invitation_key) { fprintf(stderr, "Could not generate a new key!\n"); return NULL; } @@ -1036,23 +984,46 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) { return NULL; } chmod(filename, 0600); - ecdsa_write_pem_private_key(key, f); + ecdsa_write_pem_private_key(mesh->invitation_key, f); fclose(f); - //TODO: handle this in meshlink - //if(connect_tincd(false)) - // sendline(fd, "%d %d", CONTROL, REQ_RELOAD); } else { - key = ecdsa_read_pem_private_key(f); + mesh->invitation_key = ecdsa_read_pem_private_key(f); fclose(f); - if(!key) + if(!mesh->invitation_key) fprintf(stderr, "Could not read private key from %s\n", filename); } - if(!key) + return mesh->invitation_key; +} + +char *meshlink_invite(meshlink_handle_t *mesh, const char *name) { + // Check validity of the new node's name + if(!check_id(name)) { + fprintf(stderr, "Invalid name for node.\n"); + return NULL; + } + + // Ensure no host configuration file with that name exists + char filename[PATH_MAX]; + snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name); + if(!access(filename, F_OK)) { + fprintf(stderr, "A host config file for %s already exists!\n", name); return NULL; + } + + // Ensure no other nodes know about this name + if(meshlink_get_node(mesh, name)) { + fprintf(stderr, "A node with name %s is already known!\n", name); + return NULL; + } + + if(!refresh_invitation_key(mesh)) + return NULL; + + char hash[64]; // Create a hash of the key. - char *fingerprint = ecdsa_get_base64_public_key(key); + char *fingerprint = ecdsa_get_base64_public_key(mesh->invitation_key); sha512(fingerprint, strlen(fingerprint), hash); b64encode_urlsafe(hash, hash, 18); @@ -1071,13 +1042,13 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) { b64encode_urlsafe(cookie, cookie, 18); // Create a file containing the details of the invitation. - snprintf(filename,PATH_MAX, "%s" SLASH "invitations" SLASH "%s", mesh->confbase, cookiehash); + snprintf(filename, sizeof filename, "%s" SLASH "invitations" SLASH "%s", mesh->confbase, cookiehash); int ifd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600); if(!ifd) { fprintf(stderr, "Could not create invitation file %s: %s\n", filename, strerror(errno)); return NULL; } - f = fdopen(ifd, "w"); + FILE *f = fdopen(ifd, "w"); if(!f) abort(); @@ -1091,7 +1062,8 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) { fprintf(f, "ConnectTo = %s\n", mesh->self->name); // Copy Broadcast and Mode - FILE *tc = fopen(mesh->meshlink_conf, "r"); + snprintf(filename, sizeof filename, "%s" SLASH "meshlink.conf", mesh->confbase); + FILE *tc = fopen(filename, "r"); if(tc) { char buf[1024]; while(fgets(buf, sizeof buf, tc)) { @@ -1104,14 +1076,16 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) { } } fclose(tc); + } else { + fprintf(stderr, "Could not create %s: %s\n", filename, strerror(errno)); + return NULL; } fprintf(f, "#---------------------------------------------------------------#\n"); fprintf(f, "Name = %s\n", mesh->self->name); - char filename2[PATH_MAX]; - snprintf(filename2,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->self->name); - fcopy(f, filename2); + snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->self->name); + fcopy(f, filename); fclose(f); // Create an URL from the local address, key hash and cookie @@ -1126,23 +1100,7 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { char copy[strlen(invitation) + 1]; strcpy(copy, invitation); - // Make sure confbase exists and is accessible. - if(mkdir(mesh->confbase, 0777) && errno != EEXIST) { - fprintf(stderr, "Could not create directory %s: %s\n", mesh->confbase, strerror(errno)); - return false; - } - - if(access(mesh->confbase, R_OK | W_OK | X_OK)) { - fprintf(stderr, "No permission to write in directory %s: %s\n", mesh->confbase, strerror(errno)); - return false; - } - - // TODO: Either remove or reintroduce netname in meshlink - // If a netname or explicit configuration directory is specified, check for an existing meshlink.conf. - //if((mesh->netname || confbasegiven) && !access(meshlink_conf, F_OK)) { - // fprintf(stderr, "Configuration file %s already exists!\n", meshlink_conf); - // return 1; - //} + // Split the invitation URL into hostname, port, key hash and cookie. char *slash = strchr(copy, '/'); if(!slash) @@ -1169,7 +1127,7 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { *port++ = 0; } - if(!mesh->myport || !*port) + if(!*port) port = "655"; if(!b64decode(slash, mesh->hash, 18) || !b64decode(slash + 24, mesh->cookie, 18)) @@ -1203,6 +1161,8 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { // Tell him we have an invitation, and give him our throw-away key. + mesh->blen = 0; + if(!sendline(mesh->sock, "0 ?%s %d.%d", b64key, PROT_MAJOR, 1)) { fprintf(stderr, "Error sending request to %s port %s: %s\n", address, port, strerror(errno)); closesocket(mesh->sock);