tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 08:14:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

CLI/Webserver Setup: Fix argument sanity checks

Browse Source 
refs #6120
This commit is contained in:
Eric Lippmann 2014-11-13 13:30:07 +01:00
parent 8594dc068a
commit e0f6ce36ea
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/setup/application/clicommands/ConfigCommand.php
View File

@ -100,11 +100,15 @@ class ConfigCommand extends Command
} catch (ProgrammingError $e) { } catch (ProgrammingError $e) {
$this->fail($this->translate('Unknown type') . ': ' . $type); $this->fail($this->translate('Unknown type') . ': ' . $type);
} }
if (($path = $this->params->get('path', '/icingaweb')) === null) { $path = $this->params->get('path', '/icingaweb');
$this->fail($this->translate('argument --path is mandatory.')); if (! is_string($path) || strlen(trim($path)) === 0) {
$this->fail($this->translate('The argument --path expects a URL path'));
} }
if (($documentRoot = $this->params->get('documentRoot', $webserver->getDocumentRoot())) === null) { $documentRoot = $this->params->get('documentRoot', $webserver->getDocumentRoot());
$this->fail($this->translate('argument --publicPath is mandatory.')); if (! is_string($documentRoot) || strlen(trim($documentRoot)) === 0) {
$this->fail($this->translate(
'The argument --documentRoot expects a directory from which the webserver will serve files'
));
} }
$webserver->setWebPath($path); $webserver->setWebPath($path);
$webserver->setDocumentRoot($documentRoot); $webserver->setDocumentRoot($documentRoot);