From cbda28a9a027e194872bd9e6eb9bb85b607f8068 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Sat, 1 Feb 2020 11:49:34 +1100 Subject: [PATCH] Remove analytics & Signal requests --- Signal/Signal-Info.plist | 29 ++------ .../src/Contacts/ContactDiscoveryService.m | 2 + .../OWSContactDiscoveryOperation.swift | 1 + .../src/Loki/Utilities/Analytics.swift | 11 --- .../src/Network/OWSSignalService.m | 5 +- .../src/Network/OutageDetection.swift | 6 +- SignalServiceKit/src/Util/OWSAnalytics.m | 8 ++- SignalShareExtension/Info.plist | 70 +++++++++++-------- 8 files changed, 59 insertions(+), 73 deletions(-) delete mode 100644 SignalServiceKit/src/Loki/Utilities/Analytics.swift diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 4a8f35485..6eef4af7b 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -62,35 +62,21 @@ NSExceptionDomains - amazonaws.com - - NSIncludesSubdomains - - NSThirdPartyExceptionRequiresForwardSecrecy - - - api-staging.directory.signal.org + 149.56.148.124 NSExceptionAllowsInsecureHTTPLoads - NSThirdPartyExceptionRequiresForwardSecrecy - - - api.directory.signal.org - - NSExceptionAllowsInsecureHTTPLoads + NSIncludesSubdomains - NSThirdPartyExceptionRequiresForwardSecrecy - - imaginary.stream + contentproxy.signal.org NSExceptionAllowsInsecureHTTPLoads NSIncludesSubdomains - signal.org + imaginary.stream NSExceptionAllowsInsecureHTTPLoads @@ -111,13 +97,6 @@ NSIncludesSubdomains - whispersystems.org - - NSExceptionAllowsInsecureHTTPLoads - - NSIncludesSubdomains - - NSAppleMusicUsageDescription diff --git a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m index 7c04e333e..0b0bcfb5e 100644 --- a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m +++ b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m @@ -354,6 +354,8 @@ NSError *ContactDiscoveryServiceErrorMakeWithReason(NSInteger code, NSString *re success:(void (^)(RemoteAttestation *remoteAttestation))successHandler failure:(void (^)(NSError *error))failureHandler { + return; // Loki: Do nothing + ECKeyPair *keyPair = [Curve25519 generateKeyPair]; NSString *enclaveId = @"cd6cfc342937b23b1bdd3bbf9721aa5615ac9ff50a75c5527d441cd3276826c9"; diff --git a/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift b/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift index 30b3440d7..cbefc9e8e 100644 --- a/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift +++ b/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift @@ -237,6 +237,7 @@ class CDSBatchOperation: OWSOperation { } private func makeContactDiscoveryRequest(remoteAttestation: RemoteAttestation) { + return // Loki: Do nothing guard !isCancelled else { Logger.info("no work to do, since we were canceled") diff --git a/SignalServiceKit/src/Loki/Utilities/Analytics.swift b/SignalServiceKit/src/Loki/Utilities/Analytics.swift deleted file mode 100644 index 49ddaee8b..000000000 --- a/SignalServiceKit/src/Loki/Utilities/Analytics.swift +++ /dev/null @@ -1,11 +0,0 @@ - -@objc(LKAnalytics) -public final class Analytics : NSObject { - @objc public var trackImplementation: ((String) -> Void)! // Set in AppDelegate.m - - @objc public static let shared = Analytics() - - @objc public func track(_ event: String) { - trackImplementation(event) - } -} diff --git a/SignalServiceKit/src/Network/OWSSignalService.m b/SignalServiceKit/src/Network/OWSSignalService.m index 208c95f24..57498b2fc 100644 --- a/SignalServiceKit/src/Network/OWSSignalService.m +++ b/SignalServiceKit/src/Network/OWSSignalService.m @@ -232,12 +232,9 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = - (AFHTTPSessionManager *)defaultCDNSessionManager { - NSURL *baseURL = [[NSURL alloc] initWithString:textSecureCDNServerURL]; - OWSAssertDebug(baseURL); - NSURLSessionConfiguration *sessionConf = NSURLSessionConfiguration.ephemeralSessionConfiguration; AFHTTPSessionManager *sessionManager = - [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL sessionConfiguration:sessionConf]; + [[AFHTTPSessionManager alloc] initWithBaseURL:nil sessionConfiguration:sessionConf]; sessionManager.securityPolicy = [OWSHTTPSecurityPolicy sharedPolicy]; diff --git a/SignalServiceKit/src/Network/OutageDetection.swift b/SignalServiceKit/src/Network/OutageDetection.swift index c6bd4af76..2717dc570 100644 --- a/SignalServiceKit/src/Network/OutageDetection.swift +++ b/SignalServiceKit/src/Network/OutageDetection.swift @@ -27,9 +27,9 @@ public class OutageDetection: NSObject { } private var shouldCheckForOutage = false { didSet { - AssertIsOnMainThread() - - ensureCheckTimer() + // Loki: Don't check for outages +// AssertIsOnMainThread() +// ensureCheckTimer() } } diff --git a/SignalServiceKit/src/Util/OWSAnalytics.m b/SignalServiceKit/src/Util/OWSAnalytics.m index eeb3db384..678cdaff3 100755 --- a/SignalServiceKit/src/Util/OWSAnalytics.m +++ b/SignalServiceKit/src/Util/OWSAnalytics.m @@ -18,8 +18,7 @@ NS_ASSUME_NONNULL_BEGIN #ifdef DEBUG -// TODO: Disable analytics for debug builds. -//#define NO_SIGNAL_ANALYTICS +#define NO_SIGNAL_ANALYTICS #endif @@ -120,6 +119,7 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity) - (void)tryToSyncEvents { + return; // Loki: Do nothing dispatch_async(self.serialQueue, ^{ // Don't try to sync if: // @@ -159,6 +159,7 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity) - (void)sendEvent:(NSDictionary *)eventDictionary eventKey:(NSString *)eventKey isCritical:(BOOL)isCritical { + return; // Loki: Do nothing OWSAssertDebug(eventDictionary); OWSAssertDebug(eventKey); AssertOnDispatchQueue(self.serialQueue); @@ -222,6 +223,7 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity) success:(void (^_Nonnull)(void))successBlock failure:(void (^_Nonnull)(void))failureBlock { + return; // Loki: Do nothing OWSAssertDebug(eventDictionary); OWSAssertDebug(eventKey); AssertOnDispatchQueue(self.serialQueue); @@ -292,6 +294,7 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity) - (void)addEvent:(NSString *)eventName severity:(OWSAnalyticsSeverity)severity properties:(NSDictionary *)properties { + return; // Loki: Do nothing OWSAssertDebug(eventName.length > 0); OWSAssertDebug(properties); @@ -357,6 +360,7 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity) location:(const char *)location line:(int)line { + // Loki: Do nothing DDLogFlag logFlag; switch (severity) { case OWSAnalyticsSeverityInfo: diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 2f4a1d3dd..a3dd8a8e6 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -23,32 +23,46 @@ ITSAppUsesNonExemptEncryption NSAppTransportSecurity - - NSExceptionDomains - - amazonaws.com - - NSIncludesSubdomains - - NSThirdPartyExceptionRequiresForwardSecrecy - - - signal.org - - NSExceptionAllowsInsecureHTTPLoads - - NSIncludesSubdomains - - - whispersystems.org - - NSExceptionAllowsInsecureHTTPLoads - - NSIncludesSubdomains - - - - + + NSExceptionDomains + + 149.56.148.124 + + NSExceptionAllowsInsecureHTTPLoads + + NSIncludesSubdomains + + + imaginary.stream + + NSExceptionAllowsInsecureHTTPLoads + + NSIncludesSubdomains + + + storage.seed1.loki.network + + NSExceptionAllowsInsecureHTTPLoads + + NSIncludesSubdomains + + + storage.seed2.loki.network + + NSExceptionAllowsInsecureHTTPLoads + + NSIncludesSubdomains + + + contentproxy.signal.org + + NSExceptionAllowsInsecureHTTPLoads + + NSIncludesSubdomains + + + + NSExtension NSExtensionAttributes @@ -60,8 +74,8 @@ SUBQUERY ( $extensionItem.attachments, $attachment, - ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.data" - || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.url" + ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.data" + || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.url" ).@count >= 1 ).@count == 1