Remove invitation files when blacklisting or forgetting a node.

[meshlink] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 9cf76fbea7de8bd5dbda8a8a32e362b607674cc4..1ed5ff614a73514ba6bbcfcbcffb1e1a579b8471 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -397,7 +397,7 @@ bool config_rename(meshlink_handle_t *mesh, const char *old_conf_subdir, const c
        snprintf(old_path, sizeof(old_path), "%s" SLASH "%s", mesh->confbase, old_conf_subdir);
        snprintf(new_path, sizeof(new_path), "%s" SLASH "%s", mesh->confbase, new_conf_subdir);
 
-       return rename(old_path, new_path) == 0;
+       return rename(old_path, new_path) == 0 && sync_path(mesh->confbase);
 }
 
 bool config_sync(meshlink_handle_t *mesh, const char *conf_subdir) {
@@ -903,7 +903,7 @@ bool invitation_read(meshlink_handle_t *mesh, const char *conf_subdir, const cha
                return false;
        }
 
-       if(mesh->loop.now.tv_sec >= st.st_mtime + mesh->invitation_timeout) {
+       if(time(NULL) >= st.st_mtime + mesh->invitation_timeout) {
                logger(mesh, MESHLINK_ERROR, "Peer tried to use an outdated invitation file %s\n", name);
                fclose(f);
                unlink(used_path);
@@ -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;
+}