Changeset 220805 in webkit

Timestamp:

Aug 16, 2017 1:20:56 PM (7 years ago)

Author:

eric.carlson@apple.com

Message:

Consider allow gUM to be called from localhost without https
​https://bugs.webkit.org/show_bug.cgi?id=173457
<rdar://problem/33900527>

Reviewed by Youenn Fablet.

Source/WebCore:

Tests: http/tests/media/media-stream/get-user-media-localhost.html

http/tests/media/media-stream/get-user-media-loopback-ip.html

• Modules/mediastream/UserMediaRequest.cpp:

(WebCore::isSecure): Call SchemeRegistry::shouldTreatURLSchemeAsSecure instead of looking for
the string 'https'.
(WebCore::canCallGetUserMedia): Allow localhost or loopback address.

• page/SecurityOrigin.cpp:

(WebCore::isLoopbackIPAddress): Add a comment.
(WebCore::shouldTreatAsPotentionallyTrustworthy): Move tests for localhost and loopback address
to isLocalHostOrLoopbackIPAddress, call it.
(WebCore::SecurityOrigin::isLocalHostOrLoopbackIPAddress):

• page/SecurityOrigin.h:

LayoutTests:

• http/tests/media/media-stream/get-user-media-localhost-expected.txt: Added.
• http/tests/media/media-stream/get-user-media-localhost.html: Added.
• http/tests/media/media-stream/get-user-media-loopback-ip-expected.txt: Added.
• http/tests/media/media-stream/get-user-media-loopback-ip.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/media/media-stream/get-user-media-localhost-expected.txt (added)
• LayoutTests/http/tests/media/media-stream/get-user-media-localhost.html (added)
• LayoutTests/http/tests/media/media-stream/get-user-media-loopback-ip-expected.txt (added)
• LayoutTests/http/tests/media/media-stream/get-user-media-loopback-ip.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (modified) (4 diffs)
• Source/WebCore/page/SecurityOrigin.cpp (modified) (3 diffs)
• Source/WebCore/page/SecurityOrigin.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-08-16  Eric Carlson  <eric.carlson@apple.com>
+
+        Consider allow gUM to be called from localhost without https
+        https://bugs.webkit.org/show_bug.cgi?id=173457
+        <rdar://problem/33900527>
+
+        Reviewed by Youenn Fablet.
+
+        * http/tests/media/media-stream/get-user-media-localhost-expected.txt: Added.
+        * http/tests/media/media-stream/get-user-media-localhost.html: Added.
+        * http/tests/media/media-stream/get-user-media-loopback-ip-expected.txt: Added.
+        * http/tests/media/media-stream/get-user-media-loopback-ip.html: Added.
+
 2017-08-16  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-16  Eric Carlson  <eric.carlson@apple.com>
+
+        Consider allow gUM to be called from localhost without https
+        https://bugs.webkit.org/show_bug.cgi?id=173457
+        <rdar://problem/33900527>
+
+        Reviewed by Youenn Fablet.
+
+        Tests: http/tests/media/media-stream/get-user-media-localhost.html
+               http/tests/media/media-stream/get-user-media-loopback-ip.html
+
+        * Modules/mediastream/UserMediaRequest.cpp:
+        (WebCore::isSecure): Call SchemeRegistry::shouldTreatURLSchemeAsSecure instead of looking for
+        the string 'https'.
+        (WebCore::canCallGetUserMedia): Allow localhost or loopback address.
+
+        * page/SecurityOrigin.cpp:
+        (WebCore::isLoopbackIPAddress): Add a comment.
+        (WebCore::shouldTreatAsPotentionallyTrustworthy): Move tests for localhost and loopback address
+        to isLocalHostOrLoopbackIPAddress, call it.
+        (WebCore::SecurityOrigin::isLocalHostOrLoopbackIPAddress): 
+        * page/SecurityOrigin.h:
+
 2017-08-16  Chris Dumez  <cdumez@apple.com>
 

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

@@ -2 +2 @@
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  * Copyright (C) 2012 Google Inc. All rights reserved.
- * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
  *
@@ -45 +45 @@
 #include "MediaConstraints.h"
 #include "RealtimeMediaSourceCenter.h"
+#include "SchemeRegistry.h"
 #include "Settings.h"
 #include "UserMediaController.h"
@@ -95 +96 @@
 {
     auto& response = documentLoader.response();
-    return response.url().protocolIs("https")
+    return SchemeRegistry::shouldTreatURLSchemeAsSecure(response.url().protocol().toStringWithoutCopying())
         && response.certificateInfo()
         && !response.certificateInfo()->containsNonRootSHA1SignedCertificate();
@@ -103 +104 @@
 {
     bool requiresSecureConnection = document.settings().mediaCaptureRequiresSecureConnection();
-    if (requiresSecureConnection && !isSecure(*document.loader())) {
+    auto& documentLoader = *document.loader();
+    if (requiresSecureConnection && !isSecure(documentLoader) && !SecurityOrigin::isLocalHostOrLoopbackIPAddress(documentLoader.response().url())) {
         errorMessage = "Trying to call getUserMedia from an insecure document.";
         return false;

trunk/Source/WebCore/page/SecurityOrigin.cpp

@@ -102 +102 @@
 static bool isLoopbackIPAddress(const URL& url)
 {
+    // The IPv6 loopback address is 0:0:0:0:0:0:0:1, which compresses to ::1.
     ASSERT(url.isValid());
     auto host = url.host();
@@ -131 +132 @@
         return true;
 
-    if (isLoopbackIPAddress(url))
-        return true;
-
-    // FIXME: Ensure that localhost resolves to the loopback address.
-    if (equalLettersIgnoringASCIICase(url.host(), "localhost"))
+    if (SecurityOrigin::isLocalHostOrLoopbackIPAddress(url))
         return true;
 
@@ -588 +585 @@
 }
 
+bool SecurityOrigin::isLocalHostOrLoopbackIPAddress(const URL& url)
+{
+    if (isLoopbackIPAddress(url))
+        return true;
+
+    // FIXME: Ensure that localhost resolves to the loopback address.
+    if (equalLettersIgnoringASCIICase(url.host(), "localhost"))
+        return true;
+
+    return false;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/page/SecurityOrigin.h

@@ -203 +203 @@
     bool isPotentionallyTrustworthy() const { return m_isPotentionallyTrustworthy; }
 
+    static bool isLocalHostOrLoopbackIPAddress(const URL&);
+
 private:
     SecurityOrigin();