dav: comparison dav/config.c

-:29d544c3c2b8
+:05647e862a17
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <cx/hash_map.h>
+#include <cx/utils.h>
 #include <errno.h>
 #include <libxml/tree.h>
 #include "pwd.h"
 #include "config.h"
 #include "main.h"
 #include "pwd.h"
+#include "system.h"
 #include <libidav/utils.h>
+#include <libidav/config.h>
 #define xstreq(a,b) xmlStrEqual(BAD_CAST a, BAD_CAST b)
 #define xstrEQ(a,b) !xmlStrcasecmp(BAD_CAST a, BAD_CAST b)
 #define print_error(lineno, ...) \
 #endif /* _WIN32 */
 static CxMap *repos;
 static CxMap *keys;
+static DavConfig *davconfig;
 static PwdStore *pstore;
 static char *secretstore_unlock_cmd;
 static char *secretstore_lock_cmd;
 char *path = util_concat_path(davd, name);
 free(davd);
 return path;
 }
+cxmutstr config_load_file(const char *path) {
+FILE *file = sys_fopen(path, "r");
+if(!file) {
+return (cxmutstr){NULL,0};
+}
+CxBuffer buf;
+cxBufferInit(&buf, NULL, 1024, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND);
+cx_stream_copy(file, &buf, (cx_read_func)fread, (cx_write_func)cxBufferWrite);
+fclose(file);
+return cx_mutstrn(buf.space, buf.size);
+}
 int load_config(DavContext *ctx) {
 context = ctx;
 // TODO: free the config somewhere
 repos = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 16);
 keys = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 16);
 }
 return 1;
 }
 xmlDoc *doc = xmlReadFile(file, NULL, 0);
+cxmutstr config_content = config_load_file(file);
+int config_error;
+davconfig = dav_config_load(config_content, &config_error);
+free(config_content.ptr);
 free(file);
 if(!doc) {
 fprintf(stderr, "Cannot load config.xml\n");
 return 1;
 }
 node = node->next;
 }
 xmlFreeDoc(doc);
 return ret;
+}
+DavConfig* get_config(void) {
+return davconfig;
+}
+int store_config(void) {
+if(check_config_dir()) {
+return 1;
+}
+CxBuffer *buf = dav_config2buf(davconfig);
+if(!buf) {
+return 1;
+}
+char *file = util_concat_path(ENV_HOME, ".dav/config.xml");
+FILE *cout = sys_fopen(file, "w");
+if(!cout) {
+cxBufferFree(buf);
+return 1;
+}
+// should only fail if we run out of disk space or something like that
+// in that case, the config file is only destroyed
+// could only be prevented, if we write to a temp file first and than
+// rename it
+fwrite(buf->space, buf->size, 1, cout);
+cxBufferFree(buf);
+fclose(cout);
+return 0;
 }
 void free_config(void) {
 if(repos) {
 CxIterator i = cxMapIteratorValues(repos);
 return ret;
 }
+/*
 Repository* url2repo_s(cxstring url, char **path) {
 *path = NULL;
 int s;
 if(cx_strprefix(url, CX_STR("http://"))) {
 }
 Repository* url2repo(const char *url, char **path) {
 return url2repo_s(cx_str(url), path);
 }
+*/
 static int decrypt_secrets(CmdArgs *a, PwdStore *secrets) {
 if(cmd_getoption(a, "noinput")) {
 return 1;
 }
 return 0;
 }
-static int get_location_credentials(CmdArgs *a, Repository *repo, char *path, char **user, char **password) {
+static int get_location_credentials(CmdArgs *a, DavCfgRepository *repo, const char *path, char **user, char **password) {
 PwdStore *secrets = get_pwdstore();
 if(!secrets) {
 return 0;
 }
 locations->simple_destructor = (cx_destructor_func)free_cred_location;
 CxIterator i = cxListIterator(secrets->locations);
 cx_foreach(PwdIndexEntry*, e, i) {
 CxIterator entry_iter = cxListIterator(e->locations);
 cx_foreach(char *, loc, entry_iter) {
-char *path;
+cxmutstr rpath;
-Repository *r = url2repo(loc, &path);
+DavCfgRepository *r = dav_config_url2repo_s(davconfig, cx_str(loc), &rpath);
 CredLocation *urlentry = calloc(1, sizeof(CredLocation));
 urlentry->id = e->id;
-urlentry->location = util_concat_path(r->url, path);
+urlentry->location = util_concat_path_s(cx_strcast(r->url.value), cx_strcast(rpath)).ptr;
 cxListAdd(locations, urlentry);
+free(rpath.ptr);
 }
 }
 // the list must be sorted
 cxListSort(locations);
 // create full request url string and remove protocol prefix
-cxmutstr req_url_proto = cx_mutstr(util_concat_path(repo->url, path));
+cxmutstr req_url_proto = util_concat_path_s(cx_strcast(repo->url.value), cx_str(path));
 cxstring req_url = cx_strcast(req_url_proto);
 if(cx_strprefix(req_url, CX_STR("http://"))) {
 req_url = cx_strsubs(req_url, 7);
 } else if(cx_strprefix(req_url, CX_STR("https://"))) {
 req_url = cx_strsubs(req_url, 8);
 cxListDestroy(locations);
 return ret;
 }
-DavSession* connect_to_repo(DavContext *ctx, Repository *repo, char *path, dav_auth_func authfunc, CmdArgs *a) {
+DavSession* connect_to_repo(DavContext *ctx, DavCfgRepository *repo, const char *path, dav_auth_func authfunc, CmdArgs *a) {
-char *user = repo->user;
+cxmutstr decodedpw = dav_repository_get_decodedpassword(repo);
-char *password = repo->password;
+char *user = repo->user.value.ptr;
+char *password = decodedpw.ptr;
 if(!user && !password) {
-if(!get_stored_credentials(a, repo->stored_user, &user, &password)) {
+if(!get_stored_credentials(a, repo->stored_user.value.ptr, &user, &password)) {
 get_location_credentials(a, repo, path, &user, &password);
 }
 }
-DavSession *sn = dav_session_new_auth(ctx, repo->url, user, password);
+DavSession *sn = dav_session_new_auth(ctx, repo->url.value.ptr, user, password);
-sn->flags = get_repository_flags(repo);
+if(password) {
-sn->key = dav_context_get_key(ctx, repo->default_key);
+free(password);
+}
+sn->flags = dav_repository_get_flags(repo);
+sn->key = dav_context_get_key(ctx, repo->default_key.value.ptr);
 curl_easy_setopt(sn->handle, CURLOPT_HTTPAUTH, repo->authmethods);
 curl_easy_setopt(sn->handle, CURLOPT_SSLVERSION, repo->ssl_version);
-if(repo->cert) {
+if(repo->cert.value.ptr) {
-curl_easy_setopt(sn->handle, CURLOPT_CAINFO, repo->cert);
+curl_easy_setopt(sn->handle, CURLOPT_CAINFO, repo->cert.value.ptr);
 }
-if(!repo->verification || cmd_getoption(a, "insecure")) {
+if(!repo->verification.value || cmd_getoption(a, "insecure")) {
 curl_easy_setopt(sn->handle, CURLOPT_SSL_VERIFYPEER, 0);
 curl_easy_setopt(sn->handle, CURLOPT_SSL_VERIFYHOST, 0);
 }
 if(!cmd_getoption(a, "noinput")) {
 dav_session_set_authcallback(sn, authfunc, repo);

Mercurial > hg > dav / file comparison

comparison: dav/config.c

dav/config.c