monkee.ch/snac2
1
0
Fork 0
mirror of https://codeberg.org/grunfink/snac2.git synced 2024-11-14 17:45:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

The proxy token seed is created on startup and never stored.

Browse source
This commit is contained in:
default 2024-11-12 09:01:30 +01:00
parent 50fa2ae0e6
commit 19b9998f8c
4 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
data.c
View file

@ -165,21 +165,12 @@ int srv_open(const char *basedir, int auto_upgrade)
write_default_css(); write_default_css();
} }
/* if proxy_media is set but there is no token seed, create one */ /* create the proxy token seed */
if (xs_is_true(xs_dict_get(srv_config, "proxy_media")) && {
xs_is_null(xs_dict_get(srv_config, "proxy_token_seed"))) {
char rnd[16]; char rnd[16];
xs_rnd_buf(rnd, sizeof(rnd)); xs_rnd_buf(rnd, sizeof(rnd));
xs *pts = xs_hex_enc(rnd, sizeof(rnd));
xs_dict_set(srv_config, "proxy_token_seed", pts); srv_proxy_token_seed = xs_hex_enc(rnd, sizeof(rnd));
if ((f = fopen(cfg_file, "w")) != NULL) {
xs_json_dump(srv_config, 4, f);
fclose(f);
srv_log(xs_fmt("Created proxy_token_seed"));
}
} }
return ret; return ret;
@ -3679,7 +3670,7 @@ xs_str *make_url(const char *href, const char *proxy, int by_token)
xs *p = NULL; xs *p = NULL;
if (by_token) { if (by_token) {
xs *tks = xs_fmt("%s:%s", xs_dict_get(srv_config, "proxy_token_seed"), proxy); xs *tks = xs_fmt("%s:%s", srv_proxy_token_seed, proxy);
xs *tk = xs_md5_hex(tks, strlen(tks)); xs *tk = xs_md5_hex(tks, strlen(tks));
p = xs_fmt("%s/y/%s/", proxy, tk); p = xs_fmt("%s/y/%s/", proxy, tk);

2
html.c
View file

@ -3208,7 +3208,7 @@ int html_get_handler(const xs_dict *req, const char *q_path,
} }
else { else {
/* proxy usage authorized by proxy_token */ /* proxy usage authorized by proxy_token */
xs *tks = xs_fmt("%s:%s", xs_dict_get(srv_config, "proxy_token_seed"), snac.actor); xs *tks = xs_fmt("%s:%s", srv_proxy_token_seed, snac.actor);
xs *tk = xs_md5_hex(tks, strlen(tks)); xs *tk = xs_md5_hex(tks, strlen(tks));
xs *p = xs_fmt("y/%s/", tk); xs *p = xs_fmt("y/%s/", tk);

1
snac.c
View file

@ -33,6 +33,7 @@
xs_str *srv_basedir = NULL; xs_str *srv_basedir = NULL;
xs_dict *srv_config = NULL; xs_dict *srv_config = NULL;
xs_str *srv_baseurl = NULL; xs_str *srv_baseurl = NULL;
xs_str *srv_proxy_token_seed = NULL;
int dbglevel = 0; int dbglevel = 0;

1
snac.h
View file

@ -26,6 +26,7 @@ extern double disk_layout;
extern xs_str *srv_basedir; extern xs_str *srv_basedir;
extern xs_dict *srv_config; extern xs_dict *srv_config;
extern xs_str *srv_baseurl; extern xs_str *srv_baseurl;
extern xs_str *srv_proxy_token_seed;
extern int dbglevel; extern int dbglevel;