xingcheng
/
FreshRSS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug Persona temporaire

Browse Source 
https://github.com/marienfressinaud/FreshRSS/issues/347
pull/350/head
Alexandre Alapetite 11 years ago
parent 4a19676cf2
commit 1fb25addd0
2 changed files with 10 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      app/Controllers/indexController.php
  2. 5
      app/FreshRSS.php

5
app/Controllers/indexController.php
Unescape View File

@ -237,6 +237,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
$assert = Minz_Request::param ('assertion'); $assert = Minz_Request::param ('assertion');
$params = 'assertion=' . $assert . '&audience=' . $params = 'assertion=' . $assert . '&audience=' .
urlencode (Minz_Url::display (null, 'php', true)); urlencode (Minz_Url::display (null, 'php', true));
file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' login params=' . print_r($params, true) . "\n", FILE_APPEND); //DEBUG
$ch = curl_init (); $ch = curl_init ();
$options = array ( $options = array (
CURLOPT_URL => $url, CURLOPT_URL => $url,
@ -252,8 +253,10 @@ class FreshRSS_index_Controller extends Minz_ActionController {
$loginOk = false; $loginOk = false;
$reason = ''; $reason = '';
file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' login response=' . print_r($res, true) . "\n", FILE_APPEND); //DEBUG
if ($res['status'] === 'okay') { if ($res['status'] === 'okay') {
$email = filter_var($res['email'], FILTER_VALIDATE_EMAIL); $email = filter_var($res['email'], FILTER_VALIDATE_EMAIL);
file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' filtered_email=' . $email . "\n", FILE_APPEND); //DEBUG
if ($email != '') { if ($email != '') {
$personaFile = DATA_PATH . '/persona/' . $email . '.txt'; $personaFile = DATA_PATH . '/persona/' . $email . '.txt';
if (($currentUser = @file_get_contents($personaFile)) !== false) { if (($currentUser = @file_get_contents($personaFile)) !== false) {
@ -277,12 +280,14 @@ class FreshRSS_index_Controller extends Minz_ActionController {
Minz_Session::_param('currentUser', $currentUser); Minz_Session::_param('currentUser', $currentUser);
Minz_Session::_param ('mail', $email); Minz_Session::_param ('mail', $email);
$this->view->loginOk = true; $this->view->loginOk = true;
file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' Login OK email=' . $email . ', currentUser=' . $currentUser . "\n", FILE_APPEND); //DEBUG
invalidateHttpCache(); invalidateHttpCache();
} else { } else {
$res = array (); $res = array ();
$res['status'] = 'failure'; $res['status'] = 'failure';
$res['reason'] = $reason == '' ? Minz_Translate::t ('invalid_login') : $reason; $res['reason'] = $reason == '' ? Minz_Translate::t ('invalid_login') : $reason;
Minz_Log::record ('Persona: ' . $res['reason'], Minz_Log::WARNING); Minz_Log::record ('Persona: ' . $res['reason'], Minz_Log::WARNING);
file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' Failure=' . print_r($res, true) . "\n", FILE_APPEND); //DEBUG
} }
header('Content-Type: application/json; charset=UTF-8'); header('Content-Type: application/json; charset=UTF-8');

5
app/FreshRSS.php
Unescape View File

@ -11,6 +11,7 @@ class FreshRSS extends Minz_FrontController {
} }
private function accessControl($currentUser) { private function accessControl($currentUser) {
file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' authType=' . Minz_Configuration::authType() . "\n", FILE_APPEND); //DEBUG
if ($currentUser == '') { if ($currentUser == '') {
switch (Minz_Configuration::authType()) { switch (Minz_Configuration::authType()) {
case 'http_auth': case 'http_auth':
@ -18,12 +19,15 @@ class FreshRSS extends Minz_FrontController {
$loginOk = $currentUser != ''; $loginOk = $currentUser != '';
break; break;
case 'persona': case 'persona':
file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' Persona access control' . "\n", FILE_APPEND); //DEBUG
$loginOk = false; $loginOk = false;
$email = filter_var(Minz_Session::param('mail'), FILTER_VALIDATE_EMAIL); $email = filter_var(Minz_Session::param('mail'), FILTER_VALIDATE_EMAIL);
file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' Persona email=' . Minz_Session::param('mail') . ', filtered_email=' . $email . "\n", FILE_APPEND);
if ($email != '') { //TODO: Remove redundancy with indexController if ($email != '') { //TODO: Remove redundancy with indexController
$personaFile = DATA_PATH . '/persona/' . $email . '.txt'; $personaFile = DATA_PATH . '/persona/' . $email . '.txt';
if (($currentUser = @file_get_contents($personaFile)) !== false) { if (($currentUser = @file_get_contents($personaFile)) !== false) {
$currentUser = trim($currentUser); $currentUser = trim($currentUser);
file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' Persona user from file=' . $currentUser . "\n", FILE_APPEND); //DEBUG
$loginOk = true; $loginOk = true;
} }
} }
@ -77,6 +81,7 @@ class FreshRSS extends Minz_FrontController {
$loginOk = strcasecmp($currentUser, httpAuthUser()) === 0; $loginOk = strcasecmp($currentUser, httpAuthUser()) === 0;
break; break;
case 'persona': case 'persona':
file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' Persona compare session_email=' . Minz_Session::param('mail') . ' with config_email=' . $this->conf->mail_login . "\n", FILE_APPEND); //DEBUG
$loginOk = strcasecmp(Minz_Session::param('mail'), $this->conf->mail_login) === 0; $loginOk = strcasecmp(Minz_Session::param('mail'), $this->conf->mail_login) === 0;
break; break;
case 'none': case 'none':

Write Preview
Loading…
Cancel
Save