hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused gatekeep checks

Browse Source
This commit is contained in:
Romain Neutron
2012-10-04 16:55:30 +02:00
parent 4a79bdeb09
commit 0cb56a6fbd
1 changed files with 0 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
lib/classes/gatekeeper.class.php
View File

@@ -76,10 +76,6 @@ class gatekeeper
*/
public function check_directory(Request $request)
{
if (http_request::is_command_line()) {
return;
}
if (isset($_SERVER['PHP_SELF']) && trim($_SERVER['PHP_SELF'])) {
$this->_PHP_SELF = $_SERVER['PHP_SELF'];
@@ -95,18 +91,8 @@ class gatekeeper
$this->_script_name = array_pop($php_script);
}
if (!$this->app->isAuthenticated()) {
try {
$auth = new Session_Authentication_PersistentCookie($this->app, $request->cookies->get('persistent'));
$this->app->openAccount($auth, $auth->getSessionId());
} catch (Exception $e) {
}
}
if (!$this->app->isAuthenticated()) {
switch ($this->_directory) {
case 'prod':
case 'client':
$this->give_guest_access();
if ($request->isXmlHttpRequest()) {
@@ -126,62 +112,17 @@ class gatekeeper
case 'report':
phrasea::redirect('/login/?redirect=' . $_SERVER['REQUEST_URI']);
break;
case 'login':
if ($appbox->need_major_upgrade()) {
phrasea::redirect("/setup/");
}
return;
break;
case 'api':
return;
break;
case 'include':
case '':
return;
case 'setup':
if ($this->app['phraseanet.appbox']->upgradeavailable()) {
return;
} else {
phrasea::redirect('/login/');
}
break;
default:
phrasea::redirect('/login/');
break;
case 'lightbox':
$this->token_access();
if (!$this->app->isAuthenticated()) {
phrasea::redirect('/login/?redirect=' . $_SERVER['REQUEST_URI']);
}
break;
}
} elseif ($_SERVER['PHP_SELF'] === '/login/logout/') {
return;
}
switch ($this->_directory) {
case 'admin':
case 'taskmanager':
if (!$this->app['phraseanet.user']->ACL()->has_access_to_module('admin')) {
phrasea::headers(403);
}
break;
case 'thesaurus2':
if (!$this->app['phraseanet.user']->ACL()->has_access_to_module('thesaurus')) {
phrasea::headers(403);
}
break;
case 'client':
case 'prod':
case 'lightbox':
$this->token_access();
break;
case 'upload':
if (!$this->app['phraseanet.user']->ACL()->has_right('addrecord')) {
phrasea::headers(403);
}
break;
case 'report':
if (!$this->app['phraseanet.user']->ACL()->has_right('report')) {
phrasea::headers(403);
@@ -220,51 +161,6 @@ class gatekeeper
return $this;
}
/**
* If token is present in URL, sign on and redirect
*
* @return gatekeeper
*/
protected function token_access()
{
$request = new http_request();
$parm = $request->get_parms('LOG');
if (is_null($parm["LOG"])) {
return $this;
}
try {
if ($this->app->isAuthenticated()) {
$this->app->closeAccount();
}
$auth = new Session_Authentication_Token($this->app, $parm['LOG']);
$this->app->openAccount($auth);
} catch (Exception $e) {
return phrasea::redirect("/login/?error=" . urlencode($e->getMessage()));
}
try {
$datas = random::helloToken($this->app, $parm['LOG']);
switch ($datas['type']) {
default:
return $this;
break;
case \random::TYPE_FEED_ENTRY:
return phrasea::redirect("/lightbox/feeds/entry/" . $datas['datas'] . "/");
break;
case \random::TYPE_VALIDATE:
case \random::TYPE_VIEW:
return phrasea::redirect("/lightbox/validate/" . $datas['datas'] . "/");
break;
}
} catch (Exception_NotFound $e) {
}
return $this;
}
/**
* Checks if session is open