Remove invitation files when blacklisting or forgetting a node.

diff --git a/src/conf.c b/src/conf.c
index 7cf923bc88b087c1c9da0821146780a305977379..1ed5ff614a73514ba6bbcfcbcffb1e1a579b8471 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -1036,3 +1036,79 @@ size_t invitation_purge_old(meshlink_handle_t *mesh, time_t deadline) {
 
        return count;
 }
+
+/// Purge invitations for the given node
+size_t invitation_purge_node(meshlink_handle_t *mesh, const char *node_name) {
+       if(!mesh->confbase) {
+               return true;
+       }
+
+       char path[PATH_MAX];
+       make_invitation_path(mesh, "current", "", path, sizeof(path));
+
+       DIR *dir = opendir(path);
+
+       if(!dir) {
+               logger(mesh, MESHLINK_DEBUG, "Could not read directory %s: %s\n", path, strerror(errno));
+               meshlink_errno = MESHLINK_ESTORAGE;
+               return 0;
+       }
+
+       errno = 0;
+       size_t count = 0;
+       struct dirent *ent;
+
+       while((ent = readdir(dir))) {
+               if(strlen(ent->d_name) != 24) {
+                       continue;
+               }
+
+               char invname[PATH_MAX];
+
+               if(snprintf(invname, sizeof(invname), "%s" SLASH "%s", path, ent->d_name) >= PATH_MAX) {
+                       logger(mesh, MESHLINK_DEBUG, "Filename too long: %s" SLASH "%s", path, ent->d_name);
+                       continue;
+               }
+
+               FILE *f = fopen(invname, "r");
+
+               if(!f) {
+                       errno = 0;
+                       continue;
+               }
+
+               config_t config;
+
+               if(!config_read_file(mesh, f, &config, mesh->config_key)) {
+                       logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", invname, strerror(errno));
+                       config_free(&config);
+                       fclose(f);
+                       errno = 0;
+                       continue;
+               }
+
+               packmsg_input_t in = {config.buf, config.len};
+               packmsg_get_uint32(&in); // skip version
+               char *name = packmsg_get_str_dup(&in);
+
+               if(name && !strcmp(name, node_name)) {
+                       logger(mesh, MESHLINK_DEBUG, "Removing invitation for %s", node_name);
+                       unlink(invname);
+               }
+
+               free(name);
+               config_free(&config);
+               fclose(f);
+       }
+
+       if(errno) {
+               logger(mesh, MESHLINK_DEBUG, "Error while reading directory %s: %s\n", path, strerror(errno));
+               closedir(dir);
+               meshlink_errno = MESHLINK_ESTORAGE;
+               return 0;
+       }
+
+       closedir(dir);
+
+       return count;
+}

diff --git a/src/conf.h b/src/conf.h
index 32492ace11120c104f4dc13d1a3f74f051c9d908..b42a229b1a82856cc3a907f48783f2d19b923280 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -57,5 +57,6 @@ bool config_scan_all(struct meshlink_handle *mesh, const char *conf_subdir, cons
 bool invitation_read(struct meshlink_handle *mesh, const char *conf_subdir, const char *name, struct config_t *, void *key) __attribute__((__warn_unused_result__));
 bool invitation_write(struct meshlink_handle *mesh, const char *conf_subdir, const char *name, const struct config_t *, void *key) __attribute__((__warn_unused_result__));
 size_t invitation_purge_old(struct meshlink_handle *mesh, time_t deadline);
+size_t invitation_purge_node(struct meshlink_handle *mesh, const char *node_name);
 
 #endif

diff --git a/src/meshlink.c b/src/meshlink.c
index a8ed1fad3d20a0d39db9ad5f9c7a67763d904e6f..3f191f9a6579547bf9c0c79a4573e84e5a2892da 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -3430,6 +3430,9 @@ static bool blacklist(meshlink_handle_t *mesh, node_t *n) {
                mesh->node_status_cb(mesh, (meshlink_node_t *)n, false);
        }
 
+       /* Remove any outstanding invitations */
+       invitation_purge_node(mesh, n->name);
+
        return node_write_config(mesh, n) && config_sync(mesh, "current");
 }
 
@@ -3609,6 +3612,9 @@ bool meshlink_forget_node(meshlink_handle_t *mesh, meshlink_node_t *node) {
                return false;
        }
 
+       /* Delete any pending invitations */
+       invitation_purge_node(mesh, n->name);
+
        /* Delete the node struct and any remaining edges referencing this node */
        node_del(mesh, n);