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

Use a checked exception instead of a boolean to indicate an invalid readable msg

Browse Source
This commit is contained in:
str4d
2016-07-12 11:43:19 +00:00
parent db52b2c29f
commit 2698e4c181
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-core/src/org/briarproject/clients/ReadableMessageManagerImpl.java
View File

@@ -13,6 +13,7 @@ import org.briarproject.api.db.DbException;
import org.briarproject.api.db.Transaction;
import org.briarproject.api.sync.Group;
import org.briarproject.api.sync.GroupId;
import org.briarproject.api.sync.InvalidMessageException;
import org.briarproject.api.sync.Message;
import org.briarproject.api.sync.MessageId;
@@ -35,16 +36,17 @@ public abstract class ReadableMessageManagerImpl
protected abstract Group getContactGroup(Contact c);
protected abstract boolean incomingReadableMessage(Transaction txn,
protected abstract void incomingReadableMessage(Transaction txn,
Message m, BdfList body, BdfDictionary meta)
throws DbException, FormatException;
throws DbException, FormatException, InvalidMessageException;
@Override
protected void incomingMessage(Transaction txn, Message m, BdfList body,
BdfDictionary meta) throws DbException, FormatException {
// Check if we accept this message
if (incomingReadableMessage(txn, m, body, meta)) {
try {
incomingReadableMessage(txn, m, body, meta);
// Update the group timestamp and unread count
GroupId groupId = m.getGroupId();
@@ -52,6 +54,7 @@ public abstract class ReadableMessageManagerImpl
boolean local = meta.getBoolean(LOCAL);
boolean read = meta.getBoolean(READ);
updateGroupMetadata(txn, groupId, timestamp, local, read, read);
} catch (InvalidMessageException ignored) {
}
}

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

@@ -26,6 +26,7 @@ import org.briarproject.api.introduction.IntroductionResponse;
import org.briarproject.api.sync.ClientId;
import org.briarproject.api.sync.Group;
import org.briarproject.api.sync.GroupId;
import org.briarproject.api.sync.InvalidMessageException;
import org.briarproject.api.sync.Message;
import org.briarproject.api.sync.MessageId;
import org.briarproject.api.sync.MessageStatus;
@@ -213,8 +214,9 @@ class IntroductionManagerImpl extends ReadableMessageManagerImpl
* in the introduction protocol and which engine we need to start.
*/
@Override
protected boolean incomingReadableMessage(Transaction txn, Message m, BdfList body,
BdfDictionary message) throws DbException, FormatException {
protected void incomingReadableMessage(Transaction txn, Message m,
BdfList body, BdfDictionary message)
throws DbException, FormatException, InvalidMessageException {
// Get message data and type
GroupId groupId = m.getGroupId();
@@ -240,7 +242,7 @@ class IntroductionManagerImpl extends ReadableMessageManagerImpl
LOG.log(WARNING, e.toString(), e);
}
deleteMessage(txn, m.getId());
return false;
throw new InvalidMessageException();
}
try {
introduceeManager.incomingMessage(txn, state, message);
@@ -262,7 +264,7 @@ class IntroductionManagerImpl extends ReadableMessageManagerImpl
} catch (FormatException e) {
LOG.warning("Could not find state for message, deleting...");
deleteMessage(txn, m.getId());
return false;
throw new InvalidMessageException();
}
long role = state.getLong(ROLE, -1L);
@@ -277,7 +279,7 @@ class IntroductionManagerImpl extends ReadableMessageManagerImpl
"'. Deleting message...");
}
deleteMessage(txn, m.getId());
return false;
throw new InvalidMessageException();
}
} catch (DbException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
@@ -296,11 +298,8 @@ class IntroductionManagerImpl extends ReadableMessageManagerImpl
LOG.warning("Unknown message type '" + type + "', deleting...");
}
deleteMessage(txn, m.getId());
return false;
throw new InvalidMessageException();
}
// The message is valid
return true;
}
@Override

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

@@ -21,6 +21,7 @@ import org.briarproject.api.messaging.PrivateMessageHeader;
import org.briarproject.api.sync.ClientId;
import org.briarproject.api.sync.Group;
import org.briarproject.api.sync.GroupId;
import org.briarproject.api.sync.InvalidMessageException;
import org.briarproject.api.sync.Message;
import org.briarproject.api.sync.MessageId;
import org.briarproject.api.sync.MessageStatus;
@@ -96,8 +97,9 @@ class MessagingManagerImpl extends ReadableMessageManagerImpl
}
@Override
protected boolean incomingReadableMessage(Transaction txn, Message m, BdfList body,
BdfDictionary meta) throws DbException, FormatException {
protected void incomingReadableMessage(Transaction txn, Message m,
BdfList body, BdfDictionary meta)
throws DbException, FormatException, InvalidMessageException {
// Broadcast event
GroupId groupId = m.getGroupId();
@@ -110,8 +112,6 @@ class MessagingManagerImpl extends ReadableMessageManagerImpl
PrivateMessageReceivedEvent event = new PrivateMessageReceivedEvent(
header, groupId);
txn.attach(event);
return true;
}
@Override

13
briar-core/src/org/briarproject/sharing/SharingManagerImpl.java
View File

@@ -31,6 +31,7 @@ import org.briarproject.api.sharing.SharingManager;
import org.briarproject.api.sync.ClientId;
import org.briarproject.api.sync.Group;
import org.briarproject.api.sync.GroupId;
import org.briarproject.api.sync.InvalidMessageException;
import org.briarproject.api.sync.Message;
import org.briarproject.api.sync.MessageId;
import org.briarproject.api.sync.MessageStatus;
@@ -182,8 +183,9 @@ abstract class SharingManagerImpl<S extends Shareable, I extends Invitation, IM
}
@Override
protected boolean incomingReadableMessage(Transaction txn, Message m,
BdfList body, BdfDictionary d) throws DbException, FormatException {
protected void incomingReadableMessage(Transaction txn, Message m,
BdfList body, BdfDictionary d)
throws DbException, FormatException, InvalidMessageException {
BaseMessage msg = BaseMessage.from(getIFactory(), m.getGroupId(), d);
SessionId sessionId = msg.getSessionId();
@@ -219,7 +221,7 @@ abstract class SharingManagerImpl<S extends Shareable, I extends Invitation, IM
} catch (FormatException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
deleteMessage(txn, m.getId());
return false;
throw new InvalidMessageException();
}
} else if (msg.getType() == SHARE_MSG_TYPE_ACCEPT ||
msg.getType() == SHARE_MSG_TYPE_DECLINE) {
@@ -254,9 +256,6 @@ abstract class SharingManagerImpl<S extends Shareable, I extends Invitation, IM
// message has passed validator, so that should never happen
throw new RuntimeException("Illegal Sharing Message");
}
// The message is valid
return true;
}
@Override
@@ -362,7 +361,7 @@ abstract class SharingManagerImpl<S extends Shareable, I extends Invitation, IM
@Override
public IM getInvitationMessage(ContactId contactId, MessageId messageId)
throws DbException {
Transaction txn = db.startTransaction(false);
Transaction txn = db.startTransaction(true);
try {
Contact contact = db.getContact(txn, contactId);
Group group = getContactGroup(contact);