Attachment 350106 Details for Bug 189740 – Patch

[patch] Patch

bug-189740-20180919145204.patch (text/plain), 3.19 KB, created by Yacine Bandou on 2018-09-19 05:52:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yacine Bandou

Created: 2018-09-19 05:52:05 PDT

Size: 3.19 KB

patch

obsolete

>Subversion Revision: 235549
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 261e0165da466d3b31342bc7d7880a120ae366ed..077eb994c4ca9e59d30b811953eaeb60f56811e8 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-09-19  Yacine Bandou  <yacine.bandou@softathome.com>
>+
>+        [EME] Add Webm sanitization
>+        https://bugs.webkit.org/show_bug.cgi?id=189740
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This patch adds support for sanitizing the Webm initialization data,
>+        ensures there are no bogus values.
>+        see https://www.w3.org/TR/encrypted-media/#dom-mediakeysession-generaterequest
>+
>+        Tests: imported/w3c/web-platform-tests/encrypted-media/clearkey-generate-request-disallowed-input.https.html
>+
>+        * Modules/encryptedmedia/InitDataRegistry.cpp:
>+        (WebCore::sanitizeWebM): Added implementation, check if the initialization data doesn't empty and its size
>+        should be less than 64KB, return a copy of the buffer when its is ok, otherwise a nullptr.
>+        (WebCore::extractKeyIDsWebM): Added implementation.
>+
> 2018-09-03  Yacine Bandou  <yacine.bandou_ext@softathome.com>
> 
>         [EME] Add the WebM initData support in ClearKey CDM
>diff --git a/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp b/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp
>index fb3e4c089d645eeacf74fa5d00522b3c9809f78f..38207173bc646603edec23f62b176ce89c56529c 100644
>--- a/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp
>+++ b/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp
>@@ -41,6 +41,10 @@ namespace WebCore {
> 
> namespace {
>     const uint32_t kCencMaxBoxSize = 64 * KB;
>+    // ContentEncKeyID has this EBML code [47][E2] in WebM,
>+    // as per spec the size of the ContentEncKeyID is encoded on 16 bits.
>+    // https://matroska.org/technical/specs/index.html#ContentEncKeyID/
>+    const uint32_t kWebmMaxContentEncKeyIDSize = 64 * KB; // 2^16
> }
> 
> static std::optional<Vector<Ref<SharedBuffer>>> extractKeyIDsKeyids(const SharedBuffer& buffer)
>@@ -139,18 +143,22 @@ static RefPtr<SharedBuffer> sanitizeCenc(const SharedBuffer& buffer)
> 
> static RefPtr<SharedBuffer> sanitizeWebM(const SharedBuffer& buffer)
> {
>-    // 1. Format
>-    // https://w3c.github.io/encrypted-media/format-registry/initdata/webm.html#format
>-    notImplemented();
>+    if (buffer.isEmpty() || buffer.size() > kWebmMaxContentEncKeyIDSize)
>+        return nullptr;
>     return buffer.copy();
> }
> 
>-static std::optional<Vector<Ref<SharedBuffer>>> extractKeyIDsWebM(const SharedBuffer&)
>+static std::optional<Vector<Ref<SharedBuffer>>> extractKeyIDsWebM(const SharedBuffer& buffer)
> {
>-    // 1. Format
>+    Vector<Ref<SharedBuffer>> keyIDs;
>+
>+    // Check if the buffer is a valid WebM initData.
>+    // The Webm initData is the ContentEncKeyID, so should be less than kWebmMaxContentEncKeyIDSize.
>     // https://w3c.github.io/encrypted-media/format-registry/initdata/webm.html#format
>-    notImplemented();
>-    return std::nullopt;
>+    if (buffer.isEmpty() || buffer.size() > kWebmMaxContentEncKeyIDSize)
>+        return std::nullopt;
>+    keyIDs.append(buffer.copy());
>+    return keyIDs;
> }
> 
> InitDataRegistry& InitDataRegistry::shared()

Flags:

calvaris: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 189740: 350106 | 350108 | 350184 | 350208 | 350213