Ensure exported host files have a port in the canonical address.

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index cdf9b17dcd94fe1d77d31a4102b539cf4049f02e..b85795d465e3c64c59bc6c0990f3deb60dfd3f86 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -665,24 +665,28 @@ static bool finalize_join(join_state_t *state, const void *buf, uint16_t len) {
        }
 
        char *name = packmsg_get_str_dup(&in);
-       packmsg_skip_element(&in); /* submesh */
+       char *submesh_name = packmsg_get_str_dup(&in);
        dev_class_t devclass = packmsg_get_int32(&in);
        uint32_t count = packmsg_get_array(&in);
 
-       if(!name) {
-               logger(mesh, MESHLINK_DEBUG, "No Name found in invitation!\n");
+       if(!name || !check_id(name)) {
+               logger(mesh, MESHLINK_DEBUG, "No valid Name found in invitation!\n");
+               free(name);
+               free(submesh_name);
                return false;
        }
 
-       if(!check_id(name)) {
-               logger(mesh, MESHLINK_DEBUG, "Invalid Name found in invitation: %s!\n", name);
+       if(!submesh_name || (strcmp(submesh_name, CORE_MESH) && !check_id(submesh_name))) {
+               logger(mesh, MESHLINK_DEBUG, "No valid Submesh found in invitation!\n");
                free(name);
+               free(submesh_name);
                return false;
        }
 
        if(!count) {
                logger(mesh, MESHLINK_ERROR, "Incomplete invitation file!\n");
                free(name);
+               free(submesh_name);
                return false;
        }
 
@@ -690,6 +694,8 @@ static bool finalize_join(join_state_t *state, const void *buf, uint16_t len) {
        free(mesh->self->name);
        mesh->name = name;
        mesh->self->name = xstrdup(name);
+       mesh->self->submesh = strcmp(submesh_name, CORE_MESH) ? lookup_or_create_submesh(mesh, submesh_name) : NULL;
+       free(submesh_name);
        mesh->self->devclass = devclass == DEV_CLASS_UNKNOWN ? mesh->devclass : devclass;
 
        // Initialize configuration directory
@@ -1083,9 +1089,6 @@ static bool meshlink_read_config(meshlink_handle_t *mesh) {
                return false;
        }
 
-#if 0
-
-       // TODO: check this?
        if(mesh->name && strcmp(mesh->name, name)) {
                logger(NULL, MESHLINK_ERROR, "Configuration is for a different name (%s)!", name);
                meshlink_errno = MESHLINK_ESTORAGE;
@@ -1094,8 +1097,6 @@ static bool meshlink_read_config(meshlink_handle_t *mesh) {
                return false;
        }
 
-#endif
-
        free(mesh->name);
        mesh->name = name;
        xasprintf(&mesh->myport, "%u", myport);
@@ -1153,13 +1154,7 @@ meshlink_open_params_t *meshlink_open_params_init(const char *confbase, const ch
                return NULL;
        }
 
-       if(!name || !*name) {
-               logger(NULL, MESHLINK_ERROR, "No name given!\n");
-               meshlink_errno = MESHLINK_EINVAL;
-               return NULL;
-       };
-
-       if(!check_id(name)) {
+       if(name && !check_id(name)) {
                logger(NULL, MESHLINK_ERROR, "Invalid name given!\n");
                meshlink_errno = MESHLINK_EINVAL;
                return NULL;
@@ -1174,7 +1169,7 @@ meshlink_open_params_t *meshlink_open_params_init(const char *confbase, const ch
        meshlink_open_params_t *params = xzalloc(sizeof * params);
 
        params->confbase = xstrdup(confbase);
-       params->name = xstrdup(name);
+       params->name = name ? xstrdup(name) : NULL;
        params->appname = xstrdup(appname);
        params->devclass = devclass;
        params->netns = -1;
@@ -1347,6 +1342,36 @@ meshlink_handle_t *meshlink_open_encrypted(const char *confbase, const char *nam
 }
 
 meshlink_handle_t *meshlink_open_ephemeral(const char *name, const char *appname, dev_class_t devclass) {
+       if(!name) {
+               logger(NULL, MESHLINK_ERROR, "No name given!\n");
+               meshlink_errno = MESHLINK_EINVAL;
+               return NULL;
+       }
+
+       if(!check_id(name)) {
+               logger(NULL, MESHLINK_ERROR, "Invalid name given!\n");
+               meshlink_errno = MESHLINK_EINVAL;
+               return NULL;
+       }
+
+       if(!appname || !*appname) {
+               logger(NULL, MESHLINK_ERROR, "No appname given!\n");
+               meshlink_errno = MESHLINK_EINVAL;
+               return NULL;
+       }
+
+       if(strchr(appname, ' ')) {
+               logger(NULL, MESHLINK_ERROR, "Invalid appname given!\n");
+               meshlink_errno = MESHLINK_EINVAL;
+               return NULL;
+       }
+
+       if(devclass < 0 || devclass >= DEV_CLASS_COUNT) {
+               logger(NULL, MESHLINK_ERROR, "Invalid devclass given!\n");
+               meshlink_errno = MESHLINK_EINVAL;
+               return NULL;
+       }
+
        /* Create a temporary struct on the stack, to avoid allocating and freeing one. */
        meshlink_open_params_t params;
        memset(&params, 0, sizeof(params));
@@ -1360,11 +1385,9 @@ meshlink_handle_t *meshlink_open_ephemeral(const char *name, const char *appname
 }
 
 meshlink_handle_t *meshlink_open_ex(const meshlink_open_params_t *params) {
-       // Validate arguments provided by the application
-       bool usingname = false;
-
        logger(NULL, MESHLINK_DEBUG, "meshlink_open called\n");
 
+       // Validate arguments provided by the application
        if(!params->appname || !*params->appname) {
                logger(NULL, MESHLINK_ERROR, "No appname given!\n");
                meshlink_errno = MESHLINK_EINVAL;
@@ -1377,18 +1400,10 @@ meshlink_handle_t *meshlink_open_ex(const meshlink_open_params_t *params) {
                return NULL;
        }
 
-       if(!params->name || !*params->name) {
-               logger(NULL, MESHLINK_ERROR, "No name given!\n");
-               //return NULL;
-       } else { //check name only if there is a name != NULL
-
-               if(!check_id(params->name)) {
-                       logger(NULL, MESHLINK_ERROR, "Invalid name given!\n");
-                       meshlink_errno = MESHLINK_EINVAL;
-                       return NULL;
-               } else {
-                       usingname = true;
-               }
+       if(params->name && !check_id(params->name)) {
+               logger(NULL, MESHLINK_ERROR, "Invalid name given!\n");
+               meshlink_errno = MESHLINK_EINVAL;
+               return NULL;
        }
 
        if(params->devclass < 0 || params->devclass >= DEV_CLASS_COUNT) {
@@ -1427,9 +1442,7 @@ meshlink_handle_t *meshlink_open_ex(const meshlink_open_params_t *params) {
 
        memcpy(mesh->dev_class_traits, default_class_traits, sizeof(default_class_traits));
 
-       if(usingname) {
-               mesh->name = xstrdup(params->name);
-       }
+       mesh->name = params->name ? xstrdup(params->name) : NULL;
 
        // Hash the key
        if(params->key) {
@@ -1464,6 +1477,13 @@ meshlink_handle_t *meshlink_open_ex(const meshlink_open_params_t *params) {
        // If no configuration exists yet, create it.
 
        if(!meshlink_confbase_exists(mesh)) {
+               if(!mesh->name) {
+                       logger(NULL, MESHLINK_ERROR, "No configuration files found!\n");
+                       meshlink_close(mesh);
+                       meshlink_errno = MESHLINK_ESTORAGE;
+                       return NULL;
+               }
+
                if(!meshlink_setup(mesh)) {
                        logger(NULL, MESHLINK_ERROR, "Cannot create initial configuration\n");
                        meshlink_close(mesh);
@@ -2404,13 +2424,20 @@ bool meshlink_set_canonical_address(meshlink_handle_t *mesh, meshlink_node_t *no
        }
 
        if(!is_valid_hostname(address)) {
-               logger(mesh, MESHLINK_DEBUG, "Invalid character in address: %s\n", address);
+               logger(mesh, MESHLINK_DEBUG, "Invalid character in address: %s", address);
                meshlink_errno = MESHLINK_EINVAL;
                return false;
        }
 
+       if((node_t *)node != mesh->self && !port) {
+               logger(mesh, MESHLINK_DEBUG, "Missing port number!");
+               meshlink_errno = MESHLINK_EINVAL;
+               return false;
+
+       }
+
        if(port && !is_valid_port(port)) {
-               logger(mesh, MESHLINK_DEBUG, "Invalid character in port: %s\n", address);
+               logger(mesh, MESHLINK_DEBUG, "Invalid character in port: %s", address);
                meshlink_errno = MESHLINK_EINVAL;
                return false;
        }
@@ -3022,7 +3049,15 @@ char *meshlink_export(meshlink_handle_t *mesh) {
        packmsg_add_int32(&out, mesh->self->devclass);
        packmsg_add_bool(&out, mesh->self->status.blacklisted);
        packmsg_add_bin(&out, ecdsa_get_public_key(mesh->private_key), 32);
-       packmsg_add_str(&out, mesh->self->canonical_address ? mesh->self->canonical_address : "");
+
+       if(mesh->self->canonical_address && !strchr(mesh->self->canonical_address, ' ')) {
+               char *canonical_address = NULL;
+               xasprintf(&canonical_address, "%s %s", mesh->self->canonical_address, mesh->myport);
+               packmsg_add_str(&out, canonical_address);
+               free(canonical_address);
+       } else {
+               packmsg_add_str(&out, mesh->self->canonical_address ? mesh->self->canonical_address : "");
+       }
 
        uint32_t count = 0;