Changeset 270507 in webkit

Timestamp:

Dec 7, 2020 9:22:32 AM (20 months ago)

Author:

youenn@apple.com

Message:

Allow RTCRtpSFrameTransform to handle multiple keys
​https://bugs.webkit.org/show_bug.cgi?id=219598

Reviewed by Eric Carlson.

Source/WebCore:

Keep a map of ID to Key material when setEncryptionKey is called.
Use that map on decryption side to get key material from key ID.
Add internals API to validate key retrieval is done correctly.
If setEncryptionKey key ID is not set, we use the map size which allows to use 0, 1, 2 and so on...

Test: webrtc/sframe-keys.html

• Modules/mediastream/RTCRtpSFrameTransform.cpp:

(WebCore::RTCRtpSFrameTransform::keyIdForTesting const):

• Modules/mediastream/RTCRtpSFrameTransform.h:
• Modules/mediastream/RTCRtpSFrameTransformer.cpp:

(WebCore::RTCRtpSFrameTransformer::setEncryptionKey):
(WebCore::RTCRtpSFrameTransformer::updateEncryptionKey):
(WebCore::RTCRtpSFrameTransformer::decryptFrame):

• Modules/mediastream/RTCRtpSFrameTransformer.h:

(WebCore::RTCRtpSFrameTransformer::keyId const):

• testing/Internals.cpp:

(WebCore::Internals::sframeKeyId):

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

• webrtc/sframe-keys-expected.txt: Added.
• webrtc/sframe-keys.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webrtc/sframe-keys-expected.txt (added)
• LayoutTests/webrtc/sframe-keys.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.cpp (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.h (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCRtpSFrameTransformer.cpp (modified) (3 diffs)
• Source/WebCore/Modules/mediastream/RTCRtpSFrameTransformer.h (modified) (4 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-12-07  Youenn Fablet  <youenn@apple.com>
+
+        Allow RTCRtpSFrameTransform to handle multiple keys
+        https://bugs.webkit.org/show_bug.cgi?id=219598
+
+        Reviewed by Eric Carlson.
+
+        * webrtc/sframe-keys-expected.txt: Added.
+        * webrtc/sframe-keys.html: Added.
+
 2020-12-07  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-12-07  Youenn Fablet  <youenn@apple.com>
+
+        Allow RTCRtpSFrameTransform to handle multiple keys
+        https://bugs.webkit.org/show_bug.cgi?id=219598
+
+        Reviewed by Eric Carlson.
+
+        Keep a map of ID to Key material when setEncryptionKey is called.
+        Use that map on decryption side to get key material from key ID.
+        Add internals API to validate key retrieval is done correctly.
+        If setEncryptionKey key ID is not set, we use the map size which allows to use 0, 1, 2 and so on...
+
+        Test: webrtc/sframe-keys.html
+
+        * Modules/mediastream/RTCRtpSFrameTransform.cpp:
+        (WebCore::RTCRtpSFrameTransform::keyIdForTesting const):
+        * Modules/mediastream/RTCRtpSFrameTransform.h:
+        * Modules/mediastream/RTCRtpSFrameTransformer.cpp:
+        (WebCore::RTCRtpSFrameTransformer::setEncryptionKey):
+        (WebCore::RTCRtpSFrameTransformer::updateEncryptionKey):
+        (WebCore::RTCRtpSFrameTransformer::decryptFrame):
+        * Modules/mediastream/RTCRtpSFrameTransformer.h:
+        (WebCore::RTCRtpSFrameTransformer::keyId const):
+        * testing/Internals.cpp:
+        (WebCore::Internals::sframeKeyId):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2020-12-07  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.cpp

@@ -81 +81 @@
 }
 
+uint64_t RTCRtpSFrameTransform::keyIdForTesting() const
+{
+    return m_transformer->keyId();
+}
+
 bool RTCRtpSFrameTransform::isAttached() const
 {

trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.h

@@ -61 +61 @@
 
     WEBCORE_EXPORT uint64_t counterForTesting() const;
+    WEBCORE_EXPORT uint64_t keyIdForTesting() const;
 
     ExceptionOr<RefPtr<ReadableStream>> readable();

trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransformer.cpp

@@ -150 +150 @@
 ExceptionOr<void> RTCRtpSFrameTransformer::setEncryptionKey(const Vector<uint8_t>& rawKey, Optional<uint64_t> keyId)
 {
+    auto locker = holdLock(m_keyLock);
+    return updateEncryptionKey(rawKey, keyId, ShouldUpdateKeys::Yes);
+}
+
+ExceptionOr<void> RTCRtpSFrameTransformer::updateEncryptionKey(const Vector<uint8_t>& rawKey, Optional<uint64_t> keyId, ShouldUpdateKeys shouldUpdateKeys)
+{
+    ASSERT(m_keyLock.isLocked());
+
     auto saltKeyResult = computeSaltKey(rawKey);
     if (saltKeyResult.hasException())
@@ -164 +172 @@
         return encryptionKeyResult.releaseException();
 
-    auto locker = holdLock(m_keyLock);
+    if (!keyId)
+        keyId = m_keys.size();
+
+    m_keyId = *keyId;
+    if (shouldUpdateKeys == ShouldUpdateKeys::Yes)
+        m_keys.set(*keyId, rawKey);
 
     m_saltKey = saltKeyResult.releaseReturnValue();
     m_authenticationKey = authenticationKeyResult.releaseReturnValue();
     m_encryptionKey = encryptionKeyResult.releaseReturnValue();
-
-    if (keyId)
-        m_keyId = *keyId;
 
     updateAuthenticationSize();
@@ -205 +215 @@
 
     if (header->keyId != m_keyId) {
-        // FIXME: We should search for keys.
-        return Exception { NotSupportedError };
+        auto iterator = m_keys.find(header->keyId);
+        if (iterator == m_keys.end())
+            return Exception { DataError, "Key ID is unknown" };
+        auto result = updateEncryptionKey(iterator->value, iterator->key, ShouldUpdateKeys::No);
+        if (result.hasException())
+            return result.releaseException();
     }
 

trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransformer.h

@@ -29 +29 @@
 
 #include "ExceptionOr.h"
+#include <wtf/HashMap.h>
 #include <wtf/Lock.h>
 #include <wtf/ThreadSafeRefCounted.h>
@@ -53 +54 @@
     const Vector<uint8_t>& saltKey() const { return m_saltKey; }
 
+    uint64_t keyId() const { return m_keyId; }
     uint64_t counter() const { return m_counter; }
     void setCounter(uint64_t counter) { m_counter = counter; }
@@ -61 +63 @@
     ExceptionOr<Vector<uint8_t>> decryptFrame(const uint8_t*, size_t);
     ExceptionOr<Vector<uint8_t>> encryptFrame(const uint8_t*, size_t);
+
+    enum class ShouldUpdateKeys { No, Yes };
+    ExceptionOr<void> updateEncryptionKey(const Vector<uint8_t>& rawKey, Optional<uint64_t>, ShouldUpdateKeys = ShouldUpdateKeys::Yes);
 
     ExceptionOr<Vector<uint8_t>> computeSaltKey(const Vector<uint8_t>&);
@@ -76 +81 @@
     Vector<uint8_t> m_encryptionKey;
     Vector<uint8_t> m_saltKey;
+    HashMap<uint64_t, Vector<uint8_t>> m_keys;
 
     bool m_isEncrypting { false };

trunk/Source/WebCore/testing/Internals.cpp

@@ -1582 +1582 @@
 }
 
+uint64_t Internals::sframeKeyId(const RTCRtpSFrameTransform& transform)
+{
+    return transform.keyIdForTesting();
+}
+
 void Internals::setEnableWebRTCEncryption(bool value)
 {

trunk/Source/WebCore/testing/Internals.h

@@ -611 +611 @@
     void setWebRTCVP9VTBSupport(bool);
     uint64_t sframeCounter(const RTCRtpSFrameTransform&);
+    uint64_t sframeKeyId(const RTCRtpSFrameTransform&);
     void setEnableWebRTCEncryption(bool);
     void setUseDTLS10(bool);

trunk/Source/WebCore/testing/Internals.idl

@@ -804 +804 @@
     [Conditional=WEB_RTC] undefined setWebRTCVP9VTBSupport(boolean allowed);
     [Conditional=WEB_RTC] unsigned long long sframeCounter(RTCRtpSFrameTransform transform);
+    [Conditional=WEB_RTC] unsigned long long sframeKeyId(RTCRtpSFrameTransform transform);
 
     [Conditional=MEDIA_STREAM] undefined setMockAudioTrackChannelNumber(MediaStreamTrack track, unsigned short count);