From 61f339a874784d3181f4c884bab9994ec9200f50 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 7 Sep 2017 17:56:02 -0700
Subject: owa - first commit

---
 Zotlabs/Module/Owa.php | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 Zotlabs/Module/Owa.php

(limited to 'Zotlabs/Module/Owa.php')

diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php
new file mode 100644
index 000000000..f71099599
--- /dev/null
+++ b/Zotlabs/Module/Owa.php
@@ -0,0 +1,57 @@
+<?php
+
+
+namespace Zotlabs\Module;
+
+
+
+class Owa extends \Zotlabs\Web\Controller {
+
+	function init() {
+		foreach([ 'REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION' ] as $head) {
+
+			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'];
+
+					if($keyId) {
+						$r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash 
+							where hubloc_addr = '%s' limit 1",
+							dbesc(str_replace('acct:','',$keyId))
+						);
+						if($r) {
+							$hubloc = $r[0];
+							$verified = \Zotlabs\Web\HTTPSig::verify('',$hubloc['xchan_pubkey']);
+
+logger('verified: ' . print_r($verified,true));
+
+							if($verified && $verified['header_signed'] && $verified['header_valid']) {
+								$token = random_string(32);
+								\Zotlabs\Zot\Verify::create('owt',0,token,$r[0]['hubloc_hash']);
+								$x = json_encode([ 'success' => true, 'token' => $token ]);
+								header('Content-Type: application/x-zot+json');
+								echo $x;
+								killme();
+							}
+						}
+					}
+				}
+				$x = json_encode([ 'success' => false ]);
+				header('Content-Type: application/x-zot+json');
+				echo $x;
+				killme();	
+			}
+		}
+
+		$x = json_encode([ 'success' => false ]);
+		header('Content-Type: application/x-zot+json');
+		echo $x;
+		killme();	
+	}
+}
-- 
cgit v1.2.3


From 1fbb1e6c2a665159d0085217c9b73d571e360256 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 7 Sep 2017 18:52:18 -0700
Subject: initial testing success with owa

---
 Zotlabs/Module/Owa.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Zotlabs/Module/Owa.php')

diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php
index f71099599..0b625dbe5 100644
--- a/Zotlabs/Module/Owa.php
+++ b/Zotlabs/Module/Owa.php
@@ -33,7 +33,7 @@ logger('verified: ' . print_r($verified,true));
 
 							if($verified && $verified['header_signed'] && $verified['header_valid']) {
 								$token = random_string(32);
-								\Zotlabs\Zot\Verify::create('owt',0,token,$r[0]['hubloc_hash']);
+								\Zotlabs\Zot\Verify::create('owt',0,$token,$r[0]['hubloc_addr']);
 								$x = json_encode([ 'success' => true, 'token' => $token ]);
 								header('Content-Type: application/x-zot+json');
 								echo $x;
-- 
cgit v1.2.3


From 84c86f01c853f87be93807b3e190f954aca2e6e6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 8 Sep 2017 16:00:27 -0700
Subject: owa: missed the set-observer stuff

---
 Zotlabs/Module/Owa.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'Zotlabs/Module/Owa.php')

diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php
index 0b625dbe5..900ab9f85 100644
--- a/Zotlabs/Module/Owa.php
+++ b/Zotlabs/Module/Owa.php
@@ -1,9 +1,16 @@
 <?php
 
-
 namespace Zotlabs\Module;
 
-
+/**
+ * OpenWebAuth verifier and token generator
+ * See https://macgirvin.com/wiki/mike/OpenWebAuth/Home
+ * Requests to this endpoint should be signed using HTTP Signatures
+ * using the 'Authorization: Signature' authentication method
+ * If the signature verifies a token is returned. 
+ *
+ * This token may be exchanged for an authenticated cookie. 
+ */
 
 class Owa extends \Zotlabs\Web\Controller {
 
@@ -29,8 +36,6 @@ class Owa extends \Zotlabs\Web\Controller {
 							$hubloc = $r[0];
 							$verified = \Zotlabs\Web\HTTPSig::verify('',$hubloc['xchan_pubkey']);
 
-logger('verified: ' . print_r($verified,true));
-
 							if($verified && $verified['header_signed'] && $verified['header_valid']) {
 								$token = random_string(32);
 								\Zotlabs\Zot\Verify::create('owt',0,$token,$r[0]['hubloc_addr']);
@@ -42,13 +47,8 @@ logger('verified: ' . print_r($verified,true));
 						}
 					}
 				}
-				$x = json_encode([ 'success' => false ]);
-				header('Content-Type: application/x-zot+json');
-				echo $x;
-				killme();	
 			}
 		}
-
 		$x = json_encode([ 'success' => false ]);
 		header('Content-Type: application/x-zot+json');
 		echo $x;
-- 
cgit v1.2.3


From e2e7bee3cca6f2ffc88aee9c94066e117e7a682b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 9 Sep 2017 13:34:57 -0700
Subject: owa cleanup

---
 Zotlabs/Module/Owa.php | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'Zotlabs/Module/Owa.php')

diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php
index 900ab9f85..4b0d855c5 100644
--- a/Zotlabs/Module/Owa.php
+++ b/Zotlabs/Module/Owa.php
@@ -15,8 +15,10 @@ namespace Zotlabs\Module;
 class Owa extends \Zotlabs\Web\Controller {
 
 	function init() {
-		foreach([ 'REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION' ] as $head) {
 
+		$ret = [ 'success' => false ];
+
+		foreach([ 'REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION' ] as $head) {
 			if(array_key_exists($head,$_SERVER) && substr(trim($_SERVER[$head]),0,9) === 'Signature') {
 				if($head !== 'HTTP_AUTHORIZATION') {
 					$_SERVER['HTTP_AUTHORIZATION'] = $_SERVER[$head];
@@ -34,24 +36,18 @@ class Owa extends \Zotlabs\Web\Controller {
 						);
 						if($r) {
 							$hubloc = $r[0];
-							$verified = \Zotlabs\Web\HTTPSig::verify('',$hubloc['xchan_pubkey']);
-
+							$verified = \Zotlabs\Web\HTTPSig::verify('',$hubloc['xchan_pubkey']);	
 							if($verified && $verified['header_signed'] && $verified['header_valid']) {
+								$ret['success'] = true;
 								$token = random_string(32);
 								\Zotlabs\Zot\Verify::create('owt',0,$token,$r[0]['hubloc_addr']);
-								$x = json_encode([ 'success' => true, 'token' => $token ]);
-								header('Content-Type: application/x-zot+json');
-								echo $x;
-								killme();
+								$ret['token'] = $token;
 							}
 						}
 					}
 				}
 			}
 		}
-		$x = json_encode([ 'success' => false ]);
-		header('Content-Type: application/x-zot+json');
-		echo $x;
-		killme();	
+		json_return_and_die($ret,'application/x-zot+json');
 	}
 }
-- 
cgit v1.2.3