Bug 157252 – CSP: Add workaround for XtraMath

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

[Daniel Bates]

Similar to the purpose of bug #157005, the app XtraMath depends on * matching an arbitrary protocol. Following bug #154122, we restrict matching of * to protocols HTTP, HTTPS in most circumstances. Add a app-specific workaround for this XtraMath.

<rdar://problem/25881955>

[Daniel Bates]

Created attachment 277880 [details]
Patch

[Darin Adler]

Comment on attachment 277880 [details]
Patch

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

Was about to say review+, but Andy beat me to it.

I do have this one comment:

> Source/WebKit/mac/WebView/WebView.mm:868
>  static bool shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol()

We should consider grouping these functions that make decisions about these kinds of quirks and workarounds in a header analogous to the RuntimeApplicationChecks one. This header would never mention specific application but would just list all the different quirks. The implementation file would contain all the expressions used to decide when each quirk applies, and comments about why each implements the right policy.

The implementations of the quirks would continue to be distributed throughout the code, but the policy of which quirks apply when would be grouped together.

[Daniel Bates]

(In reply to comment #2)
> [...]
> I do have this one comment:
> 
> > Source/WebKit/mac/WebView/WebView.mm:868
> >  static bool shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol()
> 
> We should consider grouping these functions that make decisions about these
> kinds of quirks and workarounds in a header analogous to the
> RuntimeApplicationChecks one. This header would never mention specific
> application but would just list all the different quirks. The implementation
> file would contain all the expressions used to decide when each quirk
> applies, and comments about why each implements the right policy.
> 
> The implementations of the quirks would continue to be distributed
> throughout the code, but the policy of which quirks apply when would be
> grouped together.

I hope you do not mind that I defer such work to bug #157267 and keep this bug focused on the workaround.

[Daniel Bates]

Comment on attachment 277880 [details]
Patch

Clearing flags on attachment: 277880

Committed r200323: <http://trac.webkit.org/changeset/200323>

[Daniel Bates]

All reviewed patches have been landed.  Closing bug.

[Timothy Hatcher]

Comment on attachment 277880 [details]
Patch

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

> Source/WebKit/mac/WebView/WebView.mm:871
> +    static bool shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol = (IOSApplication::isEcobee() || IOSApplication::isQuora() || IOSApplication::isXtraMath()) && !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_CONTENT_SECURITY_POLICY_SOURCE_STAR_PROTOCOL_RESTRICTION);

If we run into more apps doing this, I think we should consider dropping the bundle checks and just allow star to match any protocol for any app linked on older WebKit versions.