stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-18 15:49:54 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change JavaScript reauthentication check to check via XHR.

Browse Source 
Benefit: Getting the real deadline this way, not interfering with an ongoing maintenance task.
This commit is contained in:
Andy Staudacher
2010-02-13 18:03:46 -08:00
parent 293fa80941
commit 995e592a3d
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/gallery/controllers/admin.php
View File

@@ -29,6 +29,9 @@ class Admin_Controller extends Controller {
}
public function __call($controller_name, $args) {
if (Input::instance()->get("reauth_check")) {
return self::_reauth_check();
}
if (auth::must_reauth_for_admin_area()) {
return self::_prompt_for_reauth($controller_name, $args);
}
@@ -54,6 +57,24 @@ class Admin_Controller extends Controller {
call_user_func_array(array(new $controller_name, $method), $args);
}
private static function _reauth_check() {
$session = Session::instance();
$last_active_auth = $session->get("active_auth_timestamp", 0);
$last_admin_area_activity = $session->get("admin_area_activity_timestamp", 0);
$admin_area_timeout = module::get_var("gallery", "admin_area_timeout");
$time_remaining = max($last_active_auth, $last_admin_area_activity) +
$admin_area_timeout - time();
$result = new stdClass();
$result->result = "success";
if ($time_remaining < 30) {
$result->location = url::abs_site("");
}
print json_encode($result);
}
private static function _prompt_for_reauth($controller_name, $args) {
if (request::method() == "get" && !request::is_ajax()) {
// Avoid anti-phishing protection by passing the url as session variable.