diff options
| author | friendica <info@friendica.com> | 2012-09-10 22:00:56 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-09-10 22:00:56 -0700 |
| commit | c8957b36ea11a41604330c8f87c0fc0611ef18e6 (patch) | |
| tree | 4a1b2ae68d463a69c388fa6ee0a7453cc8e74498 /mod | |
| parent | 61cca7637af3c4484d90ed9e1208a10845758276 (diff) | |
| download | volse-hubzilla-c8957b36ea11a41604330c8f87c0fc0611ef18e6.tar.gz volse-hubzilla-c8957b36ea11a41604330c8f87c0fc0611ef18e6.tar.bz2 volse-hubzilla-c8957b36ea11a41604330c8f87c0fc0611ef18e6.zip | |
permissions responder + upstream merge
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/zperms.php | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/mod/zperms.php b/mod/zperms.php index c15f4dccf..b2c18c7d0 100644 --- a/mod/zperms.php +++ b/mod/zperms.php @@ -3,12 +3,15 @@ function zperms_init(&$a) { require_once('include/zot.php'); + require_once('include/Contact.php'); + require_once('include/crypto.php'); $ret = array('success' => false); - $zguid = ((x($_REQUEST,'guid')) ? $_REQUEST['guid'] : ''); - $zaddr = ((x($_REQUEST,'address')) ? $_REQUEST['address'] : ''); - $ztarget = ((x($_REQUEST,'target')) ? $_REQUEST['target'] : ''); + $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; @@ -31,8 +34,6 @@ function zperms_init(&$a) { $ret['message'] = 'Item not found.'; json_return_and_die($ret); } - - $e = $r[0]; $id = $e['entity_id']; @@ -46,15 +47,16 @@ function zperms_init(&$a) { } - $ret['success'] = true; - - // Communication details + $ret['success'] = true; $ret['guid'] = $e['entity_global_id']; $ret['guid_sig'] = base64url_encode(rsa_sign($e['entity_global_id'],$e['entity_prvkey'])); $ret['key'] = $e['entity_pubkey']; $ret['name'] = $e['entity_name']; $ret['address'] = $e['entity_address']; + $ret['target'] = $ztarget; + $ret['target_sig'] = $zsig; + $ret['permissions'] = map_perms($r[0],$ztarget,$zsig); $ret['profile'] = $profile; @@ -68,6 +70,7 @@ function zperms_init(&$a) { $ret['hubs'][] = array( 'primary' => (($hub['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) ? true : false), 'url' => $hub['hubloc_url'], + /// hmmm we probably shouldn't sign somebody else's hub. FIXME 'url_sig' => base64url_encode(rsa_sign($hub['hubloc_url'],$e['entity_prvkey'])), 'callback' => $hub['hubloc_callback'], 'sitekey' => $hub['hubloc_sitekey'] @@ -78,4 +81,4 @@ function zperms_init(&$a) { json_return_and_die($ret); -}
\ No newline at end of file +} |