From fd40402af566654bbeded28ab38e824bd3742dac Mon Sep 17 00:00:00 2001 From: Brian Nicholson Date: Fri, 18 Nov 2016 20:11:22 -0800 Subject: [PATCH] Bug 1318786 - Individual Focus/Klar entitlements --- Blockzilla.xcodeproj/project.pbxproj | 66 ++++++++++--------- Blockzilla.entitlements => Focus.entitlements | 1 - ...titlements => FocusEnterprise.entitlements | 1 - Klar.entitlements | 10 +++ KlarEnterprise.entitlements | 10 +++ 5 files changed, 55 insertions(+), 33 deletions(-) rename Blockzilla.entitlements => Focus.entitlements (86%) rename BlockzillaEnterprise.entitlements => FocusEnterprise.entitlements (84%) create mode 100644 Klar.entitlements create mode 100644 KlarEnterprise.entitlements diff --git a/Blockzilla.xcodeproj/project.pbxproj b/Blockzilla.xcodeproj/project.pbxproj index 20b584ecd8..4a86c792a5 100644 --- a/Blockzilla.xcodeproj/project.pbxproj +++ b/Blockzilla.xcodeproj/project.pbxproj @@ -200,6 +200,8 @@ D3C70C601DDE785300CEE458 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = ""; }; D3C70C651DDE785400CEE458 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = ""; }; D3C70C671DDE795300CEE458 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = ""; }; + D3C70C711DDFCA4800CEE458 /* Klar.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Klar.entitlements; sourceTree = ""; }; + D3C70C721DDFCA7000CEE458 /* KlarEnterprise.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = KlarEnterprise.entitlements; sourceTree = ""; }; D3CD375A1DD3B51900468250 /* FirstRunViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FirstRunViewController.swift; sourceTree = ""; }; D3DA77841DC2C307009C114E /* ErrorPage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ErrorPage.swift; sourceTree = ""; }; D3DA778B1DC2C60E009C114E /* errorPage.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = errorPage.html; sourceTree = ""; }; @@ -216,8 +218,8 @@ D3E2C96E1DA3093D00DEBE3D /* BrowserToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BrowserToolbar.swift; sourceTree = ""; }; D3E2C9891DA47D5300DEBE3D /* Browser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Browser.swift; sourceTree = ""; }; D3E3CA7C1DA827AD0079C94B /* HomeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = ""; }; - D3E3CA801DA83FAF0079C94B /* Blockzilla.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Blockzilla.entitlements; sourceTree = ""; }; - D3E3CA811DA83FAF0079C94B /* BlockzillaEnterprise.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = BlockzillaEnterprise.entitlements; sourceTree = ""; }; + D3E3CA801DA83FAF0079C94B /* Focus.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Focus.entitlements; sourceTree = ""; }; + D3E3CA811DA83FAF0079C94B /* FocusEnterprise.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = FocusEnterprise.entitlements; sourceTree = ""; }; E40AFB0F1DC9014700DA5651 /* UserAgent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserAgent.swift; sourceTree = ""; }; E40AFB131DC939FF00DA5651 /* SupportUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SupportUtils.swift; sourceTree = ""; }; E40AFC791DDDE98300DA5651 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -227,7 +229,7 @@ E47F9AE91DB9329D00A93285 /* Adjust-Focus.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Adjust-Focus.plist"; sourceTree = ""; }; E47F9AEB1DB9333200A93285 /* Adjust-Klar.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Adjust-Klar.plist"; sourceTree = ""; }; E47F9AED1DB9338600A93285 /* AdjustIntegration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdjustIntegration.swift; sourceTree = ""; }; - E4BF2DD31BACE8CA00DA9D68 /* Firefox Klar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Firefox Klar.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + E4BF2DD31BACE8CA00DA9D68 /* Klar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = Klar.app; path = "Firefox Klar.app"; sourceTree = BUILT_PRODUCTS_DIR; }; E4BF2DD61BACE8CA00DA9D68 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; E4BF2DDD1BACE8CA00DA9D68 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; E4BF2DE21BACE8CA00DA9D68 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -371,25 +373,27 @@ E4BF2DCA1BACE8CA00DA9D68 = { isa = PBXGroup; children = ( - D3E3CA801DA83FAF0079C94B /* Blockzilla.entitlements */, - D3E3CA811DA83FAF0079C94B /* BlockzillaEnterprise.entitlements */, + D3E3CA801DA83FAF0079C94B /* Focus.entitlements */, + D3E3CA811DA83FAF0079C94B /* FocusEnterprise.entitlements */, + D3C70C711DDFCA4800CEE458 /* Klar.entitlements */, + D3C70C721DDFCA7000CEE458 /* KlarEnterprise.entitlements */, D38D693B1C471A98003EF211 /* GCDWebServers.framework */, D38D693C1C471A98003EF211 /* SnapKit.framework */, D3E2C9001D9F17C600DEBE3D /* Blocklists */, E4BF2DD51BACE8CA00DA9D68 /* Blockzilla */, E4BF2DED1BACE92400DA9D68 /* ContentBlocker */, - 0BA39A841DD2B8E4005F970A /* XCUITest */, + D77FE464056F274978E025ED /* Frameworks */, E4BF2DD41BACE8CA00DA9D68 /* Products */, D33A1A391BC476D40003D929 /* Shared */, D30179D31BCDA5EE009AD388 /* ThirdParty */, - D77FE464056F274978E025ED /* Frameworks */, + 0BA39A841DD2B8E4005F970A /* XCUITest */, ); sourceTree = ""; }; E4BF2DD41BACE8CA00DA9D68 /* Products */ = { isa = PBXGroup; children = ( - E4BF2DD31BACE8CA00DA9D68 /* Firefox Klar.app */, + E4BF2DD31BACE8CA00DA9D68 /* Klar.app */, E4BF2DEC1BACE92400DA9D68 /* ContentBlocker.appex */, 0BA39A831DD2B8E4005F970A /* XCUITest.xctest */, ); @@ -404,7 +408,6 @@ E47F9AE91DB9329D00A93285 /* Adjust-Focus.plist */, E47F9AEB1DB9333200A93285 /* Adjust-Klar.plist */, E4BF2DE21BACE8CA00DA9D68 /* Info.plist */, - E40AFC761DDDE96D00DA5651 /* InfoPlist.strings */, D3C047BC1DCBD8ED00402FFB /* SearchEngines.plist */, D38EDB971DCA8CBD00E28196 /* splash.png */, D38EDB951DCA8A9400E28196 /* LaunchScreen.storyboard */, @@ -447,6 +450,7 @@ F805722E1DBEE504004339C1 /* WebCacheUtils.swift */, D3426AEE1DB846BB0016DA5A /* topdomains.txt */, E4BF2DDD1BACE8CA00DA9D68 /* Assets.xcassets */, + E40AFC761DDDE96D00DA5651 /* InfoPlist.strings */, D343DCC41C44356500D7EEE8 /* Localizable.strings */, D3BFCB3D1BD14F4E00AD22D1 /* LocalWebServer */, ); @@ -503,7 +507,7 @@ ); name = Blockzilla; productName = Blockzilla; - productReference = E4BF2DD31BACE8CA00DA9D68 /* Firefox Klar.app */; + productReference = E4BF2DD31BACE8CA00DA9D68 /* Klar.app */; productType = "com.apple.product-type.application"; }; E4BF2DEB1BACE92400DA9D68 /* ContentBlocker */ = { @@ -1079,7 +1083,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = BlockzillaEnterprise.entitlements; + CODE_SIGN_ENTITLEMENTS = FocusEnterprise.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; DEVELOPMENT_TEAM = 43AQ936H96; ENABLE_NS_ASSERTIONS = YES; @@ -1106,7 +1110,7 @@ D316DB131DA705FF006FA26B /* FocusEnterprise */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_ENTITLEMENTS = BlockzillaEnterprise.entitlements; + CODE_SIGN_ENTITLEMENTS = FocusEnterprise.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; DEVELOPMENT_TEAM = 43AQ936H96; INFOPLIST_FILE = ContentBlocker/Info.plist; @@ -1118,7 +1122,7 @@ }; name = FocusEnterprise; }; - D3C70C691DDFB22900CEE458 /* KlarEnterprise */ = { + D3C70C6D1DDFC48100CEE458 /* KlarEnterprise */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -1161,12 +1165,12 @@ }; name = KlarEnterprise; }; - D3C70C6A1DDFB22900CEE458 /* KlarEnterprise */ = { + D3C70C6E1DDFC48100CEE458 /* KlarEnterprise */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = BlockzillaEnterprise.entitlements; + CODE_SIGN_ENTITLEMENTS = KlarEnterprise.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; DEVELOPMENT_TEAM = 43AQ936H96; ENABLE_NS_ASSERTIONS = YES; @@ -1190,22 +1194,22 @@ }; name = KlarEnterprise; }; - D3C70C6B1DDFB22900CEE458 /* KlarEnterprise */ = { + D3C70C6F1DDFC48100CEE458 /* KlarEnterprise */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_ENTITLEMENTS = BlockzillaEnterprise.entitlements; + CODE_SIGN_ENTITLEMENTS = KlarEnterprise.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; DEVELOPMENT_TEAM = 43AQ936H96; INFOPLIST_FILE = ContentBlocker/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.mozilla.ios.Focus.enterprise.ContentBlocker; + PRODUCT_BUNDLE_IDENTIFIER = org.mozilla.ios.Klar.enterprise.ContentBlocker; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 3.0; VALID_ARCHS = arm64; }; name = KlarEnterprise; }; - D3C70C6C1DDFB22900CEE458 /* KlarEnterprise */ = { + D3C70C701DDFC48100CEE458 /* KlarEnterprise */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -1308,7 +1312,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = Blockzilla.entitlements; + CODE_SIGN_ENTITLEMENTS = Focus.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; DEVELOPMENT_TEAM = 43AQ936H96; FRAMEWORK_SEARCH_PATHS = ( @@ -1334,7 +1338,7 @@ D3E872AD1C471F7900BF4DE4 /* FocusDebug */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_ENTITLEMENTS = Blockzilla.entitlements; + CODE_SIGN_ENTITLEMENTS = Focus.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; DEVELOPMENT_TEAM = 43AQ936H96; INFOPLIST_FILE = ContentBlocker/Info.plist; @@ -1394,7 +1398,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = Blockzilla.entitlements; + CODE_SIGN_ENTITLEMENTS = Focus.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; DEVELOPMENT_TEAM = 43AQ936H96; FRAMEWORK_SEARCH_PATHS = ( @@ -1415,7 +1419,7 @@ D3E872B01C471F7F00BF4DE4 /* FocusRelease */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_ENTITLEMENTS = Blockzilla.entitlements; + CODE_SIGN_ENTITLEMENTS = Focus.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; DEVELOPMENT_TEAM = 43AQ936H96; INFOPLIST_FILE = ContentBlocker/Info.plist; @@ -1524,7 +1528,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = Blockzilla.entitlements; + CODE_SIGN_ENTITLEMENTS = Klar.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; DEVELOPMENT_TEAM = 43AQ936H96; FRAMEWORK_SEARCH_PATHS = ( @@ -1552,7 +1556,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = Blockzilla.entitlements; + CODE_SIGN_ENTITLEMENTS = Klar.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; DEVELOPMENT_TEAM = 43AQ936H96; FRAMEWORK_SEARCH_PATHS = ( @@ -1573,7 +1577,7 @@ E4BF2DF71BACE92400DA9D68 /* KlarDebug */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_ENTITLEMENTS = Blockzilla.entitlements; + CODE_SIGN_ENTITLEMENTS = Klar.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; DEVELOPMENT_TEAM = 43AQ936H96; INFOPLIST_FILE = ContentBlocker/Info.plist; @@ -1588,7 +1592,7 @@ E4BF2DF81BACE92400DA9D68 /* KlarRelease */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_ENTITLEMENTS = Blockzilla.entitlements; + CODE_SIGN_ENTITLEMENTS = Klar.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; DEVELOPMENT_TEAM = 43AQ936H96; INFOPLIST_FILE = ContentBlocker/Info.plist; @@ -1611,7 +1615,7 @@ 0BA39A8D1DD2B8E4005F970A /* KlarRelease */, 0BA39A8E1DD2B8E4005F970A /* FocusRelease */, 0BA39A8F1DD2B8E4005F970A /* FocusEnterprise */, - D3C70C6C1DDFB22900CEE458 /* KlarEnterprise */, + D3C70C701DDFC48100CEE458 /* KlarEnterprise */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = FocusRelease; @@ -1624,7 +1628,7 @@ E4BF2DE41BACE8CA00DA9D68 /* KlarRelease */, D3E872AE1C471F7F00BF4DE4 /* FocusRelease */, D316DB111DA705FF006FA26B /* FocusEnterprise */, - D3C70C691DDFB22900CEE458 /* KlarEnterprise */, + D3C70C6D1DDFC48100CEE458 /* KlarEnterprise */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = FocusRelease; @@ -1637,7 +1641,7 @@ E4BF2DE71BACE8CA00DA9D68 /* KlarRelease */, D3E872AF1C471F7F00BF4DE4 /* FocusRelease */, D316DB121DA705FF006FA26B /* FocusEnterprise */, - D3C70C6A1DDFB22900CEE458 /* KlarEnterprise */, + D3C70C6E1DDFC48100CEE458 /* KlarEnterprise */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = FocusRelease; @@ -1650,7 +1654,7 @@ E4BF2DF81BACE92400DA9D68 /* KlarRelease */, D3E872B01C471F7F00BF4DE4 /* FocusRelease */, D316DB131DA705FF006FA26B /* FocusEnterprise */, - D3C70C6B1DDFB22900CEE458 /* KlarEnterprise */, + D3C70C6F1DDFC48100CEE458 /* KlarEnterprise */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = FocusRelease; diff --git a/Blockzilla.entitlements b/Focus.entitlements similarity index 86% rename from Blockzilla.entitlements rename to Focus.entitlements index c528edaad4..d791cd1200 100644 --- a/Blockzilla.entitlements +++ b/Focus.entitlements @@ -5,7 +5,6 @@ com.apple.security.application-groups group.org.mozilla.ios.Focus - group.org.mozilla.ios.Klar diff --git a/BlockzillaEnterprise.entitlements b/FocusEnterprise.entitlements similarity index 84% rename from BlockzillaEnterprise.entitlements rename to FocusEnterprise.entitlements index ead0648525..c5f691fe76 100644 --- a/BlockzillaEnterprise.entitlements +++ b/FocusEnterprise.entitlements @@ -5,7 +5,6 @@ com.apple.security.application-groups group.org.mozilla.ios.Focus.enterprise - group.org.mozilla.ios.Klar.enterprise diff --git a/Klar.entitlements b/Klar.entitlements new file mode 100644 index 0000000000..f24d181c4e --- /dev/null +++ b/Klar.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.security.application-groups + + group.org.mozilla.ios.Klar + + + diff --git a/KlarEnterprise.entitlements b/KlarEnterprise.entitlements new file mode 100644 index 0000000000..0c342c3d0e --- /dev/null +++ b/KlarEnterprise.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.security.application-groups + + group.org.mozilla.ios.Klar.enterprise + + +