harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move the zot6 delivery to zot_fetch where it makes more sense. Exhaustively hand tested.

Browse Source
This commit is contained in:
zotlabs 2018-02-20 17:18:08 -08:00
parent 441cdeff3f
commit 02575f46a6
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/channel.php
View File

@ -2553,10 +2553,10 @@ function channel_remove($channel_id, $local = true, $unset_session = false) {
q("DELETE FROM profile WHERE uid = %d", intval($channel_id)); q("DELETE FROM profile WHERE uid = %d", intval($channel_id));
q("DELETE FROM src WHERE src_channel_id = %d", intval($channel_id)); q("DELETE FROM src WHERE src_channel_id = %d", intval($channel_id));
$r = q("select resource_id FROM attach WHERE uid = %d", intval($channel_id)); $r = q("select hash FROM attach WHERE uid = %d", intval($channel_id));
if($r) { if($r) {
foreach($r as $rv) { foreach($r as $rv) {
attach_delete($channel_id,$rv['resource_id']); attach_delete($channel_id,$rv['hash']);
} }
} }

7
include/zot.php
View File

@ -1152,7 +1152,12 @@ function zot_process_response($hub, $arr, $outq) {
* @brief * @brief
* *
* We received a notification packet (in mod_post) that a message is waiting for us, and we've verified the sender. * We received a notification packet (in mod_post) that a message is waiting for us, and we've verified the sender.
* Now send back a pickup message, using our message tracking ID ($arr['secret']), which we will sign with our site * Check if the site is using zot6 delivery and includes a verified HTTP Signature, signed content, and a 'msg' field,
* and also that the signer and the sender match.
* If that happens, we do not need to fetch/pickup the message - we have it already and it is verified.
* Translate it into the form we need for zot_import() and import it.
*
* Otherwise send back a pickup message, using our message tracking ID ($arr['secret']), which we will sign with our site
* private key. * private key.
* The entire pickup message is encrypted with the remote site's public key. * The entire pickup message is encrypted with the remote site's public key.
* If everything checks out on the remote end, we will receive back a packet containing one or more messages, * If everything checks out on the remote end, we will receive back a packet containing one or more messages,