Changeset 86506 in webkit


Ignore:
Timestamp:
May 15, 2011 9:18:03 AM (13 years ago)
Author:
eric.carlson@apple.com
Message:

2011-05-15 Eric Carlson <​eric.carlson@apple.com>

Reviewed by Maciej Stachowiak.

Use new AVAssetReferenceRestrictions to prevent cross site media references
​https://bugs.webkit.org/show_bug.cgi?id=60791
<rdar://problem/9374202>

Test: http/tests/media/video-cross-site.html

  • platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm: (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL): Set restriction

to prevent cross-domain references from being followed.

2011-05-15 Eric Carlson <​eric.carlson@apple.com>

Reviewed by Maciej Stachowiak.

Use new AVAssetReferenceRestrictions to prevent cross site media references
​https://bugs.webkit.org/show_bug.cgi?id=60791
<rdar://problem/9374202>

Add test for cross-domain QuickTime reference movie and test.

  • http/tests/media/resources/cross-site-reference.mov: Added.
  • http/tests/media/video-cross-site-expected.txt: Added.
  • http/tests/media/video-cross-site.html: Added.
  • platform/chromium/test_expectations.txt: Skipped, QuickTime reference movies not supported.
  • platform/gtk/Skipped: Ditto.
Location:
trunk
Files:
3 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r86505 r86506  
     12011-05-15  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Reviewed by Maciej Stachowiak.
     4
     5        Use new AVAssetReferenceRestrictions to prevent cross site media references
     6        https://bugs.webkit.org/show_bug.cgi?id=60791
     7        <rdar://problem/9374202>
     8
     9        Add test for cross-domain QuickTime reference movie and test.
     10
     11        * http/tests/media/resources/cross-site-reference.mov: Added.
     12        * http/tests/media/video-cross-site-expected.txt: Added.
     13        * http/tests/media/video-cross-site.html: Added.
     14        * platform/chromium/test_expectations.txt: Skipped, QuickTime reference movies not supported.
     15        * platform/gtk/Skipped: Ditto.
     16
    1172011-05-15  Sheriff Bot  <webkit.review.bot@gmail.com>
    218

  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r86496 r86506  
    488488// Doesn't apply to Chromium (QuickTime-specific behavior)
    489489WONTFIX SKIP : media/video-does-not-loop.html = TIMEOUT
     490
     491// QuickTime reference movies not supported.
     492WONTFIX SKIP : http/tests/media/video-cross-site.html = PASS FAIL TIMEOUT
    490493
    491494// Pre-HTML5 parser quirks only apply to the mac port for now.

  • trunk/LayoutTests/platform/gtk/Skipped

    r86487 r86506  
    528528http/tests/media/video-play-stall.html
    529529http/tests/media/video-seekable-stall.html
     530
     531# QuickTime reference movie not supported.
     532http/tests/media/video-cross-site.html
     533
    530534http/tests/misc/acid3.html
    531535http/tests/misc/link-rel-prefetch-and-subresource.html

  • trunk/Source/WebCore/ChangeLog

    r86503 r86506  
     12011-05-15  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Reviewed by Maciej Stachowiak.
     4
     5        Use new AVAssetReferenceRestrictions to prevent cross site media references
     6        https://bugs.webkit.org/show_bug.cgi?id=60791
     7        <rdar://problem/9374202>
     8
     9        Test: http/tests/media/video-cross-site.html
     10
     11        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm:
     12        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL): Set restriction
     13            to prevent cross-domain references from being followed.
     14
    1152011-05-15  Arno Renevier  <arno@renevier.net>
    216

  • trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm

    r86501 r86506  
    6868SOFT_LINK_POINTER(AVFoundation, AVPlayerItemDidPlayToEndTimeNotification, NSString *)
    6969SOFT_LINK_POINTER(AVFoundation, AVAssetImageGeneratorApertureModeCleanAperture, NSString *)
     70SOFT_LINK_POINTER(AVFoundation, AVURLAssetReferenceRestrictionsKey, NSString *)
    7071
    7172SOFT_LINK_CONSTANT(CoreMedia, kCMTimeZero, CMTime)
    … …  
    8485#define AVPlayerItemDidPlayToEndTimeNotification getAVPlayerItemDidPlayToEndTimeNotification()
    8586#define AVAssetImageGeneratorApertureModeCleanAperture getAVAssetImageGeneratorApertureModeCleanAperture()
     87#define AVURLAssetReferenceRestrictionsKey getAVURLAssetReferenceRestrictionsKey()
    8688
    8789#define kCMTimeZero getkCMTimeZero()
    … …  
    254256    setDelayCallbacks(true);
    255257
     258    NSDictionary *options = [NSDictionary dictionaryWithObjectsAndKeys:
     259                        [NSNumber numberWithInt:AVAssetReferenceRestrictionForbidCrossSiteReference], AVURLAssetReferenceRestrictionsKey,
     260                        nil];
    256261    NSURL *cocoaURL = KURL(ParsedURLString, url);
    257     m_avAsset.adoptNS([[AVURLAsset alloc] initWithURL:cocoaURL options:nil]);
     262    m_avAsset.adoptNS([[AVURLAsset alloc] initWithURL:cocoaURL options:options]);
     263
    258264    m_haveCheckedPlayability = false;
    259265
Note: See TracChangeset for help on using the changeset viewer.