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

Do not create PeerSession for groups we created

Browse Source 
This needs a CreatorSession which gets created on-demand.
This commit is contained in:
Torsten Grote
2021-01-14 14:02:00 -03:00
parent 2ddb7b5b64
commit c4c70f5ac2
6 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-api/src/main/java/org/briarproject/briar/api/privategroup/PrivateGroupManager.java
View File

@@ -109,6 +109,11 @@ public interface PrivateGroupManager {
Collection<PrivateGroup> getPrivateGroups(Transaction txn)
throws DbException;
/**
* Returns true if the private group with the given ID was created by us.
*/
boolean isOurPrivateGroup(Transaction txn, GroupId g) throws DbException;
/**
* Returns the text of the private group message with the given ID.
*/

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

@@ -286,6 +286,14 @@ class PrivateGroupManagerImpl extends BdfIncomingMessageHook
return privateGroups;
}
@Override
public boolean isOurPrivateGroup(Transaction txn, GroupId g)
throws DbException {
PrivateGroup group = getPrivateGroup(txn, g);
LocalAuthor localAuthor = identityManager.getLocalAuthor(txn);
return localAuthor.getId().equals(group.getCreator().getId());
}
@Override
public Collection<PrivateGroup> getPrivateGroups() throws DbException {
return db.transactionWithResult(true, this::getPrivateGroups);

10
briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImpl.java
View File

@@ -126,11 +126,15 @@ class GroupInvitationManagerImpl extends ConversationClientImpl
db.setGroupVisibility(txn, c.getId(), g.getId(), client);
// Attach the contact ID to the group
clientHelper.setContactId(txn, g.getId(), c.getId());
// If the contact belongs to any private groups, create a peer session
// If the contact belongs to any private groups (we didn't create),
// create a peer session
for (Group pg : db.getGroups(txn, PrivateGroupManager.CLIENT_ID,
PrivateGroupManager.MAJOR_VERSION)) {
if (privateGroupManager.isMember(txn, pg.getId(), c.getAuthor()))
addingMember(txn, pg.getId(), c);
if (privateGroupManager.isMember(txn, pg.getId(), c.getAuthor())) {
if (!privateGroupManager.isOurPrivateGroup(txn, pg.getId())) {
addingMember(txn, pg.getId(), c);
}
}
}
}

24
briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java
View File

@@ -709,6 +709,30 @@ public class GroupInvitationIntegrationTest
assertTrue(deleteMessages0From1(emptySet()).allDeleted());
}
@Test
public void testInvitationAfterReAddingContacts() throws Exception {
// sync invitation and response back
sendInvitation(c0.getClock().currentTimeMillis(), null);
sync0To1(1, true);
groupInvitationManager1
.respondToInvitation(contactId0From1, privateGroup, true);
sync1To0(1, true);
// sync group join messages
sync0To1(2, true); // + one invitation protocol join message
sync1To0(1, true);
assertFalse(groupInvitationManager0
.isInvitationAllowed(contact1From0, privateGroup.getId()));
// re-add contacts
removeAllContacts();
addDefaultContacts();
assertTrue(groupInvitationManager0
.isInvitationAllowed(contact1From0, privateGroup.getId()));
}
private Collection<ConversationMessageHeader> getMessages1From0()
throws DbException {
return db0.transactionWithResult(true, txn -> groupInvitationManager0

3
briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImplTest.java
View File

@@ -196,6 +196,9 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
oneOf(privateGroupManager).isMember(txn, privateGroup.getId(),
c.getAuthor());
will(returnValue(true));
oneOf(privateGroupManager)
.isOurPrivateGroup(txn, privateGroup.getId());
will(returnValue(false));
}});
expectAddingMember(privateGroup.getId(), c);
}

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

@@ -523,10 +523,10 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
contactManager0.removeContact(contactId2From0);
contactManager1.removeContact(contactId0From1);
contactManager2.removeContact(contactId0From2);
assertNotNull(contactId2From1);
contactManager1.removeContact(contactId2From1);
assertNotNull(contactId1From2);
contactManager2.removeContact(contactId1From2);
if (contactId2From1 != null)
contactManager1.removeContact(contactId2From1);
if (contactId1From2 != null)
contactManager2.removeContact(contactId1From2);
}
protected void setAutoDeleteTimer(BriarIntegrationTestComponent component,