Changeset 208589 in webkit


Ignore:
Timestamp:
Nov 11, 2016 9:18:53 AM (8 years ago)
Author:
Brent Fulgham
Message:

Remove unused FontService from sandbox profile
​https://bugs.webkit.org/show_bug.cgi?id=164625
<rdar://problem/26899976>

Reviewed by Alex Christensen.

Part of some general sandbox profile gardening.

Convert the Plugin process sandbox into

  • Configurations/WebKit.xcconfig: Add exclude for com.apple.WebKit.plugin-common.sb.in.
  • DerivedSources.make: Update to generate com.apple.WebKit.plugin-common.sb from .in file
  • PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in: Copied from Resources/PlugInSandboxProfiles/com.apple.WebKit.plugin-common.sb.
  • Resources/PlugInSandboxProfiles/com.apple.WebKit.plugin-common.sb: Removed.
  • WebKit2.xcodeproj/project.pbxproj: Update for new .in file.
  • WebProcess/com.apple.WebProcess.sb.in: Remove com.apple.FontServer

from macOS Sierra and newer.

Location:
trunk/Source/WebKit2
Files:
5 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r208559 r208589  
     12016-11-10  Brent Fulgham  <bfulgham@apple.com>
     2
     3        Remove unused FontService from sandbox profile
     4        https://bugs.webkit.org/show_bug.cgi?id=164625
     5        <rdar://problem/26899976>
     6
     7        Reviewed by Alex Christensen.
     8
     9        Part of some general sandbox profile gardening.
     10
     11        Convert the Plugin process sandbox into
     12
     13        * Configurations/WebKit.xcconfig: Add exclude for com.apple.WebKit.plugin-common.sb.in.
     14        * DerivedSources.make: Update to generate com.apple.WebKit.plugin-common.sb from .in file
     15        * PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in: Copied from Resources/PlugInSandboxProfiles/com.apple.WebKit.plugin-common.sb.
     16        * Resources/PlugInSandboxProfiles/com.apple.WebKit.plugin-common.sb: Removed.
     17        * WebKit2.xcodeproj/project.pbxproj: Update for new .in file.
     18        * WebProcess/com.apple.WebProcess.sb.in: Remove com.apple.FontServer
     19        from macOS Sierra and newer.
     20
    1212016-11-10  Eric Carlson  <eric.carlson@apple.com>
    222

  • trunk/Source/WebKit2/Configurations/WebKit.xcconfig

    r202789 r208589  
    5353SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,mac/WebKit2.order;
    5454
    55 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PluginProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
     55EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PluginProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb com.apple.WebKit.plugin-common.sb PlugInSandboxProfiles/*.sb;
    5656
    5757INSTALLHDRS_SCRIPT_PHASE = YES;

  • trunk/Source/WebKit2/DerivedSources.make

    r205369 r208589  
    204204        com.apple.WebProcess.sb \
    205205        com.apple.WebKit.Databases.sb \
     206        com.apple.WebKit.plugin-common.sb \
    206207        com.apple.WebKit.NetworkProcess.sb
    207208

  • trunk/Source/WebKit2/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in

    r208588 r208589  
    1 ; Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
     1; Copyright (C) 2013-2016 Apple Inc. All rights reserved.
    22;
    33; Redistribution and use in source and binary forms, with or without
    … …  
    221221    (global-name "com.apple.FileCoordination")
    222222    (global-name "com.apple.FontObjectsServer")
     223#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
    223224    (global-name "com.apple.FontServer")
     225#endif
    224226    (global-name "com.apple.ImageCaptureExtension2.presence")
    225227    (global-name "com.apple.PowerManagement.control")

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r208388 r208589  
    11521152                7CB16FEF1724BA23007A0A95 /* com.apple.ist.ds.appleconnect.webplugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE21724B9B5007A0A95 /* com.apple.ist.ds.appleconnect.webplugin.sb */; };
    11531153                7CB16FF01724BA24007A0A95 /* com.apple.QuickTime Plugin.plugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE31724B9B5007A0A95 /* com.apple.QuickTime Plugin.plugin.sb */; };
    1154                 7CB16FF11724BA26007A0A95 /* com.apple.WebKit.plugin-common.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE41724B9B5007A0A95 /* com.apple.WebKit.plugin-common.sb */; };
    11551154                7CB16FF21724BA28007A0A95 /* com.macromedia.Flash Player.plugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE51724B9B5007A0A95 /* com.macromedia.Flash Player.plugin.sb */; };
    11561155                7CB16FF31724BA2F007A0A95 /* com.microsoft.SilverlightPlugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE61724B9B5007A0A95 /* com.microsoft.SilverlightPlugin.sb */; };
    … …  
    20172016                                7CB16FEF1724BA23007A0A95 /* com.apple.ist.ds.appleconnect.webplugin.sb in Copy Plug-in Sandbox Profiles */,
    20182017                                7CB16FF01724BA24007A0A95 /* com.apple.QuickTime Plugin.plugin.sb in Copy Plug-in Sandbox Profiles */,
    2019                                 7CB16FF11724BA26007A0A95 /* com.apple.WebKit.plugin-common.sb in Copy Plug-in Sandbox Profiles */,
    20202018                                7CB16FF21724BA28007A0A95 /* com.macromedia.Flash Player.plugin.sb in Copy Plug-in Sandbox Profiles */,
    20212019                                7CB16FF31724BA2F007A0A95 /* com.microsoft.SilverlightPlugin.sb in Copy Plug-in Sandbox Profiles */,
    … …  
    31833181                762B7481120BBA0100819339 /* FontSmoothingLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontSmoothingLevel.h; sourceTree = "<group>"; };
    31843182                762B7484120BBA2D00819339 /* WKPreferencesRefPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesRefPrivate.h; sourceTree = "<group>"; };
     3183                7A1506721DD56298001F4B58 /* com.apple.WebKit.plugin-common.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "com.apple.WebKit.plugin-common.sb"; sourceTree = "<group>"; };
    31853184                7A5E39491D5BD8A700B4B7CE /* com.macromedia.Flash Player ESR.plugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "com.macromedia.Flash Player ESR.plugin.sb"; sourceTree = "<group>"; };
    31863185                7A791EF81C7CFB1000C4C52B /* WebResourceLoadStatisticsStoreMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebResourceLoadStatisticsStoreMessages.h; sourceTree = "<group>"; };
    … …  
    32603259                7CB16FE21724B9B5007A0A95 /* com.apple.ist.ds.appleconnect.webplugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.ist.ds.appleconnect.webplugin.sb; sourceTree = "<group>"; };
    32613260                7CB16FE31724B9B5007A0A95 /* com.apple.QuickTime Plugin.plugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "com.apple.QuickTime Plugin.plugin.sb"; sourceTree = "<group>"; };
    3262                 7CB16FE41724B9B5007A0A95 /* com.apple.WebKit.plugin-common.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "com.apple.WebKit.plugin-common.sb"; sourceTree = "<group>"; };
     3261                7CB16FE41724B9B5007A0A95 /* com.apple.WebKit.plugin-common.sb.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "com.apple.WebKit.plugin-common.sb.in"; sourceTree = "<group>"; };
    32633262                7CB16FE51724B9B5007A0A95 /* com.macromedia.Flash Player.plugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "com.macromedia.Flash Player.plugin.sb"; sourceTree = "<group>"; };
    32643263                7CB16FE61724B9B5007A0A95 /* com.microsoft.SilverlightPlugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.microsoft.SilverlightPlugin.sb; sourceTree = "<group>"; };
    … …  
    42884287                        isa = PBXGroup;
    42894288                        children = (
     4289                                7CB16FE41724B9B5007A0A95 /* com.apple.WebKit.plugin-common.sb.in */,
    42904290                                1A2D91A51281D739001EB962 /* PluginControllerProxyMac.mm */,
    42914291                                1AA4792212A59FD9008236C3 /* PluginProcessMac.mm */,
    … …  
    58715871                                7CB16FE21724B9B5007A0A95 /* com.apple.ist.ds.appleconnect.webplugin.sb */,
    58725872                                7CB16FE31724B9B5007A0A95 /* com.apple.QuickTime Plugin.plugin.sb */,
    5873                                 7CB16FE41724B9B5007A0A95 /* com.apple.WebKit.plugin-common.sb */,
    58745873                                7A5E39491D5BD8A700B4B7CE /* com.macromedia.Flash Player ESR.plugin.sb */,
    58755874                                7CB16FE51724B9B5007A0A95 /* com.macromedia.Flash Player.plugin.sb */,
    … …  
    71467145                                E115C715190F8A2500ECC516 /* com.apple.WebKit.Databases.sb */,
    71477146                                E17AE2C216B9C63A001C42F1 /* com.apple.WebKit.NetworkProcess.sb */,
     7147                                7A1506721DD56298001F4B58 /* com.apple.WebKit.plugin-common.sb */,
    71487148                                E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */,
    71497149                                2984F586164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp */,

  • trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in

    r207704 r208589  
    1 ; Copyright (C) 2010, 2011, 2012, 2013, 2014 Apple Inc. All rights reserved.
     1; Copyright (C) 2010-2016 Apple Inc. All rights reserved.
    22;
    33; Redistribution and use in source and binary forms, with or without
    … …  
    175175       (global-name "com.apple.FileCoordination")
    176176       (global-name "com.apple.FontObjectsServer")
     177#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
    177178       (global-name "com.apple.FontServer")
     179#endif
    178180       (global-name "com.apple.SystemConfiguration.configd")
    179181       (global-name "com.apple.SystemConfiguration.PPPController")
Note: See TracChangeset for help on using the changeset viewer.