bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #9106 from annando/notice

Browse source 
Avoid a notice - restructured validation check
This commit is contained in:
Tobias Diekershoff 2020-08-31 19:09:14 +02:00 committed by GitHub
commit 1146d9127e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/Module/Objects.php
View file

@ -50,26 +50,29 @@ class Objects extends BaseModule
$item = Item::selectFirst(['id', 'uid', 'origin', 'author-link', 'changed', 'private', 'psid'], $item = Item::selectFirst(['id', 'uid', 'origin', 'author-link', 'changed', 'private', 'psid'],
['guid' => $parameters['guid']], ['order' => ['origin' => true]]); ['guid' => $parameters['guid']], ['order' => ['origin' => true]]);
$validated = false; if (!DBA::isResult($item)) {
$requester = HTTPSignature::getSigner('', $_SERVER); throw new HTTPException\NotFoundException();
if (!empty($requester) && $item['origin']) { }
$requester_id = Contact::getIdForURL($requester, $item['uid']);
if (!empty($requester_id)) { $validated = in_array($item['private'], [Item::PUBLIC, Item::UNLISTED]);
$permissionSets = DI::permissionSet()->selectByContactId($requester_id, $item['uid']);
if (!empty($permissionSets)) { if (!$validated) {
$psid = array_merge($permissionSets->column('id'), $requester = HTTPSignature::getSigner('', $_SERVER);
[DI::permissionSet()->getIdFromACL($item['uid'], '', '', '', '')]); if (!empty($requester) && $item['origin']) {
$validated = in_array($item['psid'], $psid); $requester_id = Contact::getIdForURL($requester, $item['uid']);
if (!empty($requester_id)) {
$permissionSets = DI::permissionSet()->selectByContactId($requester_id, $item['uid']);
if (!empty($permissionSets)) {
$psid = array_merge($permissionSets->column('id'),
[DI::permissionSet()->getIdFromACL($item['uid'], '', '', '', '')]);
$validated = in_array($item['psid'], $psid);
}
} }
} }
} }
if (!$validated && !in_array($item['private'], [Item::PUBLIC, Item::UNLISTED])) {
unset($item);
}
// Valid items are original post or posted from this node (including in the case of a forum) // Valid items are original post or posted from this node (including in the case of a forum)
if (!DBA::isResult($item) || !$item['origin'] && (parse_url($item['author-link'], PHP_URL_HOST) != parse_url(DI::baseUrl()->get(), PHP_URL_HOST))) { if (!$validated || !$item['origin'] && (parse_url($item['author-link'], PHP_URL_HOST) != parse_url(DI::baseUrl()->get(), PHP_URL_HOST))) {
throw new HTTPException\NotFoundException(); throw new HTTPException\NotFoundException();
} }