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

some more prep work for Zot VI - some of this will need to be undone or at least re-arranged later but we need to bootstrap a test environment.

Browse Source
This commit is contained in:
zotlabs
2017-09-04 22:30:55 -07:00
parent 83d0e48ebe
commit d58f965b9a
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Zotlabs/Web/HTTPSig.php
View File

@@ -126,9 +126,16 @@ class HTTPSig {
function get_activitypub_key($id) { function get_activitypub_key($id) {
if(strpos($id,'acct:') === 0) {
$x = q("select xchan_pubkey from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_addr = '%s' limit 1",
dbesc(str_replace('acct:','',$id))
);
}
else {
$x = q("select xchan_pubkey from xchan where xchan_hash = '%s' and xchan_network = 'activitypub' ", $x = q("select xchan_pubkey from xchan where xchan_hash = '%s' and xchan_network = 'activitypub' ",
dbesc($id) dbesc($id)
); );
}
if($x && $x[0]['xchan_pubkey']) { if($x && $x[0]['xchan_pubkey']) {
return ($x[0]['xchan_pubkey']); return ($x[0]['xchan_pubkey']);

5
Zotlabs/Zot/Finger.php
View File

@@ -120,9 +120,10 @@ class Finger {
return $ret; return $ret;
} }
$verify = \Zotlabs\Web\HTTPSig::verify($result);
$x = json_decode($result['body'], true); $x = json_decode($result['body'], true);
$verify = \Zotlabs\Web\HTTPSig::verify($result,(($x) ? $x['key'] : '');
if($x && (! $verify['header_valid'])) { if($x && (! $verify['header_valid'])) {
$signed_token = ((is_array($x) && array_key_exists('signed_token', $x)) ? $x['signed_token'] : null); $signed_token = ((is_array($x) && array_key_exists('signed_token', $x)) ? $x['signed_token'] : null);
if($signed_token) { if($signed_token) {