1399372 - ChannelMediaResource::OnDataAvailable() should update the principal only once

Status: RESOLVED FIXED

(Core :: Audio/Video: Playback, enhancement, P3)

Description

[JW Wang [:jwwang] [:jw_wang]]

One ChannelMediaResource::OnDataAvailable() call might result in multiple calls into MediaCacheStream::NotifyDataReceived() which will update the principal of the stream.

http://searchfox.org/mozilla-central/rev/e76c0fee79a34a3612740b33508276f4b37c3ee8/dom/media/MediaCache.cpp#1891

We should just update the principal only once per OnDataAvailable() call.

Comment 1

[JW Wang [:jwwang] [:jw_wang]]

Attachment: Bug 1399372 - update the principal only once per OnDataAvailable() call.

Review commit: https://reviewboard.mozilla.org/r/179582/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/179582/

Comment 2

[Chris Pearce [:cpearce (Not reading bugmail)]]

Comment on attachment 8907903 [details]
Bug 1399372 - update the principal only once per OnDataAvailable() call.

https://reviewboard.mozilla.org/r/179582/#review184798

::: dom/media/MediaCache.h:265
(Diff revision 1)
>    // Notifies the cache that data has been received. The stream already
>    // knows the offset because data is received in sequence and
>    // the starting offset is known via NotifyDataStarted or because
>    // the cache requested the offset in
>    // ChannelMediaResource::CacheClientSeek, or because it defaulted to 0.
>    // We pass in the principal that was used to load this data.

The comment here still mentions the principal.

::: dom/media/MediaResource.cpp:469
(Diff revision 1)
>    // This might happen off the main thread.
>    NS_ASSERTION(mChannel.get() == aRequest, "Wrong channel!");
>  
> +  // Update principals before putting the data in the cache. This is important,
> +  // we want to make sure all principals are updated before any consumer.
> +  // TODO: Handle the case where OnDataAvailable() runs off the main thread.

You clipped off "// can see the new data." from the end of this comment when you moved it. Please can you add it back, as I want to be sure we leave the warning here as we don't want our developers accidentally adding privacy leaks to the code.

Comment 3

[JW Wang [:jwwang] [:jw_wang]]

Comment on attachment 8907903 [details]
Bug 1399372 - update the principal only once per OnDataAvailable() call.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/179582/diff/1-2/

Comment 4

[JW Wang [:jwwang] [:jw_wang]]

Thanks!

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/9b145214faae
update the principal only once per OnDataAvailable() call. r=cpearce

Comment 6

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/9b145214faae