Warn about asterisk being used in media type. #182
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
kingthorin
reviewed
Jun 6, 2017
| @@ -14,7 +14,8 @@ | |||
| + "|scripts|top-navigation)$"); | |||
| public static final Pattern requireSriForEnumeratedTokenPattern = Pattern | |||
| .compile("^(?:script|style)$", Pattern.CASE_INSENSITIVE); | |||
| public static final Pattern mediaTypePattern = Pattern.compile("^(?<type>[^/]+)/(?<subtype>[^/]+)$"); | |||
| public static final Pattern mediaTypePattern = Pattern.compile("^(?<type>[a-zA-Z0-9!#$%^&*\\-_+{}|'.`~]+)/(?<subtype>[a-zA-Z0-9!#$%^&*\\-_+{}|'.`~]+)$"); | |||
| // public static final Pattern mediaTypePattern = Pattern.compile("[a-zA-Z0-9!#$%^&\\*-_\\+{}\\|'.`~]+/[a-zA-Z0-9!#$%^&\\*-_\\+{}\\|'.`~]+"); | |||
There was a problem hiding this comment.
Drop this commented one?
| @@ -252,6 +252,8 @@ private boolean eat(@Nonnull Class<? extends Token> c) { | |||
| if (mediaTypes.isEmpty()) { | |||
| this.error(token, "The media-type-list must contain at least one media-type."); | |||
| throw INVALID_MEDIA_TYPE_LIST; | |||
| } else if (mediaTypes.stream().anyMatch(x -> x.matchesTypeOrSubType("*"))) { | |||
| this.warn(token,"`*` is allowed character in media type which will be literally matched. Make sure it not an attempt to match any."); | |||
There was a problem hiding this comment.
Make sure it not an attempt to match any.
Missing an "is" in there. Also if the user/dev does want to define "any" what should they be using? Or is it not possible? Either way, some clarity or a suggestion might help...
[The test will need to be updated to match whatever change is made here...]
There was a problem hiding this comment.
Thanks! Addressed comments.
| @@ -25,6 +25,10 @@ public boolean matchesMediaType(@Nonnull MediaType mediaType) { | |||
| return this.type.equalsIgnoreCase(mediaType.type) && this.subtype.equalsIgnoreCase(mediaType.subtype); | |||
| } | |||
|
|
|||
| public boolean matchesTypeOrSubType(@Nonnull String str) { | |||
There was a problem hiding this comment.
I don't like this function. It's not generally useful. Just use x.type.equals("*") || x.subtype.equals("*").
| @@ -14,7 +14,7 @@ | |||
| + "|scripts|top-navigation)$"); | |||
| public static final Pattern requireSriForEnumeratedTokenPattern = Pattern | |||
| .compile("^(?:script|style)$", Pattern.CASE_INSENSITIVE); | |||
| public static final Pattern mediaTypePattern = Pattern.compile("^(?<type>[^/]+)/(?<subtype>[^/]+)$"); | |||
| public static final Pattern mediaTypePattern = Pattern.compile("^(?<type>[a-zA-Z0-9!#$%^&*\\-_+{}|'.`~]+)/(?<subtype>[a-zA-Z0-9!#$%^&*\\-_+{}|'.`~]+)$"); | |||
There was a problem hiding this comment.
Add comment with link to grammar/spec and the name of the production this is supposed to match.
michaelficarra
approved these changes
Jun 27, 2017
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.
fixes #181