harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

magic auth issue

Browse Source
This commit is contained in:
friendica 2013-03-26 16:20:44 -07:00
parent 783d744f02
commit 63c6427dc4
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mod/post.php
View File

@ -19,7 +19,7 @@ function post_init(&$a) {
$webbie = argv(1); $webbie = argv(1);
if(array_key_exists('auth',$_REQUEST)) { if(array_key_exists('auth',$_REQUEST)) {
logger('mod_zot: auth request received.');
$address = $_REQUEST['auth']; $address = $_REQUEST['auth'];
$dest = $_REQUEST['dest']; $dest = $_REQUEST['dest'];
$sec = $_REQUEST['sec']; $sec = $_REQUEST['sec'];
@ -95,10 +95,17 @@ function post_init(&$a) {
$j = json_decode($result['body'],true); $j = json_decode($result['body'],true);
} }
if($already_authed || $j['result']) { if($already_authed || $j['success']) {
// everything is good... maybe // everything is good... maybe
if(local_user()) { if(local_user()) {
// tell them to logout if they're logged in locally as anything but the target remote account
// in which case just shut up because they don't need to be doing this at all.
if($a->channel['channel_hash'] != $x[0]['xchan_hash']) {
logger('mod_zot: auth: already authenticated locally as somebody else.');
notice( t('Remote authentication blocked. You are logged into this site locally. Please logout and retry.') . EOL); notice( t('Remote authentication blocked. You are logged into this site locally. Please logout and retry.') . EOL);
}
goaway($desturl); goaway($desturl);
} }
// log them in // log them in
@ -350,6 +357,7 @@ function post_post(&$a) {
} }
if($msgtype === 'auth_check') { if($msgtype === 'auth_check') {
logger('mod_zot: auth_check');
$arr = $data['sender']; $arr = $data['sender'];
$sender_hash = base64url_encode(hash('whirlpool',$arr['guid'] . $arr['guid_sig'], true)); $sender_hash = base64url_encode(hash('whirlpool',$arr['guid'] . $arr['guid_sig'], true));

2
version.inc
View File

@ -1 +1 @@
2013-03-25.263 2013-03-26.264