diff --git a/Application/Application.xcodeproj/project.pbxproj b/Application/Application.xcodeproj/project.pbxproj index 83eed1e..4b591fa 100644 --- a/Application/Application.xcodeproj/project.pbxproj +++ b/Application/Application.xcodeproj/project.pbxproj @@ -30,6 +30,7 @@ CD2F800D24455333009C3D77 /* AboutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CD2F800B24455333009C3D77 /* AboutWindowController.m */; }; CD2F801724468A8C009C3D77 /* patrons.txt in Resources */ = {isa = PBXBuildFile; fileRef = CD2F801624468A8C009C3D77 /* patrons.txt */; }; CD32C2352094062D009CADF6 /* SigningInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CD32C2332094062C009CADF6 /* SigningInfoViewController.m */; }; + CD5E3507280B942E005DFFA3 /* BlockBlock Installer.app in Resources */ = {isa = PBXBuildFile; fileRef = CD5E3506280B942E005DFFA3 /* BlockBlock Installer.app */; }; CD6836682391DB6F00CF19C1 /* security.plist in Resources */ = {isa = PBXBuildFile; fileRef = CD6836672391DB6F00CF19C1 /* security.plist */; }; CD8FD5D523BAE2D200EFE0FB /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CD8FD5D323BAE2D100EFE0FB /* Preferences.xib */; }; CD8FD5D623BAE2D200EFE0FB /* PrefsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CD8FD5D423BAE2D200EFE0FB /* PrefsWindowController.m */; }; @@ -39,7 +40,6 @@ CD8FD5FA23C05AD900EFE0FB /* Rules.xib in Resources */ = {isa = PBXBuildFile; fileRef = CD8FD5F523C05AD900EFE0FB /* Rules.xib */; }; CD8FD5FD23C05C6900EFE0FB /* Rule.m in Sources */ = {isa = PBXBuildFile; fileRef = CD8FD5FC23C05C6900EFE0FB /* Rule.m */; }; CDA88A792537CE2400C469BF /* Sentry.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CD21501B20AD2EE000CEF17B /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - CDB964D027D0871D00A9674E /* BlockBlock Installer.app in Resources */ = {isa = PBXBuildFile; fileRef = CDB964CF27D0871D00A9674E /* BlockBlock Installer.app */; }; CDFA08E1214900BF0089758C /* XPCUser.m in Sources */ = {isa = PBXBuildFile; fileRef = CDFA08DF214900BF0089758C /* XPCUser.m */; }; /* End PBXBuildFile section */ @@ -100,6 +100,7 @@ CD2F801624468A8C009C3D77 /* patrons.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = patrons.txt; path = ../Shared/patrons.txt; sourceTree = ""; }; CD32C2332094062C009CADF6 /* SigningInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SigningInfoViewController.m; sourceTree = ""; }; CD32C2342094062C009CADF6 /* SigningInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SigningInfoViewController.h; sourceTree = ""; }; + CD5E3506280B942E005DFFA3 /* BlockBlock Installer.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; name = "BlockBlock Installer.app"; path = "../DerivedData/BlockBlock/Build/Products/Release/BlockBlock Installer.app"; sourceTree = ""; }; CD6836672391DB6F00CF19C1 /* security.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = security.plist; sourceTree = ""; }; CD8FD5D123B585FE00EFE0FB /* FileMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileMonitor.h; path = ../Shared/Libraries/FileMonitor.h; sourceTree = ""; }; CD8FD5D223BAE2D100EFE0FB /* PrefsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrefsWindowController.h; sourceTree = ""; }; @@ -114,7 +115,6 @@ CD8FD5F523C05AD900EFE0FB /* Rules.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = Rules.xib; sourceTree = ""; }; CD8FD5FB23C05C6900EFE0FB /* Rule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Rule.h; path = ../Shared/Rule.h; sourceTree = ""; }; CD8FD5FC23C05C6900EFE0FB /* Rule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Rule.m; path = ../Shared/Rule.m; sourceTree = ""; }; - CDB964CF27D0871D00A9674E /* BlockBlock Installer.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; name = "BlockBlock Installer.app"; path = "../DerivedData/BlockBlock/Build/Products/Release/BlockBlock Installer.app"; sourceTree = ""; }; CDFA08D7214606DB0089758C /* XPCDaemonProto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XPCDaemonProto.h; path = ../Shared/XPCDaemonProto.h; sourceTree = ""; }; CDFA08DB21460A400089758C /* XPCUserProto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XPCUserProto.h; path = ../Shared/XPCUserProto.h; sourceTree = ""; }; CDFA08DF214900BF0089758C /* XPCUser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XPCUser.m; path = ../Shared/XPCUser.m; sourceTree = ""; }; @@ -244,7 +244,7 @@ CD80B7E327C6E49100AD7BC1 /* Uninstaller */ = { isa = PBXGroup; children = ( - CDB964CF27D0871D00A9674E /* BlockBlock Installer.app */, + CD5E3506280B942E005DFFA3 /* BlockBlock Installer.app */, ); name = Uninstaller; sourceTree = ""; @@ -346,7 +346,7 @@ CD2F801724468A8C009C3D77 /* patrons.txt in Resources */, CD8FD5FA23C05AD900EFE0FB /* Rules.xib in Resources */, 7D7755F01F02E05B00D0017D /* MainMenu.xib in Resources */, - CDB964D027D0871D00A9674E /* BlockBlock Installer.app in Resources */, + CD5E3507280B942E005DFFA3 /* BlockBlock Installer.app in Resources */, 7DD25FF01F23B73C00277EC4 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -516,7 +516,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.1.3; + CURRENT_PROJECT_VERSION = 2.1.4; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; @@ -524,7 +524,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 2.1.3; + MARKETING_VERSION = 2.1.4; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.blockblock.helper"; PRODUCT_NAME = "BlockBlock Helper"; @@ -538,7 +538,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.1.3; + CURRENT_PROJECT_VERSION = 2.1.4; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; @@ -546,7 +546,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 2.1.3; + MARKETING_VERSION = 2.1.4; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.blockblock.helper"; PRODUCT_NAME = "BlockBlock Helper"; diff --git a/Daemon/Daemon.xcodeproj/project.pbxproj b/Daemon/Daemon.xcodeproj/project.pbxproj index ad232e9..d96b10d 100644 --- a/Daemon/Daemon.xcodeproj/project.pbxproj +++ b/Daemon/Daemon.xcodeproj/project.pbxproj @@ -520,7 +520,7 @@ CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/Daemon/BlockBlock.entitlements"; CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.1.3; + CURRENT_PROJECT_VERSION = 2.1.4; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; @@ -532,7 +532,7 @@ "$(SDKROOT)/usr/lib/system", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 2.1.3; + MARKETING_VERSION = 2.1.4; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-DDAEMON_BUILD=1"; PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.blockblock"; @@ -549,7 +549,7 @@ CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/Daemon/BlockBlock.entitlements"; CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.1.3; + CURRENT_PROJECT_VERSION = 2.1.4; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; @@ -561,7 +561,7 @@ "$(SDKROOT)/usr/lib/system", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 2.1.3; + MARKETING_VERSION = 2.1.4; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-DDAEMON_BUILD=1"; PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.blockblock"; diff --git a/Daemon/Daemon/Plugins/Launchd.m b/Daemon/Daemon/Plugins/Launchd.m index 1223069..b7d9451 100644 --- a/Daemon/Daemon/Plugins/Launchd.m +++ b/Daemon/Daemon/Plugins/Launchd.m @@ -14,10 +14,10 @@ #import "Utilities.h" // REGEX -// ^(\/System|\/Users\/.+|)\/Library\/(LaunchDaemons|LaunchAgents)\/.+\.(?i)plist$ +// ^(\/System|\/Users\/[^\/]+|)\/Library\/(LaunchDaemons|LaunchAgents)\/.+\.(?i)plist$ // breakdown: // ^ -> starts with -// (\/System|\/Users\/.+|) -> "/System" or "/Users/" or nothing +// (\/System|\/Users\/[^\/]+|) -> "/System" or "/Users/" or nothing // \/Library\/ -> "/Library/" // (LaunchDaemons|LaunchAgents) -> "LaunchDaemons" or "LaunchAgents" // \/.+\.(?i)plist -> "/.plist" (case insensitive) diff --git a/Daemon/Daemon/Plugins/LoginItem.m b/Daemon/Daemon/Plugins/LoginItem.m index c22c9a3..e00a80e 100644 --- a/Daemon/Daemon/Plugins/LoginItem.m +++ b/Daemon/Daemon/Plugins/LoginItem.m @@ -18,10 +18,10 @@ extern XPCUserClient* xpcUserClient; // REGEX -// ^(\/Users\/.+|)\/Library\/Application Support\/com.apple.backgroundtaskmanagementagent\/backgrounditems.btm$ +// ^(\/Users\/[^\/]+|)\/Library\/Application Support\/com.apple.backgroundtaskmanagementagent\/backgrounditems.btm$ // breakdown: // ^ -> starts with -// (\/Users\/.+) -> "/Users/" +// (\/Users\/[^\/]+) -> "/Users/" // ...then just /Library/Application Support/com.apple.backgroundtaskmanagementagent/backgrounditems.btm // path: ~/Library/Application Support/com.apple.backgroundtaskmanagementagent/backgrounditems.btm diff --git a/Installer/Installer.xcodeproj/project.pbxproj b/Installer/Installer.xcodeproj/project.pbxproj index f82afec..6e97d32 100644 --- a/Installer/Installer.xcodeproj/project.pbxproj +++ b/Installer/Installer.xcodeproj/project.pbxproj @@ -350,7 +350,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "#archive build\nif [[ $BUILT_PRODUCTS_DIR = *\"ArchiveIntermediates\"* ]]; then\n cp -R -f \"$PROJECT_TEMP_ROOT/UninstalledProducts/macosx/BlockBlock.app\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\n cp -R -f \"$PROJECT_TEMP_ROOT/UninstalledProducts/macosx/BlockBlock Helper.app\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\n \n#normal build\nelse\n\nrm -rf \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources/BlockBlock.app\"\nrm -rf \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources/BlockBlock Helper.app\"\n\n#cp daemon/app\ncp -R -f \"$BUILT_PRODUCTS_DIR/BlockBlock.app\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\ncp -R -f \"$BUILT_PRODUCTS_DIR/BlockBlock Helper.app\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\n\nfi\n"; + shellScript = "#archive build\nif [[ $BUILT_PRODUCTS_DIR = *\"ArchiveIntermediates\"* ]]; then\n cp -R -f \"$PROJECT_TEMP_ROOT/UninstalledProducts/macosx/BlockBlock.app\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\n cp -R -f \"$PROJECT_TEMP_ROOT/UninstalledProducts/macosx/BlockBlock Helper.app\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\n \n#normal build\nelse\n\nrm -rf \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources/BlockBlock.app\"\nrm -rf \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources/BlockBlock Helper.app\"\n\n#cp daemon/app\ncp -R -f \"$BUILT_PRODUCTS_DIR/BlockBlock.app\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\ncp -R -f \"$BUILT_PRODUCTS_DIR/BlockBlock Helper.app\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\n\nfi\n\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -403,14 +403,14 @@ CODE_SIGN_ENTITLEMENTS = ""; CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2.1.3; + CURRENT_PROJECT_VERSION = 2.1.4; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; INFOPLIST_FILE = Helper/Info.plist; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 2.1.3; + MARKETING_VERSION = 2.1.4; ONLY_ACTIVE_ARCH = NO; OTHER_CODE_SIGN_FLAGS = ""; OTHER_LDFLAGS = ( @@ -438,14 +438,14 @@ CODE_SIGN_ENTITLEMENTS = ""; CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2.1.3; + CURRENT_PROJECT_VERSION = 2.1.4; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; INFOPLIST_FILE = Helper/Info.plist; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 2.1.3; + MARKETING_VERSION = 2.1.4; ONLY_ACTIVE_ARCH = NO; OTHER_CODE_SIGN_FLAGS = ""; OTHER_LDFLAGS = ( @@ -474,7 +474,7 @@ CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.1.3; + CURRENT_PROJECT_VERSION = 2.1.4; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; @@ -483,7 +483,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 2.1.3; + MARKETING_VERSION = 2.1.4; ONLY_ACTIVE_ARCH = NO; OTHER_CODE_SIGN_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.blockblock.installer"; @@ -501,7 +501,7 @@ CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.1.3; + CURRENT_PROJECT_VERSION = 2.1.4; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; @@ -510,7 +510,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 2.1.3; + MARKETING_VERSION = 2.1.4; OTHER_CODE_SIGN_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.blockblock.installer"; PRODUCT_NAME = "BlockBlock Installer"; diff --git a/Installer/Source/ConfigureWindowController.xib b/Installer/Source/ConfigureWindowController.xib index 8133eca..549c08e 100644 --- a/Installer/Source/ConfigureWindowController.xib +++ b/Installer/Source/ConfigureWindowController.xib @@ -1,8 +1,8 @@ - + - + diff --git a/Shared/patrons.txt b/Shared/patrons.txt index 3677e26..adffa0f 100644 --- a/Shared/patrons.txt +++ b/Shared/patrons.txt @@ -2,4 +2,4 @@ Patrons (2^6+): Jan Koum, Christian Blümlein, MikeyH Friends of Objective-See: -Jamf, Mosyle, Kandji, CleanMyMac X, Kolide, Fleet, SmugMug, Guardian Mobile Firewall, iVerify, Halo Privacy, uberAgent +Jamf, Mosyle, Kandji, CleanMyMac X, Kolide, Fleet, Addigy, SmugMug, Guardian Mobile Firewall, iVerify, Halo Privacy, uberAgent