Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/RejectedPromises.cpp

Issue 1474983004: Mute non-CORS cross origin promise rejection events (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updates Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "bindings/core/v8/RejectedPromises.h" 6 #include "bindings/core/v8/RejectedPromises.h"
7 7
8 #include "bindings/core/v8/ScopedPersistent.h" 8 #include "bindings/core/v8/ScopedPersistent.h"
9 #include "bindings/core/v8/ScriptState.h" 9 #include "bindings/core/v8/ScriptState.h"
10 #include "bindings/core/v8/ScriptValue.h" 10 #include "bindings/core/v8/ScriptValue.h"
(...skipping 10 matching lines...) Expand all
21 #include "public/platform/WebTaskRunner.h" 21 #include "public/platform/WebTaskRunner.h"
22 #include "public/platform/WebThread.h" 22 #include "public/platform/WebThread.h"
23 #include "wtf/Functional.h" 23 #include "wtf/Functional.h"
24 24
25 namespace blink { 25 namespace blink {
26 26
27 static const unsigned maxReportedHandlersPendingResolution = 1000; 27 static const unsigned maxReportedHandlersPendingResolution = 1000;
28 28
29 class RejectedPromises::Message final : public NoBaseWillBeGarbageCollectedFinal ized<RejectedPromises::Message> { 29 class RejectedPromises::Message final : public NoBaseWillBeGarbageCollectedFinal ized<RejectedPromises::Message> {
30 public: 30 public:
31 static PassOwnPtrWillBeRawPtr<Message> create(ScriptState* scriptState, v8:: Local<v8::Promise> promise, v8::Local<v8::Value> exception, const String& errorM essage, const String& resourceName, int scriptId, int lineNumber, int columnNumb er, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack) 31 static PassOwnPtrWillBeRawPtr<Message> create(ScriptState* scriptState, v8:: Local<v8::Promise> promise, v8::Local<v8::Value> exception, const String& errorM essage, const String& resourceName, int scriptId, int lineNumber, int columnNumb er, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack, AccessControlStatus corsS tatus)
32 { 32 {
33 return adoptPtrWillBeNoop(new Message(scriptState, promise, exception, e rrorMessage, resourceName, scriptId, lineNumber, columnNumber, callStack)); 33 return adoptPtrWillBeNoop(new Message(scriptState, promise, exception, e rrorMessage, resourceName, scriptId, lineNumber, columnNumber, callStack, corsSt atus));
34 } 34 }
35 35
36 DEFINE_INLINE_TRACE() 36 DEFINE_INLINE_TRACE()
37 { 37 {
38 visitor->trace(m_callStack); 38 visitor->trace(m_callStack);
39 } 39 }
40 40
41 bool isCollected() 41 bool isCollected()
42 { 42 {
43 return m_collected || !m_scriptState->contextIsValid(); 43 return m_collected || !m_scriptState->contextIsValid();
(...skipping 18 matching lines...) Expand all
62 62
63 ScriptState::Scope scope(m_scriptState); 63 ScriptState::Scope scope(m_scriptState);
64 v8::Local<v8::Value> value = m_promise.newLocal(m_scriptState->isolate() ); 64 v8::Local<v8::Value> value = m_promise.newLocal(m_scriptState->isolate() );
65 v8::Local<v8::Value> reason = m_exception.newLocal(m_scriptState->isolat e()); 65 v8::Local<v8::Value> reason = m_exception.newLocal(m_scriptState->isolat e());
66 // Either collected or https://crbug.com/450330 66 // Either collected or https://crbug.com/450330
67 if (value.IsEmpty() || !value->IsPromise()) 67 if (value.IsEmpty() || !value->IsPromise())
68 return; 68 return;
69 ASSERT(!hasHandler()); 69 ASSERT(!hasHandler());
70 70
71 EventTarget* target = executionContext->errorEventTarget(); 71 EventTarget* target = executionContext->errorEventTarget();
72 if (RuntimeEnabledFeatures::promiseRejectionEventEnabled() && target) { 72 if (RuntimeEnabledFeatures::promiseRejectionEventEnabled() && target && !executionContext->shouldSanitizeScriptError(m_resourceName, m_corsStatus)) {
73 PromiseRejectionEventInit init; 73 PromiseRejectionEventInit init;
74 init.setPromise(ScriptPromise(m_scriptState, value)); 74 init.setPromise(ScriptPromise(m_scriptState, value));
75 init.setReason(ScriptValue(m_scriptState, reason)); 75 init.setReason(ScriptValue(m_scriptState, reason));
76 init.setCancelable(true); 76 init.setCancelable(true);
77 RefPtrWillBeRawPtr<PromiseRejectionEvent> event = PromiseRejectionEv ent::create(m_scriptState, EventTypeNames::unhandledrejection, init); 77 RefPtrWillBeRawPtr<PromiseRejectionEvent> event = PromiseRejectionEv ent::create(m_scriptState, EventTypeNames::unhandledrejection, init);
78 // Log to console if event was not preventDefault()'ed. 78 // Log to console if event was not preventDefault()'ed.
79 m_shouldLogToConsole = target->dispatchEvent(event); 79 m_shouldLogToConsole = target->dispatchEvent(event);
80 } 80 }
81 81
82 if (m_shouldLogToConsole) { 82 if (m_shouldLogToConsole) {
(...skipping 27 matching lines...) Expand all
110 return; 110 return;
111 111
112 ScriptState::Scope scope(m_scriptState); 112 ScriptState::Scope scope(m_scriptState);
113 v8::Local<v8::Value> value = m_promise.newLocal(m_scriptState->isolate() ); 113 v8::Local<v8::Value> value = m_promise.newLocal(m_scriptState->isolate() );
114 v8::Local<v8::Value> reason = m_exception.newLocal(m_scriptState->isolat e()); 114 v8::Local<v8::Value> reason = m_exception.newLocal(m_scriptState->isolat e());
115 // Either collected or https://crbug.com/450330 115 // Either collected or https://crbug.com/450330
116 if (value.IsEmpty() || !value->IsPromise()) 116 if (value.IsEmpty() || !value->IsPromise())
117 return; 117 return;
118 118
119 EventTarget* target = executionContext->errorEventTarget(); 119 EventTarget* target = executionContext->errorEventTarget();
120 if (RuntimeEnabledFeatures::promiseRejectionEventEnabled() && target) { 120 if (RuntimeEnabledFeatures::promiseRejectionEventEnabled() && target && !executionContext->shouldSanitizeScriptError(m_resourceName, m_corsStatus)) {
121 PromiseRejectionEventInit init; 121 PromiseRejectionEventInit init;
122 init.setPromise(ScriptPromise(m_scriptState, value)); 122 init.setPromise(ScriptPromise(m_scriptState, value));
123 init.setReason(ScriptValue(m_scriptState, reason)); 123 init.setReason(ScriptValue(m_scriptState, reason));
124 RefPtrWillBeRawPtr<PromiseRejectionEvent> event = PromiseRejectionEv ent::create(m_scriptState, EventTypeNames::rejectionhandled, init); 124 RefPtrWillBeRawPtr<PromiseRejectionEvent> event = PromiseRejectionEv ent::create(m_scriptState, EventTypeNames::rejectionhandled, init);
125 target->dispatchEvent(event); 125 target->dispatchEvent(event);
126 } 126 }
127 127
128 if (m_shouldLogToConsole) { 128 if (m_shouldLogToConsole) {
129 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage:: create(JSMessageSource, RevokedErrorMessageLevel, "Handler added to rejected pro mise"); 129 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage:: create(JSMessageSource, RevokedErrorMessageLevel, "Handler added to rejected pro mise");
130 consoleMessage->setRelatedMessageId(m_consoleMessageId); 130 consoleMessage->setRelatedMessageId(m_consoleMessageId);
(...skipping 18 matching lines...) Expand all
149 bool hasHandler() 149 bool hasHandler()
150 { 150 {
151 if (isCollected()) 151 if (isCollected())
152 return false; 152 return false;
153 ScriptState::Scope scope(m_scriptState); 153 ScriptState::Scope scope(m_scriptState);
154 v8::Local<v8::Value> value = m_promise.newLocal(m_scriptState->isolate() ); 154 v8::Local<v8::Value> value = m_promise.newLocal(m_scriptState->isolate() );
155 return v8::Local<v8::Promise>::Cast(value)->HasHandler(); 155 return v8::Local<v8::Promise>::Cast(value)->HasHandler();
156 } 156 }
157 157
158 private: 158 private:
159 Message(ScriptState* scriptState, v8::Local<v8::Promise> promise, v8::Local< v8::Value> exception, const String& errorMessage, const String& resourceName, in t scriptId, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallS tack> callStack) 159 Message(ScriptState* scriptState, v8::Local<v8::Promise> promise, v8::Local< v8::Value> exception, const String& errorMessage, const String& resourceName, in t scriptId, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallS tack> callStack, AccessControlStatus corsStatus)
160 : m_scriptState(scriptState) 160 : m_scriptState(scriptState)
161 , m_promise(scriptState->isolate(), promise) 161 , m_promise(scriptState->isolate(), promise)
162 , m_exception(scriptState->isolate(), exception) 162 , m_exception(scriptState->isolate(), exception)
163 , m_errorMessage(errorMessage) 163 , m_errorMessage(errorMessage)
164 , m_resourceName(resourceName) 164 , m_resourceName(resourceName)
165 , m_scriptId(scriptId) 165 , m_scriptId(scriptId)
166 , m_lineNumber(lineNumber) 166 , m_lineNumber(lineNumber)
167 , m_columnNumber(columnNumber) 167 , m_columnNumber(columnNumber)
168 , m_callStack(callStack) 168 , m_callStack(callStack)
169 , m_consoleMessageId(0) 169 , m_consoleMessageId(0)
170 , m_collected(false) 170 , m_collected(false)
171 , m_shouldLogToConsole(true) 171 , m_shouldLogToConsole(true)
172 , m_corsStatus(corsStatus)
172 { 173 {
173 } 174 }
174 175
175 static void didCollectPromise(const v8::WeakCallbackInfo<Message>& data) 176 static void didCollectPromise(const v8::WeakCallbackInfo<Message>& data)
176 { 177 {
177 data.GetParameter()->m_collected = true; 178 data.GetParameter()->m_collected = true;
178 data.GetParameter()->m_promise.clear(); 179 data.GetParameter()->m_promise.clear();
179 } 180 }
180 181
181 static void didCollectException(const v8::WeakCallbackInfo<Message>& data) 182 static void didCollectException(const v8::WeakCallbackInfo<Message>& data)
182 { 183 {
183 data.GetParameter()->m_exception.clear(); 184 data.GetParameter()->m_exception.clear();
184 } 185 }
185 186
186 ScriptState* m_scriptState; 187 ScriptState* m_scriptState;
187 ScopedPersistent<v8::Promise> m_promise; 188 ScopedPersistent<v8::Promise> m_promise;
188 ScopedPersistent<v8::Value> m_exception; 189 ScopedPersistent<v8::Value> m_exception;
189 String m_errorMessage; 190 String m_errorMessage;
190 String m_resourceName; 191 String m_resourceName;
191 int m_scriptId; 192 int m_scriptId;
192 int m_lineNumber; 193 int m_lineNumber;
193 int m_columnNumber; 194 int m_columnNumber;
194 RefPtrWillBeMember<ScriptCallStack> m_callStack; 195 RefPtrWillBeMember<ScriptCallStack> m_callStack;
195 unsigned m_consoleMessageId; 196 unsigned m_consoleMessageId;
196 bool m_collected; 197 bool m_collected;
197 bool m_shouldLogToConsole; 198 bool m_shouldLogToConsole;
199 AccessControlStatus m_corsStatus;
198 }; 200 };
199 201
200 RejectedPromises::RejectedPromises() 202 RejectedPromises::RejectedPromises()
201 { 203 {
202 } 204 }
203 205
204 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(RejectedPromises); 206 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(RejectedPromises);
205 207
206 DEFINE_TRACE(RejectedPromises) 208 DEFINE_TRACE(RejectedPromises)
207 { 209 {
208 visitor->trace(m_queue); 210 visitor->trace(m_queue);
209 visitor->trace(m_reportedAsErrors); 211 visitor->trace(m_reportedAsErrors);
210 } 212 }
211 213
212 void RejectedPromises::rejectedWithNoHandler(ScriptState* scriptState, v8::Promi seRejectMessage data, const String& errorMessage, const String& resourceName, in t scriptId, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallS tack> callStack) 214 void RejectedPromises::rejectedWithNoHandler(ScriptState* scriptState, v8::Promi seRejectMessage data, const String& errorMessage, const String& resourceName, in t scriptId, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallS tack> callStack, AccessControlStatus corsStatus)
213 { 215 {
214 m_queue.append(Message::create(scriptState, data.GetPromise(), data.GetValue (), errorMessage, resourceName, scriptId, lineNumber, columnNumber, callStack)); 216 m_queue.append(Message::create(scriptState, data.GetPromise(), data.GetValue (), errorMessage, resourceName, scriptId, lineNumber, columnNumber, callStack, c orsStatus));
215 } 217 }
216 218
217 void RejectedPromises::handlerAdded(v8::PromiseRejectMessage data) 219 void RejectedPromises::handlerAdded(v8::PromiseRejectMessage data)
218 { 220 {
219 // First look it up in the pending messages and fast return, it'll be covere d by processQueue(). 221 // First look it up in the pending messages and fast return, it'll be covere d by processQueue().
220 for (auto it = m_queue.begin(); it != m_queue.end(); ++it) { 222 for (auto it = m_queue.begin(); it != m_queue.end(); ++it) {
221 if (!(*it)->isCollected() && (*it)->hasPromise(data.GetPromise())) { 223 if (!(*it)->isCollected() && (*it)->hasPromise(data.GetPromise())) {
222 m_queue.remove(it); 224 m_queue.remove(it);
223 return; 225 return;
224 } 226 }
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 } 284 }
283 } 285 }
284 } 286 }
285 287
286 void RejectedPromises::revokeNow(PassOwnPtrWillBeRawPtr<Message> message) 288 void RejectedPromises::revokeNow(PassOwnPtrWillBeRawPtr<Message> message)
287 { 289 {
288 message->revoke(); 290 message->revoke();
289 } 291 }
290 292
291 } // namespace blink 293 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698