aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-03-14 09:40:26 +0100
committerMario Vavti <mario@mariovavti.com>2019-03-14 09:40:26 +0100
commitf1fee1239b57842f56c456b57f3e8910b0b5d6f7 (patch)
tree9684c66e61e25424da9ef621ecd2436b6375611e /Zotlabs/Module
parent97727260651a76b5b67568925b0fe0d5b688ce0c (diff)
parent8769fa0156c470b533bdf23a0df5beb20bc1a4bd (diff)
downloadvolse-hubzilla-f1fee1239b57842f56c456b57f3e8910b0b5d6f7.tar.gz
volse-hubzilla-f1fee1239b57842f56c456b57f3e8910b0b5d6f7.tar.bz2
volse-hubzilla-f1fee1239b57842f56c456b57f3e8910b0b5d6f7.zip
Merge branch 'dev'
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Connedit.php2
-rw-r--r--Zotlabs/Module/Item.php77
2 files changed, 50 insertions, 29 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index a587324df..acd7cb769 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -848,7 +848,7 @@ class Connedit extends \Zotlabs\Web\Controller {
$locstr = unpunify($contact['xchan_url']);
$clone_warn = '';
- $clonable = (in_array($contact['xchan_network'],['zot','rss']) ? true : false);
+ $clonable = (in_array($contact['xchan_network'],['zot', 'zot6', 'rss']) ? true : false);
if(! $clonable) {
$clone_warn = '<strong>';
$clone_warn .= ((intval($contact['abook_not_here']))
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index ebcf632ef..c466e7c82 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -40,56 +40,78 @@ class Item extends Controller {
function init() {
- if(Libzot::is_zot_request()) {
+ if (Libzot::is_zot_request()) {
$conversation = false;
$item_id = argv(1);
- if(! $item_id)
+ if (! $item_id)
http_status_exit(404, 'Not found');
-
$portable_id = EMPTY_STR;
- $sigdata = HTTPSig::verify(EMPTY_STR);
- if($sigdata['portable_id'] && $sigdata['header_valid']) {
- $portable_id = $sigdata['portable_id'];
- }
-
$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 ";
- $sql_extra = item_permissions_sql(0);
+ $i = null;
+
+ // do we have the item (at all)?
- $r = q("select * from item where mid = '%s' $item_normal $sql_extra limit 1",
+ $r = q("select * from item where mid = '%s' $item_normal limit 1",
dbesc(z_root() . '/item/' . $item_id)
);
- if(! $r) {
+ if (! $r) {
+ http_status_exit(404,'Not found');
+ }
+
+ // process an authenticated fetch
+
+ $sigdata = HTTPSig::verify(EMPTY_STR);
+ if($sigdata['portable_id'] && $sigdata['header_valid']) {
+ $portable_id = $sigdata['portable_id'];
+ observer_auth($portable_id);
+
+ // first see if we have a copy of this item's parent owned by the current signer
+ // include xchans for all zot-like networks - these will have the same guid and public key
- $r = q("select * from item where mid = '%s' $item_normal limit 1",
- dbesc(z_root() . '/item/' . $item_id)
+ $x = q("select * from xchan where xchan_hash = '%s'",
+ dbesc($sigdata['portable_id'])
);
- if($r) {
- http_status_exit(403, 'Forbidden');
+
+ if ($x) {
+ $xchans = q("select xchan_hash from xchan where xchan_hash = '%s' OR ( xchan_guid = '%s' AND xchan_pubkey = '%s' ) ",
+ dbesc($sigdata['portable_id']),
+ dbesc($x[0]['xchan_guid']),
+ dbesc($x[0]['xchan_pubkey'])
+ );
+
+ if ($xchans) {
+ $hashes = ids_to_querystr($xchans,'xchan_hash',true);
+ $i = q("select id as item_id from item where mid = '%s' $item_normal and owner_xchan in ( " . protect_sprintf($hashes) . " ) limit 1",
+ dbesc($r[0]['parent_mid'])
+ );
+ }
}
- http_status_exit(404, 'Not found');
}
+ // if we don't have a parent id belonging to the signer see if we can obtain one as a visitor that we have permission to access
- $items = q("select parent as item_id from item where mid = '%s' and uid = %d $item_normal $sql_extra ",
- dbesc($r[0]['parent_mid']),
- intval($r[0]['uid'])
- );
- if(! $items) {
- http_status_exit(404, 'Not found');
+ $sql_extra = item_permissions_sql(0);
+
+ if (! $i) {
+ $i = q("select id as item_id from item where mid = '%s' $item_normal $sql_extra limit 1",
+ dbesc($r[0]['parent_mid'])
+ );
}
- $r = $items;
+ if(! $i) {
+ http_status_exit(403,'Forbidden');
+ }
- $parents_str = ids_to_querystr($r,'item_id');
+ $parents_str = ids_to_querystr($i,'item_id');
- $items = q("SELECT item.*, item.id AS item_id FROM item WHERE item.parent IN ( %s ) $item_normal $sql_extra ",
+ $items = q("SELECT item.*, item.id AS item_id FROM item WHERE item.parent IN ( %s ) $item_normal ",
dbesc($parents_str)
);
@@ -97,9 +119,8 @@ class Item extends Controller {
http_status_exit(404, 'Not found');
}
- $r = $items;
- xchan_query($r,true);
- $items = fetch_post_tags($r,true);
+ xchan_query($items,true);
+ $items = fetch_post_tags($items,true);
$observer = App::get_observer();
$parent = $items[0];