]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #5967 from annando/ap-nick
authorHypolite Petovan <hypolite@mrpetovan.com>
Fri, 19 Oct 2018 14:38:51 +0000 (10:38 -0400)
committerGitHub <noreply@github.com>
Fri, 19 Oct 2018 14:38:51 +0000 (10:38 -0400)
Fix function naming

40 files changed:
include/api.php
include/security.php [deleted file]
mod/admin.php
mod/attach.php
mod/cal.php
mod/community.php
mod/delegate.php
mod/display.php
mod/filer.php
mod/group.php
mod/invite.php
mod/item.php
mod/like.php
mod/manage.php
mod/notes.php
mod/openid.php
mod/photo.php
mod/photos.php
mod/poke.php
mod/profile.php
mod/profile_photo.php
mod/profiles.php
mod/register.php
mod/search.php
mod/settings.php
mod/subthread.php
mod/tagger.php
mod/videos.php
src/BaseModule.php
src/Content/Widget/TagCloud.php
src/Core/Authentication.php [new file with mode: 0644]
src/Model/Group.php
src/Model/Item.php
src/Model/Photo.php
src/Module/Login.php
src/Module/Logout.php
src/Module/Proxy.php
src/Object/Thread.php
src/Util/Proxy.php
src/Util/Security.php [new file with mode: 0644]

index ff763e98855c36bb0199fbc86ab7ce67b992a0c0..5e108632c99b5059f464636d517d89b400d08e20 100644 (file)
@@ -12,6 +12,7 @@ use Friendica\Content\Feature;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
+use Friendica\Core\Authentication;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\NotificationsManager;
@@ -46,7 +47,6 @@ use Friendica\Util\XML;
 require_once 'include/conversation.php';
 require_once 'mod/share.php';
 require_once 'mod/item.php';
-require_once 'include/security.php';
 require_once 'mod/wall_upload.php';
 
 define('API_METHOD_ANY', '*');
@@ -242,7 +242,7 @@ function api_login(App $a)
                throw new UnauthorizedException("This API requires login");
        }
 
-       authenticate_success($record);
+       Authentication::setAuthenticatedSessionForUser($record);
 
        $_SESSION["allow_api"] = true;
 
diff --git a/include/security.php b/include/security.php
deleted file mode 100644 (file)
index 2063bdd..0000000
+++ /dev/null
@@ -1,457 +0,0 @@
-<?php
-/**
- * @file include/security.php
- */
-
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
-use Friendica\Core\System;
-use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-use Friendica\Model\Group;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Model\PermissionSet;
-
-/**
- * @brief Calculate the hash that is needed for the "Friendica" cookie
- *
- * @param array $user Record from "user" table
- *
- * @return string Hashed data
- */
-function cookie_hash($user)
-{
-       return(hash("sha256", Config::get("system", "site_prvkey") .
-                       $user["prvkey"] .
-                       $user["password"]));
-}
-
-/**
- * @brief Set the "Friendica" cookie
- *
- * @param int $time
- * @param array $user Record from "user" table
- */
-function new_cookie($time, $user = [])
-{
-       if ($time != 0) {
-               $time = $time + time();
-       }
-
-       if ($user) {
-               $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, "/", "", (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL), true);
-}
-
-/**
- * @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'] = PConfig::get($user_record['uid'], 'system', 'mobile_theme');
-       $_SESSION['authenticated'] = 1;
-       $_SESSION['page_flags'] = $user_record['page-flags'];
-       $_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;
-
-       if ($interactive) {
-               if ($a->user['login_date'] <= NULL_DATE) {
-                       $_SESSION['return_url'] = 'profile_photo/new';
-                       $a->module = 'profile_photo';
-                       info(L10n::t("Welcome ") . $a->user['username'] . EOL);
-                       info(L10n::t('Please upload a profile photo.') . EOL);
-               } else {
-                       info(L10n::t("Welcome back ") . $a->user['username'] . EOL);
-               }
-       }
-
-       $member_since = strtotime($a->user['register_date']);
-       if (time() < ($member_since + ( 60 * 60 * 24 * 14))) {
-               $_SESSION['new_member'] = true;
-       } else {
-               $_SESSION['new_member'] = false;
-       }
-       if (strlen($a->user['timezone'])) {
-               date_default_timezone_set($a->user['timezone']);
-               $a->timezone = $a->user['timezone'];
-       }
-
-       $master_record = $a->user;
-
-       if ((x($_SESSION, 'submanage')) && intval($_SESSION['submanage'])) {
-               $user = DBA::selectFirst('user', [], ['uid' => $_SESSION['submanage']]);
-               if (DBA::isResult($user)) {
-                       $master_record = $user;
-               }
-       }
-
-       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 (DBA::isResult($r)) {
-                       $a->identities = array_merge($a->identities, DBA::toArray($r));
-               }
-       } else {
-               // 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 (DBA::isResult($r)) {
-                       $a->identities = DBA::toArray($r);
-               }
-
-               // Then add all siblings
-               $r = DBA::select('user', ['uid', 'username', 'nickname'],
-                       ['parent-uid' => $master_record['parent-uid'], 'account_removed' => false]);
-               if (DBA::isResult($r)) {
-                       $a->identities = array_merge($a->identities, DBA::toArray($r));
-               }
-       }
-
-       $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` = ?",
-               $master_record['uid']
-       );
-       if (DBA::isResult($r)) {
-               $a->identities = array_merge($a->identities, DBA::toArray($r));
-       }
-
-       if ($login_initial) {
-               logger('auth_identities: ' . print_r($a->identities, true), LOGGER_DEBUG);
-       }
-       if ($login_refresh) {
-               logger('auth_identities refresh: ' . print_r($a->identities, true), LOGGER_DEBUG);
-       }
-
-       $contact = DBA::selectFirst('contact', [], ['uid' => $_SESSION['uid'], 'self' => true]);
-       if (DBA::isResult($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'] . '"');
-
-       if ($login_initial || $login_refresh) {
-               DBA::update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $_SESSION['uid']]);
-
-               // Set the login date for all identities of the user
-               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 (!empty($_SESSION['remember'])) {
-                       logger('Injecting cookie for remembered user ' . $a->user['nickname']);
-                       new_cookie(604800, $user_record);
-                       unset($_SESSION['remember']);
-               }
-       }
-
-       if ($login_initial) {
-               Addon::callHooks('logged_in', $a->user);
-
-               if (($a->module !== 'home') && isset($_SESSION['return_url'])) {
-                       goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
-               }
-       }
-}
-
-function can_write_wall($owner)
-{
-       static $verified = 0;
-
-       if (!local_user() && !remote_user()) {
-               return false;
-       }
-
-       $uid = local_user();
-       if ($uid == $owner) {
-               return true;
-       }
-
-       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
-
-               if ($verified === 2) {
-                       return true;
-               } elseif ($verified === 1) {
-                       return false;
-               } else {
-                       $cid = 0;
-
-                       if (!empty($_SESSION['remote'])) {
-                               foreach ($_SESSION['remote'] as $visitor) {
-                                       if ($visitor['uid'] == $owner) {
-                                               $cid = $visitor['cid'];
-                                               break;
-                                       }
-                               }
-                       }
-
-                       if (!$cid) {
-                               return false;
-                       }
-
-                       $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `user`.`uid` = `contact`.`uid`
-                               WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-                               AND `user`.`blockwall` = 0 AND `readonly` = 0  AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1",
-                               intval($owner),
-                               intval($cid),
-                               intval(Contact::SHARING),
-                               intval(Contact::FRIEND),
-                               intval(Contact::PAGE_COMMUNITY)
-                       );
-
-                       if (DBA::isResult($r)) {
-                               $verified = 2;
-                               return true;
-                       } else {
-                               $verified = 1;
-                       }
-               }
-       }
-
-       return false;
-}
-
-/// @TODO $groups should be array
-function permissions_sql($owner_id, $remote_verified = false, $groups = null)
-{
-       $local_user = local_user();
-       $remote_user = remote_user();
-
-       /**
-        * Construct permissions
-        *
-        * default permissions - anonymous user
-        */
-       $sql = " AND allow_cid = ''
-                        AND allow_gid = ''
-                        AND deny_cid  = ''
-                        AND deny_gid  = ''
-       ";
-
-       /**
-        * 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) {
-               /*
-                * 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) {
-                       if (DBA::exists('contact', ['id' => $remote_user, 'uid' => $owner_id, 'blocked' => false])) {
-                               $remote_verified = true;
-                               $groups = Group::getIdsByContactId($remote_user);
-                       }
-               }
-
-               if ($remote_verified) {
-                       $gs = '<<>>'; // should be impossible to match
-
-                       if (is_array($groups)) {
-                               foreach ($groups as $g) {
-                                       $gs .= '|<' . intval($g) . '>';
-                               }
-                       }
-
-                       $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 = '') )
-                                 )
-                               ",
-                               intval($remote_user),
-                               DBA::escape($gs),
-                               intval($remote_user),
-                               DBA::escape($gs)
-                       );
-               }
-       }
-       return $sql;
-}
-
-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
-        */
-       $sql = " AND NOT `item`.`private`";
-
-       // Profile owner - everything is visible
-       if ($local_user && ($local_user == $owner_id)) {
-               $sql = '';
-       } 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.
-                */
-               $set = PermissionSet::get($owner_id, $remote_user, $groups);
-
-               if (!empty($set)) {
-                       $sql_set = " OR (`item`.`private` IN (1,2) AND `item`.`wall` AND `item`.`psid` IN (" . implode(',', $set) . "))";
-               } else {
-                       $sql_set = '';
-               }
-
-               $sql = " AND (NOT `item`.`private`" . $sql_set . ")";
-       }
-
-       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.
- * 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).
- *    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,
- *    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 = '')
-{
-       $a = get_app();
-
-       $timestamp = time();
-       $sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $timestamp . $typename);
-
-       return $timestamp . '.' . $sec_hash;
-}
-
-function check_form_security_token($typename = '', $formname = 'form_security_token')
-{
-       $hash = null;
-
-       if (!empty($_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
-
-       $a = get_app();
-
-       $x = explode('.', $hash);
-       if (time() > (IntVal($x[0]) + $max_livetime)) {
-               return false;
-       }
-
-       $sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $x[0] . $typename);
-
-       return ($sec_hash == $x[1]);
-}
-
-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')
-{
-       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(System::baseUrl() . $err_redirect);
-       }
-}
-
-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);
-               logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
-               header('HTTP/1.1 403 Forbidden');
-               killme();
-       }
-}
-
-/**
- * @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();
-}
index b0fb6d47262a23024e8d0df63c464a2cd438f4c5..2714b0b86450e98d545a23e397f51f781a9b3208 100644 (file)
@@ -6,6 +6,7 @@
  */
 
 use Friendica\App;
+use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Addon;
@@ -314,7 +315,7 @@ function admin_page_tos(App $a)
                '$preview' => L10n::t('Privacy Statement Preview'),
                '$privtext' => $tos->privacy_complete,
                '$tostext' => ['tostext', L10n::t('The Terms of Service'), Config::get('system', 'tostext'), L10n::t('Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below.')],
-               '$form_security_token' => get_form_security_token("admin_tos"),
+               '$form_security_token' => BaseModule::getFormSecurityToken("admin_tos"),
                '$submit' => L10n::t('Save Settings'),
        ]);
 }
@@ -325,7 +326,7 @@ function admin_page_tos(App $a)
  */
 function admin_page_tos_post(App $a)
 {
-       check_form_security_token_redirectOnErr('/admin/tos', 'admin_tos');
+       BaseModule::checkFormSecurityTokenRedirectOnError('/admin/tos', 'admin_tos');
 
        if (!x($_POST, "page_tos")) {
                return;
@@ -385,7 +386,7 @@ function admin_page_blocklist(App $a)
                '$entries' => $blocklistform,
                '$baseurl' => System::baseUrl(true),
                '$confirm_delete' => L10n::t('Delete entry from blocklist?'),
-               '$form_security_token' => get_form_security_token("admin_blocklist")
+               '$form_security_token' => BaseModule::getFormSecurityToken("admin_blocklist")
        ]);
 }
 
@@ -400,7 +401,7 @@ function admin_page_blocklist_post(App $a)
                return;
        }
 
-       check_form_security_token_redirectOnErr('/admin/blocklist', 'admin_blocklist');
+       BaseModule::checkFormSecurityTokenRedirectOnError('/admin/blocklist', 'admin_blocklist');
 
        if (x($_POST['page_blocklist_save'])) {
                //  Add new item to blocklist
@@ -443,7 +444,7 @@ function admin_page_contactblock_post(App $a)
        $contact_url = x($_POST, 'contact_url') ? $_POST['contact_url'] : '';
        $contacts    = x($_POST, 'contacts')    ? $_POST['contacts']    : [];
 
-       check_form_security_token_redirectOnErr('/admin/contactblock', 'admin_contactblock');
+       BaseModule::checkFormSecurityTokenRedirectOnError('/admin/contactblock', 'admin_contactblock');
 
        if (x($_POST, 'page_contactblock_block')) {
                $contact_id = Contact::getIdForURL($contact_url);
@@ -500,7 +501,7 @@ function admin_page_contactblock(App $a)
                '$h_newblock'  => L10n::t('Block New Remote Contact'),
                '$th_contacts' => [L10n::t('Photo'), L10n::t('Name'), L10n::t('Address'), L10n::t('Profile URL')],
 
-               '$form_security_token' => get_form_security_token("admin_contactblock"),
+               '$form_security_token' => BaseModule::getFormSecurityToken("admin_contactblock"),
 
                // values //
                '$baseurl'    => System::baseUrl(true),
@@ -535,7 +536,7 @@ function admin_page_deleteitem(App $a)
                '$intro2' => L10n::t('You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456.'),
                '$deleteitemguid' => ['deleteitemguid', L10n::t("GUID"), '', L10n::t("The GUID of the item you want to delete."), 'required', 'autofocus'],
                '$baseurl' => System::baseUrl(),
-               '$form_security_token' => get_form_security_token("admin_deleteitem")
+               '$form_security_token' => BaseModule::getFormSecurityToken("admin_deleteitem")
        ]);
 }
 
@@ -553,7 +554,7 @@ function admin_page_deleteitem_post(App $a)
                return;
        }
 
-       check_form_security_token_redirectOnErr('/admin/deleteitem/', 'admin_deleteitem');
+       BaseModule::checkFormSecurityTokenRedirectOnError('/admin/deleteitem/', 'admin_deleteitem');
 
        if (x($_POST['page_deleteitem_submit'])) {
                $guid = trim(notags($_POST['deleteitemguid']));
@@ -945,7 +946,7 @@ function admin_page_summary(App $a)
  */
 function admin_page_site_post(App $a)
 {
-       check_form_security_token_redirectOnErr('/admin/site', 'admin_site');
+       BaseModule::checkFormSecurityTokenRedirectOnError('/admin/site', 'admin_site');
 
        if (!empty($_POST['republish_directory'])) {
                Worker::add(PRIORITY_LOW, 'Directory');
@@ -1541,7 +1542,7 @@ function admin_page_site(App $a)
                '$relay_server_tags'    => ['relay_server_tags', L10n::t("Server tags"), Config::get('system','relay_server_tags'), L10n::t("Comma separated list of tags for the 'tags' subscription.")],
                '$relay_user_tags'      => ['relay_user_tags', L10n::t("Allow user tags"), Config::get('system', 'relay_user_tags', true), L10n::t("If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'.")],
 
-               '$form_security_token'  => get_form_security_token("admin_site"),
+               '$form_security_token'  => BaseModule::getFormSecurityToken("admin_site"),
                '$relocate_button'      => L10n::t('Start Relocation'),
        ]);
 }
@@ -1656,7 +1657,7 @@ function admin_page_users_post(App $a)
        $nu_email    = defaults($_POST, 'new_user_email'   , '');
        $nu_language = Config::get('system', 'language');
 
-       check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
+       BaseModule::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users');
 
        if (!($nu_name === "") && !($nu_email === "") && !($nu_nickname === "")) {
                try {
@@ -1772,14 +1773,14 @@ function admin_page_users(App $a)
                }
                switch ($a->argv[2]) {
                        case "delete":
-                               check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
+                               BaseModule::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
                                // delete user
                                User::remove($uid);
 
                                notice(L10n::t("User '%s' deleted", $user['username']) . EOL);
                                break;
                        case "block":
-                               check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
+                               BaseModule::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
                                q("UPDATE `user` SET `blocked` = %d WHERE `uid` = %s",
                                        intval(1 - $user['blocked']),
                                        intval($uid)
@@ -1926,7 +1927,7 @@ function admin_page_users(App $a)
                '$confirm_delete_multi' => L10n::t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'),
                '$confirm_delete' => L10n::t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'),
 
-               '$form_security_token' => get_form_security_token("admin_users"),
+               '$form_security_token' => BaseModule::getFormSecurityToken("admin_users"),
 
                // values //
                '$baseurl' => System::baseUrl(true),
@@ -1971,7 +1972,7 @@ function admin_page_addons(App $a)
                }
 
                if (x($_GET, "a") && $_GET['a'] == "t") {
-                       check_form_security_token_redirectOnErr('/admin/addons', 'admin_themes', 't');
+                       BaseModule::checkFormSecurityTokenRedirectOnError('/admin/addons', 'admin_themes', 't');
 
                        // Toggle addon status
                        $idx = array_search($addon, $a->addons);
@@ -2033,7 +2034,7 @@ function admin_page_addons(App $a)
                        '$screenshot' => '',
                        '$readme' => $readme,
 
-                       '$form_security_token' => get_form_security_token("admin_themes"),
+                       '$form_security_token' => BaseModule::getFormSecurityToken("admin_themes"),
                ]);
        }
 
@@ -2041,7 +2042,7 @@ function admin_page_addons(App $a)
         * List addons
         */
        if (x($_GET, "a") && $_GET['a'] == "r") {
-               check_form_security_token_redirectOnErr(System::baseUrl() . '/admin/addons', 'admin_themes', 't');
+               BaseModule::checkFormSecurityTokenRedirectOnError(System::baseUrl() . '/admin/addons', 'admin_themes', 't');
                Addon::reload();
                info("Addons reloaded");
                goaway(System::baseUrl() . '/admin/addons');
@@ -2084,7 +2085,7 @@ function admin_page_addons(App $a)
                '$addons' => $addons,
                '$pcount' => count($addons),
                '$noplugshint' => L10n::t('There are currently no addons available on your node. You can find the official addon repository at %1$s and might find other interesting addons in the open addon registry at %2$s', 'https://github.com/friendica/friendica-addons', 'http://addons.friendi.ca'),
-               '$form_security_token' => get_form_security_token("admin_themes"),
+               '$form_security_token' => BaseModule::getFormSecurityToken("admin_themes"),
        ]);
 }
 
@@ -2219,7 +2220,7 @@ function admin_page_themes(App $a)
                }
 
                if (x($_GET, "a") && $_GET['a'] == "t") {
-                       check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't');
+                       BaseModule::checkFormSecurityTokenRedirectOnError('/admin/themes', 'admin_themes', 't');
 
                        // Toggle theme status
 
@@ -2301,13 +2302,13 @@ function admin_page_themes(App $a)
                        '$screenshot' => $screenshot,
                        '$readme' => $readme,
 
-                       '$form_security_token' => get_form_security_token("admin_themes"),
+                       '$form_security_token' => BaseModule::getFormSecurityToken("admin_themes"),
                ]);
        }
 
        // reload active themes
        if (x($_GET, "a") && $_GET['a'] == "r") {
-               check_form_security_token_redirectOnErr(System::baseUrl() . '/admin/themes', 'admin_themes', 't');
+               BaseModule::checkFormSecurityTokenRedirectOnError(System::baseUrl() . '/admin/themes', 'admin_themes', 't');
                foreach ($themes as $th) {
                        if ($th['allowed']) {
                                Theme::uninstall($th['name']);
@@ -2340,7 +2341,7 @@ function admin_page_themes(App $a)
                '$noplugshint'         => L10n::t('No themes found on the system. They should be placed in %1$s', '<code>/view/themes</code>'),
                '$experimental'        => L10n::t('[Experimental]'),
                '$unsupported'         => L10n::t('[Unsupported]'),
-               '$form_security_token' => get_form_security_token("admin_themes"),
+               '$form_security_token' => BaseModule::getFormSecurityToken("admin_themes"),
        ]);
 }
 
@@ -2352,7 +2353,7 @@ function admin_page_themes(App $a)
 function admin_page_logs_post(App $a)
 {
        if (x($_POST, "page_logs")) {
-               check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/admin/logs', 'admin_logs');
 
                $logfile   = ((x($_POST,'logfile'))   ? notags(trim($_POST['logfile']))  : '');
                $debugging = ((x($_POST,'debugging')) ? true                             : false);
@@ -2414,7 +2415,7 @@ function admin_page_logs(App $a)
                '$debugging' => ['debugging', L10n::t("Enable Debugging"), Config::get('system', 'debugging'), ""],
                '$logfile' => ['logfile', L10n::t("Log file"), Config::get('system', 'logfile'), L10n::t("Must be writable by web server. Relative to your Friendica top-level directory.")],
                '$loglevel' => ['loglevel', L10n::t("Log level"), Config::get('system', 'loglevel'), "", $log_choices],
-               '$form_security_token' => get_form_security_token("admin_logs"),
+               '$form_security_token' => BaseModule::getFormSecurityToken("admin_logs"),
                '$phpheader' => L10n::t("PHP logging"),
                '$phphint' => L10n::t("To temporarily enable logging of PHP errors and warnings you can prepend the following to the index.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."),
                '$phplogcode' => "error_reporting(E_ERROR | E_WARNING | E_PARSE);\nini_set('error_log','php.out');\nini_set('log_errors','1');\nini_set('display_errors', '1');",
@@ -2485,7 +2486,7 @@ function admin_page_viewlogs(App $a)
  */
 function admin_page_features_post(App $a)
 {
-       check_form_security_token_redirectOnErr('/admin/features', 'admin_manage_features');
+       BaseModule::checkFormSecurityTokenRedirectOnError('/admin/features', 'admin_manage_features');
 
        logger('postvars: ' . print_r($_POST, true), LOGGER_DATA);
 
@@ -2550,7 +2551,7 @@ function admin_page_features(App $a)
 
                $tpl = get_markup_template('admin/settings_features.tpl');
                $o = replace_macros($tpl, [
-                       '$form_security_token' => get_form_security_token("admin_manage_features"),
+                       '$form_security_token' => BaseModule::getFormSecurityToken("admin_manage_features"),
                        '$title' => L10n::t('Manage Additional Features'),
                        '$features' => $arr,
                        '$submit' => L10n::t('Save Settings'),
index 99f0fc46000bdb54c6ef74678a53779bb3a64a1c..9ca701ba356ebde93865136b15dd19ef927d33b0 100644 (file)
@@ -6,9 +6,9 @@
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
+use Friendica\Util\Security;
 
 require_once 'include/dba.php';
-require_once 'include/security.php';
 
 function attach_init(App $a)
 {
@@ -27,7 +27,7 @@ function attach_init(App $a)
                return;
        }
 
-       $sql_extra = permissions_sql($r['uid']);
+       $sql_extra = Security::getPermissionsSQLByUserId($r['uid']);
 
        // Now we'll see if we can access the attachment
 
index ae1060c47ad5d36a1a76e774857ffd6c4f25e939..b55e078d83404981f34d2c19436946595e7d3cc8 100644 (file)
@@ -17,10 +17,12 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Event;
 use Friendica\Model\Group;
+use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
+use Friendica\Util\Security;
 
 function cal_init(App $a)
 {
@@ -141,7 +143,7 @@ function cal_content(App $a)
        }
 
        // get the permissions
-       $sql_perms = item_permissions_sql($owner_uid, $remote_contact, $groups);
+       $sql_perms = Item::getPermissionsSQLByUserId($owner_uid, $remote_contact, $groups);
        // we only want to have the events of the profile owner
        $sql_extra = " AND `event`.`cid` = 0 " . $sql_perms;
 
index 4b2169fd0651954a46c3ef3805a6d415aa18118e..0eaccc0db0306ead6ead5241690d2f37e524408c 100644 (file)
@@ -91,7 +91,6 @@ function community_content(App $a, $update = 0)
                }
        }
 
-       require_once 'include/security.php';
        require_once 'include/conversation.php';
 
        if (!$update) {
index ed4f854377109c6c4466487ec6ab9f34eedb0eff..2b29632dda00bc265800937b642c59406f6546b6 100644 (file)
@@ -4,11 +4,13 @@
  */
 
 use Friendica\App;
+use Friendica\BaseModule;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
+use Friendica\Util\Security;
 
 require_once 'mod/settings.php';
 
@@ -28,7 +30,7 @@ function delegate_post(App $a)
                return;
        }
 
-       check_form_security_token_redirectOnErr('/delegate', 'delegate');
+       BaseModule::checkFormSecurityTokenRedirectOnError('/delegate', 'delegate');
 
        $parent_uid = defaults($_POST, 'parent_user', 0);
        $parent_password = defaults($_POST, 'parent_password', '');
@@ -162,7 +164,7 @@ function delegate_content(App $a)
        }
 
        $o = replace_macros(get_markup_template('delegate.tpl'), [
-               '$form_security_token' => get_form_security_token('delegate'),
+               '$form_security_token' => BaseModule::getFormSecurityToken('delegate'),
                '$parent_header' => L10n::t('Parent User'),
                '$parent_user' => $parent_user,
                '$parent_password' => $parent_password,
index a03b918372efd61636961fbbf488f486aec18ddc..081c3ce6cf4302a709d83b807f755c445f848f4f 100644 (file)
@@ -18,6 +18,7 @@ use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\ActivityPub;
+use Friendica\Util\Security;
 
 function display_init(App $a)
 {
@@ -200,7 +201,6 @@ function display_content(App $a, $update = false, $update_uid = 0)
                return;
        }
 
-       require_once 'include/security.php';
        require_once 'include/conversation.php';
 
        $o = '';
@@ -325,7 +325,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
                $o .= status_editor($a, $x, 0, true);
        }
 
-       $sql_extra = item_permissions_sql($a->profile['uid'], $is_remote_contact, $groups);
+       $sql_extra = Item::getPermissionsSQLByUserId($a->profile['uid'], $is_remote_contact, $groups);
 
        if (local_user() && (local_user() == $a->profile['uid'])) {
                $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
index 9b0017322c993e229f2253703e83d7bcc6ae99fd..d8c89f8554d71cd952d06c66428f9fccec982919 100644 (file)
@@ -6,7 +6,6 @@ use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 
-require_once 'include/security.php';
 require_once 'include/items.php';
 
 function filer_content(App $a)
index f8fefc78f9e96cf91ac481f713ea956b8568df77..129cf18c2a24febbd72c57badf990ae87a5d0099 100644 (file)
@@ -6,6 +6,7 @@
  */
 
 use Friendica\App;
+use Friendica\BaseModule;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -13,6 +14,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model;
 use Friendica\Module;
+use Friendica\Util\Security;
 
 function group_init(App $a) {
        if (local_user()) {
@@ -28,7 +30,7 @@ function group_post(App $a) {
        }
 
        if (($a->argc == 2) && ($a->argv[1] === 'new')) {
-               check_form_security_token_redirectOnErr('/group/new', 'group_edit');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/group/new', 'group_edit');
 
                $name = notags(trim($_POST['groupname']));
                $r = Model\Group::create(local_user(), $name);
@@ -46,7 +48,7 @@ function group_post(App $a) {
        }
 
        if (($a->argc == 2) && intval($a->argv[1])) {
-               check_form_security_token_redirectOnErr('/group', 'group_edit');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_edit');
 
                $r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($a->argv[1]),
@@ -107,7 +109,7 @@ function group_content(App $a) {
                        '$title' => L10n::t('Create a group of contacts/friends.'),
                        '$gname' => ['groupname', L10n::t('Group Name: '), '', ''],
                        '$gid' => 'new',
-                       '$form_security_token' => get_form_security_token("group_edit"),
+                       '$form_security_token' => BaseModule::getFormSecurityToken("group_edit"),
                ]);
 
 
@@ -137,7 +139,7 @@ function group_content(App $a) {
 
 
        if (($a->argc == 3) && ($a->argv[1] === 'drop')) {
-               check_form_security_token_redirectOnErr('/group', 'group_drop', 't');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_drop', 't');
 
                if (intval($a->argv[2])) {
                        $r = q("SELECT `name` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -162,7 +164,7 @@ function group_content(App $a) {
        }
 
        if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
-               check_form_security_token_ForbiddenOnErr('group_member_change', 't');
+               BaseModule::checkFormSecurityTokenForbiddenOnError('group_member_change', 't');
 
                $r = q("SELECT `id` FROM `contact` WHERE `id` = %d AND `uid` = %d and `self` = 0 and `blocked` = 0 AND `pending` = 0 LIMIT 1",
                        intval($a->argv[2]),
@@ -216,7 +218,7 @@ function group_content(App $a) {
                $drop_txt = replace_macros($drop_tpl, [
                        '$id' => $group['id'],
                        '$delete' => L10n::t('Delete Group'),
-                       '$form_security_token' => get_form_security_token("group_drop"),
+                       '$form_security_token' => BaseModule::getFormSecurityToken("group_drop"),
                ]);
 
 
@@ -225,7 +227,7 @@ function group_content(App $a) {
                        '$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''],
                        '$gid' => $group['id'],
                        '$drop' => $drop_txt,
-                       '$form_security_token' => get_form_security_token('group_edit'),
+                       '$form_security_token' => BaseModule::getFormSecurityToken('group_edit'),
                        '$edit_name' => L10n::t('Edit Group Name'),
                        '$editable' => 1,
                ];
@@ -244,7 +246,7 @@ function group_content(App $a) {
                'contacts' => [],
        ];
 
-       $sec_token = addslashes(get_form_security_token('group_member_change'));
+       $sec_token = addslashes(BaseModule::getFormSecurityToken('group_member_change'));
 
        // Format the data of the group members
        foreach ($members as $member) {
index 7318b77ae9f78c6e3318a3fad8ad32fabb12eb21..7f479157f81afbf93d0a7463c7d0d9a4dbc99fd6 100644 (file)
@@ -7,6 +7,7 @@
  */
 
 use Friendica\App;
+use Friendica\BaseModule;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -14,6 +15,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Protocol\Email;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Security;
 
 function invite_post(App $a)
 {
@@ -22,7 +24,7 @@ function invite_post(App $a)
                return;
        }
 
-       check_form_security_token_redirectOnErr('/', 'send_invite');
+       BaseModule::checkFormSecurityTokenRedirectOnError('/', 'send_invite');
 
        $max_invites = intval(Config::get('system', 'max_invites'));
        if (! $max_invites) {
@@ -139,7 +141,7 @@ function invite_content(App $a) {
        }
 
        $o = replace_macros($tpl, [
-               '$form_security_token' => get_form_security_token("send_invite"),
+               '$form_security_token' => BaseModule::getFormSecurityToken("send_invite"),
                '$title'               => L10n::t('Send invitations'),
                '$recipients'          => ['recipients', L10n::t('Enter email addresses, one per line:')],
                '$message'             => ['message', L10n::t('Your message:'),L10n::t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
index 4d798ac1e55fac55bbf0351ce873781f4450170c..5d4a23caa7a28802a4c9f82210c07c5f640e9aa7 100644 (file)
@@ -32,6 +32,7 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
+use Friendica\Util\Security;
 
 require_once 'include/enotify.php';
 require_once 'include/text.php';
@@ -42,8 +43,6 @@ function item_post(App $a) {
                return 0;
        }
 
-       require_once 'include/security.php';
-
        $uid = local_user();
 
        if (!empty($_REQUEST['dropitems'])) {
@@ -162,7 +161,7 @@ function item_post(App $a) {
        $allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
 
        // Now check that valid personal details have been provided
-       if (!can_write_wall($profile_uid) && !$allow_comment) {
+       if (!Security::canWriteToUserWall($profile_uid) && !$allow_comment) {
                notice(L10n::t('Permission denied.') . EOL) ;
 
                if (!empty($_REQUEST['return'])) {
@@ -871,8 +870,6 @@ function item_content(App $a)
                return;
        }
 
-       require_once 'include/security.php';
-
        $o = '';
 
        if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
index 957fe5fc42ee107b9dafcb22c5c9b35a727567d6..08e3febbbc1a0b4dfc729771d17547e410a60963 100644 (file)
@@ -4,7 +4,6 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Model\Item;
 
-require_once 'include/security.php';
 require_once 'include/items.php';
 
 function like_content(App $a) {
index f81afb09a6e30e18ca2ba0bcecd23151adb2a7da..d38d90ce60e648b9ffb439d5a9fd801b1e3addad 100644 (file)
@@ -3,6 +3,7 @@
  * @file mod/manage.php
  */
 use Friendica\App;
+use Friendica\Core\Authentication;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
@@ -109,8 +110,7 @@ function manage_post(App $a) {
                unset($_SESSION['sysmsg_info']);
        }
 
-       require_once('include/security.php');
-       authenticate_success($r[0], true, true);
+       Authentication::setAuthenticatedSessionForUser($r[0], true, true);
 
        if ($limited_id) {
                $_SESSION['submanage'] = $original_id;
index da8352966e721e3f2c7698dc51668efa33db5967..55a92f8e64f674fc34716f0d656d174f238f7ea1 100644 (file)
@@ -33,7 +33,6 @@ function notes_content(App $a, $update = false)
                return;
        }
 
-       require_once 'include/security.php';
        require_once 'include/conversation.php';
 
        $o = Profile::getTabs($a, true);
index 63b29684b3c5eded4a1fa651470a76ee192dc8b5..41aabe7a97811e42ace2ec2772d16a96aac5b4e9 100644 (file)
@@ -4,6 +4,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Authentication;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
@@ -50,8 +51,7 @@ function openid_content(App $a) {
 
                                unset($_SESSION['openid']);
 
-                               require_once('include/security.php');
-                               authenticate_success($r[0],true,true);
+                               Authentication::setAuthenticatedSessionForUser($r[0],true,true);
 
                                // just in case there was no return url set
                                // and we fell through
index b1dd9a5c3a3c60863c5fb71b5c7fc2f194016581..083b7cfc99bdd2a4076fd8e9f9fbb8003930294e 100644 (file)
@@ -6,8 +6,7 @@
 use Friendica\App;
 use Friendica\Database\DBA;
 use Friendica\Object\Image;
-
-require_once 'include/security.php';
+use Friendica\Util\Security;
 
 function photo_init(App $a)
 {
@@ -111,7 +110,7 @@ function photo_init(App $a)
                        intval($resolution)
                );
                if (DBA::isResult($r)) {
-                       $sql_extra = permissions_sql($r[0]['uid']);
+                       $sql_extra = Security::getPermissionsSQLByUserId($r[0]['uid']);
 
                        // Now we'll see if we can access the photo
                        $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` <= %d $sql_extra ORDER BY scale DESC LIMIT 1",
index 259209ed4041ede16cf179b0c688030eaf10d4a8..55c8881e4cecd17d74d278fbc2e75dd8bb4d817d 100644 (file)
@@ -26,9 +26,9 @@ use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
 use Friendica\Util\Temporal;
+use Friendica\Util\Security;
 
 require_once 'include/items.php';
-require_once 'include/security.php';
 
 function photos_init(App $a) {
 
@@ -948,7 +948,6 @@ function photos_content(App $a)
                return;
        }
 
-       require_once 'include/security.php';
        require_once 'include/conversation.php';
 
        if (empty($a->data['user'])) {
@@ -1053,7 +1052,7 @@ function photos_content(App $a)
                return;
        }
 
-       $sql_extra = permissions_sql($owner_uid, $remote_contact, $groups);
+       $sql_extra = Security::getPermissionsSQLByUserId($owner_uid, $remote_contact, $groups);
 
        $o = "";
 
@@ -1473,7 +1472,7 @@ function photos_content(App $a)
                        $tpl = get_markup_template('photo_item.tpl');
                        $return_url = $a->cmd;
 
-                       if ($can_post || can_write_wall($owner_uid)) {
+                       if ($can_post || Security::canWriteToUserWall($owner_uid)) {
                                $like_tpl = get_markup_template('like_noshare.tpl');
                                $likebuttons = replace_macros($like_tpl, [
                                        '$id' => $link_item['id'],
@@ -1485,7 +1484,7 @@ function photos_content(App $a)
                        }
 
                        if (!DBA::isResult($items)) {
-                               if (($can_post || can_write_wall($owner_uid))) {
+                               if (($can_post || Security::canWriteToUserWall($owner_uid))) {
                                        $comments .= replace_macros($cmnt_tpl, [
                                                '$return_path' => '',
                                                '$jsreload' => $return_url,
@@ -1524,7 +1523,7 @@ function photos_content(App $a)
                                        $dislike = format_like($conv_responses['dislike'][$link_item['uri']], $conv_responses['dislike'][$link_item['uri'] . '-l'], 'dislike', $link_item['id']);
                                }
 
-                               if (($can_post || can_write_wall($owner_uid))) {
+                               if (($can_post || Security::canWriteToUserWall($owner_uid))) {
                                        $comments .= replace_macros($cmnt_tpl,[
                                                '$return_path' => '',
                                                '$jsreload' => $return_url,
@@ -1584,7 +1583,7 @@ function photos_content(App $a)
                                                '$comment' => $comment
                                        ]);
 
-                                       if (($can_post || can_write_wall($owner_uid))) {
+                                       if (($can_post || Security::canWriteToUserWall($owner_uid))) {
                                                $comments .= replace_macros($cmnt_tpl, [
                                                        '$return_path' => '',
                                                        '$jsreload' => $return_url,
index 6ebb8632c18b3a24bc229b2c300fc1a8e346e97f..80d476005c06aa526350f48ac81d6a5173f2831d 100644 (file)
@@ -21,7 +21,6 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
-require_once 'include/security.php';
 require_once 'include/items.php';
 
 function poke_init(App $a)
index aa284d1669a0184a1e6fdf05c84074d76e02ce46..8d5ae8758533cc10a743e2859bb0a2ee45630ad6 100644 (file)
@@ -20,6 +20,7 @@ use Friendica\Model\Profile;
 use Friendica\Module\Login;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Security;
 use Friendica\Protocol\ActivityPub;
 
 function profile_init(App $a)
@@ -130,7 +131,6 @@ function profile_content(App $a, $update = 0)
                return Login::form();
        }
 
-       require_once 'include/security.php';
        require_once 'include/conversation.php';
        require_once 'include/items.php';
 
@@ -210,7 +210,7 @@ function profile_content(App $a, $update = 0)
                $a->page['aside'] .= Widget::categories(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], (!empty($category) ? xmlify($category) : ''));
                $a->page['aside'] .= Widget::tagCloud();
 
-               if (can_write_wall($a->profile['profile_uid'])) {
+               if (Security::canWriteToUserWall($a->profile['profile_uid'])) {
                        $x = [
                                'is_owner' => $is_owner,
                                'allow_location' => ($is_owner || $commvisitor) && $a->profile['allow_location'],
@@ -234,7 +234,7 @@ function profile_content(App $a, $update = 0)
 
 
        // Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
-       $sql_extra = item_permissions_sql($a->profile['profile_uid'], $remote_contact, $groups);
+       $sql_extra = Item::getPermissionsSQLByUserId($a->profile['profile_uid'], $remote_contact, $groups);
        $sql_extra2 = '';
 
        if ($update) {
index 984ebfed6f39fc27bfa6bc157d903e5be905953a..5fdff41e8c6b6d54820f5a45bac9279197032c69 100644 (file)
@@ -4,6 +4,7 @@
  */
 
 use Friendica\App;
+use Friendica\BaseModule;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
@@ -13,6 +14,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Model\Profile;
 use Friendica\Object\Image;
+use Friendica\Util\Security;
 
 function profile_photo_init(App $a)
 {
@@ -30,7 +32,7 @@ function profile_photo_post(App $a)
                return;
        }
 
-       check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
+       BaseModule::checkFormSecurityTokenRedirectOnError('/profile_photo', 'profile_photo');
 
        if (!empty($_POST['cropfinal']) && $_POST['cropfinal'] == 1) {
 
@@ -186,7 +188,7 @@ function profile_photo_content(App $a)
        $imagecrop = [];
 
        if (isset($a->argv[1]) && $a->argv[1] == 'use' && $a->argc >= 3) {
-               // check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
+               // BaseModule::checkFormSecurityTokenRedirectOnError('/profile_photo', 'profile_photo');
 
                $resource_id = $a->argv[2];
                //die(":".local_user());
@@ -246,7 +248,7 @@ function profile_photo_content(App $a)
                        '$title' => L10n::t('Upload Profile Photo'),
                        '$submit' => L10n::t('Upload'),
                        '$profiles' => $profiles,
-                       '$form_security_token' => get_form_security_token("profile_photo"),
+                       '$form_security_token' => BaseModule::getFormSecurityToken("profile_photo"),
                        '$select' => sprintf('%s %s', L10n::t('or'),
                                ($newuser) ? '<a href="' . System::baseUrl() . '">' . L10n::t('skip this step') . '</a>' : '<a href="' . System::baseUrl() . '/photos/' . $a->user['nickname'] . '">' . L10n::t('select a photo from your photo albums') . '</a>')
                ]);
@@ -263,7 +265,7 @@ function profile_photo_content(App $a)
                        '$image_url' => System::baseUrl() . '/photo/' . $filename,
                        '$title'     => L10n::t('Crop Image'),
                        '$desc'      => L10n::t('Please adjust the image cropping for optimum viewing.'),
-                       '$form_security_token' => get_form_security_token("profile_photo"),
+                       '$form_security_token' => BaseModule::getFormSecurityToken("profile_photo"),
                        '$done'      => L10n::t('Done Editing')
                ]);
                return $o;
index 3e6bd1cb0d0ff29bacf720540dcf125cd2132e1c..22f192b4ce6fa8f34f5308fdae4f80c2109f3f47 100644 (file)
@@ -4,6 +4,7 @@
  */
 
 use Friendica\App;
+use Friendica\BaseModule;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
@@ -41,7 +42,7 @@ function profiles_init(App $a) {
                        return; // NOTREACHED
                }
 
-               check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/profiles', 'profile_drop', 't');
 
                // move every contact using this profile as their default to the user default
 
@@ -64,7 +65,7 @@ function profiles_init(App $a) {
 
        if (($a->argc > 1) && ($a->argv[1] === 'new')) {
 
-               check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/profiles', 'profile_new', 't');
 
                $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
                        intval(local_user()));
@@ -100,7 +101,7 @@ function profiles_init(App $a) {
 
        if (($a->argc > 2) && ($a->argv[1] === 'clone')) {
 
-               check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/profiles', 'profile_clone', 't');
 
                $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
                        intval(local_user()));
@@ -195,7 +196,7 @@ function profiles_post(App $a) {
                        return;
                }
 
-               check_form_security_token_redirectOnErr('/profiles', 'profile_edit');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/profiles', 'profile_edit');
 
                $is_default = (($orig[0]['is-default']) ? 1 : 0);
 
@@ -565,10 +566,10 @@ function profiles_content(App $a) {
                        ],
 
                        '$multi_profiles'               => Feature::isEnabled(local_user(), 'multi_profiles'),
-                       '$form_security_token'          => get_form_security_token("profile_edit"),
-                       '$form_security_token_photo'    => get_form_security_token("profile_photo"),
-                       '$profile_clone_link'           => ((Feature::isEnabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ""),
-                       '$profile_drop_link'            => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
+                       '$form_security_token'          => BaseModule::getFormSecurityToken("profile_edit"),
+                       '$form_security_token_photo'    => BaseModule::getFormSecurityToken("profile_photo"),
+                       '$profile_clone_link'           => ((Feature::isEnabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . BaseModule::getFormSecurityToken("profile_clone") : ""),
+                       '$profile_drop_link'            => 'profiles/drop/' . $r[0]['id'] . '?t=' . BaseModule::getFormSecurityToken("profile_drop"),
 
                        '$profile_action' => L10n::t('Profile Actions'),
                        '$banner'       => L10n::t('Edit Profile Details'),
@@ -681,7 +682,7 @@ function profiles_content(App $a) {
                                '$header'      => L10n::t('Edit/Manage Profiles'),
                                '$chg_photo'   => L10n::t('Change profile photo'),
                                '$cr_new'      => L10n::t('Create New Profile'),
-                               '$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"),
+                               '$cr_new_link' => 'profiles/new?t=' . BaseModule::getFormSecurityToken("profile_new"),
                                '$profiles'    => $profiles
                        ]);
                }
index 48fe67afc5a828f56b0e66ebccd6a89acba2765e..41d39f4158204b09792e084f9c732d790bd3066a 100644 (file)
@@ -4,6 +4,7 @@
  */
 
 use Friendica\App;
+use Friendica\BaseModule;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
@@ -18,7 +19,7 @@ require_once 'include/enotify.php';
 
 function register_post(App $a)
 {
-       check_form_security_token_redirectOnErr('/register', 'register');
+       BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register');
 
        $verified = 0;
        $blocked  = 1;
@@ -289,7 +290,7 @@ function register_content(App $a)
                '$showprivstatement' => Config::get('system', 'tosprivstatement'),
                '$privstatement' => $tos->privacy_complete,
                '$baseurl'   => System::baseurl(),
-               '$form_security_token' => get_form_security_token("register"),
+               '$form_security_token' => BaseModule::getFormSecurityToken("register"),
                '$explicit_content' => Config::get('system', 'explicit_content', false),
                '$explicit_content_note' => L10n::t('Note: This node explicitly contains adult content')
        ]);
index 64336e3487b0e78e34d304d37a86304e9b7d2630..b6e1a7e7f2cf4be8cb0f59553bf24493de7ecd41 100644 (file)
@@ -13,7 +13,6 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
-require_once 'include/security.php';
 require_once 'include/conversation.php';
 require_once 'mod/dirfind.php';
 
index 5632193e3bddcf4255713060a28ac05e2d98bbd8..cb88823997268ebd54100780c1224edeccc0238f 100644 (file)
@@ -4,6 +4,7 @@
  */
 
 use Friendica\App;
+use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Core\ACL;
@@ -22,6 +23,7 @@ use Friendica\Model\User;
 use Friendica\Protocol\Email;
 use Friendica\Util\Network;
 use Friendica\Util\Temporal;
+use Friendica\Util\Security;
 use Friendica\Module\Login;
 
 function get_theme_config_file($theme)
@@ -154,7 +156,7 @@ function settings_post(App $a)
        $old_page_flags = $a->user['page-flags'];
 
        if (($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST, 'remove')) {
-               check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth');
 
                $key = $_POST['remove'];
                DBA::delete('tokens', ['id' => $key, 'uid' => local_user()]);
@@ -163,7 +165,7 @@ function settings_post(App $a)
        }
 
        if (($a->argc > 2) && ($a->argv[1] === 'oauth')  && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST, 'submit')) {
-               check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth');
 
                $name     = defaults($_POST, 'name'    , '');
                $key      = defaults($_POST, 'key'     , '');
@@ -209,14 +211,14 @@ function settings_post(App $a)
        }
 
        if (($a->argc > 1) && ($a->argv[1] == 'addon')) {
-               check_form_security_token_redirectOnErr('/settings/addon', 'settings_addon');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/settings/addon', 'settings_addon');
 
                Addon::callHooks('addon_settings_post', $_POST);
                return;
        }
 
        if (($a->argc > 1) && ($a->argv[1] == 'connectors')) {
-               check_form_security_token_redirectOnErr('/settings/connectors', 'settings_connectors');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/settings/connectors', 'settings_connectors');
 
                if (x($_POST, 'general-submit')) {
                        PConfig::set(local_user(), 'system', 'disable_cw', intval($_POST['disable_cw']));
@@ -298,7 +300,7 @@ function settings_post(App $a)
        }
 
        if (($a->argc > 1) && ($a->argv[1] === 'features')) {
-               check_form_security_token_redirectOnErr('/settings/features', 'settings_features');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/settings/features', 'settings_features');
                foreach ($_POST as $k => $v) {
                        if (strpos($k, 'feature_') === 0) {
                                PConfig::set(local_user(), 'feature', substr($k, 8), ((intval($v)) ? 1 : 0));
@@ -309,7 +311,7 @@ function settings_post(App $a)
        }
 
        if (($a->argc > 1) && ($a->argv[1] === 'display')) {
-               check_form_security_token_redirectOnErr('/settings/display', 'settings_display');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/settings/display', 'settings_display');
 
                $theme             = x($_POST, 'theme')             ? notags(trim($_POST['theme']))        : $a->user['theme'];
                $mobile_theme      = x($_POST, 'mobile_theme')      ? notags(trim($_POST['mobile_theme'])) : '';
@@ -373,7 +375,7 @@ function settings_post(App $a)
                return; // NOTREACHED
        }
 
-       check_form_security_token_redirectOnErr('/settings', 'settings');
+       BaseModule::checkFormSecurityTokenRedirectOnError('/settings', 'settings');
 
        if (x($_POST,'resend_relocate')) {
                Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', local_user());
@@ -671,7 +673,7 @@ function settings_content(App $a)
                if (($a->argc > 2) && ($a->argv[2] === 'add')) {
                        $tpl = get_markup_template('settings/oauth_edit.tpl');
                        $o .= replace_macros($tpl, [
-                               '$form_security_token' => get_form_security_token("settings_oauth"),
+                               '$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"),
                                '$title'        => L10n::t('Add application'),
                                '$submit'       => L10n::t('Save Settings'),
                                '$cancel'       => L10n::t('Cancel'),
@@ -697,7 +699,7 @@ function settings_content(App $a)
 
                        $tpl = get_markup_template('settings/oauth_edit.tpl');
                        $o .= replace_macros($tpl, [
-                               '$form_security_token' => get_form_security_token("settings_oauth"),
+                               '$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"),
                                '$title'        => L10n::t('Add application'),
                                '$submit'       => L10n::t('Update'),
                                '$cancel'       => L10n::t('Cancel'),
@@ -711,7 +713,7 @@ function settings_content(App $a)
                }
 
                if (($a->argc > 3) && ($a->argv[2] === 'delete')) {
-                       check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't');
+                       BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth', 't');
 
                        DBA::delete('clients', ['client_id' => $a->argv[3], 'uid' => local_user()]);
                        goaway(System::baseUrl(true)."/settings/oauth/");
@@ -729,7 +731,7 @@ function settings_content(App $a)
 
                $tpl = get_markup_template('settings/oauth.tpl');
                $o .= replace_macros($tpl, [
-                       '$form_security_token' => get_form_security_token("settings_oauth"),
+                       '$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"),
                        '$baseurl'      => System::baseUrl(true),
                        '$title'        => L10n::t('Connected Apps'),
                        '$add'          => L10n::t('Add application'),
@@ -756,7 +758,7 @@ function settings_content(App $a)
 
                $tpl = get_markup_template('settings/addons.tpl');
                $o .= replace_macros($tpl, [
-                       '$form_security_token' => get_form_security_token("settings_addon"),
+                       '$form_security_token' => BaseModule::getFormSecurityToken("settings_addon"),
                        '$title'        => L10n::t('Addon Settings'),
                        '$settings_addons' => $settings_addons
                ]);
@@ -777,7 +779,7 @@ function settings_content(App $a)
 
                $tpl = get_markup_template('settings/features.tpl');
                $o .= replace_macros($tpl, [
-                       '$form_security_token' => get_form_security_token("settings_features"),
+                       '$form_security_token' => BaseModule::getFormSecurityToken("settings_features"),
                        '$title'               => L10n::t('Additional Features'),
                        '$features'            => $arr,
                        '$submit'              => L10n::t('Save Settings'),
@@ -836,7 +838,7 @@ function settings_content(App $a)
                $mail_disabled_message = (($mail_disabled) ? L10n::t('Email access is disabled on this site.') : '');
 
                $o .= replace_macros($tpl, [
-                       '$form_security_token' => get_form_security_token("settings_connectors"),
+                       '$form_security_token' => BaseModule::getFormSecurityToken("settings_connectors"),
 
                        '$title'        => L10n::t('Social Networks'),
 
@@ -956,7 +958,7 @@ function settings_content(App $a)
                $tpl = get_markup_template('settings/display.tpl');
                $o = replace_macros($tpl, [
                        '$ptitle'       => L10n::t('Display Settings'),
-                       '$form_security_token' => get_form_security_token("settings_display"),
+                       '$form_security_token' => BaseModule::getFormSecurityToken("settings_display"),
                        '$submit'       => L10n::t('Save Settings'),
                        '$baseurl' => System::baseUrl(true),
                        '$uid' => local_user(),
@@ -1185,7 +1187,7 @@ function settings_content(App $a)
                '$submit'       => L10n::t('Save Settings'),
                '$baseurl' => System::baseUrl(true),
                '$uid' => local_user(),
-               '$form_security_token' => get_form_security_token("settings"),
+               '$form_security_token' => BaseModule::getFormSecurityToken("settings"),
                '$nickname_block' => $prof_addr,
 
                '$h_pass'       => L10n::t('Password Settings'),
index 105cf60feb7f1e3d3a3ba458c3b37625a149f29c..0082021df575c8376fa27c56b4885d6ab735ddf7 100644 (file)
@@ -8,8 +8,8 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
+use Friendica\Util\Security;
 
-require_once 'include/security.php';
 require_once 'include/items.php';
 
 function subthread_content(App $a) {
@@ -32,7 +32,7 @@ function subthread_content(App $a) {
 
        $owner_uid = $item['uid'];
 
-       if (!can_write_wall($owner_uid)) {
+       if (!Security::canWriteToUserWall($owner_uid)) {
                return;
        }
 
index fd79d54150df6d60defe34a7b88f7616d278ad86..f661968f35a9b01c8b42b1bc1a0b4ffc2b53ea31 100644 (file)
@@ -10,7 +10,6 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
-require_once 'include/security.php';
 require_once 'include/items.php';
 
 function tagger_content(App $a) {
index e52c78cab11f794a0b5f2e4fdd7ab30dfd35c2a0..b66a7cbcda937cb192bcec78c4720b9936cada13 100644 (file)
@@ -14,9 +14,9 @@ use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
+use Friendica\Util\Security;
 
 require_once 'include/items.php';
-require_once 'include/security.php';
 
 function videos_init(App $a)
 {
@@ -60,7 +60,7 @@ function videos_init(App $a)
                ]);
 
                /// @TODO Old-lost code?
-               /*$sql_extra = permissions_sql($a->data['user']['uid']);
+               /*$sql_extra = Security::getPermissionsSQLByUserId($a->data['user']['uid']);
 
                $albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d $sql_extra order by created desc",
                        intval($a->data['user']['uid'])
@@ -193,7 +193,6 @@ function videos_content(App $a)
                return;
        }
 
-       require_once 'include/security.php';
        require_once 'include/conversation.php';
 
        if (empty($a->data['user'])) {
@@ -302,7 +301,7 @@ function videos_content(App $a)
                return;
        }
 
-       $sql_extra = permissions_sql($owner_uid, $remote_contact, $groups);
+       $sql_extra = Security::getPermissionsSQLByUserId($owner_uid, $remote_contact, $groups);
 
        $o = "";
 
index 1da9397a7833da42e8ab778f8268544c02344f17..e77b1a1491e3714f2c1cef34a39dcc43166cb033 100644 (file)
@@ -2,6 +2,9 @@
 
 namespace Friendica;
 
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+
 /**
  * All modules in Friendica should extend BaseModule, although not all modules
  * need to extend all the methods described here
@@ -69,4 +72,84 @@ abstract class BaseModule extends BaseObject
        {
 
        }
+
+       /*
+        * 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).
+        *    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,
+        *    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 = '')
+       {
+               $a = get_app();
+
+               $timestamp = time();
+               $sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $timestamp . $typename);
+
+               return $timestamp . '.' . $sec_hash;
+       }
+
+       public static function checkFormSecurityToken($typename = '', $formname = 'form_security_token')
+       {
+               $hash = null;
+
+               if (!empty($_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
+
+               $a = get_app();
+
+               $x = explode('.', $hash);
+               if (time() > (IntVal($x[0]) + $max_livetime)) {
+                       return false;
+               }
+
+               $sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $x[0] . $typename);
+
+               return ($sec_hash == $x[1]);
+       }
+
+       public static function getFormSecurityStandardErrorMessage()
+       {
+               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;
+       }
+
+       public static function checkFormSecurityTokenRedirectOnError($err_redirect, $typename = '', $formname = 'form_security_token')
+       {
+               if (!self::checkFormSecurityToken($typename, $formname)) {
+                       $a = get_app();
+                       logger('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
+                       logger('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
+                       notice(self::getFormSecurityStandardErrorMessage());
+                       goaway(System::baseUrl() . $err_redirect);
+               }
+       }
+
+       public static function checkFormSecurityTokenForbiddenOnError($typename = '', $formname = 'form_security_token')
+       {
+               if (!self::checkFormSecurityToken($typename, $formname)) {
+                       $a = get_app();
+                       logger('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
+                       logger('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
+                       header('HTTP/1.1 403 Forbidden');
+                       killme();
+               }
+       }
 }
index 71872830cbb6c52cf12f746e134dfb113916e5c9..309f9a5bdb4e53ad97fce9dfa6929a7b047aea74 100644 (file)
@@ -9,9 +9,10 @@ namespace Friendica\Content\Widget;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Model\Item;
+use Friendica\Util\Security;
 
 require_once 'include/dba.php';
-require_once 'include/security.php';
 
 /**
  * TagCloud widget
@@ -73,7 +74,7 @@ class TagCloud
         */
        private static function tagadelic($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HASHTAG)
        {
-               $sql_options = item_permissions_sql($uid);
+               $sql_options = Item::getPermissionsSQLByUserId($uid);
                $limit = $count ? sprintf('LIMIT %d', intval($count)) : '';
 
                if ($flags) {
diff --git a/src/Core/Authentication.php b/src/Core/Authentication.php
new file mode 100644 (file)
index 0000000..3a4471d
--- /dev/null
@@ -0,0 +1,212 @@
+<?php
+/**
+ * @file /src/Core/Authentication.php
+ */
+
+namespace Friendica\Core;
+
+use Friendica\Core\Addon;
+use Friendica\BaseObject;
+use Friendica\Core\Config;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Database\DBA;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+
+/**
+* Handle Authentification, Session and Cookies
+*/    
+class Authentication extends BaseObject
+{
+       /**
+        * @brief Calculate the hash that is needed for the "Friendica" cookie
+        *
+        * @param array $user Record from "user" table
+        *
+        * @return string Hashed data
+        */
+       public static function getCookieHashForUser($user)
+       {
+               return(hash("sha256", Config::get("system", "site_prvkey") .
+                               $user["prvkey"] .
+                               $user["password"]));
+       }
+
+       /**
+        * @brief Set the "Friendica" cookie
+        *
+        * @param int $time
+        * @param array $user Record from "user" table
+        */
+       public static  function setCookie($time, $user = [])
+       {
+               if ($time != 0) {
+                       $time = $time + time();
+               }
+
+               if ($user) {
+                       $value = json_encode(["uid" => $user["uid"],
+                               "hash" => self::getCookieHashForUser($user),
+                               "ip" => defaults($_SERVER, 'REMOTE_ADDR', '0.0.0.0')]);
+               } else {
+                       $value = "";
+               }
+
+               setcookie("Friendica", $value, $time, "/", "", (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL), true);
+       }
+
+       /**
+        * @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
+        */
+       public static function setAuthenticatedSessionForUser($user_record, $login_initial = false, $interactive = false, $login_refresh = false)
+       {
+               $a = self::getApp();
+
+               $_SESSION['uid'] = $user_record['uid'];
+               $_SESSION['theme'] = $user_record['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'] = $a->getbaseUrl() . '/profile/' . $user_record['nickname'];
+               $_SESSION['my_address'] = $user_record['nickname'] . '@' . substr($a->getbaseUrl(), strpos($a->getbaseUrl(), '://') + 3);
+               $_SESSION['addr'] = defaults($_SERVER, 'REMOTE_ADDR', '0.0.0.0');
+
+               $a->user = $user_record;
+
+               if ($interactive) {
+                       if ($a->user['login_date'] <= NULL_DATE) {
+                               $_SESSION['return_url'] = 'profile_photo/new';
+                               $a->module = 'profile_photo';
+                               info(L10n::t("Welcome ") . $a->user['username'] . EOL);
+                               info(L10n::t('Please upload a profile photo.') . EOL);
+                       } else {
+                               info(L10n::t("Welcome back ") . $a->user['username'] . EOL);
+                       }
+               }
+
+               $member_since = strtotime($a->user['register_date']);
+               if (time() < ($member_since + ( 60 * 60 * 24 * 14))) {
+                       $_SESSION['new_member'] = true;
+               } else {
+                       $_SESSION['new_member'] = false;
+               }
+               if (strlen($a->user['timezone'])) {
+                       date_default_timezone_set($a->user['timezone']);
+                       $a->timezone = $a->user['timezone'];
+               }
+
+               $master_record = $a->user;
+
+               if ((x($_SESSION, 'submanage')) && intval($_SESSION['submanage'])) {
+                       $user = DBA::selectFirst('user', [], ['uid' => $_SESSION['submanage']]);
+                       if (DBA::isResult($user)) {
+                               $master_record = $user;
+                       }
+               }
+
+               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 (DBA::isResult($r)) {
+                               $a->identities = array_merge($a->identities, DBA::toArray($r));
+                       }
+               } else {
+                       // 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 (DBA::isResult($r)) {
+                               $a->identities = DBA::toArray($r);
+                       }
+
+                       // Then add all siblings
+                       $r = DBA::select('user', ['uid', 'username', 'nickname'],
+                               ['parent-uid' => $master_record['parent-uid'], 'account_removed' => false]);
+                       if (DBA::isResult($r)) {
+                               $a->identities = array_merge($a->identities, DBA::toArray($r));
+                       }
+               }
+
+               $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` = ?",
+                       $master_record['uid']
+               );
+               if (DBA::isResult($r)) {
+                       $a->identities = array_merge($a->identities, DBA::toArray($r));
+               }
+
+               if ($login_initial) {
+                       logger('auth_identities: ' . print_r($a->identities, true), LOGGER_DEBUG);
+               }
+               if ($login_refresh) {
+                       logger('auth_identities refresh: ' . print_r($a->identities, true), LOGGER_DEBUG);
+               }
+
+               $contact = DBA::selectFirst('contact', [], ['uid' => $_SESSION['uid'], 'self' => true]);
+               if (DBA::isResult($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'] . '"');
+
+               if ($login_initial || $login_refresh) {
+                       DBA::update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $_SESSION['uid']]);
+
+                       // Set the login date for all identities of the user
+                       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 (!empty($_SESSION['remember'])) {
+                               logger('Injecting cookie for remembered user ' . $a->user['nickname']);
+                               self::setCookie(604800, $user_record);
+                               unset($_SESSION['remember']);
+                       }
+               }
+
+               if ($login_initial) {
+                       Addon::callHooks('logged_in', $a->user);
+
+                       if (($a->module !== 'home') && isset($_SESSION['return_url'])) {
+                               goaway($a->getbaseUrl() . '/' . $_SESSION['return_url']);
+                       }
+               }
+       }
+
+       /**
+        * @brief Kills the "Friendica" cookie and all session data
+        */
+       public static function deleteSession()
+       {
+               self::setCookie(-3600); // make sure cookie is deleted on browser close, as a security measure
+               session_unset();
+               session_destroy();
+       }
+}
+
index e313842e4143677afceb1f143dddb18eff3a0c31..4d0bd87e6a71c2a8119f44a975b1ba3d5f397136 100644 (file)
@@ -4,9 +4,11 @@
  */
 namespace Friendica\Model;
 
+use Friendica\BaseModule;
 use Friendica\BaseObject;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
+use Friendica\Util\Security;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -409,7 +411,7 @@ class Group extends BaseObject
                        '$createtext' => L10n::t('Create a new group'),
                        '$creategroup' => L10n::t('Group Name: '),
                        '$editgroupstext' => L10n::t('Edit groups'),
-                       '$form_security_token' => get_form_security_token('group_edit'),
+                       '$form_security_token' => BaseModule::getFormSecurityToken('group_edit'),
                ]);
 
 
index 5cda415c52d895fa1c663af2a820d4bc8cc933fb..1c0b11db4aae80c6b3db9c5e2782b08940b96e46 100644 (file)
@@ -24,6 +24,7 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\XML;
+use Friendica\Util\Security;
 use Text_LanguageDetect;
 
 require_once 'boot.php';
@@ -3007,7 +3008,7 @@ class Item extends BaseObject
                        $uid = local_user();
                }
 
-               if (!can_write_wall($uid)) {
+               if (!Security::canWriteToUserWall($uid)) {
                        logger('like: unable to write on wall ' . $uid);
                        return false;
                }
@@ -3193,4 +3194,41 @@ class Item extends BaseObject
                        }
                }
        }
+
+       public static function getPermissionsSQLByUserId($owner_id, $remote_verified = false, $groups = null)
+       {
+               $local_user = local_user();
+               $remote_user = remote_user();
+
+               /*
+                * Construct permissions
+                *
+                * default permissions - anonymous user
+                */
+               $sql = " AND NOT `item`.`private`";
+
+               // Profile owner - everything is visible
+               if ($local_user && ($local_user == $owner_id)) {
+                       $sql = '';
+               } 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.
+                        */
+                       $set = PermissionSet::get($owner_id, $remote_user, $groups);
+
+                       if (!empty($set)) {
+                               $sql_set = " OR (`item`.`private` IN (1,2) AND `item`.`wall` AND `item`.`psid` IN (" . implode(',', $set) . "))";
+                       } else {
+                               $sql_set = '';
+                       }
+
+                       $sql = " AND (NOT `item`.`private`" . $sql_set . ")";
+               }
+
+               return $sql;
+       }
 }
index e64158e175ced54a67d79fecf190be2965c561b5..372e875ea7b587e5f4dcd35802fa68d834c72976 100644 (file)
@@ -14,6 +14,7 @@ use Friendica\Database\DBA;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Security;
 
 require_once 'include/dba.php';
 
@@ -226,7 +227,7 @@ class Photo
         */
        public static function getAlbums($uid, $update = false)
        {
-               $sql_extra = permissions_sql($uid);
+               $sql_extra = Security::getPermissionsSQLByUserId($uid);
 
                $key = "photo_albums:".$uid.":".local_user().":".remote_user();
                $albums = Cache::get($key);
index 15505a38be61295c8118d9b449a4da51b2daed7b..deb6afcfbc03e0dae8624f88ffe53a4918e03fb4 100644 (file)
@@ -7,6 +7,7 @@ namespace Friendica\Module;
 use Exception;
 use Friendica\BaseModule;
 use Friendica\Core\Addon;
+use Friendica\Core\Authentication;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
@@ -16,7 +17,6 @@ use Friendica\Util\Network;
 use LightOpenID;
 
 require_once 'boot.php';
-require_once 'include/security.php';
 require_once 'include/text.php';
 
 /**
@@ -148,13 +148,13 @@ class Login extends BaseModule
                }
 
                if (!$remember) {
-                       new_cookie(0); // 0 means delete on browser exit
+                       Authentication::setCookie(0); // 0 means delete on browser exit
                }
 
                // if we haven't failed up this point, log them in.
                $_SESSION['remember'] = $remember;
                $_SESSION['last_login_date'] = DateTimeFormat::utcNow();
-               authenticate_success($record, true, true);
+               Authentication::setAuthenticatedSessionForUser($record, true, true);
 
                if (x($_SESSION, 'return_url')) {
                        $return_url = $_SESSION['return_url'];
@@ -188,9 +188,9 @@ class Login extends BaseModule
                                        ]
                                );
                                if (DBA::isResult($user)) {
-                                       if ($data->hash != cookie_hash($user)) {
+                                       if ($data->hash != Authentication::getCookieHashForUser($user)) {
                                                logger("Hash for user " . $data->uid . " doesn't fit.");
-                                               nuke_session();
+                                               Authentication::deleteSession();
                                                goaway(self::getApp()->getBaseURL());
                                        }
 
@@ -198,11 +198,11 @@ class Login extends BaseModule
                                        // Expires after 7 days by default,
                                        // can be set via system.auth_cookie_lifetime
                                        $authcookiedays = Config::get('system', 'auth_cookie_lifetime', 7);
-                                       new_cookie($authcookiedays * 24 * 60 * 60, $user);
+                                       Authentication::setCookie($authcookiedays * 24 * 60 * 60, $user);
 
                                        // Do the authentification if not done by now
                                        if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) {
-                                               authenticate_success($user);
+                                               Authentication::setAuthenticatedSessionForUser($user);
 
                                                if (Config::get('system', 'paranoia')) {
                                                        $_SESSION['addr'] = $data->ip;
@@ -227,7 +227,7 @@ class Login extends BaseModule
                                if ($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
                                        logger('Session address changed. Paranoid setting in effect, blocking session. ' .
                                                $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
-                                       nuke_session();
+                                       Authentication::deleteSession();
                                        goaway(self::getApp()->getBaseURL());
                                }
 
@@ -241,7 +241,7 @@ class Login extends BaseModule
                                        ]
                                );
                                if (!DBA::isResult($user)) {
-                                       nuke_session();
+                                       Authentication::deleteSession();
                                        goaway(self::getApp()->getBaseURL());
                                }
 
@@ -255,7 +255,7 @@ class Login extends BaseModule
                                        $_SESSION['last_login_date'] = DateTimeFormat::utcNow();
                                        $login_refresh = true;
                                }
-                               authenticate_success($user, false, false, $login_refresh);
+                               Authentication::setAuthenticatedSessionForUser($user, false, false, $login_refresh);
                        }
                }
        }
index cbfd245f302f47f276cff27f8ee1ab1e192d0459..b12ba10287ce30e70852b59ad4fe344cd62f49cb 100644 (file)
@@ -6,10 +6,10 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\Addon;
+use Friendica\Core\Authentication;
 use Friendica\Core\L10n;
 
 require_once 'boot.php';
-require_once 'include/security.php';
 
 /**
  * Logout module
@@ -24,7 +24,7 @@ class Logout extends BaseModule
        public static function init()
        {
                Addon::callHooks("logging_out");
-               nuke_session();
+               Authentication::deleteSession();
                info(L10n::t('Logged out.') . EOL);
                goaway(self::getApp()->getBaseURL());
        }
index 776dcccb35b63276ed4be75bcf1b1f89a52423f1..8c3493b2adaa6033027b78cf160dacaae6ca31a2 100644 (file)
@@ -17,8 +17,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
 
-require_once 'include/security.php';
-
 /**
  * @brief Module Proxy
  */
index cd055ee5ebfa4e17eb4cf963219afaca2bfabdd2..08c04f546f3b6f93973073e100061b8ee000456d 100644 (file)
@@ -7,6 +7,7 @@ namespace Friendica\Object;
 use Friendica\BaseObject;
 use Friendica\Core\Protocol;
 use Friendica\Object\Post;
+use Friendica\Util\Security;
 
 require_once 'boot.php';
 require_once 'include/text.php';
@@ -61,11 +62,11 @@ class Thread extends BaseObject
                                break;
                        case 'profile':
                                $this->profile_owner = $a->profile['profile_uid'];
-                               $this->writable = can_write_wall($this->profile_owner);
+                               $this->writable = Security::canWriteToUserWall($this->profile_owner);
                                break;
                        case 'display':
                                $this->profile_owner = $a->profile['uid'];
-                               $this->writable = can_write_wall($this->profile_owner) || $writable;
+                               $this->writable = Security::canWriteToUserWall($this->profile_owner) || $writable;
                                break;
                        case 'community':
                                $this->profile_owner = 0;
index 0bb7537f78bda42a52edb9535d43a4eea453ab7a..8478ce868af103794aad2ba1c534fc929dff3a57 100644 (file)
@@ -7,8 +7,6 @@ use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 
-require_once 'include/security.php';
-
 /**
  * @brief Proxy utilities class
  */
diff --git a/src/Util/Security.php b/src/Util/Security.php
new file mode 100644 (file)
index 0000000..11059c0
--- /dev/null
@@ -0,0 +1,155 @@
+<?php
+/**
+ * @file /src/Util/Security.php
+ */
+
+namespace Friendica\Util;
+
+use Friendica\BaseObject;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
+use Friendica\Core\L10n;
+use Friendica\Model\PermissionSet;
+use Friendica\Core\System;
+
+/**
+ * Secures that User is allow to do requests
+ */
+class Security extends BaseObject
+{
+       public static function canWriteToUserWall($owner)
+       {
+               static $verified = 0;
+
+               if (!local_user() && !remote_user()) {
+                       return false;
+               }
+
+               $uid = local_user();
+               if ($uid == $owner) {
+                       return true;
+               }
+
+               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
+
+                       if ($verified === 2) {
+                               return true;
+                       } elseif ($verified === 1) {
+                               return false;
+                       } else {
+                               $cid = 0;
+
+                               if (!empty($_SESSION['remote'])) {
+                                       foreach ($_SESSION['remote'] as $visitor) {
+                                               if ($visitor['uid'] == $owner) {
+                                                       $cid = $visitor['cid'];
+                                                       break;
+                                               }
+                                       }
+                               }
+
+                               if (!$cid) {
+                                       return false;
+                               }
+
+                               $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `user`.`uid` = `contact`.`uid`
+                                       WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+                                       AND `user`.`blockwall` = 0 AND `readonly` = 0  AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1",
+                                       intval($owner),
+                                       intval($cid),
+                                       intval(Contact::SHARING),
+                                       intval(Contact::FRIEND),
+                                       intval(Contact::PAGE_COMMUNITY)
+                               );
+
+                               if (DBA::isResult($r)) {
+                                       $verified = 2;
+                                       return true;
+                               } else {
+                                       $verified = 1;
+                               }
+                       }
+               }
+
+               return false;
+       }
+
+       /// @TODO $groups should be array
+       public static function getPermissionsSQLByUserId($owner_id, $remote_verified = false, $groups = null)
+       {
+               $local_user = local_user();
+               $remote_user = remote_user();
+
+               /*
+                * Construct permissions
+                *
+                * default permissions - anonymous user
+                */
+               $sql = " AND allow_cid = ''
+                                AND allow_gid = ''
+                                AND deny_cid  = ''
+                                AND deny_gid  = ''
+               ";
+
+               /*
+                * 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) {
+                       /*
+                        * 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) {
+                               if (DBA::exists('contact', ['id' => $remote_user, 'uid' => $owner_id, 'blocked' => false])) {
+                                       $remote_verified = true;
+                                       $groups = Group::getIdsByContactId($remote_user);
+                               }
+                       }
+
+                       if ($remote_verified) {
+                               $gs = '<<>>'; // should be impossible to match
+
+                               if (is_array($groups)) {
+                                       foreach ($groups as $g) {
+                                               $gs .= '|<' . intval($g) . '>';
+                                       }
+                               }
+
+                               $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 = '') )
+                                         )
+                                       ",
+                                       intval($remote_user),
+                                       DBA::escape($gs),
+                                       intval($remote_user),
+                                       DBA::escape($gs)
+                               );
+                       }
+               }
+               return $sql;
+       }
+
+}