diff options
author | Mario Vavti <mario@mariovavti.com> | 2018-01-12 09:16:56 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2018-01-12 09:16:56 +0100 |
commit | 47c14d3ca1078ca1c3d94096542f14a7a537266e (patch) | |
tree | 8da31dba6523101df452138a03885bc4ff49bbee /Zotlabs/Module/Owa.php | |
parent | 25a63dc413cd51ce12deb1a87b0609e7829b0154 (diff) | |
parent | 6a8c5832201262f62a630890935553d51cff6d90 (diff) | |
download | volse-hubzilla-47c14d3ca1078ca1c3d94096542f14a7a537266e.tar.gz volse-hubzilla-47c14d3ca1078ca1c3d94096542f14a7a537266e.tar.bz2 volse-hubzilla-47c14d3ca1078ca1c3d94096542f14a7a537266e.zip |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Owa.php')
-rw-r--r-- | Zotlabs/Module/Owa.php | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php index d58fd7a41..9a39fe4c0 100644 --- a/Zotlabs/Module/Owa.php +++ b/Zotlabs/Module/Owa.php @@ -31,19 +31,21 @@ class Owa extends \Zotlabs\Web\Controller { if($keyId) { $r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash - where hubloc_addr = '%s' limit 1", + where hubloc_addr = '%s' ", dbesc(str_replace('acct:','',$keyId)) ); if($r) { - $hubloc = $r[0]; - $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']); - $result = ''; - openssl_public_encrypt($token,$result,$hubloc['xchan_pubkey']); - $ret['encrypted_token'] = base64url_encode($result); + foreach($r as $hubloc) { + $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']); + $result = ''; + openssl_public_encrypt($token,$result,$hubloc['xchan_pubkey']); + $ret['encrypted_token'] = base64url_encode($result); + break; + } } } } |