*/
#include "system.h"
+
#include <assert.h>
#include <sys/types.h>
#include <utime.h>
#include "crypto.h"
#include "logger.h"
#include "meshlink_internal.h"
-#include "xalloc.h"
#include "packmsg.h"
+#include "protocol.h"
+#include "xalloc.h"
-/// Generate a path to the main configuration file.
-static void make_main_path(meshlink_handle_t *mesh, const char *conf_subdir, char *path, size_t len) {
- assert(conf_subdir);
- assert(path);
- assert(len);
-
- snprintf(path, len, "%s" SLASH "%s" SLASH "meshlink.conf", mesh->confbase, conf_subdir);
-}
-
-/// Generate a path to a host configuration file.
-static void make_host_path(meshlink_handle_t *mesh, const char *conf_subdir, const char *name, char *path, size_t len) {
- assert(conf_subdir);
- assert(name);
- assert(path);
- assert(len);
-
- snprintf(path, len, "%s" SLASH "%s" SLASH "hosts" SLASH "%s", mesh->confbase, conf_subdir, name);
-}
-
-/// Generate a path to an unused invitation file.
-static void make_invitation_path(meshlink_handle_t *mesh, const char *conf_subdir, const char *name, char *path, size_t len) {
- assert(conf_subdir);
- assert(name);
- assert(path);
- assert(len);
-
- snprintf(path, len, "%s" SLASH "%s" SLASH "invitations" SLASH "%s", mesh->confbase, conf_subdir, name);
-}
-
-/// Generate a path to a used invitation file.
-static void make_used_invitation_path(meshlink_handle_t *mesh, const char *conf_subdir, const char *name, char *path, size_t len) {
- assert(conf_subdir);
- assert(name);
- assert(path);
- assert(len);
-
- snprintf(path, len, "%s" SLASH "%s" SLASH "invitations" SLASH "%s.used", mesh->confbase, conf_subdir, name);
-}
-
-/// Remove a directory recursively
-static bool deltree(const char *dirname) {
- assert(dirname);
-
- DIR *d = opendir(dirname);
-
- if(d) {
- struct dirent *ent;
-
- while((ent = readdir(d))) {
- if(ent->d_name[0] == '.') {
- 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)) {
- if(!deltree(filename)) {
- return false;
- }
- }
- }
-
- closedir(d);
- } else {
- return errno == ENOENT;
- }
-
- return rmdir(dirname) == 0;
-}
-
-bool sync_path(const char *pathname) {
+static bool sync_path(const char *pathname) {
assert(pathname);
int fd = open(pathname, O_RDONLY);
return true;
}
-/// Try decrypting the main configuration file from the given sub-directory.
-static bool main_config_decrypt(meshlink_handle_t *mesh, const char *conf_subdir) {
- assert(mesh->config_key);
- assert(mesh->confbase);
- assert(conf_subdir);
-
- config_t config;
-
- if(!main_config_read(mesh, conf_subdir, &config, mesh->config_key)) {
- logger(mesh, MESHLINK_ERROR, "Could not read main configuration file");
- return false;
- }
-
- packmsg_input_t in = {config.buf, config.len};
-
- uint32_t version = packmsg_get_uint32(&in);
- config_free(&config);
-
- return version == MESHLINK_CONFIG_VERSION;
+static bool invalidate_config_file(meshlink_handle_t *mesh, const char *name, size_t len) {
+ (void)len;
+ config_t empty_config = {NULL, 0};
+ return config_store(mesh, name, &empty_config);
}
-/// Create a fresh configuration directory
-bool config_init(meshlink_handle_t *mesh, const char *conf_subdir) {
- assert(conf_subdir);
-
- if(!mesh->confbase) {
+/// Wipe an existing configuration directory
+bool config_destroy(const struct meshlink_open_params *params) {
+ if(!params->confbase) {
return true;
}
- char path[PATH_MAX];
-
- // Create "current" sub-directory in the confbase
- snprintf(path, sizeof(path), "%s" SLASH "%s", mesh->confbase, conf_subdir);
-
- 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));
- return false;
- }
+ FILE *lockfile = NULL;
- make_host_path(mesh, conf_subdir, "", path, sizeof(path));
+ if(!params->load_cb) {
+ /* Exit early if the confbase directory itself doesn't exist */
+ if(access(params->confbase, F_OK) && errno == ENOENT) {
+ return true;
+ }
- if(mkdir(path, 0700)) {
- logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", path, strerror(errno));
- return false;
- }
+ /* Take the lock the same way meshlink_open() would. */
+ lockfile = fopen(params->lock_filename, "w+");
- make_invitation_path(mesh, conf_subdir, "", path, sizeof(path));
+ if(!lockfile) {
+ logger(NULL, MESHLINK_ERROR, "Could not open lock file %s: %s", params->lock_filename, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
+ }
- if(mkdir(path, 0700)) {
- logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", path, strerror(errno));
- return false;
- }
+#ifdef FD_CLOEXEC
+ fcntl(fileno(lockfile), F_SETFD, FD_CLOEXEC);
+#endif
- return true;
-}
+#ifdef HAVE_MINGW
+ // TODO: use _locking()?
+#else
-/// Wipe an existing configuration directory
-bool config_destroy(const char *confbase, const char *conf_subdir) {
- assert(conf_subdir);
+ if(flock(fileno(lockfile), LOCK_EX | LOCK_NB) != 0) {
+ logger(NULL, MESHLINK_ERROR, "Configuration directory %s still in use\n", params->lock_filename);
+ fclose(lockfile);
+ meshlink_errno = MESHLINK_EBUSY;
+ return false;
+ }
- if(!confbase) {
- return true;
+#endif
}
- struct stat st;
+ {
+ meshlink_handle_t tmp_mesh;
+ memset(&tmp_mesh, 0, sizeof tmp_mesh);
- char path[PATH_MAX];
-
- // Check the presence of configuration base sub directory.
- snprintf(path, sizeof(path), "%s" SLASH "%s", confbase, conf_subdir);
+ tmp_mesh.confbase = params->confbase;
+ tmp_mesh.name = params->name;
+ tmp_mesh.load_cb = params->load_cb;
+ tmp_mesh.store_cb = params->store_cb;
+ tmp_mesh.ls_cb = params->ls_cb;
- if(stat(path, &st)) {
- if(errno == ENOENT) {
- return true;
- } else {
- logger(NULL, MESHLINK_ERROR, "Cannot stat %s: %s\n", path, strerror(errno));
+ if(!config_ls(&tmp_mesh, invalidate_config_file)) {
+ logger(NULL, MESHLINK_ERROR, "Cannot remove configuration files\n");
+ fclose(lockfile);
meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
}
- // Remove meshlink.conf
- snprintf(path, sizeof(path), "%s" SLASH "%s" SLASH "meshlink.conf", confbase, conf_subdir);
-
- if(unlink(path)) {
- if(errno != ENOENT) {
- logger(NULL, MESHLINK_ERROR, "Cannot delete %s: %s\n", path, strerror(errno));
+ if(!params->load_cb) {
+ if(unlink(params->lock_filename) && errno != ENOENT) {
+ logger(NULL, MESHLINK_ERROR, "Cannot remove lock file %s: %s\n", params->lock_filename, strerror(errno));
+ fclose(lockfile);
meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
- }
-
- snprintf(path, sizeof(path), "%s" SLASH "%s", confbase, conf_subdir);
-
- 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) {
- assert(src_dir_name);
- assert(dst_dir_name);
-
- char src_filename[PATH_MAX];
- char dst_filename[PATH_MAX];
- struct dirent *ent;
- DIR *src_dir = opendir(src_dir_name);
+ fclose(lockfile);
- 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
- 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;
- }
-
- while((ent = readdir(src_dir))) {
- if(ent->d_name[0] == '.') {
- continue;
+ if(!sync_path(params->confbase)) {
+ logger(NULL, MESHLINK_ERROR, "Cannot sync directory %s: %s\n", params->confbase, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
}
- snprintf(dst_filename, sizeof(dst_filename), "%s" SLASH "%s", dst_dir_name, ent->d_name);
- snprintf(src_filename, sizeof(src_filename), "%s" SLASH "%s", src_dir_name, ent->d_name);
-
- 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(!sync_path(dst_filename)) {
- return false;
- }
- } else if(ent->d_type == DT_REG) {
- struct stat st;
- config_t config;
-
- 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;
- }
-
- FILE *f = fopen(src_filename, "r");
-
- 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;
- }
-
- f = fopen(dst_filename, "w");
-
- if(!f) {
- logger(NULL, MESHLINK_ERROR, "Failed to open `%s': %s", dst_filename, strerror(errno));
- config_free(&config);
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
- }
-
- if(!config_write_file(NULL, f, &config, dst_key)) {
- 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;
- }
-
- config_free(&config);
-
- struct utimbuf times;
- times.modtime = st.st_mtime;
- times.actime = st.st_atime;
-
- if(utime(dst_filename, ×)) {
- logger(NULL, MESHLINK_ERROR, "Failed to utime `%s': %s", dst_filename, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
- }
- }
+ rmdir(params->confbase);
}
- closedir(src_dir);
return true;
}
-bool config_copy(meshlink_handle_t *mesh, const char *src_dir_name, const void *src_key, const char *dst_dir_name, const void *dst_key) {
- assert(src_dir_name);
- assert(dst_dir_name);
+/// Read a blob of data.
+static bool load(meshlink_handle_t *mesh, const char *key, void *data, size_t *len) {
+ logger(mesh, MESHLINK_DEBUG, "load(%s, %p, %zu)", key ? key : "(null)", data, *len);
- char src_filename[PATH_MAX];
- char dst_filename[PATH_MAX];
+ if(mesh->load_cb) {
+ if(!mesh->load_cb(mesh, key, data, len)) {
+ logger(mesh, MESHLINK_ERROR, "Failed to open `%s'\n", key);
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
+ } else {
+ return true;
+ }
+ }
- snprintf(dst_filename, sizeof(dst_filename), "%s" SLASH "%s", mesh->confbase, dst_dir_name);
- snprintf(src_filename, sizeof(src_filename), "%s" SLASH "%s", mesh->confbase, src_dir_name);
+ char filename[PATH_MAX];
+ snprintf(filename, sizeof(filename), "%s/%s", mesh->confbase, key);
- return copytree(src_filename, src_key, dst_filename, dst_key);
-}
+ FILE *f = fopen(filename, "r");
-/// Check the presence of the main configuration file.
-bool main_config_exists(meshlink_handle_t *mesh, const char *conf_subdir) {
- assert(conf_subdir);
-
- if(!mesh->confbase) {
+ if(!f) {
+ logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s\n", filename, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
- char path[PATH_MAX];
- make_main_path(mesh, conf_subdir, path, sizeof(path));
- return access(path, F_OK) == 0;
-}
-
-bool config_rename(meshlink_handle_t *mesh, const char *old_conf_subdir, const char *new_conf_subdir) {
- assert(old_conf_subdir);
- assert(new_conf_subdir);
+ long actual_len;
- if(!mesh->confbase) {
+ if(fseek(f, 0, SEEK_END) || (actual_len = ftell(f)) <= 0 || fseek(f, 0, SEEK_SET)) {
+ logger(mesh, MESHLINK_ERROR, "Cannot get config file size: %s\n", strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ fclose(f);
return false;
}
- char old_path[PATH_MAX];
- char new_path[PATH_MAX];
-
- 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 && sync_path(mesh->confbase);
-}
-
-bool config_sync(meshlink_handle_t *mesh, const char *conf_subdir) {
- assert(conf_subdir);
+ size_t todo = (size_t)actual_len < *len ? (size_t)actual_len : *len;
+ *len = actual_len;
- if(!mesh->confbase || mesh->storage_policy == MESHLINK_STORAGE_DISABLED) {
+ if(!data) {
+ fclose(f);
return true;
}
- char path[PATH_MAX];
- snprintf(path, sizeof(path), "%s" SLASH "%s" SLASH "hosts", mesh->confbase, conf_subdir);
-
- if(!sync_path(path)) {
+ if(fread(data, todo, 1, f) != 1) {
+ logger(mesh, MESHLINK_ERROR, "Cannot read config file: %s\n", strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ fclose(f);
return false;
}
- snprintf(path, sizeof(path), "%s" SLASH "%s", mesh->confbase, conf_subdir);
-
- if(!sync_path(path)) {
+ if(fclose(f)) {
+ logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", filename, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
return true;
}
-bool meshlink_confbase_exists(meshlink_handle_t *mesh) {
- if(!mesh->confbase) {
- return false;
- }
-
- bool confbase_exists = false;
- bool confbase_decryptable = false;
+/// Store a blob of data.
+static bool store(meshlink_handle_t *mesh, const char *key, const void *data, size_t len) {
+ logger(mesh, MESHLINK_DEBUG, "store(%s, %p, %zu)", key ? key : "(null)", data, len);
- if(main_config_exists(mesh, "current")) {
- confbase_exists = true;
-
- if(mesh->config_key && main_config_decrypt(mesh, "current")) {
- confbase_decryptable = true;
+ if(mesh->store_cb) {
+ if(!mesh->store_cb(mesh, key, data, len)) {
+ logger(mesh, MESHLINK_ERROR, "Cannot write config file: %s", strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
+ } else {
+ return true;
}
}
- if(mesh->config_key && !confbase_decryptable && main_config_exists(mesh, "new")) {
- confbase_exists = true;
-
- if(main_config_decrypt(mesh, "new")) {
- if(!config_destroy(mesh->confbase, "current")) {
- return false;
- }
+ char filename[PATH_MAX];
+ snprintf(filename, sizeof(filename), "%s" SLASH "%s", mesh->confbase, key);
- if(!config_rename(mesh, "new", "current")) {
- return false;
- }
-
- confbase_decryptable = true;
+ if(!len) {
+ if(unlink(filename) && errno != ENOENT) {
+ logger(mesh, MESHLINK_ERROR, "Failed to remove `%s': %s", filename, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
+ } else {
+ return true;
}
}
- if(mesh->config_key && !confbase_decryptable && main_config_exists(mesh, "old")) {
- confbase_exists = true;
-
- if(main_config_decrypt(mesh, "old")) {
- if(!config_destroy(mesh->confbase, "current")) {
- return false;
- }
+ char tmp_filename[PATH_MAX];
+ snprintf(tmp_filename, sizeof(tmp_filename), "%s" SLASH "%s.tmp", mesh->confbase, key);
- if(!config_rename(mesh, "old", "current")) {
- return false;
- }
+ FILE *f = fopen(tmp_filename, "w");
- confbase_decryptable = true;
- }
+ if(!f) {
+ logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", tmp_filename, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
}
- // Cleanup if current is existing with old and new
- if(confbase_exists && confbase_decryptable) {
- if(!config_destroy(mesh->confbase, "old") || !config_destroy(mesh->confbase, "new")) {
- return false;
- }
+ if(fwrite(data, len, 1, f) != 1) {
+ logger(mesh, MESHLINK_ERROR, "Cannot write config file: %s", strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ fclose(f);
+ return false;
}
- return confbase_exists;
-}
-
-/// Lock the main configuration file. Creates confbase if necessary.
-bool main_config_lock(meshlink_handle_t *mesh, const char *lock_filename) {
- if(!mesh->confbase) {
- return true;
+ if(fflush(f)) {
+ logger(mesh, MESHLINK_ERROR, "Failed to flush file: %s", strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ fclose(f);
+ return false;
}
- assert(lock_filename);
-
- if(mkdir(mesh->confbase, 0700) && errno != EEXIST) {
- logger(NULL, MESHLINK_ERROR, "Cannot create configuration directory %s: %s", mesh->confbase, strerror(errno));
- meshlink_close(mesh);
+ if(fsync(fileno(f))) {
+ logger(mesh, MESHLINK_ERROR, "Failed to sync file: %s\n", strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
- return NULL;
+ fclose(f);
+ return false;
}
- mesh->lockfile = fopen(lock_filename, "w+");
-
- if(!mesh->lockfile) {
- logger(NULL, MESHLINK_ERROR, "Cannot not open %s: %s\n", lock_filename, strerror(errno));
+ if(fclose(f)) {
+ logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", filename, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
-#ifdef FD_CLOEXEC
- fcntl(fileno(mesh->lockfile), F_SETFD, FD_CLOEXEC);
-#endif
-
-#ifdef HAVE_MINGW
- // TODO: use _locking()?
-#else
-
- if(flock(fileno(mesh->lockfile), LOCK_EX | LOCK_NB) != 0) {
- logger(NULL, MESHLINK_ERROR, "Cannot lock %s: %s\n", lock_filename, strerror(errno));
- fclose(mesh->lockfile);
- mesh->lockfile = NULL;
- meshlink_errno = MESHLINK_EBUSY;
+ if(rename(tmp_filename, filename)) {
+ logger(mesh, MESHLINK_ERROR, "Failed to rename `%s' to `%s': %s", tmp_filename, filename, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
-#endif
-
return true;
}
-/// Unlock the main configuration file.
-void main_config_unlock(meshlink_handle_t *mesh) {
- if(mesh->lockfile) {
- fclose(mesh->lockfile);
- mesh->lockfile = NULL;
+/// Read a configuration file, decrypting it if necessary.
+bool config_load(meshlink_handle_t *mesh, const char *name, config_t *config) {
+ size_t buflen = 256;
+ uint8_t *buf = xmalloc(buflen);
+ size_t len = buflen;
+
+ if(!load(mesh, name, buf, &len)) {
+ return false;
}
-}
-/// Read a configuration file from a FILE handle.
-bool config_read_file(meshlink_handle_t *mesh, FILE *f, config_t *config, const void *key) {
- assert(f);
+ buf = xrealloc(buf, len);
- long len;
+ if(len > buflen) {
+ buflen = len;
- if(fseek(f, 0, SEEK_END) || !(len = ftell(f)) || fseek(f, 0, SEEK_SET)) {
- logger(mesh, MESHLINK_ERROR, "Cannot get config file size: %s\n", strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
+ if(!load(mesh, name, (void **)&buf, &len) || len != buflen) {
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
+ }
}
- uint8_t *buf = xmalloc(len);
+ if(mesh->config_key) {
+ if(len < 12 + 16) {
+ logger(mesh, MESHLINK_ERROR, "Cannot decrypt config file\n");
+ meshlink_errno = MESHLINK_ESTORAGE;
+ config_free(config);
+ return false;
+ }
- if(fread(buf, len, 1, f) != 1) {
- logger(mesh, MESHLINK_ERROR, "Cannot read config file: %s\n", strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
- }
+ size_t decrypted_len = len - 12 - 16;
+ uint8_t *decrypted = xmalloc(decrypted_len);
- if(key) {
- uint8_t *decrypted = xmalloc(len);
- size_t decrypted_len = len;
chacha_poly1305_ctx_t *ctx = chacha_poly1305_init();
- chacha_poly1305_set_key(ctx, key);
+ chacha_poly1305_set_key(ctx, mesh->config_key);
- if(len > 12 && chacha_poly1305_decrypt_iv96(ctx, buf, buf + 12, len - 12, decrypted, &decrypted_len)) {
+ if(chacha_poly1305_decrypt_iv96(ctx, buf, buf + 12, len - 12, decrypted, &decrypted_len)) {
chacha_poly1305_exit(ctx);
free(buf);
- config->buf = decrypted;
- config->len = decrypted_len;
- return true;
+ buf = decrypted;
+ len = decrypted_len;
} else {
logger(mesh, MESHLINK_ERROR, "Cannot decrypt config file\n");
meshlink_errno = MESHLINK_ESTORAGE;
return true;
}
-/// Write a configuration file to a FILE handle.
-bool config_write_file(meshlink_handle_t *mesh, FILE *f, const config_t *config, const void *key) {
- assert(f);
+bool config_exists(meshlink_handle_t *mesh, const char *name) {
+ size_t len = 0;
- if(key) {
- uint8_t buf[config->len + 16];
- size_t len = sizeof(buf);
- uint8_t seqbuf[12];
- randomize(&seqbuf, sizeof(seqbuf));
- chacha_poly1305_ctx_t *ctx = chacha_poly1305_init();
- chacha_poly1305_set_key(ctx, key);
- bool success = false;
+ return load(mesh, name, NULL, &len) && len;
+}
- 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;
+/// Write a configuration file, encrypting it if necessary.
+bool config_store(meshlink_handle_t *mesh, const char *name, const config_t *config) {
+ if(mesh->config_key) {
+ size_t encrypted_len = config->len + 16; // length of encrypted data
+ uint8_t encrypted[12 + encrypted_len]; // store sequence number at the start
- if(!success) {
- logger(mesh, MESHLINK_ERROR, "Cannot write config file: %s", strerror(errno));
- }
+ randomize(encrypted, 12);
+ chacha_poly1305_ctx_t *ctx = chacha_poly1305_init();
+ chacha_poly1305_set_key(ctx, mesh->config_key);
- meshlink_errno = MESHLINK_ESTORAGE;
- } else {
+ if(!chacha_poly1305_encrypt_iv96(ctx, encrypted, config->buf, config->len, encrypted + 12, &encrypted_len)) {
logger(mesh, MESHLINK_ERROR, "Cannot encrypt config file\n");
meshlink_errno = MESHLINK_ESTORAGE;
+ chacha_poly1305_exit(ctx);
+ return false;
}
chacha_poly1305_exit(ctx);
- return success;
- }
-
- if(fwrite(config->buf, config->len, 1, f) != 1) {
- logger(mesh, MESHLINK_ERROR, "Cannot write config file: %s", strerror(errno));
- 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;
+ return store(mesh, name, encrypted, 12 + encrypted_len);
}
- if(fsync(fileno(f))) {
- logger(mesh, MESHLINK_ERROR, "Failed to sync file: %s\n", strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
- }
-
- return true;
+ return store(mesh, name, config->buf, config->len);
}
/// Free resources of a loaded configuration file.
config->len = 0;
}
-/// Check the presence of a host configuration file.
-bool config_exists(meshlink_handle_t *mesh, const char *conf_subdir, const char *name) {
- assert(conf_subdir);
+bool config_ls(meshlink_handle_t *mesh, config_scan_action_t action) {
+ logger(mesh, MESHLINK_DEBUG, "ls(%p)", (void *)(intptr_t)action);
if(!mesh->confbase) {
- return false;
- }
-
- char path[PATH_MAX];
- make_host_path(mesh, conf_subdir, name, path, sizeof(path));
-
- return access(path, F_OK) == 0;
-}
-
-/// Read a host configuration file.
-bool config_read(meshlink_handle_t *mesh, const char *conf_subdir, const char *name, config_t *config, void *key) {
- assert(conf_subdir);
-
- if(!mesh->confbase) {
- return false;
- }
-
- char path[PATH_MAX];
- make_host_path(mesh, conf_subdir, name, path, sizeof(path));
-
- FILE *f = fopen(path, "r");
-
- if(!f) {
- logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", path, strerror(errno));
- return false;
- }
-
- if(!config_read_file(mesh, f, config, key)) {
- logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", path, strerror(errno));
- fclose(f);
- return false;
+ return true;
}
- fclose(f);
-
- return true;
-}
-
-bool config_scan_all(meshlink_handle_t *mesh, const char *conf_subdir, const char *conf_type, config_scan_action_t action, void *arg) {
- assert(conf_subdir);
- assert(conf_type);
-
- if(!mesh->confbase) {
- return true;
+ if(mesh->ls_cb) {
+ return mesh->ls_cb(mesh, action);
}
DIR *dir;
struct dirent *ent;
- char dname[PATH_MAX];
- snprintf(dname, sizeof(dname), "%s" SLASH "%s" SLASH "%s", mesh->confbase, conf_subdir, conf_type);
- dir = opendir(dname);
+ dir = opendir(mesh->confbase);
if(!dir) {
- logger(mesh, MESHLINK_ERROR, "Could not open %s: %s", dname, strerror(errno));
+ logger(mesh, MESHLINK_ERROR, "Could not open %s: %s", mesh->confbase, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
continue;
}
- if(!action(mesh, ent->d_name, arg)) {
+ if(!action(mesh, ent->d_name, 0)) {
closedir(dir);
return false;
}
return true;
}
-/// Write a host configuration file.
-bool config_write(meshlink_handle_t *mesh, const char *conf_subdir, const char *name, const config_t *config, void *key) {
- assert(conf_subdir);
- assert(name);
- assert(config);
-
- if(!mesh->confbase) {
- return true;
- }
-
- char path[PATH_MAX];
- char tmp_path[PATH_MAX + 4];
- make_host_path(mesh, conf_subdir, name, path, sizeof(path));
- snprintf(tmp_path, sizeof(tmp_path), "%s.tmp", path);
-
- FILE *f = fopen(tmp_path, "w");
+/// Re-encrypt a configuration file.
+static bool change_key(meshlink_handle_t *mesh, const char *name, size_t len) {
+ (void)len;
+ config_t config;
- if(!f) {
- logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", tmp_path, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
+ if(!config_load(mesh, name, &config)) {
return false;
}
- if(!config_write_file(mesh, f, config, key)) {
- logger(mesh, MESHLINK_ERROR, "Failed to write `%s': %s", tmp_path, strerror(errno));
- fclose(f);
- return false;
- }
+ size_t name_len = strlen(name);
+ char new_name[name_len + 3];
+ memcpy(new_name, name, name_len);
- if(fclose(f)) {
- logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", tmp_path, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
+ if(!strcmp(name, "meshlink.conf")) {
+ // Update meshlink.conf in-place
+ new_name[name_len] = 0;
+ } else {
+ memcpy(new_name + name_len, ".r", 3);
}
- 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;
- }
+ void *orig_key = mesh->config_key;
+ mesh->config_key = mesh->ls_priv;
+ bool result = config_store(mesh, new_name, &config);
+ mesh->config_key = orig_key;
- return true;
+ return result;
}
-/// Delete a host configuration file.
-bool config_delete(meshlink_handle_t *mesh, const char *conf_subdir, const char *name) {
- assert(conf_subdir);
- assert(name);
+extern bool (*devtool_keyrotate_probe)(int stage);
- if(!mesh->confbase) {
+static bool change_node_key(meshlink_handle_t *mesh, const char *name, size_t len) {
+ /* Skip the main config and lock files */
+ if(!strcmp(name, "meshlink.conf") || !strcmp(name, "meshlink.lock")) {
return true;
}
- char path[PATH_MAX];
- make_host_path(mesh, conf_subdir, name, path, sizeof(path));
+ /* Skip any already rotated file */
+ int namelen = strlen(name);
- if(unlink(path) && errno != ENOENT) {
- logger(mesh, MESHLINK_ERROR, "Failed to unlink `%s': %s", path, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
+ if(namelen >= 2 && !strcmp(name + namelen - 2, ".r")) {
+ return true;
}
- return true;
-}
-
-/// Read the main configuration file.
-bool main_config_read(meshlink_handle_t *mesh, const char *conf_subdir, config_t *config, void *key) {
- assert(conf_subdir);
- assert(config);
-
- if(!mesh->confbase) {
+ if(!devtool_keyrotate_probe(0)) {
return false;
}
- char path[PATH_MAX];
- make_main_path(mesh, conf_subdir, path, sizeof(path));
+ return change_key(mesh, name, len);
+}
- FILE *f = fopen(path, "r");
+static bool cleanup_old_file(meshlink_handle_t *mesh, const char *name, size_t len) {
+ (void)len;
+ size_t name_len = strlen(name);
- if(!f) {
- logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", path, strerror(errno));
- return false;
+ if(name_len < 3 || strcmp(name + name_len - 2, ".r")) {
+ return true;
}
- if(!config_read_file(mesh, f, config, key)) {
- logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", path, strerror(errno));
- fclose(f);
- return false;
+ config_t config;
+
+ if(!config_load(mesh, name, &config)) {
+ store(mesh, name, NULL, 0);
+ return true;
}
- fclose(f);
+ char new_name[name_len - 1];
+ memcpy(new_name, name, name_len - 2);
+ new_name[name_len - 2] = '\0';
- return true;
+ return config_store(mesh, new_name, &config) && store(mesh, name, NULL, 0);
}
-/// Write the main configuration file.
-bool main_config_write(meshlink_handle_t *mesh, const char *conf_subdir, const config_t *config, void *key) {
- assert(conf_subdir);
- assert(config);
-
- if(!mesh->confbase) {
- return true;
- }
-
- char path[PATH_MAX];
- char tmp_path[PATH_MAX + 4];
- make_main_path(mesh, conf_subdir, path, sizeof(path));
- snprintf(tmp_path, sizeof(tmp_path), "%s.tmp", path);
+bool config_cleanup_old_files(meshlink_handle_t *mesh) {
+ return config_ls(mesh, cleanup_old_file);
+}
- FILE *f = fopen(tmp_path, "w");
+bool config_change_key(meshlink_handle_t *mesh, void *new_key) {
+ mesh->ls_priv = new_key;
- if(!f) {
- logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", tmp_path, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
+ if(!config_ls(mesh, change_node_key)) {
return false;
}
- if(!config_write_file(mesh, f, config, key)) {
- logger(mesh, MESHLINK_ERROR, "Failed to write `%s': %s", tmp_path, strerror(errno));
- fclose(f);
+ if(!devtool_keyrotate_probe(1)) {
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);
+ if(!change_key(mesh, "meshlink.conf", 0)) {
return false;
}
- if(fclose(f)) {
- logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", tmp_path, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
+ free(mesh->config_key);
+ mesh->config_key = new_key;
+
+ if(!devtool_keyrotate_probe(2)) {
+ return true;
}
+ config_cleanup_old_files(mesh);
+
+ devtool_keyrotate_probe(3);
+
return true;
}
-/// Read an invitation file from the confbase sub-directory, and immediately delete it.
-bool invitation_read(meshlink_handle_t *mesh, const char *conf_subdir, const char *name, config_t *config, void *key) {
- assert(conf_subdir);
- assert(name);
- assert(config);
+/// Migrate old format configuration directory
+static bool config_migrate(meshlink_handle_t *mesh) {
+ char base[PATH_MAX];
+ char path[PATH_MAX];
+ char new_path[PATH_MAX];
- if(!mesh->confbase) {
- return false;
- }
+ // Check if there we need to migrate
- char path[PATH_MAX];
- char used_path[PATH_MAX];
- make_invitation_path(mesh, conf_subdir, name, path, sizeof(path));
- make_used_invitation_path(mesh, conf_subdir, name, used_path, sizeof(used_path));
-
- // Atomically rename the invitation file
- if(rename(path, used_path)) {
- if(errno == ENOENT) {
- logger(mesh, MESHLINK_ERROR, "Peer tried to use non-existing invitation %s\n", name);
- } else {
- logger(mesh, MESHLINK_ERROR, "Error trying to rename invitation %s\n", name);
- }
+ snprintf(path, sizeof path, "%s/meshlink.conf", mesh->confbase);
- return false;
+ if(access(path, F_OK) == 0) {
+ return true;
}
- FILE *f = fopen(used_path, "r");
+ snprintf(path, sizeof path, "%s/current/meshlink.conf", mesh->confbase);
- if(!f) {
- logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", path, strerror(errno));
- return false;
+ if(access(path, F_OK) == -1) {
+ return true;
}
- // Check the timestamp
- struct stat st;
+ // Migrate host config files
- if(fstat(fileno(f), &st)) {
- logger(mesh, MESHLINK_ERROR, "Could not stat invitation file %s\n", name);
- fclose(f);
- unlink(used_path);
- return false;
- }
+ DIR *dir;
+ struct dirent *ent;
- 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);
- return false;
- }
+ snprintf(base, sizeof base, "%s/current/hosts", mesh->confbase);
+ dir = opendir(base);
- if(!config_read_file(mesh, f, config, key)) {
- logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", path, strerror(errno));
- fclose(f);
- unlink(used_path);
+ if(!dir) {
+ logger(NULL, MESHLINK_ERROR, "Failed to migrate %s to %s: %s", base, mesh->confbase, strerror(errno));
return false;
}
- fclose(f);
+ while((ent = readdir(dir))) {
+ if(ent->d_name[0] == '.') {
+ continue;
+ }
- if(unlink(used_path)) {
- logger(mesh, MESHLINK_ERROR, "Failed to unlink `%s': %s", path, strerror(errno));
- return false;
- }
+ if(!check_id(ent->d_name)) {
+ continue;
+ }
- snprintf(path, sizeof(path), "%s" SLASH "%s" SLASH "invitations", mesh->confbase, conf_subdir);
+ snprintf(path, sizeof path, "%s/current/hosts/%s", mesh->confbase, ent->d_name);
+ snprintf(new_path, sizeof new_path, "%s/%s", mesh->confbase, ent->d_name);
- if(!sync_path(path)) {
- logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", path, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
+ if(rename(path, new_path) == -1) {
+ logger(NULL, MESHLINK_ERROR, "Failed to migrate %s to %s: %s", path, new_path, strerror(errno));
+ closedir(dir);
+ return false;
+ }
}
- return true;
-}
+ closedir(dir);
-/// Write an invitation file.
-bool invitation_write(meshlink_handle_t *mesh, const char *conf_subdir, const char *name, const config_t *config, void *key) {
- assert(conf_subdir);
- assert(name);
- assert(config);
+ // Migrate invitation files
- if(!mesh->confbase) {
+ snprintf(base, sizeof base, "%s/current/invitations", mesh->confbase);
+ dir = opendir(base);
+
+ if(!dir) {
+ logger(NULL, MESHLINK_ERROR, "Failed to migrate %s to %s: %s", base, mesh->confbase, strerror(errno));
return false;
}
- char path[PATH_MAX];
- make_invitation_path(mesh, conf_subdir, name, path, sizeof(path));
+ while((ent = readdir(dir))) {
+ if(ent->d_name[0] == '.') {
+ continue;
+ }
- FILE *f = fopen(path, "w");
+ snprintf(path, sizeof path, "%s/current/invitations/%s", mesh->confbase, ent->d_name);
+ snprintf(new_path, sizeof new_path, "%s/%s.inv", mesh->confbase, ent->d_name);
- if(!f) {
- logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", path, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
+ if(rename(path, new_path) == -1) {
+ logger(NULL, MESHLINK_ERROR, "Failed to migrate %s to %s: %s", path, new_path, strerror(errno));
+ closedir(dir);
+ return false;
+ }
}
- if(!config_write_file(mesh, f, config, key)) {
- logger(mesh, MESHLINK_ERROR, "Failed to write `%s': %s", path, strerror(errno));
- fclose(f);
- return false;
- }
+ closedir(dir);
- if(fclose(f)) {
- logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", path, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
- }
+ // Migrate meshlink.conf
- snprintf(path, sizeof(path), "%s" SLASH "%s" SLASH "invitations", mesh->confbase, conf_subdir);
+ snprintf(path, sizeof path, "%s/current/meshlink.conf", mesh->confbase);
+ snprintf(new_path, sizeof new_path, "%s/meshlink.conf", mesh->confbase);
- if(!sync_path(path)) {
- logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", path, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
+ if(rename(path, new_path) == -1) {
+ logger(NULL, MESHLINK_ERROR, "Failed to migrate %s to %s: %s", path, new_path, strerror(errno));
return false;
}
+ // Remove directories that should now be empty
+
+ snprintf(base, sizeof base, "%s/current/hosts", mesh->confbase);
+ rmdir(base);
+ snprintf(base, sizeof base, "%s/current/invitations", mesh->confbase);
+ rmdir(base);
+ snprintf(base, sizeof base, "%s/current", mesh->confbase);
+ rmdir(base);
+
+ // Done.
+
+
return true;
}
-/// Purge old invitation files
-size_t invitation_purge_old(meshlink_handle_t *mesh, time_t deadline) {
+/// Initialize the configuration directory
+bool config_init(meshlink_handle_t *mesh, const struct meshlink_open_params *params) {
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;
- }
+ if(!mesh->load_cb) {
+ 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;
+ }
- errno = 0;
- size_t count = 0;
- struct dirent *ent;
+ mesh->lockfile = fopen(params->lock_filename, "w+");
- while((ent = readdir(dir))) {
- if(strlen(ent->d_name) != 24) {
- continue;
+ if(!mesh->lockfile) {
+ logger(NULL, MESHLINK_ERROR, "Cannot not open %s: %s\n", params->lock_filename, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
}
- char invname[PATH_MAX];
- struct stat st;
+#ifdef FD_CLOEXEC
+ fcntl(fileno(mesh->lockfile), F_SETFD, FD_CLOEXEC);
+#endif
- 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;
+#ifdef HAVE_FLOCK
+
+ if(flock(fileno(mesh->lockfile), LOCK_EX | LOCK_NB) != 0) {
+ logger(NULL, MESHLINK_ERROR, "Cannot lock %s: %s\n", params->lock_filename, strerror(errno));
+ fclose(mesh->lockfile);
+ mesh->lockfile = NULL;
+ meshlink_errno = MESHLINK_EBUSY;
+ return false;
}
- if(!stat(invname, &st)) {
- if(mesh->invitation_key && deadline < st.st_mtime) {
- count++;
- } else {
- unlink(invname);
- }
- } else {
- logger(mesh, MESHLINK_DEBUG, "Could not stat %s: %s\n", invname, strerror(errno));
- errno = 0;
+#endif
+
+ if(!config_migrate(mesh)) {
+ return false;
}
}
- if(errno) {
- logger(mesh, MESHLINK_DEBUG, "Error while reading directory %s: %s\n", path, strerror(errno));
- closedir(dir);
- meshlink_errno = MESHLINK_ESTORAGE;
- return 0;
+ return true;
+}
+
+void config_exit(meshlink_handle_t *mesh) {
+ if(mesh->lockfile) {
+ fclose(mesh->lockfile);
+ mesh->lockfile = NULL;
}
+}
- closedir(dir);
+static void make_invitation_path(const char *name, char *path, size_t len) {
+ assert(name);
+ assert(path);
+ assert(len);
- return count;
+ snprintf(path, len, "%s.inv", name);
}
-/// Purge invitations for the given node
-size_t invitation_purge_node(meshlink_handle_t *mesh, const char *node_name) {
- if(!mesh->confbase) {
- return true;
+/// Read an invitation file from the confbase sub-directory, and immediately delete it.
+bool invitation_read(meshlink_handle_t *mesh, const char *name, config_t *config) {
+ assert(name);
+ assert(config);
+
+ char invitation_name[PATH_MAX];
+ make_invitation_path(name, invitation_name, sizeof(invitation_name));
+
+ if(!config_load(mesh, invitation_name, config)) {
+ logger(mesh, MESHLINK_ERROR, "Could not read invitation file %s\n", invitation_name);
+ return false;
}
- char path[PATH_MAX];
- make_invitation_path(mesh, "current", "", path, sizeof(path));
+ // Make sure the file is deleted so it cannot be reused
+ if(!invalidate_config_file(mesh, invitation_name, 0)) {
+ logger(mesh, MESHLINK_ERROR, "Could not delete invitation file %s\n", invitation_name);
+ config_free(config);
+ return false;
+ }
- DIR *dir = opendir(path);
+ return true;
+}
- if(!dir) {
- logger(mesh, MESHLINK_DEBUG, "Could not read directory %s: %s\n", path, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- return 0;
+/// Write an invitation file.
+bool invitation_write(meshlink_handle_t *mesh, const char *name, const config_t *config) {
+ assert(name);
+ assert(config);
+
+ char invitation_name[PATH_MAX];
+ make_invitation_path(name, invitation_name, sizeof(invitation_name));
+
+ if(!config_store(mesh, invitation_name, config)) {
+ logger(mesh, MESHLINK_ERROR, "Could not write invitation file %s\n", invitation_name);
+ return false;
}
- errno = 0;
- size_t count = 0;
- struct dirent *ent;
+ return true;
+}
- while((ent = readdir(dir))) {
- if(strlen(ent->d_name) != 24) {
- continue;
- }
+typedef struct {
+ time_t deadline;
+ const char *node_name;
+ size_t count;
+} purge_info_t;
- char invname[PATH_MAX];
+static bool purge_cb(meshlink_handle_t *mesh, const char *name, size_t len) {
+ (void)len;
+ purge_info_t *info = mesh->ls_priv;
+ size_t namelen = strlen(name);
- 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;
- }
+ // Skip anything that is not an invitation
+ if(namelen < 4 || strcmp(name + namelen - 4, ".inv") != 0) {
+ return true;
+ }
- FILE *f = fopen(invname, "r");
+ config_t config;
- if(!f) {
- errno = 0;
- continue;
- }
+ if(!config_load(mesh, name, &config)) {
+ logger(mesh, MESHLINK_ERROR, "Could not read invitation file %s\n", name);
+ // Purge anything we can't read
+ invalidate_config_file(mesh, name, 0);
+ info->count++;
+ return true;
+ }
- config_t config;
+ packmsg_input_t in = {config.buf, config.len};
+ uint32_t version = packmsg_get_uint32(&in);
+ time_t timestamp = packmsg_get_int64(&in);
- 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;
- }
+ if(!packmsg_input_ok(&in) || version != MESHLINK_INVITATION_VERSION) {
+ logger(mesh, MESHLINK_ERROR, "Invalid invitation file %s\n", name);
+ invalidate_config_file(mesh, name, 0);
+ info->count++;
+ }
- packmsg_input_t in = {config.buf, config.len};
- packmsg_get_uint32(&in); // skip version
- char *name = packmsg_get_str_dup(&in);
+ if(info->node_name) {
+ char *node_name = packmsg_get_str_dup(&in);
- if(name && !strcmp(name, node_name)) {
- logger(mesh, MESHLINK_DEBUG, "Removing invitation for %s", node_name);
- unlink(invname);
+ if(!node_name || strcmp(node_name, info->node_name) == 0) {
+ invalidate_config_file(mesh, name, 0);
+ info->count++;
}
- free(name);
- config_free(&config);
- fclose(f);
+ free(node_name);
+ } else if(timestamp < info->deadline) {
+ invalidate_config_file(mesh, name, 0);
+ info->count++;
}
- if(errno) {
- logger(mesh, MESHLINK_DEBUG, "Error while reading directory %s: %s\n", path, strerror(errno));
- closedir(dir);
- meshlink_errno = MESHLINK_ESTORAGE;
- return 0;
+ config_free(&config);
+ return true;
+}
+
+/// Purge old invitation files
+size_t invitation_purge_old(meshlink_handle_t *mesh, time_t deadline) {
+ purge_info_t info = {deadline, NULL, 0};
+ mesh->ls_priv = &info;
+
+ if(!config_ls(mesh, purge_cb)) {
+ /* Ignore any failure */
}
- closedir(dir);
+ return info.count;
+}
+
+/// Purge invitations for the given node
+size_t invitation_purge_node(meshlink_handle_t *mesh, const char *node_name) {
+ purge_info_t info = {0, node_name, 0};
+ mesh->ls_priv = &info;
+
+ if(!config_ls(mesh, purge_cb)) {
+ /* Ignore any failure */
+ }
- return count;
+ return info.count;
}
return true;
}
+ /* Write our own host config file */
+ if(!node_write_config(mesh, mesh->self, true)) {
+ return false;
+ }
+
uint8_t buf[4096];
/* Write the main config file */
config_t config = {buf, packmsg_output_size(&out, buf)};
- if(!main_config_write(mesh, "current", &config, mesh->config_key)) {
- return false;
- }
-
- /* Write our own host config file */
- if(!node_write_config(mesh, mesh->self, true)) {
- return false;
- }
-
- return true;
+ return config_store(mesh, "meshlink.conf", &config);
}
typedef struct {
return false;
}
+ packmsg_skip_element(&in); // timestamp
char *name = packmsg_get_str_dup(&in);
char *submesh_name = packmsg_get_str_dup(&in);
dev_class_t devclass = packmsg_get_int32(&in);
free(submesh_name);
mesh->self->devclass = devclass == DEV_CLASS_UNKNOWN ? mesh->devclass : devclass;
- // Initialize configuration directory
- if(!config_init(mesh, "current")) {
- return false;
- }
-
if(!write_main_config_files(mesh)) {
return false;
}
node_add(mesh, n);
}
- /* Ensure the configuration directory metadata is on disk */
- if(!config_sync(mesh, "current") || (mesh->confbase && !sync_path(mesh->confbase))) {
- return false;
- }
-
if(!mesh->inviter_commits_first) {
devtool_set_inviter_commits_first(false);
}
}
}
-static bool meshlink_setup(meshlink_handle_t *mesh) {
- if(!config_destroy(mesh->confbase, "new")) {
- logger(mesh, MESHLINK_ERROR, "Could not delete configuration in %s/new: %s\n", mesh->confbase, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
- }
+static bool invalidate_config_file(meshlink_handle_t *mesh, const char *name, size_t len) {
+ (void)len;
- if(!config_destroy(mesh->confbase, "old")) {
- logger(mesh, MESHLINK_ERROR, "Could not delete configuration in %s/old: %s\n", mesh->confbase, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
+ if(!check_id(name)) {
+ return true;
}
- if(!config_init(mesh, "current")) {
- logger(mesh, MESHLINK_ERROR, "Could not set up configuration in %s/current: %s\n", mesh->confbase, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
+ config_t empty_config = {NULL, 0};
+ return config_store(mesh, name, &empty_config);
+}
+
+static bool meshlink_setup(meshlink_handle_t *mesh) {
+ // Destroy stray config files
+ if(!config_ls(mesh, invalidate_config_file)) {
return false;
}
return false;
}
- /* Ensure the configuration directory metadata is on disk */
- if(!config_sync(mesh, "current")) {
- return false;
- }
-
return true;
}
static bool meshlink_read_config(meshlink_handle_t *mesh) {
config_t config;
- if(!main_config_read(mesh, "current", &config, mesh->config_key)) {
+ if(!config_load(mesh, "meshlink.conf", &config)) {
logger(NULL, MESHLINK_ERROR, "Could not read main configuration file!");
return false;
}
mesh->invitation_key = ecdsa_set_private_key(invitation_key);
config_free(&config);
+ config_cleanup_old_files(mesh);
+
/* Create a node for ourself and read our host configuration file */
mesh->self = new_node();
return true;
}
+bool meshlink_open_params_set_storage_callbacks(meshlink_open_params_t *params, meshlink_load_cb_t load_cb, meshlink_store_cb_t store_cb, meshlink_ls_cb_t ls_cb) {
+ logger(NULL, MESHLINK_DEBUG, "meshlink_set_storage_callbacks(%p, %p)", (void *)(intptr_t)load_cb, (void *)(intptr_t)store_cb);
+
+ if(!params) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ if(load_cb && (!store_cb || !ls_cb)) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ if(!load_cb && (store_cb || ls_cb)) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ params->load_cb = load_cb;
+ params->store_cb = store_cb;
+ params->ls_cb = ls_cb;
+
+ return true;
+}
+
bool meshlink_open_params_set_storage_key(meshlink_open_params_t *params, const void *key, size_t keylen) {
logger(NULL, MESHLINK_DEBUG, "meshlink_open_params_set_storage_key(%p, %zu)", key, keylen);
}
// Create hash for the new key
- void *new_config_key;
- new_config_key = xmalloc(CHACHA_POLY1305_KEYLEN);
+ void *new_config_key = xmalloc(CHACHA_POLY1305_KEYLEN);
if(!prf(new_key, new_keylen, "MeshLink configuration key", 26, new_config_key, CHACHA_POLY1305_KEYLEN)) {
logger(mesh, MESHLINK_ERROR, "Error creating new configuration key!\n");
return false;
}
- // Copy contents of the "current" confbase sub-directory to "new" confbase sub-directory with the new key
-
- if(!config_copy(mesh, "current", mesh->config_key, "new", new_config_key)) {
- logger(mesh, MESHLINK_ERROR, "Could not set up configuration in %s/old: %s\n", mesh->confbase, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- pthread_mutex_unlock(&mesh->mutex);
- return false;
- }
-
- devtool_keyrotate_probe(1);
-
- // Rename confbase/current/ to confbase/old
-
- if(!config_rename(mesh, "current", "old")) {
- logger(mesh, MESHLINK_ERROR, "Cannot rename %s/current to %s/old\n", mesh->confbase, mesh->confbase);
- meshlink_errno = MESHLINK_ESTORAGE;
- pthread_mutex_unlock(&mesh->mutex);
- return false;
- }
-
- devtool_keyrotate_probe(2);
-
- // Rename confbase/new/ to confbase/current
-
- if(!config_rename(mesh, "new", "current")) {
- logger(mesh, MESHLINK_ERROR, "Cannot rename %s/new to %s/current\n", mesh->confbase, mesh->confbase);
- meshlink_errno = MESHLINK_ESTORAGE;
- pthread_mutex_unlock(&mesh->mutex);
- return false;
- }
-
- devtool_keyrotate_probe(3);
-
- // Cleanup the "old" confbase sub-directory
-
- if(!config_destroy(mesh->confbase, "old")) {
+ // Change the mesh handle key with new key
+ if(!config_change_key(mesh, new_config_key)) {
+ logger(mesh, MESHLINK_ERROR, "Error rotating the configuration key!\n");
pthread_mutex_unlock(&mesh->mutex);
return false;
}
- // Change the mesh handle key with new key
-
- free(mesh->config_key);
- mesh->config_key = new_config_key;
-
pthread_mutex_unlock(&mesh->mutex);
return true;
mesh->log_cb = global_log_cb;
mesh->log_level = global_log_level;
mesh->packet = xmalloc(sizeof(vpn_packet_t));
+ mesh->load_cb = params->load_cb;
+ mesh->store_cb = params->store_cb;
+ mesh->ls_cb = params->ls_cb;
randomize(&mesh->prng_state, sizeof(mesh->prng_state));
meshlink_queue_init(&mesh->outpacketqueue);
// Atomically lock the configuration directory.
- if(!main_config_lock(mesh, params->lock_filename)) {
+ if(!config_init(mesh, params)) {
meshlink_close(mesh);
return NULL;
}
bool new_configuration = false;
- if(!meshlink_confbase_exists(mesh)) {
+ if(!meshlink_read_config(mesh)) {
if(!mesh->name) {
- logger(NULL, MESHLINK_ERROR, "No configuration files found!\n");
+ logger(NULL, MESHLINK_ERROR, "No valid 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");
+ if(config_exists(mesh, "meshlink.conf")) {
+ logger(NULL, MESHLINK_ERROR, "Cannot read existing configuration!\n");
meshlink_close(mesh);
+ meshlink_errno = MESHLINK_ESTORAGE;
return NULL;
}
- new_configuration = true;
- } else {
- if(!meshlink_read_config(mesh)) {
- logger(NULL, MESHLINK_ERROR, "Cannot read main configuration\n");
+ if(!meshlink_setup(mesh)) {
+ logger(NULL, MESHLINK_ERROR, "Cannot create initial configuration\n");
meshlink_close(mesh);
return NULL;
}
list_delete_list(mesh->invitation_addresses);
}
- main_config_unlock(mesh);
+ config_exit(mesh);
pthread_mutex_unlock(&mesh->mutex);
pthread_mutex_destroy(&mesh->mutex);
return false;
}
- if(!params->confbase) {
- /* Ephemeral instances */
- return true;
- }
-
- /* Exit early if the confbase directory itself doesn't exist */
- if(access(params->confbase, F_OK) && errno == ENOENT) {
- return true;
- }
-
- /* Take the lock the same way meshlink_open() would. */
- FILE *lockfile = fopen(params->lock_filename, "w+");
-
- if(!lockfile) {
- logger(NULL, MESHLINK_ERROR, "Could not open lock file %s: %s", params->lock_filename, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
- }
-
-#ifdef FD_CLOEXEC
- fcntl(fileno(lockfile), F_SETFD, FD_CLOEXEC);
-#endif
-
-#ifdef HAVE_MINGW
- // TODO: use _locking()?
-#else
-
- if(flock(fileno(lockfile), LOCK_EX | LOCK_NB) != 0) {
- logger(NULL, MESHLINK_ERROR, "Configuration directory %s still in use\n", params->lock_filename);
- fclose(lockfile);
- meshlink_errno = MESHLINK_EBUSY;
- return false;
- }
-
-#endif
-
- if(!config_destroy(params->confbase, "current") || !config_destroy(params->confbase, "new") || !config_destroy(params->confbase, "old")) {
- logger(NULL, MESHLINK_ERROR, "Cannot remove sub-directories in %s: %s\n", params->confbase, strerror(errno));
- return false;
- }
-
- if(unlink(params->lock_filename)) {
- logger(NULL, MESHLINK_ERROR, "Cannot remove lock file %s: %s\n", params->lock_filename, strerror(errno));
- fclose(lockfile);
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
- }
-
- fclose(lockfile);
-
- if(!sync_path(params->confbase)) {
- logger(NULL, MESHLINK_ERROR, "Cannot sync directory %s: %s\n", params->confbase, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
- }
-
- return true;
+ return config_destroy(params);
}
bool meshlink_destroy(const char *confbase) {
pthread_mutex_unlock(&mesh->mutex);
- return config_sync(mesh, "current");
+ return true;
}
bool meshlink_clear_canonical_address(meshlink_handle_t *mesh, meshlink_node_t *node) {
pthread_mutex_unlock(&mesh->mutex);
- return config_sync(mesh, "current");
+ return true;
}
bool meshlink_add_invitation_address(struct meshlink_handle *mesh, const char *address, const char *port) {
devtool_trybind_probe();
- bool rval = false;
-
if(pthread_mutex_lock(&mesh->mutex) != 0) {
abort();
}
/* Write meshlink.conf with the updated port number */
write_main_config_files(mesh);
- rval = config_sync(mesh, "current");
-
done:
pthread_mutex_unlock(&mesh->mutex);
- return rval && meshlink_get_port(mesh) == port;
+ return meshlink_get_port(mesh) == port;
}
void meshlink_set_invitation_timeout(meshlink_handle_t *mesh, int timeout) {
}
// Ensure no host configuration file with that name exists
- if(config_exists(mesh, "current", name)) {
+ if(config_exists(mesh, name)) {
logger(mesh, MESHLINK_ERROR, "A host config file for %s already exists!\n", name);
meshlink_errno = MESHLINK_EEXIST;
pthread_mutex_unlock(&mesh->mutex);
packmsg_output_t inv = {outbuf, sizeof(outbuf)};
packmsg_add_uint32(&inv, MESHLINK_INVITATION_VERSION);
+ packmsg_add_int64(&inv, time(NULL));
packmsg_add_str(&inv, name);
packmsg_add_str(&inv, s ? s->name : CORE_MESH);
packmsg_add_int32(&inv, DEV_CLASS_UNKNOWN); /* TODO: allow this to be set by inviter? */
memset(configs, 0, sizeof(configs));
int count = 0;
- if(config_read(mesh, "current", mesh->self->name, &configs[count], mesh->config_key)) {
+ if(config_load(mesh, mesh->self->name, &configs[count])) {
count++;
}
config_t config = {outbuf, packmsg_output_size(&inv, outbuf)};
- if(!invitation_write(mesh, "current", cookiehash, &config, mesh->config_key)) {
+ if(!invitation_write(mesh, cookiehash, &config)) {
logger(mesh, MESHLINK_DEBUG, "Could not create invitation file %s: %s\n", cookiehash, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
pthread_mutex_unlock(&mesh->mutex);
return false;
}
- if(!config_sync(mesh, "current")) {
- return false;
- }
-
return true;
}
/* Remove any outstanding invitations */
invitation_purge_node(mesh, n->name);
- return node_write_config(mesh, n, true) && config_sync(mesh, "current");
+ return node_write_config(mesh, n, true);
}
bool meshlink_blacklist(meshlink_handle_t *mesh, meshlink_node_t *node) {
update_node_status(mesh, n);
}
- return node_write_config(mesh, n, true) && config_sync(mesh, "current");
+ return node_write_config(mesh, n, true);
}
bool meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) {
}
/* Delete the config file for this node */
- if(!config_delete(mesh, "current", n->name)) {
+ if(!invalidate_config_file(mesh, n->name, 0)) {
pthread_mutex_unlock(&mesh->mutex);
return false;
}
pthread_mutex_unlock(&mesh->mutex);
- return config_sync(mesh, "current");
+ return true;
}
/* Hint that a hostname may be found at an address
projects / meshlink / commitdiff