Changeset 202628 in webkit

Timestamp:

Jun 29, 2016 10:36:33 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

WebRTC: ice-char can not contain '=' characters for credentials
​https://bugs.webkit.org/show_bug.cgi?id=159207

Patch by Alejandro G. Castro <​alex@igalia.com> on 2016-06-29
Reviewed by Eric Carlson.

Source/WebCore:

Avoid a general calculation to get a base64 without padding which
was wrong in the randomString function. Because each parameter
using the function requires a different setup depending of the
specification and this is not a general API, it is a better
solution to calculate and store the sizes we want to use, comment
them and test them, considering we use base64 to generate the
strings we just need to avoid padding.

Existing test modified to match the correct behavior.

• Modules/mediastream/MediaEndpointPeerConnection.cpp:

(WebCore::randomString): Now the size is the one passed.
(WebCore::MediaEndpointPeerConnection::MediaEndpointPeerConnection):
Used different valid values following the sdp parser in each case.

LayoutTests:

Modified the parser to make the regexp similar to the one we have
in WebCore.

• fast/mediastream/resources/sdp-utils.js:

(printComparableSessionDescription):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/resources/sdp-utils.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-06-29  Alejandro G. Castro  <alex@igalia.com>
+
+        WebRTC: ice-char can not contain '=' characters for credentials
+        https://bugs.webkit.org/show_bug.cgi?id=159207
+
+        Reviewed by Eric Carlson.
+
+        Modified the parser to make the regexp similar to the one we have
+        in WebCore.
+
+        * fast/mediastream/resources/sdp-utils.js:
+        (printComparableSessionDescription):
+
 2016-06-29  David Kilzer  <ddkilzer@apple.com>
 

trunk/LayoutTests/fast/mediastream/resources/sdp-utils.js

@@ -16 +16 @@
             "msid": "^a=(ssrc:\\d+ )?msid:([\\w+/\\-=]+) +([\\w+/\\-=]+).*$",
             "iceufrag": "^a=ice-ufrag:([\\w+/]*).*$",
-            "icepwd": "^a=ice-pwd:([\\w+/]*=*).*$",
+            "icepwd": "^a=ice-pwd:([\\w+/]*).*$",
         };
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-29  Alejandro G. Castro  <alex@igalia.com>
+
+        WebRTC: ice-char can not contain '=' characters for credentials
+        https://bugs.webkit.org/show_bug.cgi?id=159207
+
+        Reviewed by Eric Carlson.
+
+        Avoid a general calculation to get a base64 without padding which
+        was wrong in the randomString function. Because each parameter
+        using the function requires a different setup depending of the
+        specification and this is not a general API, it is a better
+        solution to calculate and store the sizes we want to use, comment
+        them and test them, considering we use base64 to generate the
+        strings we just need to avoid padding.
+
+        Existing test modified to match the correct behavior.
+
+        * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+        (WebCore::randomString): Now the size is the one passed.
+        (WebCore::MediaEndpointPeerConnection::MediaEndpointPeerConnection):
+        Used different valid values following the sdp parser in each case.
+
 2016-06-29  David Kilzer  <ddkilzer@apple.com>
 

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

@@ -54 +54 @@
 using namespace PeerConnectionStates;
 
+// We use base64 to generate the random strings so we need a size that avoids padding to get ice-chars.
+static const size_t cnameSize = 18;
+// Size range from 4 to 256 ice-chars defined in RFC 5245.
+static const size_t iceUfragSize = 6;
+// Size range from 22 to 256 ice-chars defined in RFC 5245.
+static const size_t icePasswordSize = 24;
+
 static std::unique_ptr<PeerConnectionBackend> createMediaEndpointPeerConnection(PeerConnectionBackendClient* client)
 {
@@ -61 +68 @@
 CreatePeerConnectionBackend PeerConnectionBackend::create = createMediaEndpointPeerConnection;
 
-static String randomString(size_t length)
-{
-    const size_t size = ceil(length * 3 / 4);
+static String randomString(size_t size)
+{
     unsigned char randomValues[size];
     cryptographicallyRandomValues(randomValues, size);
@@ -73 +79 @@
     , m_mediaEndpoint(MediaEndpoint::create(*this))
     , m_sdpProcessor(std::unique_ptr<SDPProcessor>(new SDPProcessor(m_client->scriptExecutionContext())))
-    , m_cname(randomString(16))
-    , m_iceUfrag(randomString(4))
-    , m_icePassword(randomString(22))
+    , m_cname(randomString(cnameSize))
+    , m_iceUfrag(randomString(iceUfragSize))
+    , m_icePassword(randomString(icePasswordSize))
 {
     ASSERT(m_mediaEndpoint);