X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsecurity.php;h=af424df26c65c6122ff76a2070c936b426cdc46d;hb=5e5fde0a63c57d2873bfa29404110269ca9abeee;hp=51fb6f7259a1aaaacfdfd2f4bb1dcc81b84514a6;hpb=2b161108fe6552ef2effb7b300553f0242b2e49e;p=friendica.git diff --git a/include/security.php b/include/security.php index 51fb6f7259..af424df26c 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" => $_SERVER['REMOTE_ADDR']]); + } 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['my_url'] = System::baseUrl() . '/profile/' . $user_record['nickname']; + $_SESSION['my_address'] = $user_record['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); $_SESSION['addr'] = $_SERVER['REMOTE_ADDR']; $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,67 +98,78 @@ function authenticate_success($user_record, $login_initial = false, $interactive $master_record = $a->user; - if ((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) { - $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", + 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[0]; + if (DBM::is_result($r)) { + $master_record = $r; } } - $r = q("SELECT `uid`,`username`,`nickname` FROM `user` WHERE `password` = '%s' AND `email` = '%s' AND `account_removed` = 0 ", - dbesc($master_record['password']), - dbesc($master_record['email']) - ); - if (dbm::is_result($r)) { - $a->identities = $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 = q("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname` + $r = dba::p("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname` FROM `manage` INNER JOIN `user` ON `manage`.`mid` = `user`.`uid` - WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = %d", - intval($master_record['uid']) + WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = ?", + $master_record['uid'] ); - if (dbm::is_result($r)) { - $a->identities = array_merge($a->identities,$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 = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", - intval($_SESSION['uid'])); - if (dbm::is_result($r)) { - $a->contact = $r[0]; - $a->cid = $r[0]['id']; + $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']; $_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) { - - q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d", - dbesc(datetime_convert()), - intval($_SESSION['uid']) - ); + dba::update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $_SESSION['uid']]); // Set the login date for all identities of the user - q("UPDATE `user` SET `login_date` = '%s' WHERE `password` = '%s' AND `email` = '%s' AND `account_removed` = 0", - dbesc(datetime_convert()), - dbesc($master_record['password']), - dbesc($master_record['email']) - ); - - + dba::update('user', ['login_date' => DateTimeFormat::utcNow()], + ['parent-uid' => $master_record['uid'], 'account_removed' => false]); } if ($login_initial) { @@ -149,45 +178,37 @@ function authenticate_success($user_record, $login_initial = false, $interactive // 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 ' . $_SESSION['remember_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) && ($uid == $owner)) { + if ($uid == $owner) { 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 @@ -207,7 +228,7 @@ function can_write_wall(App $a, $owner) { } } - if (! $cid) { + if (!$cid) { return false; } @@ -221,11 +242,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; } } @@ -234,9 +254,8 @@ function can_write_wall(App $a, $owner) { return false; } - -function permissions_sql($owner_id, $remote_verified = false, $groups = null) { - +function permissions_sql($owner_id, $remote_verified = false, $groups = null) +{ $local_user = local_user(); $remote_user = remote_user(); @@ -254,8 +273,7 @@ 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 = ''; } elseif ($remote_user) { /* @@ -266,18 +284,18 @@ 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)) { @@ -285,20 +303,6 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null) { $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 = '') ) @@ -314,13 +318,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 @@ -332,9 +335,7 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul AND `item`.private = 0 "; - /** - * Profile owner - everything is visible - */ + // Profile owner - everything is visible if ($local_user && ($local_user == $owner_id)) { $sql = ''; } elseif ($remote_user) { @@ -345,14 +346,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) { @@ -366,16 +367,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 = ''))))) @@ -391,7 +382,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. @@ -403,7 +393,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(); @@ -412,7 +403,8 @@ function get_form_security_token($typename = '') { return $timestamp . '.' . $sec_hash; } -function check_form_security_token($typename = '', $formname = 'form_security_token') { +function check_form_security_token($typename = '', $formname = 'form_security_token') +{ if (!x($_REQUEST, $formname)) { return false; } @@ -434,19 +426,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); @@ -456,21 +453,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(); +}