|
|
|
@ -22,7 +22,8 @@ public class SignalServiceNetworkAccess {
|
|
|
|
|
|
|
|
|
|
private static final String TAG = SignalServiceNetworkAccess.class.getName();
|
|
|
|
|
|
|
|
|
|
private static final String APPSPOT_REFLECTOR_HOST = "signal-reflector-meek.appspot.com";
|
|
|
|
|
private static final String APPSPOT_SERVICE_REFLECTOR_HOST = "signal-reflector-meek.appspot.com";
|
|
|
|
|
private static final String APPSPOT_CDN_REFLECTOR_HOST = "signal-cdn-reflector.appspot.com";
|
|
|
|
|
|
|
|
|
|
private static final ConnectionSpec GMAPS_CONNECTION_SPEC = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
|
|
|
|
|
.tlsVersions(TlsVersion.TLS_1_2)
|
|
|
|
@ -99,36 +100,46 @@ public class SignalServiceNetworkAccess {
|
|
|
|
|
private final SignalServiceConfiguration uncensoredConfiguration;
|
|
|
|
|
|
|
|
|
|
public SignalServiceNetworkAccess(Context context) {
|
|
|
|
|
final TrustStore googleTrustStore = new GoogleFrontingTrustStore(context);
|
|
|
|
|
final SignalServiceUrl baseGoogle = new SignalServiceUrl("https://www.google.com", APPSPOT_REFLECTOR_HOST, googleTrustStore, GMAIL_CONNECTION_SPEC);
|
|
|
|
|
final SignalServiceUrl baseAndroid = new SignalServiceUrl("https://android.clients.google.com", APPSPOT_REFLECTOR_HOST, googleTrustStore, PLAY_CONNECTION_SPEC);
|
|
|
|
|
final SignalServiceUrl mapsOneAndroid = new SignalServiceUrl("https://clients3.google.com", APPSPOT_REFLECTOR_HOST, googleTrustStore, GMAPS_CONNECTION_SPEC);
|
|
|
|
|
final SignalServiceUrl mapsTwoAndroid = new SignalServiceUrl("https://clients4.google.com", APPSPOT_REFLECTOR_HOST, googleTrustStore, GMAPS_CONNECTION_SPEC);
|
|
|
|
|
final SignalServiceUrl mailAndroid = new SignalServiceUrl("https://mail.google.com", APPSPOT_REFLECTOR_HOST, googleTrustStore, GMAIL_CONNECTION_SPEC);
|
|
|
|
|
final TrustStore googleTrustStore = new GoogleFrontingTrustStore(context);
|
|
|
|
|
final SignalServiceUrl baseGoogleService = new SignalServiceUrl("https://www.google.com", APPSPOT_SERVICE_REFLECTOR_HOST, googleTrustStore, GMAIL_CONNECTION_SPEC);
|
|
|
|
|
final SignalServiceUrl baseAndroidService = new SignalServiceUrl("https://android.clients.google.com", APPSPOT_SERVICE_REFLECTOR_HOST, googleTrustStore, PLAY_CONNECTION_SPEC);
|
|
|
|
|
final SignalServiceUrl mapsOneAndroidService = new SignalServiceUrl("https://clients3.google.com", APPSPOT_SERVICE_REFLECTOR_HOST, googleTrustStore, GMAPS_CONNECTION_SPEC);
|
|
|
|
|
final SignalServiceUrl mapsTwoAndroidService = new SignalServiceUrl("https://clients4.google.com", APPSPOT_SERVICE_REFLECTOR_HOST, googleTrustStore, GMAPS_CONNECTION_SPEC);
|
|
|
|
|
final SignalServiceUrl mailAndroidService = new SignalServiceUrl("https://mail.google.com", APPSPOT_SERVICE_REFLECTOR_HOST, googleTrustStore, GMAIL_CONNECTION_SPEC);
|
|
|
|
|
|
|
|
|
|
final SignalCdnUrl baseGoogleCdn = new SignalCdnUrl("https://www.google.com", APPSPOT_SERVICE_REFLECTOR_HOST, googleTrustStore, GMAIL_CONNECTION_SPEC);
|
|
|
|
|
final SignalCdnUrl baseAndroidCdn = new SignalCdnUrl("https://android.clients.google.com", APPSPOT_SERVICE_REFLECTOR_HOST, googleTrustStore, PLAY_CONNECTION_SPEC);
|
|
|
|
|
final SignalCdnUrl mapsOneAndroidCdn = new SignalCdnUrl("https://clients3.google.com", APPSPOT_SERVICE_REFLECTOR_HOST, googleTrustStore, GMAPS_CONNECTION_SPEC);
|
|
|
|
|
final SignalCdnUrl mapsTwoAndroidCdn = new SignalCdnUrl("https://clients4.google.com", APPSPOT_SERVICE_REFLECTOR_HOST, googleTrustStore, GMAPS_CONNECTION_SPEC);
|
|
|
|
|
final SignalCdnUrl mailAndroidCdn = new SignalCdnUrl("https://mail.google.com", APPSPOT_SERVICE_REFLECTOR_HOST, googleTrustStore, GMAIL_CONNECTION_SPEC);
|
|
|
|
|
|
|
|
|
|
this.censorshipConfiguration = new HashMap<String, SignalServiceConfiguration>() {{
|
|
|
|
|
put("+20", new SignalServiceConfiguration(new SignalServiceUrl[] {new SignalServiceUrl("https://www.google.com.eg",
|
|
|
|
|
APPSPOT_REFLECTOR_HOST,
|
|
|
|
|
APPSPOT_SERVICE_REFLECTOR_HOST,
|
|
|
|
|
googleTrustStore, GMAIL_CONNECTION_SPEC),
|
|
|
|
|
baseAndroid, mapsOneAndroid, mapsTwoAndroid, mailAndroid},
|
|
|
|
|
new SignalCdnUrl[] {})); // XXX
|
|
|
|
|
baseAndroidService, mapsOneAndroidService, mapsTwoAndroidService, mailAndroidService},
|
|
|
|
|
new SignalCdnUrl[] {new SignalCdnUrl("https://www.google.com.eg",
|
|
|
|
|
APPSPOT_CDN_REFLECTOR_HOST,
|
|
|
|
|
googleTrustStore, GMAIL_CONNECTION_SPEC),
|
|
|
|
|
baseAndroidCdn, mapsOneAndroidCdn, mapsTwoAndroidCdn, mailAndroidCdn, mailAndroidCdn}));
|
|
|
|
|
|
|
|
|
|
put("+971", new SignalServiceConfiguration(new SignalServiceUrl[] {new SignalServiceUrl("https://www.google.ae",
|
|
|
|
|
APPSPOT_REFLECTOR_HOST,
|
|
|
|
|
APPSPOT_SERVICE_REFLECTOR_HOST,
|
|
|
|
|
googleTrustStore, GMAIL_CONNECTION_SPEC),
|
|
|
|
|
baseAndroid, baseGoogle, mapsOneAndroid, mapsTwoAndroid, mailAndroid},
|
|
|
|
|
new SignalCdnUrl[] {})); // XXX
|
|
|
|
|
|
|
|
|
|
// put("+53", new SignalServiceUrl[] {new SignalServiceUrl("https://www.google.com.cu",
|
|
|
|
|
// APPSPOT_REFLECTOR_HOST,
|
|
|
|
|
// googleTrustStore, GMAIL_CONNECTION_SPEC),
|
|
|
|
|
// baseAndroid, baseGoogle, mapsOneAndroid, mapsTwoAndroid, mailAndroid});
|
|
|
|
|
baseAndroidService, baseGoogleService, mapsOneAndroidService, mapsTwoAndroidService, mailAndroidService},
|
|
|
|
|
new SignalCdnUrl[] {new SignalCdnUrl("https://www.google.ae",
|
|
|
|
|
APPSPOT_CDN_REFLECTOR_HOST,
|
|
|
|
|
googleTrustStore, GMAIL_CONNECTION_SPEC),
|
|
|
|
|
baseAndroidCdn, baseGoogleCdn, mapsOneAndroidCdn, mapsTwoAndroidCdn, mailAndroidCdn}));
|
|
|
|
|
|
|
|
|
|
put("+968", new SignalServiceConfiguration(new SignalServiceUrl[] {new SignalServiceUrl("https://www.google.com.om",
|
|
|
|
|
APPSPOT_REFLECTOR_HOST,
|
|
|
|
|
APPSPOT_SERVICE_REFLECTOR_HOST,
|
|
|
|
|
googleTrustStore, GMAIL_CONNECTION_SPEC),
|
|
|
|
|
baseAndroid, baseGoogle, mapsOneAndroid, mapsTwoAndroid, mailAndroid},
|
|
|
|
|
new SignalCdnUrl[] {})); // XXX
|
|
|
|
|
baseAndroidService, baseGoogleService, mapsOneAndroidService, mapsTwoAndroidService, mailAndroidService},
|
|
|
|
|
new SignalCdnUrl[] {new SignalCdnUrl("https://www.google.com.om",
|
|
|
|
|
APPSPOT_CDN_REFLECTOR_HOST,
|
|
|
|
|
googleTrustStore, GMAIL_CONNECTION_SPEC),
|
|
|
|
|
baseAndroidCdn, baseGoogleCdn, mapsOneAndroidCdn, mapsTwoAndroidCdn, mailAndroidCdn}));
|
|
|
|
|
}};
|
|
|
|
|
|
|
|
|
|
this.uncensoredConfiguration = new SignalServiceConfiguration(new SignalServiceUrl[] {new SignalServiceUrl(BuildConfig.SIGNAL_URL, new SignalServiceTrustStore(context))},
|
|
|
|
|