diff --git a/SignalServiceKit/src/Network/OWSCensorshipConfiguration.h b/SignalServiceKit/src/Network/OWSCensorshipConfiguration.h index 208b33504..1f16ac63f 100644 --- a/SignalServiceKit/src/Network/OWSCensorshipConfiguration.h +++ b/SignalServiceKit/src/Network/OWSCensorshipConfiguration.h @@ -1,14 +1,15 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN @class AFSecurityPolicy; -extern NSString *const OWSCensorshipConfiguration_SouqFrontingHost; -extern NSString *const OWSCensorshipConfiguration_YahooViewFrontingHost; -extern NSString *const OWSCensorshipConfiguration_DefaultFrontingHost; +extern NSString *const OWSFrontingHost_GoogleEgypt; +extern NSString *const OWSFrontingHost_GoogleUAE; +extern NSString *const OWSFrontingHost_GoogleOman; +extern NSString *const OWSFrontingHost_GoogleQatar; @interface OWSCensorshipConfiguration : NSObject diff --git a/SignalServiceKit/src/Network/OWSCensorshipConfiguration.m b/SignalServiceKit/src/Network/OWSCensorshipConfiguration.m index 3ddbea908..fd55f80a5 100644 --- a/SignalServiceKit/src/Network/OWSCensorshipConfiguration.m +++ b/SignalServiceKit/src/Network/OWSCensorshipConfiguration.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSCensorshipConfiguration.h" @@ -11,9 +11,11 @@ NS_ASSUME_NONNULL_BEGIN -NSString *const OWSCensorshipConfiguration_SouqFrontingHost = @"cms.souqcdn.com"; -NSString *const OWSCensorshipConfiguration_YahooViewFrontingHost = @"view.yahoo.com"; -NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipConfiguration_YahooViewFrontingHost; +NSString *const OWSFrontingHost_GoogleEgypt = @"www.google.com.eg"; +NSString *const OWSFrontingHost_GoogleUAE = @"www.google.ae"; +NSString *const OWSFrontingHost_GoogleOman = @"www.google.com.om"; +NSString *const OWSFrontingHost_GoogleQatar = @"www.google.com.qa"; +NSString *const OWSFrontingHost_Default = @"www.google.com"; @implementation OWSCensorshipConfiguration @@ -25,7 +27,6 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo return nil; } - return [self censorshipConfigurationWithCountryCode:countryCode]; } @@ -45,10 +46,9 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo baseURL = [NSURL URLWithString:frontingURLString]; securityPolicy = [self securityPolicyForDomain:(NSString *)specifiedDomain]; } else { - NSString *frontingURLString = - [NSString stringWithFormat:@"https://%@", OWSCensorshipConfiguration_DefaultFrontingHost]; + NSString *frontingURLString = [NSString stringWithFormat:@"https://%@", OWSFrontingHost_Default]; baseURL = [NSURL URLWithString:frontingURLString]; - securityPolicy = [self securityPolicyForDomain:OWSCensorshipConfiguration_DefaultFrontingHost]; + securityPolicy = [self securityPolicyForDomain:OWSFrontingHost_Default]; } OWSAssertDebug(baseURL); @@ -135,13 +135,17 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo // If the security policy requires new certificates, include them in the SSK bundle + (AFSecurityPolicy *)securityPolicyForDomain:(NSString *)domain { - if ([domain isEqualToString:OWSCensorshipConfiguration_SouqFrontingHost]) { - return [self souqPinningPolicy]; - } else if ([domain isEqualToString:OWSCensorshipConfiguration_YahooViewFrontingHost]) { - return [self yahooViewPinningPolicy]; + if ([domain isEqualToString:OWSFrontingHost_GoogleEgypt]) { + return self.googlePinningPolicy; + } else if ([domain isEqualToString:OWSFrontingHost_GoogleQatar]) { + return self.googlePinningPolicy; + } else if ([domain isEqualToString:OWSFrontingHost_GoogleOman]) { + return self.googlePinningPolicy; + } else if ([domain isEqualToString:OWSFrontingHost_GoogleUAE]) { + return self.googlePinningPolicy; } else { OWSFailDebug(@"unknown pinning domain."); - return [self yahooViewPinningPolicy]; + return self.googlePinningPolicy; } } @@ -197,7 +201,7 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo return certData; } -+ (AFSecurityPolicy *)yahooViewPinningPolicy ++ (AFSecurityPolicy *)yahooViewPinningPolicy_deprecated { static AFSecurityPolicy *securityPolicy = nil; static dispatch_once_t onceToken; @@ -209,7 +213,7 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo return securityPolicy; } -+ (AFSecurityPolicy *)souqPinningPolicy ++ (AFSecurityPolicy *)souqPinningPolicy_deprecated { static AFSecurityPolicy *securityPolicy = nil; static dispatch_once_t onceToken; @@ -221,7 +225,7 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo return securityPolicy; } -+ (AFSecurityPolicy *)googlePinningPolicy_deprecated ++ (AFSecurityPolicy *)googlePinningPolicy { static AFSecurityPolicy *securityPolicy = nil; static dispatch_once_t onceToken; diff --git a/SignalServiceKit/src/Network/OWSCountryMetadata.m b/SignalServiceKit/src/Network/OWSCountryMetadata.m index 95cf9a4bb..6d3811353 100644 --- a/SignalServiceKit/src/Network/OWSCountryMetadata.m +++ b/SignalServiceKit/src/Network/OWSCountryMetadata.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSCountryMetadata.h" @@ -63,7 +63,7 @@ NS_ASSUME_NONNULL_BEGIN [OWSCountryMetadata countryMetadataWithName:@"Andorra" tld:@".ad" frontingDomain:nil countryCode:@"AD"], [OWSCountryMetadata countryMetadataWithName:@"United Arab Emirates" tld:@".ae" - frontingDomain:OWSCensorshipConfiguration_SouqFrontingHost + frontingDomain:OWSFrontingHost_GoogleUAE countryCode:@"AE"], [OWSCountryMetadata countryMetadataWithName:@"Afghanistan" tld:@".af" frontingDomain:nil countryCode:@"AF"], [OWSCountryMetadata countryMetadataWithName:@"Antigua and Barbuda" @@ -157,7 +157,7 @@ NS_ASSUME_NONNULL_BEGIN [OWSCountryMetadata countryMetadataWithName:@"Estonia" tld:@".ee" frontingDomain:nil countryCode:@"EE"], [OWSCountryMetadata countryMetadataWithName:@"Egypt" tld:@".eg" - frontingDomain:OWSCensorshipConfiguration_SouqFrontingHost + frontingDomain:OWSFrontingHost_GoogleEgypt countryCode:@"EG"], [OWSCountryMetadata countryMetadataWithName:@"Spain" tld:@".es" frontingDomain:nil countryCode:@"ES"], [OWSCountryMetadata countryMetadataWithName:@"Ethiopia" tld:@".et" frontingDomain:nil countryCode:@"ET"], @@ -255,7 +255,7 @@ NS_ASSUME_NONNULL_BEGIN [OWSCountryMetadata countryMetadataWithName:@"New Zealand" tld:@".nz" frontingDomain:nil countryCode:@"NZ"], [OWSCountryMetadata countryMetadataWithName:@"Oman" tld:@".om" - frontingDomain:OWSCensorshipConfiguration_SouqFrontingHost + frontingDomain:OWSFrontingHost_GoogleOman countryCode:@"OM"], [OWSCountryMetadata countryMetadataWithName:@"Pakistan" tld:@".pk" frontingDomain:nil countryCode:@"PK"], [OWSCountryMetadata countryMetadataWithName:@"Panama" tld:@".pa" frontingDomain:nil countryCode:@"PA"], @@ -279,7 +279,7 @@ NS_ASSUME_NONNULL_BEGIN [OWSCountryMetadata countryMetadataWithName:@"Paraguay" tld:@".py" frontingDomain:nil countryCode:@"PY"], [OWSCountryMetadata countryMetadataWithName:@"Qatar" tld:@".qa" - frontingDomain:OWSCensorshipConfiguration_SouqFrontingHost + frontingDomain:OWSFrontingHost_GoogleQatar countryCode:@"QA"], [OWSCountryMetadata countryMetadataWithName:@"Romania" tld:@".ro" frontingDomain:nil countryCode:@"RO"], [OWSCountryMetadata countryMetadataWithName:@"Serbia" tld:@".rs" frontingDomain:nil countryCode:@"RS"], diff --git a/SignalServiceKit/src/TSConstants.h b/SignalServiceKit/src/TSConstants.h index 8c327b503..e838abdce 100644 --- a/SignalServiceKit/src/TSConstants.h +++ b/SignalServiceKit/src/TSConstants.h @@ -29,8 +29,8 @@ typedef NS_ENUM(NSInteger, TSWhisperMessageType) { #define textSecureServerURL @"https://textsecure-service.whispersystems.org/" #define textSecureCDNServerURL @"https://cdn.signal.org" // Use same reflector for service and CDN -#define textSecureServiceReflectorHost @"textsecure-service-reflected.whispersystems.org" -#define textSecureCDNReflectorHost @"textsecure-service-reflected.whispersystems.org" +#define textSecureServiceReflectorHost @"europe-west1-signal-cdn-reflector.cloudfunctions.net" +#define textSecureCDNReflectorHost @"europe-west1-signal-cdn-reflector.cloudfunctions.net" #define contactDiscoveryURL @"https://api.directory.signal.org" #define kUDTrustRoot @"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF" #define USING_PRODUCTION_SERVICE