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

fix keyids

Browse source
This commit is contained in:
Mike Macgirvin 2024-05-16 21:08:01 +10:00
parent 58f35b0434
commit 6e7c42cd55
15 changed files with 23 additions and 21 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']
];
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), true, 'sha512');
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel), true, 'sha512');
$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']
];
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), true, 'sha512');
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel), true, 'sha512');
$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 ,
];
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), true, 'sha512');
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel), 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 ]);

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,
];
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), true, 'sha512');
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel), true, 'sha512');
$x = Url::get($hz_server . '/api/z/1.0/file/export?f=&zap_compat=1&file_id=' . $attach_id, [ 'headers' => $headers ]);
if (! $x['success']) {

4
src/Lib/Activity.php
View file

@ -1770,8 +1770,8 @@ class Activity
$actor->setPublicKey([
'id' => $current_url . '?operation=rsakey',
'owner' => $current_url,
'id' => (($nomadic) ? Channel::getDidResolver($channel, true) : $current_url) . '#rsakey',
'owner' => $nomadic ? Channel::getDidResolver($channel, true) : $current_url,
'signatureAlgorithm' => 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256',
'publicKeyPem' => $p['xchan_pubkey']
]);

6
src/Lib/Channel.php
View file

@ -2615,10 +2615,12 @@ class Channel
}
if ($channel['channel_address'] === App::get_hostname() || intval($channel['channel_system'])) {
return z_root() . '?operation=rsakey';
return z_root() . '#rsakey';
}
$nomadic = PConfig::Get($channel['channel_id'], 'system', 'nomaadicAP');
$url = $nomadic ? self::getDidResolver($channel, true) : z_root() . '/channel/' . $channel['channel_address'];
return (($channel) ? z_root() . '/channel/' . $channel['channel_address'] : z_root()) . '?operation=rsakey';
return $url . '#rsakey';
}
public static function is_group($uid)

4
src/Lib/Libzot.php
View file

@ -235,7 +235,7 @@ class Libzot
$h = HTTPSig::create_sig(
$headers,
$channel['channel_prvkey'],
Channel::url($channel),
Channel::keyId($channel),
false,
'sha512',
(($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)
];
$h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],Channel::url($channel),false,'sha512',
$h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],Channel::keyId($channel),false,'sha512',
(($crypto) ? [ 'key' => $crypto['hubloc_sitekey'], 'algorithm' => self::best_algorithm($crypto['site_crypto']) ] : false));
}
else {

4
src/Lib/Zotfinger.php
View file

@ -37,7 +37,7 @@ class Zotfinger
'Host' => $m['host'],
'(request-target)' => 'post ' . get_request_string($resource)
];
$h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), false);
$h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel), false);
}
else {
$h = ['Accept: ' . $accepts];
@ -125,7 +125,7 @@ class Zotfinger
'Host' => $m['host'],
'(request-target)' => 'get ' . get_request_string($resource)
];
$h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), false);
$h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel), false);
}
else {
$h = ['Accept: ' . $accepts];

2
src/Module/Activity.php
View file

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

2
src/Module/Channel.php
View file

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

2
src/Module/Directory.php
View file

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

2
src/Module/Id.php
View file

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

4
src/Module/Import.php
View file

@ -602,7 +602,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,
];
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), true, 'sha512');
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel), 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]);
@ -635,7 +635,7 @@ class Import extends Controller
'(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::url($channel), true, 'sha512');
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel), true, 'sha512');
$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

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

2
src/Module/Magic.php
View file

@ -102,7 +102,7 @@ class Magic extends Controller
$headers['Host'] = $parsed['host'];
$headers['(request-target)'] = 'get ' . '/owa';
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), true, 'sha512');
$headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::keyId($channel), true, 'sha512');
$x = Url::get($owapath, ['headers' => $headers]);
logger('owa fetch returned: ' . print_r($x, true), LOGGER_DATA);

2
src/Module/Search.php
View file

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