auth manager update, increased verbosity on salmon logs

This commit is contained in:
Friendika 2010-11-11 14:53:39 -08:00
parent 7be66b1d91
commit 4c5f3fbf79
3 changed files with 31 additions and 5 deletions

View File

@ -30,6 +30,7 @@ $a->init_pagehead();
session_start();
// header('Link: <' . $a->get_baseurl() . '/amcd>; rel="acct-mgmt";');
if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login'))
require("auth.php");

View File

@ -1,10 +1,15 @@
<?php
function amcd_content(&$a) {
header("Content-type: text/json");
//header("Content-type: text/json");
echo <<< EOT
{
"methods": {
"version":1,
"sessionstatus":{
"method":"GET",
"path":"/session"
},
"auth-methods": {
"username-password-form": {
"connect": {
"method":"POST",
@ -12,11 +17,29 @@ echo <<< EOT
"params": {
"username":"login-name",
"password":"password"
}
},
"onsuccess": { "action":"reload" }
},
"disconnect": {
"method":"GET",
"path":"/logout"
"path":"\/logout"
}
}
}
"methods": {
"username-password-form": {
"connect": {
"method":"POST",
"path":"\/login",
"params": {
"username":"login-name",
"password":"password"
},
"onsuccess": { "action":"reload" }
},
"disconnect": {
"method":"GET",
"path":"\/logout"
}
}
}

View File

@ -158,8 +158,10 @@ function salmon_post(&$a) {
$verify = $rsa->verify($signed_data,$signature);
if(! $verify)
if(! $verify) {
logger('mod-salmon: message did not verify using protocol. Trying statusnet hack.');
$verify = $rsa->verify($stnet_signed_data,$signature);
}
if(! $verify) {
logger('mod-salmon: Message did not verify. Discarding.');