Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 16:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use legacy keyId for most zot6/nomad communications

Browse source
This commit is contained in:
Mike Macgirvin 2024-07-20 18:07:52 +10:00
parent a3c2b9d0e0
commit dcbd3a44a6
10 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/import.php
View file

@ -1625,7 +1625,7 @@ function sync_files($channel, $files)
'(request-target)' => 'post ' . $m['path'] . '/' . $att['hash'] '(request-target)' => 'post ' . $m['path'] . '/' . $att['hash']
]; ];
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel), true, 'sha512'); $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel,true), true, 'sha512');
$x = Url::post($fetch_url . '/' . $att['hash'], $parr, [ 'filep' => $fp, 'headers' => $headers]); $x = Url::post($fetch_url . '/' . $att['hash'], $parr, [ 'filep' => $fp, 'headers' => $headers]);
@ -1717,7 +1717,7 @@ function sync_files($channel, $files)
'(request-target)' => 'post ' . $m['path'] . '/' . $att['hash'] '(request-target)' => 'post ' . $m['path'] . '/' . $att['hash']
]; ];
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel), true, 'sha512'); $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel, true), true, 'sha512');
$x = Url::post($fetch_url . '/' . $att['hash'], $parr, [ 'filep' => $fp, 'headers' => $headers]); $x = Url::post($fetch_url . '/' . $att['hash'], $parr, [ 'filep' => $fp, 'headers' => $headers]);

2
src/Daemon/Content_importer.php
View file

@ -39,7 +39,7 @@ class Content_importer implements DaemonInterface
'(request-target)' => 'get /api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page , '(request-target)' => 'get /api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page ,
]; ];
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel), true, 'sha512'); $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel,true), true, 'sha512');
$x = Url::get($hz_server . '/api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page, [ 'headers' => $headers ]); $x = Url::get($hz_server . '/api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page, [ 'headers' => $headers ]);

2
src/Daemon/File_importer.php
View file

@ -37,7 +37,7 @@ class File_importer implements DaemonInterface
'(request-target)' => 'get /api/z/1.0/file/export?f=&zap_compat=1&file_id=' . $attach_id, '(request-target)' => 'get /api/z/1.0/file/export?f=&zap_compat=1&file_id=' . $attach_id,
]; ];
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel), true, 'sha512'); $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel,true), true, 'sha512');
$x = Url::get($hz_server . '/api/z/1.0/file/export?f=&zap_compat=1&file_id=' . $attach_id, [ 'headers' => $headers ]); $x = Url::get($hz_server . '/api/z/1.0/file/export?f=&zap_compat=1&file_id=' . $attach_id, [ 'headers' => $headers ]);
if (! $x['success']) { if (! $x['success']) {

3
src/Lib/Channel.php
View file

@ -2630,6 +2630,9 @@ class Channel
return z_root() . '#rsakey'; return z_root() . '#rsakey';
} }
$nomadic = PConfig::Get($channel['channel_id'], 'system', 'nomadicAP'); $nomadic = PConfig::Get($channel['channel_id'], 'system', 'nomadicAP');
if ($legacy) {
$nomadic = false;
}
$url = $nomadic ? self::getDidResolver($channel, true) : z_root() . '/channel/' . $channel['channel_address']; $url = $nomadic ? self::getDidResolver($channel, true) : z_root() . '/channel/' . $channel['channel_address'];
return $url . (($legacy) ? '' : '#rsakey'); return $url . (($legacy) ? '' : '#rsakey');

4
src/Lib/Libzot.php
View file

@ -235,7 +235,7 @@ class Libzot
$h = HTTPSig::create_sig( $h = HTTPSig::create_sig(
$headers, $headers,
$channel['channel_prvkey'], $channel['channel_prvkey'],
Channel::keyId($channel), Channel::keyId($channel,true),
false, false,
'sha512', 'sha512',
(($crypto) ? ['key' => $crypto['hubloc_sitekey'], 'algorithm' => self::best_algorithm($crypto['site_crypto'])] : false) (($crypto) ? ['key' => $crypto['hubloc_sitekey'], 'algorithm' => self::best_algorithm($crypto['site_crypto'])] : false)
@ -257,7 +257,7 @@ class Libzot
'(request-target)' => 'post ' . get_request_string($url) '(request-target)' => 'post ' . get_request_string($url)
]; ];
$h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],Channel::keyId($channel),false,'sha512', $h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],Channel::keyId($channel,true),false,'sha512',
(($crypto) ? [ 'key' => $crypto['hubloc_sitekey'], 'algorithm' => self::best_algorithm($crypto['site_crypto']) ] : false)); (($crypto) ? [ 'key' => $crypto['hubloc_sitekey'], 'algorithm' => self::best_algorithm($crypto['site_crypto']) ] : false));
} }
else { else {

2
src/Module/Activity.php
View file

@ -300,7 +300,7 @@ class Activity extends Controller
$ret = json_encode($x, JSON_UNESCAPED_SLASHES); $ret = json_encode($x, JSON_UNESCAPED_SLASHES);
$headers['Digest'] = HTTPSig::generate_digest_header($ret); $headers['Digest'] = HTTPSig::generate_digest_header($ret);
$headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']; $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
$h = HTTPSig::create_sig($headers, $chan['channel_prvkey'], Channel::keyId($chan)); $h = HTTPSig::create_sig($headers, $chan['channel_prvkey'], Channel::keyId($chan, true));
HTTPSig::set_headers($h); HTTPSig::set_headers($h);
echo $ret; echo $ret;
killme(); killme();

2
src/Module/Channel.php
View file

@ -201,7 +201,7 @@ class Channel extends Controller
'Digest' => HTTPSig::generate_digest_header($data), 'Digest' => HTTPSig::generate_digest_header($data),
'(request-target)' => strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'] '(request-target)' => strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']
]; ];
$h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Zlib\Channel::keyId($channel)); $h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Zlib\Channel::keyId($channel,true));
HTTPSig::set_headers($h); HTTPSig::set_headers($h);
echo $data; echo $data;
killme(); killme();

2
src/Module/Id.php
View file

@ -103,7 +103,7 @@ class Id extends Controller
$ret = json_encode($x, JSON_UNESCAPED_SLASHES); $ret = json_encode($x, JSON_UNESCAPED_SLASHES);
$headers['Digest'] = HTTPSig::generate_digest_header($ret); $headers['Digest'] = HTTPSig::generate_digest_header($ret);
$headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']; $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
$h = HTTPSig::create_sig($headers, $chan['channel_prvkey'], Channel::keyId($chan)); $h = HTTPSig::create_sig($headers, $chan['channel_prvkey'], Channel::keyId($chan,true));
HTTPSig::set_headers($h); HTTPSig::set_headers($h);
echo $ret; echo $ret;
killme(); killme();

4
src/Module/Import.php
View file

@ -631,7 +631,7 @@ class Import extends Controller
'(request-target)' => 'get /api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page, '(request-target)' => 'get /api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page,
]; ];
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel), true, 'sha512'); $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel,true), true, 'sha512');
$x = Url::get($hz_server . '/api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page, ['headers' => $headers]); $x = Url::get($hz_server . '/api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page, ['headers' => $headers]);
@ -664,7 +664,7 @@ class Import extends Controller
'(request-target)' => 'get /api/z/1.0/files?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until), '(request-target)' => 'get /api/z/1.0/files?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until),
]; ];
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel), true, 'sha512'); $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel,true), true, 'sha512');
$x = Url::get($hz_server . '/api/z/1.0/files?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until), ['headers' => $headers]); $x = Url::get($hz_server . '/api/z/1.0/files?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until), ['headers' => $headers]);

2
src/Module/Item.php
View file

@ -325,7 +325,7 @@ class Item extends Controller
$ret = json_encode($x, JSON_UNESCAPED_SLASHES); $ret = json_encode($x, JSON_UNESCAPED_SLASHES);
$headers['Digest'] = HTTPSig::generate_digest_header($ret); $headers['Digest'] = HTTPSig::generate_digest_header($ret);
$headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']; $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
$h = HTTPSig::create_sig($headers, $chan['channel_prvkey'], Channel::keyId($chan)); $h = HTTPSig::create_sig($headers, $chan['channel_prvkey'], Channel::keyId($chan, true));
HTTPSig::set_headers($h); HTTPSig::set_headers($h);
echo $ret; echo $ret;
killme(); killme();