Chromium Code Reviews
[email protected] (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1251)

Issue 985113003: Block platform verification and file IO in the CDM adapter if the CDM configuration disallows them. (Closed)

Created:
5 years, 9 months ago by sandersd (OOO until July 31)
Modified:
5 years, 9 months ago
CC:
binji+watch_chromium.org, bradnelson+warch_chromium.org, chromium-reviews, darin-cc_chromium.org, eme-reviews_chromium.org, feature-media-reviews_chromium.org, ihf+watch_chromium.org, jam, mcasas+watch_chromium.org, mkwst+moarreviews-renderer_chromium.org, mlamouri+watch-content_chromium.org, piman+watch_chromium.org, posciak+watch_chromium.org, raymes+watch_chromium.org, teravest+watch_chromium.org, tzik, wjia+watch_chromium.org, yusukes+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Block platform verification and file IO in the CDM adapter if the CDM configuration disallows access to them. Based on the configured value of distinctiveIdentifier and persistentState, we compute permission bits and pass them through PPAPI to the CDM adapter. This enables us to enforce 'not-allowed' configs even when user permission has been granted. BUG=487452 Committed: https://crrev.com/f92575a5735f510fb159f3f1928f614e31c8a0f8 Cr-Commit-Position: refs/heads/master@{#319798}

Patch Set 1 : #

Total comments: 29

Patch Set 2 : Address comments. #

Total comments: 2

Patch Set 3 : Typo #

Patch Set 4 : Comments #

Total comments: 2

Patch Set 5 : Fix DCHECK types. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+233 lines, -109 lines) Patch
M content/renderer/media/crypto/ppapi_decryptor.h View 2 chunks +4 lines, -0 lines 0 comments Download
M content/renderer/media/crypto/ppapi_decryptor.cc View 4 chunks +8 lines, -0 lines 0 comments Download
M content/renderer/media/crypto/render_cdm_factory.h View 1 chunk +2 lines, -0 lines 0 comments Download
M content/renderer/media/crypto/render_cdm_factory.cc View 1 2 3 4 chunks +10 lines, -0 lines 0 comments Download
M content/renderer/pepper/content_decryptor_delegate.h View 1 chunk +2 lines, -0 lines 0 comments Download
M content/renderer/pepper/content_decryptor_delegate.cc View 1 2 chunks +5 lines, -2 lines 0 comments Download
M media/base/cdm_factory.h View 1 chunk +2 lines, -0 lines 0 comments Download
M media/blink/cdm_session_adapter.h View 1 1 chunk +2 lines, -0 lines 0 comments Download
M media/blink/cdm_session_adapter.cc View 2 chunks +4 lines, -1 line 0 comments Download
M media/blink/webcontentdecryptionmodule_impl.h View 1 chunk +3 lines, -1 line 0 comments Download
M media/blink/webcontentdecryptionmodule_impl.cc View 2 chunks +5 lines, -2 lines 0 comments Download
M media/blink/webcontentdecryptionmoduleaccess_impl.cc View 1 2 3 4 3 chunks +19 lines, -2 lines 0 comments Download
M media/blink/webencryptedmediaclient_impl.h View 1 chunk +2 lines, -0 lines 0 comments Download
M media/blink/webencryptedmediaclient_impl.cc View 1 chunk +6 lines, -2 lines 0 comments Download
M media/cdm/default_cdm_factory.h View 1 chunk +2 lines, -0 lines 0 comments Download
M media/cdm/default_cdm_factory.cc View 1 chunk +2 lines, -0 lines 0 comments Download
M media/cdm/ppapi/cdm_adapter.h View 2 chunks +5 lines, -1 line 0 comments Download
M media/cdm/ppapi/cdm_adapter.cc View 1 5 chunks +41 lines, -27 lines 0 comments Download
M media/cdm/proxy_decryptor.cc View 1 2 1 chunk +7 lines, -0 lines 0 comments Download
M ppapi/api/private/ppp_content_decryptor_private.idl View 1 2 chunks +8 lines, -2 lines 0 comments Download
M ppapi/c/pp_macros.h View 1 chunk +2 lines, -2 lines 0 comments Download
M ppapi/c/private/ppp_content_decryptor_private.h View 1 4 chunks +14 lines, -7 lines 0 comments Download
M ppapi/cpp/private/content_decryptor_private.h View 1 chunk +3 lines, -1 line 0 comments Download
M ppapi/cpp/private/content_decryptor_private.cc View 2 chunks +6 lines, -2 lines 0 comments Download
M ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c View 5 chunks +50 lines, -50 lines 0 comments Download
M ppapi/proxy/ppapi_messages.h View 1 chunk +4 lines, -2 lines 0 comments Download
M ppapi/proxy/ppp_content_decryptor_private_proxy.h View 1 chunk +3 lines, -1 line 0 comments Download
M ppapi/proxy/ppp_content_decryptor_private_proxy.cc View 3 chunks +12 lines, -4 lines 0 comments Download

Messages

Total messages: 29 (9 generated)
sandersd (OOO until July 31)
5 years, 9 months ago (2015-03-06 21:12:03 UTC) #2
jrummell
lgtm w/nits. https://codereview.chromium.org/985113003/diff/20001/media/blink/cdm_session_adapter.h File media/blink/cdm_session_adapter.h (right): https://codereview.chromium.org/985113003/diff/20001/media/blink/cdm_session_adapter.h#newcode36 media/blink/cdm_session_adapter.h:36: bool allow_distincitve_identifier, s/citve/ctive/ https://codereview.chromium.org/985113003/diff/20001/media/blink/webcontentdecryptionmoduleaccess_impl.cc File media/blink/webcontentdecryptionmoduleaccess_impl.cc (right): ...
5 years, 9 months ago (2015-03-06 21:40:48 UTC) #4
ddorwin
LG overall. Thansk. https://codereview.chromium.org/985113003/diff/20001/content/renderer/media/crypto/ppapi_decryptor.cc File content/renderer/media/crypto/ppapi_decryptor.cc (right): https://codereview.chromium.org/985113003/diff/20001/content/renderer/media/crypto/ppapi_decryptor.cc#newcode27 content/renderer/media/crypto/ppapi_decryptor.cc:27: bool allow_distinctive_identifier, Lots of passing lots ...
5 years, 9 months ago (2015-03-06 21:42:54 UTC) #6
dmichael (off chromium)
https://codereview.chromium.org/985113003/diff/20001/ppapi/api/private/ppp_content_decryptor_private.idl File ppapi/api/private/ppp_content_decryptor_private.idl (right): https://codereview.chromium.org/985113003/diff/20001/ppapi/api/private/ppp_content_decryptor_private.idl#newcode37 ppapi/api/private/ppp_content_decryptor_private.idl:37: [in] PP_Bool allow_persistent_state); Are we trusting the plugin to ...
5 years, 9 months ago (2015-03-06 22:32:31 UTC) #7
sandersd (OOO until July 31)
https://codereview.chromium.org/985113003/diff/20001/content/renderer/media/crypto/ppapi_decryptor.cc File content/renderer/media/crypto/ppapi_decryptor.cc (right): https://codereview.chromium.org/985113003/diff/20001/content/renderer/media/crypto/ppapi_decryptor.cc#newcode27 content/renderer/media/crypto/ppapi_decryptor.cc:27: bool allow_distinctive_identifier, On 2015/03/06 21:42:54, ddorwin wrote: > Lots ...
5 years, 9 months ago (2015-03-06 22:36:59 UTC) #8
sandersd (OOO until July 31)
https://codereview.chromium.org/985113003/diff/20001/ppapi/api/private/ppp_content_decryptor_private.idl File ppapi/api/private/ppp_content_decryptor_private.idl (right): https://codereview.chromium.org/985113003/diff/20001/ppapi/api/private/ppp_content_decryptor_private.idl#newcode37 ppapi/api/private/ppp_content_decryptor_private.idl:37: [in] PP_Bool allow_persistent_state); I've just updated the CL description ...
5 years, 9 months ago (2015-03-06 22:50:52 UTC) #9
ddorwin
lgtm Thanks. https://codereview.chromium.org/985113003/diff/20001/media/blink/webcontentdecryptionmoduleaccess_impl.cc File media/blink/webcontentdecryptionmoduleaccess_impl.cc (right): https://codereview.chromium.org/985113003/diff/20001/media/blink/webcontentdecryptionmoduleaccess_impl.cc#newcode72 media/blink/webcontentdecryptionmoduleaccess_impl.cc:72: blink::WebMediaKeySystemConfiguration::Requirement::Required); On 2015/03/06 22:36:58, sandersd wrote: > ...
5 years, 9 months ago (2015-03-07 02:06:24 UTC) #10
sandersd (OOO until July 31)
[email protected]: Please review changes in ppapi/proxy/ppapi_messages.h.
5 years, 9 months ago (2015-03-09 18:01:46 UTC) #12
dmichael (off chromium)
ppapi lgtm
5 years, 9 months ago (2015-03-09 19:58:47 UTC) #13
sandersd (OOO until July 31)
https://codereview.chromium.org/985113003/diff/20001/media/blink/webcontentdecryptionmoduleaccess_impl.cc File media/blink/webcontentdecryptionmoduleaccess_impl.cc (right): https://codereview.chromium.org/985113003/diff/20001/media/blink/webcontentdecryptionmoduleaccess_impl.cc#newcode72 media/blink/webcontentdecryptionmoduleaccess_impl.cc:72: blink::WebMediaKeySystemConfiguration::Requirement::Required); On 2015/03/07 02:06:24, ddorwin wrote: > On 2015/03/06 ...
5 years, 9 months ago (2015-03-09 20:01:36 UTC) #14
dcheng
rs lgtm Has there been any consideration of using enums instead of bools? Is there ...
5 years, 9 months ago (2015-03-09 20:57:23 UTC) #15
dmichael (off chromium)
https://codereview.chromium.org/985113003/diff/80001/media/cdm/ppapi/cdm_adapter.cc File media/cdm/ppapi/cdm_adapter.cc (right): https://codereview.chromium.org/985113003/diff/80001/media/cdm/ppapi/cdm_adapter.cc#newcode1124 media/cdm/ppapi/cdm_adapter.cc:1124: linked_ptr<PepperPlatformChallengeResponse> response( On 2015/03/09 20:57:23, dcheng wrote: > Are ...
5 years, 9 months ago (2015-03-09 21:02:07 UTC) #16
dcheng
On 2015/03/09 at 21:02:07, dmichael wrote: > https://codereview.chromium.org/985113003/diff/80001/media/cdm/ppapi/cdm_adapter.cc > File media/cdm/ppapi/cdm_adapter.cc (right): > > https://codereview.chromium.org/985113003/diff/80001/media/cdm/ppapi/cdm_adapter.cc#newcode1124 ...
5 years, 9 months ago (2015-03-09 21:04:46 UTC) #17
dmichael (off chromium)
On 2015/03/09 21:04:46, dcheng wrote: > On 2015/03/09 at 21:02:07, dmichael wrote: > > > ...
5 years, 9 months ago (2015-03-09 21:38:12 UTC) #18
dcheng
On 2015/03/09 at 21:38:12, dmichael wrote: > On 2015/03/09 21:04:46, dcheng wrote: > > On ...
5 years, 9 months ago (2015-03-09 21:39:56 UTC) #19
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/985113003/80001
5 years, 9 months ago (2015-03-09 22:22:20 UTC) #22
commit-bot: I haz the power
Try jobs failed on following builders: android_aosp on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/android_aosp/builds/66055)
5 years, 9 months ago (2015-03-09 23:04:44 UTC) #24
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/985113003/100001
5 years, 9 months ago (2015-03-09 23:32:18 UTC) #27
commit-bot: I haz the power
Committed patchset #5 (id:100001)
5 years, 9 months ago (2015-03-10 00:56:19 UTC) #28
commit-bot: I haz the power
5 years, 9 months ago (2015-03-10 00:57:06 UTC) #29
Message was sent while issue was closed.
Patchset 5 (id:??) landed as
https://crrev.com/f92575a5735f510fb159f3f1928f614e31c8a0f8
Cr-Commit-Position: refs/heads/master@{#319798}

Powered by Google App Engine
This is Rietveld 408576698