diff options
| author | zotlabs <mike@macgirvin.com> | 2017-12-12 11:54:26 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-12-12 11:54:26 -0800 |
| commit | 215d615fc3bb9e168e21a78a6319a7971c4d1e9e (patch) | |
| tree | ff0af309ef283c48a6f3df5d590068c103d6bf7a /include/api_auth.php | |
| parent | 979c05b24da0497be582aacaa8b744f692b56ccf (diff) | |
| parent | d0956eb39d7a361639f5cd73fb1c3c8463fb1e99 (diff) | |
| download | volse-hubzilla-215d615fc3bb9e168e21a78a6319a7971c4d1e9e.tar.gz volse-hubzilla-215d615fc3bb9e168e21a78a6319a7971c4d1e9e.tar.bz2 volse-hubzilla-215d615fc3bb9e168e21a78a6319a7971c4d1e9e.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/api_auth.php')
| -rw-r--r-- | include/api_auth.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/api_auth.php b/include/api_auth.php index 0818fa54b..5c0bcb317 100644 --- a/include/api_auth.php +++ b/include/api_auth.php @@ -52,6 +52,7 @@ function api_login(&$a){ /* Signature authentication */ if(array_key_exists($head,$_SERVER) && substr(trim($_SERVER[$head]),0,9) === 'Signature') { + if($head !== 'HTTP_AUTHORIZATION') { $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER[$head]; continue; @@ -59,7 +60,7 @@ function api_login(&$a){ $sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]); if($sigblock) { - $keyId = $sigblock['keyId']; + $keyId = str_replace('acct:','',$sigblock['keyId']); if($keyId) { $r = q("select * from hubloc where hubloc_addr = '%s' limit 1", dbesc($keyId) |