catch errors when parsing calendar data for calendar query requests#6901
Merged
MorrisJobke merged 1 commit intomasterfrom Nov 27, 2017
Merged
catch errors when parsing calendar data for calendar query requests#6901MorrisJobke merged 1 commit intomasterfrom
MorrisJobke merged 1 commit intomasterfrom
Conversation
Codecov Report
@@ Coverage Diff @@
## master #6901 +/- ##
============================================
- Coverage 50.86% 50.85% -0.01%
- Complexity 24534 24538 +4
============================================
Files 1584 1584
Lines 93778 93803 +25
Branches 1358 1358
============================================
+ Hits 47696 47705 +9
- Misses 46082 46098 +16
|
tcitworld
reviewed
Oct 22, 2017
| // catch parsing errors | ||
| try { | ||
| $matches = $this->validateFilterForObject($row, $filters); | ||
| } catch(\Exception $ex) { |
Member
There was a problem hiding this comment.
Maybe catch only Sabre\VObject\ParseException ? Since it can also throw Sabre\DAV\Exception\NotImplemented and Sabre\DAV\Exception\BadRequest (inside Sabre\DAV\CalendarQueryValidator) which shouldn't be logged as an error.
Member
Author
There was a problem hiding this comment.
I was considering, but sadly it's not very well documented (at least i didn't find something), what exceptions can be thrown. In the bug report it was InvalidDataException.
And the pity is, that there is no real hierarchy but all inherit from \Exception
Member
There was a problem hiding this comment.
You could check against the known (base) classes and if it's an unkown once you just re-throw it.
nickvergessen
previously requested changes
Nov 1, 2017
| $matches = $this->validateFilterForObject($row, $filters); | ||
| } catch(\Exception $ex) { | ||
| $this->logger->error('Catched parsing exception for calendar data. This indicates invalid calendar data. URI:' . $row['uri']); | ||
| $this->logger->logException($ex); |
Member
There was a problem hiding this comment.
please combine those two:
$this->logger->logException($ex, [
'app' => 'dav',
'message' => 'Catched parsing exception for calendar data. This indicates invalid calendar data. URI:' . $row['uri'],
);
georgehrke
force-pushed
the
bugfix/4014/catch_parsing_error
branch
2 times, most recently
from
172eb88 to
1b9dfa3
Compare
Member
Author
|
done |
nickvergessen
approved these changes
Nov 13, 2017
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
MorrisJobke
force-pushed
the
bugfix/4014/catch_parsing_error
branch
from
1b9dfa3 to
ea117ba
Compare
Member
|
Fixed merge conflict in |
MorrisJobke
approved these changes
Nov 27, 2017
MorrisJobke
added
4. to release
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixes #4014