lowercase waypoints (otrw) and config (otrc) directory and filenames

closes #486
This commit is contained in:
Jan-Piet Mens 2024-07-31 11:45:56 +02:00
parent 0be22243ff
commit ea54106a50

View File

@ -332,22 +332,31 @@ static char *prettyfy(char *payloadstring)
static void xx_dump(struct udata *ud, UT_string *username, UT_string *device, char *payloadstring, char *type, char *extension) static void xx_dump(struct udata *ud, UT_string *username, UT_string *device, char *payloadstring, char *type, char *extension)
{ {
static UT_string *ts = NULL; static UT_string *ts = NULL, *u = NULL, *d = NULL;
char *pretty_js = prettyfy(payloadstring); char *pretty_js = prettyfy(payloadstring);
utstring_renew(ts); utstring_renew(ts);
/* Ensure user / devicename are lowercased */
utstring_renew(u);
utstring_renew(d);
utstring_printf(u, "%s", UB(username));
utstring_printf(d, "%s", UB(device));
lowercase(UB(u));
lowercase(UB(d));
utstring_printf(ts, "%s/%s/%s/%s", utstring_printf(ts, "%s/%s/%s/%s",
STORAGEDIR, STORAGEDIR,
type, type,
UB(username), UB(u),
UB(device)); UB(d));
if (mkpath(UB(ts)) < 0) { if (mkpath(UB(ts)) < 0) {
olog(LOG_ERR, "Cannot mkdir %s: %m", UB(ts)); olog(LOG_ERR, "Cannot mkdir %s: %m", UB(ts));
if (pretty_js) free(pretty_js); if (pretty_js) free(pretty_js);
return; return;
} }
utstring_printf(ts, "/%s-%s.%s", UB(username), UB(device), extension); utstring_printf(ts, "/%s-%s.%s", UB(u), UB(d), extension);
if (ud->verbose) { if (ud->verbose) {
printf("Received %s dump, storing at %s\n", type, UB(ts)); printf("Received %s dump, storing at %s\n", type, UB(ts));
} }