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

improvement in source route checking when handling complex *upstream* delivery chains, which were not adequately accounted for in the earlier checkin.

Browse Source
This commit is contained in:
friendica 2014-10-10 00:13:46 -07:00
parent 8e7e488ffe
commit cde244ef74
3 changed files with 1106 additions and 1067 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/zot.php
View File

@ -1421,7 +1421,7 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) {
continue; continue;
} }
if(($arr['mid'] != $arr['parent_mid']) && (! $relay)) { if($arr['mid'] != $arr['parent_mid']) {
// check source route. // check source route.
// We are only going to accept comments from this sender if the comment has the same route as the top-level-post, // We are only going to accept comments from this sender if the comment has the same route as the top-level-post,
@ -1437,11 +1437,24 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) {
$result[] = array($d['hash'],'comment parent not found',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); $result[] = array($d['hash'],'comment parent not found',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
continue; continue;
} }
$current_route = (($arr['route']) ? $arr['route'] . ',' : '') . $sender['hash']; if($relay) {
// reset the route in case it travelled a great distance upstream
// use our parent's route so when we go back downstream we'll match
// with whatever route our parent has.
$arr['route'] = $r[0]['route'];
}
else {
if($r[0]['route'] != $current_route) { // going downstream check that we have the same upstream provider that
$result[] = array($d['hash'],'comment route mismatch',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); // sent it to us originally. Ignore it if it came from another source
continue; // (with potentially different permissions)
$current_route = (($arr['route']) ? $arr['route'] . ',' : '') . $sender['hash'];
if($r[0]['route'] != $current_route) {
$result[] = array($d['hash'],'comment route mismatch',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
continue;
}
} }
} }

2146
util/messages.po
View File

File diff suppressed because it is too large Load Diff

2
version.inc
View File

@ -1 +1 @@
2014-10-09.823 2014-10-10.824