Changeset 256016 in webkit

Timestamp:

Feb 7, 2020 2:42:37 AM (4 years ago)

Author:

youenn@apple.com

Message:

Mandate UUID version 4 for mDNS ICE candidates
​https://bugs.webkit.org/show_bug.cgi?id=207329

Reviewed by Alex Christensen.

Source/WebCore:

Ignore ICE candidates if they are mDNS but not UUID version 4.
Covered by existing tests relying on mDNS to do the connection.

• Modules/mediastream/PeerConnectionBackend.cpp:

(WebCore::shouldIgnoreCandidate):
(WebCore::PeerConnectionBackend::addIceCandidate):

Source/WebKit:

• NetworkProcess/webrtc/NetworkMDNSRegister.cpp:

(WebKit::NetworkMDNSRegister::registerMDNSName):
Remove the count at the end of the mDNS name to make it a fully version 4 UUID.

Source/WTF:

Add a routine to validate version 4 UUID.

• wtf/UUID.cpp:

(WTF::isHexadecimalCharacter):
(WTF::isVersion4UUID):

• wtf/UUID.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/UUID.cpp (modified) (1 diff)
• WTF/wtf/UUID.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/mediastream/PeerConnectionBackend.cpp (modified) (5 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/webrtc/NetworkMDNSRegister.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-02-07  youenn fablet  <youenn@apple.com>
+
+        Mandate UUID version 4 for mDNS ICE candidates
+        https://bugs.webkit.org/show_bug.cgi?id=207329
+
+        Reviewed by Alex Christensen.
+
+        Add a routine to validate version 4 UUID.
+
+        * wtf/UUID.cpp:
+        (WTF::isHexadecimalCharacter):
+        (WTF::isVersion4UUID):
+        * wtf/UUID.h:
+
 2020-02-07  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/WTF/wtf/UUID.cpp

@@ -82 +82 @@
 }
 
+static inline bool isHexadecimalCharacter(UChar character)
+{
+    return (character >= '0' && character <= '9')
+        || (character >= 'a' && character <= 'f')
+        || (character >= 'A' && character <= 'F');
+}
+
+bool isVersion4UUID(StringView value)
+{
+    // Version 4 UUIDs have the form xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx with hexadecimal digits for x and one of 8, 9, A, or B for y.
+    if (value.length() != 36)
+        return false;
+
+    for (auto cptr = 0; cptr < 36; ++cptr) {
+        if (cptr == 8 || cptr == 13 || cptr == 18 || cptr == 23) {
+            if (value[cptr] != '-')
+                return false;
+            continue;
+        }
+        if (cptr == 14) {
+            if (value[cptr] != '4')
+                return false;
+            continue;
+        }
+        if (cptr == 19) {
+            auto y = value[cptr];
+            if (y != '8' && y != '9' && y != 'a' && y != 'A' && y != 'b' && y != 'B')
+                return false;
+            continue;
+        }
+        if (!isHexadecimalCharacter(value[cptr]))
+            return false;
+    }
+    return true;
+}
+
 } // namespace WTF

trunk/Source/WTF/wtf/UUID.h

@@ -35 +35 @@
 namespace WTF {
 
+class StringView;
+
 // Creates a UUID that consists of 32 hexadecimal digits and returns its canonical form.
 // The canonical form is displayed in 5 groups separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters.
@@ -47 +49 @@
 
 WTF_EXPORT_PRIVATE String bootSessionUUIDString();
+WTF_EXPORT_PRIVATE bool isVersion4UUID(StringView);
 
 }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-02-07  youenn fablet  <youenn@apple.com>
+
+        Mandate UUID version 4 for mDNS ICE candidates
+        https://bugs.webkit.org/show_bug.cgi?id=207329
+
+        Reviewed by Alex Christensen.
+
+        Ignore ICE candidates if they are mDNS but not UUID version 4.
+        Covered by existing tests relying on mDNS to do the connection.
+
+        * Modules/mediastream/PeerConnectionBackend.cpp:
+        (WebCore::shouldIgnoreCandidate):
+        (WebCore::PeerConnectionBackend::addIceCandidate):
+
 2020-02-07  Tomoki Imai  <Tomoki.Imai@sony.com>
 

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

@@ -47 +47 @@
 #include "RTCTrackEvent.h"
 #include "RuntimeEnabledFeatures.h"
+#include <wtf/UUID.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/StringConcatenateNumbers.h>
@@ -303 +304 @@
 }
 
-static String extractIPAddres(const String& sdp)
-{
-    ASSERT(sdp.contains(" host "));
+static String extractIPAddress(const String& sdp)
+{
     unsigned counter = 0;
     for (auto item : StringView { sdp }.split(' ')) {
@@ -314 +314 @@
 }
 
+static inline bool shouldIgnoreIceCandidate(const RTCIceCandidate& iceCandidate)
+{
+    auto address = extractIPAddress(iceCandidate.candidate());
+    if (!address.endsWithIgnoringASCIICase(".local"_s))
+        return false;
+
+    if (!WTF::isVersion4UUID(StringView { address }.substring(0, address.length() - 6))) {
+        RELEASE_LOG_ERROR(WebRTC, "mDNS candidate is not a Version 4 UUID");
+        return true;
+    }
+    return false;
+}
+
 void PeerConnectionBackend::addIceCandidate(RTCIceCandidate* iceCandidate, DOMPromiseDeferred<void>&& promise)
 {
@@ -328 +341 @@
         return;
     }
+
+    if (shouldIgnoreIceCandidate(*iceCandidate)) {
+        promise.resolve();
+        return;
+    }
+
     m_addIceCandidatePromise = WTF::makeUnique<DOMPromiseDeferred<void>>(WTFMove(promise));
     doAddIceCandidate(*iceCandidate);
@@ -451 +470 @@
             m_pendingICECandidates.append(PendingICECandidate { String { sdp }, WTFMove(mid), sdpMLineIndex, WTFMove(serverURL) });
             if (RuntimeEnabledFeatures::sharedFeatures().webRTCMDNSICECandidatesEnabled()) {
-                auto ipAddress = extractIPAddres(sdp);
+                auto ipAddress = extractIPAddress(sdp);
                 // We restrict to IPv4 candidates for now.
                 if (ipAddress.contains('.'))

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-02-07  youenn fablet  <youenn@apple.com>
+
+        Mandate UUID version 4 for mDNS ICE candidates
+        https://bugs.webkit.org/show_bug.cgi?id=207329
+
+        Reviewed by Alex Christensen.
+
+        * NetworkProcess/webrtc/NetworkMDNSRegister.cpp:
+        (WebKit::NetworkMDNSRegister::registerMDNSName):
+        Remove the count at the end of the mDNS name to make it a fully version 4 UUID.
+
 2020-02-07  Patrick Griffis  <pgriffis@igalia.com>
 

trunk/Source/WebKit/NetworkProcess/webrtc/NetworkMDNSRegister.cpp

@@ -127 +127 @@
         service = iterator->value;
 
-    String name = makeString(createCanonicalUUIDString(), pendingRegistrationRequestCount, ".local");
+    String name = makeString(createCanonicalUUIDString(), ".local");
 
     auto ip = inet_addr(ipAddress.utf8().data());