Skip to content

Respect entitlements file above build setting for build settings affe… #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Respect entitlements file above build setting for build settings affe… #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Sources/SWBCore/SpecImplementations/Tools/ProductPackaging.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,26 @@ public final class ProductPackagingToolSpec : GenericCommandLineToolSpec, SpecId
// This is only supported when App Sandbox or Hardened Runtime is enabled.
for (buildSetting, entitlementPrefix) in Self.sandboxFileAccessSettingsAndEntitlements {
let fileAccessValue = cbc.scope.evaluate(buildSetting)
let correspondingEntitlementKey: String?

switch fileAccessValue {
case .readOnly:
entitlementsDictionary["\(entitlementPrefix).read-only"] = .plBool(true)
correspondingEntitlementKey = "\(entitlementPrefix).read-only"
case .readWrite:
entitlementsDictionary["\(entitlementPrefix).read-write"] = .plBool(true)
correspondingEntitlementKey = "\(entitlementPrefix).read-write"
case .none:
break
correspondingEntitlementKey = nil
}

// The entitlements file is the ultimate authority, so if this is already configured there the build system should respect that.
if let correspondingEntitlementKey, entitlementsDictionary[correspondingEntitlementKey] == nil {
entitlementsDictionary[correspondingEntitlementKey] = .plBool(true)
}
}

for (buildSetting, entitlement) in Self.sandboxAndHardenedRuntimeBooleanEntitlements {
if cbc.scope.evaluate(buildSetting) {
// The entitlements file is the ultimate authority, so if this is already configured there the build system should respect that.
if cbc.scope.evaluate(buildSetting) && entitlementsDictionary[entitlement] == nil {
entitlementsDictionary[entitlement] = .plBool(true)
}
}
Expand Down
4 changes: 2 additions & 2 deletions Tests/SWBBuildSystemTests/EntitlementsBuildOperationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ fileprivate struct EntitlementsBuildOperationTests: CoreBasedTests {
"com.apple.security.cs.debugger": "1",
"com.apple.security.cs.disable-executable-page-protection": "1",
"com.apple.security.cs.disable-library-validation": "1",
"com.apple.security.device.audio-input": "1",
"com.apple.security.device.audio-input": "0",
"com.apple.security.device.bluetooth": "1",
"com.apple.security.personal-information.calendars": "1",
"com.apple.security.device.camera": "1",
Expand All @@ -398,7 +398,7 @@ fileprivate struct EntitlementsBuildOperationTests: CoreBasedTests {
"com.apple.security.files.downloads.read-write": "1",
"com.apple.security.assets.pictures.read-only": "1",
"com.apple.security.assets.music.read-write": "1",
"com.apple.security.assets.movies.read-only": "1",
"com.apple.security.assets.movies.read-only": "0",
"com.apple.security.network.client": "1",
"com.apple.security.network.server": "1",
],
Expand Down
Loading