holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Admin: clear cache after admin-cli.php commands, so they become active automatically

Browse Source 
and allow to send json requests with basic auth credentials without an active session, used here to clear cache via webservice call, as we can NOT clear shared memmory cache of webserver from cli
This commit is contained in:
Ralf Becker 2016-04-27 10:34:57 +00:00
parent 9f8f8891fb
commit 07a5224025
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
admin/admin-cli.php
View File

@ -11,6 +11,8 @@
* @version $Id$ * @version $Id$
*/ */
use EGroupware\Api;
chdir(dirname(__FILE__)); // to enable our relative pathes to work chdir(dirname(__FILE__)); // to enable our relative pathes to work
if (php_sapi_name() !== 'cli') // security precaution: forbit calling admin-cli as web-page if (php_sapi_name() !== 'cli') // security precaution: forbit calling admin-cli as web-page
@ -113,7 +115,7 @@ exit(0);
*/ */
function run_command(admin_cmd $cmd) function run_command(admin_cmd $cmd)
{ {
global $arguments; global $arguments,$user,$arg0s,$domain;
$skip_checks = false; $skip_checks = false;
while ($arguments && ($extra = array_shift($arguments))) while ($arguments && ($extra = array_shift($arguments)))
@ -168,6 +170,24 @@ function run_command(admin_cmd $cmd)
//_debug_array($cmd); //_debug_array($cmd);
try { try {
print_r($cmd->run($time, true, $skip_checks, $dry_run)); print_r($cmd->run($time, true, $skip_checks, $dry_run));
// cli can NOT clear instance cache of APC(u), as cli uses different shared memory then webserver
// --> we use a webservice call to clear cache (might fail if no domain in specified in webserver_url or on command line)
if (!$dry_run)
{
$url = $GLOBALS['egw_info']['server']['webserver_url'].'/json.php?menuaction=admin.admin_hooks.ajax_clear_cache';
if ($url[0] == '/') $url = 'http://'.(!empty($domain) && $domain != 'default' ? $domain : 'localhost').$url;
$data = file_get_contents($url, false, Api\Framework::proxy_context($user,$arg0s[1]));
error_log("file_get_contents('$url') returned ".array2string($data));
if ($data && strpos($data, '"success"') !== false)
{
error_log('Instance cache cleared.');
}
else
{
error_log('You might need to clear the cache for changes to be visiable: Admin >> Clear cache!');
}
}
} }
catch (egw_exception_wrong_userinput $e) { catch (egw_exception_wrong_userinput $e) {
echo "\n".$e->getMessage()."\n\n"; echo "\n".$e->getMessage()."\n\n";

10
json.php
View File

@ -10,17 +10,23 @@
* @version $Id$ * @version $Id$
*/ */
use EGroupware\Api;
use EGroupware\Api\Json; use EGroupware\Api\Json;
/** /**
* callback if the session-check fails, redirects to login.php * callback if the session-check fails, redirects to login.php, if no valid basic auth credentials given
* *
* @param array &$anon_account anon account_info with keys 'login', 'passwd' and optional 'passwd_type' * @param array &$anon_account anon account_info with keys 'login', 'passwd' and optional 'passwd_type'
* @return boolean|string true if we allow anon access and anon_account is set, a sessionid or false otherwise * @return boolean|string true if we allow anon access and anon_account is set, a sessionid or false otherwise
*/ */
function login_redirect(&$anon_account) function login_redirect(&$anon_account)
{ {
unset($anon_account); // allow to make json calls via basic auth
if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW']) &&
($session_id = Api\Header\Authenticate::autocreate_session_callback($anon_account)))
{
return $session_id;
}
Json\Request::isJSONRequest(true); // because egw_json_request::parseRequest() is not (yet) called Json\Request::isJSONRequest(true); // because egw_json_request::parseRequest() is not (yet) called
$response = Json\Response::get(); $response = Json\Response::get();
$response->redirect($GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=10', true); $response->redirect($GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=10', true);