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

Key manager should listen for TransportRemovedEvent and erase keys.

Browse Source
This commit is contained in:
akwizgran
2013-02-18 15:55:41 +00:00
parent d1fedaed57
commit b8cf58c426
3 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-api/src/net/sf/briar/api/transport/ConnectionRecogniser.java
View File

@@ -23,5 +23,7 @@ public interface ConnectionRecogniser {
void removeSecrets(ContactId c);
void removeSecrets(TransportId t);
void removeSecrets();
}

4
briar-core/src/net/sf/briar/transport/ConnectionRecogniserImpl.java
View File

@@ -64,6 +64,10 @@ class ConnectionRecogniserImpl implements ConnectionRecogniser {
r.removeSecrets(c);
}
public synchronized void removeSecrets(TransportId t) {
recognisers.remove(t);
}
public synchronized void removeSecrets() {
for(TransportConnectionRecogniser r : recognisers.values())
r.removeSecrets();

23
briar-core/src/net/sf/briar/transport/KeyManagerImpl.java
View File

@@ -21,6 +21,7 @@ import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.event.ContactRemovedEvent;
import net.sf.briar.api.db.event.DatabaseEvent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.TransportRemovedEvent;
import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionRecogniser;
@@ -63,6 +64,7 @@ class KeyManagerImpl extends TimerTask implements KeyManager, DatabaseListener {
}
public synchronized boolean start() {
// Load the temporary secrets and the storage key from the database
Collection<TemporarySecret> secrets;
try {
secrets = db.getSecrets();
@@ -322,6 +324,14 @@ class KeyManagerImpl extends TimerTask implements KeyManager, DatabaseListener {
removeAndEraseSecrets(c, incomingOld);
removeAndEraseSecrets(c, incomingNew);
}
} else if(e instanceof TransportRemovedEvent) {
TransportId t = ((TransportRemovedEvent) e).getTransportId();
recogniser.removeSecrets(t);
synchronized(this) {
removeAndEraseSecrets(t, outgoing);
removeAndEraseSecrets(t, incomingOld);
removeAndEraseSecrets(t, incomingNew);
}
}
}
@@ -337,6 +347,19 @@ class KeyManagerImpl extends TimerTask implements KeyManager, DatabaseListener {
}
}
// Locking: this
private void removeAndEraseSecrets(TransportId t,
Map<?, TemporarySecret> m) {
Iterator<TemporarySecret> it = m.values().iterator();
while(it.hasNext()) {
TemporarySecret s = it.next();
if(s.getTransportId().equals(t)) {
ByteUtils.erase(s.getSecret());
it.remove();
}
}
}
private static class EndpointKey {
private final ContactId contactId;