Backend service implementation and integration with independent app binary

AppController.m

@@ -31,7 +31,6 @@
 #import "SCXPCClient.h"
 #import "SCBlockFileReaderWriter.h"
 #import "SCUIUtilities.h"
-#import <TransformerKit/NSValueTransformer+TransformerKit.h>
 
 @interface AppController () {}
 
@@ -608,23 +607,23 @@ - (void)installBlock {
                 // we're about to launch a helper tool which will read settings, so make sure the ones on disk are valid
                 [self->settings_ synchronizeSettings];
                 [self->defaults_ synchronize];
-
+                NSDictionary *blockSettings = @{
+                    @"ClearCaches": [self->defaults_ valueForKey: @"ClearCaches"],
+                    @"AllowLocalNetworks": [self->defaults_ valueForKey: @"AllowLocalNetworks"],
+                    @"EvaluateCommonSubdomains": [self->defaults_ valueForKey: @"EvaluateCommonSubdomains"],
+                    @"IncludeLinkedDomains": [self->defaults_ valueForKey: @"IncludeLinkedDomains"],
+                    @"BlockSoundShouldPlay": [self->defaults_ valueForKey: @"BlockSoundShouldPlay"],
+                    @"BlockSound": [self->defaults_ valueForKey: @"BlockSound"],
+                    @"EnableErrorReporting": [self->defaults_ valueForKey: @"EnableErrorReporting"]
+                };
                 // ok, the new helper tool is installed! refresh the connection, then it's time to start the block
                 [self.xpc refreshConnectionAndRun:^{
                     NSLog(@"Refreshed connection and ready to start block!");
                     [self.xpc startBlockWithControllingUID: getuid()
                                                  blocklist: [self->defaults_ arrayForKey: @"Blocklist"]
                                                isAllowlist: [self->defaults_ boolForKey: @"BlockAsWhitelist"]
                                                    endDate: newBlockEndDate
-                                             blockSettings: @{
-                                                                @"ClearCaches": [self->defaults_ valueForKey: @"ClearCaches"],
-                                                                @"AllowLocalNetworks": [self->defaults_ valueForKey: @"AllowLocalNetworks"],
-                                                                @"EvaluateCommonSubdomains": [self->defaults_ valueForKey: @"EvaluateCommonSubdomains"],
-                                                                @"IncludeLinkedDomains": [self->defaults_ valueForKey: @"IncludeLinkedDomains"],
-                                                                @"BlockSoundShouldPlay": [self->defaults_ valueForKey: @"BlockSoundShouldPlay"],
-                                                                @"BlockSound": [self->defaults_ valueForKey: @"BlockSound"],
-                                                                @"EnableErrorReporting": [self->defaults_ valueForKey: @"EnableErrorReporting"]
-                                                            }
+                                             blockSettings: blockSettings
                                                      reply:^(NSError * _Nonnull error) {
                         if (error != nil) {
                             [SCUIUtilities presentError: error];

ButtonWithPopupMenu.m

@@ -54,4 +54,4 @@ - (void)dealloc {
 }
 
 
-@end
+@end

Common/SCSentry.m

@@ -9,32 +9,33 @@
 #import "SCSettings.h"
 
 #ifndef TESTING
-#import <Sentry/Sentry.h>
+//#import <Sentry/Sentry.h>
+//#import <Sentry/Sentry.h>
 #endif
 
 @implementation SCSentry
 
 //org.eyebeam.SelfControl
 + (void)startSentry:(NSString*)componentId {
 #ifndef TESTING
-    [SentrySDK startWithConfigureOptions:^(SentryOptions *options) {
-        options.dsn = @"https://58fbe7145368418998067f88896007b2@o504820.ingest.sentry.io/5592195";
-        options.releaseName = [NSString stringWithFormat: @"%@%@", componentId, SELFCONTROL_VERSION_STRING];
-        options.enableAutoSessionTracking = NO;
-        options.environment = @"dev";
-
-        // make sure no data leaves the device if error reporting isn't enabled
-        options.beforeSend = ^SentryEvent * _Nullable(SentryEvent * _Nonnull event) {
-            if ([SCSentry errorReportingEnabled]) {
-                return event;
-            } else {
-                return NULL;
-            }
-        };
-    }];
-    [SentrySDK configureScope:^(SentryScope * _Nonnull scope) {
-        [scope setTagValue: [[NSLocale currentLocale] localeIdentifier] forKey: @"localeId"];
-    }];
+//    [SentrySDK startWithConfigureOptions:^(SentryOptions *options) {
+//        options.dsn = @"https://58fbe7145368418998067f88896007b2@o504820.ingest.sentry.io/5592195";
+//        options.releaseName = [NSString stringWithFormat: @"%@%@", componentId, SELFCONTROL_VERSION_STRING];
+//        options.enableAutoSessionTracking = NO;
+//        options.environment = @"dev";
+//        
+//        // make sure no data leaves the device if error reporting isn't enabled
+//        options.beforeSend = ^SentryEvent * _Nullable(SentryEvent * _Nonnull event) {
+//            if ([SCSentry errorReportingEnabled]) {
+//                return event;
+//            } else {
+//                return NULL;
+//            }
+//        };
+//    }];
+//    [SentrySDK configureScope:^(SentryScope * _Nonnull scope) {
+//        [scope setTagValue: [[NSLocale currentLocale] localeIdentifier] forKey: @"localeId"];
+//    }];
 #endif
 }
 
@@ -113,19 +114,19 @@ + (void)updateDefaultsContext {
     [defaultsDict removeObjectForKey: @"SULastProfileSubmissionDate"];
 
 #ifndef TESTING
-    [SentrySDK configureScope:^(SentryScope * _Nonnull scope) {
-        [scope setContextValue: defaultsDict forKey: @"NSUserDefaults"];
-    }];
+//    [SentrySDK configureScope:^(SentryScope * _Nonnull scope) {
+//        [scope setContextValue: defaultsDict forKey: @"NSUserDefaults"];
+//    }];
 #endif
 }
 
 + (void)addBreadcrumb:(NSString*)message category:(NSString*)category {
 #ifndef TESTING
-    SentryBreadcrumb* crumb = [[SentryBreadcrumb alloc] init];
-    crumb.level = kSentryLevelInfo;
-    crumb.category = category;
-    crumb.message = message;
-    [SentrySDK addBreadcrumb: crumb];
+//    SentryBreadcrumb* crumb = [[SentryBreadcrumb alloc] init];
+//    crumb.level = kSentryLevelInfo;
+//    crumb.category = category;
+//    crumb.message = message;
+//    [SentrySDK addBreadcrumb: crumb];
 #endif
 }
 
@@ -147,7 +148,7 @@ + (void)captureError:(NSError*)error {
     [[SCSettings sharedSettings] updateSentryContext];
     [SCSentry updateDefaultsContext];
 #ifndef TESTING
-    [SentrySDK captureError: error];
+//    [SentrySDK captureError: error];
 #endif
 }
 
@@ -170,11 +171,11 @@ + (void)captureMessage:(NSString*)message withScopeBlock:(nullable void (^)(Sent
     [SCSentry updateDefaultsContext];
 
 #ifndef TESTING
-    if (block != nil) {
-        [SentrySDK captureMessage: message withScopeBlock: block];
-    } else {
-        [SentrySDK captureMessage: message];
-    }
+//    if (block != nil) {
+//        [SentrySDK captureMessage: message withScopeBlock: block];
+//    } else {
+//        [SentrySDK captureMessage: message];
+//    }
 #endif
 }
 

Common/SCSettings.m

@@ -9,7 +9,7 @@
 #import <AppKit/AppKit.h>
 
 #ifndef TESTING
-#import <Sentry/Sentry.h>
+//#import <Sentry/Sentry.h>
 #endif
 
 float const SYNC_INTERVAL_SECS = 30;
@@ -485,9 +485,9 @@ - (void)updateSentryContext {
     }
 
 #ifndef TESTING
-    [SentrySDK configureScope:^(SentryScope * _Nonnull scope) {
-        [scope setContextValue: dictCopy forKey: @"SCSettings"];
-    }];
+//    [SentrySDK configureScope:^(SentryScope * _Nonnull scope) {
+//        [scope setContextValue: dictCopy forKey: @"SCSettings"];
+//    }];
 #endif
 }
 

Daemon/SCDaemon.m

@@ -124,6 +124,7 @@ - (void)startInactivityTimer {
         }
     }];
 }
+
 - (void)resetInactivityTimer {
     self.lastActivityDate = [NSDate date];
 }
@@ -146,6 +147,11 @@ - (void)dealloc {
 #pragma mark - NSXPCListenerDelegate
 
 - (BOOL)listener:(NSXPCListener *)listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection {
+//#if DEBUG
+//    // In Debug builds, skip code signature validation to ease development.
+//    NSLog(@"[DEBUG] Accepting XPC connection without signature validation.");
+//    [SCSentry addBreadcrumb:@"DEBUG: accepted XPC connection without validation" category:@"daemon"];
+//#else
     // There is a potential security issue / race condition with matching based on PID, so we use the (technically private) auditToken instead
     audit_token_t auditToken = newConnection.auditToken;
     NSDictionary* guestAttributes = @{
@@ -159,7 +165,7 @@ - (BOOL)listener:(NSXPCListener *)listener shouldAcceptNewConnection:(NSXPCConne
     SecRequirementRef isSelfControlApp;
     // versions before 4.0 didn't have hardened code signing, so aren't trustworthy to talk to the daemon
     // (plus the daemon didn't exist before 4.0 so there's really no reason they should want to run it!)
-    SecRequirementCreateWithString(CFSTR("anchor apple generic and (identifier \"org.eyebeam.SelfControl\" or identifier \"org.eyebeam.selfcontrol-cli\") and info [CFBundleVersion] >= \"407\" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = EG6ZYP3AQH)"), kSecCSDefaultFlags, &isSelfControlApp);
+    SecRequirementCreateWithString(CFSTR("anchor apple generic and (identifier \"org.eyebeam.SelfControl\" or identifier \"org.eyebeam.selfcontrol-cli\") and info [CFBundleVersion] >= \"407\""), kSecCSDefaultFlags, &isSelfControlApp);
     OSStatus clientValidityStatus = SecCodeCheckValidity(guest, kSecCSDefaultFlags, isSelfControlApp);
 
     CFRelease(guest);
@@ -171,6 +177,7 @@ - (BOOL)listener:(NSXPCListener *)listener shouldAcceptNewConnection:(NSXPCConne
         [SCSentry captureError: error];
         return NO;
     }
+//#endif
 
     SCDaemonXPC* scdXPC = [[SCDaemonXPC alloc] init];
     newConnection.exportedInterface = [NSXPCInterface interfaceWithProtocol: @protocol(SCDaemonProtocol)];

Daemon/SCDaemonXPC.m

@@ -71,7 +71,7 @@ - (void)getVersionWithReply:(void(^)(NSString * version))reply {
     NSLog(@"XPC method called: getVersionWithReply");
     // We specifically don't check for authorization here.  Everyone is always allowed to get
     // the version of the helper tool.
-    reply(SELFCONTROL_VERSION_STRING);
+    reply(@"4.0.2");
 }
 
 @end

Daemon/selfcontrold-Info.plist

@@ -52,7 +52,7 @@
 	<string>Free and open-source under the GPL.</string>
 	<key>SMAuthorizedClients</key>
 	<array>
-		<string>anchor apple generic and (identifier &quot;org.eyebeam.SelfControl&quot; or identifier &quot;org.eyebeam.selfcontrol-cli&quot;) and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = EG6ZYP3AQH)</string>
+		<string>anchor apple generic and (identifier &quot;org.eyebeam.SelfControl&quot; or identifier &quot;org.eyebeam.selfcontrol-cli&quot;)</string>
 	</array>
 </dict>
 </plist>

Info.plist

@@ -58,18 +58,18 @@
 	<key>SMPrivilegedExecutables</key>
 	<dict>
 		<key>org.eyebeam.selfcontrold</key>
-		<string>anchor apple generic and identifier &quot;org.eyebeam.selfcontrold&quot; and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = EG6ZYP3AQH)</string>
+		<string>anchor apple generic and identifier "org.eyebeam.selfcontrold"</string>
 	</dict>
 	<key>SUEnableAutomaticChecks</key>
 	<true/>
 	<key>SUEnableJavaScript</key>
 	<true/>
+	<key>SUEnableSystemProfiling</key>
+	<true/>
 	<key>SUFeedURL</key>
 	<string>https://selfcontrolapp.com/appcast.xml</string>
 	<key>SUPublicDSAKeyFile</key>
 	<string>dsa_pub.pem</string>
-	<key>SUEnableSystemProfiling</key>
-	<true/>
 	<key>SUSendProfileInfo</key>
 	<true/>
 </dict>

Podfile

@@ -1,6 +1,6 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
-minVersion = '10.10'
+minVersion = '11.5'
 
 platform :osx, minVersion
 
@@ -11,10 +11,9 @@ plugin 'cocoapods-prune-localizations', { :localizations => supported_locales }
 target "SelfControl" do
     use_frameworks! :linkage => :static
     pod 'MASPreferences', '~> 1.1.4'
-    pod 'TransformerKit', '~> 1.1.1'
     pod 'FormatterKit/TimeIntervalFormatter', '~> 1.8.0'
     pod 'LetsMove', '~> 1.24'
-    pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.3.0'
+    pod 'Sentry'
 
     # Add test target
     target 'SelfControlTests' do
@@ -24,19 +23,15 @@ end
 
 target "SelfControl Killer" do
     use_frameworks! :linkage => :static
-    pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.3.0'
 end
 
 # we can't use_frameworks on these because they're command-line tools
 # Sentry says we need use_frameworks, but they seem to work OK anyway?
 target "SCKillerHelper" do
-    pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.3.0'
 end
 target "selfcontrol-cli" do
-    pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.3.0'
 end
 target "org.eyebeam.selfcontrold" do
-    pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.3.0'
 end
 
 post_install do |pi|

SCDurationSlider.m

@@ -7,7 +7,6 @@
 
 #import "SCDurationSlider.h"
 #import "SCTimeIntervalFormatter.h"
-#import <TransformerKit/NSValueTransformer+TransformerKit.h>
 
 #define kValueTransformerName @"BlockDurationSliderTransformer"
 
@@ -47,29 +46,31 @@ - (void)setMaxDuration:(NSInteger)maxDuration {
 }
 
 - (void)registerMinutesValueTransformer {
-    [NSValueTransformer registerValueTransformerWithName: kValueTransformerName
-                                   transformedValueClass: [NSNumber class]
-                      returningTransformedValueWithBlock:^id _Nonnull(id  _Nonnull value) {
-        // if it's not a number or convertable to one, IDK man
-        if (![value respondsToSelector: @selector(floatValue)]) return @0;
-
-        long minutesValue = lroundf([value floatValue]);
-        return @(minutesValue);
-    }];
+
+//SS: TODO:
+//    [NSValueTransformer registerValueTransformerWithName: kValueTransformerName
+//                                   transformedValueClass: [NSNumber class]
+//                      returningTransformedValueWithBlock:^id _Nonnull(id  _Nonnull value) {
+//        // if it's not a number or convertable to one, IDK man
+//        if (![value respondsToSelector: @selector(floatValue)]) return @0;
+//        
+//        long minutesValue = lroundf([value floatValue]);
+//        return @(minutesValue);
+//    }];
 }
 
 - (NSInteger)durationValueMinutes {
     return lroundf(self.floatValue);
 }
 
 - (void)bindDurationToObject:(id)obj keyPath:(NSString*)keyPath {
-    [self bind: @"value"
-      toObject: obj
-   withKeyPath: keyPath
-       options: @{
-                  NSContinuouslyUpdatesValueBindingOption: @YES,
-                  NSValueTransformerNameBindingOption: kValueTransformerName
-                  }];
+//    [self bind: @"value"
+//      toObject: obj
+//   withKeyPath: keyPath
+//       options: @{
+//                  NSContinuouslyUpdatesValueBindingOption: @YES,
+//                  NSValueTransformerNameBindingOption: kValueTransformerName
+//                  }];
 }
 
 - (NSString*)durationDescription {