tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3706 from Icinga/fix/multiline-values-in-ini-files-broken-3705 

Fix multiline values in ini files broken
This commit is contained in:
Johannes Meyer 2019-04-05 08:44:46 +02:00 committed by GitHub
parent affed19536 f6f106faf2
commit ccc2f487f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 52 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/Icinga/File/Ini/Dom/Directive.php
View File

@ -157,11 +157,10 @@ class Directive
{
$str = trim($str);
$str = str_replace('\\', '\\\\', $str);
$str = str_replace('"', '\\"', $str);
$str = str_replace('"', '\"', $str);
$str = str_replace("\r", '\r', $str);
$str = str_replace("\n", '\n', $str);
// line breaks in the value should always match the current system EOL sequence
// to assure editable configuration files
$str = preg_replace("/(\r\n)|(\n)/", PHP_EOL, $str);
return $str;
}
}

11
library/Icinga/File/Ini/IniParser.php
View File

@ -284,8 +284,8 @@ class IniParser
*/
protected static function unescapeSectionName($str)
{
$str = str_replace('\\"', '"', $str);
$str = str_replace('\\;', ';', $str);
$str = str_replace('\"', '"', $str);
$str = str_replace('\;', ';', $str);
return str_replace('\\\\', '\\', $str);
}
@ -299,8 +299,11 @@ class IniParser
*/
protected static function unescapeOptionValue($str)
{
$str = str_replace('\\"', '"', $str);
$str = str_replace('\n', "\n", $str);
$str = str_replace('\r', "\r", $str);
$str = str_replace('\"', '"', $str);
$str = str_replace('\\\\', '\\', $str);
return str_replace('\\\\', '\\', $str);
return $str;
}
}

37
test/php/library/Icinga/File/Ini/IniParserTest.php
View File

@ -132,7 +132,42 @@ EOD;
$this->assertEquals(
2,
count(explode("\n", $doc->getSection('section')->getDirective('key1')->getValue())),
'IniParser does not recognize multi-line values'
'IniParser::parseIni does not recognize multi-line values'
);
(new IniWriter(Config::fromArray([
'section' => [
'key1' => "with some\nnewline in the value"
]
]), $this->tempFile))->write();
$doc = IniParser::parseIniFile($this->tempFile);
$this->assertEquals(
2,
count(explode("\n", $doc->getSection('section')->get('key1'))),
'IniParser::parseIniFile does not recognize multi-line values'
);
}
public function testEnvironmentVariableResolutionDoesNotWork()
{
(new IniWriter(Config::fromArray([
'section' => [
'key1' => '${PATH}_${APACHE_RUN_DIR}',
'key2' => '${APACHE_RUN_USER}'
]
]), $this->tempFile))->write();
$configObject = IniParser::parseIniFile($this->tempFile);
$this->assertEquals(
'${PATH}_${APACHE_RUN_DIR}',
$configObject->getSection('section')->get('key1'),
'IniParser::parseIniFile does resolve environment variables'
);
$this->assertEquals(
'${APACHE_RUN_USER}',
$configObject->getSection('section')->get('key2'),
'IniParser::parseIniFile does resolve environment variables'
);
}
}

7
test/php/library/Icinga/File/Ini/IniWriterTest.php
View File

@ -275,9 +275,14 @@ inkey' => 'blarg'
);
$rendered = $writer->render();
$this->assertRegExp(
'~linebreak\\\\nin line~',
$rendered,
'newlines in values are not escaped'
);
$this->assertEquals(
4,
count(explode("\n", $rendered)),
5,
'generated config should not contain more than three line breaks'
);
}