<!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>[244938] 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/244938">244938</a></dd>
<dt>Author</dt> <dd>jiewen_tan@apple.com</dd>
<dt>Date</dt> <dd>2019-05-03 16:41:36 -0700 (Fri, 03 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[WebAuthN] A focused document should be required
https://bugs.webkit.org/show_bug.cgi?id=197543
<rdar://problem/50430989>

Reviewed by Brent Fulgham.

Source/WebCore:

This patch adds a check to see if the invoking document is focused before
calling into WebAuthN. This patch also removes some out-to-dated comments.

Test: http/wpt/webauthn/public-key-credential-unfocused-document.https.html

* Modules/credentialmanagement/CredentialsContainer.cpp:
(WebCore::CredentialsContainer::get):
(WebCore::CredentialsContainer::isCreate):
* Modules/webauthn/AuthenticatorCoordinator.cpp:
(WebCore::AuthenticatorCoordinator::create const):
(WebCore::AuthenticatorCoordinator::discoverFromExternalSource const):

LayoutTests:

* http/wpt/webauthn/public-key-credential-same-origin-with-ancestors.https.html:
* http/wpt/webauthn/public-key-credential-unfocused-document.https-expected.txt: Added.
* http/wpt/webauthn/public-key-credential-unfocused-document.https.html: Copied from LayoutTests/http/wpt/webauthn/public-key-credential-same-origin-with-ancestors.https.html.
* http/wpt/webauthn/resources/last-layer-frame.https.html:
* http/wpt/webauthn/resources/second-layer-frame.https.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttpwptwebauthnpublickeycredentialsameoriginwithancestorshttpshtml">trunk/LayoutTests/http/wpt/webauthn/public-key-credential-same-origin-with-ancestors.https.html</a></li>
<li><a href="#trunkLayoutTestshttpwptwebauthnresourceslastlayerframehttpshtml">trunk/LayoutTests/http/wpt/webauthn/resources/last-layer-frame.https.html</a></li>
<li><a href="#trunkLayoutTestshttpwptwebauthnresourcessecondlayerframehttpshtml">trunk/LayoutTests/http/wpt/webauthn/resources/second-layer-frame.https.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulescredentialmanagementCredentialsContainercpp">trunk/Source/WebCore/Modules/credentialmanagement/CredentialsContainer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebauthnAuthenticatorCoordinatorcpp">trunk/Source/WebCore/Modules/webauthn/AuthenticatorCoordinator.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttpwptwebauthnpublickeycredentialunfocuseddocumenthttpsexpectedtxt">trunk/LayoutTests/http/wpt/webauthn/public-key-credential-unfocused-document.https-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttpwptwebauthnpublickeycredentialunfocuseddocumenthttpshtml">trunk/LayoutTests/http/wpt/webauthn/public-key-credential-unfocused-document.https.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (244937 => 244938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-05-03 23:34:52 UTC (rev 244937)
+++ trunk/LayoutTests/ChangeLog 2019-05-03 23:41:36 UTC (rev 244938)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2019-05-03  Jiewen Tan  <jiewen_tan@apple.com>
+
+        [WebAuthN] A focused document should be required
+        https://bugs.webkit.org/show_bug.cgi?id=197543
+        <rdar://problem/50430989>
+
+        Reviewed by Brent Fulgham.
+
+        * http/wpt/webauthn/public-key-credential-same-origin-with-ancestors.https.html:
+        * http/wpt/webauthn/public-key-credential-unfocused-document.https-expected.txt: Added.
+        * http/wpt/webauthn/public-key-credential-unfocused-document.https.html: Copied from LayoutTests/http/wpt/webauthn/public-key-credential-same-origin-with-ancestors.https.html.
+        * http/wpt/webauthn/resources/last-layer-frame.https.html:
+        * http/wpt/webauthn/resources/second-layer-frame.https.html:
+
</ins><span class="cx"> 2019-05-03  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [iOS] set the default maximum camera count to 1 for enumerateDevices
</span></span></pre></div>
<a id="trunkLayoutTestshttpwptwebauthnpublickeycredentialsameoriginwithancestorshttpshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/wpt/webauthn/public-key-credential-same-origin-with-ancestors.https.html (244937 => 244938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/wpt/webauthn/public-key-credential-same-origin-with-ancestors.https.html  2019-05-03 23:34:52 UTC (rev 244937)
+++ trunk/LayoutTests/http/wpt/webauthn/public-key-credential-same-origin-with-ancestors.https.html     2019-05-03 23:41:36 UTC (rev 244938)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> <body>
</span><span class="cx">     <script>
</span><span class="cx">         promise_test(t => {
</span><del>-            return withCrossOriginIframe("last-layer-frame.https.html").then((message) => {
</del><ins>+            return withCrossOriginIframe("last-layer-frame.https.html?shouldFocus=true&exceptionMessage=The origin of the document is not the same as its ancestors.").then((message) => {
</ins><span class="cx">                 assert_equals(message.data, "PASS.");
</span><span class="cx">             });
</span><span class="cx">         }, "Tests that a frame that doesn't share the same origin with all its ancestors could not access the API.");
</span></span></pre></div>
<a id="trunkLayoutTestshttpwptwebauthnpublickeycredentialunfocuseddocumenthttpsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/wpt/webauthn/public-key-credential-unfocused-document.https-expected.txt (0 => 244938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/wpt/webauthn/public-key-credential-unfocused-document.https-expected.txt                          (rev 0)
+++ trunk/LayoutTests/http/wpt/webauthn/public-key-credential-unfocused-document.https-expected.txt     2019-05-03 23:41:36 UTC (rev 244938)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+  
+
+PASS Tests that a frame that doesn't have the focus could not access the API. 
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttpwptwebauthnpublickeycredentialunfocuseddocumenthttpshtmlfromrev244937trunkLayoutTestshttpwptwebauthnpublickeycredentialsameoriginwithancestorshttpshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/wpt/webauthn/public-key-credential-unfocused-document.https.html (from rev 244937, trunk/LayoutTests/http/wpt/webauthn/public-key-credential-same-origin-with-ancestors.https.html) (0 => 244938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/wpt/webauthn/public-key-credential-unfocused-document.https.html                          (rev 0)
+++ trunk/LayoutTests/http/wpt/webauthn/public-key-credential-unfocused-document.https.html     2019-05-03 23:41:36 UTC (rev 244938)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Web Authentication API: Tests that a frame that doesn't have the focus could not access the API.</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/utils.js"></script>
+    <script src="/common/get-host-info.sub.js"></script>
+    <script src="./resources/util.js"></script>
+</head>
+<body>
+    <iframe src=""></iframe>
+    <script>
+        promise_test(t => {
+            return withCrossOriginIframe("last-layer-frame.https.html?shouldFocus=false&exceptionMessage=The document is not focused.").then((message) => {
+                assert_equals(message.data, "PASS.");
+            });
+        }, "Tests that a frame that doesn't have the focus could not access the API.");
+    </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttpwptwebauthnresourceslastlayerframehttpshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/wpt/webauthn/resources/last-layer-frame.https.html (244937 => 244938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/wpt/webauthn/resources/last-layer-frame.https.html        2019-05-03 23:34:52 UTC (rev 244937)
+++ trunk/LayoutTests/http/wpt/webauthn/resources/last-layer-frame.https.html   2019-05-03 23:41:36 UTC (rev 244938)
</span><span class="lines">@@ -1,48 +1,61 @@
</span><del>-<script src="./util.js"></script>
-<script>
-function messageToTop(message) {
-    top.postMessage(message, "*");
-}
</del><ins>+<!DOCTYPE html>
+<html>
+<head>
+    <script src="./util.js"></script>
+</head>
+<body>
+    <input type="text" id="input">
+    <script>
+        const url = new URL(window.location.href);
+        const shouldFocus = url.searchParams.get("shouldFocus");
+        const exceptionMessage = url.searchParams.get("exceptionMessage");
</ins><span class="cx"> 
</span><del>-const makeOptions = {
-    publicKey: {
-        rp: {
-            name: "example.com"
-        },
-        user: {
-            name: "John Appleseed",
-            id: asciiToUint8Array("123456"),
-            displayName: "Appleseed",
-        },
-        challenge: asciiToUint8Array("123456"),
-        pubKeyCredParams: [{ type: "public-key", alg: -7 }]
-    }
-};
-const requestOptions = {
-    publicKey: {
-        challenge: asciiToUint8Array("123456"),
-    }
-};
</del><ins>+        function messageToTop(message) {
+            top.postMessage(message, "*");
+        }
</ins><span class="cx"> 
</span><ins>+        const makeOptions = {
+            publicKey: {
+                rp: {
+                    name: "example.com"
+                },
+                user: {
+                    name: "John Appleseed",
+                    id: asciiToUint8Array("123456"),
+                    displayName: "Appleseed",
+                },
+                challenge: asciiToUint8Array("123456"),
+                pubKeyCredParams: [{ type: "public-key", alg: -7 }]
+            }
+        };
+        const requestOptions = {
+            publicKey: {
+                challenge: asciiToUint8Array("123456"),
+            }
+        };
</ins><span class="cx"> 
</span><del>-navigator.credentials.create(makeOptions).then(
-    function(value) {
-        messageToTop("Access granted. " + value);
-    },
-    function(exception) {
-        if (exception.name == "NotAllowedError" && exception.message == "The origin of the document is not the same as its ancestors.")
-            return navigator.credentials.get(requestOptions);
-        else
-            messageToTop("Throw " + exception.name  + ".");
-    }
-).then(function(value) {
-        messageToTop("Access granted. " + value);
-    },
-    function(exception) {
-        if (exception.name == "NotAllowedError" && exception.message == "The origin of the document is not the same as its ancestors.")
-            messageToTop("PASS.");
-        else
-            messageToTop("Throw " + exception.name  + ".");
-    }
-);
-</script>
</del><ins>+        if (shouldFocus == "true")
+            input.focus();
+        navigator.credentials.create(makeOptions).then(
+            function(value) {
+                messageToTop("Access granted. " + value);
+            },
+            function(exception) {
+                if (exception.name == "NotAllowedError" && exception.message == exceptionMessage)
+                    return navigator.credentials.get(requestOptions);
+                else
+                    messageToTop("Throw " + exception.name  + ".");
+            }
+        ).then(function(value) {
+                messageToTop("Access granted. " + value);
+            },
+            function(exception) {
+                if (exception.name == "NotAllowedError" && exception.message == exceptionMessage)
+                    messageToTop("PASS.");
+                else
+                    messageToTop("Throw " + exception.name  + ".");
+            }
+        );
+    </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttpwptwebauthnresourcessecondlayerframehttpshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/wpt/webauthn/resources/second-layer-frame.https.html (244937 => 244938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/wpt/webauthn/resources/second-layer-frame.https.html      2019-05-03 23:34:52 UTC (rev 244937)
+++ trunk/LayoutTests/http/wpt/webauthn/resources/second-layer-frame.https.html 2019-05-03 23:41:36 UTC (rev 244938)
</span><span class="lines">@@ -3,6 +3,6 @@
</span><span class="cx"> <head>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-    <iframe src="last-layer-frame.https.html"></iframe>
</del><ins>+    <iframe src="last-layer-frame.https.html?shouldFocus=true&exceptionMessage=The origin of the document is not the same as its ancestors."></iframe>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (244937 => 244938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-05-03 23:34:52 UTC (rev 244937)
+++ trunk/Source/WebCore/ChangeLog      2019-05-03 23:41:36 UTC (rev 244938)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2019-05-02  Jiewen Tan  <jiewen_tan@apple.com>
+
+        [WebAuthN] A focused document should be required
+        https://bugs.webkit.org/show_bug.cgi?id=197543
+        <rdar://problem/50430989>
+
+        Reviewed by Brent Fulgham.
+
+        This patch adds a check to see if the invoking document is focused before
+        calling into WebAuthN. This patch also removes some out-to-dated comments.
+
+        Test: http/wpt/webauthn/public-key-credential-unfocused-document.https.html
+
+        * Modules/credentialmanagement/CredentialsContainer.cpp:
+        (WebCore::CredentialsContainer::get):
+        (WebCore::CredentialsContainer::isCreate):
+        * Modules/webauthn/AuthenticatorCoordinator.cpp:
+        (WebCore::AuthenticatorCoordinator::create const):
+        (WebCore::AuthenticatorCoordinator::discoverFromExternalSource const):
+
</ins><span class="cx"> 2019-05-03  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: DOM: rename "low power" to "display composited"
</span></span></pre></div>
<a id="trunkSourceWebCoreModulescredentialmanagementCredentialsContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/credentialmanagement/CredentialsContainer.cpp (244937 => 244938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/credentialmanagement/CredentialsContainer.cpp       2019-05-03 23:34:52 UTC (rev 244937)
+++ trunk/Source/WebCore/Modules/credentialmanagement/CredentialsContainer.cpp  2019-05-03 23:41:36 UTC (rev 244938)
</span><span class="lines">@@ -83,6 +83,12 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    // Extra.
+    if (!m_document->hasFocus()) {
+        promise.reject(Exception { NotAllowedError, "The document is not focused."_s });
+        return;
+    }
+
</ins><span class="cx">     m_document->page()->authenticatorCoordinator().discoverFromExternalSource(m_document->securityOrigin(), options.publicKey.value(), doesHaveSameOriginAsItsAncestors(), WTFMove(options.signal), WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -112,6 +118,12 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    // Extra.
+    if (!m_document->hasFocus()) {
+        promise.reject(Exception { NotAllowedError, "The document is not focused."_s });
+        return;
+    }
+
</ins><span class="cx">     m_document->page()->authenticatorCoordinator().create(m_document->securityOrigin(), options.publicKey.value(), doesHaveSameOriginAsItsAncestors(), WTFMove(options.signal), WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebauthnAuthenticatorCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webauthn/AuthenticatorCoordinator.cpp (244937 => 244938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webauthn/AuthenticatorCoordinator.cpp       2019-05-03 23:34:52 UTC (rev 244937)
+++ trunk/Source/WebCore/Modules/webauthn/AuthenticatorCoordinator.cpp  2019-05-03 23:41:36 UTC (rev 244938)
</span><span class="lines">@@ -166,10 +166,7 @@
</span><span class="cx">     auto clientDataJsonHash = produceClientDataJsonHash(clientDataJson);
</span><span class="cx"> 
</span><span class="cx">     // Step 4, 17-21.
</span><del>-    // Only platform attachments will be supported at this stage. Assuming one authenticator per device.
-    // Also, resident keys, user verifications and direct attestation are enforced at this tage.
-    // For better performance, transports of options.excludeCredentials are checked in LocalAuthenticator.
-    if (!m_client)  {
</del><ins>+    if (!m_client) {
</ins><span class="cx">         promise.reject(Exception { UnknownError, "Unknown internal error."_s });
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="lines">@@ -237,10 +234,7 @@
</span><span class="cx">     auto clientDataJsonHash = produceClientDataJsonHash(clientDataJson);
</span><span class="cx"> 
</span><span class="cx">     // Step 4, 14-19.
</span><del>-    // Only platform attachments will be supported at this stage. Assuming one authenticator per device.
-    // Also, resident keys, user verifications and direct attestation are enforced at this tage.
-    // For better performance, filtering of options.allowCredentials is done in LocalAuthenticator.
-    if (!m_client)  {
</del><ins>+    if (!m_client) {
</ins><span class="cx">         promise.reject(Exception { UnknownError, "Unknown internal error."_s });
</span><span class="cx">         return;
</span><span class="cx">     }
</span></span></pre>
</div>
</div>

</body>
</html>