Bug 237100 – Restrict supported image decoding types when in CaptivePortal mode

• Component: WebKit Misc.
• Status: RESOLVED INVALID

[Brent Fulgham]

Adopt the CGImageSourceSetAllowableTypes SPI to prevent CoreGraphics from running image decoders for riskier image types.

[Radar WebKit Bug Importer]

<rdar://problem/89369518>

[Brent Fulgham]

Created attachment 453010 [details]
Patch

[Brent Fulgham]

Created attachment 453023 [details]
Patch

[Darin Adler]

Comment on attachment 453023 [details]
Patch

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

> Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:248
> +#if HAVE(CGIMAGESOURCE_WITH_SET_ALLOWABLE_TYPES)
> +static NSArray *UTITypes()
> +{
> +    return @[@"public.jpeg",
> +        @"public.png",
> +        @"org.webmproject.webp",
> +        @"com.compuserve.gif",
> +    ];
> +}
> +#endif

Does not seem like we need a separate function for this.

    NSArray *types = @[
        @"public.jpeg",
        @"public.png",
        @"org.webmproject.webp",
        @"com.compuserve.gif",
    ];
    auto status = CGImageSourceSetAllowableTypes(bridge_cast(types));

Could even use auto or constexpr.

> Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:255
> +#if HAVE(CGIMAGESOURCE_WITH_SET_ALLOWABLE_TYPES)

I think we should format the #if differently. Strange to just check the boolean and then do nothing, so maybe we can put more of the function inside the #if, or put the #if at the call site too.

[Brent Fulgham]

See Bug 237120 for the actual issue.

[Brent Fulgham]

After reviewing this with the CoreGraphics/ImageIO team, we don't need to do this, as we have already adopted the necessary entitlements to limit decoders in Captive Portal mode.

The cause of PDF images still appearing is a separate issue, which requires a different fix (see Bug 237120).