diff options
| author | Mario <mario@mariovavti.com> | 2019-06-27 13:05:25 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-06-27 13:05:25 +0200 |
| commit | 49ba3ffee6e53eefe11a03c62ee673398717b167 (patch) | |
| tree | a0f0b45249487bd471bcf0545dfbb23f7b871623 /Zotlabs/Module/Magic.php | |
| parent | 5ccef18d4e5b7901f78a11e0124c16e1c484e3bf (diff) | |
| parent | cf844cb27c02c3aae636eb1aa1587b1d5e3e81a0 (diff) | |
| download | volse-hubzilla-49ba3ffee6e53eefe11a03c62ee673398717b167.tar.gz volse-hubzilla-49ba3ffee6e53eefe11a03c62ee673398717b167.tar.bz2 volse-hubzilla-49ba3ffee6e53eefe11a03c62ee673398717b167.zip | |
Merge branch 'httpsig' into 'dev'
http signature consolidation
See merge request hubzilla/core!1685
Diffstat (limited to 'Zotlabs/Module/Magic.php')
| -rw-r--r-- | Zotlabs/Module/Magic.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php index e8e960574..6ac656a04 100644 --- a/Zotlabs/Module/Magic.php +++ b/Zotlabs/Module/Magic.php @@ -1,6 +1,8 @@ <?php namespace Zotlabs\Module; +use Zotlabs\Web\HTTPSig; + @require_once('include/zot.php'); @@ -152,10 +154,9 @@ class Magic extends \Zotlabs\Web\Controller { $headers['Accept'] = 'application/x-zot+json' ; $headers['X-Open-Web-Auth'] = random_string(); $headers['Host'] = $parsed['host']; - $headers['Digest'] = 'SHA-256=' . \Zotlabs\Web\HTTPSig::generate_digest($data,false); + $headers['Digest'] = HTTPSig::generate_digest_header($data); - $headers = \Zotlabs\Web\HTTPSig::create_sig('',$headers,$channel['channel_prvkey'], - 'acct:' . $channel['channel_address'] . '@' . \App::get_hostname(),false,true,'sha512'); + $headers = HTTPSig::create_sig($headers,$channel['channel_prvkey'], 'acct:' . channel_reddress($channel),true,'sha512'); $x = z_post_url($basepath . '/owa',$data,$redirects,[ 'headers' => $headers ]); if($x['success']) { |