Bug 146079 – [Content Extensions] Fail to parse invalid arrays

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

[Alex Christensen]

Right now there are some cases where we parse but ignore invalid arrays.  We should not succeed to parse these rules to prevent confusing developers.

[Alex Christensen]

Created attachment 255039 [details]
Patch

[Benjamin Poulain]

Comment on attachment 255039 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=255039&action=review

> Source/WebCore/contentextensions/ContentExtensionParser.cpp:138
> +    } else if (!resourceTypeValue.isUndefined())

else if (resourceTypeValue)?

> Source/WebCore/contentextensions/ContentExtensionParser.cpp:146
> +    } else if (!loadTypeValue.isUndefined())

ditto

> Source/WebCore/contentextensions/ContentExtensionParser.cpp:158
> +    } else if (!ifDomain.isUndefined())

ditto

> Source/WebCore/contentextensions/ContentExtensionParser.cpp:171
> +    } else if (!unlessDomain.isUndefined())

ditto

> Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:820
> +    checkCompilerError("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"webkit.org\",\"resource-type\":\"document\"}}]",

Test passing null and undefined arguments? Maybe an array like object too?

> Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:851
> +    checkCompilerError("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"webkit.org\",\"if-domain\":5}}]", ContentExtensions::ContentExtensionError::JSONInvalidDomainList);
> +    checkCompilerError("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"webkit.org\",\"unless-domain\":5}}]", ContentExtensions::ContentExtensionError::JSONInvalidDomainList);
> +    checkCompilerError("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"webkit.org\",\"if-domain\":5,\"unless-domain\":5}}]", ContentExtensions::ContentExtensionError::JSONInvalidDomainList);

ditto

[Alex Christensen]

(In reply to comment #2)
> > Source/WebCore/contentextensions/ContentExtensionParser.cpp:138
> > +    } else if (!resourceTypeValue.isUndefined())
> 
> else if (resourceTypeValue)?
Nope.  That means something else.
> > Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:820
> > +    checkCompilerError("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"webkit.org\",\"resource-type\":\"document\"}}]",
> 
> Test passing null and undefined arguments? Maybe an array like object too?
Done.

[Alex Christensen]

http://trac.webkit.org/changeset/185683