friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #4092 from MrPetovan/task/3954-move-auth-to-src 

Move auth to src
This commit is contained in:
Tobias Diekershoff 2018-01-04 18:06:42 +01:00 committed by GitHub
parent 6e71a84075 520a068500
commit 04589ecd38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 783 additions and 856 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
boot.php
View File

@ -29,6 +29,7 @@ use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Database\DBStructure; use Friendica\Database\DBStructure;
use Friendica\Module\Login;
require_once 'include/network.php'; require_once 'include/network.php';
require_once 'include/plugin.php'; require_once 'include/plugin.php';
@ -878,83 +879,6 @@ function get_guid($size = 16, $prefix = "")
} }
} }
/**
* @brief Wrapper for adding a login box.
*
* @param bool $register If $register == true provide a registration link.
* This will most always depend on the value of $a->config['register_policy'].
* @param bool $hiddens optional
*
* @return string Returns the complete html for inserting into the page
*
* @hooks 'login_hook'
* string $o
*/
function login($register = false, $hiddens = false)
{
$a = get_app();
$o = "";
$reg = false;
if ($register) {
$reg = array(
'title' => t('Create a New Account'),
'desc' => t('Register')
);
}
$noid = Config::get('system', 'no_openid');
$dest_url = $a->query_string;
if (local_user()) {
$tpl = get_markup_template("logout.tpl");
} else {
$a->page['htmlhead'] .= replace_macros(
get_markup_template("login_head.tpl"),
array(
'$baseurl' => $a->get_baseurl(true)
)
);
$tpl = get_markup_template("login.tpl");
$_SESSION['return_url'] = $a->query_string;
$a->module = 'login';
}
$o .= replace_macros(
$tpl,
array(
'$dest_url' => $dest_url,
'$logout' => t('Logout'),
'$login' => t('Login'),
'$lname' => array('username', t('Nickname or Email: ') , '', ''),
'$lpassword' => array('password', t('Password: '), '', ''),
'$lremember' => array('remember', t('Remember me'), 0, ''),
'$openid' => !$noid,
'$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''),
'$hiddens' => $hiddens,
'$register' => $reg,
'$lostpass' => t('Forgot your password?'),
'$lostlink' => t('Password Reset'),
'$tostitle' => t('Website Terms of Service'),
'$toslink' => t('terms of service'),
'$privacytitle' => t('Website Privacy Policy'),
'$privacylink' => t('privacy policy'),
)
);
call_hooks('login_hook', $o);
return $o;
}
/** /**
* @brief Used to end the current process, after saving session state. * @brief Used to end the current process, after saving session state.
*/ */
@ -970,13 +894,15 @@ function killme()
/** /**
* @brief Redirect to another URL and terminate this process. * @brief Redirect to another URL and terminate this process.
*/ */
function goaway($s) function goaway($path)
{ {
if (!strstr(normalise_link($s), "http://")) { if (strstr(normalise_link($path), 'http://')) {
$s = System::baseUrl() . "/" . $s; $url = $path;
} else {
$url = System::baseUrl() . '/' . ltrim($path, '/');
} }
header("Location: $s"); header("Location: $url");
killme(); killme();
} }

209
include/auth.php
View File

@ -1,209 +0,0 @@
<?php
use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Model\User;
require_once 'include/security.php';
require_once 'include/datetime.php';
// When the "Friendica" cookie is set, take the value to authenticate and renew the cookie.
if (isset($_COOKIE["Friendica"])) {
$data = json_decode($_COOKIE["Friendica"]);
if (isset($data->uid)) {
$user = dba::select('user',
[],
[
'uid' => $data->uid,
'blocked' => false,
'account_expired' => false,
'account_removed' => false,
'verified' => true,
],
['limit' => 1]
);
if (DBM::is_result($user)) {
if ($data->hash != cookie_hash($user)) {
logger("Hash for user " . $data->uid . " doesn't fit.");
nuke_session();
goaway(System::baseUrl());
}
// Renew the cookie
// 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);
// Do the authentification if not done by now
if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) {
authenticate_success($user);
if (Config::get('system', 'paranoia')) {
$_SESSION['addr'] = $data->ip;
}
}
}
}
}
// login/logout
if (isset($_SESSION) && x($_SESSION, 'authenticated') && (!x($_POST, 'auth-params') || ($_POST['auth-params'] !== 'login'))) {
if ((x($_POST, 'auth-params') && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) {
// process logout request
call_hooks("logging_out");
nuke_session();
info(t('Logged out.') . EOL);
goaway(System::baseUrl());
}
if (x($_SESSION, 'visitor_id') && !x($_SESSION, 'uid')) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($_SESSION['visitor_id'])
);
if (DBM::is_result($r)) {
$a->contact = $r[0];
}
}
if (x($_SESSION, 'uid')) {
// already logged in user returning
$check = Config::get('system', 'paranoia');
// extra paranoia - if the IP changed, log them out
if ($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
logger('Session address changed. Paranoid setting in effect, blocking session. ' .
$_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
nuke_session();
goaway(System::baseUrl());
}
$user = dba::select('user',
[],
[
'uid' => $_SESSION['uid'],
'blocked' => false,
'account_expired' => false,
'account_removed' => false,
'verified' => true,
],
['limit' => 1]
);
if (!DBM::is_result($user)) {
nuke_session();
goaway(System::baseUrl());
}
// Make sure to refresh the last login time for the user if the user
// stays logged in for a long time, e.g. with "Remember Me"
$login_refresh = false;
if (!x($_SESSION['last_login_date'])) {
$_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
}
if (strcmp(datetime_convert('UTC', 'UTC', 'now - 12 hours'), $_SESSION['last_login_date']) > 0) {
$_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
$login_refresh = true;
}
authenticate_success($user, false, false, $login_refresh);
}
} else {
session_unset();
if (
!(x($_POST, 'password') && strlen($_POST['password']))
&& (
x($_POST, 'openid_url') && strlen($_POST['openid_url'])
|| x($_POST, 'username') && strlen($_POST['username'])
)
) {
$noid = Config::get('system', 'no_openid');
$openid_url = trim(strlen($_POST['openid_url']) ? $_POST['openid_url'] : $_POST['username']);
// validate_url alters the calling parameter
$temp_string = $openid_url;
// if it's an email address or doesn't resolve to a URL, fail.
if ($noid || strpos($temp_string, '@') || !validate_url($temp_string)) {
$a = get_app();
notice(t('Login failed.') . EOL);
goaway(System::baseUrl());
// NOTREACHED
}
// Otherwise it's probably an openid.
try {
require_once('library/openid.php');
$openid = new LightOpenID;
$openid->identity = $openid_url;
$_SESSION['openid'] = $openid_url;
$_SESSION['remember'] = $_POST['remember'];
$openid->returnUrl = System::baseUrl(true) . '/openid';
goaway($openid->authUrl());
} catch (Exception $e) {
notice(t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . '<br /><br >' . t('The error message was:') . ' ' . $e->getMessage());
}
// NOTREACHED
}
if (x($_POST, 'auth-params') && $_POST['auth-params'] === 'login') {
$record = null;
$addon_auth = array(
'username' => trim($_POST['username']),
'password' => trim($_POST['password']),
'authenticated' => 0,
'user_record' => null
);
/**
*
* A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record
* Plugins should never set 'authenticated' except to indicate success - as hooks may be chained
* and later plugins should not interfere with an earlier one that succeeded.
*
*/
call_hooks('authenticate', $addon_auth);
if ($addon_auth['authenticated'] && count($addon_auth['user_record'])) {
$record = $addon_auth['user_record'];
} else {
$user_id = User::authenticate(trim($_POST['username']), trim($_POST['password']));
if ($user_id) {
$record = dba::select('user', [], ['uid' => $user_id], ['limit' => 1]);
}
}
if (!$record || !count($record)) {
logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
notice(t('Login failed.') . EOL);
goaway(System::baseUrl());
}
if (!$_POST['remember']) {
new_cookie(0); // 0 means delete on browser exit
}
// if we haven't failed up this point, log them in.
$_SESSION['remember'] = $_POST['remember'];
$_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
authenticate_success($record, true, true);
}
}
/**
* @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();
}

11
include/identity.php
View File

@ -920,11 +920,12 @@ function get_my_url()
function zrl_init(App $a) function zrl_init(App $a)
{ {
$tmp_str = get_my_url(); $my_url = get_my_url();
if (validate_url($tmp_str)) { $my_url = validate_url($my_url);
if ($my_url) {
// Is it a DDoS attempt? // Is it a DDoS attempt?
// The check fetches the cached value from gprobe to reduce the load for this system // The check fetches the cached value from gprobe to reduce the load for this system
$urlparts = parse_url($tmp_str); $urlparts = parse_url($my_url);
$result = Cache::get('gprobe:' . $urlparts['host']); $result = Cache::get('gprobe:' . $urlparts['host']);
if ((!is_null($result)) && (in_array($result['network'], array(NETWORK_FEED, NETWORK_PHANTOM)))) { if ((!is_null($result)) && (in_array($result['network'], array(NETWORK_FEED, NETWORK_PHANTOM)))) {
@ -932,8 +933,8 @@ function zrl_init(App $a)
return; return;
} }
Worker::add(PRIORITY_LOW, 'GProbe', $tmp_str); Worker::add(PRIORITY_LOW, 'GProbe', $my_url);
$arr = array('zrl' => $tmp_str, 'url' => $a->cmd); $arr = array('zrl' => $my_url, 'url' => $a->cmd);
call_hooks('zrl_init', $arr); call_hooks('zrl_init', $arr);
} }
} }

16
include/network.php
View File

@ -470,26 +470,28 @@ function http_status_exit($val, $description = array())
* and check DNS to see if it's real (or check if is a valid IP address) * and check DNS to see if it's real (or check if is a valid IP address)
* *
* @param string $url The URL to be validated * @param string $url The URL to be validated
* @return boolean True if it's a valid URL, fals if something wrong with it * @return string|boolean The actual working URL, false else
*/ */
function validate_url(&$url) function validate_url($url)
{ {
if (Config::get('system', 'disable_url_validation')) { if (Config::get('system', 'disable_url_validation')) {
return true; return $url;
} }
// no naked subdomains (allow localhost for tests) // no naked subdomains (allow localhost for tests)
if (strpos($url, '.') === false && strpos($url, '/localhost/') === false) if (strpos($url, '.') === false && strpos($url, '/localhost/') === false) {
return false; return false;
}
if (substr($url, 0, 4) != 'http') if (substr($url, 0, 4) != 'http') {
$url = 'http://' . $url; $url = 'http://' . $url;
}
/// @TODO Really supress function outcomes? Why not find them + debug them? /// @TODO Really suppress function outcomes? Why not find them + debug them?
$h = @parse_url($url); $h = @parse_url($url);
if ((is_array($h)) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) { if ((is_array($h)) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
return true; return $url;
} }
return false; return false;

174
include/security.php
View File

@ -5,6 +5,7 @@ use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Group;
/** /**
* @brief Calculate the hash that is needed for the "Friendica" cookie * @brief Calculate the hash that is needed for the "Friendica" cookie
@ -13,10 +14,11 @@ use Friendica\Database\DBM;
* *
* @return string Hashed data * @return string Hashed data
*/ */
function cookie_hash($user) { function cookie_hash($user)
return(hash("sha256", Config::get("system", "site_prvkey"). {
$user["prvkey"]. return(hash("sha256", Config::get("system", "site_prvkey") .
$user["password"])); $user["prvkey"] .
$user["password"]));
} }
/** /**
@ -25,28 +27,35 @@ function cookie_hash($user) {
* @param int $time * @param int $time
* @param array $user Record from "user" table * @param array $user Record from "user" table
*/ */
function new_cookie($time, $user = array()) { function new_cookie($time, $user = array())
{
if ($time != 0) { if ($time != 0) {
$time = $time + time(); $time = $time + time();
} }
if ($user) { if ($user) {
$value = json_encode(array("uid" => $user["uid"], $value = json_encode(array("uid" => $user["uid"],
"hash" => cookie_hash($user), "hash" => cookie_hash($user),
"ip" => $_SERVER['REMOTE_ADDR'])); "ip" => $_SERVER['REMOTE_ADDR']));
} } else {
else {
$value = ""; $value = "";
} }
setcookie("Friendica", $value, $time, "/", "", setcookie("Friendica", $value, $time, "/", "", (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL), true);
(Config::get('system', 'ssl_policy') == SSL_POLICY_FULL), true);
} }
function authenticate_success($user_record, $login_initial = false, $interactive = false, $login_refresh = false) { /**
* @brief Sets the provided user's authenticated session
*
* @todo Should be moved to Friendica\Core\Session once it's created
*
* @param type $user_record
* @param type $login_initial
* @param type $interactive
* @param type $login_refresh
*/
function authenticate_success($user_record, $login_initial = false, $interactive = false, $login_refresh = false)
{
$a = get_app(); $a = get_app();
$_SESSION['uid'] = $user_record['uid']; $_SESSION['uid'] = $user_record['uid'];
@ -55,7 +64,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
$_SESSION['authenticated'] = 1; $_SESSION['authenticated'] = 1;
$_SESSION['page_flags'] = $user_record['page-flags']; $_SESSION['page_flags'] = $user_record['page-flags'];
$_SESSION['my_url'] = System::baseUrl() . '/profile/' . $user_record['nickname']; $_SESSION['my_url'] = System::baseUrl() . '/profile/' . $user_record['nickname'];
$_SESSION['my_address'] = $user_record['nickname'] . '@' . substr(System::baseUrl(),strpos(System::baseUrl(),'://')+3); $_SESSION['my_address'] = $user_record['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
$_SESSION['addr'] = $_SERVER['REMOTE_ADDR']; $_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
$a->user = $user_record; $a->user = $user_record;
@ -64,10 +73,10 @@ function authenticate_success($user_record, $login_initial = false, $interactive
if ($a->user['login_date'] <= NULL_DATE) { if ($a->user['login_date'] <= NULL_DATE) {
$_SESSION['return_url'] = 'profile_photo/new'; $_SESSION['return_url'] = 'profile_photo/new';
$a->module = 'profile_photo'; $a->module = 'profile_photo';
info( t("Welcome ") . $a->user['username'] . EOL); info(t("Welcome ") . $a->user['username'] . EOL);
info( t('Please upload a profile photo.') . EOL); info(t('Please upload a profile photo.') . EOL);
} else { } else {
info( t("Welcome back ") . $a->user['username'] . EOL); info(t("Welcome back ") . $a->user['username'] . EOL);
} }
} }
@ -84,7 +93,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
$master_record = $a->user; $master_record = $a->user;
if ((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) { if ((x($_SESSION, 'submanage')) && intval($_SESSION['submanage'])) {
$r = dba::fetch_first("SELECT * FROM `user` WHERE `uid` = ? LIMIT 1", $r = dba::fetch_first("SELECT * FROM `user` WHERE `uid` = ? LIMIT 1",
intval($_SESSION['submanage']) intval($_SESSION['submanage'])
); );
@ -112,10 +121,10 @@ function authenticate_success($user_record, $login_initial = false, $interactive
} }
if ($login_initial) { if ($login_initial) {
logger('auth_identities: ' . print_r($a->identities,true), LOGGER_DEBUG); logger('auth_identities: ' . print_r($a->identities, true), LOGGER_DEBUG);
} }
if ($login_refresh) { if ($login_refresh) {
logger('auth_identities refresh: ' . print_r($a->identities,true), LOGGER_DEBUG); logger('auth_identities refresh: ' . print_r($a->identities, true), LOGGER_DEBUG);
} }
$r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $_SESSION['uid']); $r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $_SESSION['uid']);
@ -125,7 +134,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
$_SESSION['cid'] = $a->cid; $_SESSION['cid'] = $a->cid;
} }
header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"'); header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] . '"');
if ($login_initial || $login_refresh) { if ($login_initial || $login_refresh) {
dba::update('user', array('login_date' => datetime_convert()), array('uid' => $_SESSION['uid'])); dba::update('user', array('login_date' => datetime_convert()), array('uid' => $_SESSION['uid']));
@ -141,7 +150,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
// The cookie will be renewed automatically. // The cookie will be renewed automatically.
// The week ensures that sessions will expire after some inactivity. // The week ensures that sessions will expire after some inactivity.
if ($_SESSION['remember']) { if ($_SESSION['remember']) {
logger('Injecting cookie for remembered user '. $_SESSION['remember_user']['nickname']); logger('Injecting cookie for remembered user ' . $_SESSION['remember_user']['nickname']);
new_cookie(604800, $user_record); new_cookie(604800, $user_record);
unset($_SESSION['remember']); unset($_SESSION['remember']);
} }
@ -156,13 +165,11 @@ function authenticate_success($user_record, $login_initial = false, $interactive
} }
} }
function can_write_wall(App $a, $owner)
{
function can_write_wall(App $a, $owner) {
static $verified = 0; static $verified = 0;
if ((! (local_user())) && (! (remote_user()))) { if (!local_user() && !remote_user()) {
return false; return false;
} }
@ -173,10 +180,8 @@ function can_write_wall(App $a, $owner) {
} }
if (remote_user()) { if (remote_user()) {
// use remembered decision and avoid a DB lookup for each and every display item // 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 // 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 // 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 // belongs to this page owner, and has the necessary permissions to post content
@ -196,7 +201,7 @@ function can_write_wall(App $a, $owner) {
} }
} }
if (! $cid) { if (!$cid) {
return false; return false;
} }
@ -213,8 +218,7 @@ function can_write_wall(App $a, $owner) {
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$verified = 2; $verified = 2;
return true; return true;
} } else {
else {
$verified = 1; $verified = 1;
} }
} }
@ -223,9 +227,8 @@ function can_write_wall(App $a, $owner) {
return false; return false;
} }
function permissions_sql($owner_id, $remote_verified = false, $groups = null)
function permissions_sql($owner_id, $remote_verified = false, $groups = null) { {
$local_user = local_user(); $local_user = local_user();
$remote_user = remote_user(); $remote_user = remote_user();
@ -243,8 +246,7 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null) {
/** /**
* Profile owner - everything is visible * Profile owner - everything is visible
*/ */
if ($local_user && $local_user == $owner_id) {
if (($local_user) && ($local_user == $owner_id)) {
$sql = ''; $sql = '';
} elseif ($remote_user) { } elseif ($remote_user) {
/* /*
@ -255,18 +257,18 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null) {
* done this and passed the groups into this function. * done this and passed the groups into this function.
*/ */
if (! $remote_verified) { if (!$remote_verified) {
$r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1", $r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
intval($remote_user), intval($remote_user),
intval($owner_id) intval($owner_id)
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$remote_verified = true; $remote_verified = true;
$groups = init_groups_visitor($remote_user); $groups = Group::getIdsByContactId($remote_user);
} }
} }
if ($remote_verified) {
if ($remote_verified) {
$gs = '<<>>'; // should be impossible to match $gs = '<<>>'; // should be impossible to match
if (is_array($groups) && count($groups)) { if (is_array($groups) && count($groups)) {
@ -274,20 +276,6 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null) {
$gs .= '|<' . intval($g) . '>'; $gs .= '|<' . intval($g) . '>';
} }
/*
* @TODO old-lost code found?
$sql = sprintf(
" AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' )
AND ( deny_cid = '' OR NOT deny_cid REGEXP '<%d>' )
AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
AND ( deny_gid = '' OR NOT deny_gid REGEXP '%s')
",
intval($remote_user),
intval($remote_user),
dbesc($gs),
dbesc($gs)
);
*/
$sql = sprintf( $sql = sprintf(
" AND ( NOT (deny_cid REGEXP '<%d>' OR deny_gid REGEXP '%s') " 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 = '') ) AND ( allow_cid REGEXP '<%d>' OR allow_gid REGEXP '%s' OR ( allow_cid = '' AND allow_gid = '') )
@ -303,13 +291,12 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null) {
return $sql; return $sql;
} }
function item_permissions_sql($owner_id, $remote_verified = false, $groups = null)
function item_permissions_sql($owner_id, $remote_verified = false, $groups = null) { {
$local_user = local_user(); $local_user = local_user();
$remote_user = remote_user(); $remote_user = remote_user();
/** /*
* Construct permissions * Construct permissions
* *
* default permissions - anonymous user * default permissions - anonymous user
@ -321,9 +308,7 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul
AND `item`.private = 0 AND `item`.private = 0
"; ";
/** // Profile owner - everything is visible
* Profile owner - everything is visible
*/
if ($local_user && ($local_user == $owner_id)) { if ($local_user && ($local_user == $owner_id)) {
$sql = ''; $sql = '';
} elseif ($remote_user) { } elseif ($remote_user) {
@ -334,14 +319,14 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul
* If pre-verified, the caller is expected to have already * If pre-verified, the caller is expected to have already
* done this and passed the groups into this function. * done this and passed the groups into this function.
*/ */
if (! $remote_verified) { if (!$remote_verified) {
$r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1", $r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
intval($remote_user), intval($remote_user),
intval($owner_id) intval($owner_id)
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$remote_verified = true; $remote_verified = true;
$groups = init_groups_visitor($remote_user); $groups = Group::getIdsByContactId($remote_user);
} }
} }
if ($remote_verified) { if ($remote_verified) {
@ -355,16 +340,6 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul
} }
$sql = sprintf( $sql = sprintf(
/*" AND ( private = 0 OR ( private in (1,2) AND wall = 1 AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' )
AND ( deny_cid = '' OR NOT deny_cid REGEXP '<%d>' )
AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
AND ( deny_gid = '' OR NOT deny_gid REGEXP '%s')))
",
intval($remote_user),
intval($remote_user),
dbesc($gs),
dbesc($gs)
*/
" AND ( `item`.private = 0 OR ( `item`.private in (1,2) AND `item`.`wall` = 1 " AND ( `item`.private = 0 OR ( `item`.private in (1,2) AND `item`.`wall` = 1
AND ( NOT (`item`.deny_cid REGEXP '<%d>' OR `item`.deny_gid REGEXP '%s') AND ( NOT (`item`.deny_cid REGEXP '<%d>' OR `item`.deny_gid REGEXP '%s')
AND ( `item`.allow_cid REGEXP '<%d>' OR `item`.allow_gid REGEXP '%s' OR ( `item`.allow_cid = '' AND `item`.allow_gid = ''))))) AND ( `item`.allow_cid REGEXP '<%d>' OR `item`.allow_gid REGEXP '%s' OR ( `item`.allow_cid = '' AND `item`.allow_gid = '')))))
@ -380,7 +355,6 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul
return $sql; return $sql;
} }
/* /*
* Functions used to protect against Cross-Site Request Forgery * 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. * 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.
@ -392,7 +366,8 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul
* Actually, important actions should not be triggered by Links / GET-Requests at all, but somethimes they still are, * 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). * so this mechanism brings in some damage control (the attacker would be able to forge a request to a form of this type, but not to forms of other types).
*/ */
function get_form_security_token($typename = '') { function get_form_security_token($typename = '')
{
$a = get_app(); $a = get_app();
$timestamp = time(); $timestamp = time();
@ -401,7 +376,8 @@ function get_form_security_token($typename = '') {
return $timestamp . '.' . $sec_hash; return $timestamp . '.' . $sec_hash;
} }
function check_form_security_token($typename = '', $formname = 'form_security_token') { function check_form_security_token($typename = '', $formname = 'form_security_token')
{
if (!x($_REQUEST, $formname)) { if (!x($_REQUEST, $formname)) {
return false; return false;
} }
@ -423,19 +399,24 @@ function check_form_security_token($typename = '', $formname = 'form_security_to
return ($sec_hash == $x[1]); return ($sec_hash == $x[1]);
} }
function check_form_security_std_err_msg() { function check_form_security_std_err_msg()
{
return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it.') . EOL; return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it.') . EOL;
} }
function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token') {
function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token')
{
if (!check_form_security_token($typename, $formname)) { if (!check_form_security_token($typename, $formname)) {
$a = get_app(); $a = get_app();
logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename); logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA); logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
notice( check_form_security_std_err_msg() ); notice(check_form_security_std_err_msg());
goaway(System::baseUrl() . $err_redirect ); goaway(System::baseUrl() . $err_redirect);
} }
} }
function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') {
function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token')
{
if (!check_form_security_token($typename, $formname)) { if (!check_form_security_token($typename, $formname)) {
$a = get_app(); $a = get_app();
logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename); logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
@ -445,21 +426,12 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f
} }
} }
// Returns an array of group id's this contact is a member of. /**
// This array will only contain group id's related to the uid of this * @brief Kills the "Friendica" cookie and all session data
// DFRN contact. They are *not* neccessarily unique across the entire site. */
function nuke_session()
{
if (! function_exists('init_groups_visitor')) { new_cookie(-3600); // make sure cookie is deleted on browser close, as a security measure
function init_groups_visitor($contact_id) { session_unset();
$groups = array(); session_destroy();
$r = q("SELECT `gid` FROM `group_member` }
WHERE `contact-id` = %d ",
intval($contact_id)
);
if (DBM::is_result($r)) {
foreach ($r as $rr)
$groups[] = $rr['gid'];
}
return $groups;
}}

5
index.php
View File

@ -14,6 +14,7 @@ use Friendica\Core\System;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Module\Login;
require_once 'boot.php'; require_once 'boot.php';
@ -149,9 +150,7 @@ if ((x($_GET, 'zrl')) && (!$install && !$maintenance)) {
// header('Link: <' . System::baseUrl() . '/amcd>; rel="acct-mgmt";'); // header('Link: <' . System::baseUrl() . '/amcd>; rel="acct-mgmt";');
if (x($_COOKIE, "Friendica") || (x($_SESSION, 'authenticated')) || (x($_POST, 'auth-params')) || ($a->module === 'login')) { Login::sessionAuth();
require "include/auth.php";
}
if (! x($_SESSION, 'authenticated')) { if (! x($_SESSION, 'authenticated')) {
header('X-Account-Management-Status: none'); header('X-Account-Management-Status: none');

3
mod/admin.php
View File

@ -13,6 +13,7 @@ use Friendica\Database\DBM;
use Friendica\Database\DBStructure; use Friendica\Database\DBStructure;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Module\Login;
require_once 'include/enotify.php'; require_once 'include/enotify.php';
require_once 'include/text.php'; require_once 'include/text.php';
@ -153,7 +154,7 @@ function admin_post(App $a)
function admin_content(App $a) function admin_content(App $a)
{ {
if (!is_site_admin()) { if (!is_site_admin()) {
return login(false); return Login::form();
} }
if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) { if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {

75
mod/api.php
View File

@ -3,10 +3,12 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Module\Login;
require_once('include/api.php'); require_once('include/api.php');
function oauth_get_client($request){ function oauth_get_client($request)
{
$params = $request->get_parameters(); $params = $request->get_parameters();
@ -15,8 +17,7 @@ function oauth_get_client($request){
$r = q("SELECT `clients`.* $r = q("SELECT `clients`.*
FROM `clients`, `tokens` FROM `clients`, `tokens`
WHERE `clients`.`client_id`=`tokens`.`client_id` WHERE `clients`.`client_id`=`tokens`.`client_id`
AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'", AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'", dbesc($token));
dbesc($token));
if (!DBM::is_result($r)) if (!DBM::is_result($r))
return null; return null;
@ -24,57 +25,57 @@ function oauth_get_client($request){
return $r[0]; return $r[0];
} }
function api_post(App $a) { function api_post(App $a)
{
if (! local_user()) { if (!local_user()) {
notice( t('Permission denied.') . EOL); notice(t('Permission denied.') . EOL);
return; return;
} }
if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) { if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) {
notice( t('Permission denied.') . EOL); notice(t('Permission denied.') . EOL);
return; return;
} }
} }
function api_content(App $a) { function api_content(App $a)
if ($a->cmd=='api/oauth/authorize'){ {
if ($a->cmd == 'api/oauth/authorize') {
/* /*
* api/oauth/authorize interact with the user. return a standard page * api/oauth/authorize interact with the user. return a standard page
*/ */
$a->page['template'] = "minimal"; $a->page['template'] = "minimal";
// get consumer/client from request token // get consumer/client from request token
try { try {
$request = OAuthRequest::from_request(); $request = OAuthRequest::from_request();
} catch(Exception $e) { } catch (Exception $e) {
echo "<pre>"; var_dump($e); killme(); echo "<pre>";
var_dump($e);
killme();
} }
if (x($_POST, 'oauth_yes')) {
if (x($_POST,'oauth_yes')){
$app = oauth_get_client($request); $app = oauth_get_client($request);
if (is_null($app)) return "Invalid request. Unknown token."; if (is_null($app)) {
return "Invalid request. Unknown token.";
}
$consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']); $consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']);
$verifier = md5($app['secret'].local_user()); $verifier = md5($app['secret'] . local_user());
Config::set("oauth", $verifier, local_user()); Config::set("oauth", $verifier, local_user());
if ($consumer->callback_url != null) {
if ($consumer->callback_url!=null) {
$params = $request->get_parameters(); $params = $request->get_parameters();
$glue="?"; $glue = "?";
if (strstr($consumer->callback_url,$glue)) $glue="?"; if (strstr($consumer->callback_url, $glue)) {
goaway($consumer->callback_url.$glue."oauth_token=".OAuthUtil::urlencode_rfc3986($params['oauth_token'])."&oauth_verifier=".OAuthUtil::urlencode_rfc3986($verifier)); $glue = "?";
}
goaway($consumer->callback_url . $glue . "oauth_token=" . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . OAuthUtil::urlencode_rfc3986($verifier));
killme(); killme();
} }
$tpl = get_markup_template("oauth_authorize_done.tpl"); $tpl = get_markup_template("oauth_authorize_done.tpl");
$o = replace_macros($tpl, array( $o = replace_macros($tpl, array(
'$title' => t('Authorize application connection'), '$title' => t('Authorize application connection'),
@ -83,31 +84,27 @@ function api_content(App $a) {
)); ));
return $o; return $o;
} }
if (!local_user()) {
if (! local_user()) {
/// @TODO We need login form to redirect to this page /// @TODO We need login form to redirect to this page
notice( t('Please login to continue.') . EOL ); notice(t('Please login to continue.') . EOL);
return login(false,$request->get_parameters()); return Login::form($a->query_string, false, $request->get_parameters());
} }
//FKOAuth1::loginUser(4); //FKOAuth1::loginUser(4);
$app = oauth_get_client($request); $app = oauth_get_client($request);
if (is_null($app)) return "Invalid request. Unknown token."; if (is_null($app)) {
return "Invalid request. Unknown token.";
}
$tpl = get_markup_template('oauth_authorize.tpl'); $tpl = get_markup_template('oauth_authorize.tpl');
$o = replace_macros($tpl, array( $o = replace_macros($tpl, array(
'$title' => t('Authorize application connection'), '$title' => t('Authorize application connection'),
'$app' => $app, '$app' => $app,
'$authorize' => t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'), '$authorize' => t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'),
'$yes' => t('Yes'), '$yes' => t('Yes'),
'$no' => t('No'), '$no' => t('No'),
)); ));
return $o; return $o;

19
mod/bookmarklet.php
View File

@ -2,23 +2,26 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Module\Login;
require_once('include/conversation.php'); require_once('include/conversation.php');
require_once('include/items.php'); require_once('include/items.php');
function bookmarklet_init(App $a) { function bookmarklet_init(App $a)
{
$_GET["mode"] = "minimal"; $_GET["mode"] = "minimal";
} }
function bookmarklet_content(App $a) { function bookmarklet_content(App $a)
{
if (!local_user()) { if (!local_user()) {
$o = '<h2>'.t('Login').'</h2>'; $o = '<h2>' . t('Login') . '</h2>';
$o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true); $o .= Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? false : true);
return $o; return $o;
} }
$referer = normalise_link($_SERVER["HTTP_REFERER"]); $referer = normalise_link($_SERVER["HTTP_REFERER"]);
$page = normalise_link(System::baseUrl()."/bookmarklet"); $page = normalise_link(System::baseUrl() . "/bookmarklet");
if (!strstr($referer, $page)) { if (!strstr($referer, $page)) {
$content = add_page_info($_REQUEST["url"]); $content = add_page_info($_REQUEST["url"]);
@ -30,7 +33,7 @@ function bookmarklet_content(App $a) {
'nickname' => $a->user['nickname'], 'nickname' => $a->user['nickname'],
'lockstate' => ((is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid'])))) ? 'lock' : 'unlock'), 'lockstate' => ((is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid'])))) ? 'lock' : 'unlock'),
'default_perms' => get_acl_permissions($a->user), 'default_perms' => get_acl_permissions($a->user),
'acl' => populate_acl($a->user,true), 'acl' => populate_acl($a->user, true),
'bang' => '', 'bang' => '',
'visitor' => 'block', 'visitor' => 'block',
'profile_uid' => local_user(), 'profile_uid' => local_user(),
@ -38,10 +41,10 @@ function bookmarklet_content(App $a) {
'title' => trim($_REQUEST["title"], "*"), 'title' => trim($_REQUEST["title"], "*"),
'content' => $content 'content' => $content
); );
$o = status_editor($a,$x, 0, false); $o = status_editor($a, $x, 0, false);
$o .= "<script>window.resizeTo(800,550);</script>"; $o .= "<script>window.resizeTo(800,550);</script>";
} else { } else {
$o = '<h2>'.t('The post was created').'</h2>'; $o = '<h2>' . t('The post was created') . '</h2>';
$o .= "<script>window.close()</script>"; $o .= "<script>window.close()</script>";
} }

3
mod/cal.php
View File

@ -12,6 +12,7 @@ use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group;
require_once 'include/event.php'; require_once 'include/event.php';
require_once 'include/redir.php'; require_once 'include/redir.php';
@ -127,7 +128,7 @@ function cal_content(App $a) {
} }
} }
if($contact_id) { if($contact_id) {
$groups = init_groups_visitor($contact_id); $groups = Group::getIdsByContactId($contact_id);
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id), intval($contact_id),
intval($a->profile['profile_uid']) intval($a->profile['profile_uid'])

22
mod/dfrn_poll.php
View File

@ -7,23 +7,25 @@ use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Module\Login;
use Friendica\Protocol\DFRN; use Friendica\Protocol\DFRN;
use Friendica\Protocol\OStatus; use Friendica\Protocol\OStatus;
require_once 'include/items.php'; require_once 'include/items.php';
require_once 'include/auth.php';
function dfrn_poll_init(App $a) function dfrn_poll_init(App $a)
{ {
$dfrn_id = x($_GET,'dfrn_id') ? $_GET['dfrn_id'] : ''; Login::sessionAuth();
$type = x($_GET,'type') ? $_GET['type'] : 'data';
$last_update = x($_GET,'last_update') ? $_GET['last_update'] : ''; $dfrn_id = defaults($_GET, 'dfrn_id' , '');
$destination_url = x($_GET,'destination_url') ? $_GET['destination_url'] : ''; $type = defaults($_GET, 'type' , 'data');
$challenge = x($_GET,'challenge') ? $_GET['challenge'] : ''; $last_update = defaults($_GET, 'last_update' , '');
$sec = x($_GET,'sec') ? $_GET['sec'] : ''; $destination_url = defaults($_GET, 'destination_url', '');
$dfrn_version = x($_GET,'dfrn_version') ? (float) $_GET['dfrn_version'] : 2.0; $challenge = defaults($_GET, 'challenge' , '');
$perm = x($_GET,'perm') ? $_GET['perm'] : 'r'; $sec = defaults($_GET, 'sec' , '');
$quiet = x($_GET,'quiet') ? true : false; $dfrn_version = (float) defaults($_GET, 'dfrn_version' , 2.0);
$perm = defaults($_GET, 'perm' , 'r');
$quiet = x($_GET, 'quiet');
// Possibly it is an OStatus compatible server that requests a user feed // Possibly it is an OStatus compatible server that requests a user feed
if (($a->argc > 1) && ($dfrn_id == '') && !strstr($_SERVER["HTTP_USER_AGENT"], 'Friendica')) { if (($a->argc > 1) && ($dfrn_id == '') && !strstr($_SERVER["HTTP_USER_AGENT"], 'Friendica')) {

340
mod/dfrn_request.php
View File

@ -1,4 +1,5 @@
<?php <?php
/** /**
* @file mod/dfrn_request.php * @file mod/dfrn_request.php
* @brief Module: dfrn_request * @brief Module: dfrn_request
@ -18,6 +19,7 @@ use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Module\Login;
use Friendica\Network\Probe; use Friendica\Network\Probe;
require_once 'include/enotify.php'; require_once 'include/enotify.php';
@ -31,7 +33,6 @@ function dfrn_request_init(App $a)
return; return;
} }
/** /**
* Function: dfrn_request_post * Function: dfrn_request_post
* *
@ -47,100 +48,73 @@ function dfrn_request_init(App $a)
* After logging in, we click 'submit' to approve the linkage. * After logging in, we click 'submit' to approve the linkage.
* *
*/ */
function dfrn_request_post(App $a) { function dfrn_request_post(App $a)
{
if(($a->argc != 2) || (! count($a->profile))) { if (($a->argc != 2) || (!count($a->profile))) {
logger('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile)); logger('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
return; return;
} }
if (x($_POST, 'cancel')) {
if(x($_POST, 'cancel')) {
goaway(System::baseUrl()); goaway(System::baseUrl());
} }
/* /*
*
* Scenario 2: We've introduced ourself to another cell, then have been returned to our own cell * Scenario 2: We've introduced ourself to another cell, then have been returned to our own cell
* to confirm the request, and then we've clicked submit (perhaps after logging in). * to confirm the request, and then we've clicked submit (perhaps after logging in).
* That brings us here: * That brings us here:
*
*/ */
if ((x($_POST, 'localconfirm')) && ($_POST['localconfirm'] == 1)) {
if((x($_POST,'localconfirm')) && ($_POST['localconfirm'] == 1)) { // Ensure this is a valid request
if (local_user() && ($a->user['nickname'] == $a->argv[1]) && (x($_POST, 'dfrn_url'))) {
/* $dfrn_url = notags(trim($_POST['dfrn_url']));
* Ensure this is a valid request $aes_allow = (((x($_POST, 'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
*/ $confirm_key = ((x($_POST, 'confirm_key')) ? $_POST['confirm_key'] : "");
$hidden = ((x($_POST, 'hidden-contact')) ? intval($_POST['hidden-contact']) : 0);
if(local_user() && ($a->user['nickname'] == $a->argv[1]) && (x($_POST,'dfrn_url'))) {
$dfrn_url = notags(trim($_POST['dfrn_url']));
$aes_allow = (((x($_POST,'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
$confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : "");
$hidden = ((x($_POST,'hidden-contact')) ? intval($_POST['hidden-contact']) : 0);
$contact_record = null; $contact_record = null;
$blocked = 1; $blocked = 1;
$pending = 1; $pending = 1;
if(x($dfrn_url)) { if (x($dfrn_url)) {
// Lookup the contact based on their URL (which is the only unique thing we have at the moment)
/*
* Lookup the contact based on their URL (which is the only unique thing we have at the moment)
*/
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND NOT `self` LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND NOT `self` LIMIT 1",
intval(local_user()), intval(local_user()),
dbesc(normalise_link($dfrn_url)) dbesc(normalise_link($dfrn_url))
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
if(strlen($r[0]['dfrn-id'])) { if (strlen($r[0]['dfrn-id'])) {
// We don't need to be here. It has already happened.
/* notice(t("This introduction has already been accepted.") . EOL);
* We don't need to be here. It has already happened.
*/
notice( t("This introduction has already been accepted.") . EOL );
return; return;
} } else {
else
$contact_record = $r[0]; $contact_record = $r[0];
}
} }
if(is_array($contact_record)) { if (is_array($contact_record)) {
$r = q("UPDATE `contact` SET `ret-aes` = %d, hidden = %d WHERE `id` = %d", $r = q("UPDATE `contact` SET `ret-aes` = %d, hidden = %d WHERE `id` = %d",
intval($aes_allow), intval($aes_allow),
intval($hidden), intval($hidden),
intval($contact_record['id']) intval($contact_record['id'])
); );
} } else {
else { // Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
/*
* Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
*/
$parms = Probe::profile($dfrn_url); $parms = Probe::profile($dfrn_url);
if (! count($parms)) { if (!count($parms)) {
notice( t('Profile location is not valid or does not contain profile information.') . EOL ); notice(t('Profile location is not valid or does not contain profile information.') . EOL);
return; return;
} } else {
else { if (!x($parms, 'fn')) {
if (! x($parms,'fn')) { notice(t('Warning: profile location has no identifiable owner name.') . EOL);
notice( t('Warning: profile location has no identifiable owner name.') . EOL );
} }
if (! x($parms,'photo')) { if (!x($parms, 'photo')) {
notice( t('Warning: profile location has no profile photo.') . EOL ); notice(t('Warning: profile location has no profile photo.') . EOL);
} }
$invalid = Probe::validDfrn($parms); $invalid = Probe::validDfrn($parms);
if ($invalid) { if ($invalid) {
notice( sprintf( tt("%d required parameter was not found at the given location", notice(sprintf(tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid), $invalid) . EOL);
"%d required parameters were not found at the given location",
$invalid), $invalid) . EOL );
return; return;
} }
} }
@ -152,10 +126,7 @@ function dfrn_request_post(App $a) {
// Escape the entire array // Escape the entire array
DBM::esc_array($parms); DBM::esc_array($parms);
/* // Create a contact record on our site for the other person
* Create a contact record on our site for the other person
*/
$r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `addr`, `name`, `nick`, `photo`, `site-pubkey`, $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `addr`, `name`, `nick`, `photo`, `site-pubkey`,
`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`) `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`)
VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)", VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)",
@ -182,7 +153,7 @@ function dfrn_request_post(App $a) {
} }
if ($r) { if ($r) {
info( t("Introduction complete.") . EOL); info(t("Introduction complete.") . EOL);
} }
$r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `site-pubkey` = '%s' LIMIT 1", $r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `site-pubkey` = '%s' LIMIT 1",
@ -197,15 +168,12 @@ function dfrn_request_post(App $a) {
Contact::updateAvatar($photo, local_user(), $r[0]["id"], true); Contact::updateAvatar($photo, local_user(), $r[0]["id"], true);
} }
$forwardurl = System::baseUrl()."/contacts/".$r[0]['id']; $forwardurl = System::baseUrl() . "/contacts/" . $r[0]['id'];
} else { } else {
$forwardurl = System::baseUrl()."/contacts"; $forwardurl = System::baseUrl() . "/contacts";
} }
/* // Allow the blocked remote notification to complete
* Allow the blocked remote notification to complete
*/
if (is_array($contact_record)) { if (is_array($contact_record)) {
$dfrn_request = $contact_record['request']; $dfrn_request = $contact_record['request'];
} }
@ -215,18 +183,14 @@ function dfrn_request_post(App $a) {
} }
// (ignore reply, nothing we can do it failed) // (ignore reply, nothing we can do it failed)
// Old: goaway(zrl($dfrn_url)); // Old: goaway(zrl($dfrn_url));
goaway($forwardurl); goaway($forwardurl);
return; // NOTREACHED return; // NOTREACHED
} }
} }
// invalid/bogus request // invalid/bogus request
notice(t('Unrecoverable protocol error.') . EOL);
notice( t('Unrecoverable protocol error.') . EOL );
goaway(System::baseUrl()); goaway(System::baseUrl());
return; // NOTREACHED return; // NOTREACHED
} }
@ -252,9 +216,8 @@ function dfrn_request_post(App $a) {
* in $a->argv[1] and we should have their complete info in $a->profile. * in $a->argv[1] and we should have their complete info in $a->profile.
* *
*/ */
if (!(is_array($a->profile) && count($a->profile))) {
if(! (is_array($a->profile) && count($a->profile))) { notice(t('Profile unavailable.') . EOL);
notice( t('Profile unavailable.') . EOL);
return; return;
} }
@ -268,32 +231,24 @@ function dfrn_request_post(App $a) {
$blocked = 1; $blocked = 1;
$pending = 1; $pending = 1;
if (x($_POST, 'dfrn_url')) {
if( x($_POST,'dfrn_url')) { // Block friend request spam
if ($maxreq) {
/*
* Block friend request spam
*/
if($maxreq) {
$r = q("SELECT * FROM `intro` WHERE `datetime` > '%s' AND `uid` = %d", $r = q("SELECT * FROM `intro` WHERE `datetime` > '%s' AND `uid` = %d",
dbesc(datetime_convert('UTC','UTC','now - 24 hours')), dbesc(datetime_convert('UTC', 'UTC', 'now - 24 hours')),
intval($uid) intval($uid)
); );
if (DBM::is_result($r) && count($r) > $maxreq) { if (DBM::is_result($r) && count($r) > $maxreq) {
notice( sprintf( t('%s has received too many connection requests today.'), $a->profile['name']) . EOL); notice(sprintf(t('%s has received too many connection requests today.'), $a->profile['name']) . EOL);
notice( t('Spam protection measures have been invoked.') . EOL); notice(t('Spam protection measures have been invoked.') . EOL);
notice( t('Friends are advised to please try again in 24 hours.') . EOL); notice(t('Friends are advised to please try again in 24 hours.') . EOL);
return; return;
} }
} }
/* /* Cleanup old introductions that remain blocked.
*
* Cleanup old introductions that remain blocked.
* Also remove the contact record, but only if there is no existing relationship * Also remove the contact record, but only if there is no existing relationship
*/ */
$r = q("SELECT `intro`.*, `intro`.`id` AS `iid`, `contact`.`id` AS `cid`, `contact`.`rel` $r = q("SELECT `intro`.*, `intro`.`id` AS `iid`, `contact`.`id` AS `cid`, `contact`.`rel`
FROM `intro` LEFT JOIN `contact` on `intro`.`contact-id` = `contact`.`id` FROM `intro` LEFT JOIN `contact` on `intro`.`contact-id` = `contact`.`id`
WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0 WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0
@ -301,7 +256,7 @@ function dfrn_request_post(App $a) {
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
if(! $rr['rel']) { if (!$rr['rel']) {
q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`", q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`",
intval($rr['cid']) intval($rr['cid'])
); );
@ -312,11 +267,11 @@ function dfrn_request_post(App $a) {
} }
} }
$real_name = (x($_POST,'realname') ? notags(trim($_POST['realname'])) : ''); $real_name = x($_POST, 'realname') ? notags(trim($_POST['realname'])) : '';
$url = trim($_POST['dfrn_url']); $url = trim($_POST['dfrn_url']);
if(! strlen($url)) { if (!strlen($url)) {
notice( t("Invalid locator") . EOL ); notice(t("Invalid locator") . EOL);
return; return;
} }
@ -327,10 +282,9 @@ function dfrn_request_post(App $a) {
$network = $data["network"]; $network = $data["network"];
// Canonicalise email-style profile locator // Canonicalise email-style profile locator
$url = Probe::webfingerDfrn($url,$hcard); $url = Probe::webfingerDfrn($url, $hcard);
if (substr($url,0,5) === 'stat:') {
if (substr($url, 0, 5) === 'stat:') {
// Every time we detect the remote subscription we define this as OStatus. // Every time we detect the remote subscription we define this as OStatus.
// We do this even if it is not OStatus. // We do this even if it is not OStatus.
// we only need to pass this through another section of the code. // we only need to pass this through another section of the code.
@ -338,29 +292,27 @@ function dfrn_request_post(App $a) {
$network = NETWORK_OSTATUS; $network = NETWORK_OSTATUS;
} }
$url = substr($url,5); $url = substr($url, 5);
} else { } else {
$network = NETWORK_DFRN; $network = NETWORK_DFRN;
} }
logger('dfrn_request: url: ' . $url . ',network=' . $network, LOGGER_DEBUG); logger('dfrn_request: url: ' . $url . ',network=' . $network, LOGGER_DEBUG);
if($network === NETWORK_DFRN) { if ($network === NETWORK_DFRN) {
$ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1", $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
intval($uid), intval($uid),
dbesc($url) dbesc($url)
); );
if (DBM::is_result($ret)) { if (DBM::is_result($ret)) {
if(strlen($ret[0]['issued-id'])) { if (strlen($ret[0]['issued-id'])) {
notice( t('You have already introduced yourself here.') . EOL ); notice(t('You have already introduced yourself here.') . EOL);
return; return;
} } elseif ($ret[0]['rel'] == CONTACT_IS_FRIEND) {
elseif($ret[0]['rel'] == CONTACT_IS_FRIEND) { notice(sprintf(t('Apparently you are already friends with %s.'), $a->profile['name']) . EOL);
notice( sprintf( t('Apparently you are already friends with %s.'), $a->profile['name']) . EOL);
return; return;
} } else {
else {
$contact_record = $ret[0]; $contact_record = $ret[0];
$parms = array('dfrn-request' => $ret[0]['request']); $parms = array('dfrn-request' => $ret[0]['request']);
} }
@ -368,57 +320,53 @@ function dfrn_request_post(App $a) {
$issued_id = random_string(); $issued_id = random_string();
if(is_array($contact_record)) { if (is_array($contact_record)) {
// There is a contact record but no issued-id, so this // There is a contact record but no issued-id, so this
// is a reciprocal introduction from a known contact // is a reciprocal introduction from a known contact
$r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d", $r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d",
dbesc($issued_id), dbesc($issued_id),
intval($contact_record['id']) intval($contact_record['id'])
); );
} } else {
else { $url = validate_url($url);
if (! validate_url($url)) { if (!$url) {
notice( t('Invalid profile URL.') . EOL); notice(t('Invalid profile URL.') . EOL);
goaway(System::baseUrl() . '/' . $a->cmd); goaway(System::baseUrl() . '/' . $a->cmd);
return; // NOTREACHED return; // NOTREACHED
} }
if (! allowed_url($url)) { if (!allowed_url($url)) {
notice( t('Disallowed profile URL.') . EOL); notice(t('Disallowed profile URL.') . EOL);
goaway(System::baseUrl() . '/' . $a->cmd); goaway(System::baseUrl() . '/' . $a->cmd);
return; // NOTREACHED return; // NOTREACHED
} }
if (blocked_url($url)) { if (blocked_url($url)) {
notice( t('Blocked domain') . EOL); notice(t('Blocked domain') . EOL);
goaway(System::baseUrl() . '/' . $a->cmd); goaway(System::baseUrl() . '/' . $a->cmd);
return; // NOTREACHED return; // NOTREACHED
} }
$parms = Probe::profile(($hcard) ? $hcard : $url); $parms = Probe::profile(($hcard) ? $hcard : $url);
if (! count($parms)) { if (!count($parms)) {
notice( t('Profile location is not valid or does not contain profile information.') . EOL ); notice(t('Profile location is not valid or does not contain profile information.') . EOL);
goaway(System::baseUrl() . '/' . $a->cmd); goaway(System::baseUrl() . '/' . $a->cmd);
} } else {
else { if (!x($parms, 'fn')) {
if (! x($parms,'fn')) { notice(t('Warning: profile location has no identifiable owner name.') . EOL);
notice( t('Warning: profile location has no identifiable owner name.') . EOL );
} }
if (! x($parms,'photo')) { if (!x($parms, 'photo')) {
notice( t('Warning: profile location has no profile photo.') . EOL ); notice(t('Warning: profile location has no profile photo.') . EOL);
} }
$invalid = Probe::validDfrn($parms); $invalid = Probe::validDfrn($parms);
if ($invalid) { if ($invalid) {
notice( sprintf( tt("%d required parameter was not found at the given location", notice(sprintf(tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid), $invalid) . EOL);
"%d required parameters were not found at the given location",
$invalid), $invalid) . EOL );
return; return;
} }
} }
$parms['url'] = $url; $parms['url'] = $url;
$parms['issued-id'] = $issued_id; $parms['issued-id'] = $issued_id;
$photo = $parms["photo"]; $photo = $parms["photo"];
@ -460,10 +408,9 @@ function dfrn_request_post(App $a) {
Contact::updateAvatar($photo, $uid, $contact_record["id"], true); Contact::updateAvatar($photo, $uid, $contact_record["id"], true);
} }
} }
} }
if ($r === false) { if ($r === false) {
notice( t('Failed to update contact record.') . EOL ); notice(t('Failed to update contact record.') . EOL);
return; return;
} }
@ -482,43 +429,38 @@ function dfrn_request_post(App $a) {
} }
// This notice will only be seen by the requestor if the requestor and requestee are on the same server. // This notice will only be seen by the requestor if the requestor and requestee are on the same server.
if (!$failed) {
if (! $failed) { info(t('Your introduction has been sent.') . EOL);
info( t('Your introduction has been sent.') . EOL );
} }
// "Homecoming" - send the requestor back to their site to record the introduction. // "Homecoming" - send the requestor back to their site to record the introduction.
$dfrn_url = bin2hex(System::baseUrl() . '/profile/' . $nickname); $dfrn_url = bin2hex(System::baseUrl() . '/profile/' . $nickname);
$aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0); $aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url" goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
. '&confirm_key=' . $hash . '&confirm_key=' . $hash
. (($aes_allow) ? "&aes_allow=1" : "") . (($aes_allow) ? "&aes_allow=1" : "")
); );
// NOTREACHED // NOTREACHED
// END $network === NETWORK_DFRN // END $network === NETWORK_DFRN
} elseif (($network != NETWORK_PHANTOM) && ($url != "")) { } elseif (($network != NETWORK_PHANTOM) && ($url != "")) {
/* /* Substitute our user's feed URL into $url template
*
* Substitute our user's feed URL into $url template
* Send the subscriber home to subscribe * Send the subscriber home to subscribe
*
*/ */
// Diaspora needs the uri in the format user@domain.tld // Diaspora needs the uri in the format user@domain.tld
// Diaspora will support the remote subscription in a future version // Diaspora will support the remote subscription in a future version
if ($network == NETWORK_DIASPORA) { if ($network == NETWORK_DIASPORA) {
$uri = $nickname.'@'.$a->get_hostname(); $uri = $nickname . '@' . $a->get_hostname();
if ($a->get_path()) if ($a->get_path()) {
$uri .= '/'.$a->get_path(); $uri .= '/' . $a->get_path();
}
$uri = urlencode($uri); $uri = urlencode($uri);
} else { } else {
$uri = System::baseUrl().'/profile/'.$nickname; $uri = System::baseUrl() . '/profile/' . $nickname;
} }
$url = str_replace('{uri}', $uri, $url); $url = str_replace('{uri}', $uri, $url);
@ -526,44 +468,37 @@ function dfrn_request_post(App $a) {
// NOTREACHED // NOTREACHED
// END $network != NETWORK_PHANTOM // END $network != NETWORK_PHANTOM
} else { } else {
notice(t("Remote subscription can't be done for your network. Please subscribe directly on your system.").EOL); notice(t("Remote subscription can't be done for your network. Please subscribe directly on your system.") . EOL);
return; return;
} }
} return;
} return;
} }
function dfrn_request_content(App $a)
function dfrn_request_content(App $a) { {
if (($a->argc != 2) || (!count($a->profile))) {
if (($a->argc != 2) || (! count($a->profile))) {
return ""; return "";
} }
// "Homecoming". Make sure we're logged in to this site as the correct user. Then offer a confirm button // "Homecoming". Make sure we're logged in to this site as the correct user. Then offer a confirm button
// to send us to the post section to record the introduction. // to send us to the post section to record the introduction.
if (x($_GET, 'dfrn_url')) {
if (x($_GET,'dfrn_url')) { if (!local_user()) {
info(t("Please login to confirm introduction.") . EOL);
if (! local_user()) {
info( t("Please login to confirm introduction.") . EOL );
/* setup the return URL to come back to this page if they use openid */ /* setup the return URL to come back to this page if they use openid */
$_SESSION['return_url'] = $a->query_string; return Login::form();
return login();
} }
// Edge case, but can easily happen in the wild. This person is authenticated, // Edge case, but can easily happen in the wild. This person is authenticated,
// but not as the person who needs to deal with this request. // but not as the person who needs to deal with this request.
if ($a->user['nickname'] != $a->argv[1]) { if ($a->user['nickname'] != $a->argv[1]) {
notice( t("Incorrect identity currently logged in. Please login to <strong>this</strong> profile.") . EOL); notice(t("Incorrect identity currently logged in. Please login to <strong>this</strong> profile.") . EOL);
return login(); return Login::form();
} }
$dfrn_url = notags(trim(hex2bin($_GET['dfrn_url']))); $dfrn_url = notags(trim(hex2bin($_GET['dfrn_url'])));
$aes_allow = (((x($_GET,'aes_allow')) && ($_GET['aes_allow'] == 1)) ? 1 : 0); $aes_allow = x($_GET, 'aes_allow') && $_GET['aes_allow'] == 1 ? 1 : 0;
$confirm_key = (x($_GET,'confirm_key') ? $_GET['confirm_key'] : ""); $confirm_key = x($_GET, 'confirm_key') ? $_GET['confirm_key'] : "";
// Checking fastlane for validity // Checking fastlane for validity
if (x($_SESSION, "fastlane") && (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) { if (x($_SESSION, "fastlane") && (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) {
@ -580,34 +515,29 @@ function dfrn_request_content(App $a) {
} }
$tpl = get_markup_template("dfrn_req_confirm.tpl"); $tpl = get_markup_template("dfrn_req_confirm.tpl");
$o = replace_macros($tpl,array( $o = replace_macros($tpl, array(
'$dfrn_url' => $dfrn_url, '$dfrn_url' => $dfrn_url,
'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ), '$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
'$hidethem' => t('Hide this contact'), '$hidethem' => t('Hide this contact'),
'$hidechecked' => '', '$hidechecked' => '',
'$confirm_key' => $confirm_key, '$confirm_key' => $confirm_key,
'$welcome' => sprintf( t('Welcome home %s.'), $a->user['username']), '$welcome' => sprintf(t('Welcome home %s.'), $a->user['username']),
'$please' => sprintf( t('Please confirm your introduction/connection request to %s.'), $dfrn_url), '$please' => sprintf(t('Please confirm your introduction/connection request to %s.'), $dfrn_url),
'$submit' => t('Confirm'), '$submit' => t('Confirm'),
'$uid' => $_SESSION['uid'], '$uid' => $_SESSION['uid'],
'$nickname' => $a->user['nickname'], '$nickname' => $a->user['nickname'],
'dfrn_rawurl' => $_GET['dfrn_url'] 'dfrn_rawurl' => $_GET['dfrn_url']
)); ));
return $o; return $o;
} elseif ((x($_GET, 'confirm_key')) && strlen($_GET['confirm_key'])) {
}
elseif((x($_GET,'confirm_key')) && strlen($_GET['confirm_key'])) {
// we are the requestee and it is now safe to send our user their introduction, // we are the requestee and it is now safe to send our user their introduction,
// We could just unblock it, but first we have to jump through a few hoops to // We could just unblock it, but first we have to jump through a few hoops to
// send an email, or even to find out if we need to send an email. // send an email, or even to find out if we need to send an email.
$intro = q("SELECT * FROM `intro` WHERE `hash` = '%s' LIMIT 1", $intro = q("SELECT * FROM `intro` WHERE `hash` = '%s' LIMIT 1",
dbesc($_GET['confirm_key']) dbesc($_GET['confirm_key'])
); );
if (DBM::is_result($intro)) { if (DBM::is_result($intro)) {
$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` $r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `contact`.`id` = %d LIMIT 1", WHERE `contact`.`id` = %d LIMIT 1",
intval($intro[0]['contact-id']) intval($intro[0]['contact-id'])
@ -616,11 +546,11 @@ function dfrn_request_content(App $a) {
$auto_confirm = false; $auto_confirm = false;
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP)) if ($r[0]['page-flags'] != PAGE_NORMAL && $r[0]['page-flags'] != PAGE_PRVGROUP) {
$auto_confirm = true; $auto_confirm = true;
}
if(! $auto_confirm) { if (!$auto_confirm) {
notification(array( notification(array(
'type' => NOTIFY_INTRO, 'type' => NOTIFY_INTRO,
'notify_flags' => $r[0]['notify-flags'], 'notify_flags' => $r[0]['notify-flags'],
@ -637,7 +567,7 @@ function dfrn_request_content(App $a) {
)); ));
} }
if($auto_confirm) { if ($auto_confirm) {
require_once 'mod/dfrn_confirm.php'; require_once 'mod/dfrn_confirm.php';
$handsfree = array( $handsfree = array(
'uid' => $r[0]['uid'], 'uid' => $r[0]['uid'],
@ -645,14 +575,13 @@ function dfrn_request_content(App $a) {
'dfrn_id' => $r[0]['issued-id'], 'dfrn_id' => $r[0]['issued-id'],
'intro_id' => $intro[0]['id'], 'intro_id' => $intro[0]['id'],
'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0), 'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0),
'activity' => intval(PConfig::get($r[0]['uid'],'system','post_newfriend')) 'activity' => intval(PConfig::get($r[0]['uid'], 'system', 'post_newfriend'))
); );
dfrn_confirm_post($a,$handsfree); dfrn_confirm_post($a, $handsfree);
} }
} }
if(! $auto_confirm) { if (!$auto_confirm) {
// If we are auto_confirming, this record will have already been nuked // If we are auto_confirming, this record will have already been nuked
// in dfrn_confirm_post() // in dfrn_confirm_post()
@ -665,53 +594,39 @@ function dfrn_request_content(App $a) {
killme(); killme();
return; // NOTREACHED return; // NOTREACHED
} } else {
else { // Normal web request. Display our user's introduction form.
if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
/* if (!Config::get('system', 'local_block')) {
* Normal web request. Display our user's introduction form. notice(t('Public access denied.') . EOL);
*/
if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
if(! Config::get('system','local_block')) {
notice( t('Public access denied.') . EOL);
return; return;
} }
} }
// Try to auto-fill the profile address
/*
* Try to auto-fill the profile address
*/
// At first look if an address was provided // At first look if an address was provided
// Otherwise take the local address // Otherwise take the local address
if (x($_GET,'addr') && ($_GET['addr'] != "")) { if (x($_GET, 'addr') && ($_GET['addr'] != "")) {
$myaddr = hex2bin($_GET['addr']); $myaddr = hex2bin($_GET['addr']);
} elseif (x($_GET,'address') && ($_GET['address'] != "")) { } elseif (x($_GET, 'address') && ($_GET['address'] != "")) {
$myaddr = $_GET['address']; $myaddr = $_GET['address'];
} elseif (local_user()) { } elseif (local_user()) {
if (strlen($a->path)) { if (strlen($a->path)) {
$myaddr = System::baseUrl() . '/profile/' . $a->user['nickname']; $myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
} else { } else {
$myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3 ); $myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
} }
} else { } else {
// last, try a zrl // last, try a zrl
$myaddr = get_my_url(); $myaddr = get_my_url();
} }
$target_addr = $a->profile['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3 ); $target_addr = $a->profile['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
/* The auto_request form only has the profile address
/*
*
* The auto_request form only has the profile address
* because nobody is going to read the comments and * because nobody is going to read the comments and
* it doesn't matter if they know you or not. * it doesn't matter if they know you or not.
*
*/ */
if ($a->profile['page-flags'] == PAGE_NORMAL) { if ($a->profile['page-flags'] == PAGE_NORMAL) {
$tpl = get_markup_template('dfrn_request.tpl'); $tpl = get_markup_template('dfrn_request.tpl');
} else { } else {
@ -725,20 +640,17 @@ function dfrn_request_content(App $a) {
get_server() get_server()
); );
$o = replace_macros($tpl,array( $o = replace_macros($tpl, array(
'$header' => t('Friend/Connection Request'), '$header' => t('Friend/Connection Request'),
'$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'), '$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'),
'$pls_answer' => t('Please answer the following:'), '$pls_answer' => t('Please answer the following:'),
'$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'), t('Yes'))), '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'), $a->profile['name']), false, '', array(t('No'), t('Yes'))),
/*'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']),
'$yes' => t('Yes'),
'$no' => t('No'), */
'$add_note' => t('Add a personal note:'), '$add_note' => t('Add a personal note:'),
'$page_desc' => $page_desc, '$page_desc' => $page_desc,
'$friendica' => t('Friendica'), '$friendica' => t('Friendica'),
'$statusnet' => t('GNU Social (Pleroma, Mastodon)'), '$statusnet' => t('GNU Social (Pleroma, Mastodon)'),
'$diaspora' => t('Diaspora (Socialhome, Hubzilla)'), '$diaspora' => t('Diaspora (Socialhome, Hubzilla)'),
'$diasnote' => sprintf (t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.'),$target_addr), '$diasnote' => sprintf(t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.'), $target_addr),
'$your_address' => t('Your Identity Address:'), '$your_address' => t('Your Identity Address:'),
'$invite_desc' => $invite_desc, '$invite_desc' => $invite_desc,
'$submit' => t('Submit Request'), '$submit' => t('Submit Request'),

3
mod/display.php
View File

@ -5,6 +5,7 @@ use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group;
use Friendica\Protocol\DFRN; use Friendica\Protocol\DFRN;
function display_init(App $a) { function display_init(App $a) {
@ -271,7 +272,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
} }
if ($contact_id) { if ($contact_id) {
$groups = init_groups_visitor($contact_id); $groups = Group::getIdsByContactId($contact_id);
$r = dba::fetch_first("SELECT * FROM `contact` WHERE `id` = ? AND `uid` = ? LIMIT 1", $r = dba::fetch_first("SELECT * FROM `contact` WHERE `id` = ? AND `uid` = ? LIMIT 1",
$contact_id, $contact_id,
$a->profile['uid'] $a->profile['uid']

3
mod/home.php
View File

@ -3,6 +3,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Module\Login;
if(! function_exists('home_init')) { if(! function_exists('home_init')) {
function home_init(App $a) { function home_init(App $a) {
@ -43,8 +44,8 @@ function home_content(App $a) {
$o .= '<h1>'.((x($a->config,'sitename')) ? sprintf(t("Welcome to %s"), $a->config['sitename']) : "").'</h1>'; $o .= '<h1>'.((x($a->config,'sitename')) ? sprintf(t("Welcome to %s"), $a->config['sitename']) : "").'</h1>';
} }
$o .= Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1);
$o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
call_hooks("home_content",$o); call_hooks("home_content",$o);

20
mod/login.php
View File

@ -1,20 +0,0 @@
<?php
use Friendica\App;
use Friendica\Core\System;
function login_content(App $a) {
if (x($_SESSION, 'theme')) {
unset($_SESSION['theme']);
}
if (x($_SESSION, 'mobile-theme')) {
unset($_SESSION['mobile-theme']);
}
if (local_user()) {
goaway(System::baseUrl());
}
return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
}

4
mod/network.php
View File

@ -11,6 +11,7 @@ use Friendica\Core\PConfig;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Module\Login;
require_once 'include/conversation.php'; require_once 'include/conversation.php';
require_once 'include/contact_widgets.php'; require_once 'include/contact_widgets.php';
@ -380,8 +381,7 @@ function networkConversation($a, $items, $mode, $update) {
function network_content(App $a, $update = 0) { function network_content(App $a, $update = 0) {
if (!local_user()) { if (!local_user()) {
$_SESSION['return_url'] = $a->query_string; return Login::form();
return login(false);
} }
/// @TODO Is this really necessary? $a is already available to hooks /// @TODO Is this really necessary? $a is already available to hooks

3
mod/notify.php
View File

@ -4,6 +4,7 @@ use Friendica\App;
use Friendica\Core\NotificationsManager; use Friendica\Core\NotificationsManager;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Module\Login;
function notify_init(App $a) { function notify_init(App $a) {
if (! local_user()) { if (! local_user()) {
@ -45,7 +46,7 @@ function notify_init(App $a) {
function notify_content(App $a) { function notify_content(App $a) {
if (! local_user()) { if (! local_user()) {
return login(); return Login::form();
} }
$nm = new NotificationsManager(); $nm = new NotificationsManager();

3
mod/oexchange.php
View File

@ -2,6 +2,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Module\Login;
function oexchange_init(App $a) { function oexchange_init(App $a) {
@ -17,7 +18,7 @@ function oexchange_init(App $a) {
function oexchange_content(App $a) { function oexchange_content(App $a) {
if (! local_user()) { if (! local_user()) {
$o = login(false); $o = Login::form();
return $o; return $o;
} }

3
mod/photos.php
View File

@ -9,6 +9,7 @@ use Friendica\Core\Config;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Image; use Friendica\Object\Image;
@ -1045,7 +1046,7 @@ function photos_content(App $a)
} }
} }
if ($contact_id) { if ($contact_id) {
$groups = init_groups_visitor($contact_id); $groups = Group::getIdsByContactId($contact_id);
$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id), intval($contact_id),
intval($owner_uid) intval($owner_uid)

6
mod/profile.php
View File

@ -5,6 +5,8 @@ use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Group;
use Friendica\Module\Login;
require_once 'include/contact_widgets.php'; require_once 'include/contact_widgets.php';
require_once 'include/redir.php'; require_once 'include/redir.php';
@ -103,7 +105,7 @@ function profile_content(App $a, $update = 0)
$hashtags = defaults($_GET, 'tag', ''); $hashtags = defaults($_GET, 'tag', '');
if (Config::get('system', 'block_public') && !local_user() && !remote_user()) { if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
return login(); return Login::form();
} }
require_once 'include/bbcode.php'; require_once 'include/bbcode.php';
@ -139,7 +141,7 @@ function profile_content(App $a, $update = 0)
} }
if ($contact_id) { if ($contact_id) {
$groups = init_groups_visitor($contact_id); $groups = Group::getIdsByContactId($contact_id);
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id), intval($contact_id),
intval($a->profile['profile_uid']) intval($a->profile['profile_uid'])

5
mod/regmod.php
View File

@ -6,6 +6,7 @@ use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Module\Login;
require_once 'include/enotify.php'; require_once 'include/enotify.php';
@ -94,11 +95,9 @@ function regmod_content(App $a)
{ {
global $lang; global $lang;
$_SESSION['return_url'] = $a->cmd;
if (!local_user()) { if (!local_user()) {
info(t('Please login.') . EOL); info(t('Please login.') . EOL);
$o .= '<br /><br />' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1); $o .= '<br /><br />' . Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1);
return $o; return $o;
} }

5
mod/settings.php
View File

@ -537,10 +537,9 @@ function settings_post(App $a) {
// If openid has changed or if there's an openid but no openidserver, try and discover it. // If openid has changed or if there's an openid but no openidserver, try and discover it.
if ($openid != $a->user['openid'] || (strlen($openid) && (!strlen($openidserver)))) { if ($openid != $a->user['openid'] || (strlen($openid) && (!strlen($openidserver)))) {
$tmp_str = $openid; if (strlen($tmp_str) && validate_url($openid)) {
if (strlen($tmp_str) && validate_url($tmp_str)) {
logger('updating openidserver'); logger('updating openidserver');
require_once('library/openid.php'); require_once 'library/openid.php';
$open_id_obj = new LightOpenID; $open_id_obj = new LightOpenID;
$open_id_obj->identity = $openid; $open_id_obj->identity = $openid;
$openidserver = $open_id_obj->discover($open_id_obj->identity); $openidserver = $open_id_obj->discover($open_id_obj->identity);

3
mod/videos.php
View File

@ -6,6 +6,7 @@ use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group;
require_once 'include/items.php'; require_once 'include/items.php';
require_once 'include/acl_selectors.php'; require_once 'include/acl_selectors.php';
@ -294,7 +295,7 @@ function videos_content(App $a) {
} }
} }
if($contact_id) { if($contact_id) {
$groups = init_groups_visitor($contact_id); $groups = Group::getIdsByContactId($contact_id);
$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id), intval($contact_id),
intval($owner_uid) intval($owner_uid)

2
src/BaseObject.php
View File

@ -20,7 +20,7 @@ class BaseObject
* *
* Same as get_app from boot.php * Same as get_app from boot.php
* *
* @return object * @return App
*/ */
public static function getApp() public static function getApp()
{ {

25
src/Core/System.php
View File

@ -4,7 +4,7 @@
*/ */
namespace Friendica\Core; namespace Friendica\Core;
use Friendica\App; use Friendica\BaseObject;
/** /**
* @file include/Core/System.php * @file include/Core/System.php
@ -16,23 +16,8 @@ use Friendica\App;
/** /**
* @brief System methods * @brief System methods
*/ */
class System class System extends BaseObject
{ {
private static $a;
/**
* @brief Initializes the static class variable
* @return void
*/
private static function init()
{
global $a;
if (!is_object(self::$a)) {
self::$a = $a;
}
}
/** /**
* @brief Retrieves the Friendica instance base URL * @brief Retrieves the Friendica instance base URL
* *
@ -41,8 +26,7 @@ class System
*/ */
public static function baseUrl($ssl = false) public static function baseUrl($ssl = false)
{ {
self::init(); return self::getApp()->get_baseurl($ssl);
return self::$a->get_baseurl($ssl);
} }
/** /**
@ -54,8 +38,7 @@ class System
*/ */
public static function removedBaseUrl($orig_url) public static function removedBaseUrl($orig_url)
{ {
self::init(); return self::getApp()->remove_baseurl($orig_url);
return self::$a->remove_baseurl($orig_url);
} }
/** /**

2
src/Model/Group.php
View File

@ -61,7 +61,7 @@ class Group extends BaseObject
* @param int $cid * @param int $cid
* @return array * @return array
*/ */
private static function getIdsByContactId($cid) public static function getIdsByContactId($cid)
{ {
$condition = ['contact-id' => $cid]; $condition = ['contact-id' => $cid];
$stmt = dba::select('group_member', ['gid'], $condition); $stmt = dba::select('group_member', ['gid'], $condition);

6
src/Model/User.php
View File

@ -198,8 +198,6 @@ class User
$password = $password1; $password = $password1;
} }
$tmp_str = $openid_url;
if ($using_invites) { if ($using_invites) {
if (!$invite_id) { if (!$invite_id) {
throw new Exception(t('An invitation is required.')); throw new Exception(t('An invitation is required.'));
@ -212,7 +210,7 @@ class User
if (!x($username) || !x($email) || !x($nickname)) { if (!x($username) || !x($email) || !x($nickname)) {
if ($openid_url) { if ($openid_url) {
if (!validate_url($tmp_str)) { if (!validate_url($openid_url)) {
throw new Exception(t('Invalid OpenID url')); throw new Exception(t('Invalid OpenID url'));
} }
$_SESSION['register'] = 1; $_SESSION['register'] = 1;
@ -235,7 +233,7 @@ class User
throw new Exception(t('Please enter the required information.')); throw new Exception(t('Please enter the required information.'));
} }
if (!validate_url($tmp_str)) { if (!validate_url($openid_url)) {
$openid_url = ''; $openid_url = '';
} }

311
src/Module/Login.php Normal file
View File

@ -0,0 +1,311 @@
<?php
namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Model\User;
use dba;
require_once 'boot.php';
require_once 'include/datetime.php';
require_once 'include/pgettext.php';
require_once 'include/security.php';
require_once 'include/text.php';
/**
* Login module
*
* @author Hypolite Petovan mrpetovan@gmail.com
*/
class Login extends BaseModule
{
public static function content()
{
$a = self::getApp();
if (x($_SESSION, 'theme')) {
unset($_SESSION['theme']);
}
if (x($_SESSION, 'mobile-theme')) {
unset($_SESSION['mobile-theme']);
}
if (local_user()) {
goaway(self::getApp()->get_baseurl());
}
return self::form(self::getApp()->get_baseurl(), $a->config['register_policy'] != REGISTER_CLOSED);
}
public static function post()
{
session_unset();
// OpenId Login
if (
!x($_POST, 'password')
&& (
x($_POST, 'openid_url')
|| x($_POST, 'username')
)
) {
$noid = Config::get('system', 'no_openid');
$openid_url = trim($_POST['openid_url'] ? : $_POST['username']);
// if it's an email address or doesn't resolve to a URL, fail.
if ($noid || strpos($openid_url, '@') || !validate_url($openid_url)) {
notice(t('Login failed.') . EOL);
goaway(self::getApp()->get_baseurl());
// NOTREACHED
}
// Otherwise it's probably an openid.
try {
require_once 'library/openid.php';
$openid = new LightOpenID;
$openid->identity = $openid_url;
$_SESSION['openid'] = $openid_url;
$_SESSION['remember'] = $_POST['remember'];
$openid->returnUrl = self::getApp()->get_baseurl(true) . '/openid';
goaway($openid->authUrl());
} catch (Exception $e) {
notice(t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . '<br /><br >' . t('The error message was:') . ' ' . $e->getMessage());
}
// NOTREACHED
}
if (x($_POST, 'auth-params') && $_POST['auth-params'] === 'login') {
$record = null;
$addon_auth = array(
'username' => trim($_POST['username']),
'password' => trim($_POST['password']),
'authenticated' => 0,
'user_record' => null
);
/*
* A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record
* Plugins should never set 'authenticated' except to indicate success - as hooks may be chained
* and later plugins should not interfere with an earlier one that succeeded.
*/
call_hooks('authenticate', $addon_auth);
if ($addon_auth['authenticated'] && count($addon_auth['user_record'])) {
$record = $addon_auth['user_record'];
} else {
$user_id = User::authenticate(trim($_POST['username']), trim($_POST['password']));
if ($user_id) {
$record = dba::select('user', [], ['uid' => $user_id], ['limit' => 1]);
}
}
if (!$record || !count($record)) {
logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
notice(t('Login failed.') . EOL);
goaway(self::getApp()->get_baseurl());
}
if (!$_POST['remember']) {
new_cookie(0); // 0 means delete on browser exit
}
// if we haven't failed up this point, log them in.
$_SESSION['remember'] = $_POST['remember'];
$_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
authenticate_success($record, true, true);
if (x($_SESSION, 'return_url')) {
$return_url = $_SESSION['return_url'];
unset($_SESSION['return_url']);
} else {
$return_url = '';
}
goaway($return_url);
}
}
/**
* @brief Tries to auth the user from the cookie or session
*
* @todo Should be moved to Friendica\Core\Session when it's created
*/
public static function sessionAuth()
{
// When the "Friendica" cookie is set, take the value to authenticate and renew the cookie.
if (isset($_COOKIE["Friendica"])) {
$data = json_decode($_COOKIE["Friendica"]);
if (isset($data->uid)) {
$user = dba::select('user',
[],
[
'uid' => $data->uid,
'blocked' => false,
'account_expired' => false,
'account_removed' => false,
'verified' => true,
],
['limit' => 1]
);
if (DBM::is_result($user)) {
if ($data->hash != cookie_hash($user)) {
logger("Hash for user " . $data->uid . " doesn't fit.");
nuke_session();
goaway(self::getApp()->get_baseurl());
}
// Renew the cookie
// 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);
// Do the authentification if not done by now
if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) {
authenticate_success($user);
if (Config::get('system', 'paranoia')) {
$_SESSION['addr'] = $data->ip;
}
}
}
}
}
if (isset($_SESSION) && x($_SESSION, 'authenticated')) {
if (x($_SESSION, 'visitor_id') && !x($_SESSION, 'uid')) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($_SESSION['visitor_id'])
);
if (DBM::is_result($r)) {
$a->contact = $r[0];
}
}
if (x($_SESSION, 'uid')) {
// already logged in user returning
$check = Config::get('system', 'paranoia');
// extra paranoia - if the IP changed, log them out
if ($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
logger('Session address changed. Paranoid setting in effect, blocking session. ' .
$_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
nuke_session();
goaway(self::getApp()->get_baseurl());
}
$user = dba::select('user',
[],
[
'uid' => $_SESSION['uid'],
'blocked' => false,
'account_expired' => false,
'account_removed' => false,
'verified' => true,
],
['limit' => 1]
);
if (!DBM::is_result($user)) {
nuke_session();
goaway(self::getApp()->get_baseurl());
}
// Make sure to refresh the last login time for the user if the user
// stays logged in for a long time, e.g. with "Remember Me"
$login_refresh = false;
if (!x($_SESSION['last_login_date'])) {
$_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
}
if (strcmp(datetime_convert('UTC', 'UTC', 'now - 12 hours'), $_SESSION['last_login_date']) > 0) {
$_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
$login_refresh = true;
}
authenticate_success($user, false, false, $login_refresh);
}
}
}
/**
* @brief Wrapper for adding a login box.
*
* @param string $return_url The url relative to the base the user should be sent
* back to after login completes
* @param bool $register If $register == true provide a registration link.
* This will most always depend on the value of $a->config['register_policy'].
* @param array $hiddens optional
*
* @return string Returns the complete html for inserting into the page
*
* @hooks 'login_hook' string $o
*/
public static function form($return_url = null, $register = false, $hiddens = [])
{
$a = self::getApp();
$o = '';
$reg = false;
if ($register) {
$reg = array(
'title' => t('Create a New Account'),
'desc' => t('Register')
);
}
$noid = Config::get('system', 'no_openid');
if (is_null($return_url)) {
$return_url = $a->query_string;
}
if (local_user()) {
$tpl = get_markup_template('logout.tpl');
} else {
$a->page['htmlhead'] .= replace_macros(
get_markup_template('login_head.tpl'),
[
'$baseurl' => $a->get_baseurl(true)
]
);
$tpl = get_markup_template('login.tpl');
$_SESSION['return_url'] = $return_url;
}
$o .= replace_macros(
$tpl,
[
'$dest_url' => self::getApp()->get_baseurl(true) . '/login',
'$logout' => t('Logout'),
'$login' => t('Login'),
'$lname' => array('username', t('Nickname or Email: ') , '', ''),
'$lpassword' => array('password', t('Password: '), '', ''),
'$lremember' => array('remember', t('Remember me'), 0, ''),
'$openid' => !$noid,
'$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''),
'$hiddens' => $hiddens,
'$register' => $reg,
'$lostpass' => t('Forgot your password?'),
'$lostlink' => t('Password Reset'),
'$tostitle' => t('Website Terms of Service'),
'$toslink' => t('terms of service'),
'$privacytitle' => t('Website Privacy Policy'),
'$privacylink' => t('privacy policy'),
]
);
call_hooks('login_hook', $o);
return $o;
}
}

29
src/Module/Logout.php Normal file
View File

@ -0,0 +1,29 @@
<?php
namespace Friendica\Module;
use Friendica\BaseModule;
require_once 'boot.php';
require_once 'include/pgettext.php';
require_once 'include/plugin.php';
require_once 'include/security.php';
/**
* Logout module
*
* @author Hypolite Petovan mrpetovan@gmail.com
*/
class Logout extends BaseModule
{
/**
* @brief Process logout requests
*/
public static function init()
{
call_hooks("logging_out");
nuke_session();
info(t('Logged out.') . EOL);
goaway(self::getApp()->get_baseurl());
}
}

3
src/Protocol/DFRN.php
View File

@ -15,6 +15,7 @@ use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\GContact; use Friendica\Model\GContact;
use Friendica\Model\Group;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Object\Image; use Friendica\Object\Image;
@ -167,7 +168,7 @@ class DFRN
$contact = $r[0]; $contact = $r[0];
include_once 'include/security.php'; include_once 'include/security.php';
$groups = init_groups_visitor($contact['id']); $groups = Group::getIdsByContactId($contact['id']);
if (count($groups)) { if (count($groups)) {
for ($x = 0; $x < count($groups); $x ++) for ($x = 0; $x < count($groups); $x ++)

238
view/theme/frio/php/default.php
View File

@ -6,140 +6,152 @@
?> ?>
<!DOCTYPE html > <!DOCTYPE html >
<?php <?php
use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\PConfig;
require_once('view/theme/frio/php/frio_boot.php'); use Friendica\Core\System;
require_once 'view/theme/frio/php/frio_boot.php';
// $minimal = is_modal(); // $minimal = is_modal();
if (!isset($minimal)) { if (!isset($minimal)) {
$minimal = false; $minimal = false;
} }
?> ?>
<html> <html>
<head> <head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title> <title><?php if (x($page, 'title')) echo $page['title'] ?></title>
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>"> <meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
<script type="text/javascript">var baseurl="<?php echo System::baseUrl() ?>";</script> <script type="text/javascript">var baseurl = "<?php echo System::baseUrl(); ?>";</script>
<script type="text/javascript">var frio="<?php echo "view/theme/frio"; ?>";</script> <script type="text/javascript">var frio = "<?php echo 'view/theme/frio'; ?>";</script>
<?php $baseurl = System::baseUrl(); ?>
<?php $frio = "view/theme/frio"; ?>
<?php
// Because we use minimal for modals the header and the included js stuff should be only loaded
// if the page is an standard page (so we don't have it twice for modals)
//
/// @todo Think about to move js stuff in the footer
if(!$minimal) {
if(x($page,'htmlhead')) echo $page['htmlhead'];
}
?>
<?php
// Add the theme color meta
// It makes mobile Chrome UI match Frio's top bar color.
$uid = $a->profile_uid;
if (is_null($uid)) {
$uid = get_theme_uid();
}
$schema = PConfig::get($uid, 'frio', 'schema');
if (($schema) && ($schema != '---')) {
if (file_exists('view/theme/frio/schema/'.$schema.'.php')) {
$schemefile = 'view/theme/frio/schema/'.$schema.'.php';
require_once($schemefile);
}
} else {
$nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
}
if (!$nav_bg) {
$nav_bg = "#708fa0";
}
echo '<meta name="theme-color" content="'.$nav_bg.'" />';
?>
</head>
<?php <?php
if(($_SERVER['REQUEST_URI'] != "/register") && ($_SERVER['REQUEST_URI'] != "/lostpass") && ($_SERVER['REQUEST_URI'] != "/login")) $baseurl = System::baseUrl();
{ $frio = "view/theme/frio";
echo"<body id=\"top\">"; // Because we use minimal for modals the header and the included js stuff should be only loaded
} // if the page is an standard page (so we don't have it twice for modals)
else //
{ /// @todo Think about to move js stuff in the footer
echo"<body id=\"top\">"; if (!$minimal && x($page, 'htmlhead')) {
} echo $page['htmlhead'];
}
// Add the theme color meta
// It makes mobile Chrome UI match Frio's top bar color.
$uid = $a->profile_uid;
if (is_null($uid)) {
$uid = get_theme_uid();
}
$schema = PConfig::get($uid, 'frio', 'schema');
if (($schema) && ($schema != '---')) {
if (file_exists('view/theme/frio/schema/' . $schema . '.php')) {
$schemefile = 'view/theme/frio/schema/' . $schema . '.php';
require_once $schemefile;
}
} else {
$nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
}
if (!$nav_bg) {
$nav_bg = "#708fa0";
}
echo '
<meta name="theme-color" content="' . $nav_bg . '" />';
?> ?>
<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a> </head>
<body id="top">
<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
<?php <?php
if(x($page,'nav') && (!$minimal)){ if (x($page, 'nav') && !$minimal) {
echo str_replace("~config.sitename~",Config::get('config','sitename'), echo str_replace(
str_replace("~system.banner~",Config::get('system','banner'), "~config.sitename~",
$page['nav'] Config::get('config', 'sitename'),
));}; str_replace(
"~system.banner~",
Config::get('system', 'banner'),
$page['nav']
)
);
};
// special minimal style for modal dialogs // special minimal style for modal dialogs
if($minimal) { if ($minimal) {
?> ?>
<section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(x($page,'content')) echo $page['content']; ?> <section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;">
<?php if (x($page, 'content')) echo $page['content']; ?>
<div id="page-footer"></div> <div id="page-footer"></div>
</section> </section>
<?php }
// the style for all other pages
else {
?> <main>
<div class="container">
<div class="row">
<?php <?php
if(($_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != "/")) } else {
{ // the style for all other pages
echo" ?>
<aside class=\"col-lg-3 col-md-3 offcanvas-sm offcanvas-xs\"> <main>
"; if(x($page,'aside')) echo $page['aside']; echo" <div class="container">
"; if(x($page,'right_aside')) echo $page['right_aside']; echo" <div class="row">
<?php
if ((!x($_REQUEST, 'pagename') || $_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != "/")) {
echo '
<aside class="col-lg-3 col-md-3 offcanvas-sm offcanvas-xs">';
if (x($page, 'aside')) {
echo $page['aside'];
}
if (x($page, 'right_aside')) {
echo $page['right_aside'];
}
echo '
</aside> </aside>
<div class=\"col-lg-7 col-md-7 col-sm-12 col-xs-12\" id=\"content\"> <div class="col-lg-7 col-md-7 col-sm-12 col-xs-12" id="content">
<section class=\"sectiontop "; echo $a->argv[0]; echo "-content-wrapper\">"; <section class="sectiontop ';
if(x($page,'content')) echo $page['content']; echo" echo $a->argv[0];
<div id=\"pause\"></div> <!-- The pause/resume Ajax indicator --> echo '-content-wrapper">';
if (x($page, 'content')) {
echo $page['content'];
}
echo '
<div id="pause"></div> <!-- The pause/resume Ajax indicator -->
</section> </section>
</div> </div>
"; ';
} } else {
else echo '
{ <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" id="content" style="margin-top:50px;">';
echo" if (x($page, 'content')) {
<div class=\"col-lg-12 col-md-12 col-sm-12 col-xs-12\" id=\"content\" style=\"margin-top:50px;\" > echo $page['content'];
"; if(x($page,'content')) echo $page['content']; echo" }
echo '
</div> </div>
"; ';
} }
?> ?>
</div><!--row--> </div><!--row-->
</div><!-- container --> </div><!-- container -->
<div id="back-to-top" title="back to top">&#8679;</div> <div id="back-to-top" title="back to top">&#8679;</div>
</main> </main>
<footer> <footer>
<?php if(x($page,'footer')) echo $page['footer']; ?> <?php if (x($page, 'footer')) echo $page['footer']; ?>
<!-- Modal --> <!-- Modal -->
<div id="modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true"> <div id="modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-full-screen"> <div class="modal-dialog modal-full-screen">
<div class="modal-content"> <div class="modal-content">
<div id="modal-header" class="modal-header"> <div id="modal-header" class="modal-header">
<button id="modal-cloase" type="button" class="close" data-dismiss="modal" aria-hidden="true"> <button id="modal-cloase" type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times; &times;
</button> </button>
<h4 id="modal-title" class="modal-title"></h4> <h4 id="modal-title" class="modal-title"></h4>
</div>
<div id="modal-body" class="modal-body">
<!-- /# content goes here -->
</div>
</div>
</div>
</div> </div>
<div id="modal-body" class="modal-body">
<!-- /# content goes here -->
</div>
</div>
</div>
</div>
<!-- Dummy div to append other div's when needed (e.g. used for js function editpost() --> <!-- Dummy div to append other div's when needed (e.g. used for js function editpost() -->
<div id="cache-container"></div> <div id="cache-container"></div>
</footer> </footer>
<?php } ?> <!-- End of condition if $minal else the rest --> <?php } ?> <!-- End of condition if $minimal else the rest -->
</body> </body>