Changeset 261387 in webkit

Timestamp:

May 8, 2020 9:33:21 AM (4 years ago)

Author:

pvollan@apple.com

Message:

[Cocoa] Close connections to Launch Services after revoking extension
​https://bugs.webkit.org/show_bug.cgi?id=211594

Reviewed by Brent Fulgham.

Source/WebCore/PAL:

Declare _LSDService class.

• pal/spi/cocoa/LaunchServicesSPI.h:

Source/WebKit:

In <​https://trac.webkit.org/changeset/258915/webkit>, connections to the Launch Services database mapping
services were denied, by creating a temporary extension. After revoking this extension in the WebContent
process, it is important to close any open connections to Launch Services initiated by the mapping.

No new tests, covered by existing UTI/MIME type tests.

• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformInitializeWebProcess):

Location:

trunk/Source

Files:

• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/cocoa/WebProcessCocoa.mm (modified) (3 diffs)

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2020-05-08  Per Arne Vollan  <pvollan@apple.com>
+
+        [Cocoa] Close connections to Launch Services after revoking extension
+        https://bugs.webkit.org/show_bug.cgi?id=211594
+
+        Reviewed by Brent Fulgham.
+
+        Declare _LSDService class.
+
+        * pal/spi/cocoa/LaunchServicesSPI.h:
+
 2020-05-07  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h

@@ -86 +86 @@
 #endif // !USE(APPLE_INTERNAL_SDK)
 
+@interface _LSDService : NSObject <NSXPCListenerDelegate>
++ (NSArray<Class> *)allServiceClasses;
++ (NSXPCConnection *)XPCConnectionToService;
+@end
+
 #if PLATFORM(MAC)
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-05-08  Per Arne Vollan  <pvollan@apple.com>
+
+        [Cocoa] Close connections to Launch Services after revoking extension
+        https://bugs.webkit.org/show_bug.cgi?id=211594
+
+        Reviewed by Brent Fulgham.
+
+        In <https://trac.webkit.org/changeset/258915/webkit>, connections to the Launch Services database mapping
+        services were denied, by creating a temporary extension. After revoking this extension in the WebContent
+        process, it is important to close any open connections to Launch Services initiated by the mapping.
+
+        No new tests, covered by existing UTI/MIME type tests.
+
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2020-05-08  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -87 +87 @@
 #import <wtf/FileSystem.h>
 #import <wtf/ProcessPrivilege.h>
+#import <wtf/SoftLinking.h>
 #import <wtf/cocoa/NSURLExtras.h>
 #import <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
@@ -135 +136 @@
 #import <os/state_private.h>
 #endif
+
+SOFT_LINK_FRAMEWORK(CoreServices)
+SOFT_LINK_CLASS(CoreServices, _LSDService)
+SOFT_LINK_CLASS(CoreServices, _LSDOpenService)
 
 #define RELEASE_LOG_SESSION_ID (m_sessionID ? m_sessionID->toUInt64() : 0)
@@ -204 +209 @@
         ok = extension->revoke();
         ASSERT_UNUSED(ok, ok);
+
+        auto services = [get_LSDServiceClass() allServiceClasses];
+        for (Class cls in services) {
+            auto connection = [cls XPCConnectionToService];
+            [connection invalidate];
+        }
+
+        ASSERT(String(uti.get()) = String(adoptCF(UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, CFSTR("text/html"), 0)).get()));
     }