diff options
| author | zotlabs <mike@macgirvin.com> | 2020-01-29 14:29:06 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2020-01-29 14:29:06 -0800 |
| commit | 3df5d854b8935b11c67893bbbd24cdf8829eda00 (patch) | |
| tree | b206e3050ed8bb54022f3e7c1be105903274febb | |
| parent | f123809d29d6cc335251cd4fd8984c1b5ef67e2a (diff) | |
| download | volse-hubzilla-3df5d854b8935b11c67893bbbd24cdf8829eda00.tar.gz volse-hubzilla-3df5d854b8935b11c67893bbbd24cdf8829eda00.tar.bz2 volse-hubzilla-3df5d854b8935b11c67893bbbd24cdf8829eda00.zip | |
z6 transition work - prevent z6 sync packets from being unpacked into an incompatible schema
| -rw-r--r-- | Zotlabs/Lib/Libsync.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 7 | ||||
| -rw-r--r-- | include/zid.php | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php index d93270bc5..b9e9bb38a 100644 --- a/Zotlabs/Lib/Libsync.php +++ b/Zotlabs/Lib/Libsync.php @@ -83,7 +83,7 @@ class Libsync { $info = (($packet) ? $packet : array()); $info['type'] = 'sync'; - $info['encoding'] = 'red'; // note: not zot, this packet is very platform specific + $info['encoding'] = 'hz'; // note: not zot, this packet is very platform specific $info['relocate'] = ['channel_address' => $channel['channel_address'], 'url' => z_root() ]; if(array_key_exists($uid,\App::$config) && array_key_exists('transient',\App::$config[$uid])) { @@ -144,7 +144,7 @@ class Libsync { foreach($synchubs as $hub) { $hash = random_string(); - $n = Libzot::build_packet($channel,'sync',$env_recips,json_encode($info),'red',$hub['hubloc_sitekey'],$hub['site_crypto']); + $n = Libzot::build_packet($channel,'sync',$env_recips,json_encode($info),'hz',$hub['hubloc_sitekey'],$hub['site_crypto']); Queue::insert(array( 'hash' => $hash, 'account_id' => $channel['channel_account_id'], diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index ad00aa97a..bb70dfbf2 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -1277,7 +1277,12 @@ class Libzot { logger('Channel sync received: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG); logger('Channel sync recipients: ' . print_r($deliveries,true), LOGGER_DATA, LOG_DEBUG); - $result = Libsync::process_channel_sync_delivery($env['sender'],$arr,$deliveries); + if ($env['encoding'] === 'hz') { + $result = Libsync::process_channel_sync_delivery($env['sender'],$arr,$deliveries); + } + else { + logger('sync packet type not supported.'); + } } } if ($result) { diff --git a/include/zid.php b/include/zid.php index 3b3dd8554..325af5580 100644 --- a/include/zid.php +++ b/include/zid.php @@ -1,6 +1,7 @@ <?php use Zotlabs\Lib\Verify; +use Zotlabs\Zot\Finger; function is_matrix_url($url) { |