X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsecurity.php;h=51fb6f7259a1aaaacfdfd2f4bb1dcc81b84514a6;hb=ea88e15a8cc10f99621720ca0e5a9598d0e64e0f;hp=6049700a387cc75d4f480996855727a169555add;hpb=951006dd10628151c8f108f82c3260f13846e557;p=friendica.git diff --git a/include/security.php b/include/security.php index 6049700a38..51fb6f7259 100644 --- a/include/security.php +++ b/include/security.php @@ -1,5 +1,7 @@ user = $user_record; if ($interactive) { - if ($a->user['login_date'] === '0000-00-00 00:00:00') { + 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); - } - else + } else { info( t("Welcome back ") . $a->user['username'] . EOL); + } } $member_since = strtotime($a->user['register_date']); - if (time() < ($member_since + ( 60 * 60 * 24 * 14))) + if (time() < ($member_since + ( 60 * 60 * 24 * 14))) { $_SESSION['new_member'] = true; - else + } else { $_SESSION['new_member'] = false; + } if (strlen($a->user['timezone'])) { date_default_timezone_set($a->user['timezone']); $a->timezone = $a->user['timezone']; @@ -78,34 +81,40 @@ 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", + $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($_SESSION['submanage']) ); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $master_record = $r[0]; + } } $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)) + if (dbm::is_result($r)) { $a->identities = $r; - else + } else { $a->identities = array(); + } - $r = q("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", + $r = q("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']) ); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $a->identities = array_merge($a->identities,$r); + } - if ($login_initial) + if ($login_initial) { logger('auth_identities: ' . print_r($a->identities,true), LOGGER_DEBUG); - if ($login_refresh) + } + if ($login_refresh) { 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'])); @@ -226,7 +235,7 @@ function can_write_wall(App $a, $owner) { } -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(); @@ -236,7 +245,6 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) { * * default permissions - anonymous user */ - $sql = " AND allow_cid = '' AND allow_gid = '' AND deny_cid = '' @@ -249,17 +257,14 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) { 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) { + } elseif ($remote_user) { + /* + * 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. + */ if (! $remote_verified) { $r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1", @@ -280,7 +285,9 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) { $gs .= '|<' . intval($g) . '>'; } - /*$sql = sprintf( + /* + * @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' ) @@ -290,7 +297,8 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) { 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 = '') ) @@ -307,7 +315,7 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) { } -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(); @@ -317,7 +325,6 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) * * default permissions - anonymous user */ - $sql = " AND `item`.allow_cid = '' AND `item`.allow_gid = '' AND `item`.deny_cid = '' @@ -328,21 +335,16 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) /** * Profile owner - everything is visible */ - 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) { - + } elseif ($remote_user) { + /* + * 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. + */ if (! $remote_verified) { $r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1", intval($remote_user), @@ -358,8 +360,9 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) $gs = '<<>>'; // should be impossible to match if (is_array($groups) && count($groups)) { - foreach ($groups as $g) + foreach ($groups as $g) { $gs .= '|<' . intval($g) . '>'; + } } $sql = sprintf( @@ -410,7 +413,11 @@ function get_form_security_token($typename = '') { } function check_form_security_token($typename = '', $formname = 'form_security_token') { - if (!x($_REQUEST, $formname)) return false; + if (!x($_REQUEST, $formname)) { + return false; + } + + /// @TODO Careful, not secured! $hash = $_REQUEST[$formname]; $max_livetime = 10800; // 3 hours @@ -418,7 +425,9 @@ function check_form_security_token($typename = '', $formname = 'form_security_to $a = get_app(); $x = explode('.', $hash); - if (time() > (IntVal($x[0]) + $max_livetime)) return false; + if (time() > (IntVal($x[0]) + $max_livetime)) { + return false; + } $sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $x[0] . $typename); @@ -439,7 +448,7 @@ function check_form_security_token_redirectOnErr($err_redirect, $typename = '', } function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') { if (!check_form_security_token($typename, $formname)) { - $a = get_app(); + $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); header('HTTP/1.1 403 Forbidden'); @@ -465,4 +474,3 @@ function init_groups_visitor($contact_id) { } return $groups; }} -