<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[248796] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/248796">248796</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2019-08-16 14:03:44 -0700 (Fri, 16 Aug 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Re-land] ProxyObject should not be allow to access its target's private properties.
https://bugs.webkit.org/show_bug.cgi?id=200739
<rdar://problem/53972768>

Reviewed by Yusuke Suzuki.

JSTests:

* stress/proxy-should-not-be-allowed-to-access-private-properties-of-target.js: Copied from JSTests/stress/proxy-should-not-be-allowed-to-access-private-properties-of-target.js.
* stress/proxy-with-private-symbols.js:

Source/JavaScriptCore:

Re-landing this after <a href="http://trac.webkit.org/projects/webkit/changeset/200829">r200829</a> which resolves the test262 failure uncovered by this patch.

* runtime/ProxyObject.cpp:
(JSC::performProxyGet):
(JSC::ProxyObject::performInternalMethodGetOwnProperty):
(JSC::ProxyObject::performHasProperty):
(JSC::ProxyObject::performPut):
(JSC::ProxyObject::performDelete):
(JSC::ProxyObject::performDefineOwnProperty):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestsstressproxywithprivatesymbolsjs">trunk/JSTests/stress/proxy-with-private-symbols.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeProxyObjectcpp">trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressproxyshouldnotbeallowedtoaccessprivatepropertiesoftargetjs">trunk/JSTests/stress/proxy-should-not-be-allowed-to-access-private-properties-of-target.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (248795 => 248796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog  2019-08-16 20:59:29 UTC (rev 248795)
+++ trunk/JSTests/ChangeLog     2019-08-16 21:03:44 UTC (rev 248796)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-08-16  Mark Lam  <mark.lam@apple.com>
+
+        [Re-land] ProxyObject should not be allow to access its target's private properties.
+        https://bugs.webkit.org/show_bug.cgi?id=200739
+        <rdar://problem/53972768>
+
+        Reviewed by Yusuke Suzuki.
+
+        * stress/proxy-should-not-be-allowed-to-access-private-properties-of-target.js: Copied from JSTests/stress/proxy-should-not-be-allowed-to-access-private-properties-of-target.js.
+        * stress/proxy-with-private-symbols.js:
+
</ins><span class="cx"> 2019-08-16  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [JSC] Promise.prototype.finally should accept non-promise objects
</span></span></pre></div>
<a id="trunkJSTestsstressproxyshouldnotbeallowedtoaccessprivatepropertiesoftargetjsfromrev248785trunkJSTestsstressproxyshouldnotbeallowedtoaccessprivatepropertiesoftargetjs"></a>
<div class="copfile"><h4>Copied: trunk/JSTests/stress/proxy-should-not-be-allowed-to-access-private-properties-of-target.js (from rev 248785, trunk/JSTests/stress/proxy-should-not-be-allowed-to-access-private-properties-of-target.js) (0 => 248796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/proxy-should-not-be-allowed-to-access-private-properties-of-target.js                               (rev 0)
+++ trunk/JSTests/stress/proxy-should-not-be-allowed-to-access-private-properties-of-target.js  2019-08-16 21:03:44 UTC (rev 248796)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+var foo = (function* bar() {
+    try {
+        yield* x;
+    } finally {
+        try {
+            y;
+        } finally {
+            return;
+        }
+    }
+}) ();
+
+var x = new Proxy(foo, {});
+try {
+    x.next();
+} catch (e) {
+    exception = e;
+}
+
+if (exception != 'TypeError: |this| should be a generator')
+    throw "FAILED";
</ins></span></pre></div>
<a id="trunkJSTestsstressproxywithprivatesymbolsjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/stress/proxy-with-private-symbols.js (248795 => 248796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/proxy-with-private-symbols.js       2019-08-16 20:59:29 UTC (rev 248795)
+++ trunk/JSTests/stress/proxy-with-private-symbols.js  2019-08-16 21:03:44 UTC (rev 248796)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">             assert(e.message === "%ArrayIteratorPrototype%.next requires that |this| be an Array Iterator instance");
</span><span class="cx">             threw = true;
</span><span class="cx">         }
</span><del>-        assert(!threw);
</del><ins>+        assert(threw);
</ins><span class="cx">         assert(!sawPrivateSymbolAsString);
</span><span class="cx">         sawPrivateSymbolAsString = false;
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (248795 => 248796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2019-08-16 20:59:29 UTC (rev 248795)
+++ trunk/Source/JavaScriptCore/ChangeLog       2019-08-16 21:03:44 UTC (rev 248796)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2019-08-16  Mark Lam  <mark.lam@apple.com>
+
+        [Re-land] ProxyObject should not be allow to access its target's private properties.
+        https://bugs.webkit.org/show_bug.cgi?id=200739
+        <rdar://problem/53972768>
+
+        Reviewed by Yusuke Suzuki.
+
+        Re-landing this after r200829 which resolves the test262 failure uncovered by this patch.
+
+        * runtime/ProxyObject.cpp:
+        (JSC::performProxyGet):
+        (JSC::ProxyObject::performInternalMethodGetOwnProperty):
+        (JSC::ProxyObject::performHasProperty):
+        (JSC::ProxyObject::performPut):
+        (JSC::ProxyObject::performDelete):
+        (JSC::ProxyObject::performDefineOwnProperty):
+
</ins><span class="cx"> 2019-08-16  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [JSC] Promise.prototype.finally should accept non-promise objects
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp (248795 => 248796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp      2019-08-16 20:59:29 UTC (rev 248795)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2019-08-16 21:03:44 UTC (rev 248796)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2016-2017 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2016-2019 Apple Inc. All Rights Reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     if (propertyName.isPrivateName())
</span><del>-        return performDefaultGet();
</del><ins>+        return jsUndefined();
</ins><span class="cx"> 
</span><span class="cx">     JSValue handlerValue = proxyObject->handler();
</span><span class="cx">     if (handlerValue.isNull())
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     if (propertyName.isPrivateName())
</span><del>-        RELEASE_AND_RETURN(scope, performDefaultGetOwnProperty());
</del><ins>+        return false;
</ins><span class="cx"> 
</span><span class="cx">     JSValue handlerValue = this->handler();
</span><span class="cx">     if (handlerValue.isNull()) {
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     if (propertyName.isPrivateName())
</span><del>-        RELEASE_AND_RETURN(scope, performDefaultHasProperty());
</del><ins>+        return false;
</ins><span class="cx"> 
</span><span class="cx">     JSValue handlerValue = this->handler();
</span><span class="cx">     if (handlerValue.isNull()) {
</span><span class="lines">@@ -425,7 +425,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (propertyName.isPrivateName())
</span><del>-        RELEASE_AND_RETURN(scope, performDefaultPut());
</del><ins>+        return false;
</ins><span class="cx"> 
</span><span class="cx">     JSValue handlerValue = this->handler();
</span><span class="cx">     if (handlerValue.isNull()) {
</span><span class="lines">@@ -628,7 +628,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (propertyName.isPrivateName())
</span><del>-        RELEASE_AND_RETURN(scope, performDefaultDelete());
</del><ins>+        return false;
</ins><span class="cx"> 
</span><span class="cx">     JSValue handlerValue = this->handler();
</span><span class="cx">     if (handlerValue.isNull()) {
</span><span class="lines">@@ -827,7 +827,7 @@
</span><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     if (propertyName.isPrivateName())
</span><del>-        return performDefaultDefineOwnProperty();
</del><ins>+        return false;
</ins><span class="cx"> 
</span><span class="cx">     JSValue handlerValue = this->handler();
</span><span class="cx">     if (handlerValue.isNull()) {
</span></span></pre>
</div>
</div>

</body>
</html>