use Friendica\App;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
+use Friendica\Util\Strings;
+use Friendica\Util\Network;
function redir_init(App $a) {
$contact_url = $contact['url'];
- if ($contact['network'] !== Protocol::DFRN // Authentication isn't supported for non DFRN contacts.
- || (!local_user() && !remote_user()) // Visitors (not logged in or not remotes) can't authenticate.
+ if ((!local_user() && !remote_user()) // Visitors (not logged in or not remotes) can't authenticate.
|| (!empty($a->contact['id']) && $a->contact['id'] == $cid)) // Local user is already authenticated.
{
$a->redirect(defaults($url, $contact_url));
if ($contact['uid'] == 0 && local_user()) {
// Let's have a look if there is an established connection
- // between the puplic contact we have found and the local user.
+ // between the public contact we have found and the local user.
$contact = DBA::selectFirst('contact', $fields, ['nurl' => $contact['nurl'], 'uid' => local_user()]);
if (DBA::isResult($contact)) {
if (!empty($a->contact['id']) && $a->contact['id'] == $cid) {
// Local user is already authenticated.
$target_url = defaults($url, $contact_url);
- logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
+ Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
$a->redirect($target_url);
}
}
// for authentification everytime he/she is visiting a profile page of the local
// contact.
if ($host == $remotehost
- && x($_SESSION, 'remote')
+ && !empty($_SESSION['remote'])
&& is_array($_SESSION['remote']))
{
foreach ($_SESSION['remote'] as $v) {
if ($v['uid'] == $_SESSION['visitor_visiting'] && $v['cid'] == $_SESSION['visitor_id']) {
// Remote user is already authenticated.
$target_url = defaults($url, $contact_url);
- logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
+ Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
$a->redirect($target_url);
}
}
}
}
+ // When the remote page does support OWA, then we enforce the use of it
+ $basepath = Contact::getBasepath($contact_url);
+ if ($basepath == System::baseUrl()) {
+ $use_magic = true;
+ } else {
+ $serverret = Network::curl($basepath . '/magic');
+ $use_magic = $serverret->isSuccess();
+ }
+
// Doing remote auth with dfrn.
- if (local_user() && (!empty($contact['dfrn-id']) || !empty($contact['issued-id'])) && empty($contact['pending'])) {
+ if (local_user() && !$use_magic && (!empty($contact['dfrn-id']) || !empty($contact['issued-id'])) && empty($contact['pending'])) {
$dfrn_id = $orig_id = (($contact['issued-id']) ? $contact['issued-id'] : $contact['dfrn-id']);
if ($contact['duplex'] && $contact['issued-id']) {
$dfrn_id = '0:' . $orig_id;
}
- $sec = random_string();
+ $sec = Strings::getRandomHex();
$fields = ['uid' => local_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id,
'sec' => $sec, 'expire' => time() + 45];
DBA::insert('profile_check', $fields);
- logger('mod_redir: ' . $contact['name'] . ' ' . $sec, LOGGER_DEBUG);
+ Logger::log('mod_redir: ' . $contact['name'] . ' ' . $sec, Logger::DEBUG);
$dest = (!empty($url) ? '&destination_url=' . $url : '');
if (!empty($url)) {
$my_profile = Profile::getMyURL();
- if (!empty($my_profile) && !link_compare($my_profile, $url)) {
+ if (!empty($my_profile) && !Strings::compareLink($my_profile, $url)) {
$separator = strpos($url, '?') ? '&' : '?';
$url .= $separator . 'zrl=' . urlencode($my_profile);
}
- logger('redirecting to ' . $url, LOGGER_DEBUG);
+ Logger::log('redirecting to ' . $url, Logger::DEBUG);
$a->redirect($url);
}