harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

strip acct: from OWA auth to API endpoints

Browse Source
This commit is contained in:
zotlabs
2017-12-07 18:56:26 -08:00
parent e9ae51cfbc
commit 85b7c90637
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Cdav.php
View File

@@ -39,7 +39,7 @@ class Cdav extends \Zotlabs\Web\Controller {
$sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]); $sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]);
if($sigblock) { if($sigblock) {
$keyId = $sigblock['keyId']; $keyId = str_replace('acct:','',$sigblock['keyId']);
if($keyId) { if($keyId) {
$r = q("select * from hubloc where hubloc_addr = '%s' limit 1", $r = q("select * from hubloc where hubloc_addr = '%s' limit 1",
dbesc($keyId) dbesc($keyId)

2
Zotlabs/Module/Dav.php
View File

@@ -48,7 +48,7 @@ class Dav extends \Zotlabs\Web\Controller {
$sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]); $sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]);
if($sigblock) { if($sigblock) {
$keyId = $sigblock['keyId']; $keyId = str_replace('acct:','',$sigblock['keyId']);
if($keyId) { if($keyId) {
$r = q("select * from hubloc where hubloc_addr = '%s' limit 1", $r = q("select * from hubloc where hubloc_addr = '%s' limit 1",
dbesc($keyId) dbesc($keyId)

3
include/api_auth.php
View File

@@ -52,6 +52,7 @@ function api_login(&$a){
/* Signature authentication */ /* Signature authentication */
if(array_key_exists($head,$_SERVER) && substr(trim($_SERVER[$head]),0,9) === 'Signature') { if(array_key_exists($head,$_SERVER) && substr(trim($_SERVER[$head]),0,9) === 'Signature') {
if($head !== 'HTTP_AUTHORIZATION') { if($head !== 'HTTP_AUTHORIZATION') {
$_SERVER['HTTP_AUTHORIZATION'] = $_SERVER[$head]; $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER[$head];
continue; continue;
@@ -59,7 +60,7 @@ function api_login(&$a){
$sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]); $sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]);
if($sigblock) { if($sigblock) {
$keyId = $sigblock['keyId']; $keyId = str_replace('acct:','',$sigblock['keyId']);
if($keyId) { if($keyId) {
$r = q("select * from hubloc where hubloc_addr = '%s' limit 1", $r = q("select * from hubloc where hubloc_addr = '%s' limit 1",
dbesc($keyId) dbesc($keyId)