X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/a050a0d51152ae3f8eaf77017cfd07e6c6a64c6b..4949c8e357228fa7aaea909a411d912dba9b1782:/admin.php?ds=inline diff --git a/admin.php b/admin.php index 93b7d35..ea3e084 100644 --- a/admin.php +++ b/admin.php @@ -2,6 +2,7 @@ /* * Jirafeau, your web file repository * Copyright (C) 2015 Jerome Jutteau + * Copyright (C) 2023 Blackeye * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -44,7 +45,8 @@ if (php_sapi_name() == "cli") { } else { die("No command found. Should be admin.php .\n"); } -} else { +// Second check: Challenge by IP +} elseif (true === jirafeau_challenge_admin_ip($cfg, get_ip_address($cfg))) { /* Disable admin interface if we have a empty admin password. */ if (empty($cfg['admin_password']) && empty($cfg['admin_http_auth_user'])) { require(JIRAFEAU_ROOT . 'lib/template/header.php'); @@ -55,18 +57,19 @@ if (php_sapi_name() == "cli") { exit; } - /* Unlog if asked. */ + /* Logout if requested. */ if (jirafeau_admin_session_logged() && isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { - jirafeau_admin_session_end(); + jirafeau_session_end(); } if (!jirafeau_admin_session_logged()) { - /* Test HTTP authentification. */ + /* Test HTTP authentication. */ if (!empty($cfg['admin_http_auth_user']) && - $cfg['admin_http_auth_user'] == $_SERVER['PHP_AUTH_USER']) { + ((is_array($cfg['admin_http_auth_user']) && in_array($_SERVER['PHP_AUTH_USER'], $cfg['admin_http_auth_user'])) || + (($cfg['admin_http_auth_user'] == $_SERVER['PHP_AUTH_USER'])))) { jirafeau_admin_session_start(); } - /* Test web password authentification. */ + /* Test web password authentication. */ elseif (!empty($cfg['admin_password']) && isset($_POST['admin_password'])) { if ($cfg['admin_password'] === hash('sha256', $_POST['admin_password'])) { jirafeau_admin_session_start(); @@ -91,7 +94,7 @@ if (php_sapi_name() == "cli") { + size = "40" autocomplete = "current-password" /> @@ -117,9 +120,13 @@ if (php_sapi_name() == "cli") { /* Show admin interface if not downloading a file. */ if (!(isset($_POST['action']) && strcmp($_POST['action'], 'download') == 0)) { require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?>

(version )

(version )

'.t('SODIUM_UNAVAILABLE').'

'; + } - ?>
+ ?>
@@ -219,6 +226,19 @@ if (php_sapi_name() == "cli") { + + + + + + + + +
+ + + +
@@ -282,9 +302,14 @@ if (php_sapi_name() == "cli") { fclose($r); } exit; + } elseif (strcmp($_POST['action'], 'bug_report_info') == 0) { + echo jirafeau_admin_bug_report($cfg); } } require(JIRAFEAU_ROOT.'lib/template/footer.php'); +} else { + require(JIRAFEAU_ROOT . 'lib/template/header.php'); + jirafeau_fatal_error(t('ACCESS_KO'), $cfg); } ?>