X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/b0502f9f825b2fe7a76b45909b8f57abfc11c891..8957a08453edb6a68ddae1a9bd01485032c4e2d8:/src/main/java/org/asamk/signal/manager/ServiceConfig.java diff --git a/src/main/java/org/asamk/signal/manager/ServiceConfig.java b/src/main/java/org/asamk/signal/manager/ServiceConfig.java index 4ea41734..353670ae 100644 --- a/src/main/java/org/asamk/signal/manager/ServiceConfig.java +++ b/src/main/java/org/asamk/signal/manager/ServiceConfig.java @@ -1,5 +1,6 @@ package org.asamk.signal.manager; +import org.signal.zkgroup.ServerPublicParams; import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.signalservice.api.account.AccountAttributes; import org.whispersystems.signalservice.api.push.TrustStore; @@ -12,8 +13,11 @@ import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl; import org.whispersystems.util.Base64; import java.io.IOException; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -29,51 +33,83 @@ public class ServiceConfig { final static int MAX_ENVELOPE_SIZE = 0; final static long AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE = 10 * 1024 * 1024; + final static String CDS_MRENCLAVE = "c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15"; + private final static String URL = "https://textsecure-service.whispersystems.org"; private final static String CDN_URL = "https://cdn.signal.org"; private final static String CDN2_URL = "https://cdn2.signal.org"; + private final static String SIGNAL_CONTACT_DISCOVERY_URL = "https://api.directory.signal.org"; private final static String SIGNAL_KEY_BACKUP_URL = "https://api.backup.signal.org"; private final static String STORAGE_URL = "https://storage.signal.org"; private final static TrustStore TRUST_STORE = new WhisperTrustStore(); + private final static TrustStore IAS_TRUST_STORE = new IasTrustStore(); private final static Optional dns = Optional.absent(); private final static String zkGroupServerPublicParamsHex = "AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X0="; + private final static byte[] zkGroupServerPublicParams; - static final AccountAttributes.Capabilities capabilities = new AccountAttributes.Capabilities(false, false, false, false); - - public static SignalServiceConfiguration createDefaultServiceConfiguration(String userAgent) { - final Interceptor userAgentInterceptor = chain -> - chain.proceed(chain.request().newBuilder() - .header("User-Agent", userAgent) - .build()); - - final List interceptors = Collections.singletonList(userAgentInterceptor); + static final AccountAttributes.Capabilities capabilities; - final byte[] zkGroupServerPublicParams; + static { try { zkGroupServerPublicParams = Base64.decode(zkGroupServerPublicParamsHex); } catch (IOException e) { throw new AssertionError(e); } - return new SignalServiceConfiguration( - new SignalServiceUrl[]{new SignalServiceUrl(URL, TRUST_STORE)}, - makeSignalCdnUrlMapFor(new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)}, new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}), - new SignalContactDiscoveryUrl[0], + boolean zkGroupAvailable; + try { + new ServerPublicParams(zkGroupServerPublicParams); + zkGroupAvailable = true; + } catch (Throwable ignored) { + zkGroupAvailable = false; + } + capabilities = new AccountAttributes.Capabilities(false, zkGroupAvailable, false, zkGroupAvailable); + } + + public static SignalServiceConfiguration createDefaultServiceConfiguration(String userAgent) { + final Interceptor userAgentInterceptor = chain -> chain.proceed(chain.request() + .newBuilder() + .header("User-Agent", userAgent) + .build()); + + final List interceptors = Collections.singletonList(userAgentInterceptor); + + return new SignalServiceConfiguration(new SignalServiceUrl[]{new SignalServiceUrl(URL, TRUST_STORE)}, + makeSignalCdnUrlMapFor(new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)}, + new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}), + new SignalContactDiscoveryUrl[]{new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL, + TRUST_STORE)}, new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)}, new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)}, interceptors, dns, - zkGroupServerPublicParams - ); + zkGroupServerPublicParams); + } + + public static AccountAttributes.Capabilities getCapabilities() { + return capabilities; + } + + static KeyStore getIasKeyStore() { + try { + TrustStore contactTrustStore = IAS_TRUST_STORE; + + KeyStore keyStore = KeyStore.getInstance("BKS"); + keyStore.load(contactTrustStore.getKeyStoreInputStream(), + contactTrustStore.getKeyStorePassword().toCharArray()); + + return keyStore; + } catch (KeyStoreException | CertificateException | IOException | NoSuchAlgorithmException e) { + throw new AssertionError(e); + } } - private static Map makeSignalCdnUrlMapFor(SignalCdnUrl[] cdn0Urls, SignalCdnUrl[] cdn2Urls) { - Map result = new HashMap<>(); - result.put(0, cdn0Urls); - result.put(2, cdn2Urls); - return Collections.unmodifiableMap(result); + private static Map makeSignalCdnUrlMapFor( + SignalCdnUrl[] cdn0Urls, SignalCdnUrl[] cdn2Urls + ) { + return Map.of(0, cdn0Urls, 2, cdn2Urls); } private ServiceConfig() {