Changeset 202810 in webkit

Timestamp:

Jul 4, 2016 11:31:37 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Shield WebRTC JS built-ins from user scripts
​https://bugs.webkit.org/show_bug.cgi?id=155964

Patch by Youenn Fablet <​youenn@apple.com> on 2016-07-04
Reviewed by Sam Weinig.

Source/WebCore:

Making use of Promise.prototype.@then instead of Promise.prototype.then.
Covered by updated tests.

• Modules/mediastream/RTCPeerConnection.js:

(createOffer):
(createAnswer):
(setLocalDescription):
(setRemoteDescription):
(addIceCandidate):
(getStats):

• Modules/mediastream/RTCPeerConnectionInternals.js:

(enqueueOperation):

LayoutTests:

• fast/mediastream/RTCPeerConnection-createOffer.html:
• fast/mediastream/RTCPeerConnection-stable.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-createOffer.html (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-stable.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.js (modified) (6 diffs)
• Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-07-04  Youenn Fablet  <youenn@apple.com>
+
+        Shield WebRTC JS built-ins from user scripts
+        https://bugs.webkit.org/show_bug.cgi?id=155964
+
+        Reviewed by Sam Weinig.
+
+        * fast/mediastream/RTCPeerConnection-createOffer.html:
+        * fast/mediastream/RTCPeerConnection-stable.html:
+
 2016-07-04  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer.html

@@ -7 +7 @@
         <script>
             description("Tests RTCPeerConnection createOffer.");
+
+            // Let's ensure built-ins are shielded from user scripts
+            var thenPromise = Promise.prototype.then;
+            Promise.prototype.then = function() {
+                console.log("Promise.prototype.then is called internally");
+                return thenPromise.apply(this, arguments);
+            }
 
             var pc = null;

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-stable.html

@@ -9 +9 @@
 
             var pc = null;
+
+            // Let's ensure built-ins are shielded from user scripts
+            var thenPromise = Promise.prototype.then;
+            Promise.prototype.then = function() {
+                console.log("Promise.prototype.then is called internally");
+                return thenPromise.apply(this, arguments);
+            }
 
             function requestSucceeded2()

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-07-04  Youenn Fablet  <youenn@apple.com>
+
+        Shield WebRTC JS built-ins from user scripts
+        https://bugs.webkit.org/show_bug.cgi?id=155964
+
+        Reviewed by Sam Weinig.
+
+        Making use of Promise.prototype.@then instead of Promise.prototype.then.
+        Covered by updated tests.
+
+        * Modules/mediastream/RTCPeerConnection.js:
+        (createOffer):
+        (createAnswer):
+        (setLocalDescription):
+        (setRemoteDescription):
+        (addIceCandidate):
+        (getStats):
+        * Modules/mediastream/RTCPeerConnectionInternals.js:
+        (enqueueOperation):
+
 2016-07-04  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.js

@@ -147 +147 @@
         // Legacy callbacks mode
         @enqueueOperation(peerConnection, function () {
-            return peerConnection.@queuedCreateOffer(options).then(successCallback, errorCallback);
+            return peerConnection.@queuedCreateOffer(options).@then(successCallback, errorCallback);
         });
 
@@ -171 +171 @@
         // Legacy callbacks mode
         @enqueueOperation(peerConnection, function () {
-            return peerConnection.@queuedCreateAnswer(options).then(successCallback, errorCallback);
+            return peerConnection.@queuedCreateAnswer(options).@then(successCallback, errorCallback);
         });
 
@@ -200 +200 @@
         // Legacy callbacks mode
         @enqueueOperation(peerConnection, function () {
-            return peerConnection.@queuedSetLocalDescription(description).then(successCallback, errorCallback);
+            return peerConnection.@queuedSetLocalDescription(description).@then(successCallback, errorCallback);
         });
 
@@ -229 +229 @@
         // Legacy callbacks mode
         @enqueueOperation(peerConnection, function () {
-            return peerConnection.@queuedSetRemoteDescription(description).then(successCallback, errorCallback);
+            return peerConnection.@queuedSetRemoteDescription(description).@then(successCallback, errorCallback);
         });
 
@@ -258 +258 @@
         // Legacy callbacks mode
         @enqueueOperation(peerConnection, function () {
-            return peerConnection.@queuedAddIceCandidate(candidate).then(successCallback, errorCallback);
+            return peerConnection.@queuedAddIceCandidate(candidate).@then(successCallback, errorCallback);
         });
 
@@ -285 +285 @@
     }, function (selector, successCallback, errorCallback) {
         // Legacy callbacks mode
-        peerConnection.@privateGetStats(selector).then(successCallback, errorCallback);
-
-        return @Promise.@resolve(@undefined);
-    });
-}
+        peerConnection.@privateGetStats(selector).@then(successCallback, errorCallback);
+
+        return @Promise.@resolve(@undefined);
+    });
+}

trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js

@@ -47 +47 @@
     return new @Promise(function (resolve, reject) {
         operations.@push(function() {
-            operation().then(resolve, reject).then(runNext, runNext);
+            operation().@then(resolve, reject).@then(runNext, runNext);
         });