Diff
Modified: trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (295730 => 295731)
--- trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2022-06-22 15:16:08 UTC (rev 295730)
+++ trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2022-06-22 15:56:57 UTC (rev 295731)
@@ -76,6 +76,7 @@
57F1C90A25DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57F1C90825DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.mm */; };
57FD318A22B3593E008D0E8B /* AppSSOSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57FD318922B3593E008D0E8B /* AppSSOSoftLink.mm */; };
5C7C787423AC3E770065F47E /* ManagedConfigurationSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C7C787223AC3E770065F47E /* ManagedConfigurationSoftLink.mm */; };
+ 5CB898B2286274FA00CA3485 /* QuarantineSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB898B1286274FA00CA3485 /* QuarantineSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
7B47F2A328587B9700E793C8 /* CoreGraphicsSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B47F2A128587B9700E793C8 /* CoreGraphicsSoftLink.h */; settings = {ATTRIBUTES = (Private, ); }; };
7B47F2A428587B9700E793C8 /* CoreGraphicsSoftLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B47F2A228587B9700E793C8 /* CoreGraphicsSoftLink.cpp */; };
93B38EC025821CD800198E63 /* SpeechSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93B38EBF25821CD700198E63 /* SpeechSoftLink.mm */; };
@@ -884,6 +885,7 @@
5C7C787123AC3E770065F47E /* ManagedConfigurationSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ManagedConfigurationSoftLink.h; sourceTree = "<group>"; };
5C7C787223AC3E770065F47E /* ManagedConfigurationSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ManagedConfigurationSoftLink.mm; sourceTree = "<group>"; };
5C7C787523AC3E850065F47E /* ManagedConfigurationSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ManagedConfigurationSPI.h; sourceTree = "<group>"; };
+ 5CB898B1286274FA00CA3485 /* QuarantineSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuarantineSPI.h; sourceTree = "<group>"; };
63E369F921AFA83F001C14BC /* NSProgressSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSProgressSPI.h; sourceTree = "<group>"; };
71B1141F26823ACD004D6701 /* SystemPreviewSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemPreviewSPI.h; sourceTree = "<group>"; };
7A36D0F8223AD9AB00B0522E /* CommonCryptoSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonCryptoSPI.h; sourceTree = "<group>"; };
@@ -1162,6 +1164,7 @@
0C7785841F45130F00F4EBB6 /* NSWindowSPI.h */,
0C7785851F45130F00F4EBB6 /* PIPSPI.h */,
E34F26F52846B7550076E549 /* PowerLogSPI.h */,
+ 5CB898B1286274FA00CA3485 /* QuarantineSPI.h */,
0C7785871F45130F00F4EBB6 /* QuickLookMacSPI.h */,
07035D3027A9B32E00FB03E4 /* ScreenCaptureKitSPI.h */,
71B1141F26823ACD004D6701 /* SystemPreviewSPI.h */,
@@ -1988,6 +1991,7 @@
DD20DDAE27BC90D70093D175 /* WebGPUTextureAspect.h in Headers */,
DD20DDAF27BC90D70093D175 /* WebGPUTextureBindingLayout.h in Headers */,
DD20DDB027BC90D70093D175 /* WebGPUTextureDescriptor.h in Headers */,
+ 5CB898B2286274FA00CA3485 /* QuarantineSPI.h in Headers */,
DD20DDB127BC90D70093D175 /* WebGPUTextureDimension.h in Headers */,
DD20DDB227BC90D70093D175 /* WebGPUTextureFormat.h in Headers */,
DD20DD3E27BC90D60093D175 /* WebGPUTextureImpl.h in Headers */,
Copied: trunk/Source/WebCore/PAL/pal/spi/mac/QuarantineSPI.h (from rev 295730, trunk/Source/WebKit/Platform/spi/mac/QuarantineSPI.h) (0 => 295731)
--- trunk/Source/WebCore/PAL/pal/spi/mac/QuarantineSPI.h (rev 0)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/QuarantineSPI.h 2022-06-22 15:56:57 UTC (rev 295731)
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#if PLATFORM(MAC)
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#include <quarantine.h>
+
+#else
+
+enum qtn_error_code {
+ QTN_NOT_QUARANTINED = -1,
+};
+
+enum qtn_flags {
+ QTN_FLAG_DOWNLOAD = 0x0001,
+ QTN_FLAG_SANDBOX = 0x0002,
+ QTN_FLAG_HARD = 0x0004,
+ QTN_FLAG_USER_APPROVED = 0x0040,
+};
+
+#define qtn_proc_alloc _qtn_proc_alloc
+#define qtn_proc_apply_to_self _qtn_proc_apply_to_self
+#define qtn_proc_free _qtn_proc_free
+#define qtn_proc_init _qtn_proc_init
+#define qtn_proc_init_with_self _qtn_proc_init_with_self
+#define qtn_proc_set_flags _qtn_proc_set_flags
+#define qtn_file_alloc _qtn_file_alloc
+#define qtn_file_init_with_path _qtn_file_init_with_path
+#define qtn_file_free _qtn_file_free
+#define qtn_file_apply_to_path _qtn_file_apply_to_path
+#define qtn_file_set_flags _qtn_file_set_flags
+#define qtn_file_get_flags _qtn_file_get_flags
+#endif
+
+typedef struct _qtn_proc *qtn_proc_t;
+typedef struct _qtn_file *qtn_file_t;
+
+WTF_EXTERN_C_BEGIN
+
+int qtn_proc_apply_to_self(qtn_proc_t);
+void qtn_proc_init(qtn_proc_t);
+int qtn_proc_init_with_self(qtn_proc_t);
+int qtn_proc_set_flags(qtn_proc_t, uint32_t flags);
+qtn_proc_t qtn_proc_alloc();
+void qtn_proc_free(qtn_proc_t);
+qtn_file_t qtn_file_alloc(void);
+void qtn_file_free(qtn_file_t qf);
+int qtn_file_set_flags(qtn_file_t qf, uint32_t flags);
+uint32_t qtn_file_get_flags(qtn_file_t qf);
+int qtn_file_apply_to_path(qtn_file_t qf, const char *path);
+int qtn_file_init_with_path(qtn_file_t qf, const char *path);
+
+WTF_EXTERN_C_END
+
+struct QuarantineFileDeleter {
+ void operator()(qtn_file_t file)
+ {
+ qtn_file_free(file);
+ }
+};
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebKit/NetworkProcess/Downloads/Download.cpp (295730 => 295731)
--- trunk/Source/WebKit/NetworkProcess/Downloads/Download.cpp 2022-06-22 15:16:08 UTC (rev 295730)
+++ trunk/Source/WebKit/NetworkProcess/Downloads/Download.cpp 2022-06-22 15:56:57 UTC (rev 295731)
@@ -55,7 +55,6 @@
, m_client(downloadManager.client())
, m_download(&download)
, m_sessionID(session.sessionID())
- , m_suggestedName(suggestedName)
, m_testSpeedMultiplier(session.testSpeedMultiplier())
{
ASSERT(m_downloadID);
@@ -70,7 +69,6 @@
, m_client(downloadManager.client())
, m_downloadTask(download)
, m_sessionID(session.sessionID())
- , m_suggestedName(suggestedName)
, m_testSpeedMultiplier(session.testSpeedMultiplier())
{
ASSERT(m_downloadID);
Modified: trunk/Source/WebKit/NetworkProcess/Downloads/Download.h (295730 => 295731)
--- trunk/Source/WebKit/NetworkProcess/Downloads/Download.h 2022-06-22 15:16:08 UTC (rev 295730)
+++ trunk/Source/WebKit/NetworkProcess/Downloads/Download.h 2022-06-22 15:56:57 UTC (rev 295731)
@@ -81,7 +81,6 @@
DownloadID downloadID() const { return m_downloadID; }
PAL::SessionID sessionID() const { return m_sessionID; }
- const String& suggestedName() const { return m_suggestedName; }
void setSandboxExtension(RefPtr<SandboxExtension>&& sandboxExtension) { m_sandboxExtension = WTFMove(sandboxExtension); }
void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler&&);
@@ -117,7 +116,6 @@
RetainPtr<NSProgress> m_progress;
#endif
PAL::SessionID m_sessionID;
- String m_suggestedName;
bool m_hasReceivedData { false };
IgnoreDidFailCallback m_ignoreDidFailCallback { IgnoreDidFailCallback::No };
DownloadMonitor m_monitor { *this };
Deleted: trunk/Source/WebKit/Platform/spi/mac/QuarantineSPI.h (295730 => 295731)
--- trunk/Source/WebKit/Platform/spi/mac/QuarantineSPI.h 2022-06-22 15:16:08 UTC (rev 295730)
+++ trunk/Source/WebKit/Platform/spi/mac/QuarantineSPI.h 2022-06-22 15:56:57 UTC (rev 295731)
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if PLATFORM(MAC)
-
-#if USE(APPLE_INTERNAL_SDK)
-
-#include <quarantine.h>
-
-#else
-
-enum qtn_error_code {
- QTN_NOT_QUARANTINED = -1,
-};
-
-enum qtn_flags {
- QTN_FLAG_DOWNLOAD = 0x0001,
- QTN_FLAG_SANDBOX = 0x0002,
- QTN_FLAG_USER_APPROVED = 0x0040,
-};
-
-#define qtn_proc_alloc _qtn_proc_alloc
-#define qtn_proc_apply_to_self _qtn_proc_apply_to_self
-#define qtn_proc_free _qtn_proc_free
-#define qtn_proc_init _qtn_proc_init
-#define qtn_proc_init_with_self _qtn_proc_init_with_self
-#define qtn_proc_set_flags _qtn_proc_set_flags
-#define qtn_file_alloc _qtn_file_alloc
-#define qtn_file_init_with_path _qtn_file_init_with_path
-#define qtn_file_free _qtn_file_free
-#define qtn_file_apply_to_path _qtn_file_apply_to_path
-#define qtn_file_set_flags _qtn_file_set_flags
-#define qtn_file_get_flags _qtn_file_get_flags
-#endif
-
-typedef struct _qtn_proc *qtn_proc_t;
-typedef struct _qtn_file *qtn_file_t;
-
-WTF_EXTERN_C_BEGIN
-
-int qtn_proc_apply_to_self(qtn_proc_t);
-void qtn_proc_init(qtn_proc_t);
-int qtn_proc_init_with_self(qtn_proc_t);
-int qtn_proc_set_flags(qtn_proc_t, uint32_t flags);
-qtn_proc_t qtn_proc_alloc();
-void qtn_proc_free(qtn_proc_t);
-qtn_file_t qtn_file_alloc(void);
-void qtn_file_free(qtn_file_t qf);
-int qtn_file_set_flags(qtn_file_t qf, uint32_t flags);
-uint32_t qtn_file_get_flags(qtn_file_t qf);
-int qtn_file_apply_to_path(qtn_file_t qf, const char *path);
-int qtn_file_init_with_path(qtn_file_t qf, const char *path);
-
-WTF_EXTERN_C_END
-
-#endif // PLATFORM(MAC)
Modified: trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm (295730 => 295731)
--- trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm 2022-06-22 15:16:08 UTC (rev 295730)
+++ trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm 2022-06-22 15:56:57 UTC (rev 295731)
@@ -30,7 +30,6 @@
#import "ApplicationServicesSPI.h"
#import "CodeSigning.h"
-#import "QuarantineSPI.h"
#import "SandboxInitializationParameters.h"
#import "SandboxUtilities.h"
#import "WKFoundation.h"
@@ -44,6 +43,7 @@
#import <pal/spi/cocoa/CoreServicesSPI.h>
#import <pal/spi/cocoa/LaunchServicesSPI.h>
#import <pal/spi/cocoa/NotifySPI.h>
+#import <pal/spi/mac/QuarantineSPI.h>
#import <pwd.h>
#import <stdlib.h>
#import <sys/sysctl.h>
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm (295730 => 295731)
--- trunk/Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm 2022-06-22 15:16:08 UTC (rev 295730)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm 2022-06-22 15:56:57 UTC (rev 295731)
@@ -28,11 +28,11 @@
#if PLATFORM(COCOA) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
-#import "QuarantineSPI.h"
#import "WKWebViewInternal.h"
#import "WebPageProxy.h"
#import <WebCore/RuntimeApplicationChecks.h>
#import <WebCore/ShareData.h>
+#import <pal/spi/mac/QuarantineSPI.h>
#import <wtf/RetainPtr.h>
#import <wtf/Scope.h>
#import <wtf/UUID.h>
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm (295730 => 295731)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2022-06-22 15:16:08 UTC (rev 295730)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2022-06-22 15:56:57 UTC (rev 295731)
@@ -38,7 +38,6 @@
#import "ModalContainerControlClassifier.h"
#import "PageClient.h"
#import "PlaybackSessionManagerProxy.h"
-#import "QuarantineSPI.h"
#import "QuickLookThumbnailLoader.h"
#import "SafeBrowsingSPI.h"
#import "SafeBrowsingWarning.h"
@@ -66,6 +65,7 @@
#import <WebCore/TextAlternativeWithRange.h>
#import <WebCore/ValidationBubble.h>
#import <pal/spi/cocoa/QuartzCoreSPI.h>
+#import <pal/spi/mac/QuarantineSPI.h>
#import <wtf/BlockPtr.h>
#import <wtf/SoftLinking.h>
#import <wtf/cf/TypeCastsCF.h>
Modified: trunk/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp (295730 => 295731)
--- trunk/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp 2022-06-22 15:16:08 UTC (rev 295730)
+++ trunk/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp 2022-06-22 15:56:57 UTC (rev 295731)
@@ -45,6 +45,10 @@
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
+#if PLATFORM(MAC)
+#include <pal/spi/mac/QuarantineSPI.h>
+#endif
+
namespace WebKit {
using namespace WebCore;
@@ -180,8 +184,36 @@
m_client->didCreateDestination(*this, path);
}
+#if PLATFORM(MAC)
+void DownloadProxy::updateQuarantinePropertiesIfPossible()
+{
+ auto fileURL = URL::fileURLWithFileSystemPath(m_destinationFilename);
+ auto path = fileURL.fileSystemPath().utf8();
+
+ auto file = std::unique_ptr<_qtn_file, QuarantineFileDeleter>(qtn_file_alloc());
+ if (!file)
+ return;
+
+ auto error = qtn_file_init_with_path(file.get(), path.data());
+ if (error)
+ return;
+
+ uint32_t flags = qtn_file_get_flags(file.get());
+ ASSERT_WITH_MESSAGE(flags & QTN_FLAG_HARD, "Downloaded files written by the sandboxed network process should have QTN_FLAG_HARD");
+ flags &= ~QTN_FLAG_HARD;
+ error = qtn_file_set_flags(file.get(), flags);
+ if (error)
+ return;
+
+ qtn_file_apply_to_path(file.get(), path.data());
+}
+#endif
+
void DownloadProxy::didFinish()
{
+#if PLATFORM(MAC)
+ updateQuarantinePropertiesIfPossible();
+#endif
m_client->didFinish(*this);
// This can cause the DownloadProxy object to be deleted.
Modified: trunk/Source/WebKit/UIProcess/Downloads/DownloadProxy.h (295730 => 295731)
--- trunk/Source/WebKit/UIProcess/Downloads/DownloadProxy.h 2022-06-22 15:16:08 UTC (rev 295730)
+++ trunk/Source/WebKit/UIProcess/Downloads/DownloadProxy.h 2022-06-22 15:56:57 UTC (rev 295731)
@@ -104,7 +104,9 @@
void setProgress(NSProgress *progress) { m_progress = progress; }
NSProgress *progress() const { return m_progress.get(); }
#endif
-
+#if PLATFORM(MAC)
+ void updateQuarantinePropertiesIfPossible();
+#endif
API::FrameInfo& frameInfo() { return m_frameInfo.get(); }
API::DownloadClient& client() { return m_client.get(); }
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (295730 => 295731)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-06-22 15:16:08 UTC (rev 295730)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-06-22 15:56:57 UTC (rev 295731)
@@ -1601,7 +1601,6 @@
A1B4DCE125A7923C007D178C /* MediaSampleByteRange.h in Headers */ = {isa = PBXBuildFile; fileRef = A1B4DCDF25A79211007D178C /* MediaSampleByteRange.h */; };
A1C512C9190656E500448914 /* WebPreviewLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = A1C512C7190656E500448914 /* WebPreviewLoaderClient.h */; };
A1DF631318E0B7C8003A3E2A /* LegacyDownloadClient.h in Headers */ = {isa = PBXBuildFile; fileRef = A1DF631118E0B7C8003A3E2A /* LegacyDownloadClient.h */; };
- A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A1E6886F1F6E2BAB007006A6 /* QuarantineSPI.h */; };
A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */ = {isa = PBXBuildFile; fileRef = A1EA02361DABFF7E0096021F /* WKContextMenuListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
A1EA02401DAC31DB0096021F /* WebContextMenuListenerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = A1EA023E1DAC31DB0096021F /* WebContextMenuListenerProxy.h */; };
A1EF36C02581F76F0090B02A /* MediaFormatReader.bundle in Copy Plug-ins */ = {isa = PBXBuildFile; fileRef = A16E66002581930800EE1749 /* MediaFormatReader.bundle */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -5950,7 +5949,6 @@
A1C512C7190656E500448914 /* WebPreviewLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebPreviewLoaderClient.h; path = ios/WebPreviewLoaderClient.h; sourceTree = "<group>"; };
A1DF631018E0B7C8003A3E2A /* LegacyDownloadClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LegacyDownloadClient.mm; sourceTree = "<group>"; };
A1DF631118E0B7C8003A3E2A /* LegacyDownloadClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LegacyDownloadClient.h; sourceTree = "<group>"; };
- A1E6886F1F6E2BAB007006A6 /* QuarantineSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QuarantineSPI.h; sourceTree = "<group>"; };
A1EA02351DABFF7E0096021F /* WKContextMenuListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKContextMenuListener.cpp; sourceTree = "<group>"; };
A1EA02361DABFF7E0096021F /* WKContextMenuListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextMenuListener.h; sourceTree = "<group>"; };
A1EA023D1DAC31DB0096021F /* WebContextMenuListenerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebContextMenuListenerProxy.cpp; sourceTree = "<group>"; };
@@ -11287,7 +11285,6 @@
children = (
F48D2A8421583A0200C6752B /* AppKitSPI.h */,
29D04E2821F7C73D0076741D /* ApplicationServicesSPI.h */,
- A1E6886F1F6E2BAB007006A6 /* QuarantineSPI.h */,
);
path = mac;
sourceTree = "<group>";
@@ -14366,7 +14363,6 @@
517B5F95275EBA63002DC22D /* PushMessageForTesting.h in Headers */,
EB36B16827A7B4500050E00D /* PushService.h in Headers */,
EBA8D3B527A5E33F00CB7900 /* PushServiceConnection.h in Headers */,
- A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */,
411B89CC27B2B89800F9EBD3 /* QueryPermissionResultCallback.h in Headers */,
1A0C227E2451130A00ED614D /* QuickLookThumbnailingSoftLink.h in Headers */,
1AEE57252409F142002005D6 /* QuickLookThumbnailLoader.h in Headers */,
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm (295730 => 295731)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm 2022-06-22 15:16:08 UTC (rev 295730)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm 2022-06-22 15:56:57 UTC (rev 295731)
@@ -60,6 +60,10 @@
#import <wtf/WeakObjCPtr.h>
#import <wtf/text/WTFString.h>
+#if PLATFORM(MAC)
+#include <pal/spi/mac/QuarantineSPI.h>
+#endif
+
static unsigned redirectCount = 0;
static bool hasReceivedResponse;
static NSURL *sourceURL = [[NSBundle mainBundle] URLForResource:@"simple" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"];
@@ -1259,7 +1263,7 @@
static NSURL *tempFileThatDoesNotExist()
{
- NSURL *tempDir = [NSURL fileURLWithPath:[NSTemporaryDirectory() stringByAppendingPathComponent:@"DownloadTest"] isDirectory:YES];
+ NSURL *tempDir = [NSURL fileURLWithPath:[NSTemporaryDirectory() stringByAppendingPathComponent:@"DownloadTëst"] isDirectory:YES];
[[NSFileManager defaultManager] createDirectoryAtURL:tempDir withIntermediateDirectories:YES attributes:nil error:nil];
NSURL *file = [tempDir URLByAppendingPathComponent:@"example.txt"];
[[NSFileManager defaultManager] removeItemAtURL:file error:nil];
@@ -1448,6 +1452,28 @@
EXPECT_EQ(actualCallbacks[i], expectedCallbacks[i]);
}
+#if PLATFORM(MAC)
+static void expectHardQuarantine(NSURL *url, bool expected)
+{
+ auto file = std::unique_ptr<_qtn_file, QuarantineFileDeleter>(qtn_file_alloc());
+ if (!file) {
+ ASSERT_NOT_REACHED();
+ return;
+ }
+
+ auto error = qtn_file_init_with_path(file.get(), url.fileSystemRepresentation);
+ if (error) {
+ ASSERT_NOT_REACHED();
+ return;
+ }
+
+ uint32_t flags = qtn_file_get_flags(file.get());
+ EXPECT_EQ(!!(flags & QTN_FLAG_HARD), expected);
+}
+#else
+static void expectHardQuarantine(NSURL *, bool) { }
+#endif
+
TEST(WKDownload, FinishSuccessfully)
{
auto server = simpleDownloadTestServer();
@@ -1469,6 +1495,7 @@
[delegate waitForDownloadDidFinish];
checkFileContents(expectedDownloadFile, longString<5000>('a'));
+ expectHardQuarantine(expectedDownloadFile, false);
checkCallbackRecord(delegate.get(), {
DownloadCallback::NavigationAction,
@@ -1570,6 +1597,7 @@
[webView loadRequest:server.request()];
waitForFirst5k(retainedDownload);
+ expectHardQuarantine(expectedDownloadFile, true);
__block RetainPtr<NSData> retainedResumeData;
[retainedDownload cancel:^(NSData *resumeData) {
@@ -1579,6 +1607,7 @@
while (!retainedResumeData)
Util::spinRunLoop();
resumeAndFinishDownload(retainedResumeData.get(), expectedDownloadFile);
+ expectHardQuarantine(expectedDownloadFile, false);
checkCallbackRecord(delegate.get(), {
DownloadCallback::NavigationAction,
DownloadCallback::NavigationResponse,
