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

Try to show a piece of the error after connecting.

Browse source
This commit is contained in:
default 2023-02-14 08:15:38 +01:00
parent 296625c3a4
commit 7e27ccfde8
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
activitypub.c
View file

@ -1180,7 +1180,22 @@ void process_queue_item(xs_dict *q_item)
/* deliver */ /* deliver */
status = send_to_inbox_raw(keyid, seckey, inbox, msg, &payload, &p_size, retries == 0 ? 3 : 8); status = send_to_inbox_raw(keyid, seckey, inbox, msg, &payload, &p_size, retries == 0 ? 3 : 8);
srv_log(xs_fmt("output message: sent to inbox %s %d", inbox, status)); if (payload && !valid_status(status)) {
/* in case of error, print a part of the payload,
as it may be informative */
if (p_size > 24) {
/* trim the message */
payload[24] = '\0';
payload = xs_str_cat(payload, "...");
}
payload = xs_str_wrap_i(" (", payload, ")");
}
if (payload == NULL)
payload = xs_str_new(NULL);
srv_log(xs_fmt("output message: sent to inbox %s %d%s", inbox, status, payload));
if (!valid_status(status)) { if (!valid_status(status)) {
retries++; retries++;
@ -1377,8 +1392,11 @@ int activitypub_post_handler(d_char *req, char *q_path,
snac snac; snac snac;
char *v; char *v;
if (i_ctype == NULL) if (i_ctype == NULL) {
*body = xs_str_new("no content-type");
*ctype = "text/plain";
return 400; return 400;
}
if (xs_str_in(i_ctype, "application/activity+json") == -1 && if (xs_str_in(i_ctype, "application/activity+json") == -1 &&
xs_str_in(i_ctype, "application/ld+json") == -1) xs_str_in(i_ctype, "application/ld+json") == -1)
@ -1389,6 +1407,9 @@ int activitypub_post_handler(d_char *req, char *q_path,
if (msg == NULL) { if (msg == NULL) {
srv_log(xs_fmt("activitypub_post_handler JSON error %s", q_path)); srv_log(xs_fmt("activitypub_post_handler JSON error %s", q_path));
*body = xs_str_new("JSON error");
*ctype = "text/plain";
status = 400; status = 400;
} }
@ -1417,6 +1438,9 @@ int activitypub_post_handler(d_char *req, char *q_path,
if (strcmp(s2, v) != 0) { if (strcmp(s2, v) != 0) {
srv_log(xs_fmt("digest check FAILED")); srv_log(xs_fmt("digest check FAILED"));
*body = xs_str_new("bad digest");
*ctype = "text/plain";
status = 400; status = 400;
} }
} }

2
httpd.c
View file

@ -198,7 +198,7 @@ void httpd_connection(FILE *f)
if (status == 404) if (status == 404)
body = xs_str_new("<h1>404 Not Found</h1>"); body = xs_str_new("<h1>404 Not Found</h1>");
if (status == 400) if (status == 400 && body != NULL)
body = xs_str_new("<h1>400 Bad Request</h1>"); body = xs_str_new("<h1>400 Bad Request</h1>");
if (status == 303) if (status == 303)