authenticated fetch fixes
This commit is contained in:
parent
220d6ed494
commit
51024d3821
@ -319,7 +319,10 @@ class ActivityStreams {
|
|||||||
function get_compound_property($property, $base = '', $namespace = '', $first = false) {
|
function get_compound_property($property, $base = '', $namespace = '', $first = false) {
|
||||||
$x = $this->get_property_obj($property, $base, $namespace);
|
$x = $this->get_property_obj($property, $base, $namespace);
|
||||||
if($this->is_url($x)) {
|
if($this->is_url($x)) {
|
||||||
$x = $this->fetch_property($x);
|
$y = $this->fetch_property($x);
|
||||||
|
if (is_array($y)) {
|
||||||
|
$x = $y;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// verify and unpack JSalmon signature if present
|
// verify and unpack JSalmon signature if present
|
||||||
|
@ -55,6 +55,7 @@ class Item extends Controller {
|
|||||||
$sigdata = HTTPSig::verify(EMPTY_STR);
|
$sigdata = HTTPSig::verify(EMPTY_STR);
|
||||||
if($sigdata['portable_id'] && $sigdata['header_valid']) {
|
if($sigdata['portable_id'] && $sigdata['header_valid']) {
|
||||||
$portable_id = $sigdata['portable_id'];
|
$portable_id = $sigdata['portable_id'];
|
||||||
|
observer_auth($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 ";
|
$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 ";
|
||||||
|
@ -352,3 +352,51 @@ function owt_init($token) {
|
|||||||
|
|
||||||
logger('OpenWebAuth: auth success from ' . $hubloc['xchan_addr']);
|
logger('OpenWebAuth: auth success from ' . $hubloc['xchan_addr']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function observer_auth($ob_hash) {
|
||||||
|
|
||||||
|
if($ob_hash === false) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$r = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash
|
||||||
|
where hubloc_addr = '%s' or hubloc_id_url = '%s' or hubloc_hash = '%s' order by hubloc_id desc",
|
||||||
|
dbesc($ob_hash),
|
||||||
|
dbesc($ob_hash),
|
||||||
|
dbesc($ob_hash)
|
||||||
|
);
|
||||||
|
|
||||||
|
if(! $r) {
|
||||||
|
// finger them if they can't be found.
|
||||||
|
$wf = discover_by_webbie($ob_hash);
|
||||||
|
if($wf) {
|
||||||
|
$r = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash
|
||||||
|
where hubloc_addr = '%s' or hubloc_id_url = '%s' or hubloc_hash = '%s' order by hubloc_id desc",
|
||||||
|
dbesc($ob_hash),
|
||||||
|
dbesc($ob_hash),
|
||||||
|
dbesc($ob_hash)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(! $r) {
|
||||||
|
logger('unable to finger ' . $ob_hash);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$hubloc = $r[0];
|
||||||
|
|
||||||
|
$_SESSION['authenticated'] = 1;
|
||||||
|
|
||||||
|
// normal visitor (remote_channel) login session credentials
|
||||||
|
$_SESSION['visitor_id'] = $hubloc['xchan_hash'];
|
||||||
|
$_SESSION['my_url'] = $hubloc['xchan_url'];
|
||||||
|
$_SESSION['my_address'] = $hubloc['hubloc_addr'];
|
||||||
|
$_SESSION['remote_hub'] = $hubloc['hubloc_url'];
|
||||||
|
$_SESSION['DNT'] = 1;
|
||||||
|
|
||||||
|
\App::set_observer($hubloc);
|
||||||
|
require_once('include/security.php');
|
||||||
|
\App::set_groups(init_groups_visitor($_SESSION['visitor_id']));
|
||||||
|
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user