More work.

This commit is contained in:
default 2022-09-24 11:54:35 +02:00
parent a7202dcd1c
commit e9afd7cd13
2 changed files with 13 additions and 16 deletions

View file

@ -156,6 +156,7 @@ d_char *msg_collection(snac *snac, char *id)
d_char *msg_update(snac *snac, char *object) d_char *msg_update(snac *snac, char *object)
/* creates an Update message */
{ {
xs *id = xs_fmt("%s/Update", xs_dict_get(object, "id")); xs *id = xs_fmt("%s/Update", xs_dict_get(object, "id"));
d_char *msg = msg_base(snac, "Update", id, snac->actor, ""); d_char *msg = msg_base(snac, "Update", id, snac->actor, "");
@ -331,31 +332,32 @@ int activitypub_post_handler(d_char *req, char *q_path,
xs_str_in(i_ctype, "application/ld+json") == -1) xs_str_in(i_ctype, "application/ld+json") == -1)
return 0; return 0;
/* decode the message */
xs *msg = xs_json_loads(payload);
if (msg == NULL) {
srv_log(xs_fmt("activitypub_post_handler JSON error %s", q_path));
status = 400;
}
/* get the user and path */
xs *l = xs_split_n(q_path, "/", 2); xs *l = xs_split_n(q_path, "/", 2);
char *uid; char *uid;
if (xs_list_len(l) != 3 || strcmp(xs_list_get(l, 2), "inbox") != 0) { if (xs_list_len(l) != 3 || strcmp(xs_list_get(l, 2), "inbox") != 0) {
/* strange q_path */ /* strange q_path */
srv_log(xs_fmt("activitypub_post_handler unsupported path %s", q_path)); srv_debug(1, xs_fmt("activitypub_post_handler unsupported path %s", q_path));
return 404; return 404;
} }
uid = xs_list_get(l, 1); uid = xs_list_get(l, 1);
if (!user_open(&snac, uid)) { if (!user_open(&snac, uid)) {
/* invalid user */ /* invalid user */
srv_log(xs_fmt("activitypub_post_handler bad user %s", uid)); srv_debug(1, xs_fmt("activitypub_post_handler bad user %s", uid));
return 404; return 404;
} }
/* decode */ enqueue_input(&snac, msg, req);
xs *msg = xs_json_loads(payload);
if (msg && xs_dict_get(msg, "actor") && xs_dict_get(msg, "type"))
enqueue_input(&snac, msg, req);
else {
srv_log(xs_fmt("activitypub_post_handler JSON error %s", q_path));
status = 400;
}
user_free(&snac); user_free(&snac);

View file

@ -106,11 +106,6 @@ void httpd_connection(int rs)
req = xs_httpd_request(f, &payload, &p_size); req = xs_httpd_request(f, &payload, &p_size);
{
xs *j = xs_json_dumps_pp(req, 4);
printf("%s\n", j);
}
req_hdrs = xs_dict_get(req, "headers"); req_hdrs = xs_dict_get(req, "headers");
method = xs_dict_get(req_hdrs, "method"); method = xs_dict_get(req_hdrs, "method");