Skip to content

GitLab

T
tangled
Commit 5e3c6036 authored by Ayu Ishii's avatar Ayu Ishii Committed by Commit Bot
Browse files
Options

[sms] Restrict SMS Receiver API to Top Level Frames 

This change restrictes the SMS Receiver API to only be used from top level
frames to prevent malicious sites from accessing the one time passcodes
for signup. Restriction in the browser process will be added in a
following CL.

Bug: 955765
Change-Id: Ie11e3b1fc6c9bf4597bde880d5083fec7255b79a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1594211Reviewed-by: default avatarReilly Grant <reillyg@chromium.org>
Commit-Queue: Ayu Ishii <ayui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#658694}
parent 5f13ee10
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 4 deletions
third_party/blink/renderer/modules/sms/sms_receiver.cc
View file @ 5e3c6036
...@@ -8,7 +8,9 @@ ...@@ -8,7 +8,9 @@
#include "services/service_manager/public/cpp/interface_provider.h" #include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/blink/public/mojom/sms/sms_manager.mojom-blink.h" #include "third_party/blink/public/mojom/sms/sms_manager.mojom-blink.h"
#include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
#include "third_party/blink/renderer/core/dom/dom_exception.h" #include "third_party/blink/renderer/core/dom/dom_exception.h"
#include "third_party/blink/renderer/core/frame/local_frame.h"
#include "third_party/blink/renderer/modules/sms/sms.h" #include "third_party/blink/renderer/modules/sms/sms.h"
#include "third_party/blink/renderer/modules/sms/sms_receiver_options.h" #include "third_party/blink/renderer/modules/sms/sms_receiver_options.h"
#include "third_party/blink/renderer/platform/bindings/name_client.h" #include "third_party/blink/renderer/platform/bindings/name_client.h"
...@@ -70,6 +72,14 @@ ScriptPromise SMSReceiver::start(ScriptState* script_state) { ...@@ -70,6 +72,14 @@ ScriptPromise SMSReceiver::start(ScriptState* script_state) {
ExecutionContext* context = ExecutionContext::From(script_state); ExecutionContext* context = ExecutionContext::From(script_state);
DCHECK(context->IsContextThread()); DCHECK(context->IsContextThread());
LocalFrame* frame = GetFrame();
if (!frame->IsMainFrame()) {
return ScriptPromise::RejectWithDOMException(
script_state,
DOMException::Create(DOMExceptionCode::kNotAllowedError,
"Must be in top-level browsing context."));
}
StartMonitoring(); StartMonitoring();
return ScriptPromise::CastUndefined(script_state); return ScriptPromise::CastUndefined(script_state);
......
third_party/blink/web_tests/external/wpt/sms/constructor.tentative.https.any.js
View file @ 5e3c6036
...@@ -56,5 +56,5 @@ promise_test(async t => { ...@@ -56,5 +56,5 @@ promise_test(async t => {
}, 'constructor uses a default value for the timeout when none is passed'); }, 'constructor uses a default value for the timeout when none is passed');
promise_test(async t => { promise_test(async t => {
new IdleDetector({timeout: undefined}); new SMSReceiver({timeout: undefined});
}, 'constructor uses a default value for the timeout'); }, 'constructor uses a default value for the timeout');
third_party/blink/web_tests/external/wpt/sms/resources/iframe.html 0 → 100644
View file @ 5e3c6036
<script>
'use strict';
new SMSReceiver().start().catch(error => {
window.parent.postMessage({errorType: error.name}, '*');
});
</script>
third_party/blink/web_tests/external/wpt/sms/sms-top-level-frame-only.https.html 0 → 100644
View file @ 5e3c6036
<!DOCTYPE html>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<body>
<script>
'use strict';
promise_test(async t => {
const messageWatcher = new EventWatcher(t, window, "message");
var iframe = document.createElement("iframe");
iframe.src = "resources/iframe.html"
document.body.appendChild(iframe);
const message = await messageWatcher.wait_for("message");
assert_equals(message.data.errorType, "NotAllowedError");
}, "Test SMSReceiver API disabled in iframes");
</script>
</body>
third_party/blink/web_tests/external/wpt/sms/sms_receiver.idl
View file @ 5e3c6036
[ [
SecureContext, SecureContext,
Exposed=(Window,DedicatedWorker), Exposed=(Window,DedicatedWorker)]
RuntimeEnabled=SmsRetrieval]
interface SMS { interface SMS {
readonly attribute DOMString content; readonly attribute DOMString content;
}; };
...@@ -18,4 +17,4 @@ dictionary SMSReceiverOptions { ...@@ -18,4 +17,4 @@ dictionary SMSReceiverOptions {
readonly attribute SMS sms; readonly attribute SMS sms;
attribute EventHandler onchange; attribute EventHandler onchange;
Promise<void> start(); Promise<void> start();
}; };
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment