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

Added some more private group validation tests, found a bug.

Browse Source
This commit is contained in:
akwizgran
2016-11-29 17:46:46 +00:00
parent b37a7531ca
commit 050111a994
2 changed files with 358 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
briar-core/src/org/briarproject/privategroup/GroupMessageValidator.java
View File

@@ -9,7 +9,6 @@ import org.briarproject.api.data.MetadataEncoder;
import org.briarproject.api.identity.Author;
import org.briarproject.api.identity.AuthorFactory;
import org.briarproject.api.nullsafety.NotNullByDefault;
import org.briarproject.api.privategroup.MessageType;
import org.briarproject.api.privategroup.PrivateGroup;
import org.briarproject.api.privategroup.PrivateGroupFactory;
import org.briarproject.api.privategroup.invitation.GroupInvitationFactory;
@@ -79,17 +78,14 @@ class GroupMessageValidator extends BdfMessageValidator {
Author member = authorFactory.createAuthor(memberName, memberPublicKey);
BdfMessageContext c;
switch (MessageType.valueOf(type)) {
case JOIN:
c = validateJoin(m, g, body, member);
addMessageMetadata(c, member, m.getTimestamp());
break;
case POST:
c = validatePost(m, g, body, member);
addMessageMetadata(c, member, m.getTimestamp());
break;
default:
throw new InvalidMessageException("Unknown Message Type");
if (type == JOIN.getInt()) {
c = validateJoin(m, g, body, member);
addMessageMetadata(c, member, m.getTimestamp());
} else if (type == POST.getInt()) {
c = validatePost(m, g, body, member);
addMessageMetadata(c, member, m.getTimestamp());
} else {
throw new InvalidMessageException("Unknown Message Type");
}
c.getDictionary().put(KEY_TYPE, type);
return c;
@@ -133,8 +129,9 @@ class GroupMessageValidator extends BdfMessageValidator {
.createInviteToken(creator.getId(), member.getId(),
pg.getId(), inviteTimestamp);
try {
clientHelper.verifySignature(SIGNING_LABEL_INVITE, creatorSignature,
creator.getPublicKey(), token);
clientHelper
.verifySignature(SIGNING_LABEL_INVITE, creatorSignature,
creator.getPublicKey(), token);
} catch (GeneralSecurityException e) {
throw new InvalidMessageException(e);
}