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

Ignore 'Add' activities ASAP.

Browse source
This commit is contained in:
default 2023-08-13 16:09:20 +02:00
parent d3de540a05
commit c8d535a154
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
activitypub.c
View file

@ -1412,6 +1412,12 @@ int process_input_message(snac *snac, xs_dict *msg, xs_dict *req)
if (xs_is_null(type)) if (xs_is_null(type))
type = "Note"; type = "Note";
/* reject uninteresting messages right now */
if (strcmp(type, "Add") == 0) {
snac_debug(snac, 0, xs_fmt("Ignored message of type '%s'", type));
return 1;
}
if (xs_is_null(actor)) { if (xs_is_null(actor)) {
snac_debug(snac, 0, xs_fmt("malformed message")); snac_debug(snac, 0, xs_fmt("malformed message"));
return 1; return 1;
@ -2084,9 +2090,9 @@ int activitypub_post_handler(const xs_dict *req, const char *q_path,
/* decode the message */ /* decode the message */
xs *msg = xs_json_loads(payload); xs *msg = xs_json_loads(payload);
const char *id; const char *id = xs_dict_get(msg, "id");
if (msg == NULL || xs_is_null(id = xs_dict_get(msg, "id"))) { 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));
srv_archive_error("activitypub_post_handler", "JSON error", req, payload); srv_archive_error("activitypub_post_handler", "JSON error", req, payload);
@ -2096,7 +2102,7 @@ int activitypub_post_handler(const xs_dict *req, const char *q_path,
return 400; return 400;
} }
if (is_instance_blocked(id)) { if (id && is_instance_blocked(id)) {
srv_debug(1, xs_fmt("full instance block for %s", id)); srv_debug(1, xs_fmt("full instance block for %s", id));
*body = xs_str_new("blocked"); *body = xs_str_new("blocked");
@ -2106,7 +2112,6 @@ int activitypub_post_handler(const xs_dict *req, const char *q_path,
/* get the user and path */ /* get the user and path */
xs *l = xs_split_n(q_path, "/", 2); xs *l = xs_split_n(q_path, "/", 2);
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 */
@ -2114,7 +2119,7 @@ int activitypub_post_handler(const xs_dict *req, const char *q_path,
return 404; return 404;
} }
uid = xs_list_get(l, 1); const char *uid = xs_list_get(l, 1);
if (!user_open(&snac, uid)) { if (!user_open(&snac, uid)) {
/* invalid user */ /* invalid user */
srv_debug(1, xs_fmt("activitypub_post_handler bad user %s", uid)); srv_debug(1, xs_fmt("activitypub_post_handler bad user %s", uid));