Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow unknown value data types for VALUE #674

Merged

Conversation

heiglandreas
Copy link
Contributor

Currently value-types that are not known will cause the parser to throw an InvalidDataException. In RFC5545, Section 3.2.20 is described though that the allowed values for the "VALUE" data-type can include x-names and iana-tokens. These can be any string that might - or might not - be understood by the parser. The description clearly states that "Applications MUST preserve the value data for x-name and iana-token value that they don't recognize without attempting to interpret or parse the value data"

This means that the content of the "VALUE" part should not be interpreted at all the moment the parser doesn't find a match in the corresponding mapping table.

But it should also not hard-fail when someone sets a VALUE that might not be understood. In such a case the default should be used instead.

Currently value-types that are not known will cause the parser to throw
an InvalidDataException. In RFC5545, Section 3.2.20 is described though
that the allowed values for the "VALUE" data-type can include x-names and
iana-tokens. These can be any string that might - or might not - be
understood by the parser. The description clearly states that
"Applications MUST preserve the value data for x-name and iana-token
value that they don't recognize without attempting to interpret or parse
the value data"

This means that the content of the "VALUE" part should not be
interpreted at all the moment the parser doesn't find a match in the
corresponding mapping table.

But it should also not hard-fail when someone sets a VALUE that might
not be understood. In such a case the default should be used instead.
Copy link

codecov bot commented Sep 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.78%. Comparing base (57492ab) to head (1f22f4a).
Report is 16 commits behind head on master.

Additional details and impacted files
@@             Coverage Diff              @@
##             master     #674      +/-   ##
============================================
+ Coverage     98.76%   98.78%   +0.02%     
- Complexity     1874     1875       +1     
============================================
  Files            71       71              
  Lines          5343     5271      -72     
============================================
- Hits           5277     5207      -70     
+ Misses           66       64       -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@heiglandreas
Copy link
Contributor Author

Background is a feed we got from a server that uses a DTSTAMP;VALUE=DATETIME:20240101T000000Z (note the DATETIME instead of DATE-TIME).

The whole feed looks like this:

BEGIN:VCALENDAR
PRODID;X-RICAL-TZSOURCE=TZINFO:-//Application//Calendar//EN
CALSCALE:GREGORIAN
VERSION:2.0
BEGIN:VEVENT
DTSTAMP;VALUE=DATETIME:20240101T000000Z
DTSTART;VALUE=DATE:20240910
DTEND;VALUE=DATE:20240912
UID:[email protected]
SUMMARY:Summary
END:VEVENT
END:VCALENDAR

Verifying this with the ICS-Validator at https://icalendar.org/validator.html results in "Success! No errors found"

grafik

Yet with the current implementation of the library importing this feed will fail due to the unknown DATETIME value.

Copy link
Contributor

@phil-davis phil-davis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add unit test cases to cover the changed/new behavior.
That will also make it easier to understand exactly what code-flow is needed for the various data combinations.

lib/Document.php Outdated Show resolved Hide resolved
THis adds a test to assure that an unknown value is skipped. The value
`DATETIME` is not known. It should be `DATE-TIME`. Adding the value of
DATETIME previopusly resulted in an Error. This now tests that it
actually works and that the unknown parameter is actually also kept as
specified by the RFC
This will remove the necesity to calculate the class name twice in
immediate succession should the declared valuetype not be set.
if (isset($parameters['VALUE'])) {
$class = $this->getClassNameForPropertyValue($parameters['VALUE']);
if (is_null($class)) {
throw new InvalidDataException('Unsupported VALUE parameter for '.$name.' property. You supplied "'.$parameters['VALUE'].'"');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code used to be able to throw this exception if $parameters['VALUE'] had an invalid value (did not end up matching to a class).
Now, if $parameters['VALUE'] is not valid, the code will end up doing:
$class = $this->getClassNameForPropertyName($name);

That is, it will just ignore the invalid value, and use what has been passed in $name.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am surprised that no unit test has failed. I guess that there is not a unit test that covers the (now deleted) InvalidDataException

Copy link
Contributor Author

@heiglandreas heiglandreas Oct 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. As far as I see this part of RFC5545, Section 3.2.20 (Value Data Type)

Applications MUST preserve the value data for x-name and iana-token values that they don't recognize without attempting to interpret or parse the value data.

we need to allow to keep - but not interpret - VALUE information that we don't understand. That didn't work previously due to the Exception. That broke the whole process of interpretation.

The Exception has been introduced with c20acd7 about 8 years ago to have "A better error message for unsupported VALUE parameters." but even then there should have been no Exception as unsupported VALUE parameters IMO do not pose an error condition. They should not be interpreted, yes (what they are now), but not break the process but also be preserved for other tools to interpret that might be able to understand it.

That is the reason why the current process then falls back to the default value when "an invalid" - let's rephrase that to "a not recognized" - value is encountered.

@phil-davis phil-davis merged commit c8ef5fd into sabre-io:master Oct 22, 2024
8 checks passed
@phil-davis
Copy link
Contributor

Backport to 4.5 branch is PR #699

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants