Support whitelist for xml document types #183
Merged
Conversation
This file contains 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
|
@schmittjoh should I pull your automatic review ? |
|
Ho, and I forgot to update two old tests too... |
|
@michelsalib most of the automatic changes are right. I'm not sure about the one modifying the call to |
|
Thanks @stof, I will update tomorrow |
| @@ -67,7 +68,13 @@ public function prepare($data) | |||
| $dom->loadXML($data); | |||
| foreach ($dom->childNodes as $child) { | |||
| if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { | |||
| throw new \InvalidArgumentException('Document types are not allowed.'); | |||
| $internalSubset = str_replace(PHP_EOL, '', $child->internalSubset); | |||
| if (!in_array($internalSubset, $this->documentWhitelist)) { | |||
There was a problem hiding this comment.
Could you add true as third arg here?
|
@schmittjoh I wanted to have your feedback about the configuration part that I added. Especially about namings. |
| <visitors> | ||
| <xml> | ||
| <document_whitelist> | ||
| <!DOCTYPE authorized SYSTEM "http://some_url"> |
There was a problem hiding this comment.
Surely, actually I never used xml configuration in such a way, do you know how it should look like?
|
@schmittjoh Done ! |
schmittjoh
added a commit
that referenced
this pull request
Oct 3, 2012
Support whitelist for xml document types
|
Thanks, merged! |
|
You are very welcome ;) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As discussed here (5a9b7e6), here is a proposal for a whitelist support concerning xml deserialization with document types.
I updated the doc to give an example: