X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsecurity.php;h=768d7c82d45934310a7122b1ca94e56c2e437f0c;hb=0b38f1c58b822ac1ec5a199de00f0a0631c01a61;hp=0a4379d952340ce58fceb8938e614e5623862c15;hpb=b14b44e8a8334aa6878ea10c69c8286bf8ea72b5;p=friendica.git diff --git a/include/security.php b/include/security.php index 0a4379d952..768d7c82d4 100644 --- a/include/security.php +++ b/include/security.php @@ -1,6 +1,16 @@ $user["uid"], - "hash" => cookie_hash($user), - "ip" => $_SERVER['REMOTE_ADDR'])); - } - else { + $value = json_encode(["uid" => $user["uid"], + "hash" => cookie_hash($user), + "ip" => defaults($_SERVER, 'REMOTE_ADDR', '0.0.0.0')]); + } else { $value = ""; } - setcookie("Friendica", $value, $time, "/", "", - (get_config('system', 'ssl_policy') == SSL_POLICY_FULL), true); - + setcookie("Friendica", $value, $time, "/", "", (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL), true); } -function authenticate_success($user_record, $login_initial = false, $interactive = false, $login_refresh = false) { - +/** + * @brief Sets the provided user's authenticated session + * + * @todo Should be moved to Friendica\Core\Session once it's created + * + * @param type $user_record + * @param type $login_initial + * @param type $interactive + * @param type $login_refresh + */ +function authenticate_success($user_record, $login_initial = false, $interactive = false, $login_refresh = false) +{ $a = get_app(); $_SESSION['uid'] = $user_record['uid']; $_SESSION['theme'] = $user_record['theme']; - $_SESSION['mobile-theme'] = get_pconfig($user_record['uid'], 'system', 'mobile_theme'); + $_SESSION['mobile-theme'] = PConfig::get($user_record['uid'], 'system', 'mobile_theme'); $_SESSION['authenticated'] = 1; $_SESSION['page_flags'] = $user_record['page-flags']; - $_SESSION['my_url'] = App::get_baseurl() . '/profile/' . $user_record['nickname']; - $_SESSION['my_address'] = $user_record['nickname'] . '@' . substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')+3); - $_SESSION['addr'] = $_SERVER['REMOTE_ADDR']; + $_SESSION['my_url'] = System::baseUrl() . '/profile/' . $user_record['nickname']; + $_SESSION['my_address'] = $user_record['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); + $_SESSION['addr'] = defaults($_SERVER, 'REMOTE_ADDR', '0.0.0.0'); $a->user = $user_record; @@ -60,10 +78,10 @@ function authenticate_success($user_record, $login_initial = false, $interactive if ($a->user['login_date'] <= NULL_DATE) { $_SESSION['return_url'] = 'profile_photo/new'; $a->module = 'profile_photo'; - info( t("Welcome ") . $a->user['username'] . EOL); - info( t('Please upload a profile photo.') . EOL); + info(L10n::t("Welcome ") . $a->user['username'] . EOL); + info(L10n::t('Please upload a profile photo.') . EOL); } else { - info( t("Welcome back ") . $a->user['username'] . EOL); + info(L10n::t("Welcome back ") . $a->user['username'] . EOL); } } @@ -80,21 +98,42 @@ function authenticate_success($user_record, $login_initial = false, $interactive $master_record = $a->user; - if ((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) { - $r = dba::fetch_first("SELECT * FROM `user` WHERE `uid` = ? LIMIT 1", - intval($_SESSION['submanage']) - ); - if (dbm::is_result($r)) { - $master_record = $r; + if ((x($_SESSION, 'submanage')) && intval($_SESSION['submanage'])) { + $user = dba::selectFirst('user', [], ['uid' => $_SESSION['submanage']]); + if (DBM::is_result($user)) { + $master_record = $user; } } - $r = dba::select('user', array('uid', 'username', 'nickname'), - array('password' => $master_record['password'], 'email' => $master_record['email'], 'account_removed' => false)); - if (dbm::is_result($r)) { - $a->identities = dba::inArray($r); + if ($master_record['parent-uid'] == 0) { + // First add our own entry + $a->identities = [['uid' => $master_record['uid'], + 'username' => $master_record['username'], + 'nickname' => $master_record['nickname']]]; + + // Then add all the children + $r = dba::select('user', ['uid', 'username', 'nickname'], + ['parent-uid' => $master_record['uid'], 'account_removed' => false]); + if (DBM::is_result($r)) { + $a->identities = array_merge($a->identities, dba::inArray($r)); + } } else { - $a->identities = array(); + // Just ensure that the array is always defined + $a->identities = []; + + // First entry is our parent + $r = dba::select('user', ['uid', 'username', 'nickname'], + ['uid' => $master_record['parent-uid'], 'account_removed' => false]); + if (DBM::is_result($r)) { + $a->identities = dba::inArray($r); + } + + // Then add all siblings + $r = dba::select('user', ['uid', 'username', 'nickname'], + ['parent-uid' => $master_record['parent-uid'], 'account_removed' => false]); + if (DBM::is_result($r)) { + $a->identities = array_merge($a->identities, dba::inArray($r)); + } } $r = dba::p("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname` @@ -103,76 +142,77 @@ function authenticate_success($user_record, $login_initial = false, $interactive WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = ?", $master_record['uid'] ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { $a->identities = array_merge($a->identities, dba::inArray($r)); } if ($login_initial) { - logger('auth_identities: ' . print_r($a->identities,true), LOGGER_DEBUG); + logger('auth_identities: ' . print_r($a->identities, true), LOGGER_DEBUG); } if ($login_refresh) { - logger('auth_identities refresh: ' . print_r($a->identities,true), LOGGER_DEBUG); + logger('auth_identities refresh: ' . print_r($a->identities, true), LOGGER_DEBUG); } - $r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $_SESSION['uid']); - if (dbm::is_result($r)) { - $a->contact = $r; - $a->cid = $r['id']; + $contact = dba::selectFirst('contact', [], ['uid' => $_SESSION['uid'], 'self' => true]); + if (DBM::is_result($contact)) { + $a->contact = $contact; + $a->cid = $contact['id']; $_SESSION['cid'] = $a->cid; } - header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"'); + header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] . '"'); if ($login_initial || $login_refresh) { - dba::update('user', array('login_date' => datetime_convert()), array('uid' => $_SESSION['uid'])); + dba::update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $_SESSION['uid']]); // Set the login date for all identities of the user - dba::update('user', array('login_date' => datetime_convert()), - array('password' => $master_record['password'], 'email' => $master_record['email'], 'account_removed' => false)); + dba::update('user', ['login_date' => DateTimeFormat::utcNow()], + ['parent-uid' => $master_record['uid'], 'account_removed' => false]); } if ($login_initial) { - // If the user specified to remember the authentication, then set a cookie - // that expires after one week (the default is when the browser is closed). - // The cookie will be renewed automatically. - // The week ensures that sessions will expire after some inactivity. + /* + * If the user specified to remember the authentication, then set a cookie + * that expires after one week (the default is when the browser is closed). + * The cookie will be renewed automatically. + * The week ensures that sessions will expire after some inactivity. + */ if ($_SESSION['remember']) { - logger('Injecting cookie for remembered user '. $_SESSION['remember_user']['nickname']); + logger('Injecting cookie for remembered user ' . $a->user['nickname']); new_cookie(604800, $user_record); unset($_SESSION['remember']); } } if ($login_initial) { - call_hooks('logged_in', $a->user); + Addon::callHooks('logged_in', $a->user); if (($a->module !== 'home') && isset($_SESSION['return_url'])) { - goaway(App::get_baseurl() . '/' . $_SESSION['return_url']); + goaway(System::baseUrl() . '/' . $_SESSION['return_url']); } } } - - -function can_write_wall(App $a, $owner) { - +function can_write_wall($owner) +{ static $verified = 0; - if ((! (local_user())) && (! (remote_user()))) { + if (!local_user() && !remote_user()) { return false; } $uid = local_user(); + if ($uid == $owner) { + return true; + } - if (($uid) && ($uid == $owner)) { + if (local_user() && ($owner == 0)) { return true; } if (remote_user()) { - // use remembered decision and avoid a DB lookup for each and every display item // DO NOT use this function if there are going to be multiple owners - // We have a contact-id for an authenticated remote user, this block determines if the contact // belongs to this page owner, and has the necessary permissions to post content @@ -192,7 +232,7 @@ function can_write_wall(App $a, $owner) { } } - if (! $cid) { + if (!$cid) { return false; } @@ -206,11 +246,10 @@ function can_write_wall(App $a, $owner) { intval(PAGE_COMMUNITY) ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { $verified = 2; return true; - } - else { + } else { $verified = 1; } } @@ -219,9 +258,9 @@ function can_write_wall(App $a, $owner) { return false; } - -function permissions_sql($owner_id, $remote_verified = false, $groups = null) { - +/// @TODO $groups should be array +function permissions_sql($owner_id, $remote_verified = false, $groups = null) +{ $local_user = local_user(); $remote_user = remote_user(); @@ -239,9 +278,15 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null) { /** * Profile owner - everything is visible */ - - if (($local_user) && ($local_user == $owner_id)) { + if ($local_user && $local_user == $owner_id) { $sql = ''; + /** + * Authenticated visitor. Unless pre-verified, + * check that the contact belongs to this $owner_id + * and load the groups the visitor belongs to. + * If pre-verified, the caller is expected to have already + * done this and passed the groups into this function. + */ } elseif ($remote_user) { /* * Authenticated visitor. Unless pre-verified, @@ -251,39 +296,26 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null) { * done this and passed the groups into this function. */ - if (! $remote_verified) { + if (!$remote_verified) { $r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1", intval($remote_user), intval($owner_id) ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { $remote_verified = true; - $groups = init_groups_visitor($remote_user); + $groups = Group::getIdsByContactId($remote_user); } } - if ($remote_verified) { + if ($remote_verified) { $gs = '<<>>'; // should be impossible to match - if (is_array($groups) && count($groups)) { - foreach ($groups as $g) + if (is_array($groups)) { + foreach ($groups as $g) { $gs .= '|<' . intval($g) . '>'; + } } - /* - * @TODO old-lost code found? - $sql = sprintf( - " AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' ) - AND ( deny_cid = '' OR NOT deny_cid REGEXP '<%d>' ) - AND ( allow_gid = '' OR allow_gid REGEXP '%s' ) - AND ( deny_gid = '' OR NOT deny_gid REGEXP '%s') - ", - intval($remote_user), - intval($remote_user), - dbesc($gs), - dbesc($gs) - ); - */ $sql = sprintf( " AND ( NOT (deny_cid REGEXP '<%d>' OR deny_gid REGEXP '%s') AND ( allow_cid REGEXP '<%d>' OR allow_gid REGEXP '%s' OR ( allow_cid = '' AND allow_gid = '') ) @@ -299,13 +331,12 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null) { return $sql; } - -function item_permissions_sql($owner_id, $remote_verified = false, $groups = null) { - +function item_permissions_sql($owner_id, $remote_verified = false, $groups = null) +{ $local_user = local_user(); $remote_user = remote_user(); - /** + /* * Construct permissions * * default permissions - anonymous user @@ -314,12 +345,10 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul AND `item`.allow_gid = '' AND `item`.deny_cid = '' AND `item`.deny_gid = '' - AND `item`.private = 0 + AND `item`.private != 1 "; - /** - * Profile owner - everything is visible - */ + // Profile owner - everything is visible if ($local_user && ($local_user == $owner_id)) { $sql = ''; } elseif ($remote_user) { @@ -330,14 +359,14 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul * If pre-verified, the caller is expected to have already * done this and passed the groups into this function. */ - if (! $remote_verified) { + if (!$remote_verified) { $r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1", intval($remote_user), intval($owner_id) ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { $remote_verified = true; - $groups = init_groups_visitor($remote_user); + $groups = Group::getIdsByContactId($remote_user); } } if ($remote_verified) { @@ -351,16 +380,6 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul } $sql = sprintf( - /*" AND ( private = 0 OR ( private in (1,2) AND wall = 1 AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' ) - AND ( deny_cid = '' OR NOT deny_cid REGEXP '<%d>' ) - AND ( allow_gid = '' OR allow_gid REGEXP '%s' ) - AND ( deny_gid = '' OR NOT deny_gid REGEXP '%s'))) - ", - intval($remote_user), - intval($remote_user), - dbesc($gs), - dbesc($gs) -*/ " AND ( `item`.private = 0 OR ( `item`.private in (1,2) AND `item`.`wall` = 1 AND ( NOT (`item`.deny_cid REGEXP '<%d>' OR `item`.deny_gid REGEXP '%s') AND ( `item`.allow_cid REGEXP '<%d>' OR `item`.allow_gid REGEXP '%s' OR ( `item`.allow_cid = '' AND `item`.allow_gid = ''))))) @@ -376,7 +395,6 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul return $sql; } - /* * 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. @@ -388,7 +406,8 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul * Actually, important actions should not be triggered by Links / GET-Requests at all, but somethimes 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). */ -function get_form_security_token($typename = '') { +function get_form_security_token($typename = '') +{ $a = get_app(); $timestamp = time(); @@ -397,13 +416,23 @@ function get_form_security_token($typename = '') { return $timestamp . '.' . $sec_hash; } -function check_form_security_token($typename = '', $formname = 'form_security_token') { - if (!x($_REQUEST, $formname)) { - return false; +function check_form_security_token($typename = '', $formname = 'form_security_token') +{ + $hash = null; + + if (!empty($_REQUEST[$formname])) { + /// @TODO Careful, not secured! + $hash = $_REQUEST[$formname]; } - /// @TODO Careful, not secured! - $hash = $_REQUEST[$formname]; + if (!empty($_SERVER['HTTP_X_CSRF_TOKEN'])) { + /// @TODO Careful, not secured! + $hash = $_SERVER['HTTP_X_CSRF_TOKEN']; + } + + if (empty($hash)) { + return false; + } $max_livetime = 10800; // 3 hours @@ -419,19 +448,24 @@ function check_form_security_token($typename = '', $formname = 'form_security_to return ($sec_hash == $x[1]); } -function check_form_security_std_err_msg() { - return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it.') . EOL; +function check_form_security_std_err_msg() +{ + return L10n::t("The form security token was not correct. This probably happened because the form has been opened for too long \x28>3 hours\x29 before submitting it.") . EOL; } -function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token') { + +function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token') +{ if (!check_form_security_token($typename, $formname)) { $a = get_app(); logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename); logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA); - notice( check_form_security_std_err_msg() ); - goaway(App::get_baseurl() . $err_redirect ); + notice(check_form_security_std_err_msg()); + goaway(System::baseUrl() . $err_redirect); } } -function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') { + +function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') +{ if (!check_form_security_token($typename, $formname)) { $a = get_app(); logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename); @@ -441,21 +475,12 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f } } -// Returns an array of group id's this contact is a member of. -// This array will only contain group id's related to the uid of this -// DFRN contact. They are *not* neccessarily unique across the entire site. - - -if (! function_exists('init_groups_visitor')) { -function init_groups_visitor($contact_id) { - $groups = array(); - $r = q("SELECT `gid` FROM `group_member` - WHERE `contact-id` = %d ", - intval($contact_id) - ); - if (dbm::is_result($r)) { - foreach ($r as $rr) - $groups[] = $rr['gid']; - } - return $groups; -}} +/** + * @brief Kills the "Friendica" cookie and all session data + */ +function nuke_session() +{ + new_cookie(-3600); // make sure cookie is deleted on browser close, as a security measure + session_unset(); + session_destroy(); +}