Changeset 227618 in webkit


Ignore:
Timestamp:
Jan 25, 2018 11:34:48 AM (6 years ago)
Author:
mitz@apple.com
Message:

[Mac] Enable library validation for Networking & Storage XPC services
​https://bugs.webkit.org/show_bug.cgi?id=173424
<rdar://problem/32386565>

Reviewed by Joseph Pecoraro.

  • Configurations/BaseXPCService.xcconfig: Moved the definitions of WK_LIBRARY_VALIDATION_ENABLED and WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS from WebContentService.xcconfig to here and made them Mac-only at this level.
  • Configurations/NetworkService.xcconfig: Also set OTHER_CODE_SIGN_FLAGS to WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS.
  • Configurations/StorageService.xcconfig: Ditto.
  • Configurations/WebContentService.xcconfig: Moved definitions from here to BaseXPCService.xcconfig.
Location:
trunk/Source/WebKit
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r227614 r227618  
     12018-01-25  Dan Bernstein  <mitz@apple.com>
     2
     3        [Mac] Enable library validation for Networking & Storage XPC services
     4        https://bugs.webkit.org/show_bug.cgi?id=173424
     5        <rdar://problem/32386565>
     6
     7        Reviewed by Joseph Pecoraro.
     8
     9        * Configurations/BaseXPCService.xcconfig: Moved the definitions of
     10          WK_LIBRARY_VALIDATION_ENABLED and WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS from
     11          WebContentService.xcconfig to here and made them Mac-only at this level.
     12        * Configurations/NetworkService.xcconfig: Also set OTHER_CODE_SIGN_FLAGS to
     13          WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS.
     14        * Configurations/StorageService.xcconfig: Ditto.
     15        * Configurations/WebContentService.xcconfig: Moved definitions from here to
     16          BaseXPCService.xcconfig.
     17
    1182018-01-25  David Hyatt  <hyatt@apple.com>
    219

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

    r219050 r227618  
    6868WK_XPC_SERVICE_INSERT_LIBRARIES_DIR_NO = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Frameworks;
    6969WK_XPC_SERVICE_INSERT_LIBRARIES_DIR_YES = @executable_path/$(WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK)/Frameworks;
     70
     71WK_LIBRARY_VALIDATION_ENABLED = $(WK_LIBRARY_VALIDATION_ENABLED_$(WK_EMPTY_$(WK_LIBRARY_VALIDATION_ENABLED)));
     72WK_LIBRARY_VALIDATION_ENABLED_ = $(WK_LIBRARY_VALIDATION_ENABLED_NO);
     73WK_LIBRARY_VALIDATION_ENABLED_NO = $(WK_LIBRARY_VALIDATION_ENABLED);
     74WK_LIBRARY_VALIDATION_ENABLED_YES = YES;
     75
     76WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS[sdk=macosx*] = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_$(WK_XPC_SERVICE_VARIANT));
     77WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_ = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_Normal);
     78WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_Normal = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_$(WK_LIBRARY_VALIDATION_ENABLED));
     79WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_YES = -o library;

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

    r219050 r227618  
    2626WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Network-iOS;
    2727
     28OTHER_CODE_SIGN_FLAGS = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS);
     29
    2830PRODUCT_NAME = com.apple.WebKit.Networking;
    2931PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);

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

    r220501 r227618  
    2626WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Databases-iOS;
    2727
     28OTHER_CODE_SIGN_FLAGS = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS);
     29
    2830PRODUCT_NAME = $(WK_STORAGE_SERVICE_PRODUCT_NAME);
    2931PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);

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

    r227582 r227618  
    2828CODE_SIGN_ENTITLEMENTS[sdk=macosx*] = $(CODE_SIGN_ENTITLEMENTS_OSX_WITH_XPC_DOMAIN_EXTENSION_$(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT));
    2929CODE_SIGN_ENTITLEMENTS_OSX_WITH_XPC_DOMAIN_EXTENSION_YES = Configurations/WebContent-OSX.entitlements;
    30 OTHER_CODE_SIGN_FLAGS[sdk=macosx*] = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS);
     30OTHER_CODE_SIGN_FLAGS = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS);
    3131
    3232PRODUCT_NAME = $(PRODUCT_NAME_$(WK_XPC_SERVICE_VARIANT));
    … …  
    4747WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_YES = $(WK_RELOCATABLE_FRAMEWORKS);
    4848
    49 WK_LIBRARY_VALIDATION_ENABLED = $(WK_LIBRARY_VALIDATION_ENABLED_$(WK_EMPTY_$(WK_LIBRARY_VALIDATION_ENABLED)));
    50 WK_LIBRARY_VALIDATION_ENABLED_ = $(WK_LIBRARY_VALIDATION_ENABLED_NO);
    51 WK_LIBRARY_VALIDATION_ENABLED_NO = $(WK_LIBRARY_VALIDATION_ENABLED);
    52 WK_LIBRARY_VALIDATION_ENABLED_YES = YES;
    53 
    5449WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG = $(WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG_$(WK_EMPTY_$(WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG)));
    5550WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG_ = $(WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG_NO);
    … …  
    5752WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG_YES = $(USE_STAGING_INSTALL_PATH);
    5853
    59 WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_$(WK_XPC_SERVICE_VARIANT));
    60 WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_ = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_Normal);
    61 WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_Normal = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_$(WK_LIBRARY_VALIDATION_ENABLED));
    62 WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_YES = -o library;
    63 
    6454RUNLOOP_TYPE[sdk=macosx*] = NSRunLoop;
    6555RUNLOOP_TYPE[sdk=macosx10.13*] = _NSApplicationMain;
Note: See TracChangeset for help on using the changeset viewer.