From 5ce13b210ee83a3ee3622d2106589b9c2c4c876a Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 9 Jul 2020 15:03:14 -0400 Subject: [PATCH 1/6] Add check for exif data existence in mod/photos --- mod/photos.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/photos.php b/mod/photos.php index 2b72fd3e4..f33a9241e 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -778,7 +778,7 @@ function photos_post(App $a) // Create item container $lat = $lon = null; - if ($exif && $exif['GPS'] && Feature::isEnabled($page_owner_uid, 'photo_location')) { + if (!empty($exif['GPS']) && Feature::isEnabled($page_owner_uid, 'photo_location')) { $lat = Photo::getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']); $lon = Photo::getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']); } From 04c95a5045136cb18d09f0ae6f9cb46975dace13 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 9 Jul 2020 15:03:48 -0400 Subject: [PATCH 2/6] Move logged in logging where it makes sense in include/api --- include/api.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/api.php b/include/api.php index 85a34d275..53d00b27d 100644 --- a/include/api.php +++ b/include/api.php @@ -335,16 +335,16 @@ function api_call(App $a, App\Arguments $args = null) if (!empty($info['auth']) && api_user() === false) { api_login($a); + Logger::info(API_LOG_PREFIX . 'username {username}', ['module' => 'api', 'action' => 'call', 'username' => $a->user['username']]); } - Logger::info(API_LOG_PREFIX . 'username {username}', ['module' => 'api', 'action' => 'call', 'username' => $a->user['username']]); Logger::debug(API_LOG_PREFIX . 'parameters', ['module' => 'api', 'action' => 'call', 'parameters' => $_REQUEST]); $stamp = microtime(true); $return = call_user_func($info['func'], $type); $duration = floatval(microtime(true) - $stamp); - Logger::info(API_LOG_PREFIX . 'username {username}', ['module' => 'api', 'action' => 'call', 'username' => $a->user['username'], 'duration' => round($duration, 2)]); + Logger::info(API_LOG_PREFIX . 'duration {duration}', ['module' => 'api', 'action' => 'call', 'duration' => round($duration, 2)]); DI::profiler()->saveLog(DI::logger(), API_LOG_PREFIX . 'performance'); From d9b8a1fccdf1c42254060383458e9b7feebea60d Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 9 Jul 2020 15:04:30 -0400 Subject: [PATCH 3/6] Add missing $a->profile initialization in mod/cal --- mod/cal.php | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/mod/cal.php b/mod/cal.php index 4b90b02cd..dcfb5db9c 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -37,17 +37,18 @@ use Friendica\Model\Event; use Friendica\Model\Item; use Friendica\Model\Profile; use Friendica\Module\BaseProfile; +use Friendica\Network\HTTPException; use Friendica\Util\DateTimeFormat; use Friendica\Util\Temporal; function cal_init(App $a) { if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) { - throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Access denied.')); + throw new HTTPException\ForbiddenException(DI::l10n()->t('Access denied.')); } if ($a->argc < 2) { - throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Access denied.')); + throw new HTTPException\ForbiddenException(DI::l10n()->t('Access denied.')); } Nav::setSelected('events'); @@ -55,7 +56,7 @@ function cal_init(App $a) $nick = $a->argv[1]; $user = DBA::selectFirst('user', [], ['nickname' => $nick, 'blocked' => false]); if (!DBA::isResult($user)) { - throw new \Friendica\Network\HTTPException\NotFoundException(); + throw new HTTPException\NotFoundException(); } $a->data['user'] = $user; @@ -67,18 +68,22 @@ function cal_init(App $a) return; } - $profile = Profile::getByNickname($nick, $a->profile_uid); + $a->profile = Profile::getByNickname($nick, $a->profile_uid); - $account_type = Contact::getAccountType($profile); + if (empty($a->profile)) { + throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.')); + } + + $account_type = Contact::getAccountType($a->profile); $tpl = Renderer::getMarkupTemplate('widget/vcard.tpl'); $vcard_widget = Renderer::replaceMacros($tpl, [ - '$name' => $profile['name'], - '$photo' => $profile['photo'], - '$addr' => $profile['addr'] ?: '', + '$name' => $a->profile['name'], + '$photo' => $a->profile['photo'], + '$addr' => $a->profile['addr'] ?: '', '$account_type' => $account_type, - '$about' => BBCode::convert($profile['about']), + '$about' => BBCode::convert($a->profile['about']), ]); $cal_widget = Widget\CalendarExport::getHTML(); From 2db04b0c34e90bfa46c1256fd489fd35b9606773 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 9 Jul 2020 15:05:11 -0400 Subject: [PATCH 4/6] Add check for parent item existence in Model\UserItem::setNotificationForUser --- src/Model/UserItem.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/UserItem.php b/src/Model/UserItem.php index 89dbafed8..afb13829d 100644 --- a/src/Model/UserItem.php +++ b/src/Model/UserItem.php @@ -75,7 +75,7 @@ class UserItem private static function setNotificationForUser(array $item, int $uid) { $thread = Item::selectFirstThreadForUser($uid, ['ignored'], ['iid' => $item['parent'], 'deleted' => false]); - if ($thread['ignored']) { + if (!empty($thread['ignored'])) { return; } From ad66a92deb71f5dd9e54b8c486a3e69a2fc3b12d Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 9 Jul 2020 15:06:50 -0400 Subject: [PATCH 5/6] Add check for $a->profile structure in Module\HoverCard --- src/Module/HoverCard.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Module/HoverCard.php b/src/Module/HoverCard.php index f3b8248a6..ae107ca17 100644 --- a/src/Module/HoverCard.php +++ b/src/Module/HoverCard.php @@ -26,7 +26,7 @@ use Friendica\Core\Session; use Friendica\DI; use Friendica\Model\Profile; use Friendica\Model\User; -use Friendica\Network\HTTPException\NotFoundException; +use Friendica\Network\HTTPException; /** * Loads a profile for the HoverCard view @@ -44,11 +44,15 @@ class HoverCard extends BaseModule // Show the profile hovercard $nickname = $parameters['profile']; } else { - throw new NotFoundException(DI::l10n()->t('No profile')); + throw new HTTPException\NotFoundException(DI::l10n()->t('No profile')); } Profile::load($a, $nickname); + if (empty($a->profile)) { + throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.')); + } + $page = DI::page(); if (!empty($a->profile['page-flags']) && ($a->profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY)) { From cb0341893785b678b5225404c22d0929c62484f8 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 9 Jul 2020 15:08:09 -0400 Subject: [PATCH 6/6] Add checks for $a->user existence - Variable can be empty/null in many cases --- src/App/Page.php | 2 +- src/BaseModule.php | 10 +++++----- view/theme/frio/theme.php | 2 +- view/theme/vier/theme.php | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/App/Page.php b/src/App/Page.php index 50afac1b4..d3365a16c 100644 --- a/src/App/Page.php +++ b/src/App/Page.php @@ -276,7 +276,7 @@ class Page implements ArrayAccess // If you're just visiting, let javascript take you home if (!empty($_SESSION['visitor_home'])) { $homebase = $_SESSION['visitor_home']; - } elseif (local_user()) { + } elseif (!empty($app->user['nickname'])) { $homebase = 'profile/' . $app->user['nickname']; } diff --git a/src/BaseModule.php b/src/BaseModule.php index 1dbf3f38d..0e0fedb80 100644 --- a/src/BaseModule.php +++ b/src/BaseModule.php @@ -96,11 +96,11 @@ abstract class BaseModule * Functions used to protect against Cross-Site Request Forgery * The security token has to base on at least one value that an attacker can't know - here it's the session ID and the private key. * In this implementation, a security token is reusable (if the user submits a form, goes back and resubmits the form, maybe with small changes; - * or if the security token is used for ajax-calls that happen several times), but only valid for a certain amout of time (3hours). - * The "typename" seperates the security tokens of different types of forms. This could be relevant in the following case: - * A security token is used to protekt a link from CSRF (e.g. the "delete this profile"-link). + * or if the security token is used for ajax-calls that happen several times), but only valid for a certain amount of time (3hours). + * The "typename" separates the security tokens of different types of forms. This could be relevant in the following case: + * A security token is used to protect a link from CSRF (e.g. the "delete this profile"-link). * If the new page contains by any chance external elements, then the used security token is exposed by the referrer. - * Actually, important actions should not be triggered by Links / GET-Requests at all, but somethimes they still are, + * Actually, important actions should not be triggered by Links / GET-Requests at all, but sometimes they still are, * so this mechanism brings in some damage control (the attacker would be able to forge a request to a form of this type, but not to forms of other types). */ public static function getFormSecurityToken($typename = '') @@ -108,7 +108,7 @@ abstract class BaseModule $a = DI::app(); $timestamp = time(); - $sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $timestamp . $typename); + $sec_hash = hash('whirlpool', ($a->user['guid'] ?? '') . ($a->user['prvkey'] ?? '') . session_id() . $timestamp . $typename); return $timestamp . '.' . $sec_hash; } diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php index 0202fda0e..fd6927835 100644 --- a/view/theme/frio/theme.php +++ b/view/theme/frio/theme.php @@ -224,7 +224,7 @@ function frio_remote_nav($a, &$nav) // since $userinfo isn't available for the hook we write it to the nav array // this isn't optimal because the contact query will be done now twice - if (local_user()) { + if (local_user() && !empty($a->user['uid'])) { // empty the server url for local user because we won't need it $server_url = ''; // user info diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index cec5e5ba6..fdcc8f11d 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -27,7 +27,7 @@ function vier_init(App $a) Renderer::setActiveTemplateEngine('smarty3'); - if (!empty($a->argv[0]) && ($a->argv[0] . ($a->argv[1] ?? '')) === ('profile' . $a->user['nickname']) || $a->argv[0] === 'network' && local_user()) { + if (!empty($a->argv[0]) && ($a->argv[0] . ($a->argv[1] ?? '')) === ('profile' . ($a->user['nickname'] ?? '')) || $a->argv[0] === 'network' && local_user()) { vier_community_info(); DI::page()['htmlhead'] .= "\n";