Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 19:59:05 +01:00
Code Issues Projects Releases Wiki Activity

Restrict getMessage() method to small messages.

Browse Source
This commit is contained in:
akwizgran
2020-11-03 17:19:39 +00:00
parent 4490a2cd3f
commit 2962afa6f1
28 changed files with 150 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-core/src/main/java/org/briarproject/briar/blog/BlogManagerImpl.java
View File

@@ -317,7 +317,7 @@ class BlogManagerImpl extends BdfIncomingMessageHook implements BlogManager,
}
// Get body of message to be wrapped
BdfList body = clientHelper.getMessageAsList(txn, header.getId());
BdfList body = clientHelper.getSmallMessageAsList(txn, header.getId());
long timestamp = header.getTimestamp();
Message wrappedMessage;
@@ -465,7 +465,7 @@ class BlogManagerImpl extends BdfIncomingMessageHook implements BlogManager,
@Override
public String getPostText(MessageId m) throws DbException {
try {
return getPostText(clientHelper.getMessageAsList(m));
return getPostText(clientHelper.getSmallMessageAsList(m));
} catch (FormatException e) {
throw new DbException(e);
}

2
briar-core/src/main/java/org/briarproject/briar/forum/ForumManagerImpl.java
View File

@@ -179,7 +179,7 @@ class ForumManagerImpl extends BdfIncomingMessageHook implements ForumManager {
@Override
public String getPostText(MessageId m) throws DbException {
try {
return getPostText(clientHelper.getMessageAsList(m));
return getPostText(clientHelper.getSmallMessageAsList(m));
} catch (FormatException e) {
throw new DbException(e);
}

2
briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionManagerImpl.java
View File

@@ -448,7 +448,7 @@ class IntroductionManagerImpl extends ConversationClientImpl
MessageStatus status, SessionId sessionId,
Map<AuthorId, AuthorInfo> authorInfos)
throws DbException, FormatException {
Message msg = clientHelper.getMessage(txn, m);
Message msg = clientHelper.getSmallMessage(txn, m);
BdfList body = clientHelper.toList(msg);
RequestMessage rm = messageParser.parseRequestMessage(msg, body);
String text = rm.getText();

4
briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java
View File

@@ -392,7 +392,7 @@ class MessagingManagerImpl implements MessagingManager, IncomingMessageHook,
@Override
public String getMessageText(MessageId m) throws DbException {
try {
BdfList body = clientHelper.getMessageAsList(m);
BdfList body = clientHelper.getSmallMessageAsList(m);
if (body.size() == 1) return body.getString(0); // Legacy format
else return body.getOptionalString(1);
} catch (FormatException e) {
@@ -404,7 +404,7 @@ class MessagingManagerImpl implements MessagingManager, IncomingMessageHook,
public Attachment getAttachment(AttachmentHeader h) throws DbException {
// TODO: Support large messages
MessageId m = h.getMessageId();
byte[] body = clientHelper.getMessage(m).getBody();
byte[] body = clientHelper.getSmallMessage(m).getBody();
try {
BdfDictionary meta = clientHelper.getMessageMetadataAsDictionary(m);
Long messageType = meta.getOptionalLong(MSG_KEY_MSG_TYPE);

2
briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupManagerImpl.java
View File

@@ -304,7 +304,7 @@ class PrivateGroupManagerImpl extends BdfIncomingMessageHook
@Override
public String getMessageText(MessageId m) throws DbException {
try {
return getMessageText(clientHelper.getMessageAsList(m));
return getMessageText(clientHelper.getSmallMessageAsList(m));
} catch (FormatException e) {
throw new DbException(e);
}

2
briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageParserImpl.java
View File

@@ -89,7 +89,7 @@ class MessageParserImpl implements MessageParser {
@Override
public InviteMessage getInviteMessage(Transaction txn, MessageId m)
throws DbException, FormatException {
Message message = clientHelper.getMessage(txn, m);
Message message = clientHelper.getSmallMessage(txn, m);
BdfList body = clientHelper.toList(message);
return parseInviteMessage(message, body);
}

2
briar-core/src/main/java/org/briarproject/briar/sharing/MessageParserImpl.java
View File

@@ -77,7 +77,7 @@ abstract class MessageParserImpl<S extends Shareable>
@Override
public InviteMessage<S> getInviteMessage(Transaction txn, MessageId m)
throws DbException, FormatException {
Message message = clientHelper.getMessage(txn, m);
Message message = clientHelper.getSmallMessage(txn, m);
BdfList body = clientHelper.toList(message);
return parseInviteMessage(message, body);
}

8
briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java
View File

@@ -498,7 +498,7 @@ public class BlogManagerImplTest extends BriarTestCase {
oneOf(db).startTransaction(false);
will(returnValue(txn));
// Wrap the original post for blog 2
oneOf(clientHelper).getMessageAsList(txn, messageId);
oneOf(clientHelper).getSmallMessageAsList(txn, messageId);
will(returnValue(originalPostBody));
oneOf(db).getGroup(txn, blog1.getId());
will(returnValue(blog1.getGroup()));
@@ -609,7 +609,7 @@ public class BlogManagerImplTest extends BriarTestCase {
oneOf(db).startTransaction(false);
will(returnValue(txn));
// Wrap the original post for blog 1
oneOf(clientHelper).getMessageAsList(txn, rssMessageId);
oneOf(clientHelper).getSmallMessageAsList(txn, rssMessageId);
will(returnValue(originalPostBody));
oneOf(db).getGroup(txn, rssBlog.getId());
will(returnValue(rssBlog.getGroup()));
@@ -734,7 +734,7 @@ public class BlogManagerImplTest extends BriarTestCase {
oneOf(db).startTransaction(false);
will(returnValue(txn));
// Rewrap the wrapped post for blog 2
oneOf(clientHelper).getMessageAsList(txn, wrappedPostId);
oneOf(clientHelper).getSmallMessageAsList(txn, wrappedPostId);
will(returnValue(wrappedPostBody));
oneOf(blogPostFactory).rewrapWrappedPost(blog2.getId(),
wrappedPostBody);
@@ -745,7 +745,7 @@ public class BlogManagerImplTest extends BriarTestCase {
oneOf(clientHelper).addLocalMessage(txn, rewrappedPostMsg,
rewrappedPostMeta, true, false);
// Wrap the original comment for blog 2
oneOf(clientHelper).getMessageAsList(txn, originalCommentId);
oneOf(clientHelper).getSmallMessageAsList(txn, originalCommentId);
will(returnValue(originalCommentBody));
oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
wrappedPostId);

4
briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java
View File

@@ -1870,8 +1870,8 @@ public class IntroductionIntegrationTest
ch.getMessageMetadataAsDictionary(g.getId(), query);
assertEquals(1, map.size());
MessageId id = map.entrySet().iterator().next().getKey();
Message m = ch.getMessage(id);
BdfList body = ch.getMessageAsList(id);
Message m = ch.getSmallMessage(id);
BdfList body = ch.getSmallMessageAsList(id);
if (type == ACCEPT) {
return c0.getMessageParser().parseAcceptMessage(m, body);
} else if (type == DECLINE) {

20
briar-core/src/test/java/org/briarproject/briar/messaging/MessagingManagerIntegrationTest.java
View File

@@ -247,8 +247,10 @@ public class MessagingManagerIntegrationTest
sendMessage(c0, c1, getRandomString(42), singletonList(h));
// attachment exists on both devices
db0.transaction(true, txn -> db0.getMessage(txn, h.getMessageId()));
db1.transaction(true, txn -> db1.getMessage(txn, h.getMessageId()));
db0.transaction(true, txn ->
db0.getSmallMessage(txn, h.getMessageId()));
db1.transaction(true, txn ->
db1.getSmallMessage(txn, h.getMessageId()));
// delete message on both sides (deletes all, because returns true)
assertTrue(db0.transactionWithResult(false,
@@ -260,13 +262,15 @@ public class MessagingManagerIntegrationTest
// attachment was deleted on both devices
try {
db0.transaction(true, txn -> db0.getMessage(txn, h.getMessageId()));
db0.transaction(true, txn ->
db0.getSmallMessage(txn, h.getMessageId()));
fail();
} catch (MessageDeletedException e) {
// expected
}
try {
db1.transaction(true, txn -> db1.getMessage(txn, h.getMessageId()));
db1.transaction(true, txn ->
db1.getSmallMessage(txn, h.getMessageId()));
fail();
} catch (MessageDeletedException e) {
// expected
@@ -282,7 +286,7 @@ public class MessagingManagerIntegrationTest
// attachment exists on both devices, state set to PENDING for receiver
db1.transaction(false, txn -> {
db1.getMessage(txn, h.getMessageId());
db1.getSmallMessage(txn, h.getMessageId());
db1.setMessageState(txn, h.getMessageId(), PENDING);
});
@@ -310,13 +314,15 @@ public class MessagingManagerIntegrationTest
// attachment was deleted on both devices
try {
db0.transaction(true, txn -> db0.getMessage(txn, h.getMessageId()));
db0.transaction(true, txn ->
db0.getSmallMessage(txn, h.getMessageId()));
fail();
} catch (MessageDeletedException e) {
// expected
}
try {
db1.transaction(true, txn -> db1.getMessage(txn, h.getMessageId()));
db1.transaction(true, txn ->
db1.getSmallMessage(txn, h.getMessageId()));
fail();
} catch (MessageDeletedException e) {
// expected

2
briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java
View File

@@ -242,7 +242,7 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
executor.execute(() -> {
if (DEBUG) {
try {
BdfList body = clientHelper.getMessageAsList(id);
BdfList body = clientHelper.getSmallMessageAsList(id);
LOG.info("Contents of " + id + ":\n"
+ BdfStringUtils.toString(body));
} catch (DbException | FormatException e) {