some changes after testing server-to-server magic auth

4 files changed, 36 insertions, 22 deletions

diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
index bae3fc6aa..abaec26a6 100644
--- a/Zotlabs/Module/Cdav.php
+++ b/Zotlabs/Module/Cdav.php
@@ -32,6 +32,11 @@ class Cdav extends \Zotlabs\Web\Controller {
 				/* 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;
+					}
+
 					$sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]);
 					if($sigblock) {
 						$keyId = $sigblock['keyId'];
@@ -43,20 +48,17 @@ class Cdav extends \Zotlabs\Web\Controller {
 								$c = channelx_by_hash($r[0]['hubloc_hash']);
 								if($c) {
 									$a = q("select * from account where account_id = %d limit 1",
-										intval($c[0]['channel_account_id'])
+										intval($c['channel_account_id'])
 									);
 									if($a) {
-										$record = [ 'channel' => $c[0], 'account' => $a[0] ];
-										$channel_login = $c[0]['channel_id'];
+										$record = [ 'channel' => $c, 'account' => $a[0] ];
+										$channel_login = $c['channel_id'];
 									}
 								}
 							}
 							if(! $record)
 								continue;
 
-							if($head !== 'HTTP_AUTHORIZATION') {
-								$_SERVER['HTTP_AUTHORIZATION'] = $_SERVER[$head];
-							}
 							if($record) {
 								$verified = \Zotlabs\Web\HTTPSig::verify('',$record['channel']['channel_pubkey']);
 								if(! ($verified && $verified['header_signed'] && $verified['header_valid'])) {
diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php
index 8c4512806..d506fe9f5 100644
--- a/Zotlabs/Module/Dav.php
+++ b/Zotlabs/Module/Dav.php
@@ -41,6 +41,11 @@ class Dav extends \Zotlabs\Web\Controller {
 			/* 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;
+				}
+
 				$sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]);
 				if($sigblock) {
 					$keyId = $sigblock['keyId'];
@@ -52,19 +57,17 @@ class Dav extends \Zotlabs\Web\Controller {
 							$c = channelx_by_hash($r[0]['hubloc_hash']);
 							if($c) {
 								$a = q("select * from account where account_id = %d limit 1",
-									intval($c[0]['channel_account_id'])
+									intval($c['channel_account_id'])
 								);
 								if($a) {
-									$record = [ 'channel' => $c[0], 'account' => $a[0] ];
-									$channel_login = $c[0]['channel_id'];
+									$record = [ 'channel' => $c, 'account' => $a[0] ];
+									$channel_login = $c['channel_id'];
 								}
 							}
 						}
 						if(! $record)
 							continue;
-						if($head !== 'HTTP_AUTHORIZATION') {
-							$_SERVER['HTTP_AUTHORIZATION'] = $_SERVER[$head];
-						}
+
 						if($record) {
 							$verified = \Zotlabs\Web\HTTPSig::verify('',$record['channel']['channel_pubkey']);
 							if(! ($verified && $verified['header_signed'] && $verified['header_valid'])) {
diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php
index 537cd52a1..1f485a881 100644
--- a/Zotlabs/Web/HTTPSig.php
+++ b/Zotlabs/Web/HTTPSig.php
@@ -145,7 +145,7 @@ class HTTPSig {
 
 
 
-	static function create_sig($request,$head,$prvkey,$keyid = 'Key',$send_headers = false,$alg = 'sha256') {
+	static function create_sig($request,$head,$prvkey,$keyid = 'Key',$send_headers = false,$auth = false,$alg = 'sha256') {
 
 		$return_headers = [];
 
@@ -155,8 +155,14 @@ class HTTPSig {
 
 		$x = self::sign($request,$head,$prvkey,$alg);			
 
-		$sighead = 'Signature: keyId="' . $keyid . '",algorithm="' . $algorithm
+		if($auth) {
+			$sighead = 'Authorization: Signature keyId="' . $keyid . '",algorithm="' . $algorithm
 			. '",headers="' . $x['headers'] . '",signature="' . $x['signature'] . '"';
+		}
+		else {
+			$sighead = 'Signature: keyId="' . $keyid . '",algorithm="' . $algorithm
+			. '",headers="' . $x['headers'] . '",signature="' . $x['signature'] . '"';
+		}
 
 		if($head) {
 			foreach($head as $k => $v) {
diff --git a/include/api_auth.php b/include/api_auth.php
index 01a4599aa..0818fa54b 100644
--- a/include/api_auth.php
+++ b/include/api_auth.php
@@ -8,6 +8,7 @@ function api_login(&$a){
 
 	$record = null;
 	$remote_auth = false;
+	$sigblock = null;
 
 	require_once('include/oauth.php');
 
@@ -51,6 +52,11 @@ 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;
+			}
+
 			$sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]);
 			if($sigblock) {
 				$keyId = $sigblock['keyId'];
@@ -62,11 +68,11 @@ function api_login(&$a){
 						$c = channelx_by_hash($r[0]['hubloc_hash']);
 						if($c) {
 							$a = q("select * from account where account_id = %d limit 1",
-								intval($c[0]['channel_account_id'])
+								intval($c['channel_account_id'])
 							);
 							if($a) {
-								$record = [ 'channel' => $c[0], 'account' => $a[0] ];
-								$channel_login = $c[0]['channel_id'];
+								$record = [ 'channel' => $c, 'account' => $a[0] ];
+								$channel_login = $c['channel_id'];
 							}
 							else {
 								continue;
@@ -80,9 +86,6 @@ function api_login(&$a){
 						continue;
 					}
 
-					if($head !== 'HTTP_AUTHORIZATION') {
-						$_SERVER['HTTP_AUTHORIZATION'] = $_SERVER[$head];
-					}
 					if($record) {					
 						$verified = \Zotlabs\Web\HTTPSig::verify('',$record['channel']['channel_pubkey']);
 						if(! ($verified && $verified['header_signed'] && $verified['header_valid'])) {
@@ -127,8 +130,8 @@ function api_login(&$a){
 }
 
 
-function retry_basic_auth() {
-	header('WWW-Authenticate: Basic realm="Hubzilla"');
+function retry_basic_auth($method = 'Basic') {
+	header('WWW-Authenticate: ' . $method . ' realm="Hubzilla"');
 	header('HTTP/1.0 401 Unauthorized');
 	echo('This api requires login');
 	killme();