Changeset 202130 in webkit

Timestamp:

Jun 16, 2016 11:12:41 AM (8 years ago)

Author:

adam.bergkvist@ericsson.com

Message:

WebRTC: Check type of this in RTCPeerConnection JS built-in functions
​https://bugs.webkit.org/show_bug.cgi?id=151303

Reviewed by Youenn Fablet.

Source/WebCore:

Check type of 'this' in RTCPeerConnection JS built-in functions.

Test: fast/mediastream/RTCPeerConnection-js-built-ins-check-this.html

• Modules/mediastream/RTCPeerConnection.js:

(createOffer):
(createAnswer):
(setLocalDescription):
(setRemoteDescription):
(addIceCandidate):
(getStats):
Reject if 'this' isn't of type RTCPeerConnection.

• Modules/mediastream/RTCPeerConnectionInternals.js:

(isRTCPeerConnection):
Add helper function to perform type check. Needs further robustifying.

LayoutTests:

Verify that the RTCPeerConnection JS built-in methods checks 'this'. The test has expected
failures (bug: ​http://webkit.org/b/158831).

• fast/mediastream/RTCPeerConnection-js-built-ins-check-this-expected.txt: Added.
• fast/mediastream/RTCPeerConnection-js-built-ins-check-this.html: Added.
• platform/mac/TestExpectations:

The mac port does not build with WEB_RTC enabled yet.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-js-built-ins-check-this-expected.txt (added)
• LayoutTests/fast/mediastream/RTCPeerConnection-js-built-ins-check-this.html (added)
• LayoutTests/platform/mac/TestExpectations (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-06-16  Adam Bergkvist  <adam.bergkvist@ericsson.com>
+
+        WebRTC: Check type of this in RTCPeerConnection JS built-in functions
+        https://bugs.webkit.org/show_bug.cgi?id=151303
+
+        Reviewed by Youenn Fablet.
+
+        Verify that the RTCPeerConnection JS built-in methods checks 'this'. The test has expected
+        failures (bug: http://webkit.org/b/158831).
+
+        * fast/mediastream/RTCPeerConnection-js-built-ins-check-this-expected.txt: Added.
+        * fast/mediastream/RTCPeerConnection-js-built-ins-check-this.html: Added.
+        * platform/mac/TestExpectations:
+        The mac port does not build with WEB_RTC enabled yet.
+
 2016-06-16  Dean Jackson  <dino@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -186 +186 @@
 fast/mediastream/RTCPeerConnection-stable.html
 fast/mediastream/RTCPeerConnection.html
+fast/mediastream/RTCPeerConnection-js-built-ins-check-this.html
 fast/mediastream/RTCPeerConnection-inspect-offer.html
 fast/mediastream/RTCPeerConnection-add-removeTrack.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-16  Adam Bergkvist  <adam.bergkvist@ericsson.com>
+
+        WebRTC: Check type of this in RTCPeerConnection JS built-in functions
+        https://bugs.webkit.org/show_bug.cgi?id=151303
+
+        Reviewed by Youenn Fablet.
+
+        Check type of 'this' in RTCPeerConnection JS built-in functions.
+
+        Test: fast/mediastream/RTCPeerConnection-js-built-ins-check-this.html
+
+        * Modules/mediastream/RTCPeerConnection.js:
+        (createOffer):
+        (createAnswer):
+        (setLocalDescription):
+        (setRemoteDescription):
+        (addIceCandidate):
+        (getStats):
+        Reject if 'this' isn't of type RTCPeerConnection.
+        * Modules/mediastream/RTCPeerConnectionInternals.js:
+        (isRTCPeerConnection):
+        Add helper function to perform type check. Needs further robustifying.
+
 2016-06-16  Myles C. Maxfield  <mmaxfield@apple.com>
 

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

@@ -35 +35 @@
     "use strict";
 
+    if (!@isRTCPeerConnection(this))
+        return @Promise.@reject(new @TypeError("Function should be called on an RTCPeerConnection"));
+
     const peerConnection = this;
 
@@ -56 +59 @@
     "use strict";
 
+    if (!@isRTCPeerConnection(this))
+        return @Promise.@reject(new @TypeError("Function should be called on an RTCPeerConnection"));
+
     const peerConnection = this;
 
@@ -76 +82 @@
 {
     "use strict";
+
+    if (!@isRTCPeerConnection(this))
+        return @Promise.@reject(new @TypeError("Function should be called on an RTCPeerConnection"));
 
     const peerConnection = this;
@@ -103 +112 @@
     "use strict";
 
+    if (!@isRTCPeerConnection(this))
+        return @Promise.@reject(new @TypeError("Function should be called on an RTCPeerConnection"));
+
     const peerConnection = this;
 
@@ -128 +140 @@
 {
     "use strict";
+
+    if (!@isRTCPeerConnection(this))
+        return @Promise.@reject(new @TypeError("Function should be called on an RTCPeerConnection"));
 
     const peerConnection = this;
@@ -155 +170 @@
     "use strict";
 
+    if (!@isRTCPeerConnection(this))
+        return @Promise.@reject(new @TypeError("Function should be called on an RTCPeerConnection"));
+
     const peerConnection = this;
 

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

@@ -129 +129 @@
     return legacyMode(successCallback, errorCallback, args[2]);
 }
+
+function isRTCPeerConnection(connection)
+{
+    "use strict";
+
+    // FIXME: Robustify this check (http://webkit.org/b/158831)
+    return @isObject(connection) && !!connection.@queuedCreateOffer;
+}