TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 15:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enforce a configurable max envelope size.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-10-22 16:01:52 -04:00
committed by Cody Henthorne
parent ac54b5cbdf
commit f676d1c61c
4 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libsignal/service/src/main/java/org/whispersystems/signalservice/api/ContentTooLargeException.java Normal file
View File

@@ -0,0 +1,7 @@
package org.whispersystems.signalservice.api;
public class ContentTooLargeException extends IllegalStateException {
public ContentTooLargeException(long size) {
super("Too large! Size: " + size + " bytes");
}
}

15
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View File

@@ -126,6 +126,7 @@ public class SignalServiceMessageSender {
private final AtomicBoolean isMultiDevice;
private final ExecutorService executor;
private final int maxEnvelopeSize;
/**
* Construct a SignalServiceMessageSender.
@@ -149,7 +150,7 @@ public class SignalServiceMessageSender {
ClientZkProfileOperations clientZkProfileOperations,
ExecutorService executor)
{
this(urls, new StaticCredentialsProvider(uuid, e164, password, null), store, signalAgent, isMultiDevice, pipe, unidentifiedPipe, eventListener, clientZkProfileOperations, executor);
this(urls, new StaticCredentialsProvider(uuid, e164, password, null), store, signalAgent, isMultiDevice, pipe, unidentifiedPipe, eventListener, clientZkProfileOperations, executor, 0);
}
public SignalServiceMessageSender(SignalServiceConfiguration urls,
@@ -161,7 +162,8 @@ public class SignalServiceMessageSender {
Optional<SignalServiceMessagePipe> unidentifiedPipe,
Optional<EventListener> eventListener,
ClientZkProfileOperations clientZkProfileOperations,
ExecutorService executor)
ExecutorService executor,
int maxEnvelopeSize)
{
this.socket = new PushServiceSocket(urls, credentialsProvider, signalAgent, clientZkProfileOperations);
this.store = store;
@@ -171,6 +173,7 @@ public class SignalServiceMessageSender {
this.isMultiDevice = new AtomicBoolean(isMultiDevice);
this.eventListener = eventListener;
this.executor = executor != null ? executor : Executors.newSingleThreadExecutor();
this.maxEnvelopeSize = maxEnvelopeSize;
}
/**
@@ -698,7 +701,13 @@ public class SignalServiceMessageSender {
builder.setTimestamp(message.getTimestamp());
return container.setDataMessage(builder).build().toByteArray();
byte[] content = container.setDataMessage(builder).build().toByteArray();
if (maxEnvelopeSize > 0 && content.length > maxEnvelopeSize) {
throw new ContentTooLargeException(content.length);
}
return content;
}
private byte[] createCallContent(SignalServiceCallMessage callMessage) {