diff options
| -rw-r--r-- | include/zot.php | 2 | ||||
| -rw-r--r-- | mod/zfinger.php | 50 |
2 files changed, 30 insertions, 22 deletions
diff --git a/include/zot.php b/include/zot.php index e041e273e..c9fd25de4 100644 --- a/include/zot.php +++ b/include/zot.php @@ -40,7 +40,7 @@ function zot_get_hubloc($arr,$primary = false) { $sql_extra = (($primary) ? " and hubloc_flags & " . intval(HUBLOC_FLAGS_PRIMARY) : "" ); $limit = (($primary) ? " limit 1 " : ""); - return q("select * from hubloc where hubloc_guid in ( $tmp ) $sql_extra order by hubloc_url $limit"); + return q("select * from hubloc where hubloc_hash in ( $tmp ) $sql_extra order by hubloc_url $limit"); } diff --git a/mod/zfinger.php b/mod/zfinger.php index 2ae265df7..c1abeedc9 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -7,18 +7,22 @@ function zfinger_init(&$a) { $ret = array('success' => false); - $zguid = ((x($_REQUEST,'guid')) ? $_REQUEST['guid'] : ''); - $zaddr = ((x($_REQUEST,'address')) ? $_REQUEST['address'] : ''); + $zguid = ((x($_REQUEST,'guid')) ? $_REQUEST['guid'] : ''); + $zaddr = ((x($_REQUEST,'address')) ? $_REQUEST['address'] : ''); + $ztarget = ((x($_REQUEST,'target')) ? $_REQUEST['target'] : ''); + $zsig = ((x($_REQUEST,'target_sig')) ? $_REQUEST['target_sig'] : ''); $r = null; if(strlen($zguid)) { - $r = q("select * from channel where channel_guid = '%s' limit 1", + $r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash + where channel_guid = '%s' limit 1", dbesc($zguid) ); } elseif(strlen($zaddr)) { - $r = q("select * from channel where channel_address = '%s' limit 1", + $r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash + where channel_address = '%s' limit 1", dbesc($zaddr) ); } @@ -35,32 +39,38 @@ function zfinger_init(&$a) { $e = $r[0]; $id = $e['channel_id']; - $r = q("select contact.*, profile.* - from contact left join profile on contact.uid = profile.uid - where contact.uid = %d && contact.self = 1 and profile.is_default = 1 limit 1", - intval($id) - ); - if($r && count($r)) { - $profile = $r[0]; - } +// $r = q("select contact.*, profile.* +// from contact left join profile on contact.uid = profile.uid +// where contact.uid = %d && contact.self = 1 and profile.is_default = 1 limit 1", +// intval($id) +// ); +// if($r && count($r)) { +// $profile = $r[0]; +// } $ret['success'] = true; // Communication details - $ret['guid'] = $e['channel_guid']; - $ret['guid_sig'] = base64url_encode(rsa_sign($e['channel_guid'],$e['channel_prvkey'])); - $ret['key'] = $e['channel_pubkey']; - $ret['name'] = $e['channel_name']; - $ret['address'] = $e['channel_address']; + $ret['guid'] = $e['xchan_guid']; + $ret['guid_sig'] = $e['xchan_guid_sig']; + $ret['key'] = $e['xchan_pubkey']; + $ret['name'] = $e['xchan_name']; + $ret['name_updated'] = $e['xchan_name_date']; + $ret['address'] = $e['xchan_addr']; + $ret['photo'] = $e['xchan_photo_l']; + $ret['photo_updated'] = $e['xchan_photo_date']; + $ret['target'] = $ztarget; + $ret['target_sig'] = $zsig; + $ret['permissions'] = map_perms($r[0],$ztarget,$zsig); - $ret['profile'] = $profile; +// $ret['profile'] = $profile; // array of (verified) hubs this channel uses $ret['hubs'] = array(); - $x = zot_get_hubloc(array($e['channel_guid'])); + $x = zot_get_hubloc(array($e['channel_hash'])); if($x && count($x)) { foreach($x as $hub) { if(! ($hub['hubloc_flags'] & HUBLOC_FLAGS_UNVERIFIED)) { @@ -68,8 +78,6 @@ function zfinger_init(&$a) { 'primary' => (($hub['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) ? true : false), 'url' => $hub['hubloc_url'], 'url_sig' => $hub['hubloc_url_sig'], - /// hmmm we probably shouldn't sign somebody else's hub. FIXME - 'url_sig2' => base64url_encode(rsa_sign($hub['hubloc_url'],$e['channel_prvkey'])), 'host' => $hub['hubloc_host'], 'callback' => $hub['hubloc_callback'], 'sitekey' => $hub['hubloc_sitekey'] |