monkee.ch/snac2
1
0
Fork 0
mirror of https://codeberg.org/grunfink/snac2.git synced 2024-11-15 01:55:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't use goto in check_signature().

Browse source 
It seems to interfere with cleanup functions in llvm.
This commit is contained in:
default 2023-01-08 10:11:33 +01:00
parent 1f949b48cf
commit 7bcac99c88
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
http.c
View file

@ -103,7 +103,7 @@ d_char *http_signed_request(snac *snac, char *method, char *url,
} }
int check_signature(snac *snac, char *req) static int _check_signature(snac *snac, char *req)
/* check the signature */ /* check the signature */
{ {
char *sig_hdr = xs_dict_get(req, "signature"); char *sig_hdr = xs_dict_get(req, "signature");
@ -141,7 +141,7 @@ int check_signature(snac *snac, char *req)
if (keyId == NULL || headers == NULL || signature == NULL) { if (keyId == NULL || headers == NULL || signature == NULL) {
snac_debug(snac, 0, xs_fmt("check_signature bad signature header")); snac_debug(snac, 0, xs_fmt("check_signature bad signature header"));
goto error; return 0;
} }
/* strip the # from the keyId */ /* strip the # from the keyId */
@ -152,13 +152,13 @@ int check_signature(snac *snac, char *req)
xs *actor = NULL; xs *actor = NULL;
if (!valid_status(actor_get(snac, keyId, &actor))) { if (!valid_status(actor_get(snac, keyId, &actor))) {
snac_debug(snac, 0, xs_fmt("check_signature unknown actor %s", keyId)); snac_debug(snac, 0, xs_fmt("check_signature unknown actor %s", keyId));
goto error; return 0;
} }
if ((p = xs_dict_get(actor, "publicKey")) == NULL || if ((p = xs_dict_get(actor, "publicKey")) == NULL ||
((pubkey = xs_dict_get(p, "publicKeyPem")) == NULL)) { ((pubkey = xs_dict_get(p, "publicKeyPem")) == NULL)) {
snac_debug(snac, 0, xs_fmt("check_signature cannot get pubkey from %s", keyId)); snac_debug(snac, 0, xs_fmt("check_signature cannot get pubkey from %s", keyId));
goto error; return 0;
} }
/* now build the string to be signed */ /* now build the string to be signed */
@ -193,7 +193,7 @@ int check_signature(snac *snac, char *req)
snac_debug(snac, 0, snac_debug(snac, 0,
xs_fmt("check_signature cannot find header %s", v)); xs_fmt("check_signature cannot find header %s", v));
goto error; return 0;
} }
ss = xs_fmt("%s: %s", v, hc); ss = xs_fmt("%s: %s", v, hc);
@ -205,13 +205,19 @@ int check_signature(snac *snac, char *req)
if (xs_evp_verify(pubkey, sig_str, strlen(sig_str), signature) != 1) { if (xs_evp_verify(pubkey, sig_str, strlen(sig_str), signature) != 1) {
snac_debug(snac, 0, xs_fmt("check_signature rsa verify error %s", keyId)); snac_debug(snac, 0, xs_fmt("check_signature rsa verify error %s", keyId));
goto error; return 0;
} }
return 1; return 1;
}
error:
int check_signature(snac *snac, char *req)
/* checks the signature and archives the error */
{ {
int ret;
if ((ret = _check_signature(snac, req)) == 0) {
xs *ntid = tid(0); xs *ntid = tid(0);
xs *fn = xs_fmt("%s/error/check_signature_%s.json", srv_basedir, ntid); xs *fn = xs_fmt("%s/error/check_signature_%s.json", srv_basedir, ntid);
FILE *f; FILE *f;
@ -224,5 +230,5 @@ error:
} }
} }
return 0; return ret;
} }