X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=33af6c36272a4c05aac9c1f1cfab87c0f5f5ccf4;hb=cf5a9d0ff6ef59cd130a865ce1be44b4e8b8471a;hp=718b07a183d2d0449cdadfbef6c8881c9956d46b;hpb=47de98b27b28e049c47ce29a056d245fb14a2576;p=meshlink diff --git a/src/meshlink.c b/src/meshlink.c index 718b07a1..33af6c36 100644 --- a/src/meshlink.c +++ b/src/meshlink.c @@ -16,11 +16,13 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define VAR_SERVER 1 /* Should be in tinc.conf */ +#define VAR_SERVER 1 /* Should be in meshlink.conf */ #define VAR_HOST 2 /* Can be in host config file */ #define VAR_MULTIPLE 4 /* Multiple statements allowed */ #define VAR_OBSOLETE 8 /* Should not be used anymore */ #define VAR_SAFE 16 /* Variable is safe when accepting invitations */ +#define MAX_ADDRESS_LENGTH 45 /* Max length of an (IPv6) address */ +#define MAX_PORT_LENGTH 5 /* 0-65535 */ typedef struct { const char *name; int type; @@ -39,7 +41,13 @@ typedef struct { #include "utils.h" #include "xalloc.h" #include "ed25519/sha512.h" +#include "discovery.h" +#ifndef MSG_NOSIGNAL +#define MSG_NOSIGNAL 0 +#endif + +__thread meshlink_errno_t meshlink_errno; //TODO: this can go away completely const var_t variables[] = { @@ -179,18 +187,17 @@ 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; // If that doesn't work, guess externally visible hostname fprintf(stderr, "Trying to discover externally visible hostname...\n"); - struct addrinfo *ai = str2addrinfo("tinc-vpn.org", "80", SOCK_STREAM); + struct addrinfo *ai = str2addrinfo("meshlink.io", "80", SOCK_STREAM); struct addrinfo *aip = ai; - static const char request[] = "GET http://tinc-vpn.org/host.cgi HTTP/1.0\r\n\r\n"; + static const char request[] = "GET http://www.meshlink.io/host.cgi HTTP/1.0\r\n\r\n"; while(aip) { int s = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol); @@ -234,44 +241,9 @@ static char *get_my_hostname(meshlink_handle_t* mesh) { } } - //if(!tty) { - // if(!hostname) { - // fprintf(stderr, "Could not determine the external address or hostname. Please set Address manually.\n"); - // return NULL; - // } - // goto save; - //} - -again: - fprintf(stderr, "Please enter your host's external address or hostname"); - if(hostname) - fprintf(stderr, " [%s]", hostname); - fprintf(stderr, ": "); - - if(!fgets(line, sizeof line, stdin)) { - fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno)); - free(hostname); + if(!hostname) return NULL; - } - if(!rstrip(line)) { - if(hostname) - goto save; - else - goto again; - } - - for(char *p = line; *p; p++) { - if(isalnum(*p) || *p == '-' || *p == '.') - continue; - fprintf(stderr, "Invalid address or hostname.\n"); - goto again; - } - - free(hostname); - hostname = xstrdup(line); - -save: f = fopen(filename, "a"); if(f) { fprintf(f, "\nAddress = %s\n", hostname); @@ -342,18 +314,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; @@ -372,15 +332,20 @@ static bool try_bind(int port) { while(ai) { int fd = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP); - if(!fd) + if(!fd) { + freeaddrinfo(ai); return false; + } int result = bind(fd, ai->ai_addr, ai->ai_addrlen); closesocket(fd); - if(result) + if(result) { + freeaddrinfo(ai); return false; + } ai = ai->ai_next; } + freeaddrinfo(ai); return true; } @@ -424,33 +389,26 @@ 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; } - // Filter first chunk on approved keywords, split between tinc.conf and hosts/Name + // Filter first chunk on approved keywords, split between meshlink.conf and hosts/Name // Other chunks go unfiltered to their respective host config files const char *p = mesh->data; char *l, *value; @@ -515,7 +473,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 +503,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 = 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 +541,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: @@ -681,12 +628,21 @@ static bool sendline(int fd, char *format, ...) { static const char *errstr[] = { [MESHLINK_OK] = "No error", + [MESHLINK_EINVAL] = "Invalid argument", [MESHLINK_ENOMEM] = "Out of memory", [MESHLINK_ENOENT] = "No such node", + [MESHLINK_EEXIST] = "Node already exists", + [MESHLINK_EINTERNAL] = "Internal error", + [MESHLINK_ERESOLV] = "Could not resolve hostname", + [MESHLINK_ESTORAGE] = "Storage error", + [MESHLINK_ENETWORK] = "Network error", + [MESHLINK_EPEER] = "Error communicating with peer", }; -const char *meshlink_strerror(meshlink_errno_t errno) { - return errstr[errno]; +const char *meshlink_strerror(meshlink_errno_t err) { + if(err < 0 || err >= sizeof errstr / sizeof *errstr) + return "Invalid error code"; + return errstr[err]; } static bool ecdsa_keygen(meshlink_handle_t *mesh) { @@ -698,6 +654,7 @@ static bool ecdsa_keygen(meshlink_handle_t *mesh) { if(!(key = ecdsa_generate())) { fprintf(stderr, "Error during key generation!\n"); + meshlink_errno = MESHLINK_EINTERNAL; return false; } else fprintf(stderr, "Done.\n"); @@ -705,8 +662,10 @@ static bool ecdsa_keygen(meshlink_handle_t *mesh) { snprintf(privname, sizeof privname, "%s" SLASH "ecdsa_key.priv", mesh->confbase); f = fopen(privname, "w"); - if(!f) + if(!f) { + meshlink_errno = MESHLINK_ESTORAGE; return false; + } #ifdef HAVE_FCHMOD fchmod(fileno(f), 0600); @@ -716,17 +675,19 @@ static bool ecdsa_keygen(meshlink_handle_t *mesh) { fprintf(stderr, "Error writing private key!\n"); ecdsa_free(key); fclose(f); + meshlink_errno = MESHLINK_EINTERNAL; return false; } fclose(f); - snprintf(pubname, sizeof pubname, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->name); f = fopen(pubname, "a"); - if(!f) + if(!f) { + meshlink_errno = MESHLINK_ESTORAGE; return false; + } char *pubkey = ecdsa_get_base64_public_key(key); fprintf(f, "ECDSAPublicKey = %s\n", pubkey); @@ -739,64 +700,85 @@ 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)); + meshlink_errno = MESHLINK_ESTORAGE; 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)); + meshlink_errno = MESHLINK_ESTORAGE; 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); + meshlink_errno = MESHLINK_EEXIST; 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)); - return 1; + fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno)); + meshlink_errno = MESHLINK_ESTORAGE; + return false; } fprintf(f, "Name = %s\n", mesh->name); fclose(f); - if(!ecdsa_keygen(mesh)) + if(!ecdsa_keygen(mesh)) { + meshlink_errno = MESHLINK_EINTERNAL; return false; + } check_port(mesh); return true; } -meshlink_handle_t *meshlink_open(const char *confbase, const char *name) { +meshlink_handle_t *meshlink_open(const char *confbase, const char *name, const char* appname) { // Validate arguments provided by the application + bool usingname = false; if(!confbase || !*confbase) { fprintf(stderr, "No confbase given!\n"); + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + if(!appname || !*appname) { + fprintf(stderr, "No appname given!\n"); + meshlink_errno = MESHLINK_EINVAL; return NULL; } if(!name || !*name) { fprintf(stderr, "No name given!\n"); - return NULL; + //return NULL; } + else { //check name only if there is a name != NULL - if(!check_id(name)) { - fprintf(stderr, "Invalid name given!\n"); - return NULL; + if(!check_id(name)) { + fprintf(stderr, "Invalid name given!\n"); + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } else { usingname = true;} } meshlink_handle_t *mesh = xzalloc(sizeof *mesh); mesh->confbase = xstrdup(confbase); - mesh->name = xstrdup(name); + mesh->appname = xstrdup(appname); + if (usingname) mesh->name = xstrdup(name); + pthread_mutex_init ( &(mesh->outpacketqueue_mutex), NULL); + pthread_mutex_init ( &(mesh->nodes_mutex), NULL); + mesh->threadstarted = false; event_loop_init(&mesh->loop); mesh->loop.data = mesh; @@ -811,10 +793,15 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) { if(access(filename, R_OK)) { if(errno == ENOENT) { // If not, create it - meshlink_setup(mesh); + if(!meshlink_setup(mesh)) { + // meshlink_errno is set by meshlink_setup() + return NULL; + } } else { fprintf(stderr, "Cannot not read from %s: %s\n", filename, strerror(errno)); - return meshlink_close(mesh), NULL; + meshlink_close(mesh); + meshlink_errno = MESHLINK_ESTORAGE; + return NULL; } } @@ -822,19 +809,30 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) { init_configuration(&mesh->config); - if(!read_server_config(mesh)) - return meshlink_close(mesh), NULL; + if(!read_server_config(mesh)) { + meshlink_close(mesh); + meshlink_errno = MESHLINK_ESTORAGE; + return NULL; + }; + +#ifdef HAVE_MINGW + struct WSAData wsa_state; + WSAStartup(MAKEWORD(2, 2), &wsa_state); +#endif // Setup up everything // TODO: we should not open listening sockets yet - if(!setup_network(mesh)) - return meshlink_close(mesh), NULL; + if(!setup_network(mesh)) { + meshlink_close(mesh); + meshlink_errno = MESHLINK_ENETWORK; + return NULL; + } return mesh; } -void *meshlink_main_loop(void *arg) { +static void *meshlink_main_loop(void *arg) { meshlink_handle_t *mesh = arg; try_outgoing_connections(mesh); @@ -845,21 +843,53 @@ void *meshlink_main_loop(void *arg) { } bool meshlink_start(meshlink_handle_t *mesh) { + if(!mesh) { + meshlink_errno = MESHLINK_EINVAL; + return false; + } + // TODO: open listening sockets first + //Check that a valid name is set + if(!mesh->name ) { + fprintf(stderr, "No name given!\n"); + meshlink_errno = MESHLINK_EINVAL; + return false; + } + // Start the main thread if(pthread_create(&mesh->thread, NULL, meshlink_main_loop, mesh) != 0) { fprintf(stderr, "Could not start thread: %s\n", strerror(errno)); memset(&mesh->thread, 0, sizeof mesh->thread); + meshlink_errno = MESHLINK_EINTERNAL; return false; } + mesh->threadstarted=true; + + // Start discovery + if(!discovery_start(mesh)) + return false; + return true; } void meshlink_stop(meshlink_handle_t *mesh) { - // TODO: close the listening sockets to signal the main thread to shut down + if(!mesh) { + meshlink_errno = MESHLINK_EINVAL; + return; + } + + // Stop discovery + discovery_stop(mesh); + + // Shut down the listening sockets to signal the main thread to shut down + + for(int i = 0; i < mesh->listen_sockets; i++) { + shutdown(mesh->listen_socket[i].tcp.fd, SHUT_RDWR); + shutdown(mesh->listen_socket[i].udp.fd, SHUT_RDWR); + } // Wait for the main thread to finish @@ -867,6 +897,11 @@ void meshlink_stop(meshlink_handle_t *mesh) { } void meshlink_close(meshlink_handle_t *mesh) { + if(!mesh || !mesh->confbase) { + meshlink_errno = MESHLINK_EINVAL; + return; + } + // Close and free all resources used. close_network_connections(mesh); @@ -875,57 +910,224 @@ void meshlink_close(meshlink_handle_t *mesh) { exit_configuration(&mesh->config); event_loop_exit(&mesh->loop); + +#ifdef HAVE_MINGW + if(mesh->confbase) + WSACleanup(); +#endif + + ecdsa_free(mesh->invitation_key); + + free(mesh->name); + free(mesh->confbase); + + memset(mesh, 0, sizeof *mesh); + + free(mesh); } void meshlink_set_receive_cb(meshlink_handle_t *mesh, meshlink_receive_cb_t cb) { + if(!mesh) { + meshlink_errno = MESHLINK_EINVAL; + return; + } + mesh->receive_cb = cb; } void meshlink_set_node_status_cb(meshlink_handle_t *mesh, meshlink_node_status_cb_t cb) { + if(!mesh) { + meshlink_errno = MESHLINK_EINVAL; + return; + } + mesh->node_status_cb = cb; } void meshlink_set_log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, meshlink_log_cb_t cb) { + if(!mesh) { + meshlink_errno = MESHLINK_EINVAL; + return; + } + mesh->log_cb = cb; mesh->log_level = level; } -bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, unsigned int len) { +bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, size_t len) { + if(!mesh || !destination) { + meshlink_errno = MESHLINK_EINVAL; + return false; + } + + if(!len) + return true; + + if(!data) { + meshlink_errno = MESHLINK_EINVAL; + return false; + } + + /* If there is no outgoing list yet, create one. */ + + if(!mesh->outpacketqueue) + mesh->outpacketqueue = list_alloc(NULL); + + //add packet to the queue + outpacketqueue_t *packet_in_queue = xzalloc(sizeof *packet_in_queue); + packet_in_queue->destination=destination; + packet_in_queue->data=data; + packet_in_queue->len=len; + pthread_mutex_lock(&(mesh->outpacketqueue_mutex)); + list_insert_head(mesh->outpacketqueue,packet_in_queue); + pthread_mutex_unlock(&(mesh->outpacketqueue_mutex)); + + //notify event loop + signal_trigger(&(mesh->loop),&(mesh->datafromapp)); + return true; +} + +void meshlink_send_from_queue(event_loop_t* el,meshlink_handle_t *mesh) { vpn_packet_t packet; meshlink_packethdr_t *hdr = (meshlink_packethdr_t *)packet.data; - if (sizeof(meshlink_packethdr_t) + len > MAXSIZE) { + + outpacketqueue_t* p = list_get_tail(mesh->outpacketqueue); + if (p) + list_delete_tail(mesh->outpacketqueue); + else return ; + + if (sizeof(meshlink_packethdr_t) + p->len > MAXSIZE) { //log something - return false; + return ; } packet.probe = false; memset(hdr, 0, sizeof *hdr); - memcpy(hdr->destination, destination->name, sizeof hdr->destination); + memcpy(hdr->destination, p->destination->name, sizeof hdr->destination); memcpy(hdr->source, mesh->self->name, sizeof hdr->source); - packet.len = sizeof *hdr + len; - memcpy(packet.data + sizeof *hdr, data, len); + packet.len = sizeof *hdr + p->len; + memcpy(packet.data + sizeof *hdr, p->data, p->len); mesh->self->in_packets++; mesh->self->in_bytes += packet.len; route(mesh, mesh->self, &packet); - return false; + return ; +} + +ssize_t meshlink_get_pmtu(meshlink_handle_t *mesh, meshlink_node_t *destination) { + if(!mesh || !destination) { + meshlink_errno = MESHLINK_EINVAL; + return -1; + } + + node_t *n = (node_t *)destination; + if(!n->status.reachable) + return 0; + else if(n->mtuprobes > 30 && n->minmtu) + return n->minmtu; + else + return MTU; +} + +char *meshlink_get_fingerprint(meshlink_handle_t *mesh, meshlink_node_t *node) { + if(!mesh || !node) { + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + node_t *n = (node_t *)node; + + if(!node_read_ecdsa_public_key(mesh, n) || !n->ecdsa) { + meshlink_errno = MESHLINK_EINTERNAL; + return false; + } + + char *fingerprint = ecdsa_get_base64_public_key(n->ecdsa); + + if(!fingerprint) + meshlink_errno = MESHLINK_EINTERNAL; + + return fingerprint; } meshlink_node_t *meshlink_get_node(meshlink_handle_t *mesh, const char *name) { + if(!mesh || !name) { + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + return (meshlink_node_t *)lookup_node(mesh, (char *)name); // TODO: make lookup_node() use const } -size_t meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes, size_t nmemb) { - return 0; +meshlink_node_t **meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes, size_t *nmemb) { + if(!mesh || !nmemb || (*nmemb && !nodes)) { + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + meshlink_node_t **result; + + //lock mesh->nodes + pthread_mutex_lock(&(mesh->nodes_mutex)); + + *nmemb = mesh->nodes->count; + result = realloc(nodes, *nmemb * sizeof *nodes); + + if(result) { + meshlink_node_t **p = result; + for splay_each(node_t, n, mesh->nodes) + *p++ = (meshlink_node_t *)n; + } else { + *nmemb = 0; + free(nodes); + meshlink_errno = MESHLINK_ENOMEM; + } + + pthread_mutex_unlock(&(mesh->nodes_mutex)); + + return result; } -char *meshlink_sign(meshlink_handle_t *mesh, const char *data, size_t len) { - return NULL; +bool meshlink_sign(meshlink_handle_t *mesh, const void *data, size_t len, void *signature, size_t *siglen) { + if(!mesh || !data || !len || !signature || !siglen) { + meshlink_errno = MESHLINK_EINVAL; + return false; + } + + if(*siglen < MESHLINK_SIGLEN) { + meshlink_errno = MESHLINK_EINVAL; + return false; + } + + if(!ecdsa_sign(mesh->self->connection->ecdsa, data, len, signature)) { + meshlink_errno = MESHLINK_EINTERNAL; + return false; + } + + *siglen = MESHLINK_SIGLEN; + return true; } -bool meshlink_verify(meshlink_handle_t *mesh, meshlink_node_t *source, const char *data, size_t len, const char *signature) { - return false; +bool meshlink_verify(meshlink_handle_t *mesh, meshlink_node_t *source, const void *data, size_t len, const void *signature, size_t siglen) { + if(!mesh || !data || !len || !signature) { + meshlink_errno = MESHLINK_EINVAL; + return false; + } + + if(siglen != MESHLINK_SIGLEN) { + meshlink_errno = MESHLINK_EINVAL; + return false; + } + + struct node_t *n = (struct node_t *)source; + node_read_ecdsa_public_key(mesh, n); + if(!n->ecdsa) { + meshlink_errno = MESHLINK_EINTERNAL; + return false; + } + + return ecdsa_verify(((struct node_t *)source)->ecdsa, data, len, signature); } static bool refresh_invitation_key(meshlink_handle_t *mesh) { @@ -934,14 +1136,16 @@ static bool refresh_invitation_key(meshlink_handle_t *mesh) { 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; + meshlink_errno = MESHLINK_ESTORAGE; + return false; } // Count the number of valid invitations, clean up old ones DIR *dir = opendir(filename); if(!dir) { fprintf(stderr, "Could not read directory %s: %s\n", filename, strerror(errno)); - return NULL; + meshlink_errno = MESHLINK_ESTORAGE; + return false; } errno = 0; @@ -954,7 +1158,7 @@ static bool refresh_invitation_key(meshlink_handle_t *mesh) { 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(mesh->invitation_key && deadline < st.st_mtime) count++; @@ -969,6 +1173,7 @@ static bool refresh_invitation_key(meshlink_handle_t *mesh) { if(errno) { fprintf(stderr, "Error while reading directory %s: %s\n", filename, strerror(errno)); closedir(dir); + meshlink_errno = MESHLINK_ESTORAGE; return false; } @@ -993,18 +1198,21 @@ static bool refresh_invitation_key(meshlink_handle_t *mesh) { if(!f) { if(errno != ENOENT) { fprintf(stderr, "Could not read %s: %s\n", filename, strerror(errno)); - return NULL; + meshlink_errno = MESHLINK_ESTORAGE; + return false; } mesh->invitation_key = ecdsa_generate(); if(!mesh->invitation_key) { fprintf(stderr, "Could not generate a new key!\n"); - return NULL; + meshlink_errno = MESHLINK_EINTERNAL; + return false; } f = fopen(filename, "w"); if(!f) { fprintf(stderr, "Could not write %s: %s\n", filename, strerror(errno)); - return NULL; + meshlink_errno = MESHLINK_ESTORAGE; + return false; } chmod(filename, 0600); ecdsa_write_pem_private_key(mesh->invitation_key, f); @@ -1012,36 +1220,73 @@ static bool refresh_invitation_key(meshlink_handle_t *mesh) { } else { mesh->invitation_key = ecdsa_read_pem_private_key(f); fclose(f); - if(!mesh->invitation_key) + if(!mesh->invitation_key) { fprintf(stderr, "Could not read private key from %s\n", filename); + meshlink_errno = MESHLINK_ESTORAGE; + } } return mesh->invitation_key; } +bool meshlink_add_address(meshlink_handle_t *mesh, const char *address) { + if(!mesh || !address) { + meshlink_errno = MESHLINK_EINVAL; + return false; + } + + for(const char *p = address; *p; p++) { + if(isalnum(*p) || *p == '-' || *p == '.' || *p == ':') + continue; + fprintf(stderr, "Invalid character in address: %s\n", address); + meshlink_errno = MESHLINK_EINVAL; + return false; + } + + return append_config_file(mesh, mesh->self->name, "Address", address); +} + char *meshlink_invite(meshlink_handle_t *mesh, const char *name) { + if(!mesh) { + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + // Check validity of the new node's name if(!check_id(name)) { fprintf(stderr, "Invalid name for node.\n"); + meshlink_errno = MESHLINK_EINVAL; 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); + 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); + meshlink_errno = MESHLINK_EEXIST; 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); + meshlink_errno = MESHLINK_EEXIST; return NULL; } - if(!refresh_invitation_key(mesh)) + // Get the local address + char *address = get_my_hostname(mesh); + if(!address) { + fprintf(stderr, "No Address known for ourselves!\n"); + meshlink_errno = MESHLINK_ERESOLV; return NULL; + } + + if(!refresh_invitation_key(mesh)) { + meshlink_errno = MESHLINK_EINTERNAL; + return NULL; + } char hash[64]; @@ -1064,20 +1309,20 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) { b64encode_urlsafe(cookie, cookie, 18); + free(fingerprint); + // 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)); + meshlink_errno = MESHLINK_ESTORAGE; return NULL; } FILE *f = fdopen(ifd, "w"); if(!f) abort(); - // Get the local address - char *address = get_my_hostname(mesh); - // Fill in the details. fprintf(f, "Name = %s\n", name); //if(netname) @@ -1085,7 +1330,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)) { @@ -1098,24 +1344,33 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) { } } fclose(tc); + } else { + fprintf(stderr, "Could not create %s: %s\n", filename, strerror(errno)); + meshlink_errno = MESHLINK_ESTORAGE; + 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 char *url; xasprintf(&url, "%s/%s%s", address, hash, cookie); + free(address); return url; } bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { + if(!mesh || !invitation) { + meshlink_errno = MESHLINK_EINVAL; + return false; + } + //TODO: think of a better name for this variable, or of a different way to tokenize the invitation URL. char copy[strlen(invitation) + 1]; strcpy(copy, invitation); @@ -1147,7 +1402,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)) @@ -1155,28 +1410,43 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { // Generate a throw-away key for the invitation. ecdsa_t *key = ecdsa_generate(); - if(!key) + if(!key) { + meshlink_errno = MESHLINK_EINTERNAL; return false; + } char *b64key = ecdsa_get_base64_public_key(key); + //Before doing meshlink_join make sure we are not connected to another mesh + if ( mesh->threadstarted ){ + goto invalid; + } + // Connect to the meshlink daemon mentioned in the URL. struct addrinfo *ai = str2addrinfo(address, port, SOCK_STREAM); - if(!ai) + if(!ai) { + meshlink_errno = MESHLINK_ERESOLV; return false; + } mesh->sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); if(mesh->sock <= 0) { fprintf(stderr, "Could not open socket: %s\n", strerror(errno)); + freeaddrinfo(ai); + meshlink_errno = MESHLINK_ENETWORK; return false; } if(connect(mesh->sock, ai->ai_addr, ai->ai_addrlen)) { fprintf(stderr, "Could not connect to %s port %s: %s\n", address, port, strerror(errno)); closesocket(mesh->sock); + freeaddrinfo(ai); + meshlink_errno = MESHLINK_ENETWORK; return false; } + freeaddrinfo(ai); + fprintf(stderr, "Connected to %s port %s...\n", address, port); // Tell him we have an invitation, and give him our throw-away key. @@ -1186,15 +1456,19 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { 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); + meshlink_errno = MESHLINK_ENETWORK; return false; } + free(b64key); + char hisname[4096] = ""; int code, hismajor, hisminor = 0; if(!recvline(mesh, sizeof mesh->line) || sscanf(mesh->line, "%d %s %d.%d", &code, hisname, &hismajor, &hisminor) < 3 || code != 0 || hismajor != PROT_MAJOR || !check_id(hisname) || !recvline(mesh, sizeof mesh->line) || !rstrip(mesh->line) || sscanf(mesh->line, "%d ", &code) != 1 || code != ACK || strlen(mesh->line) < 3) { fprintf(stderr, "Cannot read greeting from peer\n"); closesocket(mesh->sock); + meshlink_errno = MESHLINK_ENETWORK; return false; } @@ -1203,25 +1477,33 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { char hishash[64]; if(sha512(fingerprint, strlen(fingerprint), hishash)) { fprintf(stderr, "Could not create hash\n%s\n", mesh->line + 2); + meshlink_errno = MESHLINK_EINTERNAL; return false; } if(memcmp(hishash, mesh->hash, 18)) { fprintf(stderr, "Peer has an invalid key!\n%s\n", mesh->line + 2); + meshlink_errno = MESHLINK_EPEER; return false; } ecdsa_t *hiskey = ecdsa_set_base64_public_key(fingerprint); - if(!hiskey) + if(!hiskey) { + meshlink_errno = MESHLINK_EINTERNAL; return false; + } // Start an SPTPS session - if(!sptps_start(&mesh->sptps, mesh, true, false, key, hiskey, "meshlink invitation", 15, invitation_send, invitation_receive)) + if(!sptps_start(&mesh->sptps, mesh, true, false, key, hiskey, "meshlink invitation", 15, invitation_send, invitation_receive)) { + meshlink_errno = MESHLINK_EINTERNAL; return false; + } // Feed rest of input buffer to SPTPS - if(!sptps_receive_data(&mesh->sptps, mesh->buffer, mesh->blen)) + if(!sptps_receive_data(&mesh->sptps, mesh->buffer, mesh->blen)) { + meshlink_errno = MESHLINK_EPEER; return false; + } int len; @@ -1230,11 +1512,14 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { if(errno == EINTR) continue; fprintf(stderr, "Error reading data from %s port %s: %s\n", address, port, strerror(errno)); + meshlink_errno = MESHLINK_ENETWORK; return false; } - if(!sptps_receive_data(&mesh->sptps, mesh->line, len)) + if(!sptps_receive_data(&mesh->sptps, mesh->line, len)) { + meshlink_errno = MESHLINK_EPEER; return false; + } } sptps_stop(&mesh->sptps); @@ -1244,25 +1529,180 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { if(!mesh->success) { fprintf(stderr, "Connection closed by peer, invitation cancelled.\n"); + meshlink_errno = MESHLINK_EPEER; return false; } return true; invalid: - fprintf(stderr, "Invalid invitation URL.\n"); + fprintf(stderr, "Invalid invitation URL or you are already connected to a Mesh ?\n"); + meshlink_errno = MESHLINK_EINVAL; return false; } char *meshlink_export(meshlink_handle_t *mesh) { - return NULL; + if(!mesh) { + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + char filename[PATH_MAX]; + snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->self->name); + FILE *f = fopen(filename, "r"); + if(!f) { + fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno)); + meshlink_errno = MESHLINK_ESTORAGE; + return NULL; + } + + fseek(f, 0, SEEK_END); + int fsize = ftell(f); + rewind(f); + + size_t len = fsize + 9 + strlen(mesh->self->name); + char *buf = xmalloc(len); + snprintf(buf, len, "Name = %s\n", mesh->self->name); + if(fread(buf + len - fsize - 1, fsize, 1, f) != 1) { + fprintf(stderr, "Error reading from %s: %s\n", filename, strerror(errno)); + fclose(f); + meshlink_errno = MESHLINK_ESTORAGE; + return NULL; + } + + fclose(f); + buf[len - 1] = 0; + return buf; } bool meshlink_import(meshlink_handle_t *mesh, const char *data) { - return false; + if(!mesh || !data) { + meshlink_errno = MESHLINK_EINVAL; + return false; + } + + if(strncmp(data, "Name = ", 7)) { + fprintf(stderr, "Invalid data\n"); + meshlink_errno = MESHLINK_EPEER; + return false; + } + + char *end = strchr(data + 7, '\n'); + if(!end) { + fprintf(stderr, "Invalid data\n"); + meshlink_errno = MESHLINK_EPEER; + return false; + } + + int len = end - (data + 7); + char name[len + 1]; + memcpy(name, data + 7, len); + name[len] = 0; + if(!check_id(name)) { + fprintf(stderr, "Invalid Name\n"); + meshlink_errno = MESHLINK_EPEER; + return false; + } + + char filename[PATH_MAX]; + snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name); + if(!access(filename, F_OK)) { + fprintf(stderr, "File %s already exists, not importing\n", filename); + meshlink_errno = MESHLINK_EEXIST; + return false; + } + + if(errno != ENOENT) { + fprintf(stderr, "Error accessing %s: %s\n", filename, strerror(errno)); + meshlink_errno = MESHLINK_ESTORAGE; + return false; + } + + FILE *f = fopen(filename, "w"); + if(!f) { + fprintf(stderr, "Could not create %s: %s\n", filename, strerror(errno)); + meshlink_errno = MESHLINK_ESTORAGE; + return false; + } + + fwrite(end + 1, strlen(end + 1), 1, f); + fclose(f); + + load_all_nodes(mesh); + + return true; } void meshlink_blacklist(meshlink_handle_t *mesh, meshlink_node_t *node) { + if(!mesh || !node) { + meshlink_errno = MESHLINK_EINVAL; + return; + } + + node_t *n; + n = (node_t*)node; + n->status.blacklisted=true; + fprintf(stderr, "Blacklisted %s.\n",node->name); + + //Make blacklisting persistent in the config file + append_config_file(mesh, n->name, "blacklisted", "yes"); + + return; +} + +void meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) { + if(!mesh || !node) { + meshlink_errno = MESHLINK_EINVAL; + return; + } + + node_t *n = (node_t *)node; + n->status.blacklisted = false; + + //TODO: remove blacklisted = yes from the config file + + return; +} + +/* Hint that a hostname may be found at an address + * See header file for detailed comment. + */ +extern void meshlink_hint_address(meshlink_handle_t *mesh, meshlink_node_t *node, struct sockaddr *addr) { + if(!mesh || !node || !addr) + return; + + char *addr_str = malloc(MAX_ADDRESS_LENGTH*sizeof(char)); + memset(addr_str, 0, MAX_ADDRESS_LENGTH*sizeof(char)); + + char *port_str = malloc(MAX_PORT_LENGTH*sizeof(char)); + memset(port_str, 0, MAX_PORT_LENGTH*sizeof(char)); + + // extra byte for a space, and one to make sure string is null-terminated + int full_addr_len = MAX_ADDRESS_LENGTH + MAX_PORT_LENGTH + 2; + + char *full_addr_str = malloc(full_addr_len*sizeof(char)); + memset(full_addr_str, 0, full_addr_len*sizeof(char)); + + // get address and port number + if(!get_ip_str(addr, addr_str, MAX_ADDRESS_LENGTH)) + goto fail; + if(!get_port_str(addr, port_str, MAX_ADDRESS_LENGTH)) + goto fail; + + // append_config_file expects an address, a space, and then a port number + strcat(full_addr_str, addr_str); + strcat(full_addr_str, " "); + strcat(full_addr_str, port_str); + + append_config_file(mesh, node->name, "Address", full_addr_str); + +fail: +done: + free(addr_str); + free(port_str); + free(full_addr_str); + + // @TODO do we want to fire off a connection attempt right away? } static void __attribute__((constructor)) meshlink_init(void) {