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

protocol upgrade

Browse Source
This commit is contained in:
redmatrix 2015-11-03 23:54:53 -08:00
parent 5dade2b608
commit b6b2420ff7
2 changed files with 59 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/zot.php
View File

@ -570,11 +570,12 @@ function zot_gethub($arr,$multiple = false) {
} }
$limit = (($multiple) ? '' : ' limit 1 '); $limit = (($multiple) ? '' : ' limit 1 ');
$sitekey = ((array_key_exists('sitekey',$arr) && $arr['sitekey']) ? " and hubloc_sitekey = '" . protect_sprintf($arr['sitekey']) . "' " : '');
$r = q("select * from hubloc $r = q("select * from hubloc
where hubloc_guid = '%s' and hubloc_guid_sig = '%s' where hubloc_guid = '%s' and hubloc_guid_sig = '%s'
and hubloc_url = '%s' and hubloc_url_sig = '%s' and hubloc_url = '%s' and hubloc_url_sig = '%s'
$limit", $sitekey $limit",
dbesc($arr['guid']), dbesc($arr['guid']),
dbesc($arr['guid_sig']), dbesc($arr['guid_sig']),
dbesc($arr['url']), dbesc($arr['url']),

94
mod/post.php
View File

@ -673,16 +673,16 @@ function post_post(&$a) {
/* Check if the sender is already verified here */ /* Check if the sender is already verified here */
$hub = zot_gethub($sender); $hubs = zot_gethub($sender,true);
if (! $hub) { if (! $hubs) {
/* Have never seen this guid or this guid coming from this location. Check it and register it. */ /* Have never seen this guid or this guid coming from this location. Check it and register it. */
// (!!) this will validate the sender // (!!) this will validate the sender
$result = zot_register_hub($sender); $result = zot_register_hub($sender);
if ((! $result['success']) || (! ($hub = zot_gethub($sender)))) { if ((! $result['success']) || (! ($hubs = zot_gethub($sender,true)))) {
$ret['message'] = 'Hub not available.'; $ret['message'] = 'Hub not available.';
logger('mod_zot: no hub'); logger('mod_zot: no hub');
json_return_and_die($ret); json_return_and_die($ret);
@ -690,47 +690,67 @@ function post_post(&$a) {
} }
// Update our DB to show when we last communicated successfully with this hub foreach($hubs as $hub) {
// This will allow us to prune dead hubs from using up resources
$r = q("update hubloc set hubloc_connected = '%s' where hubloc_id = %d", $sitekey = $hub['hubloc_sitekey'];
dbesc(datetime_convert()),
intval($hub['hubloc_id'])
);
// a dead hub came back to life - reset any tombstones we might have if(array_key_exists('sitekey',$sender) && $sender['sitekey']) {
if ($hub['hubloc_status'] & HUBLOC_OFFLINE) { /*
q("update hubloc set hubloc_status = (hubloc_status & ~%d) where hubloc_id = %d", * This hub has now been proven to be valid.
intval(HUBLOC_OFFLINE), * Any hub with the same URL and a different sitekey cannot be valid.
intval($hub['hubloc_id']) * Get rid of them (mark them deleted). There's a good chance they were re-installs.
*/
q("update hubloc set hubloc_flags = ( hubloc_flags | %d ) where hubloc_url = '%s' and hubloc_sitekey != '%s' ",
intval(HUBLOC_FLAGS_DELETED),
dbesc($hub['hubloc_url']),
dbesc($sender['sitekey'])
);
$sitekey = $sender['sitekey'];
}
// $sender['sitekey'] is a new addition to the protcol to distinguish
// hublocs coming from re-installed sites. Older sites will not provide
// this field and we have to still mark them valid, since we can't tell
// if this hubloc has the same sitekey as the packet we received.
// Update our DB to show when we last communicated successfully with this hub
// This will allow us to prune dead hubs from using up resources
$r = q("update hubloc set hubloc_connected = '%s' where hubloc_id = %d and hubloc_sitekey = '%s' ",
dbesc(datetime_convert()),
intval($hub['hubloc_id']),
dbesc($sitekey)
); );
if ($r[0]['hubloc_flags'] & HUBLOC_FLAGS_ORPHANCHECK) {
q("update hubloc set hubloc_flags = (hubloc_flags & ~%d) where hubloc_id = %d", // a dead hub came back to life - reset any tombstones we might have
intval(HUBLOC_FLAGS_ORPHANCHECK),
intval($hub['hubloc_id']) if ($hub['hubloc_status'] & HUBLOC_OFFLINE) {
q("update hubloc set hubloc_status = (hubloc_status & ~%d) where hubloc_id = %d and hubloc_sitekey = '%s' ",
intval(HUBLOC_OFFLINE),
intval($hub['hubloc_id']),
dbesc($sitekey)
);
if ($r[0]['hubloc_flags'] & HUBLOC_FLAGS_ORPHANCHECK) {
q("update hubloc set hubloc_flags = (hubloc_flags & ~%d) where hubloc_id = %d and hubloc_sitekey = '%s' ",
intval(HUBLOC_FLAGS_ORPHANCHECK),
intval($hub['hubloc_id']),
dbesc($sitekey)
);
}
q("update xchan set xchan_flags = (xchan_flags & ~%d) where (xchan_flags & %d)>0 and xchan_hash = '%s'",
intval(XCHAN_FLAGS_ORPHAN),
intval(XCHAN_FLAGS_ORPHAN),
dbesc($hub['hubloc_hash'])
); );
} }
q("update xchan set xchan_flags = (xchan_flags & ~%d) where (xchan_flags & %d)>0 and xchan_hash = '%s'",
intval(XCHAN_FLAGS_ORPHAN), $connecting_url = $hub['hubloc_url'];
intval(XCHAN_FLAGS_ORPHAN),
dbesc($hub['hubloc_hash'])
);
} }
/*
* This hub has now been proven to be valid.
* Any hub with the same URL and a different sitekey cannot be valid.
* Get rid of them (mark them deleted). There's a good chance they were re-installs.
*/
// fixed in hubzilla with a protocol change
// q("update hubloc set hubloc_flags = ( hubloc_flags | %d ) where hubloc_url = '%s' and hubloc_sitekey != '%s' ",
// intval(HUBLOC_FLAGS_DELETED),
// dbesc($hub['hubloc_url']),
// dbesc($hub['hubloc_sitekey'])
// );
/** @TODO check which hub is primary and take action if mismatched */ /** @TODO check which hub is primary and take action if mismatched */
if (array_key_exists('recipients', $data)) if (array_key_exists('recipients', $data))
@ -932,7 +952,7 @@ function post_post(&$a) {
if ($msgtype === 'notify') { if ($msgtype === 'notify') {
logger('notify received from ' . $hub['hubloc_url']); logger('notify received from ' . $connecting_url);
$async = get_config('system','queued_fetch'); $async = get_config('system','queued_fetch');