rooty/php-rrule
1
0
Fork 0
mirror of https://github.com/rlanvin/php-rrule.git synced 2025-02-20 09:54:16 +01:00
Code Issues Releases Activity

Make RFC parser more strict

Browse Source
This commit is contained in:
rlanvin 2017-04-11 14:20:42 +01:00
parent 9b4681793d
commit a6d01f4036
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
## [Unreleased]
- Add `explicit_infinite` and `dtstart` options to `humanReadable` to respectivity omit "forever" and the start date from the sentence.
- RFC parser will not accept multiple DTSTART or RRULE lines
## [1.4.2] - 2017-03-29

28
src/RRule.php
View File

@ -652,18 +652,22 @@ class RRule implements RRuleInterface
*
* @throws \InvalidArgumentException on error
*/
static public function parseRfcString($string)
static protected function parseRfcString($string)
{
$parts = array();
$string = trim($string);
$parts = array();
$dtstart_type = null;
$rfc_date_regexp = '/\d{6}(T\d{6})?Z?/'; // a bit loose
$rfc_date_regexp = '/\d{6}(T\d{6})?Z?/'; // regexp to check the date, a bit loose
$nb_dtstart = 0;
$nb_rrule = 0;
$lines = explode("\n", $string);
foreach ( explode("\n", $string) as $line ) {
foreach ( $lines as $line ) {
$line = trim($line);
if ( strpos($line,':') === false ) {
if ( sizeof($lines) > 1 ) {
throw new \InvalidArgumentException('Failed to parse RFC string, line is not starting with "RRULE:" in a multi-line RFC string');
}
$property_name = 'RRULE';
$property_value = $line;
}
@ -682,9 +686,12 @@ class RRule implements RRuleInterface
$property_params[$key] = $value;
}
switch ( $property_name ) {
switch ( strtoupper($property_name) ) {
case 'DTSTART':
case 'dtstart':
$nb_dtstart += 1;
if ( $nb_dtstart > 1 ) {
throw new \InvalidArgumentException('Too many DTSTART properties (there can be only one)');
}
$tmp = null;
$dtstart_type = 'date';
if ( ! preg_match($rfc_date_regexp, $property_value) ) {
@ -720,7 +727,10 @@ class RRule implements RRuleInterface
$parts['DTSTART'] = new \DateTime($property_value, $tmp);
break;
case 'RRULE':
case 'rrule':
$nb_rrule += 1;
if ( $nb_rrule > 1 ) {
throw new \InvalidArgumentException('Too many RRULE properties (there can be only one)');
}
foreach ( explode(';',$property_value) as $pair ) {
$pair = explode('=', $pair);
if ( ! isset($pair[1]) || isset($pair[2]) ) {

9
tests/RRuleTest.php
View File

@ -1942,6 +1942,15 @@ class RRuleTest extends PHPUnit_Framework_TestCase
array('DTSTART:19970512
RRULE:FREQ=YEARLY;UNTIL=19970512T090000Z'),
// missing RRULE
array("DTSTART:20060624\nFREQ=DAILY"),
// multiple RRULE or DTSTART
array("DTSTART:20060624\nRRULE:FREQ=DAILY\nRRULE:FREQ=YEARLY"),
array("DTSTART:20060624\nDTSTART:20060624\nRRULE:FREQ=YEARLY"),
// properties for Rset
array("DTSTART:20060624\nRRULE:FREQ=DAILY\nEXRULE:FREQ=YEARLY"),
);
}