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

merge zperms functionality into zfinger

Browse Source
This commit is contained in:
friendica 2012-10-31 17:38:22 -07:00
parent eef329abe9
commit 2a0ff2b542
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/zot.php
View File

@ -40,7 +40,7 @@ function zot_get_hubloc($arr,$primary = false) {
$sql_extra = (($primary) ? " and hubloc_flags & " . intval(HUBLOC_FLAGS_PRIMARY) : "" ); $sql_extra = (($primary) ? " and hubloc_flags & " . intval(HUBLOC_FLAGS_PRIMARY) : "" );
$limit = (($primary) ? " limit 1 " : ""); $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");
} }

50
mod/zfinger.php
View File

@ -7,18 +7,22 @@ function zfinger_init(&$a) {
$ret = array('success' => false); $ret = array('success' => false);
$zguid = ((x($_REQUEST,'guid')) ? $_REQUEST['guid'] : ''); $zguid = ((x($_REQUEST,'guid')) ? $_REQUEST['guid'] : '');
$zaddr = ((x($_REQUEST,'address')) ? $_REQUEST['address'] : ''); $zaddr = ((x($_REQUEST,'address')) ? $_REQUEST['address'] : '');
$ztarget = ((x($_REQUEST,'target')) ? $_REQUEST['target'] : '');
$zsig = ((x($_REQUEST,'target_sig')) ? $_REQUEST['target_sig'] : '');
$r = null; $r = null;
if(strlen($zguid)) { 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) dbesc($zguid)
); );
} }
elseif(strlen($zaddr)) { 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) dbesc($zaddr)
); );
} }
@ -35,32 +39,38 @@ function zfinger_init(&$a) {
$e = $r[0]; $e = $r[0];
$id = $e['channel_id']; $id = $e['channel_id'];
$r = q("select contact.*, profile.* // $r = q("select contact.*, profile.*
from contact left join profile on contact.uid = profile.uid // from contact left join profile on contact.uid = profile.uid
where contact.uid = %d && contact.self = 1 and profile.is_default = 1 limit 1", // where contact.uid = %d && contact.self = 1 and profile.is_default = 1 limit 1",
intval($id) // intval($id)
); // );
if($r && count($r)) { // if($r && count($r)) {
$profile = $r[0]; // $profile = $r[0];
} // }
$ret['success'] = true; $ret['success'] = true;
// Communication details // Communication details
$ret['guid'] = $e['channel_guid']; $ret['guid'] = $e['xchan_guid'];
$ret['guid_sig'] = base64url_encode(rsa_sign($e['channel_guid'],$e['channel_prvkey'])); $ret['guid_sig'] = $e['xchan_guid_sig'];
$ret['key'] = $e['channel_pubkey']; $ret['key'] = $e['xchan_pubkey'];
$ret['name'] = $e['channel_name']; $ret['name'] = $e['xchan_name'];
$ret['address'] = $e['channel_address']; $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 // array of (verified) hubs this channel uses
$ret['hubs'] = array(); $ret['hubs'] = array();
$x = zot_get_hubloc(array($e['channel_guid'])); $x = zot_get_hubloc(array($e['channel_hash']));
if($x && count($x)) { if($x && count($x)) {
foreach($x as $hub) { foreach($x as $hub) {
if(! ($hub['hubloc_flags'] & HUBLOC_FLAGS_UNVERIFIED)) { if(! ($hub['hubloc_flags'] & HUBLOC_FLAGS_UNVERIFIED)) {
@ -68,8 +78,6 @@ function zfinger_init(&$a) {
'primary' => (($hub['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) ? true : false), 'primary' => (($hub['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) ? true : false),
'url' => $hub['hubloc_url'], 'url' => $hub['hubloc_url'],
'url_sig' => $hub['hubloc_url_sig'], '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'], 'host' => $hub['hubloc_host'],
'callback' => $hub['hubloc_callback'], 'callback' => $hub['hubloc_callback'],
'sitekey' => $hub['hubloc_sitekey'] 'sitekey' => $hub['hubloc_sitekey']