content/browser/web_contents/web_drag_dest_mac.mm - Issue 207013003: Mark drags starting in web content as tainted to avoid file path forgery

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/web_drag_dest_mac.mm

Issue 207013003: Mark drags starting in web content as tainted to avoid file path forgery (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: More fixes and comment Created 6 years, 9 months 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/web_contents/web_drag_dest_gtk.cc ('k') | content/browser/web_contents/web_drag_source_gtk.cc » ('j') | ui/base/clipboard/clipboard_aurax11.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_drag_dest_mac.mm

diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm

index 8768bed657b59d4bb327364cfd5a66d241d35473..57720c7d93b77974ab40ccc75df4cf201f0a657d 100644

--- a/content/browser/web_contents/web_drag_dest_mac.mm

+++ b/content/browser/web_contents/web_drag_dest_mac.mm

@@ -253,6 +253,9 @@ int GetModifierFlags() {

DCHECK(pboard);

NSArray* types = [pboard types];

+ const bool renderer_tainted =

+ [types containsObject:ui::kChromeDragDummyPboardType];

// Get URL if possible. To avoid exposing file system paths to web content,

// filenames in the drag are not converted to file URLs.

ui::PopulateURLAndTitleFromPasteboard(&data->url,

@@ -280,7 +283,7 @@ int GetModifierFlags() {

}

// Get files.

- if ([types containsObject:NSFilenamesPboardType]) {

+ if ([types containsObject:NSFilenamesPboardType] && !renderer_tainted) {

NSArray* files = [pboard propertyListForType:NSFilenamesPboardType];

if ([files isKindOfClass:[NSArray class]] && [files count]) {

for (NSUInteger i = 0; i < [files count]; i++) {