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

Added a special drop for Delete messages from unknown actors.

Browse source
This commit is contained in:
default 2023-12-11 16:59:33 +01:00
parent e78f0bf1b1
commit b1ecaba803
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
activitypub.c
View file

@ -1470,6 +1470,8 @@ int update_question(snac *user, const char *id)
int process_input_message(snac *snac, xs_dict *msg, xs_dict *req) int process_input_message(snac *snac, xs_dict *msg, xs_dict *req)
/* processes an ActivityPub message from the input queue */ /* processes an ActivityPub message from the input queue */
/* return values: -1, fatal error; 0, transient error, retry;
1, processed and done; 2, propagate to users (only when no user is set) */
{ {
char *actor = xs_dict_get(msg, "actor"); char *actor = xs_dict_get(msg, "actor");
char *type = xs_dict_get(msg, "type"); char *type = xs_dict_get(msg, "type");
@ -1500,13 +1502,21 @@ int process_input_message(snac *snac, xs_dict *msg, xs_dict *req)
else else
utype = "(null)"; utype = "(null)";
/* special case for Delete messages */
if (strcmp(type, "Delete") == 0) {
/* if the actor is not here, do not even try */
if (!object_here(actor)) {
srv_debug(0, xs_fmt("dropped 'Delete' message from unknown actor '%s'", actor));
return -1;
}
}
/* bring the actor */ /* bring the actor */
a_status = actor_request(actor, &actor_o); a_status = actor_request(actor, &actor_o);
/* do not retry permanent failures */ /* do not retry permanent failures */
if (a_status == 404 || a_status == 410 || a_status < 0) { if (a_status == 404 || a_status == 410 || a_status < 0) {
srv_debug(1, xs_fmt("dropping message due to actor error %s %d", actor, a_status)); srv_debug(1, xs_fmt("dropping message due to actor error %s %d", actor, a_status));
return -1; return -1;
} }
@ -1519,7 +1529,6 @@ int process_input_message(snac *snac, xs_dict *msg, xs_dict *req)
/* other actor download errors may need a retry */ /* other actor download errors may need a retry */
srv_debug(1, xs_fmt("error requesting actor %s %d -- retry later", actor, a_status)); srv_debug(1, xs_fmt("error requesting actor %s %d -- retry later", actor, a_status));
return 0; return 0;
} }
@ -1530,13 +1539,12 @@ int process_input_message(snac *snac, xs_dict *msg, xs_dict *req)
srv_log(xs_fmt("bad signature %s (%s)", actor, sig_err)); srv_log(xs_fmt("bad signature %s (%s)", actor, sig_err));
srv_archive_error("check_signature", sig_err, req, msg); srv_archive_error("check_signature", sig_err, req, msg);
return -1; return -1;
} }
/* if no user is set, no further checks can be done */ /* if no user is set, no further checks can be done; propagate */
if (snac == NULL) if (snac == NULL)
return 1; return 2;
/* reject messages that are not for this user */ /* reject messages that are not for this user */
if (!is_msg_for_me(snac, msg)) { if (!is_msg_for_me(snac, msg)) {