}
/// Remove a directory recursively
-static void deltree(const char *dirname) {
+static bool deltree(const char *dirname) {
assert(dirname);
DIR *d = opendir(dirname);
while((ent = readdir(d))) {
if(ent->d_name[0] == '.') {
- continue;
+ if(!ent->d_name[1] || (ent->d_name[1] == '.' && !ent->d_name[2])) {
+ continue;
+ }
}
char filename[PATH_MAX];
snprintf(filename, sizeof(filename), "%s" SLASH "%s", dirname, ent->d_name);
if(unlink(filename)) {
- deltree(filename);
+ if(!deltree(filename)) {
+ return false;
+ }
}
}
closedir(d);
+ } else {
+ return errno == ENOENT;
}
- rmdir(dirname);
+ return rmdir(dirname) == 0;
}
-static bool sync_path(const char *pathname) {
+bool sync_path(const char *pathname) {
assert(pathname);
int fd = open(pathname, O_RDONLY);
return true;
}
- if(mkdir(mesh->confbase, 0700) && errno != EEXIST) {
- logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", mesh->confbase, strerror(errno));
- return false;
- }
-
char path[PATH_MAX];
// Create "current" sub-directory in the confbase
snprintf(path, sizeof(path), "%s" SLASH "%s", mesh->confbase, conf_subdir);
- deltree(path);
+
+ if(!deltree(path)) {
+ logger(mesh, MESHLINK_DEBUG, "Could not delete directory %s: %s\n", path, strerror(errno));
+ return false;
+ }
if(mkdir(path, 0700)) {
logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", path, strerror(errno));
assert(conf_subdir);
if(!confbase) {
- return false;
+ return true;
}
struct stat st;
}
snprintf(path, sizeof(path), "%s" SLASH "%s", confbase, conf_subdir);
- deltree(path);
- return true;
+
+ if(!deltree(path)) {
+ logger(NULL, MESHLINK_ERROR, "Cannot delete %s: %s\n", path, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
+ }
+
+ return sync_path(confbase);
}
static bool copytree(const char *src_dir_name, const void *src_key, const char *dst_dir_name, const void *dst_key) {
if(!src_dir) {
logger(NULL, MESHLINK_ERROR, "Could not open directory file %s\n", src_dir_name);
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
// Delete if already exists and create a new destination directory
- deltree(dst_dir_name);
+ if(!deltree(dst_dir_name)) {
+ logger(NULL, MESHLINK_ERROR, "Cannot delete %s: %s\n", dst_dir_name, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
+ }
if(mkdir(dst_dir_name, 0700)) {
logger(NULL, MESHLINK_ERROR, "Could not create directory %s\n", dst_filename);
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
if(ent->d_type == DT_DIR) {
if(!copytree(src_filename, src_key, dst_filename, dst_key)) {
logger(NULL, MESHLINK_ERROR, "Copying %s to %s failed\n", src_filename, dst_filename);
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
if(stat(src_filename, &st)) {
logger(NULL, MESHLINK_ERROR, "Could not stat file `%s': %s\n", src_filename, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
if(!f) {
logger(NULL, MESHLINK_ERROR, "Failed to open `%s': %s\n", src_filename, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
if(!config_read_file(NULL, f, &config, src_key)) {
logger(NULL, MESHLINK_ERROR, "Failed to read `%s': %s\n", src_filename, strerror(errno));
fclose(f);
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
if(fclose(f)) {
logger(NULL, MESHLINK_ERROR, "Failed to close `%s': %s\n", src_filename, strerror(errno));
config_free(&config);
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
if(!f) {
logger(NULL, MESHLINK_ERROR, "Failed to open `%s': %s", dst_filename, strerror(errno));
config_free(&config);
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
logger(NULL, MESHLINK_ERROR, "Failed to write `%s': %s", dst_filename, strerror(errno));
config_free(&config);
fclose(f);
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
if(fclose(f)) {
logger(NULL, MESHLINK_ERROR, "Failed to close `%s': %s", dst_filename, strerror(errno));
config_free(&config);
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
if(utime(dst_filename, ×)) {
logger(NULL, MESHLINK_ERROR, "Failed to utime `%s': %s", dst_filename, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
}
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) {
// Cleanup if current is existing with old and new
if(confbase_exists && confbase_decryptable) {
- config_destroy(mesh->confbase, "old");
- config_destroy(mesh->confbase, "new");
+ if(!config_destroy(mesh->confbase, "old") || !config_destroy(mesh->confbase, "new")) {
+ return false;
+ }
}
return confbase_exists;
}
-/// Lock the main configuration file.
+/// Lock the main configuration file. Creates confbase if necessary.
bool main_config_lock(meshlink_handle_t *mesh) {
if(!mesh->confbase) {
return true;
}
+ if(mkdir(mesh->confbase, 0700) && errno != EEXIST) {
+ logger(NULL, MESHLINK_ERROR, "Cannot create configuration directory %s: %s", mesh->confbase, strerror(errno));
+ meshlink_close(mesh);
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return NULL;
+ }
+
char path[PATH_MAX];
- make_main_path(mesh, "current", path, sizeof(path));
+ snprintf(path, sizeof(path), "%s" SLASH "meshlink.lock", mesh->confbase);
- mesh->conffile = fopen(path, "r");
+ mesh->lockfile = fopen(path, "w+");
- if(!mesh->conffile) {
+ if(!mesh->lockfile) {
logger(NULL, MESHLINK_ERROR, "Cannot not open %s: %s\n", path, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
#ifdef FD_CLOEXEC
- fcntl(fileno(mesh->conffile), F_SETFD, FD_CLOEXEC);
+ fcntl(fileno(mesh->lockfile), F_SETFD, FD_CLOEXEC);
#endif
#ifdef HAVE_MINGW
// TODO: use _locking()?
#else
- if(flock(fileno(mesh->conffile), LOCK_EX | LOCK_NB) != 0) {
+ if(flock(fileno(mesh->lockfile), LOCK_EX | LOCK_NB) != 0) {
logger(NULL, MESHLINK_ERROR, "Cannot lock %s: %s\n", path, strerror(errno));
- fclose(mesh->conffile);
- mesh->conffile = NULL;
+ fclose(mesh->lockfile);
+ mesh->lockfile = NULL;
meshlink_errno = MESHLINK_EBUSY;
return false;
}
/// Unlock the main configuration file.
void main_config_unlock(meshlink_handle_t *mesh) {
- if(mesh->conffile) {
- fclose(mesh->conffile);
- mesh->conffile = NULL;
+ if(mesh->lockfile) {
+ fclose(mesh->lockfile);
+ mesh->lockfile = NULL;
}
}
if(chacha_poly1305_encrypt_iv96(ctx, seqbuf, config->buf, config->len, buf, &len)) {
success = fwrite(seqbuf, sizeof(seqbuf), 1, f) == 1 && fwrite(buf, len, 1, f) == 1;
+
+ if(!success) {
+ logger(mesh, MESHLINK_ERROR, "Cannot write config file: %s", strerror(errno));
+ }
+
+ meshlink_errno = MESHLINK_ESTORAGE;
} else {
logger(mesh, MESHLINK_ERROR, "Cannot encrypt config file\n");
meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
+ if(fflush(f)) {
+ logger(mesh, MESHLINK_ERROR, "Failed to flush file: %s", strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
+ }
+
if(fsync(fileno(f))) {
logger(mesh, MESHLINK_ERROR, "Failed to sync file: %s\n", strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
if(!f) {
logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", tmp_path, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
return false;
}
- if(fsync(fileno(f))) {
- logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", tmp_path, strerror(errno));
- fclose(f);
- return false;
- }
-
if(fclose(f)) {
logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", tmp_path, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
if(rename(tmp_path, path)) {
logger(mesh, MESHLINK_ERROR, "Failed to rename `%s' to `%s': %s", tmp_path, path, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
+ }
+
+ return true;
+}
+
+/// Delete a host configuration file.
+bool config_delete(meshlink_handle_t *mesh, const char *conf_subdir, const char *name) {
+ assert(conf_subdir);
+ assert(name);
+
+ if(!mesh->confbase) {
+ return true;
+ }
+
+ char path[PATH_MAX];
+ make_host_path(mesh, conf_subdir, name, path, sizeof(path));
+
+ if(unlink(path) && errno != ENOENT) {
+ logger(mesh, MESHLINK_ERROR, "Failed to unlink `%s': %s", path, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
if(!f) {
logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", tmp_path, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
return false;
}
- if(fsync(fileno(f))) {
- logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", tmp_path, strerror(errno));
- fclose(f);
- return false;
- }
-
if(rename(tmp_path, path)) {
logger(mesh, MESHLINK_ERROR, "Failed to rename `%s' to `%s': %s", tmp_path, path, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
fclose(f);
return false;
}
if(fclose(f)) {
logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", tmp_path, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
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);
fclose(f);
- unlink(used_path);
+ if(unlink(used_path)) {
+ logger(mesh, MESHLINK_ERROR, "Failed to unlink `%s': %s", path, strerror(errno));
+ return false;
+ }
+
+ snprintf(path, sizeof(path), "%s" SLASH "%s" SLASH "invitations", mesh->confbase, conf_subdir);
+
+ if(!sync_path(path)) {
+ logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", path, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
+ }
+
return true;
}
if(!f) {
logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", path, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
return false;
}
- if(fsync(fileno(f))) {
- logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", path, strerror(errno));
- fclose(f);
+ if(fclose(f)) {
+ logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", path, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
- if(fclose(f)) {
- logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", path, strerror(errno));
+ snprintf(path, sizeof(path), "%s" SLASH "%s" SLASH "invitations", mesh->confbase, conf_subdir);
+
+ if(!sync_path(path)) {
+ logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", path, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
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;
+}
projects / meshlink / blobdiff