From cb5e3c6bf748c9d020218033eabdcc3c5680c81a Mon Sep 17 00:00:00 2001 From: Kevin Date: Sat, 4 Jun 2022 11:11:35 +0200 Subject: [PATCH 001/802] Added base64 encoded attachment support (#966) * Added base64 encoded attachment support * Added final * Added full RFC 2397 support * Added feedback * Update doc * Update signal-cli.1.adoc Co-authored-by: Sebastian Scheibner --- .../manager/helper/AttachmentHelper.java | 2 +- .../signal/manager/util/AttachmentUtils.java | 12 ++-- .../asamk/signal/manager/util/DataURI.java | 70 +++++++++++++++++++ .../org/asamk/signal/manager/util/Utils.java | 30 ++++++-- man/signal-cli.1.adoc | 3 + .../asamk/signal/commands/SendCommand.java | 4 +- 6 files changed, 110 insertions(+), 11 deletions(-) create mode 100644 lib/src/main/java/org/asamk/signal/manager/util/DataURI.java diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java index 8793ce93..0d560e14 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java @@ -51,7 +51,7 @@ public class AttachmentHelper { } public SignalServiceAttachmentPointer uploadAttachment(String attachment) throws IOException, AttachmentInvalidException { - var attachmentStream = AttachmentUtils.createAttachmentStream(new File(attachment)); + var attachmentStream = AttachmentUtils.createAttachmentStream(attachment); return uploadAttachment(attachmentStream); } diff --git a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java index a94d7673..4da78f68 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java @@ -6,6 +6,7 @@ import org.whispersystems.signalservice.api.util.StreamDetails; import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec; import java.io.File; +import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -19,17 +20,18 @@ public class AttachmentUtils { } final var signalServiceAttachments = new ArrayList(attachments.size()); for (var attachment : attachments) { - signalServiceAttachments.add(createAttachmentStream(new File(attachment))); + signalServiceAttachments.add(createAttachmentStream(attachment)); } return signalServiceAttachments; } - public static SignalServiceAttachmentStream createAttachmentStream(File attachmentFile) throws AttachmentInvalidException { + public static SignalServiceAttachmentStream createAttachmentStream(String attachment) throws AttachmentInvalidException { try { - final var streamDetails = Utils.createStreamDetailsFromFile(attachmentFile); - return createAttachmentStream(streamDetails, Optional.of(attachmentFile.getName())); + final var streamDetails = Utils.createStreamDetails(attachment); + + return createAttachmentStream(streamDetails.first(), streamDetails.second()); } catch (IOException e) { - throw new AttachmentInvalidException(attachmentFile.toString(), e); + throw new AttachmentInvalidException(attachment, e); } } diff --git a/lib/src/main/java/org/asamk/signal/manager/util/DataURI.java b/lib/src/main/java/org/asamk/signal/manager/util/DataURI.java new file mode 100644 index 00000000..04d4bbc8 --- /dev/null +++ b/lib/src/main/java/org/asamk/signal/manager/util/DataURI.java @@ -0,0 +1,70 @@ +package org.asamk.signal.manager.util; + +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +@SuppressWarnings({"java:S6218"}) +public record DataURI(String mediaType, Map parameter, byte[] data) { + + public static final Pattern DATA_URI_PATTERN = Pattern.compile( + "\\Adata:(?.+?/.+?)?(?;.+?=.+?)?(?;base64)?,(?.+)\\z", + Pattern.CASE_INSENSITIVE); + public static final Pattern PARAMETER_PATTERN = Pattern.compile("\\G;(?.+)=(?.+)", + Pattern.CASE_INSENSITIVE); + public static final String DEFAULT_TYPE = "text/plain"; + + /** + * Generates a new {@link DataURI} object that follows + * RFC 2397 from the given string. + *

+ * The {@code dataURI} must be of the form: + *

+ * {@code + * data:[][;base64], + * } + *

+ * The {@code } is an Internet media type specification (with + * optional parameters.) The appearance of ";base64" means that the data + * is encoded as base64. Without ";base64", the data is represented using (ASCII) URL Escaped encoding. + * If {@code } is omitted, it defaults to {@link DataURI#DEFAULT_TYPE}. + * Parameter values should use the URL Escaped encoding. + * + * @param dataURI the data URI + * @return a data URI object + * @throws IllegalArgumentException if the given string is not a valid data URI + */ + public static DataURI of(final String dataURI) { + final var matcher = DATA_URI_PATTERN.matcher(dataURI); + + if (!matcher.find()) { + throw new IllegalArgumentException("The given string is not a valid data URI."); + } + + final Map parameters = new HashMap<>(); + final var params = matcher.group("parameters"); + if (params != null) { + final Matcher paramsMatcher = PARAMETER_PATTERN.matcher(params); + while (paramsMatcher.find()) { + final var key = paramsMatcher.group("key"); + final var value = URLDecoder.decode(paramsMatcher.group("value"), StandardCharsets.UTF_8); + parameters.put(key, value); + } + } + + final boolean isBase64 = matcher.group("base64") != null; + final byte[] data; + if (isBase64) { + data = Base64.getDecoder().decode(matcher.group("data").getBytes(StandardCharsets.UTF_8)); + } else { + data = URLDecoder.decode(matcher.group("data"), StandardCharsets.UTF_8).getBytes(StandardCharsets.UTF_8); + } + + return new DataURI(Optional.ofNullable(matcher.group("type")).orElse(DEFAULT_TYPE), parameters, data); + } +} diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java index 3fc69801..e71e6412 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java @@ -1,5 +1,6 @@ package org.asamk.signal.manager.util; +import org.asamk.signal.manager.api.Pair; import org.signal.libsignal.protocol.IdentityKey; import org.signal.libsignal.protocol.fingerprint.Fingerprint; import org.signal.libsignal.protocol.fingerprint.NumericFingerprintGenerator; @@ -9,6 +10,7 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.util.StreamDetails; import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -17,9 +19,11 @@ import java.net.URLConnection; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; import java.nio.file.Files; +import java.util.Base64; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import java.util.Optional; import java.util.Spliterator; import java.util.Spliterators; import java.util.function.BiFunction; @@ -31,10 +35,10 @@ public class Utils { private final static Logger logger = LoggerFactory.getLogger(Utils.class); - public static String getFileMimeType(File file, String defaultMimeType) throws IOException { + public static String getFileMimeType(final File file, final String defaultMimeType) throws IOException { var mime = Files.probeContentType(file.toPath()); if (mime == null) { - try (InputStream bufferedStream = new BufferedInputStream(new FileInputStream(file))) { + try (final InputStream bufferedStream = new BufferedInputStream(new FileInputStream(file))) { mime = URLConnection.guessContentTypeFromStream(bufferedStream); } } @@ -44,13 +48,31 @@ public class Utils { return mime; } - public static StreamDetails createStreamDetailsFromFile(File file) throws IOException { - InputStream stream = new FileInputStream(file); + public static Pair> createStreamDetailsFromDataURI(final String dataURI) { + final DataURI uri = DataURI.of(dataURI); + + return new Pair<>(new StreamDetails( + new ByteArrayInputStream(uri.data()), uri.mediaType(), uri.data().length), + Optional.ofNullable(uri.parameter().get("filename"))); + } + + public static StreamDetails createStreamDetailsFromFile(final File file) throws IOException { + final InputStream stream = new FileInputStream(file); final var size = file.length(); final var mime = getFileMimeType(file, "application/octet-stream"); return new StreamDetails(stream, mime, size); } + public static Pair> createStreamDetails(final String value) throws IOException { + try { + return createStreamDetailsFromDataURI(value); + } catch (final IllegalArgumentException e) { + final File f = new File(value); + + return new Pair<>(createStreamDetailsFromFile(f), Optional.of(f.getName())); + } + } + public static Fingerprint computeSafetyNumber( boolean isUuidCapable, SignalServiceAddress ownAddress, diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc index 6258243a..d60ef3ad 100644 --- a/man/signal-cli.1.adoc +++ b/man/signal-cli.1.adoc @@ -231,6 +231,9 @@ Read the message from standard input. *-a* [ATTACHMENT [ATTACHMENT ...]], *--attachment* [ATTACHMENT [ATTACHMENT ...]]:: Add one or more files as attachment. +Can be either a file path or a data URI. Data URI encoded attachments must follow the RFC 2397. +Additionally a file name can be added: +e.g.: `data:;filename=;base64,` *--sticker* STICKER:: Send a sticker of a locally known sticker pack (syntax: stickerPackId:stickerId). diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java index ae324c84..411895dd 100644 --- a/src/main/java/org/asamk/signal/commands/SendCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendCommand.java @@ -55,7 +55,9 @@ public class SendCommand implements JsonRpcLocalCommand { mut.addArgument("--message-from-stdin") .action(Arguments.storeTrue()) .help("Read the message from standard input."); - subparser.addArgument("-a", "--attachment").nargs("*").help("Add file as attachment"); + subparser.addArgument("-a", "--attachment").nargs("*").help("Add an attachment. " + + "Can be either a file path or a data URI. Data URI encoded attachments must follow the RFC 2397. Additionally a file name can be added, e.g. " + + "data:;filename=;base64,."); subparser.addArgument("-e", "--end-session", "--endsession") .help("Clear session state and send end session message.") .action(Arguments.storeTrue()); From 3ad87e136231159f7439c7707605f3c4fe90d2f0 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 4 Jun 2022 11:52:42 +0200 Subject: [PATCH 002/802] Reformat --- .../org/asamk/signal/manager/util/AttachmentUtils.java | 2 -- .../main/java/org/asamk/signal/manager/util/Utils.java | 4 +--- src/main/java/org/asamk/signal/commands/SendCommand.java | 8 +++++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java index 4da78f68..a535d82b 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java @@ -5,8 +5,6 @@ import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStre import org.whispersystems.signalservice.api.util.StreamDetails; import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java index e71e6412..cead93d9 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java @@ -19,7 +19,6 @@ import java.net.URLConnection; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import java.util.Base64; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -51,8 +50,7 @@ public class Utils { public static Pair> createStreamDetailsFromDataURI(final String dataURI) { final DataURI uri = DataURI.of(dataURI); - return new Pair<>(new StreamDetails( - new ByteArrayInputStream(uri.data()), uri.mediaType(), uri.data().length), + return new Pair<>(new StreamDetails(new ByteArrayInputStream(uri.data()), uri.mediaType(), uri.data().length), Optional.ofNullable(uri.parameter().get("filename"))); } diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java index 411895dd..23a7fb37 100644 --- a/src/main/java/org/asamk/signal/commands/SendCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendCommand.java @@ -55,9 +55,11 @@ public class SendCommand implements JsonRpcLocalCommand { mut.addArgument("--message-from-stdin") .action(Arguments.storeTrue()) .help("Read the message from standard input."); - subparser.addArgument("-a", "--attachment").nargs("*").help("Add an attachment. " - + "Can be either a file path or a data URI. Data URI encoded attachments must follow the RFC 2397. Additionally a file name can be added, e.g. " - + "data:;filename=;base64,."); + subparser.addArgument("-a", "--attachment") + .nargs("*") + .help("Add an attachment. " + + "Can be either a file path or a data URI. Data URI encoded attachments must follow the RFC 2397. Additionally a file name can be added, e.g. " + + "data:;filename=;base64,."); subparser.addArgument("-e", "--end-session", "--endsession") .help("Clear session state and send end session message.") .action(Arguments.storeTrue()); From 51c2352d676cce004844f704b4c71c3de5bde4cc Mon Sep 17 00:00:00 2001 From: AsamK Date: Mon, 6 Jun 2022 17:14:17 +0200 Subject: [PATCH 003/802] Extend logging when determining default locale --- lib/src/main/java/org/asamk/signal/manager/util/Utils.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java index cead93d9..cb0cf95f 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java @@ -107,15 +107,18 @@ public class Utils { public static Locale getDefaultLocale(Locale fallback) { final var locale = Locale.getDefault(); if (locale == null) { + logger.debug("No default locale found, using fallback: {}", fallback); return fallback; } + final var localeString = locale.getLanguage() + "-" + locale.getCountry(); try { - Locale.LanguageRange.parse(locale.getLanguage() + "-" + locale.getCountry()); + Locale.LanguageRange.parse(localeString); } catch (IllegalArgumentException e) { - logger.debug("Invalid locale, ignoring: {}", locale); + logger.debug("Invalid locale '{}', using fallback: {}", locale, fallback); return fallback; } + logger.debug("Using default locale: {} ({})", locale, localeString); return locale; } From 5b5a1718e9c54f6e12eac47662257faa9337f366 Mon Sep 17 00:00:00 2001 From: AsamK Date: Tue, 7 Jun 2022 11:53:53 +0200 Subject: [PATCH 004/802] Update register error message --- graalvm-config-dir/reflect-config.json | 7 +++++++ .../java/org/asamk/signal/commands/RegisterCommand.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json index 62612d44..2c2c94f9 100644 --- a/graalvm-config-dir/reflect-config.json +++ b/graalvm-config-dir/reflect-config.json @@ -2135,6 +2135,13 @@ "name":"org.whispersystems.signalservice.api.push.SignedPreKeyEntity$ByteArraySerializer", "methods":[{"name":"","parameterTypes":[] }] }, +{ + "name":"org.whispersystems.signalservice.api.push.exceptions.NonNormalizedPhoneNumberException$JsonResponse", + "allDeclaredFields":true, + "queryAllDeclaredMethods":true, + "queryAllDeclaredConstructors":true, + "methods":[{"name":"","parameterTypes":[] }] +}, { "name":"org.whispersystems.signalservice.api.storage.StorageAuthResponse", "allDeclaredFields":true, diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java index 4415bb18..84287877 100644 --- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java +++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java @@ -80,7 +80,7 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration } catch (NonNormalizedPhoneNumberException e) { throw new UserErrorException("Failed to register: " + e.getMessage(), e); } catch (IOException e) { - throw new IOErrorException("Request verify error: " + e.getMessage(), e); + throw new IOErrorException("Failed to register: " + e.getMessage(), e); } } From 5afe9c5337e16e89c2ce7bd4aa1781a9ab78704b Mon Sep 17 00:00:00 2001 From: AsamK Date: Tue, 7 Jun 2022 14:25:28 +0200 Subject: [PATCH 005/802] Rename ThreadInfo to LegacyThreadInfo --- .../storage/threads/LegacyJsonThreadStore.java | 12 ++++++------ .../{ThreadInfo.java => LegacyThreadInfo.java} | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) rename lib/src/main/java/org/asamk/signal/manager/storage/threads/{ThreadInfo.java => LegacyThreadInfo.java} (86%) diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java index 81810713..7e5fd242 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java @@ -25,9 +25,9 @@ public class LegacyJsonThreadStore { @JsonProperty("threads") @JsonSerialize(using = MapToListSerializer.class) @JsonDeserialize(using = ThreadsDeserializer.class) - private Map threads = new HashMap<>(); + private Map threads = new HashMap<>(); - public List getThreads() { + public List getThreads() { return new ArrayList<>(threads.values()); } @@ -41,16 +41,16 @@ public class LegacyJsonThreadStore { } } - private static class ThreadsDeserializer extends JsonDeserializer> { + private static class ThreadsDeserializer extends JsonDeserializer> { @Override - public Map deserialize( + public Map deserialize( JsonParser jsonParser, DeserializationContext deserializationContext ) throws IOException { - var threads = new HashMap(); + var threads = new HashMap(); JsonNode node = jsonParser.getCodec().readTree(jsonParser); for (var n : node) { - var t = jsonProcessor.treeToValue(n, ThreadInfo.class); + var t = jsonProcessor.treeToValue(n, LegacyThreadInfo.class); threads.put(t.id, t); } diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyThreadInfo.java similarity index 86% rename from lib/src/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java rename to lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyThreadInfo.java index b81a0051..7a55c665 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyThreadInfo.java @@ -2,7 +2,7 @@ package org.asamk.signal.manager.storage.threads; import com.fasterxml.jackson.annotation.JsonProperty; -public class ThreadInfo { +public class LegacyThreadInfo { @JsonProperty public String id; From 1757e939e1f60e77744501d0bd6cd7dd762b5dfc Mon Sep 17 00:00:00 2001 From: AsamK Date: Tue, 7 Jun 2022 15:26:42 +0200 Subject: [PATCH 006/802] Reformat sql statements in MessageSendLogStore --- .../storage/sendLog/MessageSendLogStore.java | 67 ++++++++++++------- 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java index 79fc28f0..c893f09c 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java @@ -93,13 +93,16 @@ public class MessageSendLogStore implements AutoCloseable { public List findMessages( final RecipientId recipientId, final int deviceId, final long timestamp, final boolean isSenderKey ) { + final var sql = """ + SELECT group_id, content, content_hint + FROM %s l + INNER JOIN %s lc ON l.content_id = lc._id + WHERE l.recipient_id = ? AND l.device_id = ? AND lc.timestamp = ? + """.formatted(TABLE_MESSAGE_SEND_LOG, TABLE_MESSAGE_SEND_LOG_CONTENT); try (final var connection = database.getConnection()) { deleteOutdatedEntries(connection); - try (final var statement = connection.prepareStatement( - "SELECT group_id, content, content_hint FROM %s l INNER JOIN %s lc ON l.content_id = lc._id WHERE l.recipient_id = ? AND l.device_id = ? AND lc.timestamp = ?".formatted( - TABLE_MESSAGE_SEND_LOG, - TABLE_MESSAGE_SEND_LOG_CONTENT))) { + try (final var statement = connection.prepareStatement(sql)) { statement.setLong(1, recipientId.id()); statement.setInt(2, deviceId); statement.setLong(3, timestamp); @@ -185,10 +188,12 @@ public class MessageSendLogStore implements AutoCloseable { } public void deleteEntryForGroup(long sentTimestamp, GroupId groupId) { + final var sql = """ + DELETE FROM %s AS lc + WHERE lc.timestamp = ? AND lc.group_id = ? + """.formatted(TABLE_MESSAGE_SEND_LOG_CONTENT); try (final var connection = database.getConnection()) { - try (final var statement = connection.prepareStatement( - "DELETE FROM %s AS lc WHERE lc.timestamp = ? AND lc.group_id = ?".formatted( - TABLE_MESSAGE_SEND_LOG_CONTENT))) { + try (final var statement = connection.prepareStatement(sql)) { statement.setLong(1, sentTimestamp); statement.setBytes(2, groupId.serialize()); statement.executeUpdate(); @@ -199,12 +204,13 @@ public class MessageSendLogStore implements AutoCloseable { } public void deleteEntryForRecipientNonGroup(long sentTimestamp, RecipientId recipientId) { + final var sql = """ + DELETE FROM %s AS lc + WHERE lc.timestamp = ? AND lc.group_id IS NULL AND lc._id IN (SELECT content_id FROM %s l WHERE l.recipient_id = ?) + """.formatted(TABLE_MESSAGE_SEND_LOG_CONTENT, TABLE_MESSAGE_SEND_LOG); try (final var connection = database.getConnection()) { connection.setAutoCommit(false); - try (final var statement = connection.prepareStatement( - "DELETE FROM %s AS lc WHERE lc.timestamp = ? AND lc.group_id IS NULL AND lc._id IN (SELECT content_id FROM %s l WHERE l.recipient_id = ?)".formatted( - TABLE_MESSAGE_SEND_LOG_CONTENT, - TABLE_MESSAGE_SEND_LOG))) { + try (final var statement = connection.prepareStatement(sql)) { statement.setLong(1, sentTimestamp); statement.setLong(2, recipientId.id()); statement.executeUpdate(); @@ -222,12 +228,13 @@ public class MessageSendLogStore implements AutoCloseable { } public void deleteEntriesForRecipient(List sentTimestamps, RecipientId recipientId, int deviceId) { + final var sql = """ + DELETE FROM %s AS l + WHERE l.content_id IN (SELECT _id FROM %s lc WHERE lc.timestamp = ?) AND l.recipient_id = ? AND l.device_id = ? + """.formatted(TABLE_MESSAGE_SEND_LOG, TABLE_MESSAGE_SEND_LOG_CONTENT); try (final var connection = database.getConnection()) { connection.setAutoCommit(false); - try (final var statement = connection.prepareStatement( - "DELETE FROM %s AS l WHERE l.content_id IN (SELECT _id FROM %s lc WHERE lc.timestamp = ?) AND l.recipient_id = ? AND l.device_id = ?".formatted( - TABLE_MESSAGE_SEND_LOG, - TABLE_MESSAGE_SEND_LOG_CONTENT))) { + try (final var statement = connection.prepareStatement(sql)) { for (final var sentTimestamp : sentTimestamps) { statement.setLong(1, sentTimestamp); statement.setLong(2, recipientId.id()); @@ -269,12 +276,14 @@ public class MessageSendLogStore implements AutoCloseable { ) { byte[] groupId = getGroupId(content); + final var sql = """ + INSERT INTO %s (timestamp, group_id, content, content_hint) + VALUES (?,?,?,?) + """.formatted(TABLE_MESSAGE_SEND_LOG_CONTENT); try (final var connection = database.getConnection()) { connection.setAutoCommit(false); final long contentId; - try (final var statement = connection.prepareStatement( - "INSERT INTO %s (timestamp, group_id, content, content_hint) VALUES (?,?,?,?)".formatted( - TABLE_MESSAGE_SEND_LOG_CONTENT))) { + try (final var statement = connection.prepareStatement(sql)) { statement.setLong(1, sentTimestamp); statement.setBytes(2, groupId); statement.setBytes(3, content.toByteArray()); @@ -334,8 +343,11 @@ public class MessageSendLogStore implements AutoCloseable { private void insertRecipientsForExistingContent( final long contentId, final List recipientDevices, final Connection connection ) throws SQLException { - try (final var statement = connection.prepareStatement( - "INSERT INTO %s (recipient_id, device_id, content_id) VALUES (?,?,?)".formatted(TABLE_MESSAGE_SEND_LOG))) { + final var sql = """ + INSERT INTO %s (recipient_id, device_id, content_id) + VALUES (?,?,?) + """.formatted(TABLE_MESSAGE_SEND_LOG); + try (final var statement = connection.prepareStatement(sql)) { for (final var recipientDevice : recipientDevices) { for (final var deviceId : recipientDevice.deviceIds()) { statement.setLong(1, recipientDevice.recipientId().id()); @@ -348,8 +360,11 @@ public class MessageSendLogStore implements AutoCloseable { } private void deleteOutdatedEntries(final Connection connection) throws SQLException { - try (final var statement = connection.prepareStatement("DELETE FROM %s WHERE timestamp < ?".formatted( - TABLE_MESSAGE_SEND_LOG_CONTENT))) { + final var sql = """ + DELETE FROM %s + WHERE timestamp < ? + """.formatted(TABLE_MESSAGE_SEND_LOG_CONTENT); + try (final var statement = connection.prepareStatement(sql)) { statement.setLong(1, System.currentTimeMillis() - LOG_DURATION.toMillis()); final var rowCount = statement.executeUpdate(); if (rowCount > 0) { @@ -361,9 +376,11 @@ public class MessageSendLogStore implements AutoCloseable { } private void deleteOrphanedLogContents(final Connection connection) throws SQLException { - try (final var statement = connection.prepareStatement( - "DELETE FROM %s WHERE _id NOT IN (SELECT content_id FROM %s)".formatted(TABLE_MESSAGE_SEND_LOG_CONTENT, - TABLE_MESSAGE_SEND_LOG))) { + final var sql = """ + DELETE FROM %s + WHERE _id NOT IN (SELECT content_id FROM %s) + """.formatted(TABLE_MESSAGE_SEND_LOG_CONTENT, TABLE_MESSAGE_SEND_LOG); + try (final var statement = connection.prepareStatement(sql)) { statement.executeUpdate(); } } From 8236696492cb29930c421e642d89d4bd48b7c3e5 Mon Sep 17 00:00:00 2001 From: AsamK Date: Tue, 7 Jun 2022 20:34:41 +0200 Subject: [PATCH 007/802] Fix typo --- .../manager/storage/senderKeys/SenderKeyRecordStore.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java index 0d9f6288..83302faf 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java @@ -6,6 +6,7 @@ import org.asamk.signal.manager.util.IOUtils; import org.signal.libsignal.protocol.InvalidMessageException; import org.signal.libsignal.protocol.SignalProtocolAddress; import org.signal.libsignal.protocol.groups.state.SenderKeyRecord; +import org.signal.libsignal.protocol.groups.state.SenderKeyStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,7 +24,7 @@ import java.util.UUID; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class SenderKeyRecordStore implements org.signal.libsignal.protocol.groups.state.SenderKeyStore { +public class SenderKeyRecordStore implements SenderKeyStore { private final static Logger logger = LoggerFactory.getLogger(SenderKeyRecordStore.class); @@ -138,7 +139,7 @@ public class SenderKeyRecordStore implements org.signal.libsignal.protocol.group } /** - * @param identifier can be either a serialized uuid or a e164 phone number + * @param identifier can be either a serialized uuid or an e164 phone number */ private RecipientId resolveRecipient(String identifier) { return resolver.resolveRecipient(identifier); From 936a68433def7a74d11a5fb17e0fac073dae77b9 Mon Sep 17 00:00:00 2001 From: AsamK Date: Wed, 8 Jun 2022 15:21:24 +0200 Subject: [PATCH 008/802] Add additional logging for payment address parsing --- .../java/org/asamk/signal/manager/util/PaymentUtils.java | 6 ++++++ .../java/org/asamk/signal/manager/util/ProfileUtils.java | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java index 6c34d9c9..1471d8fe 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java @@ -6,10 +6,14 @@ import org.signal.libsignal.protocol.IdentityKey; import org.signal.libsignal.protocol.IdentityKeyPair; import org.signal.libsignal.protocol.ecc.ECPrivateKey; import org.signal.libsignal.protocol.ecc.ECPublicKey; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.whispersystems.signalservice.internal.push.SignalServiceProtos; public class PaymentUtils { + private final static Logger logger = LoggerFactory.getLogger(PaymentUtils.class); + private PaymentUtils() { } @@ -37,6 +41,7 @@ public class PaymentUtils { SignalServiceProtos.PaymentAddress paymentAddress, ECPublicKey publicKey ) { if (!paymentAddress.hasMobileCoinAddress()) { + logger.debug("Got payment address without mobile coin address, ignoring."); return null; } @@ -44,6 +49,7 @@ public class PaymentUtils { byte[] signature = paymentAddress.getMobileCoinAddress().getSignature().toByteArray(); if (signature.length != 64 || !publicKey.verifySignature(bytes, signature)) { + logger.debug("Got mobile coin address with invalid signature, ignoring."); return null; } diff --git a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java index e202f70a..5d61cab3 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java @@ -30,7 +30,8 @@ public class ProfileUtils { IdentityKey identityKey = null; try { identityKey = new IdentityKey(Base64.getDecoder().decode(encryptedProfile.getIdentityKey()), 0); - } catch (InvalidKeyException ignored) { + } catch (InvalidKeyException e) { + logger.debug("Failed to decode identity key in profile, can't verify payment address", e); } try { @@ -112,6 +113,7 @@ public class ProfileUtils { try { decrypted = profileCipher.decryptWithLength(encryptedPaymentAddress); } catch (IOException e) { + logger.debug("Failed to decrypt payment address", e); return null; } @@ -119,6 +121,7 @@ public class ProfileUtils { try { paymentAddress = SignalServiceProtos.PaymentAddress.parseFrom(decrypted); } catch (InvalidProtocolBufferException e) { + logger.debug("Failed to parse payment address", e); return null; } From 0e65e67077f36932fe9ed1471d41502ca6e1ffe3 Mon Sep 17 00:00:00 2001 From: AsamK Date: Wed, 8 Jun 2022 17:26:22 +0200 Subject: [PATCH 009/802] Log more detailed provisioning errors --- .../org/asamk/signal/manager/ProvisioningManagerImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java index 0c617646..e405f54c 100644 --- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java @@ -161,7 +161,7 @@ class ProvisioningManagerImpl implements ProvisioningManager { try { m.refreshPreKeys(); } catch (Exception e) { - logger.error("Failed to refresh pre keys."); + logger.error("Failed to refresh pre keys.", e); } logger.debug("Requesting sync data"); @@ -169,7 +169,8 @@ class ProvisioningManagerImpl implements ProvisioningManager { m.requestAllSyncData(); } catch (Exception e) { logger.error( - "Failed to request sync messages from linked device, data can be requested again with `sendSyncRequest`."); + "Failed to request sync messages from linked device, data can be requested again with `sendSyncRequest`.", + e); } if (newManagerListener != null) { From 7bf06aef5ecea8856aeebc5c9d3a67d11cb73b92 Mon Sep 17 00:00:00 2001 From: AsamK Date: Wed, 8 Jun 2022 17:26:37 +0200 Subject: [PATCH 010/802] Store self profile key in profile store after linking --- .../asamk/signal/manager/storage/SignalAccount.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java index f66d3e4a..6d636359 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java @@ -313,6 +313,11 @@ public class SignalAccount implements Closeable { final var pair = openFileChannel(fileName, true); var signalAccount = new SignalAccount(pair.first(), pair.second()); + signalAccount.dataPath = dataPath; + signalAccount.accountPath = accountPath; + signalAccount.serviceEnvironment = serviceEnvironment; + signalAccount.localRegistrationId = registrationId; + signalAccount.trustNewIdentity = trustNewIdentity; signalAccount.setProvisioningData(number, aci, pni, @@ -323,11 +328,6 @@ public class SignalAccount implements Closeable { pniIdentityKey, profileKey); - signalAccount.dataPath = dataPath; - signalAccount.accountPath = accountPath; - signalAccount.serviceEnvironment = serviceEnvironment; - signalAccount.localRegistrationId = registrationId; - signalAccount.trustNewIdentity = trustNewIdentity; signalAccount.groupStore = new GroupStore(getGroupCachePath(dataPath, accountPath), signalAccount.getRecipientResolver(), signalAccount::saveGroupStore); @@ -360,6 +360,7 @@ public class SignalAccount implements Closeable { this.pni = pni; this.password = password; this.profileKey = profileKey; + getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey()); this.encryptedDeviceName = encryptedDeviceName; this.deviceId = deviceId; this.aciIdentityKeyPair = aciIdentity; From c8cd36bde884fe03004dfa05357eac34394b4b01 Mon Sep 17 00:00:00 2001 From: AsamK Date: Wed, 8 Jun 2022 17:50:20 +0200 Subject: [PATCH 011/802] Unsubscribe receive if jsonRpcSender channel is closed --- .../java/org/asamk/signal/manager/ManagerImpl.java | 3 ++- .../signal/jsonrpc/SignalJsonRpcDispatcherHandler.java | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java index dc7e743e..fcc50e09 100644 --- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java @@ -860,7 +860,8 @@ class ManagerImpl implements Manager { logger.debug("Starting receiving messages"); context.getReceiveHelper().receiveMessagesContinuously((envelope, e) -> { synchronized (messageHandlers) { - Stream.concat(messageHandlers.stream(), weakHandlers.stream()).forEach(h -> { + final var handlers = Stream.concat(messageHandlers.stream(), weakHandlers.stream()).toList(); + handlers.forEach(h -> { try { h.handleMessage(envelope, e); } catch (Throwable ex) { diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java index 086681f7..181233bc 100644 --- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java +++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java @@ -30,6 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; +import java.nio.channels.ClosedChannelException; import java.nio.channels.OverlappingFileLockException; import java.util.HashMap; import java.util.List; @@ -101,7 +102,14 @@ public class SignalJsonRpcDispatcherHandler { final var receiveMessageHandler = new JsonReceiveMessageHandler(m, s -> { final ContainerNode params = objectMapper.valueToTree(s); ((ObjectNode) params).set("subscription", IntNode.valueOf(subscriptionId)); - jsonRpcSender.sendRequest(JsonRpcRequest.forNotification("receive", params, null)); + final var jsonRpcRequest = JsonRpcRequest.forNotification("receive", params, null); + try { + jsonRpcSender.sendRequest(jsonRpcRequest); + } catch (AssertionError e) { + if (e.getCause() instanceof ClosedChannelException) { + unsubscribeReceive(subscriptionId); + } + } }); m.addReceiveHandler(receiveMessageHandler); return new Pair<>(m, (Manager.ReceiveMessageHandler) receiveMessageHandler); From 26620f3137bc7a3aa5a5e05510cfdac6c6fb3a32 Mon Sep 17 00:00:00 2001 From: AsamK Date: Thu, 9 Jun 2022 15:37:21 +0200 Subject: [PATCH 012/802] Refactor identity key store --- .../org/asamk/signal/manager/ManagerImpl.java | 2 +- .../signal/manager/helper/IdentityHelper.java | 5 +- .../signal/manager/helper/ProfileHelper.java | 3 +- .../signal/manager/helper/SendHelper.java | 2 +- .../signal/manager/helper/StorageHelper.java | 3 +- .../signal/manager/helper/SyncHelper.java | 2 +- .../signal/manager/storage/SignalAccount.java | 17 +++-- .../storage/identities/IdentityKeyStore.java | 60 ++++------------- .../identities/SignalIdentityKeyStore.java | 66 +++++++++++++++++++ 9 files changed, 99 insertions(+), 61 deletions(-) create mode 100644 lib/src/main/java/org/asamk/signal/manager/storage/identities/SignalIdentityKeyStore.java diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java index fcc50e09..201f0931 100644 --- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java @@ -1049,7 +1049,7 @@ class ManagerImpl implements Manager { IdentityInfo identity; try { identity = account.getIdentityKeyStore() - .getIdentity(context.getRecipientHelper().resolveRecipient(recipient)); + .getIdentityInfo(context.getRecipientHelper().resolveRecipient(recipient)); } catch (UnregisteredRecipientException e) { identity = null; } diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java index ee74338e..ce397353 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java @@ -16,7 +16,6 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress; import java.io.IOException; import java.util.Arrays; -import java.util.Date; import java.util.function.Function; import static org.asamk.signal.manager.config.ServiceConfig.capabilities; @@ -85,7 +84,7 @@ public class IdentityHelper { private boolean trustIdentity( RecipientId recipientId, Function verifier, TrustLevel trustLevel ) { - var identity = account.getIdentityKeyStore().getIdentity(recipientId); + var identity = account.getIdentityKeyStore().getIdentityInfo(recipientId); if (identity == null) { return false; } @@ -110,7 +109,7 @@ public class IdentityHelper { ) { final var identityKey = identityFailure.getIdentityKey(); if (identityKey != null) { - account.getIdentityKeyStore().saveIdentity(recipientId, identityKey, new Date()); + account.getIdentityKeyStore().saveIdentity(recipientId, identityKey); } else { // Retrieve profile to get the current identity key from the server context.getProfileHelper().refreshRecipientProfile(recipientId); diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java index 812e4b3c..a3f3b480 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java @@ -35,7 +35,6 @@ import java.io.OutputStream; import java.nio.file.Files; import java.util.Base64; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.Locale; import java.util.Objects; @@ -354,7 +353,7 @@ public final class ProfileHelper { try { logger.trace("Storing identity"); final var identityKey = new IdentityKey(Base64.getDecoder().decode(encryptedProfile.getIdentityKey())); - account.getIdentityKeyStore().saveIdentity(recipientId, identityKey, new Date()); + account.getIdentityKeyStore().saveIdentity(recipientId, identityKey); } catch (InvalidKeyException ignored) { logger.warn("Got invalid identity key in profile for {}", context.getRecipientHelper().resolveSignalServiceAddress(recipientId).getIdentifier()); diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java index 758fe1b9..e0f2f161 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java @@ -477,7 +477,7 @@ public class SendHelper { continue; } - final var identity = account.getIdentityKeyStore().getIdentity(recipientId); + final var identity = account.getIdentityKeyStore().getIdentityInfo(recipientId); if (identity == null || !identity.getTrustLevel().isTrusted()) { continue; } diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java index 281901c1..84d98db2 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java @@ -24,7 +24,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Date; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -127,7 +126,7 @@ public class StorageHelper { try { logger.trace("Storing identity key {}", recipientId); final var identityKey = new IdentityKey(contactRecord.getIdentityKey().get()); - account.getIdentityKeyStore().saveIdentity(recipientId, identityKey, new Date()); + account.getIdentityKeyStore().saveIdentity(recipientId, identityKey); final var trustLevel = TrustLevel.fromIdentityState(contactRecord.getIdentityState()); if (trustLevel != null) { diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java index 4e77d738..3ad1fda8 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java @@ -128,7 +128,7 @@ public class SyncHelper { final var contact = contactPair.second(); final var address = context.getRecipientHelper().resolveSignalServiceAddress(recipientId); - var currentIdentity = account.getIdentityKeyStore().getIdentity(recipientId); + var currentIdentity = account.getIdentityKeyStore().getIdentityInfo(recipientId); VerifiedMessage verifiedMessage = null; if (currentIdentity != null) { verifiedMessage = new VerifiedMessage(address, diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java index 6d636359..a66af784 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java @@ -15,6 +15,7 @@ import org.asamk.signal.manager.storage.groups.GroupInfoV1; import org.asamk.signal.manager.storage.groups.GroupInfoV2; import org.asamk.signal.manager.storage.groups.GroupStore; import org.asamk.signal.manager.storage.identities.IdentityKeyStore; +import org.asamk.signal.manager.storage.identities.SignalIdentityKeyStore; import org.asamk.signal.manager.storage.identities.TrustNewIdentity; import org.asamk.signal.manager.storage.messageCache.MessageCache; import org.asamk.signal.manager.storage.prekeys.PreKeyStore; @@ -81,7 +82,6 @@ import java.security.SecureRandom; import java.sql.SQLException; import java.util.Base64; import java.util.Comparator; -import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Optional; @@ -137,6 +137,7 @@ public class SignalAccount implements Closeable { private SignedPreKeyStore pniSignedPreKeyStore; private SessionStore sessionStore; private IdentityKeyStore identityKeyStore; + private SignalIdentityKeyStore aciIdentityKeyStore; private SenderKeyStore senderKeyStore; private GroupStore groupStore; private GroupStore.Storage groupStoreStorage; @@ -1016,7 +1017,7 @@ public class SignalAccount implements Closeable { () -> signalProtocolStore = new SignalProtocolStore(getAciPreKeyStore(), getAciSignedPreKeyStore(), getSessionStore(), - getIdentityKeyStore(), + getAciIdentityKeyStore(), getSenderKeyStore(), this::isMultiDevice)); } @@ -1050,11 +1051,17 @@ public class SignalAccount implements Closeable { return getOrCreate(() -> identityKeyStore, () -> identityKeyStore = new IdentityKeyStore(getIdentitiesPath(dataPath, accountPath), getRecipientResolver(), - aciIdentityKeyPair, - localRegistrationId, trustNewIdentity)); } + public SignalIdentityKeyStore getAciIdentityKeyStore() { + return getOrCreate(() -> aciIdentityKeyStore, + () -> aciIdentityKeyStore = new SignalIdentityKeyStore(getRecipientResolver(), + () -> aciIdentityKeyPair, + localRegistrationId, + getIdentityKeyStore())); + } + public GroupStore getGroupStore() { return groupStore; } @@ -1390,7 +1397,7 @@ public class SignalAccount implements Closeable { getSenderKeyStore().deleteAll(); final var recipientId = getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress()); final var publicKey = getAciIdentityKeyPair().getPublicKey(); - getIdentityKeyStore().saveIdentity(recipientId, publicKey, new Date()); + getIdentityKeyStore().saveIdentity(recipientId, publicKey); getIdentityKeyStore().setIdentityTrustLevel(recipientId, publicKey, TrustLevel.TRUSTED_VERIFIED); } diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java index d9c553b7..4d08f89f 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java @@ -7,9 +7,8 @@ import org.asamk.signal.manager.storage.recipients.RecipientId; import org.asamk.signal.manager.storage.recipients.RecipientResolver; import org.asamk.signal.manager.util.IOUtils; import org.signal.libsignal.protocol.IdentityKey; -import org.signal.libsignal.protocol.IdentityKeyPair; import org.signal.libsignal.protocol.InvalidKeyException; -import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.state.IdentityKeyStore.Direction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +31,7 @@ import java.util.regex.Pattern; import io.reactivex.rxjava3.subjects.PublishSubject; import io.reactivex.rxjava3.subjects.Subject; -public class IdentityKeyStore implements org.signal.libsignal.protocol.state.IdentityKeyStore { +public class IdentityKeyStore { private final static Logger logger = LoggerFactory.getLogger(IdentityKeyStore.class); private final ObjectMapper objectMapper = org.asamk.signal.manager.storage.Utils.createStorageObjectMapper(); @@ -42,24 +41,16 @@ public class IdentityKeyStore implements org.signal.libsignal.protocol.state.Ide private final File identitiesPath; private final RecipientResolver resolver; - private final IdentityKeyPair identityKeyPair; - private final int localRegistrationId; private final TrustNewIdentity trustNewIdentity; private final PublishSubject identityChanges = PublishSubject.create(); private boolean isRetryingDecryption = false; public IdentityKeyStore( - final File identitiesPath, - final RecipientResolver resolver, - final IdentityKeyPair identityKeyPair, - final int localRegistrationId, - final TrustNewIdentity trustNewIdentity + final File identitiesPath, final RecipientResolver resolver, final TrustNewIdentity trustNewIdentity ) { this.identitiesPath = identitiesPath; this.resolver = resolver; - this.identityKeyPair = identityKeyPair; - this.localRegistrationId = localRegistrationId; this.trustNewIdentity = trustNewIdentity; } @@ -67,21 +58,8 @@ public class IdentityKeyStore implements org.signal.libsignal.protocol.state.Ide return identityChanges; } - @Override - public IdentityKeyPair getIdentityKeyPair() { - return identityKeyPair; - } - - @Override - public int getLocalRegistrationId() { - return localRegistrationId; - } - - @Override - public boolean saveIdentity(SignalProtocolAddress address, IdentityKey identityKey) { - final var recipientId = resolveRecipient(address.getName()); - - return saveIdentity(recipientId, identityKey, new Date()); + public boolean saveIdentity(final RecipientId recipientId, final IdentityKey identityKey) { + return saveIdentity(recipientId, identityKey, null); } public boolean saveIdentity(final RecipientId recipientId, final IdentityKey identityKey, Date added) { @@ -100,7 +78,10 @@ public class IdentityKeyStore implements org.signal.libsignal.protocol.state.Ide trustNewIdentity == TrustNewIdentity.ON_FIRST_USE && identityInfo == null ) ? TrustLevel.TRUSTED_UNVERIFIED : TrustLevel.UNTRUSTED; logger.debug("Storing new identity for recipient {} with trust {}", recipientId, trustLevel); - final var newIdentityInfo = new IdentityInfo(recipientId, identityKey, trustLevel, added); + final var newIdentityInfo = new IdentityInfo(recipientId, + identityKey, + trustLevel, + added == null ? new Date() : added); storeIdentityLocked(recipientId, newIdentityInfo); identityChanges.onNext(recipientId); return true; @@ -137,26 +118,23 @@ public class IdentityKeyStore implements org.signal.libsignal.protocol.state.Ide } } - @Override - public boolean isTrustedIdentity(SignalProtocolAddress address, IdentityKey identityKey, Direction direction) { + public boolean isTrustedIdentity(RecipientId recipientId, IdentityKey identityKey, Direction direction) { if (trustNewIdentity == TrustNewIdentity.ALWAYS) { return true; } - var recipientId = resolveRecipient(address.getName()); - synchronized (cachedIdentities) { // TODO implement possibility for different handling of incoming/outgoing trust decisions var identityInfo = loadIdentityLocked(recipientId); if (identityInfo == null) { logger.debug("Initial identity found for {}, saving.", recipientId); - saveIdentity(address, identityKey); + saveIdentity(recipientId, identityKey); identityInfo = loadIdentityLocked(recipientId); } else if (!identityInfo.getIdentityKey().equals(identityKey)) { // Identity found, but different if (direction == Direction.SENDING) { logger.debug("Changed identity found for {}, saving.", recipientId); - saveIdentity(address, identityKey); + saveIdentity(recipientId, identityKey); identityInfo = loadIdentityLocked(recipientId); } else { logger.trace("Trusting identity for {} for {}: {}", recipientId, direction, false); @@ -170,17 +148,14 @@ public class IdentityKeyStore implements org.signal.libsignal.protocol.state.Ide } } - @Override - public IdentityKey getIdentity(SignalProtocolAddress address) { - var recipientId = resolveRecipient(address.getName()); - + public IdentityKey getIdentity(RecipientId recipientId) { synchronized (cachedIdentities) { var identity = loadIdentityLocked(recipientId); return identity == null ? null : identity.getIdentityKey(); } } - public IdentityInfo getIdentity(RecipientId recipientId) { + public IdentityInfo getIdentityInfo(RecipientId recipientId) { synchronized (cachedIdentities) { return loadIdentityLocked(recipientId); } @@ -214,13 +189,6 @@ public class IdentityKeyStore implements org.signal.libsignal.protocol.state.Ide } } - /** - * @param identifier can be either a serialized uuid or a e164 phone number - */ - private RecipientId resolveRecipient(String identifier) { - return resolver.resolveRecipient(identifier); - } - private File getIdentityFile(final RecipientId recipientId) { try { IOUtils.createPrivateDirectories(identitiesPath); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/SignalIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/SignalIdentityKeyStore.java new file mode 100644 index 00000000..06050875 --- /dev/null +++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/SignalIdentityKeyStore.java @@ -0,0 +1,66 @@ +package org.asamk.signal.manager.storage.identities; + +import org.asamk.signal.manager.storage.recipients.RecipientId; +import org.asamk.signal.manager.storage.recipients.RecipientResolver; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.IdentityKeyPair; +import org.signal.libsignal.protocol.SignalProtocolAddress; + +import java.util.function.Supplier; + +public class SignalIdentityKeyStore implements org.signal.libsignal.protocol.state.IdentityKeyStore { + + private final RecipientResolver resolver; + private final Supplier identityKeyPairSupplier; + private final int localRegistrationId; + private final IdentityKeyStore identityKeyStore; + + public SignalIdentityKeyStore( + final RecipientResolver resolver, + final Supplier identityKeyPairSupplier, + final int localRegistrationId, + final IdentityKeyStore identityKeyStore + ) { + this.resolver = resolver; + this.identityKeyPairSupplier = identityKeyPairSupplier; + this.localRegistrationId = localRegistrationId; + this.identityKeyStore = identityKeyStore; + } + + @Override + public IdentityKeyPair getIdentityKeyPair() { + return identityKeyPairSupplier.get(); + } + + @Override + public int getLocalRegistrationId() { + return localRegistrationId; + } + + @Override + public boolean saveIdentity(SignalProtocolAddress address, IdentityKey identityKey) { + final var recipientId = resolveRecipient(address.getName()); + + return identityKeyStore.saveIdentity(recipientId, identityKey); + } + + @Override + public boolean isTrustedIdentity(SignalProtocolAddress address, IdentityKey identityKey, Direction direction) { + var recipientId = resolveRecipient(address.getName()); + + return identityKeyStore.isTrustedIdentity(recipientId, identityKey, direction); + } + + @Override + public IdentityKey getIdentity(SignalProtocolAddress address) { + var recipientId = resolveRecipient(address.getName()); + return identityKeyStore.getIdentity(recipientId); + } + + /** + * @param identifier can be either a serialized uuid or an e164 phone number + */ + private RecipientId resolveRecipient(String identifier) { + return resolver.resolveRecipient(identifier); + } +} From 7bb690e58e56ab81ad85f811e438f8024c6cc495 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 11 Jun 2022 12:34:30 +0200 Subject: [PATCH 013/802] Update libsignal-service-java --- lib/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index cad9ca8b..567afd19 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -14,7 +14,7 @@ repositories { } dependencies { - implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_49") + implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_50") implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.3") implementation("com.google.protobuf", "protobuf-javalite", "3.11.4") implementation("org.bouncycastle", "bcprov-jdk15on", "1.70") From e9e66e1005ce39684d9d128933bb7edaf99d8de1 Mon Sep 17 00:00:00 2001 From: AsamK Date: Fri, 10 Jun 2022 10:34:37 +0200 Subject: [PATCH 014/802] Handle groups sync message again --- .../helper/IncomingMessageHandler.java | 8 +++- .../signal/manager/helper/SyncHelper.java | 46 +++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java index b6e3d8cb..4940e67c 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java @@ -367,7 +367,13 @@ public final class IncomingMessageHandler { } } if (syncMessage.getGroups().isPresent()) { - logger.warn("Received a group v1 sync message, that can't be handled anymore, ignoring."); + try { + final var groupsMessage = syncMessage.getGroups().get(); + context.getAttachmentHelper() + .retrieveAttachment(groupsMessage, context.getSyncHelper()::handleSyncDeviceGroups); + } catch (Exception e) { + logger.warn("Failed to handle received sync groups, ignoring: {}", e.getMessage()); + } } if (syncMessage.getBlockedList().isPresent()) { final var blockedListMessage = syncMessage.getBlockedList().get(); diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java index 3ad1fda8..9a5b5a7d 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java @@ -3,6 +3,7 @@ package org.asamk.signal.manager.helper; import com.google.protobuf.ByteString; import org.asamk.signal.manager.api.TrustLevel; +import org.asamk.signal.manager.groups.GroupId; import org.asamk.signal.manager.storage.SignalAccount; import org.asamk.signal.manager.storage.groups.GroupInfoV1; import org.asamk.signal.manager.storage.recipients.Contact; @@ -21,6 +22,7 @@ import org.whispersystems.signalservice.api.messages.multidevice.DeviceContact; import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactsInputStream; import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactsOutputStream; import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroup; +import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsInputStream; import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsOutputStream; import org.whispersystems.signalservice.api.messages.multidevice.KeysMessage; import org.whispersystems.signalservice.api.messages.multidevice.RequestMessage; @@ -36,7 +38,9 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; import java.util.ArrayList; +import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; public class SyncHelper { @@ -237,6 +241,48 @@ public class SyncHelper { context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forPniIdentity(pniIdentity)); } + public void handleSyncDeviceGroups(final InputStream input) { + final var s = new DeviceGroupsInputStream(input); + DeviceGroup g; + while (true) { + try { + g = s.read(); + } catch (IOException e) { + logger.warn("Sync groups contained invalid group, ignoring: {}", e.getMessage()); + continue; + } + if (g == null) { + break; + } + var syncGroup = account.getGroupStore().getOrCreateGroupV1(GroupId.v1(g.getId())); + if (syncGroup != null) { + if (g.getName().isPresent()) { + syncGroup.name = g.getName().get(); + } + syncGroup.addMembers(g.getMembers() + .stream() + .map(account.getRecipientResolver()::resolveRecipient) + .collect(Collectors.toSet())); + if (!g.isActive()) { + syncGroup.removeMember(account.getSelfRecipientId()); + } else { + // Add ourself to the member set as it's marked as active + syncGroup.addMembers(List.of(account.getSelfRecipientId())); + } + syncGroup.blocked = g.isBlocked(); + if (g.getColor().isPresent()) { + syncGroup.color = g.getColor().get(); + } + + if (g.getAvatar().isPresent()) { + context.getGroupHelper().downloadGroupAvatar(syncGroup.getGroupId(), g.getAvatar().get()); + } + syncGroup.archived = g.isArchived(); + account.getGroupStore().updateGroup(syncGroup); + } + } + } + public void handleSyncDeviceContacts(final InputStream input) throws IOException { final var s = new DeviceContactsInputStream(input); DeviceContact c; From 0b63e78d2b80cd96962152393c0130046d490b54 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 11 Jun 2022 18:17:15 +0200 Subject: [PATCH 015/802] Add logging to test script --- run_tests.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/run_tests.sh b/run_tests.sh index 94eb98d9..69a7d382 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -20,8 +20,8 @@ if [ "$NATIVE" -eq 1 ]; then SIGNAL_CLI="$PWD/build/native/nativeCompile/signal-cli" elif [ "$JSON_RPC" -eq 1 ]; then (cd client && cargo build) - "$PWD/build/install/signal-cli/bin/signal-cli" --verbose --verbose --trust-new-identities=always --config="$PATH_MAIN" --service-environment="staging" daemon --socket --receive-mode=manual& - "$PWD/build/install/signal-cli/bin/signal-cli" --verbose --verbose --trust-new-identities=always --config="$PATH_LINK" --service-environment="staging" daemon --tcp --receive-mode=manual& + "$PWD/build/install/signal-cli/bin/signal-cli" --verbose --verbose --trust-new-identities=always --config="$PATH_MAIN" --service-environment="staging" --log-file="$PATH_MAIN/log" daemon --socket --receive-mode=manual& + "$PWD/build/install/signal-cli/bin/signal-cli" --verbose --verbose --trust-new-identities=always --config="$PATH_LINK" --service-environment="staging" --log-file="$PATH_LINK/log" daemon --tcp --receive-mode=manual& sleep 5 SIGNAL_CLI="$PWD/client/target/debug/signal-cli-client" else @@ -41,7 +41,7 @@ run() { if [ "$JSON_RPC" -eq 1 ]; then "$SIGNAL_CLI" $@ else - "$SIGNAL_CLI" --service-environment="staging" $@ + "$SIGNAL_CLI" --service-environment="staging" --verbose --verbose $@ fi set +x } @@ -51,7 +51,7 @@ run_main() { if [ "$JSON_RPC" -eq 1 ]; then run --json-rpc-socket="$XDG_RUNTIME_DIR/signal-cli/socket" $@ else - run --config="$PATH_MAIN" $@ + run --config="$PATH_MAIN" --log-file="$PATH_MAIN/log" $@ fi unset SIGNAL_CLI_AGENT_ID } @@ -61,7 +61,7 @@ run_linked() { if [ "$JSON_RPC" -eq 1 ]; then run --json-rpc-tcp="127.0.0.1:7583" $@ else - run --config="$PATH_LINK" $@ + run --config="$PATH_LINK" --log-file="$PATH_LINK/log" $@ fi unset SIGNAL_CLI_AGENT_ID } @@ -177,14 +177,14 @@ run_main -a "$NUMBER_1" updateGroup -g "$GROUP_ID" -r "$NUMBER_2" run_main -a "$NUMBER_1" updateGroup -g "$GROUP_ID" -m "$NUMBER_2" run_main -a "$NUMBER_1" listGroups -d run_main -a "$NUMBER_1" --output=json listGroups -d -run_main -a "$NUMBER_2" --verbose receive +run_main -a "$NUMBER_2" receive run_main -a "$NUMBER_2" quitGroup -g "$GROUP_ID" run_main -a "$NUMBER_2" listGroups -d run_main -a "$NUMBER_2" --output=json listGroups -d run_main -a "$NUMBER_1" receive run_main -a "$NUMBER_1" updateGroup -g "$GROUP_ID" -m "$NUMBER_2" -run_main -a "$NUMBER_1" --verbose block -g "$GROUP_ID" -run_main -a "$NUMBER_1" --verbose unblock -g "$GROUP_ID" +run_main -a "$NUMBER_1" block -g "$GROUP_ID" +run_main -a "$NUMBER_1" unblock -g "$GROUP_ID" ## Configuration run_main -a "$NUMBER_1" updateConfiguration --read-receipts=true From c487929bcd505a76b4ee445a0765079184865e8b Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 11 Jun 2022 18:36:53 +0200 Subject: [PATCH 016/802] Make version command work on the command line --- .../asamk/signal/commands/VersionCommand.java | 49 +++++++++++++++---- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/asamk/signal/commands/VersionCommand.java b/src/main/java/org/asamk/signal/commands/VersionCommand.java index 95b41598..52099ff3 100644 --- a/src/main/java/org/asamk/signal/commands/VersionCommand.java +++ b/src/main/java/org/asamk/signal/commands/VersionCommand.java @@ -1,14 +1,23 @@ package org.asamk.signal.commands; +import com.fasterxml.jackson.core.type.TypeReference; + +import net.sourceforge.argparse4j.inf.Namespace; +import net.sourceforge.argparse4j.inf.Subparser; + import org.asamk.signal.BaseConfig; +import org.asamk.signal.OutputType; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.MultiAccountManager; import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; +import java.util.List; import java.util.Map; -public class VersionCommand implements JsonRpcSingleCommand, JsonRpcMultiCommand { +public class VersionCommand implements JsonRpcLocalCommand, JsonRpcMultiLocalCommand { @Override public String getName() { @@ -16,21 +25,41 @@ public class VersionCommand implements JsonRpcSingleCommand, JsonRpcMultiC } @Override - public void handleCommand( - final Void request, final Manager m, final JsonWriter jsonWriter - ) throws CommandException { - outputVersion(jsonWriter); + public List getSupportedOutputTypes() { + return List.of(OutputType.PLAIN_TEXT, OutputType.JSON); + } + + @Override + public void attachToSubparser(final Subparser subparser) { } @Override public void handleCommand( - final Void request, final MultiAccountManager c, final JsonWriter jsonWriter + final Namespace ns, final Manager m, final OutputWriter outputWriter ) throws CommandException { - outputVersion(jsonWriter); + outputVersion(outputWriter); } - private void outputVersion(final JsonWriter jsonWriter) { - jsonWriter.write(Map.of("version", - BaseConfig.PROJECT_VERSION == null ? "unknown" : BaseConfig.PROJECT_VERSION)); + @Override + public void handleCommand( + final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter + ) throws CommandException { + outputVersion(outputWriter); + } + + @Override + public TypeReference> getRequestType() { + return new TypeReference<>() {}; + } + + private void outputVersion(final OutputWriter outputWriter) { + final var projectName = BaseConfig.PROJECT_NAME == null ? "signal-cli" : BaseConfig.PROJECT_NAME; + final var version = BaseConfig.PROJECT_VERSION == null ? "unknown" : BaseConfig.PROJECT_VERSION; + + if (outputWriter instanceof JsonWriter jsonWriter) { + jsonWriter.write(Map.of("version", version)); + } else if (outputWriter instanceof PlainTextWriter plainTextWriter) { + plainTextWriter.println("{} {}", projectName, version); + } } } From aaa6412469c0af93a226ba805e6dbe74b4ea9773 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 11 Jun 2022 22:45:51 +0200 Subject: [PATCH 017/802] Allow registering new accounts on both live and staging environments in the same config directory --- graalvm-config-dir/reflect-config.json | 8 +- .../signal/manager/SignalAccountFiles.java | 17 ++- .../storage/accounts/AccountsStorage.java | 4 +- .../storage/accounts/AccountsStore.java | 132 ++++++++++++++---- src/main/java/org/asamk/signal/App.java | 10 +- 5 files changed, 136 insertions(+), 35 deletions(-) diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json index 2c2c94f9..54ed49f6 100644 --- a/graalvm-config-dir/reflect-config.json +++ b/graalvm-config-dir/reflect-config.json @@ -914,8 +914,9 @@ "queryAllDeclaredMethods":true, "queryAllDeclaredConstructors":true, "methods":[ - {"name":"","parameterTypes":["java.util.List"] }, - {"name":"accounts","parameterTypes":[] } + {"name":"","parameterTypes":["java.util.List","java.lang.Integer"] }, + {"name":"accounts","parameterTypes":[] }, + {"name":"version","parameterTypes":[] } ] }, { @@ -924,7 +925,8 @@ "queryAllDeclaredMethods":true, "queryAllDeclaredConstructors":true, "methods":[ - {"name":"","parameterTypes":["java.lang.String","java.lang.String","java.lang.String"] }, + {"name":"","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, + {"name":"environment","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"path","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] } diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java index 3821a306..f397b534 100644 --- a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java +++ b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java @@ -41,14 +41,24 @@ public class SignalAccountFiles { this.serviceEnvironmentConfig = ServiceConfig.getServiceEnvironmentConfig(this.serviceEnvironment, userAgent); this.userAgent = userAgent; this.trustNewIdentity = trustNewIdentity; - this.accountsStore = new AccountsStore(pathConfig.dataPath()); + this.accountsStore = new AccountsStore(pathConfig.dataPath(), serviceEnvironment, accountPath -> { + if (accountPath == null || !SignalAccount.accountFileExists(pathConfig.dataPath(), accountPath)) { + return null; + } + + try { + return SignalAccount.load(pathConfig.dataPath(), accountPath, false, trustNewIdentity); + } catch (Exception e) { + return null; + } + }); } - public Set getAllLocalAccountNumbers() { + public Set getAllLocalAccountNumbers() throws IOException { return accountsStore.getAllNumbers(); } - public MultiAccountManager initMultiAccountManager() { + public MultiAccountManager initMultiAccountManager() throws IOException { final var managers = accountsStore.getAllAccounts().parallelStream().map(a -> { try { return initManager(a.number(), a.path()); @@ -108,6 +118,7 @@ public class SignalAccountFiles { if (account.getServiceEnvironment() == null) { account.setServiceEnvironment(serviceEnvironment); + accountsStore.updateAccount(accountPath, account.getNumber(), account.getAci()); } return manager; diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStorage.java b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStorage.java index 7507c339..40107986 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStorage.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStorage.java @@ -2,7 +2,7 @@ package org.asamk.signal.manager.storage.accounts; import java.util.List; -public record AccountsStorage(List accounts) { +public record AccountsStorage(List accounts, Integer version) { - public record Account(String path, String number, String uuid) {} + public record Account(String path, String environment, String number, String uuid) {} } diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java index ea2f0a1b..d708a41c 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java @@ -3,6 +3,8 @@ package org.asamk.signal.manager.storage.accounts; import com.fasterxml.jackson.databind.ObjectMapper; import org.asamk.signal.manager.api.Pair; +import org.asamk.signal.manager.config.ServiceEnvironment; +import org.asamk.signal.manager.storage.SignalAccount; import org.asamk.signal.manager.storage.Utils; import org.asamk.signal.manager.util.IOUtils; import org.slf4j.Logger; @@ -29,39 +31,52 @@ import java.util.stream.Stream; public class AccountsStore { + private static final int MINIMUM_STORAGE_VERSION = 1; + private static final int CURRENT_STORAGE_VERSION = 2; private final static Logger logger = LoggerFactory.getLogger(AccountsStore.class); private final ObjectMapper objectMapper = Utils.createStorageObjectMapper(); private final File dataPath; + private final String serviceEnvironment; + private final AccountLoader accountLoader; - public AccountsStore(final File dataPath) throws IOException { + public AccountsStore( + final File dataPath, final ServiceEnvironment serviceEnvironment, final AccountLoader accountLoader + ) throws IOException { this.dataPath = dataPath; + this.serviceEnvironment = getServiceEnvironmentString(serviceEnvironment); + this.accountLoader = accountLoader; if (!getAccountsFile().exists()) { createInitialAccounts(); } } - public synchronized Set getAllNumbers() { + public synchronized Set getAllNumbers() throws IOException { return readAccounts().stream() .map(AccountsStorage.Account::number) .filter(Objects::nonNull) .collect(Collectors.toSet()); } - public synchronized Set getAllAccounts() { - return readAccounts().stream().filter(a -> a.number() != null).collect(Collectors.toSet()); + public synchronized Set getAllAccounts() throws IOException { + return readAccounts().stream() + .filter(a -> a.environment() == null || serviceEnvironment.equals(a.environment())) + .filter(a -> a.number() != null) + .collect(Collectors.toSet()); } - public synchronized String getPathByNumber(String number) { + public synchronized String getPathByNumber(String number) throws IOException { return readAccounts().stream() + .filter(a -> a.environment() == null || serviceEnvironment.equals(a.environment())) .filter(a -> number.equals(a.number())) .map(AccountsStorage.Account::path) .findFirst() .orElse(null); } - public synchronized String getPathByAci(ACI aci) { + public synchronized String getPathByAci(ACI aci) throws IOException { return readAccounts().stream() + .filter(a -> a.environment() == null || serviceEnvironment.equals(a.environment())) .filter(a -> aci.toString().equals(a.uuid())) .map(AccountsStorage.Account::path) .findFirst() @@ -70,15 +85,22 @@ public class AccountsStore { public synchronized void updateAccount(String path, String number, ACI aci) { updateAccounts(accounts -> accounts.stream().map(a -> { + if (a.environment() != null && !serviceEnvironment.equals(a.environment())) { + return a; + } + if (path.equals(a.path())) { - return new AccountsStorage.Account(a.path(), number, aci == null ? null : aci.toString()); + return new AccountsStorage.Account(a.path(), + serviceEnvironment, + number, + aci == null ? null : aci.toString()); } if (number != null && number.equals(a.number())) { - return new AccountsStorage.Account(a.path(), null, a.uuid()); + return new AccountsStorage.Account(a.path(), a.environment(), null, a.uuid()); } if (aci != null && aci.toString().equals(a.toString())) { - return new AccountsStorage.Account(a.path(), a.number(), null); + return new AccountsStorage.Account(a.path(), a.environment(), a.number(), null); } return a; @@ -87,14 +109,21 @@ public class AccountsStore { public synchronized String addAccount(String number, ACI aci) { final var accountPath = generateNewAccountPath(); - final var account = new AccountsStorage.Account(accountPath, number, aci == null ? null : aci.toString()); + final var account = new AccountsStorage.Account(accountPath, + serviceEnvironment, + number, + aci == null ? null : aci.toString()); updateAccounts(accounts -> { final var existingAccounts = accounts.stream().map(a -> { - if (number != null && number.equals(a.number())) { - return new AccountsStorage.Account(a.path(), null, a.uuid()); + if (a.environment() != null && !serviceEnvironment.equals(a.environment())) { + return a; } - if (aci != null && aci.toString().equals(a.toString())) { - return new AccountsStorage.Account(a.path(), a.number(), null); + + if (number != null && number.equals(a.number())) { + return new AccountsStorage.Account(a.path(), a.environment(), null, a.uuid()); + } + if (aci != null && aci.toString().equals(a.uuid())) { + return new AccountsStorage.Account(a.path(), a.environment(), a.number(), null); } return a; @@ -105,7 +134,9 @@ public class AccountsStore { } public void removeAccount(final String accountPath) { - updateAccounts(accounts -> accounts.stream().filter(a -> !a.path().equals(accountPath)).toList()); + updateAccounts(accounts -> accounts.stream().filter(a -> !( + (a.environment() == null || serviceEnvironment.equals(a.environment())) && a.path().equals(accountPath) + )).toList()); } private String generateNewAccountPath() { @@ -123,8 +154,8 @@ public class AccountsStore { private void createInitialAccounts() throws IOException { final var legacyAccountPaths = getLegacyAccountPaths(); final var accountsStorage = new AccountsStorage(legacyAccountPaths.stream() - .map(number -> new AccountsStorage.Account(number, number, null)) - .toList()); + .map(number -> new AccountsStorage.Account(number, null, number, null)) + .toList(), CURRENT_STORAGE_VERSION); IOUtils.createPrivateDirectories(dataPath); var fileName = getAccountsFile(); @@ -152,15 +183,52 @@ public class AccountsStore { .collect(Collectors.toSet()); } - private List readAccounts() { - try { - final var pair = openFileChannel(getAccountsFile()); - try (final var fileChannel = pair.first(); final var lock = pair.second()) { - return readAccountsLocked(fileChannel).accounts(); + private List readAccounts() throws IOException { + final var pair = openFileChannel(getAccountsFile()); + try (final var fileChannel = pair.first(); final var lock = pair.second()) { + final var storage = readAccountsLocked(fileChannel); + + var accountsVersion = storage.version() == null ? 1 : storage.version(); + if (accountsVersion > CURRENT_STORAGE_VERSION) { + throw new IOException("Accounts file was created by a more recent version: " + accountsVersion); + } else if (accountsVersion < MINIMUM_STORAGE_VERSION) { + throw new IOException("Accounts file was created by a no longer supported older version: " + + accountsVersion); + } else if (accountsVersion < CURRENT_STORAGE_VERSION) { + return upgradeAccountsFile(fileChannel, storage, accountsVersion).accounts(); } - } catch (IOException e) { - logger.error("Failed to read accounts list", e); - return List.of(); + return storage.accounts(); + } + } + + private AccountsStorage upgradeAccountsFile( + final FileChannel fileChannel, final AccountsStorage storage, final int accountsVersion + ) { + try { + List newAccounts = storage.accounts(); + if (accountsVersion < 2) { + // add environment field + newAccounts = newAccounts.stream().map(a -> { + if (a.environment() != null) { + return a; + } + try (final var account = accountLoader.loadAccountOrNull(a.path())) { + if (account == null || account.getServiceEnvironment() == null) { + return a; + } + return new AccountsStorage.Account(a.path(), + getServiceEnvironmentString(account.getServiceEnvironment()), + a.number(), + a.uuid()); + } + }).toList(); + } + final var newStorage = new AccountsStorage(newAccounts, CURRENT_STORAGE_VERSION); + saveAccountsLocked(fileChannel, newStorage); + return newStorage; + } catch (Exception e) { + logger.warn("Failed to upgrade accounts file", e); + return storage; } } @@ -170,7 +238,7 @@ public class AccountsStore { try (final var fileChannel = pair.first(); final var lock = pair.second()) { final var accountsStorage = readAccountsLocked(fileChannel); final var newAccountsStorage = updater.apply(accountsStorage.accounts()); - saveAccountsLocked(fileChannel, new AccountsStorage(newAccountsStorage)); + saveAccountsLocked(fileChannel, new AccountsStorage(newAccountsStorage, CURRENT_STORAGE_VERSION)); } } catch (IOException e) { logger.error("Failed to update accounts list", e); @@ -209,4 +277,16 @@ public class AccountsStore { } return new Pair<>(fileChannel, lock); } + + private String getServiceEnvironmentString(final ServiceEnvironment serviceEnvironment) { + return switch (serviceEnvironment) { + case LIVE -> "LIVE"; + case STAGING -> "STAGING"; + }; + } + + public interface AccountLoader { + + SignalAccount loadAccountOrNull(String accountPath); + } } diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java index 37f5feec..91af270d 100644 --- a/src/main/java/org/asamk/signal/App.java +++ b/src/main/java/org/asamk/signal/App.java @@ -46,6 +46,7 @@ import java.io.BufferedWriter; import java.io.File; import java.io.IOException; import java.io.OutputStreamWriter; +import java.util.Set; import static net.sourceforge.argparse4j.DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS; @@ -188,7 +189,12 @@ public class App { return; } - var accounts = signalAccountFiles.getAllLocalAccountNumbers(); + Set accounts = null; + try { + accounts = signalAccountFiles.getAllLocalAccountNumbers(); + } catch (IOException e) { + throw new IOErrorException("Failed to load local accounts file", e); + } if (accounts.size() == 0) { throw new UserErrorException("No local users found, you first need to register or link an account"); } else if (accounts.size() > 1) { @@ -299,6 +305,8 @@ public class App { ) throws CommandException { try (var multiAccountManager = signalAccountFiles.initMultiAccountManager()) { command.handleCommand(ns, multiAccountManager, outputWriter); + } catch (IOException e) { + throw new IOErrorException("Failed to load local accounts file", e); } } From 4ea3d94d0768f452899b45120df50a67fd1b8443 Mon Sep 17 00:00:00 2001 From: AsamK Date: Mon, 13 Jun 2022 15:35:25 +0200 Subject: [PATCH 018/802] Improve number filtering of listContacts command If the given number is not registered, don't output all recipients --- lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java index 201f0931..5548e5ac 100644 --- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java @@ -989,6 +989,9 @@ class ManagerImpl implements Manager { return null; } }).filter(Objects::nonNull).collect(Collectors.toSet()); + if (!recipients.isEmpty() && recipientIds.isEmpty()) { + return List.of(); + } // refresh profiles of explicitly given recipients context.getProfileHelper().refreshRecipientProfiles(recipientIds); return account.getRecipientStore().getRecipients(onlyContacts, blocked, recipientIds, name); From adce64bc21cc57bcba2bd12a68105be5924a9f63 Mon Sep 17 00:00:00 2001 From: AsamK Date: Mon, 13 Jun 2022 15:46:03 +0200 Subject: [PATCH 019/802] Bump version --- CHANGELOG.md | 11 +++++++++++ build.gradle.kts | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a829372d..3d27afb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ ## [Unreleased] +## [0.10.8] - 2022-06-13 + +### Added +- Attachments can now be given as data: URIs with base64 data instead of just file paths (Thanks @KevinRoebert) +- `version` command can now be used on the commandline, in addition to the `--version` flag. + In the next version the current short form `-v` will change its meaning to `--verbose`! + +### Improved +- An account can now be registered on both LIVE and STAGING environment in the same config directory. +- Logging output for registering has been extended. + ## [0.10.7] - 2022-05-29 ### Added diff --git a/build.gradle.kts b/build.gradle.kts index 8bdd9ca4..cbaa36c3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { id("org.graalvm.buildtools.native") version "0.9.11" } -version = "0.10.7" +version = "0.10.8" java { sourceCompatibility = JavaVersion.VERSION_17 From abebffb2cd99678bd17498fea2d1f0749b602c8b Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 18 Jun 2022 12:11:36 +0200 Subject: [PATCH 020/802] Improve output for profile key update messages --- .../java/org/asamk/signal/manager/api/MessageEnvelope.java | 2 ++ src/main/java/org/asamk/signal/ReceiveMessageHandler.java | 5 ++++- src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java index 67a33613..d2164e91 100644 --- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java +++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java @@ -100,6 +100,7 @@ public record MessageEnvelope( boolean isExpirationUpdate, boolean isViewOnce, boolean isEndSession, + boolean isProfileKeyUpdate, boolean hasProfileKey, Optional reaction, Optional quote, @@ -126,6 +127,7 @@ public record MessageEnvelope( dataMessage.isExpirationUpdate(), dataMessage.isViewOnce(), dataMessage.isEndSession(), + dataMessage.isProfileKeyUpdate(), dataMessage.getProfileKey().isPresent(), dataMessage.getReaction().map(r -> Reaction.from(r, recipientResolver, addressResolver)), dataMessage.getQuote().map(q -> Quote.from(q, recipientResolver, addressResolver, fileProvider)), diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java index 04a7be03..390087f9 100644 --- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java +++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java @@ -141,9 +141,12 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { if (message.expiresInSeconds() > 0) { writer.println("Expires in: {} seconds", message.expiresInSeconds()); } - if (message.hasProfileKey()) { + if (message.isProfileKeyUpdate()) { writer.println("Profile key update"); } + if (message.hasProfileKey()) { + writer.println("With profile key"); + } if (message.reaction().isPresent()) { writer.println("Reaction:"); final var reaction = message.reaction().get(); diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java index 9ffb0795..90153147 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java @@ -757,6 +757,7 @@ public class DbusManagerImpl implements Manager { false, false, false, + false, Optional.empty(), Optional.empty(), Optional.empty(), @@ -827,6 +828,7 @@ public class DbusManagerImpl implements Manager { false, false, false, + false, Optional.empty(), Optional.empty(), Optional.empty(), From 280bdbefdcb9123a9bd7ee0cf7b7b3585a972dfc Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 18 Jun 2022 12:27:34 +0200 Subject: [PATCH 021/802] Only send profile key update message from the primary device --- .../asamk/signal/manager/helper/IncomingMessageHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java index 4940e67c..d18cc0c0 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java @@ -255,7 +255,10 @@ public final class IncomingMessageHandler { } else { // Message wasn't sent as unidentified sender message final var contact = context.getAccount().getContactStore().getContact(sender); - if (contact != null && !contact.isBlocked() && contact.isProfileSharingEnabled()) { + if (account.isPrimaryDevice() + && contact != null + && !contact.isBlocked() + && contact.isProfileSharingEnabled()) { actions.add(UpdateAccountAttributesAction.create()); actions.add(new SendProfileKeyAction(sender)); } From 6bbbccb9ac74d577d159fdabe9b6de27a8d99822 Mon Sep 17 00:00:00 2001 From: John Rush Date: Tue, 21 Jun 2022 01:11:30 -0700 Subject: [PATCH 022/802] Update README.md (#972) Fix typo from "JSON-PRC" to "JSON-RPC". --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 570451c2..50442c34 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ support [provisioning as a linked device](https://github.com/WhisperSystems/libs registering you need a phone number where you can receive SMS or incoming calls. signal-cli is primarily intended to be used on servers to notify admins of important events. For this use-case, it has a daemon mode with D-BUS -interface ([man page](https://github.com/AsamK/signal-cli/blob/master/man/signal-cli-dbus.5.adoc)) and JSON-PRC interface ([documentation](https://github.com/AsamK/signal-cli/wiki/JSON-RPC-service)). For the JSON-RPC interface there's also a simple [example client](https://github.com/AsamK/signal-cli/tree/master/client), written in Rust. +interface ([man page](https://github.com/AsamK/signal-cli/blob/master/man/signal-cli-dbus.5.adoc)) and JSON-RPC interface ([documentation](https://github.com/AsamK/signal-cli/wiki/JSON-RPC-service)). For the JSON-RPC interface there's also a simple [example client](https://github.com/AsamK/signal-cli/tree/master/client), written in Rust. ## Installation From c1dc44d4fd5cf1aba2a30f7c689cf9ea013e2d60 Mon Sep 17 00:00:00 2001 From: AsamK Date: Tue, 21 Jun 2022 16:58:15 +0200 Subject: [PATCH 023/802] Separate registrationLock attribute from master key --- .../manager/RegistrationManagerImpl.java | 2 +- .../signal/manager/helper/AccountHelper.java | 13 ++++------ .../signal/manager/storage/SignalAccount.java | 24 ++++++++++++++++--- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java index 3ce77557..5a99b827 100644 --- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java @@ -182,7 +182,7 @@ class RegistrationManagerImpl implements RegistrationManager { account.getLocalRegistrationId(), true, null, - account.getPinMasterKey() == null ? null : account.getPinMasterKey().deriveRegistrationLock(), + account.getRegistrationLock(), account.getSelfUnidentifiedAccessKey(), account.isUnrestrictedUnidentifiedAccess(), capabilities, diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java index bae049c5..0c66a182 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java @@ -9,7 +9,6 @@ import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException; import org.asamk.signal.manager.api.PinLockedException; import org.asamk.signal.manager.config.ServiceConfig; import org.asamk.signal.manager.storage.SignalAccount; -import org.asamk.signal.manager.util.KeyUtils; import org.asamk.signal.manager.util.NumberVerificationUtils; import org.signal.libsignal.protocol.InvalidKeyException; import org.slf4j.Logger; @@ -125,7 +124,7 @@ public class AccountHelper { account.getLocalRegistrationId(), true, null, - account.getPinMasterKey() == null ? null : account.getPinMasterKey().deriveRegistrationLock(), + account.getRegistrationLock(), account.getSelfUnidentifiedAccessKey(), account.isUnrestrictedUnidentifiedAccess(), ServiceConfig.capabilities, @@ -157,20 +156,18 @@ public class AccountHelper { } public void setRegistrationPin(String pin) throws IOException { - final var masterKey = account.getPinMasterKey() != null - ? account.getPinMasterKey() - : KeyUtils.createMasterKey(); + var masterKey = account.getOrCreatePinMasterKey(); context.getPinHelper().setRegistrationLockPin(pin, masterKey); - account.setRegistrationLockPin(pin, masterKey); + account.setRegistrationLockPin(pin); } public void removeRegistrationPin() throws IOException { // Remove KBS Pin context.getPinHelper().removeRegistrationLockPin(); - account.setRegistrationLockPin(null, null); + account.setRegistrationLockPin(null); } public void unregister() throws IOException { @@ -189,7 +186,7 @@ public class AccountHelper { } catch (IOException e) { logger.warn("Failed to remove registration lock pin"); } - account.setRegistrationLockPin(null, null); + account.setRegistrationLockPin(null); dependencies.getAccountManager().deleteAccount(); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java index a66af784..7268693a 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java @@ -1253,13 +1253,31 @@ public class SignalAccount implements Closeable { save(); } - public void setRegistrationLockPin(final String registrationLockPin, final MasterKey pinMasterKey) { + public void setRegistrationLockPin(final String registrationLockPin) { this.registrationLockPin = registrationLockPin; - this.pinMasterKey = pinMasterKey; save(); } - public MasterKey getPinMasterKey() { + public String getRegistrationLock() { + final var masterKey = getPinBackedMasterKey(); + if (masterKey == null) { + return null; + } + return masterKey.deriveRegistrationLock(); + } + + public MasterKey getPinBackedMasterKey() { + if (registrationLockPin == null) { + return null; + } + return pinMasterKey; + } + + public MasterKey getOrCreatePinMasterKey() { + if (pinMasterKey == null) { + pinMasterKey = KeyUtils.createMasterKey(); + save(); + } return pinMasterKey; } From a4db5d616a184b4ef442a37005a0738a276909f5 Mon Sep 17 00:00:00 2001 From: AsamK Date: Tue, 21 Jun 2022 17:17:25 +0200 Subject: [PATCH 024/802] Create master key before storage sync if it doesn't exist yet --- .../main/java/org/asamk/signal/manager/ManagerImpl.java | 4 +--- .../manager/actions/RetrieveStorageDataAction.java | 6 +----- .../org/asamk/signal/manager/helper/StorageHelper.java | 9 ++++++++- .../org/asamk/signal/manager/storage/SignalAccount.java | 7 +++++++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java index 5548e5ac..6f178e4e 100644 --- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java @@ -830,9 +830,7 @@ class ManagerImpl implements Manager { } void retrieveRemoteStorage() throws IOException { - if (account.getStorageKey() != null) { - context.getStorageHelper().readDataFromStorage(); - } + context.getStorageHelper().readDataFromStorage(); } @Override diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/RetrieveStorageDataAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/RetrieveStorageDataAction.java index 28b304ab..8b296006 100644 --- a/lib/src/main/java/org/asamk/signal/manager/actions/RetrieveStorageDataAction.java +++ b/lib/src/main/java/org/asamk/signal/manager/actions/RetrieveStorageDataAction.java @@ -15,10 +15,6 @@ public class RetrieveStorageDataAction implements HandleAction { @Override public void execute(Context context) throws Throwable { - if (context.getAccount().getStorageKey() != null) { - context.getStorageHelper().readDataFromStorage(); - } else if (!context.getAccount().isPrimaryDevice()) { - context.getSyncHelper().requestSyncKeys(); - } + context.getStorageHelper().readDataFromStorage(); } } diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java index 84d98db2..f849389d 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java @@ -43,11 +43,18 @@ public class StorageHelper { } public void readDataFromStorage() throws IOException { + final var storageKey = account.getOrCreateStorageKey(); + if (storageKey == null) { + logger.debug("Storage key unknown, requesting from primary device."); + context.getSyncHelper().requestSyncKeys(); + return; + } + logger.debug("Reading data from remote storage"); Optional manifest; try { manifest = dependencies.getAccountManager() - .getStorageManifestIfDifferentVersion(account.getStorageKey(), account.getStorageManifestVersion()); + .getStorageManifestIfDifferentVersion(storageKey, account.getStorageManifestVersion()); } catch (InvalidKeyException e) { logger.warn("Manifest couldn't be decrypted, ignoring."); return; diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java index 7268693a..72b759b6 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java @@ -1288,6 +1288,13 @@ public class SignalAccount implements Closeable { return storageKey; } + public StorageKey getOrCreateStorageKey() { + if (isPrimaryDevice()) { + return getOrCreatePinMasterKey().deriveStorageServiceKey(); + } + return storageKey; + } + public void setStorageKey(final StorageKey storageKey) { if (storageKey.equals(this.storageKey)) { return; From 9553b1ef00992430477717a5ceb8fd7aea920661 Mon Sep 17 00:00:00 2001 From: AsamK Date: Tue, 21 Jun 2022 17:18:16 +0200 Subject: [PATCH 025/802] Check account identifiers on the server before updating the account attributes --- lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java index 6f178e4e..cdb6f640 100644 --- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java @@ -231,6 +231,7 @@ class ManagerImpl implements Manager { if (deviceName != null) { context.getAccountHelper().setDeviceName(deviceName); } + context.getAccountHelper().checkWhoAmiI(); context.getAccountHelper().updateAccountAttributes(); } From c586f58286fb3128d67c420be45b78c1905ed014 Mon Sep 17 00:00:00 2001 From: AsamK Date: Tue, 21 Jun 2022 20:34:38 +0200 Subject: [PATCH 026/802] Reset cached storage manifest after provisioning/registering --- .../signal/manager/storage/SignalAccount.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java index 72b759b6..5e3e7d04 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java @@ -371,6 +371,7 @@ public class SignalAccount implements Closeable { this.lastReceiveTimestamp = 0; this.pinMasterKey = null; this.storageManifestVersion = -1; + this.setStorageManifest(null); this.storageKey = null; } @@ -1329,9 +1330,19 @@ public class SignalAccount implements Closeable { } public void setStorageManifest(SignalStorageManifest manifest) { - final var manifestBytes = manifest.serialize(); - final var storageManifestFile = getStorageManifestFile(dataPath, accountPath); + if (manifest == null) { + if (storageManifestFile.exists()) { + try { + Files.delete(storageManifestFile.toPath()); + } catch (IOException e) { + logger.error("Failed to delete local storage manifest.", e); + } + } + return; + } + + final var manifestBytes = manifest.serialize(); try (var outputStream = new FileOutputStream(storageManifestFile)) { outputStream.write(manifestBytes); } catch (IOException e) { @@ -1406,6 +1417,7 @@ public class SignalAccount implements Closeable { public void finishRegistration(final ACI aci, final PNI pni, final MasterKey masterKey, final String pin) { this.pinMasterKey = masterKey; this.storageManifestVersion = -1; + this.setStorageManifest(null); this.storageKey = null; this.encryptedDeviceName = null; this.deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID; From dca1d479e84f7b4c8b3a91ef517438d8483a32a7 Mon Sep 17 00:00:00 2001 From: AsamK Date: Mon, 27 Jun 2022 15:39:33 +0200 Subject: [PATCH 027/802] Update graalvm buildtools --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index cbaa36c3..878ea08e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ plugins { application eclipse `check-lib-versions` - id("org.graalvm.buildtools.native") version "0.9.11" + id("org.graalvm.buildtools.native") version "0.9.12" } version = "0.10.8" From 9f7979314f2e3d5338b704f43e81da5a408d97b9 Mon Sep 17 00:00:00 2001 From: AsamK Date: Mon, 27 Jun 2022 16:57:40 +0200 Subject: [PATCH 028/802] Prevent duplicate family name when handling contact sync message --- .../main/java/org/asamk/signal/manager/helper/SyncHelper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java index 9a5b5a7d..d192ae8f 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java @@ -308,6 +308,7 @@ public class SyncHelper { final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact); if (c.getName().isPresent()) { builder.withGivenName(c.getName().get()); + builder.withFamilyName(null); } if (c.getColor().isPresent()) { builder.withColor(c.getColor().get()); From 1c7d1861d6b004c47b5a3264fbfec071f25a9e7b Mon Sep 17 00:00:00 2001 From: AsamK Date: Fri, 15 Jul 2022 20:07:28 +0200 Subject: [PATCH 029/802] Update graalvm buildtools --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 878ea08e..bd257e5a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ plugins { application eclipse `check-lib-versions` - id("org.graalvm.buildtools.native") version "0.9.12" + id("org.graalvm.buildtools.native") version "0.9.13" } version = "0.10.8" From 9da2a0040358c57c27fbbf3c98d416b243070832 Mon Sep 17 00:00:00 2001 From: AsamK Date: Fri, 15 Jul 2022 20:13:36 +0200 Subject: [PATCH 030/802] Fix issue with loading legacy profile store Fixes #981 --- .../manager/storage/profiles/LegacyProfileStore.java | 2 +- .../{SignalProfile.java => LegacySignalProfile.java} | 7 +++++-- .../manager/storage/profiles/LegacySignalProfileEntry.java | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) rename lib/src/main/java/org/asamk/signal/manager/storage/profiles/{SignalProfile.java => LegacySignalProfile.java} (95%) diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java index b3aa4f8c..be275116 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java @@ -60,7 +60,7 @@ public class LegacyProfileStore { } } var lastUpdateTimestamp = entry.get("lastUpdateTimestamp").asLong(); - var profile = jsonProcessor.treeToValue(entry.get("profile"), SignalProfile.class); + var profile = jsonProcessor.treeToValue(entry.get("profile"), LegacySignalProfile.class); profileEntries.add(new LegacySignalProfileEntry(address, profileKey, lastUpdateTimestamp, diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfile.java similarity index 95% rename from lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java rename to lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfile.java index ed5f0160..e3e18b1e 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfile.java @@ -3,7 +3,7 @@ package org.asamk.signal.manager.storage.profiles; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -public class SignalProfile { +public class LegacySignalProfile { @JsonProperty @JsonIgnore @@ -27,7 +27,7 @@ public class SignalProfile { @JsonProperty private final Capabilities capabilities; - public SignalProfile( + public LegacySignalProfile( @JsonProperty("name") final String name, @JsonProperty("about") final String about, @JsonProperty("aboutEmoji") final String aboutEmoji, @@ -88,6 +88,9 @@ public class SignalProfile { @JsonIgnore public boolean uuid; + @JsonIgnore + public boolean gv2; + @JsonProperty public boolean storage; diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java index 7571146e..609d2f54 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java @@ -12,7 +12,7 @@ public class LegacySignalProfileEntry { private final long lastUpdateTimestamp; - private final SignalProfile profile; + private final LegacySignalProfile profile; private final ProfileKeyCredential profileKeyCredential; @@ -20,7 +20,7 @@ public class LegacySignalProfileEntry { final RecipientAddress address, final ProfileKey profileKey, final long lastUpdateTimestamp, - final SignalProfile profile, + final LegacySignalProfile profile, final ProfileKeyCredential profileKeyCredential ) { this.address = address; @@ -42,7 +42,7 @@ public class LegacySignalProfileEntry { return lastUpdateTimestamp; } - public SignalProfile getProfile() { + public LegacySignalProfile getProfile() { return profile; } From f4346e3f0ad1507bc9ba350289b32b388f2b2814 Mon Sep 17 00:00:00 2001 From: AsamK Date: Thu, 7 Jul 2022 18:46:29 +0200 Subject: [PATCH 031/802] Update account attributes before checking whoAmI --- lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java index cdb6f640..23423955 100644 --- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java @@ -231,8 +231,8 @@ class ManagerImpl implements Manager { if (deviceName != null) { context.getAccountHelper().setDeviceName(deviceName); } - context.getAccountHelper().checkWhoAmiI(); context.getAccountHelper().updateAccountAttributes(); + context.getAccountHelper().checkWhoAmiI(); } @Override From dcde9fbe8ea884e7ae61b3c64a0cff28c09050ea Mon Sep 17 00:00:00 2001 From: AsamK Date: Thu, 7 Jul 2022 18:22:09 +0200 Subject: [PATCH 032/802] Use toList() Stream method --- .../java/org/asamk/signal/manager/helper/SendHelper.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java index e0f2f161..523df2c9 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java @@ -51,7 +51,6 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import java.util.stream.Collectors; public class SendHelper { @@ -275,7 +274,7 @@ public class SendHelper { .getDevices() .stream() .map(device -> new SignalProtocolAddress(address.getIdentifier(), device)) - .collect(Collectors.toList()); + .toList(); account.getSenderKeyStore().markSenderKeySharedWith(group.getDistributionId(), addresses); } @@ -536,14 +535,14 @@ public class SendHelper { List addresses = recipientIdList.stream() .map(context.getRecipientHelper()::resolveSignalServiceAddress) - .collect(Collectors.toList()); + .toList(); List unidentifiedAccesses = context.getUnidentifiedAccessHelper() .getAccessFor(recipientIdList) .stream() .map(Optional::get) .map(UnidentifiedAccessPair::getTargetUnidentifiedAccess) .map(Optional::get) - .collect(Collectors.toList()); + .toList(); try { List results = sender.send(distributionId, From 457b093dce9a63b22b773ac4502867fdc7b0ab2c Mon Sep 17 00:00:00 2001 From: AsamK Date: Thu, 7 Jul 2022 18:43:49 +0200 Subject: [PATCH 033/802] Improve import of contact from storage --- .../signal/manager/helper/StorageHelper.java | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java index f849389d..bc785099 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java @@ -6,6 +6,7 @@ import org.asamk.signal.manager.api.TrustLevel; import org.asamk.signal.manager.groups.GroupId; import org.asamk.signal.manager.storage.SignalAccount; import org.asamk.signal.manager.storage.recipients.Contact; +import org.asamk.signal.manager.storage.recipients.Profile; import org.signal.libsignal.protocol.IdentityKey; import org.signal.libsignal.protocol.InvalidKeyException; import org.signal.libsignal.zkgroup.InvalidInputException; @@ -100,26 +101,36 @@ public class StorageHelper { final var contactRecord = record.getContact().get(); final var address = contactRecord.getAddress(); - final var recipientId = account.getRecipientResolver().resolveRecipient(address); + final var contact = account.getContactStore().getContact(recipientId); final var blocked = contact != null && contact.isBlocked(); final var profileShared = contact != null && contact.isProfileSharingEnabled(); - final var givenName = contact == null ? null : contact.getGivenName(); - final var familyName = contact == null ? null : contact.getFamilyName(); - if ((contactRecord.getGivenName().isPresent() && !contactRecord.getGivenName().get().equals(givenName)) || ( - contactRecord.getFamilyName().isPresent() && !contactRecord.getFamilyName().get().equals(familyName) - ) || blocked != contactRecord.isBlocked() || profileShared != contactRecord.isProfileSharingEnabled()) { + final var archived = contact != null && contact.isArchived(); + if (blocked != contactRecord.isBlocked() + || profileShared != contactRecord.isProfileSharingEnabled() + || archived != contactRecord.isArchived()) { logger.debug("Storing new or updated contact {}", recipientId); final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact); final var newContact = contactBuilder.withBlocked(contactRecord.isBlocked()) - .withGivenName(contactRecord.getGivenName().orElse(null)) - .withFamilyName(contactRecord.getFamilyName().orElse(null)) .withProfileSharingEnabled(contactRecord.isProfileSharingEnabled()) + .withArchived(contactRecord.isArchived()) .build(); account.getContactStore().storeContact(recipientId, newContact); } + final var profile = account.getProfileStore().getProfile(recipientId); + final var givenName = profile == null ? null : profile.getGivenName(); + final var familyName = profile == null ? null : profile.getFamilyName(); + if ((contactRecord.getGivenName().isPresent() && !contactRecord.getGivenName().get().equals(givenName)) || ( + contactRecord.getFamilyName().isPresent() && !contactRecord.getFamilyName().get().equals(familyName) + )) { + final var profileBuilder = profile == null ? Profile.newBuilder() : Profile.newBuilder(profile); + final var newProfile = profileBuilder.withGivenName(contactRecord.getGivenName().orElse(null)) + .withFamilyName(contactRecord.getFamilyName().orElse(null)) + .build(); + account.getProfileStore().storeProfile(recipientId, newProfile); + } if (contactRecord.getProfileKey().isPresent()) { try { logger.trace("Storing profile key {}", recipientId); From ed7d023581ecbdf8cfebbef6a89e41921b281ee0 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 16 Jul 2022 11:06:10 +0200 Subject: [PATCH 034/802] Update gradle wrapper --- gradle/wrapper/gradle-wrapper.jar | Bin 59821 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 6 ++++++ gradlew.bat | 14 ++++++++------ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a4d4fb3f96a785543079b8df6723c946b..249e5832f090a2944b7473328c07c9755baa3196 100644 GIT binary patch delta 10197 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fce..8049c684 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c7873..a69d9cb6 100755 --- a/gradlew +++ b/gradlew @@ -205,6 +205,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal From de583475f923fba15cf548369808ee06fba10a2d Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 16 Jul 2022 15:17:48 +0200 Subject: [PATCH 035/802] Update libsignal-service-java --- lib/build.gradle.kts | 2 +- lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java | 5 +++-- .../java/org/asamk/signal/manager/helper/SendHelper.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 567afd19..f475d567 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -14,7 +14,7 @@ repositories { } dependencies { - implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_50") + implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_51") implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.3") implementation("com.google.protobuf", "protobuf-javalite", "3.11.4") implementation("org.bouncycastle", "bcprov-jdk15on", "1.70") diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java index 23423955..7b09aa3e 100644 --- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java @@ -564,7 +564,8 @@ class ManagerImpl implements Manager { final var quote = message.quote().get(); messageBuilder.withQuote(new SignalServiceDataMessage.Quote(quote.timestamp(), context.getRecipientHelper() - .resolveSignalServiceAddress(context.getRecipientHelper().resolveRecipient(quote.author())), + .resolveSignalServiceAddress(context.getRecipientHelper().resolveRecipient(quote.author())) + .getServiceId(), quote.message(), List.of(), resolveMentions(quote.mentions()), @@ -651,7 +652,7 @@ class ManagerImpl implements Manager { var targetAuthorRecipientId = context.getRecipientHelper().resolveRecipient(targetAuthor); var reaction = new SignalServiceDataMessage.Reaction(emoji, remove, - context.getRecipientHelper().resolveSignalServiceAddress(targetAuthorRecipientId), + context.getRecipientHelper().resolveSignalServiceAddress(targetAuthorRecipientId).getServiceId(), targetSentTimestamp); final var messageBuilder = SignalServiceDataMessage.newBuilder().withReaction(reaction); return sendMessage(messageBuilder, recipients); diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java index 523df2c9..f71133ae 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java @@ -633,7 +633,7 @@ public class SendHelper { message.getTimestamp(), Optional.of(message), message.getExpiresInSeconds(), - Map.of(address, true), + Map.of(address.getServiceId(), true), false, Optional.empty(), Set.of()); From 72293d8d877fcbd9412d4a748db9de2b2a950748 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 16 Jul 2022 15:25:58 +0200 Subject: [PATCH 036/802] Bump version to 0.10.9 --- CHANGELOG.md | 9 +++++++++ build.gradle.kts | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d27afb3..8ff851c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ ## [Unreleased] +## [0.10.9] - 2022-07-16 + +### Changed +- updateAccount command checks self number and PNI after updating account attributes + +### Fixed +- Fixed small issue with syncing contacts from storage +- Fixed issue with opening older account files + ## [0.10.8] - 2022-06-13 ### Added diff --git a/build.gradle.kts b/build.gradle.kts index bd257e5a..0c5ca9b2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { id("org.graalvm.buildtools.native") version "0.9.13" } -version = "0.10.8" +version = "0.10.9" java { sourceCompatibility = JavaVersion.VERSION_17 From 956cb97331c2dfa5371d29aa8ac6fe58c2ef0623 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sun, 24 Jul 2022 10:01:22 +0200 Subject: [PATCH 037/802] Update libsignal-service-java --- graalvm-config-dir/reflect-config.json | 43 +++++++++------ lib/build.gradle.kts | 2 +- .../signal/manager/config/LiveConfig.java | 2 +- .../signal/manager/config/StagingConfig.java | 2 +- .../signal/manager/helper/GroupV2Helper.java | 55 +++++++++++++------ .../signal/manager/helper/ProfileHelper.java | 25 +++++---- .../signal/manager/storage/SignalAccount.java | 2 +- .../storage/profiles/LegacyProfileStore.java | 15 +---- .../profiles/LegacySignalProfileEntry.java | 11 +--- .../storage/profiles/ProfileStore.java | 9 ++- .../manager/storage/recipients/Recipient.java | 26 ++++----- .../storage/recipients/RecipientStore.java | 38 +++++++------ 12 files changed, 122 insertions(+), 108 deletions(-) diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json index 54ed49f6..4c41de46 100644 --- a/graalvm-config-dir/reflect-config.json +++ b/graalvm-config-dir/reflect-config.json @@ -761,7 +761,6 @@ "queryAllDeclaredMethods":true, "queryAllDeclaredConstructors":true, "methods":[ - {"name":"date","parameterTypes":[] }, {"name":"description","parameterTypes":[] }, {"name":"image","parameterTypes":[] }, {"name":"title","parameterTypes":[] }, @@ -1041,18 +1040,6 @@ "allDeclaredMethods":true, "allDeclaredConstructors":true }, -{ - "name":"org.asamk.signal.manager.storage.profiles.SignalProfile", - "allDeclaredFields":true, - "allDeclaredMethods":true, - "allDeclaredConstructors":true -}, -{ - "name":"org.asamk.signal.manager.storage.profiles.SignalProfile$Capabilities", - "allDeclaredFields":true, - "allDeclaredMethods":true, - "allDeclaredConstructors":true -}, { "name":"org.asamk.signal.manager.storage.protocol.LegacyJsonIdentityKeyStore$JsonIdentityKeyStoreDeserializer", "methods":[{"name":"","parameterTypes":[] }] @@ -1634,13 +1621,13 @@ "queryAllDeclaredMethods":true }, { - "name":"org.signal.libsignal.zkgroup.profiles.ProfileKey", + "name":"org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential", "allDeclaredFields":true, "queryAllDeclaredMethods":true, "queryAllDeclaredConstructors":true }, { - "name":"org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential", + "name":"org.signal.libsignal.zkgroup.profiles.ProfileKey", "allDeclaredFields":true, "queryAllDeclaredMethods":true, "queryAllDeclaredConstructors":true @@ -1728,6 +1715,7 @@ {"name":"modifyMemberRoles_"}, {"name":"modifyTitle_"}, {"name":"promotePendingMembers_"}, + {"name":"promotePendingPniAciMembers_"}, {"name":"promoteRequestingMembers_"}, {"name":"revision_"}, {"name":"sourceUuid_"} @@ -1798,7 +1786,11 @@ }, { "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$ModifyMemberProfileKeyAction", - "fields":[{"name":"presentation_"}] + "fields":[ + {"name":"presentation_"}, + {"name":"profileKey_"}, + {"name":"userId_"} + ] }, { "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$ModifyMemberRoleAction", @@ -1817,7 +1809,20 @@ }, { "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$PromotePendingMemberAction", - "fields":[{"name":"presentation_"}] + "fields":[ + {"name":"presentation_"}, + {"name":"profileKey_"}, + {"name":"userId_"} + ] +}, +{ + "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$PromotePendingPniAciMemberProfileKeyAction", + "fields":[ + {"name":"pni_"}, + {"name":"presentation_"}, + {"name":"profileKey_"}, + {"name":"userId_"} + ] }, { "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$PromoteRequestingMemberAction", @@ -1946,6 +1951,7 @@ {"name":"newTimer_"}, {"name":"newTitle_"}, {"name":"promotePendingMembers_"}, + {"name":"promotePendingPniAciMembers_"}, {"name":"promoteRequestingMembers_"}, {"name":"revision_"} ] @@ -1967,6 +1973,7 @@ "name":"org.signal.storageservice.protos.groups.local.DecryptedMember", "fields":[ {"name":"joinedAtRevision_"}, + {"name":"pni_"}, {"name":"profileKey_"}, {"name":"role_"}, {"name":"uuid_"} @@ -2142,7 +2149,7 @@ "allDeclaredFields":true, "queryAllDeclaredMethods":true, "queryAllDeclaredConstructors":true, - "methods":[{"name":"","parameterTypes":[] }] + "methods":[{"name":"","parameterTypes":["java.lang.String","java.lang.String"] }] }, { "name":"org.whispersystems.signalservice.api.storage.StorageAuthResponse", diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index f475d567..eb68b368 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -14,7 +14,7 @@ repositories { } dependencies { - implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_51") + implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_52") implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.3") implementation("com.google.protobuf", "protobuf-javalite", "3.11.4") implementation("org.bouncycastle", "bcprov-jdk15on", "1.70") 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 98e1f026..b219830e 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 @@ -46,7 +46,7 @@ class LiveConfig { private final static Optional proxy = Optional.empty(); private final static byte[] zkGroupServerPublicParams = Base64.getDecoder() - .decode("AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXQ=="); + .decode("AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P"); static SignalServiceConfiguration createDefaultServiceConfiguration( final List interceptors 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 8faec0eb..ca2adc92 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 @@ -46,7 +46,7 @@ class StagingConfig { private final static Optional proxy = Optional.empty(); private final static byte[] zkGroupServerPublicParams = Base64.getDecoder() - .decode("ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXQ=="); + .decode("ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUj"); static SignalServiceConfiguration createDefaultServiceConfiguration( final List interceptors 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 9b934580..967c70a2 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 @@ -16,7 +16,7 @@ import org.asamk.signal.manager.util.IOUtils; import org.asamk.signal.manager.util.Utils; import org.signal.libsignal.zkgroup.InvalidInputException; import org.signal.libsignal.zkgroup.VerificationFailedException; -import org.signal.libsignal.zkgroup.auth.AuthCredentialResponse; +import org.signal.libsignal.zkgroup.auth.AuthCredentialWithPniResponse; import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import org.signal.libsignal.zkgroup.groups.GroupSecretParams; import org.signal.libsignal.zkgroup.groups.UuidCiphertext; @@ -41,6 +41,7 @@ import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations; import org.whispersystems.signalservice.api.groupsv2.InvalidGroupStateException; import org.whispersystems.signalservice.api.groupsv2.NotAbleToApplyGroupV2ChangeException; import org.whispersystems.signalservice.api.push.ACI; +import org.whispersystems.signalservice.api.push.PNI; import org.whispersystems.signalservice.api.push.ServiceId; import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; @@ -69,7 +70,7 @@ class GroupV2Helper { private final SignalDependencies dependencies; private final Context context; - private HashMap groupApiCredentials; + private HashMap groupApiCredentials; GroupV2Helper(final Context context) { this.dependencies = context.getDependencies(); @@ -177,7 +178,7 @@ class GroupV2Helper { String name, Set members, byte[] avatar ) { final var profileKeyCredential = context.getProfileHelper() - .getRecipientProfileKeyCredential(context.getAccount().getSelfRecipientId()); + .getExpiringProfileKeyCredential(context.getAccount().getSelfRecipientId()); if (profileKeyCredential == null) { logger.warn("Cannot create a V2 group as self does not have a versioned profile"); return null; @@ -185,7 +186,7 @@ class GroupV2Helper { final var self = new GroupCandidate(getSelfAci().uuid(), Optional.of(profileKeyCredential)); final var memberList = new ArrayList<>(members); - final var credentials = context.getProfileHelper().getRecipientProfileKeyCredential(memberList).stream(); + final var credentials = context.getProfileHelper().getExpiringProfileKeyCredential(memberList).stream(); final var uuids = memberList.stream() .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId().uuid()); var candidates = Utils.zip(uuids, @@ -234,7 +235,7 @@ class GroupV2Helper { GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2); final var memberList = new ArrayList<>(newMembers); - final var credentials = context.getProfileHelper().getRecipientProfileKeyCredential(memberList).stream(); + final var credentials = context.getProfileHelper().getExpiringProfileKeyCredential(memberList).stream(); final var uuids = memberList.stream() .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId().uuid()); var candidates = Utils.zip(uuids, @@ -396,7 +397,7 @@ class GroupV2Helper { logger.debug("Updating own profile key in group " + groupInfoV2.getGroupId().toBase64()); final var selfRecipientId = context.getAccount().getSelfRecipientId(); - final var profileKeyCredential = context.getProfileHelper().getRecipientProfileKeyCredential(selfRecipientId); + final var profileKeyCredential = context.getProfileHelper().getExpiringProfileKeyCredential(selfRecipientId); if (profileKeyCredential == null) { logger.trace("Cannot update profile key as self does not have a versioned profile"); return null; @@ -417,7 +418,7 @@ class GroupV2Helper { final var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams); final var selfRecipientId = context.getAccount().getSelfRecipientId(); - final var profileKeyCredential = context.getProfileHelper().getRecipientProfileKeyCredential(selfRecipientId); + final var profileKeyCredential = context.getProfileHelper().getExpiringProfileKeyCredential(selfRecipientId); if (profileKeyCredential == null) { throw new IOException("Cannot join a V2 group as self does not have a versioned profile"); } @@ -439,7 +440,7 @@ class GroupV2Helper { final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2); final var selfRecipientId = context.getAccount().getSelfRecipientId(); - final var profileKeyCredential = context.getProfileHelper().getRecipientProfileKeyCredential(selfRecipientId); + final var profileKeyCredential = context.getProfileHelper().getExpiringProfileKeyCredential(selfRecipientId); if (profileKeyCredential == null) { throw new IOException("Cannot join a V2 group as self does not have a versioned profile"); } @@ -609,31 +610,49 @@ class GroupV2Helper { return null; } - private static int currentTimeDays() { - return (int) TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis()); + private static long currentDaySeconds() { + return TimeUnit.DAYS.toSeconds(TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis())); } private GroupsV2AuthorizationString getGroupAuthForToday( final GroupSecretParams groupSecretParams ) throws IOException { - final var today = currentTimeDays(); - if (groupApiCredentials == null || !groupApiCredentials.containsKey(today)) { + final var todaySeconds = currentDaySeconds(); + if (groupApiCredentials == null || !groupApiCredentials.containsKey(todaySeconds)) { // Returns credentials for the next 7 days - final var isAci = true; // TODO enable group handling with PNI - groupApiCredentials = dependencies.getGroupsV2Api().getCredentials(today, isAci); + groupApiCredentials = dependencies.getGroupsV2Api().getCredentials(todaySeconds); // TODO cache credentials on disk until they expire } - var authCredentialResponse = groupApiCredentials.get(today); - final var aci = getSelfAci(); try { - return dependencies.getGroupsV2Api() - .getGroupsV2AuthorizationString(aci, today, groupSecretParams, authCredentialResponse); + return getAuthorizationString(groupSecretParams, todaySeconds); + } catch (VerificationFailedException e) { + logger.debug("Group api credentials invalid, renewing and trying again."); + groupApiCredentials.clear(); + } + + groupApiCredentials = dependencies.getGroupsV2Api().getCredentials(todaySeconds); + try { + return getAuthorizationString(groupSecretParams, todaySeconds); } catch (VerificationFailedException e) { throw new IOException(e); } } + private GroupsV2AuthorizationString getAuthorizationString( + final GroupSecretParams groupSecretParams, final long todaySeconds + ) throws VerificationFailedException { + var authCredentialResponse = groupApiCredentials.get(todaySeconds); + final var aci = getSelfAci(); + final var pni = getSelfPni(); + return dependencies.getGroupsV2Api() + .getGroupsV2AuthorizationString(aci, pni, todaySeconds, groupSecretParams, authCredentialResponse); + } + private ACI getSelfAci() { return context.getAccount().getAci(); } + + private PNI getSelfPni() { + return context.getAccount().getPni(); + } } diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java index a3f3b480..f4497e5d 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java @@ -16,8 +16,8 @@ import org.asamk.signal.manager.util.ProfileUtils; import org.asamk.signal.manager.util.Utils; import org.signal.libsignal.protocol.IdentityKey; import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential; import org.signal.libsignal.zkgroup.profiles.ProfileKey; -import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess; @@ -28,6 +28,7 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.exceptions.NotFoundException; import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.services.ProfileService; +import org.whispersystems.signalservice.api.util.ExpiringProfileCredentialUtil; import java.io.File; import java.io.IOException; @@ -106,11 +107,12 @@ public final class ProfileHelper { getRecipientProfiles(recipientIds, true); } - public List getRecipientProfileKeyCredential(List recipientIds) { + public List getExpiringProfileKeyCredential(List recipientIds) { try { account.getRecipientStore().setBulkUpdating(true); final var profileFetches = Flowable.fromIterable(recipientIds) - .filter(recipientId -> account.getProfileStore().getProfileKeyCredential(recipientId) == null) + .filter(recipientId -> !ExpiringProfileCredentialUtil.isValid(account.getProfileStore() + .getExpiringProfileKeyCredential(recipientId))) .map(recipientId -> retrieveProfile(recipientId, SignalServiceProfile.RequestType.PROFILE_AND_CREDENTIAL).onErrorComplete()); Maybe.merge(profileFetches, 10).blockingSubscribe(); @@ -118,12 +120,12 @@ public final class ProfileHelper { account.getRecipientStore().setBulkUpdating(false); } - return recipientIds.stream().map(r -> account.getProfileStore().getProfileKeyCredential(r)).toList(); + return recipientIds.stream().map(r -> account.getProfileStore().getExpiringProfileKeyCredential(r)).toList(); } - public ProfileKeyCredential getRecipientProfileKeyCredential(RecipientId recipientId) { - var profileKeyCredential = account.getProfileStore().getProfileKeyCredential(recipientId); - if (profileKeyCredential != null) { + public ExpiringProfileKeyCredential getExpiringProfileKeyCredential(RecipientId recipientId) { + var profileKeyCredential = account.getProfileStore().getExpiringProfileKeyCredential(recipientId); + if (ExpiringProfileCredentialUtil.isValid(profileKeyCredential)) { return profileKeyCredential; } @@ -134,7 +136,7 @@ public final class ProfileHelper { return null; } - return account.getProfileStore().getProfileKeyCredential(recipientId); + return account.getProfileStore().getExpiringProfileKeyCredential(recipientId); } /** @@ -327,10 +329,11 @@ public final class ProfileHelper { final var encryptedProfile = p.getProfile(); if (requestType == SignalServiceProfile.RequestType.PROFILE_AND_CREDENTIAL - || account.getProfileStore().getProfileKeyCredential(recipientId) == null) { + || !ExpiringProfileCredentialUtil.isValid(account.getProfileStore() + .getExpiringProfileKeyCredential(recipientId))) { logger.trace("Storing profile credential"); - final var profileKeyCredential = p.getProfileKeyCredential().orElse(null); - account.getProfileStore().storeProfileKeyCredential(recipientId, profileKeyCredential); + final var profileKeyCredential = p.getExpiringProfileKeyCredential().orElse(null); + account.getProfileStore().storeExpiringProfileKeyCredential(recipientId, profileKeyCredential); } final var profile = account.getProfileStore().getProfile(recipientId); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java index 5e3e7d04..b797290a 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java @@ -756,7 +756,7 @@ public class SignalAccount implements Closeable { final var legacyProfileStore = jsonProcessor.convertValue(profileStoreNode, LegacyProfileStore.class); for (var profileEntry : legacyProfileStore.getProfileEntries()) { var recipientId = getRecipientResolver().resolveRecipient(profileEntry.getAddress()); - getProfileStore().storeProfileKeyCredential(recipientId, profileEntry.getProfileKeyCredential()); + // Not migrating profile key credential here, it was changed to expiring profile key credentials getProfileStore().storeProfileKey(recipientId, profileEntry.getProfileKey()); final var profile = profileEntry.getProfile(); if (profile != null) { diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java index be275116..99e2980e 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java @@ -11,7 +11,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.asamk.signal.manager.storage.recipients.RecipientAddress; import org.signal.libsignal.zkgroup.InvalidInputException; import org.signal.libsignal.zkgroup.profiles.ProfileKey; -import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; import org.whispersystems.signalservice.api.util.UuidUtil; import java.io.IOException; @@ -51,21 +50,9 @@ public class LegacyProfileStore { profileKey = new ProfileKey(Base64.getDecoder().decode(entry.get("profileKey").asText())); } catch (InvalidInputException ignored) { } - ProfileKeyCredential profileKeyCredential = null; - if (entry.hasNonNull("profileKeyCredential")) { - try { - profileKeyCredential = new ProfileKeyCredential(Base64.getDecoder() - .decode(entry.get("profileKeyCredential").asText())); - } catch (Throwable ignored) { - } - } var lastUpdateTimestamp = entry.get("lastUpdateTimestamp").asLong(); var profile = jsonProcessor.treeToValue(entry.get("profile"), LegacySignalProfile.class); - profileEntries.add(new LegacySignalProfileEntry(address, - profileKey, - lastUpdateTimestamp, - profile, - profileKeyCredential)); + profileEntries.add(new LegacySignalProfileEntry(address, profileKey, lastUpdateTimestamp, profile)); } } diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java index 609d2f54..3acad2b1 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java @@ -2,7 +2,6 @@ package org.asamk.signal.manager.storage.profiles; import org.asamk.signal.manager.storage.recipients.RecipientAddress; import org.signal.libsignal.zkgroup.profiles.ProfileKey; -import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; public class LegacySignalProfileEntry { @@ -14,20 +13,16 @@ public class LegacySignalProfileEntry { private final LegacySignalProfile profile; - private final ProfileKeyCredential profileKeyCredential; - public LegacySignalProfileEntry( final RecipientAddress address, final ProfileKey profileKey, final long lastUpdateTimestamp, - final LegacySignalProfile profile, - final ProfileKeyCredential profileKeyCredential + final LegacySignalProfile profile ) { this.address = address; this.profileKey = profileKey; this.lastUpdateTimestamp = lastUpdateTimestamp; this.profile = profile; - this.profileKeyCredential = profileKeyCredential; } public RecipientAddress getAddress() { @@ -45,8 +40,4 @@ public class LegacySignalProfileEntry { public LegacySignalProfile getProfile() { return profile; } - - public ProfileKeyCredential getProfileKeyCredential() { - return profileKeyCredential; - } } diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java index df65db0d..acdcbb18 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java @@ -2,8 +2,8 @@ package org.asamk.signal.manager.storage.profiles; import org.asamk.signal.manager.storage.recipients.Profile; import org.asamk.signal.manager.storage.recipients.RecipientId; +import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential; import org.signal.libsignal.zkgroup.profiles.ProfileKey; -import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; public interface ProfileStore { @@ -11,7 +11,7 @@ public interface ProfileStore { ProfileKey getProfileKey(RecipientId recipientId); - ProfileKeyCredential getProfileKeyCredential(RecipientId recipientId); + ExpiringProfileKeyCredential getExpiringProfileKeyCredential(RecipientId recipientId); void storeProfile(RecipientId recipientId, Profile profile); @@ -19,5 +19,8 @@ public interface ProfileStore { void storeProfileKey(RecipientId recipientId, ProfileKey profileKey); - void storeProfileKeyCredential(RecipientId recipientId, ProfileKeyCredential profileKeyCredential); + void storeExpiringProfileKeyCredential( + RecipientId recipientId, + ExpiringProfileKeyCredential expiringProfileKeyCredential + ); } diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java index d5c68315..2d3c8430 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java @@ -1,7 +1,7 @@ package org.asamk.signal.manager.storage.recipients; +import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential; import org.signal.libsignal.zkgroup.profiles.ProfileKey; -import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; import java.util.Objects; @@ -15,7 +15,7 @@ public class Recipient { private final ProfileKey profileKey; - private final ProfileKeyCredential profileKeyCredential; + private final ExpiringProfileKeyCredential expiringProfileKeyCredential; private final Profile profile; @@ -24,14 +24,14 @@ public class Recipient { final RecipientAddress address, final Contact contact, final ProfileKey profileKey, - final ProfileKeyCredential profileKeyCredential, + final ExpiringProfileKeyCredential expiringProfileKeyCredential, final Profile profile ) { this.recipientId = recipientId; this.address = address; this.contact = contact; this.profileKey = profileKey; - this.profileKeyCredential = profileKeyCredential; + this.expiringProfileKeyCredential = expiringProfileKeyCredential; this.profile = profile; } @@ -40,7 +40,7 @@ public class Recipient { address = builder.address; contact = builder.contact; profileKey = builder.profileKey; - profileKeyCredential = builder.profileKeyCredential; + expiringProfileKeyCredential = builder.expiringProfileKeyCredential1; profile = builder.profile; } @@ -54,7 +54,7 @@ public class Recipient { builder.address = copy.getAddress(); builder.contact = copy.getContact(); builder.profileKey = copy.getProfileKey(); - builder.profileKeyCredential = copy.getProfileKeyCredential(); + builder.expiringProfileKeyCredential1 = copy.getExpiringProfileKeyCredential(); builder.profile = copy.getProfile(); return builder; } @@ -75,8 +75,8 @@ public class Recipient { return profileKey; } - public ProfileKeyCredential getProfileKeyCredential() { - return profileKeyCredential; + public ExpiringProfileKeyCredential getExpiringProfileKeyCredential() { + return expiringProfileKeyCredential; } public Profile getProfile() { @@ -92,13 +92,13 @@ public class Recipient { && Objects.equals(address, recipient.address) && Objects.equals(contact, recipient.contact) && Objects.equals(profileKey, recipient.profileKey) - && Objects.equals(profileKeyCredential, recipient.profileKeyCredential) + && Objects.equals(expiringProfileKeyCredential, recipient.expiringProfileKeyCredential) && Objects.equals(profile, recipient.profile); } @Override public int hashCode() { - return Objects.hash(recipientId, address, contact, profileKey, profileKeyCredential, profile); + return Objects.hash(recipientId, address, contact, profileKey, expiringProfileKeyCredential, profile); } public static final class Builder { @@ -107,7 +107,7 @@ public class Recipient { private RecipientAddress address; private Contact contact; private ProfileKey profileKey; - private ProfileKeyCredential profileKeyCredential; + private ExpiringProfileKeyCredential expiringProfileKeyCredential1; private Profile profile; private Builder() { @@ -133,8 +133,8 @@ public class Recipient { return this; } - public Builder withProfileKeyCredential(final ProfileKeyCredential val) { - profileKeyCredential = val; + public Builder withExpiringProfileKeyCredential(final ExpiringProfileKeyCredential val) { + expiringProfileKeyCredential1 = val; return this; } diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java index cc9db862..7244a96c 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java @@ -8,8 +8,8 @@ import org.asamk.signal.manager.storage.Utils; import org.asamk.signal.manager.storage.contacts.ContactsStore; import org.asamk.signal.manager.storage.profiles.ProfileStore; import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential; import org.signal.libsignal.zkgroup.profiles.ProfileKey; -import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.whispersystems.signalservice.api.push.ACI; @@ -89,11 +89,11 @@ public class RecipientStore implements RecipientResolver, RecipientTrustedResolv } } - ProfileKeyCredential profileKeyCredential = null; - if (r.profileKeyCredential != null) { + ExpiringProfileKeyCredential expiringProfileKeyCredential = null; + if (r.expiringProfileKeyCredential != null) { try { - profileKeyCredential = new ProfileKeyCredential(Base64.getDecoder() - .decode(r.profileKeyCredential)); + expiringProfileKeyCredential = new ExpiringProfileKeyCredential(Base64.getDecoder() + .decode(r.expiringProfileKeyCredential)); } catch (Throwable ignored) { } } @@ -116,7 +116,7 @@ public class RecipientStore implements RecipientResolver, RecipientTrustedResolv .collect(Collectors.toSet())); } - return new Recipient(recipientId, address, contact, profileKey, profileKeyCredential, profile); + return new Recipient(recipientId, address, contact, profileKey, expiringProfileKeyCredential, profile); }).collect(Collectors.toMap(Recipient::getRecipientId, r -> r)); recipientStore.addRecipients(recipients); @@ -333,9 +333,9 @@ public class RecipientStore implements RecipientResolver, RecipientTrustedResolv } @Override - public ProfileKeyCredential getProfileKeyCredential(final RecipientId recipientId) { + public ExpiringProfileKeyCredential getExpiringProfileKeyCredential(final RecipientId recipientId) { final var recipient = getRecipient(recipientId); - return recipient == null ? null : recipient.getProfileKeyCredential(); + return recipient == null ? null : recipient.getExpiringProfileKeyCredential(); } @Override @@ -371,7 +371,7 @@ public class RecipientStore implements RecipientResolver, RecipientTrustedResolv final var builder = Recipient.newBuilder(recipient) .withProfileKey(profileKey) - .withProfileKeyCredential(null); + .withExpiringProfileKeyCredential(null); if (resetProfile) { builder.withProfile(recipient.getProfile() == null ? null @@ -383,11 +383,15 @@ public class RecipientStore implements RecipientResolver, RecipientTrustedResolv } @Override - public void storeProfileKeyCredential(RecipientId recipientId, final ProfileKeyCredential profileKeyCredential) { + public void storeExpiringProfileKeyCredential( + RecipientId recipientId, final ExpiringProfileKeyCredential expiringProfileKeyCredential + ) { synchronized (recipients) { final var recipient = recipients.get(recipientId); storeRecipientLocked(recipientId, - Recipient.newBuilder(recipient).withProfileKeyCredential(profileKeyCredential).build()); + Recipient.newBuilder(recipient) + .withExpiringProfileKeyCredential(expiringProfileKeyCredential) + .build()); } } @@ -535,9 +539,9 @@ public class RecipientStore implements RecipientResolver, RecipientTrustedResolv recipient.getProfileKey() != null ? recipient.getProfileKey() : toBeMergedRecipient.getProfileKey(), - recipient.getProfileKeyCredential() != null - ? recipient.getProfileKeyCredential() - : toBeMergedRecipient.getProfileKeyCredential(), + recipient.getExpiringProfileKeyCredential() != null + ? recipient.getExpiringProfileKeyCredential() + : toBeMergedRecipient.getExpiringProfileKeyCredential(), recipient.getProfile() != null ? recipient.getProfile() : toBeMergedRecipient.getProfile())); recipients.remove(toBeMergedRecipientId); recipientsMerged.put(toBeMergedRecipientId.id(), recipientId.id()); @@ -607,9 +611,9 @@ public class RecipientStore implements RecipientResolver, RecipientTrustedResolv recipient.getProfileKey() == null ? null : base64.encodeToString(recipient.getProfileKey().serialize()), - recipient.getProfileKeyCredential() == null + recipient.getExpiringProfileKeyCredential() == null ? null - : base64.encodeToString(recipient.getProfileKeyCredential().serialize()), + : base64.encodeToString(recipient.getExpiringProfileKeyCredential().serialize()), contact, profile); }).toList(), lastId); @@ -634,7 +638,7 @@ public class RecipientStore implements RecipientResolver, RecipientTrustedResolv String number, String uuid, String profileKey, - String profileKeyCredential, + String expiringProfileKeyCredential, Storage.Recipient.Contact contact, Storage.Recipient.Profile profile ) { From 1cc21834e2429a5efa27b1766dcff9d6b3151ddf Mon Sep 17 00:00:00 2001 From: AsamK Date: Wed, 27 Jul 2022 18:20:07 +0200 Subject: [PATCH 038/802] Workaround possible GraalVM issue Fixes #987 --- src/main/java/org/asamk/signal/util/IOUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/asamk/signal/util/IOUtils.java b/src/main/java/org/asamk/signal/util/IOUtils.java index 9f220946..2d4ffd8e 100644 --- a/src/main/java/org/asamk/signal/util/IOUtils.java +++ b/src/main/java/org/asamk/signal/util/IOUtils.java @@ -125,7 +125,7 @@ public class IOUtils { UnixDomainPrincipal principal = null; try { principal = channel.getOption(ExtendedSocketOptions.SO_PEERCRED); - } catch (UnsupportedOperationException ignored) { + } catch (UnsupportedOperationException | NoClassDefFoundError ignored) { } return principal; } From 7a427372872580e6d4ce740e668101dbc2a1f536 Mon Sep 17 00:00:00 2001 From: AsamK Date: Wed, 27 Jul 2022 20:58:58 +0200 Subject: [PATCH 039/802] Workaround possible GraalVM issue --- src/main/java/org/asamk/signal/util/IOUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/asamk/signal/util/IOUtils.java b/src/main/java/org/asamk/signal/util/IOUtils.java index 2d4ffd8e..9e0d6c3e 100644 --- a/src/main/java/org/asamk/signal/util/IOUtils.java +++ b/src/main/java/org/asamk/signal/util/IOUtils.java @@ -121,13 +121,13 @@ public class IOUtils { return socketAddress; } - public static UnixDomainPrincipal getUnixDomainPrincipal(final SocketChannel channel) throws IOException { + public static String getUnixDomainPrincipal(final SocketChannel channel) throws IOException { UnixDomainPrincipal principal = null; try { principal = channel.getOption(ExtendedSocketOptions.SO_PEERCRED); } catch (UnsupportedOperationException | NoClassDefFoundError ignored) { } - return principal; + return principal == null ? null : principal.toString(); } public static ServerSocketChannel bindSocket(final SocketAddress address) throws IOErrorException { From d69b9ea394dc4ac8298139480700611316bdb444 Mon Sep 17 00:00:00 2001 From: AsamK Date: Thu, 28 Jul 2022 16:57:49 +0200 Subject: [PATCH 040/802] Update KBS enclave Fixes #985 --- .../java/org/asamk/signal/manager/config/LiveConfig.java | 6 +++--- .../java/org/asamk/signal/manager/config/StagingConfig.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 b219830e..41eab6cf 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 @@ -28,10 +28,10 @@ class LiveConfig { .decode("BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF"); private final static String CDS_MRENCLAVE = "c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15"; - private final static String KEY_BACKUP_ENCLAVE_NAME = "fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe"; + private final static String KEY_BACKUP_ENCLAVE_NAME = "0cedba03535b41b67729ce9924185f831d7767928a1d1689acb689bc079c375f"; private final static byte[] KEY_BACKUP_SERVICE_ID = Hex.decode( - "fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe"); - private final static String KEY_BACKUP_MRENCLAVE = "a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87"; + "187d2739d22be65e74b65f0055e74d31310e4267e5fac2b1246cc8beba81af39"); + private final static String KEY_BACKUP_MRENCLAVE = "ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba"; private final static String URL = "https://chat.signal.org"; private final static String CDN_URL = "https://cdn.signal.org"; 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 ca2adc92..771e9348 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 @@ -28,10 +28,10 @@ class StagingConfig { .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx"); private final static String CDS_MRENCLAVE = "c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15"; - private final static String KEY_BACKUP_ENCLAVE_NAME = "823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9"; + private final static String KEY_BACKUP_ENCLAVE_NAME = "dd6f66d397d9e8cf6ec6db238e59a7be078dd50e9715427b9c89b409ffe53f99"; private final static byte[] KEY_BACKUP_SERVICE_ID = Hex.decode( - "16b94ac6d2b7f7b9d72928f36d798dbb35ed32e7bb14c42b4301ad0344b46f29"); - private final static String KEY_BACKUP_MRENCLAVE = "a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87"; + "4200003414528c151e2dccafbc87aa6d3d66a5eb8f8c05979a6e97cb33cd493a"); + private final static String KEY_BACKUP_MRENCLAVE = "ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba"; private final static String URL = "https://chat.staging.signal.org"; private final static String CDN_URL = "https://cdn-staging.signal.org"; From d8a5244a8861cde08c954e128e3267e705e6ae5f Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 30 Jul 2022 14:56:17 +0200 Subject: [PATCH 041/802] Bump version to 0.10.10 --- CHANGELOG.md | 5 +++++ build.gradle.kts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ff851c8..5d70bb27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## [Unreleased] +## [0.10.10] - 2022-07-30 +### Fixed +- Fix setPin/removePin commands which broke due to server side changes +- Workaround GraalVM 22.2.0 issue with daemon connection + ## [0.10.9] - 2022-07-16 ### Changed diff --git a/build.gradle.kts b/build.gradle.kts index 0c5ca9b2..35960cbc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { id("org.graalvm.buildtools.native") version "0.9.13" } -version = "0.10.9" +version = "0.10.10" java { sourceCompatibility = JavaVersion.VERSION_17 From 525f04d44606cd11d0bf15b2bed7ec2dc1bff500 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 30 Jul 2022 16:52:13 +0200 Subject: [PATCH 042/802] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d70bb27..d2083b5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## [Unreleased] ## [0.10.10] - 2022-07-30 +**Attention**: Now requires native libsignal-client version 0.18.1 + ### Fixed - Fix setPin/removePin commands which broke due to server side changes - Workaround GraalVM 22.2.0 issue with daemon connection From 597ac9b5042bec57c845b4ca08ce935d84ef63d4 Mon Sep 17 00:00:00 2001 From: Sebastian Scheibner Date: Sat, 30 Jul 2022 16:57:48 +0200 Subject: [PATCH 043/802] Update FUNDING.yml --- FUNDING.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/FUNDING.yml b/FUNDING.yml index 909168ff..c2420609 100644 --- a/FUNDING.yml +++ b/FUNDING.yml @@ -1,3 +1,4 @@ +github: AsamK liberapay: asamk ko_fi: asamk #bitcoin: bc1qykae53fry8a8ycgdzgv0rlxfc959hmmllvz698 From 81e36d4f9b690df2c39d772f9b3e99422329ff27 Mon Sep 17 00:00:00 2001 From: AsamK Date: Tue, 2 Aug 2022 23:20:26 +0200 Subject: [PATCH 044/802] Update libsignal-service-java --- graalvm-config-dir/reflect-config.json | 4 ++- lib/build.gradle.kts | 2 +- .../signal/manager/helper/SendHelper.java | 32 +++++++++++++------ .../storage/sendLog/MessageSendLogEntry.java | 2 +- .../storage/sendLog/MessageSendLogStore.java | 16 ++++++---- .../manager/util/MessageCacheUtils.java | 13 ++++++-- 6 files changed, 47 insertions(+), 22 deletions(-) diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json index 4c41de46..c223851b 100644 --- a/graalvm-config-dir/reflect-config.json +++ b/graalvm-config-dir/reflect-config.json @@ -2806,7 +2806,8 @@ {"name":"sourceE164_"}, {"name":"sourceUuid_"}, {"name":"timestamp_"}, - {"name":"type_"} + {"name":"type_"}, + {"name":"urgent_"} ] }, { @@ -3052,6 +3053,7 @@ "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent", "fields":[ {"name":"bitField0_"}, + {"name":"destinationE164_"}, {"name":"destinationUuid_"}, {"name":"expirationStartTimestamp_"}, {"name":"isRecipientUpdate_"}, diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index eb68b368..70de8dd7 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -14,7 +14,7 @@ repositories { } dependencies { - implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_52") + implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_53") implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.3") implementation("com.google.protobuf", "protobuf-javalite", "3.11.4") implementation("org.bouncycastle", "bcprov-jdk15on", "1.70") diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java index f71133ae..717db812 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java @@ -123,7 +123,7 @@ public class SendHelper { (messageSender, address, unidentifiedAccess) -> messageSender.sendReceipt(address, unidentifiedAccess, receiptMessage)); - messageSendLogStore.insertIfPossible(receiptMessage.getWhen(), result, ContentHint.IMPLICIT); + messageSendLogStore.insertIfPossible(receiptMessage.getWhen(), result, ContentHint.IMPLICIT, false); handleSendMessageResult(result); return result; } @@ -140,7 +140,8 @@ public class SendHelper { unidentifiedAccess, ContentHint.IMPLICIT, message, - SignalServiceMessageSender.IndividualSendEvents.EMPTY)); + SignalServiceMessageSender.IndividualSendEvents.EMPTY, + false)); } public SendMessageResult sendRetryReceipt( @@ -237,7 +238,8 @@ public class SendHelper { timestamp, messageSendLogEntry.content(), messageSendLogEntry.contentHint(), - Optional.empty())); + Optional.empty(), + messageSendLogEntry.urgent())); } final var groupId = messageSendLogEntry.groupId().get(); @@ -266,7 +268,8 @@ public class SendHelper { timestamp, contentToSend, messageSendLogEntry.contentHint(), - Optional.of(group.getGroupId().serialize()))); + Optional.of(group.getGroupId().serialize()), + messageSendLogEntry.urgent())); if (result.isSuccess()) { final var address = context.getRecipientHelper().resolveSignalServiceAddress(recipientId); @@ -315,6 +318,7 @@ public class SendHelper { final var messageSendLogStore = account.getMessageSendLogStore(); final AtomicLong entryId = new AtomicLong(-1); + final var urgent = true; final LegacySenderHandler legacySender = (recipients, unidentifiedAccess, isRecipientUpdate) -> messageSender.sendDataMessage( recipients, unidentifiedAccess, @@ -328,14 +332,16 @@ public class SendHelper { if (entryId.get() == -1) { final var newId = messageSendLogStore.insertIfPossible(message.getTimestamp(), sendResult, - contentHint); + contentHint, + urgent); entryId.set(newId); } else { messageSendLogStore.addRecipientToExistingEntryIfPossible(entryId.get(), sendResult); } } }, - () -> false); + () -> false, + urgent); final SenderKeySenderHandler senderKeySender = (distId, recipients, unidentifiedAccess, isRecipientUpdate) -> { final var res = messageSender.sendGroupDataMessage(distId, recipients, @@ -343,10 +349,14 @@ public class SendHelper { isRecipientUpdate, contentHint, message, - SignalServiceMessageSender.SenderKeyGroupEvents.EMPTY); + SignalServiceMessageSender.SenderKeyGroupEvents.EMPTY, + urgent); synchronized (entryId) { if (entryId.get() == -1) { - final var newId = messageSendLogStore.insertIfPossible(message.getTimestamp(), res, contentHint); + final var newId = messageSendLogStore.insertIfPossible(message.getTimestamp(), + res, + contentHint, + urgent); entryId.set(newId); } else { messageSendLogStore.addRecipientToExistingEntryIfPossible(entryId.get(), res); @@ -582,13 +592,15 @@ public class SendHelper { SignalServiceDataMessage message, RecipientId recipientId ) { final var messageSendLogStore = account.getMessageSendLogStore(); + final var urgent = true; final var result = handleSendMessage(recipientId, (messageSender, address, unidentifiedAccess) -> messageSender.sendDataMessage(address, unidentifiedAccess, ContentHint.RESENDABLE, message, - SignalServiceMessageSender.IndividualSendEvents.EMPTY)); - messageSendLogStore.insertIfPossible(message.getTimestamp(), result, ContentHint.RESENDABLE); + SignalServiceMessageSender.IndividualSendEvents.EMPTY, + urgent)); + messageSendLogStore.insertIfPossible(message.getTimestamp(), result, ContentHint.RESENDABLE, urgent); handleSendMessageResult(result); return result; } diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogEntry.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogEntry.java index 31a4252a..67ca5cd4 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogEntry.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogEntry.java @@ -7,5 +7,5 @@ import org.whispersystems.signalservice.internal.push.SignalServiceProtos; import java.util.Optional; public record MessageSendLogEntry( - Optional groupId, SignalServiceProtos.Content content, ContentHint contentHint + Optional groupId, SignalServiceProtos.Content content, ContentHint contentHint, boolean urgent ) {} diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java index c893f09c..b53c5ac0 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java @@ -117,7 +117,8 @@ public class MessageSendLogStore implements AutoCloseable { return null; } final var contentHint = ContentHint.fromType(resultSet.getInt("content_hint")); - return new MessageSendLogEntry(groupId, content, contentHint); + final var urgent = true; // TODO + return new MessageSendLogEntry(groupId, content, contentHint, urgent); })) { return result.filter(Objects::nonNull) .filter(e -> !isSenderKey || e.groupId().isPresent()) @@ -131,7 +132,7 @@ public class MessageSendLogStore implements AutoCloseable { } public long insertIfPossible( - long sentTimestamp, SendMessageResult sendMessageResult, ContentHint contentHint + long sentTimestamp, SendMessageResult sendMessageResult, ContentHint contentHint, boolean urgent ) { final RecipientDevices recipientDevice = getRecipientDevices(sendMessageResult); if (recipientDevice == null) { @@ -141,11 +142,12 @@ public class MessageSendLogStore implements AutoCloseable { return insert(List.of(recipientDevice), sentTimestamp, sendMessageResult.getSuccess().getContent().get(), - contentHint); + contentHint, + urgent); } public long insertIfPossible( - long sentTimestamp, List sendMessageResults, ContentHint contentHint + long sentTimestamp, List sendMessageResults, ContentHint contentHint, boolean urgent ) { final var recipientDevices = sendMessageResults.stream() .map(this::getRecipientDevices) @@ -161,7 +163,7 @@ public class MessageSendLogStore implements AutoCloseable { .findFirst() .get(); - return insert(recipientDevices, sentTimestamp, content, contentHint); + return insert(recipientDevices, sentTimestamp, content, contentHint, urgent); } public void addRecipientToExistingEntryIfPossible(final long contentId, final SendMessageResult sendMessageResult) { @@ -272,10 +274,12 @@ public class MessageSendLogStore implements AutoCloseable { final List recipientDevices, final long sentTimestamp, final SignalServiceProtos.Content content, - final ContentHint contentHint + final ContentHint contentHint, + final boolean urgent ) { byte[] groupId = getGroupId(content); + // TODO store urgent final var sql = """ INSERT INTO %s (timestamp, group_id, content, content_hint) VALUES (?,?,?,?) diff --git a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java index 347e3d81..43badfa6 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java @@ -19,7 +19,8 @@ public class MessageCacheUtils { try (var f = new FileInputStream(file)) { var in = new DataInputStream(f); var version = in.readInt(); - if (version > 5) { + if (version > 6) { + // Unsupported envelope version return null; } var type = in.readInt(); @@ -63,6 +64,10 @@ public class MessageCacheUtils { if (version >= 4) { serverDeliveredTimestamp = in.readLong(); } + boolean isUrgent = true; + if (version >= 6) { + isUrgent = in.readBoolean(); + } Optional addressOptional = sourceServiceId == null ? Optional.empty() : Optional.of(new SignalServiceAddress(sourceServiceId, source)); @@ -75,14 +80,15 @@ public class MessageCacheUtils { serverReceivedTimestamp, serverDeliveredTimestamp, uuid, - destinationUuid == null ? UuidUtil.UNKNOWN_UUID.toString() : destinationUuid); + destinationUuid == null ? UuidUtil.UNKNOWN_UUID.toString() : destinationUuid, + isUrgent); } } public static void storeEnvelope(SignalServiceEnvelope envelope, File file) throws IOException { try (var f = new FileOutputStream(file)) { try (var out = new DataOutputStream(f)) { - out.writeInt(5); // version + out.writeInt(6); // version out.writeInt(envelope.getType()); out.writeUTF(envelope.getSourceE164().isPresent() ? envelope.getSourceE164().get() : ""); out.writeUTF(envelope.getSourceUuid().isPresent() ? envelope.getSourceUuid().get() : ""); @@ -105,6 +111,7 @@ public class MessageCacheUtils { var uuid = envelope.getServerGuid(); out.writeUTF(uuid == null ? "" : uuid); out.writeLong(envelope.getServerDeliveredTimestamp()); + out.writeBoolean(envelope.isUrgent()); } } } From a593051512b716ed3cc42a1a7b69d49a459352ed Mon Sep 17 00:00:00 2001 From: AsamK Date: Mon, 8 Aug 2022 18:12:30 +0200 Subject: [PATCH 045/802] Implement receive handling for story messages --- graalvm-config-dir/reflect-config.json | 82 ++++++++++++++ .../org/asamk/signal/manager/api/Color.java | 24 ++++ .../signal/manager/api/MessageEnvelope.java | 103 +++++++++++++++++- .../helper/IncomingMessageHandler.java | 103 ++++++++++++++---- .../asamk/signal/ReceiveMessageHandler.java | 42 +++++++ .../asamk/signal/dbus/DbusManagerImpl.java | 8 +- .../asamk/signal/json/JsonDataMessage.java | 9 +- .../signal/json/JsonMessageEnvelope.java | 3 + .../asamk/signal/json/JsonStoryContext.java | 16 +++ .../asamk/signal/json/JsonStoryMessage.java | 52 +++++++++ .../asamk/signal/json/JsonSyncMessage.java | 22 +--- .../signal/json/JsonSyncStoryMessage.java | 26 +++++ 12 files changed, 443 insertions(+), 47 deletions(-) create mode 100644 lib/src/main/java/org/asamk/signal/manager/api/Color.java create mode 100644 src/main/java/org/asamk/signal/json/JsonStoryContext.java create mode 100644 src/main/java/org/asamk/signal/json/JsonStoryMessage.java create mode 100644 src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json index c223851b..389c947c 100644 --- a/graalvm-config-dir/reflect-config.json +++ b/graalvm-config-dir/reflect-config.json @@ -837,6 +837,55 @@ "allDeclaredMethods":true, "allDeclaredConstructors":true }, +{ + "name":"org.asamk.signal.json.JsonStoryContext", + "allDeclaredFields":true, + "queryAllDeclaredMethods":true, + "queryAllDeclaredConstructors":true, + "methods":[ + {"name":"authorNumber","parameterTypes":[] }, + {"name":"authorUuid","parameterTypes":[] }, + {"name":"sentTimestamp","parameterTypes":[] } + ] +}, +{ + "name":"org.asamk.signal.json.JsonStoryMessage", + "allDeclaredFields":true, + "queryAllDeclaredMethods":true, + "queryAllDeclaredConstructors":true, + "methods":[ + {"name":"allowsReplies","parameterTypes":[] }, + {"name":"fileAttachment","parameterTypes":[] }, + {"name":"groupId","parameterTypes":[] }, + {"name":"textAttachment","parameterTypes":[] } + ] +}, +{ + "name":"org.asamk.signal.json.JsonStoryMessage$TextAttachment", + "allDeclaredFields":true, + "queryAllDeclaredMethods":true, + "queryAllDeclaredConstructors":true, + "methods":[ + {"name":"backgroundColor","parameterTypes":[] }, + {"name":"backgroundGradient","parameterTypes":[] }, + {"name":"preview","parameterTypes":[] }, + {"name":"style","parameterTypes":[] }, + {"name":"text","parameterTypes":[] }, + {"name":"textBackgroundColor","parameterTypes":[] }, + {"name":"textForegroundColor","parameterTypes":[] } + ] +}, +{ + "name":"org.asamk.signal.json.JsonStoryMessage$TextAttachment$Gradient", + "allDeclaredFields":true, + "queryAllDeclaredMethods":true, + "queryAllDeclaredConstructors":true, + "methods":[ + {"name":"angle","parameterTypes":[] }, + {"name":"endColor","parameterTypes":[] }, + {"name":"startColor","parameterTypes":[] } + ] +}, { "name":"org.asamk.signal.json.JsonSyncDataMessage", "allDeclaredFields":true, @@ -860,6 +909,17 @@ "allDeclaredMethods":true, "allDeclaredConstructors":true }, +{ + "name":"org.asamk.signal.json.JsonSyncStoryMessage", + "allDeclaredFields":true, + "queryAllDeclaredMethods":true, + "queryAllDeclaredConstructors":true, + "methods":[ + {"name":"dataMessage","parameterTypes":[] }, + {"name":"destinationNumber","parameterTypes":[] }, + {"name":"destinationUuid","parameterTypes":[] } + ] +}, { "name":"org.asamk.signal.json.JsonTypingMessage", "allDeclaredFields":true, @@ -3106,6 +3166,28 @@ {"name":"timestamp_"} ] }, +{ + "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$TextAttachment", + "fields":[ + {"name":"backgroundCase_"}, + {"name":"background_"}, + {"name":"bitField0_"}, + {"name":"preview_"}, + {"name":"textBackgroundColor_"}, + {"name":"textForegroundColor_"}, + {"name":"textStyle_"}, + {"name":"text_"} + ] +}, +{ + "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$TextAttachment$Gradient", + "fields":[ + {"name":"angle_"}, + {"name":"bitField0_"}, + {"name":"endColor_"}, + {"name":"startColor_"} + ] +}, { "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$TypingMessage", "fields":[ diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Color.java b/lib/src/main/java/org/asamk/signal/manager/api/Color.java new file mode 100644 index 00000000..11f7deb0 --- /dev/null +++ b/lib/src/main/java/org/asamk/signal/manager/api/Color.java @@ -0,0 +1,24 @@ +package org.asamk.signal.manager.api; + +public record Color(int color) { + + public int alpha() { + return color >>> 24; + } + + public int red() { + return (color >> 16) & 0xFF; + } + + public int green() { + return (color >> 8) & 0xFF; + } + + public int blue() { + return color & 0xFF; + } + + public String toHexColor() { + return String.format("#%08x", color); + } +} diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java index d2164e91..a3546a4b 100644 --- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java +++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java @@ -15,6 +15,8 @@ import org.whispersystems.signalservice.api.messages.SignalServiceGroup; import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext; import org.whispersystems.signalservice.api.messages.SignalServicePreview; import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage; +import org.whispersystems.signalservice.api.messages.SignalServiceStoryMessage; +import org.whispersystems.signalservice.api.messages.SignalServiceTextAttachment; import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage; import org.whispersystems.signalservice.api.messages.calls.AnswerMessage; import org.whispersystems.signalservice.api.messages.calls.BusyMessage; @@ -49,7 +51,8 @@ public record MessageEnvelope( Optional typing, Optional data, Optional sync, - Optional call + Optional call, + Optional story ) { public record Receipt(long when, Type type, List timestamps) { @@ -94,6 +97,7 @@ public record MessageEnvelope( public record Data( long timestamp, Optional groupContext, + Optional storyContext, Optional groupCallUpdate, Optional body, int expiresInSeconds, @@ -121,6 +125,10 @@ public record MessageEnvelope( ) { return new Data(dataMessage.getTimestamp(), dataMessage.getGroupContext().map(GroupContext::from), + dataMessage.getStoryContext() + .map((SignalServiceDataMessage.StoryContext storyContext) -> StoryContext.from(storyContext, + recipientResolver, + addressResolver)), dataMessage.getGroupCallUpdate().map(GroupCallUpdate::from), dataMessage.getBody(), dataMessage.getExpiresInSeconds(), @@ -168,6 +176,18 @@ public record MessageEnvelope( } } + public record StoryContext(RecipientAddress author, long sentTimestamp) { + + static StoryContext from( + SignalServiceDataMessage.StoryContext storyContext, + RecipientResolver recipientResolver, + RecipientAddressResolver addressResolver + ) { + return new StoryContext(addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient( + storyContext.getAuthorServiceId())), storyContext.getSentTimestamp()); + } + } + public record GroupCallUpdate(String eraId) { static GroupCallUpdate from(SignalServiceDataMessage.GroupCallUpdate groupCallUpdate) { @@ -519,7 +539,8 @@ public record MessageEnvelope( long expirationStartTimestamp, Optional destination, Set recipients, - Optional message + Optional message, + Optional story ) { static Sent from( @@ -537,7 +558,8 @@ public record MessageEnvelope( .map(d -> addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(d))) .collect(Collectors.toSet()), sentMessage.getDataMessage() - .map(message -> Data.from(message, recipientResolver, addressResolver, fileProvider))); + .map(message -> Data.from(message, recipientResolver, addressResolver, fileProvider)), + sentMessage.getStoryMessage().map(s -> Story.from(s, fileProvider))); } } @@ -757,6 +779,75 @@ public record MessageEnvelope( } } + public record Story( + boolean allowsReplies, + Optional groupId, + Optional fileAttachment, + Optional textAttachment + ) { + + public static Story from( + SignalServiceStoryMessage storyMessage, final AttachmentFileProvider fileProvider + ) { + return new Story(storyMessage.getAllowsReplies().orElse(false), + storyMessage.getGroupContext().map(c -> GroupUtils.getGroupIdV2(c.getMasterKey())), + storyMessage.getFileAttachment().map(f -> Data.Attachment.from(f, fileProvider)), + storyMessage.getTextAttachment().map(t -> TextAttachment.from(t, fileProvider))); + } + + public record TextAttachment( + Optional text, + Optional