http signature consolidation

This commit is contained in:
zotlabs
2019-06-26 21:45:21 -07:00
parent 4f280b5497
commit cf844cb27c
22 changed files with 304 additions and 185 deletions

View File

@@ -2,6 +2,8 @@
namespace Zotlabs\Zot;
use Zotlabs\Web\HTTPSig;
/**
* @brief Finger
*
@@ -95,8 +97,7 @@ class Finger {
$headers['X-Zot-Nonce'] = random_string();
$headers['Host'] = $parsed_host;
$xhead = \Zotlabs\Web\HTTPSig::create_sig('',$headers,$channel['channel_prvkey'],
'acct:' . $channel['channel_address'] . '@' . \App::get_hostname(),false);
$xhead = HTTPSig::create_sig($headers,$channel['channel_prvkey'],'acct:' . channel_reddress($channel));
$retries = 0;
@@ -129,7 +130,7 @@ class Finger {
$x = json_decode($result['body'], true);
$verify = \Zotlabs\Web\HTTPSig::verify($result,(($x) ? $x['key'] : ''));
$verify = HTTPSig::verify($result,(($x) ? $x['key'] : ''));
if($x && (! $verify['header_valid'])) {
$signed_token = ((is_array($x) && array_key_exists('signed_token', $x)) ? $x['signed_token'] : null);