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

Icinga\Repository::retrieveGeneralizedTime(): comply w/ RFC4517

Browse Source 
refs #2816
This commit is contained in:
Alexander A. Klimov 2018-01-17 18:14:18 +01:00
parent 0abff5f643
commit fbffc42b96
1 changed files with 82 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
library/Icinga/Repository/Repository.php
View File

@ -211,6 +211,36 @@ abstract class Repository implements Selectable
*/ */
protected $columnAliasMap; protected $columnAliasMap;
/**
* "3.3.13. Generalized Time" syntax as specified by IETF RFC 4517
*
* @var string
*
* @see https://tools.ietf.org/html/rfc4517#section-3.3.13
*/
protected $generalizedTimePattern = <<<EOD
/\A
(?P<YmdH>
[0-9]{4} # century year
(?:0[1-9]|1[0-2]) # month
(?:0[1-9]|[12][0-9]|3[0-1]) # day
(?:[01][0-9]|2[0-3]) # hour
)
(?:
(?P<i>[0-5][0-9]) # minute
(?P<s>[0-5][0-9]|60)? # second or leap-second
)?
(?:[.,](?P<frac>[0-9]+))? # fraction
(?P<tz> # g-time-zone
Z
|
[-+]
(?:[01][0-9]|2[0-3]) # hour
(?:[0-5][0-9])? # minute
)
\z/x
EOD;
/** /**
* Create a new repository object * Create a new repository object
* *
@ -929,6 +959,8 @@ abstract class Repository implements Selectable
* @param string|null $value * @param string|null $value
* *
* @return int * @return int
*
* @see https://tools.ietf.org/html/rfc4517#section-3.3.13
*/ */
protected function retrieveGeneralizedTime($value) protected function retrieveGeneralizedTime($value)
{ {
@ -936,21 +968,57 @@ abstract class Repository implements Selectable
return $value; return $value;
} }
if (($dateTime = DateTime::createFromFormat('YmdHis.uO', $value)) !== false $matches = array();
|| ($dateTime = DateTime::createFromFormat('YmdHis.uZ', $value)) !== false
|| ($dateTime = DateTime::createFromFormat('YmdHis.u', $value)) !== false if (preg_match($this->generalizedTimePattern, $value, $matches)) {
|| ($dateTime = DateTime::createFromFormat('YmdHis', $value)) !== false $dateTimeRaw = $matches['YmdH'];
|| ($dateTime = DateTime::createFromFormat('YmdHi', $value)) !== false $dateTimeFormat = 'YmdH';
|| ($dateTime = DateTime::createFromFormat('YmdH', $value)) !== false
) { if ($matches['i'] !== '') {
return $dateTime->getTimeStamp(); $dateTimeRaw .= $matches['i'];
} else { $dateTimeFormat .= 'i';
Logger::debug(sprintf(
'Failed to parse "%s" based on the ASN.1 standard (GeneralizedTime) in repository "%s".', if ($matches['s'] !== '') {
$value, $dateTimeRaw .= $matches['s'];
$this->getName() $dateTimeFormat .= 's';
)); $fractionOfSeconds = 1;
} else {
$fractionOfSeconds = 60;
}
} else {
$fractionOfSeconds = 3600;
}
$dateTimeFormat .= 'O';
if ($matches['tz'] === 'Z') {
$dateTimeRaw .= '+0000';
} else {
$dateTimeRaw .= $matches['tz'];
if (strlen($matches['tz']) === 3) {
$dateTimeRaw .= '00';
}
}
$dateTime = DateTime::createFromFormat($dateTimeFormat, $dateTimeRaw);
if ($dateTime !== false) {
$timestamp = $dateTime->getTimeStamp();
if (isset($matches['frac'])) {
$timestamp += (int) round((float) ('0.' . $matches['frac']) * $fractionOfSeconds);
}
return $timestamp;
}
} }
Logger::debug(sprintf(
'Failed to parse "%s" based on the ASN.1 standard (GeneralizedTime) in repository "%s".',
$value,
$this->getName()
));
} }
/** /**