keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update front

Browse Source
pull/2/head
Michael Kirk 5 years ago
parent 3b0d6991e1
commit 3fb8b02b3b
4 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File

9
SignalServiceKit/src/Network/OWSCensorshipConfiguration.h
Unescape Escape View File

@ -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 NS_ASSUME_NONNULL_BEGIN
@class AFSecurityPolicy; @class AFSecurityPolicy;
extern NSString *const OWSCensorshipConfiguration_SouqFrontingHost; extern NSString *const OWSFrontingHost_GoogleEgypt;
extern NSString *const OWSCensorshipConfiguration_YahooViewFrontingHost; extern NSString *const OWSFrontingHost_GoogleUAE;
extern NSString *const OWSCensorshipConfiguration_DefaultFrontingHost; extern NSString *const OWSFrontingHost_GoogleOman;
extern NSString *const OWSFrontingHost_GoogleQatar;
@interface OWSCensorshipConfiguration : NSObject @interface OWSCensorshipConfiguration : NSObject

36
SignalServiceKit/src/Network/OWSCensorshipConfiguration.m
Unescape Escape View File

@ -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" #import "OWSCensorshipConfiguration.h"
@ -11,9 +11,11 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
NSString *const OWSCensorshipConfiguration_SouqFrontingHost = @"cms.souqcdn.com"; NSString *const OWSFrontingHost_GoogleEgypt = @"www.google.com.eg";
NSString *const OWSCensorshipConfiguration_YahooViewFrontingHost = @"view.yahoo.com"; NSString *const OWSFrontingHost_GoogleUAE = @"www.google.ae";
NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipConfiguration_YahooViewFrontingHost; 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 @implementation OWSCensorshipConfiguration
@ -25,7 +27,6 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo
return nil; return nil;
} }
return [self censorshipConfigurationWithCountryCode:countryCode]; return [self censorshipConfigurationWithCountryCode:countryCode];
} }
@ -45,10 +46,9 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo
baseURL = [NSURL URLWithString:frontingURLString]; baseURL = [NSURL URLWithString:frontingURLString];
securityPolicy = [self securityPolicyForDomain:(NSString *)specifiedDomain]; securityPolicy = [self securityPolicyForDomain:(NSString *)specifiedDomain];
} else { } else {
NSString *frontingURLString = NSString *frontingURLString = [NSString stringWithFormat:@"https://%@", OWSFrontingHost_Default];
[NSString stringWithFormat:@"https://%@", OWSCensorshipConfiguration_DefaultFrontingHost];
baseURL = [NSURL URLWithString:frontingURLString]; baseURL = [NSURL URLWithString:frontingURLString];
securityPolicy = [self securityPolicyForDomain:OWSCensorshipConfiguration_DefaultFrontingHost]; securityPolicy = [self securityPolicyForDomain:OWSFrontingHost_Default];
} }
OWSAssertDebug(baseURL); OWSAssertDebug(baseURL);
@ -135,13 +135,17 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo
// If the security policy requires new certificates, include them in the SSK bundle // If the security policy requires new certificates, include them in the SSK bundle
+ (AFSecurityPolicy *)securityPolicyForDomain:(NSString *)domain + (AFSecurityPolicy *)securityPolicyForDomain:(NSString *)domain
{ {
if ([domain isEqualToString:OWSCensorshipConfiguration_SouqFrontingHost]) { if ([domain isEqualToString:OWSFrontingHost_GoogleEgypt]) {
return [self souqPinningPolicy]; return self.googlePinningPolicy;
} else if ([domain isEqualToString:OWSCensorshipConfiguration_YahooViewFrontingHost]) { } else if ([domain isEqualToString:OWSFrontingHost_GoogleQatar]) {
return [self yahooViewPinningPolicy]; return self.googlePinningPolicy;
} else if ([domain isEqualToString:OWSFrontingHost_GoogleOman]) {
return self.googlePinningPolicy;
} else if ([domain isEqualToString:OWSFrontingHost_GoogleUAE]) {
return self.googlePinningPolicy;
} else { } else {
OWSFailDebug(@"unknown pinning domain."); OWSFailDebug(@"unknown pinning domain.");
return [self yahooViewPinningPolicy]; return self.googlePinningPolicy;
} }
} }
@ -197,7 +201,7 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo
return certData; return certData;
} }
+ (AFSecurityPolicy *)yahooViewPinningPolicy + (AFSecurityPolicy *)yahooViewPinningPolicy_deprecated
{ {
static AFSecurityPolicy *securityPolicy = nil; static AFSecurityPolicy *securityPolicy = nil;
static dispatch_once_t onceToken; static dispatch_once_t onceToken;
@ -209,7 +213,7 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo
return securityPolicy; return securityPolicy;
} }
+ (AFSecurityPolicy *)souqPinningPolicy + (AFSecurityPolicy *)souqPinningPolicy_deprecated
{ {
static AFSecurityPolicy *securityPolicy = nil; static AFSecurityPolicy *securityPolicy = nil;
static dispatch_once_t onceToken; static dispatch_once_t onceToken;
@ -221,7 +225,7 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo
return securityPolicy; return securityPolicy;
} }
+ (AFSecurityPolicy *)googlePinningPolicy_deprecated + (AFSecurityPolicy *)googlePinningPolicy
{ {
static AFSecurityPolicy *securityPolicy = nil; static AFSecurityPolicy *securityPolicy = nil;
static dispatch_once_t onceToken; static dispatch_once_t onceToken;

10
SignalServiceKit/src/Network/OWSCountryMetadata.m
Unescape Escape View File

@ -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" #import "OWSCountryMetadata.h"
@ -63,7 +63,7 @@ NS_ASSUME_NONNULL_BEGIN
[OWSCountryMetadata countryMetadataWithName:@"Andorra" tld:@".ad" frontingDomain:nil countryCode:@"AD"], [OWSCountryMetadata countryMetadataWithName:@"Andorra" tld:@".ad" frontingDomain:nil countryCode:@"AD"],
[OWSCountryMetadata countryMetadataWithName:@"United Arab Emirates" [OWSCountryMetadata countryMetadataWithName:@"United Arab Emirates"
tld:@".ae" tld:@".ae"
frontingDomain:OWSCensorshipConfiguration_SouqFrontingHost frontingDomain:OWSFrontingHost_GoogleUAE
countryCode:@"AE"], countryCode:@"AE"],
[OWSCountryMetadata countryMetadataWithName:@"Afghanistan" tld:@".af" frontingDomain:nil countryCode:@"AF"], [OWSCountryMetadata countryMetadataWithName:@"Afghanistan" tld:@".af" frontingDomain:nil countryCode:@"AF"],
[OWSCountryMetadata countryMetadataWithName:@"Antigua and Barbuda" [OWSCountryMetadata countryMetadataWithName:@"Antigua and Barbuda"
@ -157,7 +157,7 @@ NS_ASSUME_NONNULL_BEGIN
[OWSCountryMetadata countryMetadataWithName:@"Estonia" tld:@".ee" frontingDomain:nil countryCode:@"EE"], [OWSCountryMetadata countryMetadataWithName:@"Estonia" tld:@".ee" frontingDomain:nil countryCode:@"EE"],
[OWSCountryMetadata countryMetadataWithName:@"Egypt" [OWSCountryMetadata countryMetadataWithName:@"Egypt"
tld:@".eg" tld:@".eg"
frontingDomain:OWSCensorshipConfiguration_SouqFrontingHost frontingDomain:OWSFrontingHost_GoogleEgypt
countryCode:@"EG"], countryCode:@"EG"],
[OWSCountryMetadata countryMetadataWithName:@"Spain" tld:@".es" frontingDomain:nil countryCode:@"ES"], [OWSCountryMetadata countryMetadataWithName:@"Spain" tld:@".es" frontingDomain:nil countryCode:@"ES"],
[OWSCountryMetadata countryMetadataWithName:@"Ethiopia" tld:@".et" frontingDomain:nil countryCode:@"ET"], [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:@"New Zealand" tld:@".nz" frontingDomain:nil countryCode:@"NZ"],
[OWSCountryMetadata countryMetadataWithName:@"Oman" [OWSCountryMetadata countryMetadataWithName:@"Oman"
tld:@".om" tld:@".om"
frontingDomain:OWSCensorshipConfiguration_SouqFrontingHost frontingDomain:OWSFrontingHost_GoogleOman
countryCode:@"OM"], countryCode:@"OM"],
[OWSCountryMetadata countryMetadataWithName:@"Pakistan" tld:@".pk" frontingDomain:nil countryCode:@"PK"], [OWSCountryMetadata countryMetadataWithName:@"Pakistan" tld:@".pk" frontingDomain:nil countryCode:@"PK"],
[OWSCountryMetadata countryMetadataWithName:@"Panama" tld:@".pa" frontingDomain:nil countryCode:@"PA"], [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:@"Paraguay" tld:@".py" frontingDomain:nil countryCode:@"PY"],
[OWSCountryMetadata countryMetadataWithName:@"Qatar" [OWSCountryMetadata countryMetadataWithName:@"Qatar"
tld:@".qa" tld:@".qa"
frontingDomain:OWSCensorshipConfiguration_SouqFrontingHost frontingDomain:OWSFrontingHost_GoogleQatar
countryCode:@"QA"], countryCode:@"QA"],
[OWSCountryMetadata countryMetadataWithName:@"Romania" tld:@".ro" frontingDomain:nil countryCode:@"RO"], [OWSCountryMetadata countryMetadataWithName:@"Romania" tld:@".ro" frontingDomain:nil countryCode:@"RO"],
[OWSCountryMetadata countryMetadataWithName:@"Serbia" tld:@".rs" frontingDomain:nil countryCode:@"RS"], [OWSCountryMetadata countryMetadataWithName:@"Serbia" tld:@".rs" frontingDomain:nil countryCode:@"RS"],

4
SignalServiceKit/src/TSConstants.h
Unescape Escape View File

@ -29,8 +29,8 @@ typedef NS_ENUM(NSInteger, TSWhisperMessageType) {
#define textSecureServerURL @"https://textsecure-service.whispersystems.org/" #define textSecureServerURL @"https://textsecure-service.whispersystems.org/"
#define textSecureCDNServerURL @"https://cdn.signal.org" #define textSecureCDNServerURL @"https://cdn.signal.org"
// Use same reflector for service and CDN // Use same reflector for service and CDN
#define textSecureServiceReflectorHost @"textsecure-service-reflected.whispersystems.org" #define textSecureServiceReflectorHost @"europe-west1-signal-cdn-reflector.cloudfunctions.net"
#define textSecureCDNReflectorHost @"textsecure-service-reflected.whispersystems.org" #define textSecureCDNReflectorHost @"europe-west1-signal-cdn-reflector.cloudfunctions.net"
#define contactDiscoveryURL @"https://api.directory.signal.org" #define contactDiscoveryURL @"https://api.directory.signal.org"
#define kUDTrustRoot @"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF" #define kUDTrustRoot @"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF"
#define USING_PRODUCTION_SERVICE #define USING_PRODUCTION_SERVICE

Write Preview
Loading…
Cancel
Save