From 90f82b6d4c9761c21651e359038f9f6a4a2b0dc0 Mon Sep 17 00:00:00 2001 From: AsamK Date: Wed, 24 May 2023 22:29:46 +0200 Subject: [PATCH] Update libsignal-service --- CHANGELOG.md | 2 +- graalvm-config-dir/reflect-config.json | 1 + .../org/asamk/signal/manager/config/LiveConfig.java | 8 +++++++- .../asamk/signal/manager/config/StagingConfig.java | 8 +++++++- .../asamk/signal/manager/helper/GroupV2Helper.java | 12 ++++++++---- settings.gradle.kts | 2 +- 6 files changed, 25 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df52b7ef..043bb418 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog ## [Unreleased] -**Attention**: Now requires native libsignal-client version 0.24.0 +**Attention**: Now requires native libsignal-client version 0.25.0 ### Added - New `--text-style` and `--quote-text-style` flags for `send` command diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json index 32827631..5b0a7682 100644 --- a/graalvm-config-dir/reflect-config.json +++ b/graalvm-config-dir/reflect-config.json @@ -3434,6 +3434,7 @@ {"name":"bitField0_"}, {"name":"blocked_"}, {"name":"callEvent_"}, + {"name":"callLinkUpdate_"}, {"name":"configuration_"}, {"name":"contacts_"}, {"name":"fetchLatest_"}, diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java index fc917b2c..80322b8b 100644 --- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java +++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java @@ -12,6 +12,7 @@ import org.whispersystems.signalservice.internal.configuration.SignalProxy; import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration; import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl; import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl; +import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url; import java.util.Base64; import java.util.Collection; @@ -43,6 +44,7 @@ class LiveConfig { 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 String SIGNAL_CDSI_URL = "https://cdsi.signal.org"; + private final static String SIGNAL_SVR2_URL = "https://svr2.staging.signal.org"; private final static TrustStore TRUST_STORE = new WhisperTrustStore(); private final static Optional dns = Optional.empty(); @@ -50,6 +52,8 @@ class LiveConfig { private final static byte[] zkGroupServerPublicParams = Base64.getDecoder() .decode("AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P"); + private final static byte[] genericServerPublicParams = Base64.getDecoder() + .decode("AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN"); static SignalServiceConfiguration createDefaultServiceConfiguration( final List interceptors @@ -62,10 +66,12 @@ class LiveConfig { new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)}, new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)}, new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)}, + new SignalSvr2Url[]{new SignalSvr2Url(SIGNAL_SVR2_URL, TRUST_STORE, null, null)}, interceptors, dns, proxy, - zkGroupServerPublicParams); + zkGroupServerPublicParams, + genericServerPublicParams); } static ECPublicKey getUnidentifiedSenderTrustRoot() { diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java index 0090902e..95a3dd96 100644 --- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java +++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java @@ -12,6 +12,7 @@ import org.whispersystems.signalservice.internal.configuration.SignalProxy; import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration; import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl; import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl; +import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url; import java.util.Base64; import java.util.Collection; @@ -43,6 +44,7 @@ class StagingConfig { private final static String SIGNAL_KEY_BACKUP_URL = "https://api-staging.backup.signal.org"; private final static String STORAGE_URL = "https://storage-staging.signal.org"; private final static String SIGNAL_CDSI_URL = "https://cdsi.staging.signal.org"; + private final static String SIGNAL_SVR2_URL = "https://svr2.staging.signal.org"; private final static TrustStore TRUST_STORE = new WhisperTrustStore(); private final static Optional dns = Optional.empty(); @@ -50,6 +52,8 @@ class StagingConfig { private final static byte[] zkGroupServerPublicParams = Base64.getDecoder() .decode("ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUj"); + private final static byte[] genericServerPublicParams = Base64.getDecoder() + .decode("AHILOIrFPXX9laLbalbA9+L1CXpSbM/bTJXZGZiuyK1JaI6dK5FHHWL6tWxmHKYAZTSYmElmJ5z2A5YcirjO/yfoemE03FItyaf8W1fE4p14hzb5qnrmfXUSiAIVrhaXVwIwSzH6RL/+EO8jFIjJ/YfExfJ8aBl48CKHgu1+A6kWynhttonvWWx6h7924mIzW0Czj2ROuh4LwQyZypex4GuOPW8sgIT21KNZaafgg+KbV7XM1x1tF3XA17B4uGUaDbDw2O+nR1+U5p6qHPzmJ7ggFjSN6Utu+35dS1sS0P9N"); static SignalServiceConfiguration createDefaultServiceConfiguration( final List interceptors @@ -62,10 +66,12 @@ class StagingConfig { new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)}, new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)}, new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)}, + new SignalSvr2Url[]{new SignalSvr2Url(SIGNAL_SVR2_URL, TRUST_STORE, null, null)}, interceptors, dns, proxy, - zkGroupServerPublicParams); + zkGroupServerPublicParams, + genericServerPublicParams); } static ECPublicKey getUnidentifiedSenderTrustRoot() { diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java index 85462e19..7cc28d6a 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java @@ -49,8 +49,8 @@ import org.whispersystems.signalservice.api.util.UuidUtil; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.UUID; @@ -66,7 +66,7 @@ class GroupV2Helper { private final SignalDependencies dependencies; private final Context context; - private HashMap groupApiCredentials; + private Map groupApiCredentials; GroupV2Helper(final Context context) { this.dependencies = context.getDependencies(); @@ -646,7 +646,9 @@ class GroupV2Helper { final var todaySeconds = currentDaySeconds(); if (groupApiCredentials == null || !groupApiCredentials.containsKey(todaySeconds)) { // Returns credentials for the next 7 days - groupApiCredentials = dependencies.getGroupsV2Api().getCredentials(todaySeconds); + groupApiCredentials = dependencies.getGroupsV2Api() + .getCredentials(todaySeconds) + .getAuthCredentialWithPniResponseHashMap(); // TODO cache credentials on disk until they expire } try { @@ -656,7 +658,9 @@ class GroupV2Helper { groupApiCredentials.clear(); } - groupApiCredentials = dependencies.getGroupsV2Api().getCredentials(todaySeconds); + groupApiCredentials = dependencies.getGroupsV2Api() + .getCredentials(todaySeconds) + .getAuthCredentialWithPniResponseHashMap(); try { return getAuthorizationString(groupSecretParams, todaySeconds); } catch (VerificationFailedException e) { diff --git a/settings.gradle.kts b/settings.gradle.kts index 45a40d11..24992a4d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,7 +16,7 @@ dependencyResolutionManagement { library("logback", "ch.qos.logback", "logback-classic").version("1.4.7") - library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_71") + library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_72") library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.23.0") library("sqlite", "org.xerial", "sqlite-jdbc").version("3.41.2.1") library("hikari", "com.zaxxer", "HikariCP").version("5.0.1") -- 2.50.1