webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 02:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Store envelopes using envelope proto

Browse source
This commit is contained in:
AsamK 2023-04-23 19:39:36 +02:00
parent f6aebb5917
commit 60ad582012
1 changed files with 75 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

161
lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
View file

@ -6,6 +6,7 @@ import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
import org.whispersystems.signalservice.api.push.ServiceId;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.util.UuidUtil;
import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@ -19,7 +20,7 @@ public class MessageCacheUtils {
private final static Logger logger = LoggerFactory.getLogger(MessageCacheUtils.class);
final static int CURRENT_VERSION = 8;
final static int CURRENT_VERSION = 9;
public static SignalServiceEnvelope loadEnvelope(File file) throws IOException {
try (var f = new FileInputStream(file)) {
@ -31,74 +32,80 @@ public class MessageCacheUtils {
// Unsupported envelope version
return null;
}
var type = in.readInt();
var source = in.readUTF();
ServiceId sourceServiceId = null;
if (version >= 3) {
sourceServiceId = ServiceId.parseOrNull(in.readUTF());
}
var sourceDevice = in.readInt();
if (version == 1) {
// read legacy relay field
in.readUTF();
}
String destinationUuid = null;
if (version >= 5) {
destinationUuid = in.readUTF();
}
var timestamp = in.readLong();
byte[] content = null;
var contentLen = in.readInt();
if (contentLen > 0) {
content = new byte[contentLen];
in.readFully(content);
}
var legacyMessageLen = in.readInt();
if (legacyMessageLen > 0) {
byte[] legacyMessage = new byte[legacyMessageLen];
in.readFully(legacyMessage);
}
long serverReceivedTimestamp = 0;
String uuid = null;
if (version >= 2) {
serverReceivedTimestamp = in.readLong();
uuid = in.readUTF();
if ("".equals(uuid)) {
uuid = null;
if (version >= 9) {
final var serverReceivedTimestamp = in.readLong();
final var envelope = SignalServiceProtos.Envelope.parseFrom(in.readAllBytes());
return new SignalServiceEnvelope(envelope, serverReceivedTimestamp);
} else {
var type = in.readInt();
var source = in.readUTF();
ServiceId sourceServiceId = null;
if (version >= 3) {
sourceServiceId = ServiceId.parseOrNull(in.readUTF());
}
var sourceDevice = in.readInt();
if (version == 1) {
// read legacy relay field
in.readUTF();
}
String destinationUuid = null;
if (version >= 5) {
destinationUuid = in.readUTF();
}
var timestamp = in.readLong();
byte[] content = null;
var contentLen = in.readInt();
if (contentLen > 0) {
content = new byte[contentLen];
in.readFully(content);
}
var legacyMessageLen = in.readInt();
if (legacyMessageLen > 0) {
byte[] legacyMessage = new byte[legacyMessageLen];
in.readFully(legacyMessage);
}
long serverReceivedTimestamp = 0;
String uuid = null;
if (version >= 2) {
serverReceivedTimestamp = in.readLong();
uuid = in.readUTF();
if ("".equals(uuid)) {
uuid = null;
}
}
long serverDeliveredTimestamp = 0;
if (version >= 4) {
serverDeliveredTimestamp = in.readLong();
}
boolean isUrgent = true;
if (version >= 6) {
isUrgent = in.readBoolean();
}
boolean isStory = true;
if (version >= 7) {
isStory = in.readBoolean();
}
String updatedPni = null;
if (version >= 8) {
updatedPni = in.readUTF();
}
Optional<SignalServiceAddress> addressOptional = sourceServiceId == null
? Optional.empty()
: Optional.of(new SignalServiceAddress(sourceServiceId, source));
return new SignalServiceEnvelope(type,
addressOptional,
sourceDevice,
timestamp,
content,
serverReceivedTimestamp,
serverDeliveredTimestamp,
uuid,
destinationUuid == null ? UuidUtil.UNKNOWN_UUID.toString() : destinationUuid,
isUrgent,
isStory,
null,
updatedPni == null ? "" : updatedPni);
}
long serverDeliveredTimestamp = 0;
if (version >= 4) {
serverDeliveredTimestamp = in.readLong();
}
boolean isUrgent = true;
if (version >= 6) {
isUrgent = in.readBoolean();
}
boolean isStory = true;
if (version >= 7) {
isStory = in.readBoolean();
}
String updatedPni = null;
if (version >= 8) {
updatedPni = in.readUTF();
}
Optional<SignalServiceAddress> addressOptional = sourceServiceId == null
? Optional.empty()
: Optional.of(new SignalServiceAddress(sourceServiceId, source));
return new SignalServiceEnvelope(type,
addressOptional,
sourceDevice,
timestamp,
content,
serverReceivedTimestamp,
serverDeliveredTimestamp,
uuid,
destinationUuid == null ? UuidUtil.UNKNOWN_UUID.toString() : destinationUuid,
isUrgent,
isStory,
null,
updatedPni == null ? "" : updatedPni);
}
}
@ -106,26 +113,8 @@ public class MessageCacheUtils {
try (var f = new FileOutputStream(file)) {
try (var out = new DataOutputStream(f)) {
out.writeInt(CURRENT_VERSION); // version
out.writeInt(envelope.getType());
out.writeUTF(""); // legacy number
out.writeUTF(envelope.getSourceUuid().isPresent() ? envelope.getSourceUuid().get() : "");
out.writeInt(envelope.getSourceDevice());
out.writeUTF(envelope.getDestinationUuid() == null ? "" : envelope.getDestinationUuid());
out.writeLong(envelope.getTimestamp());
if (envelope.hasContent()) {
out.writeInt(envelope.getContent().length);
out.write(envelope.getContent());
} else {
out.writeInt(0);
}
out.writeInt(0); // legacy message
out.writeLong(envelope.getServerReceivedTimestamp());
var uuid = envelope.getServerGuid();
out.writeUTF(uuid == null ? "" : uuid);
out.writeLong(envelope.getServerDeliveredTimestamp());
out.writeBoolean(envelope.isUrgent());
out.writeBoolean(envelope.isStory());
out.writeUTF(envelope.getUpdatedPni() == null ? "" : envelope.getUpdatedPni());
envelope.getProto().writeTo(out);
}
}
}