mirrors/snac2
3
0
Fork 0
mirror of https://codeberg.org/grunfink/snac2.git synced 2024-11-09 19:50:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

New file ~user/user_o.json, for the admin to override user settings.

Browse Source
This commit is contained in:
default 2023-02-12 09:17:38 +01:00
parent dca071b14d
commit 0f4db7cf26
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
data.c
View File

@ -130,6 +130,7 @@ void user_free(snac *snac)
xs_free(snac->uid); xs_free(snac->uid);
xs_free(snac->basedir); xs_free(snac->basedir);
xs_free(snac->config); xs_free(snac->config);
xs_free(snac->config_o);
xs_free(snac->key); xs_free(snac->key);
xs_free(snac->actor); xs_free(snac->actor);
xs_free(snac->md5); xs_free(snac->md5);
@ -172,7 +173,22 @@ int user_open(snac *snac, const char *uid)
if ((snac->key = xs_json_loads(key_data)) != NULL) { if ((snac->key = xs_json_loads(key_data)) != NULL) {
snac->actor = xs_fmt("%s/%s", srv_baseurl, uid); snac->actor = xs_fmt("%s/%s", srv_baseurl, uid);
snac->md5 = xs_md5_hex(snac->actor, strlen(snac->actor)); snac->md5 = xs_md5_hex(snac->actor, strlen(snac->actor));
/* everything is ok right now */
ret = 1; ret = 1;
/* does it have a configuration override? */
xs *cfg_file_o = xs_fmt("%s/user_o.json", snac->basedir);
if ((f = fopen(cfg_file_o, "r")) != NULL) {
xs *j = xs_readall(f);
fclose(f);
if ((snac->config_o = xs_json_loads(j)) == NULL)
srv_log(xs_fmt("cannot parse '%s'", cfg_file_o));
}
if (snac->config_o == NULL)
snac->config_o = xs_dict_new();
} }
else else
srv_log(xs_fmt("cannot parse '%s'", key_file)); srv_log(xs_fmt("cannot parse '%s'", key_file));

15
snac.h
View File

@ -1,7 +1,7 @@
/* snac - A simple, minimalistic ActivityPub instance */ /* snac - A simple, minimalistic ActivityPub instance */
/* copyright (c) 2022 - 2023 grunfink / MIT license */ /* copyright (c) 2022 - 2023 grunfink / MIT license */
#define VERSION "2.22" #define VERSION "2.23-dev"
#define USER_AGENT "snac/" VERSION #define USER_AGENT "snac/" VERSION
@ -30,12 +30,13 @@ int srv_open(char *basedir, int auto_upgrade);
void srv_free(void); void srv_free(void);
typedef struct _snac { typedef struct _snac {
d_char *uid; /* uid */ xs_str *uid; /* uid */
d_char *basedir; /* user base directory */ xs_str *basedir; /* user base directory */
d_char *config; /* user configuration */ xs_dict *config; /* user configuration */
d_char *key; /* keypair */ xs_dict *config_o; /* user configuration admin override */
d_char *actor; /* actor url */ xs_dict *key; /* keypair */
d_char *md5; /* actor url md5 */ xs_str *actor; /* actor url */
xs_str *md5; /* actor url md5 */
} snac; } snac;
int user_open(snac *snac, const char *uid); int user_open(snac *snac, const char *uid);