<!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>[211236] trunk/Source/WebCore</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/211236">211236</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2017-01-26 15:50:28 -0800 (Thu, 26 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[QuickLook] Create temporary files with NSFileProtectionCompleteUnlessOpen
https://bugs.webkit.org/show_bug.cgi?id=167455
<rdar://problem/12499118>
Reviewed by David Kilzer.
Add the NSFileProtectionKey attribute with value NSFileProtectionCompleteUnlessOpen to
temporary directories created for QuickLook files. Also:
1. Stop calling -[NSFileManager _web_pathWithUniqueFilenameForPath:], since the temporary
directory is already unique and only one file will be placed inside it.
2. Create the temporary file with -[NSFileManager _web_createFileAtPath:contents:attributes:]
instead of with -[NSFileManager _web_createFileAtPathWithIntermediateDirectories:contents:attributes:directoryAttributes:],
since the intermediate directories were already created by createTemporaryDirectory().
3. Explicitly set the temporary directory's attributes with
-[NSFileManager setAttributes:ofItemAtPath:error:].
4. Append the lastPathComponent of fileName to downloadDirectory to ensure fileName isn't
really a relative path.
* loader/ios/QuickLook.h: Stopped declaring QLFileAttributes() and QLDirectoryAttributes().
* loader/ios/QuickLook.mm:
(WebCore::temporaryFileAttributes): Renamed from QLFileAttributes().
(WebCore::temporaryDirectoryAttributes): Renamed from QLDirectoryAttributes().
(WebCore::createTemporaryFileForQuickLook):
(WebCore::QLFileAttributes): Deleted.
(WebCore::QLDirectoryAttributes): Deleted.
* platform/spi/cocoa/NSFileManagerSPI.h: Declared -_web_createFileAtPath:contents:attributes:
and removed declarations for -_web_createFileAtPathWithIntermediateDirectories:contents:attributes:directoryAttributes:
and -_web_pathWithUniqueFilenameForPath:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderiosQuickLookh">trunk/Source/WebCore/loader/ios/QuickLook.h</a></li>
<li><a href="#trunkSourceWebCoreloaderiosQuickLookmm">trunk/Source/WebCore/loader/ios/QuickLook.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaNSFileManagerSPIh">trunk/Source/WebCore/platform/spi/cocoa/NSFileManagerSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211235 => 211236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-26 23:47:53 UTC (rev 211235)
+++ trunk/Source/WebCore/ChangeLog 2017-01-26 23:50:28 UTC (rev 211236)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2017-01-26 Andy Estes <aestes@apple.com>
+
+ [QuickLook] Create temporary files with NSFileProtectionCompleteUnlessOpen
+ https://bugs.webkit.org/show_bug.cgi?id=167455
+ <rdar://problem/12499118>
+
+ Reviewed by David Kilzer.
+
+ Add the NSFileProtectionKey attribute with value NSFileProtectionCompleteUnlessOpen to
+ temporary directories created for QuickLook files. Also:
+
+ 1. Stop calling -[NSFileManager _web_pathWithUniqueFilenameForPath:], since the temporary
+ directory is already unique and only one file will be placed inside it.
+ 2. Create the temporary file with -[NSFileManager _web_createFileAtPath:contents:attributes:]
+ instead of with -[NSFileManager _web_createFileAtPathWithIntermediateDirectories:contents:attributes:directoryAttributes:],
+ since the intermediate directories were already created by createTemporaryDirectory().
+ 3. Explicitly set the temporary directory's attributes with
+ -[NSFileManager setAttributes:ofItemAtPath:error:].
+ 4. Append the lastPathComponent of fileName to downloadDirectory to ensure fileName isn't
+ really a relative path.
+
+ * loader/ios/QuickLook.h: Stopped declaring QLFileAttributes() and QLDirectoryAttributes().
+ * loader/ios/QuickLook.mm:
+ (WebCore::temporaryFileAttributes): Renamed from QLFileAttributes().
+ (WebCore::temporaryDirectoryAttributes): Renamed from QLDirectoryAttributes().
+ (WebCore::createTemporaryFileForQuickLook):
+ (WebCore::QLFileAttributes): Deleted.
+ (WebCore::QLDirectoryAttributes): Deleted.
+ * platform/spi/cocoa/NSFileManagerSPI.h: Declared -_web_createFileAtPath:contents:attributes:
+ and removed declarations for -_web_createFileAtPathWithIntermediateDirectories:contents:attributes:directoryAttributes:
+ and -_web_pathWithUniqueFilenameForPath:
+
</ins><span class="cx"> 2017-01-26 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Pointer lock events should be delivered directly to the target element
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderiosQuickLookh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ios/QuickLook.h (211235 => 211236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ios/QuickLook.h 2017-01-26 23:47:53 UTC (rev 211235)
+++ trunk/Source/WebCore/loader/ios/QuickLook.h 2017-01-26 23:50:28 UTC (rev 211236)
</span><span class="lines">@@ -52,10 +52,6 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT NSSet *QLPreviewGetSupportedMIMETypesSet();
</span><span class="cx">
</span><del>-// Used for setting the permissions on the saved QL content
-NSDictionary *QLFileAttributes();
-NSDictionary *QLDirectoryAttributes();
-
</del><span class="cx"> WEBCORE_EXPORT void addQLPreviewConverterWithFileForURL(NSURL *, id converter, NSString *fileName);
</span><span class="cx"> WEBCORE_EXPORT NSString *qlPreviewConverterFileNameForURL(NSURL *);
</span><span class="cx"> WEBCORE_EXPORT NSString *qlPreviewConverterUTIForURL(NSURL *);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderiosQuickLookmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ios/QuickLook.mm (211235 => 211236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ios/QuickLook.mm 2017-01-26 23:47:53 UTC (rev 211235)
+++ trunk/Source/WebCore/loader/ios/QuickLook.mm 2017-01-26 23:50:28 UTC (rev 211236)
</span><span class="lines">@@ -49,28 +49,6 @@
</span><span class="cx"> return set.get().get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NSDictionary *WebCore::QLFileAttributes()
-{
- // Set file perms to owner read/write only
- NSNumber *filePOSIXPermissions = [NSNumber numberWithInteger:(WEB_UREAD | WEB_UWRITE)];
- static NSDictionary *dictionary = adoptNS([[NSDictionary alloc] initWithObjectsAndKeys:
- NSUserName(), NSFileOwnerAccountName,
- filePOSIXPermissions, NSFilePosixPermissions,
- nullptr]).leakRef();
- return dictionary;
-}
-
-NSDictionary *WebCore::QLDirectoryAttributes()
-{
- // Set file perms to owner read/write/execute only
- NSNumber *directoryPOSIXPermissions = [NSNumber numberWithInteger:(WEB_UREAD | WEB_UWRITE | WEB_UEXEC)];
- static NSDictionary *dictionary = adoptNS([[NSDictionary alloc] initWithObjectsAndKeys:
- NSUserName(), NSFileOwnerAccountName,
- directoryPOSIXPermissions, NSFilePosixPermissions,
- nullptr]).leakRef();
- return dictionary;
-}
-
</del><span class="cx"> static Lock& qlPreviewConverterDictionaryMutex()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<Lock> mutex;
</span><span class="lines">@@ -347,6 +325,25 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static NSDictionary *temporaryFileAttributes()
+{
+ static NSDictionary *attributes = [@{
+ NSFileOwnerAccountName : NSUserName(),
+ NSFilePosixPermissions : [NSNumber numberWithInteger:(WEB_UREAD | WEB_UWRITE)],
+ } retain];
+ return attributes;
+}
+
+static NSDictionary *temporaryDirectoryAttributes()
+{
+ static NSDictionary *attributes = [@{
+ NSFileOwnerAccountName : NSUserName(),
+ NSFilePosixPermissions : [NSNumber numberWithInteger:(WEB_UREAD | WEB_UWRITE | WEB_UEXEC)],
+ NSFileProtectionKey : NSFileProtectionCompleteUnlessOpen,
+ } retain];
+ return attributes;
+}
+
</ins><span class="cx"> NSString *createTemporaryFileForQuickLook(NSString *fileName)
</span><span class="cx"> {
</span><span class="cx"> NSString *downloadDirectory = createTemporaryDirectory(@"QuickLookContent");
</span><span class="lines">@@ -353,16 +350,21 @@
</span><span class="cx"> if (!downloadDirectory)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- NSString *contentPath = [downloadDirectory stringByAppendingPathComponent:fileName];
</del><span class="cx"> NSFileManager *fileManager = [NSFileManager defaultManager];
</span><del>- NSString *uniqueContentPath = [fileManager _web_pathWithUniqueFilenameForPath:contentPath];
</del><span class="cx">
</span><del>- BOOL success = [fileManager _web_createFileAtPathWithIntermediateDirectories:uniqueContentPath
- contents:nil
- attributes:QLFileAttributes()
- directoryAttributes:QLDirectoryAttributes()];
</del><ins>+ NSError *error;
+ if (![fileManager setAttributes:temporaryDirectoryAttributes() ofItemAtPath:downloadDirectory error:&error]) {
+ LOG_ERROR("Failed to set attribute NSFileProtectionCompleteUnlessOpen on directory %@ with error: %@.", downloadDirectory, error.localizedDescription);
+ return nil;
+ }
</ins><span class="cx">
</span><del>- return success ? uniqueContentPath : nil;
</del><ins>+ NSString *contentPath = [downloadDirectory stringByAppendingPathComponent:fileName.lastPathComponent];
+ if (![fileManager _web_createFileAtPath:contentPath contents:nil attributes:temporaryFileAttributes()]) {
+ LOG_ERROR("Failed to create QuickLook temporary file at path %@.", contentPath);
+ return nil;
+ }
+
+ return contentPath;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> QuickLookHandle::QuickLookHandle(ResourceLoader& loader, const ResourceResponse& response)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaNSFileManagerSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/NSFileManagerSPI.h (211235 => 211236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/NSFileManagerSPI.h 2017-01-26 23:47:53 UTC (rev 211235)
+++ trunk/Source/WebCore/platform/spi/cocoa/NSFileManagerSPI.h 2017-01-26 23:50:28 UTC (rev 211236)
</span><span class="lines">@@ -36,8 +36,7 @@
</span><span class="cx"> #define WEB_UEXEC (00100)
</span><span class="cx">
</span><span class="cx"> @interface NSFileManager ()
</span><del>-- (BOOL)_web_createFileAtPathWithIntermediateDirectories:(NSString *)path contents:(NSData *)contents attributes:(NSDictionary *)attributes directoryAttributes:(NSDictionary *)directoryAttributes;
-- (NSString *)_web_pathWithUniqueFilenameForPath:(NSString *)path;
</del><ins>+- (BOOL)_web_createFileAtPath:(NSString *)path contents:(NSData *)contents attributes:(NSDictionary *)attributes;
</ins><span class="cx"> - (BOOL)_web_removeFileOnlyAtPath:(NSString *)path;
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>