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/Dav.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/Dav.php')
| -rw-r--r-- | Zotlabs/Module/Dav.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php index 9f64e2fea..866520461 100644 --- a/Zotlabs/Module/Dav.php +++ b/Zotlabs/Module/Dav.php @@ -8,8 +8,9 @@ namespace Zotlabs\Module; -use \Sabre\DAV as SDAV; -use \Zotlabs\Storage; +use Sabre\DAV as SDAV; +use Zotlabs\Storage; +use Zotlabs\Web\HTTPSig; require_once('include/attach.php'); require_once('include/auth.php'); @@ -46,7 +47,7 @@ class Dav extends \Zotlabs\Web\Controller { continue; } - $sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]); + $sigblock = HTTPSig::parse_sigheader($_SERVER[$head]); if($sigblock) { $keyId = str_replace('acct:','',$sigblock['keyId']); if($keyId) { @@ -69,7 +70,7 @@ class Dav extends \Zotlabs\Web\Controller { continue; if($record) { - $verified = \Zotlabs\Web\HTTPSig::verify('',$record['channel']['channel_pubkey']); + $verified = HTTPSig::verify('',$record['channel']['channel_pubkey']); if(! ($verified && $verified['header_signed'] && $verified['header_valid'])) { $record = null; } |