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

Create an identity at startup if the database doesn't exist.

Browse Source
This commit is contained in:
akwizgran
2013-04-08 16:01:52 +01:00
parent ce7e9e73c9
commit de472ba2a6
47 changed files with 934 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-core/src/net/sf/briar/db/Database.java
View File

@@ -54,12 +54,8 @@ import net.sf.briar.api.transport.TemporarySecret;
*/
interface Database<T> {
/**
* Opens the database.
* @param resume true to reopen an existing database, false to create a
* new one.
*/
void open(boolean resume) throws DbException, IOException;
/** Opens the database and returns true if the database already existed. */
boolean open() throws DbException, IOException;
/**
* Prevents new transactions from starting, waits for all current

5
briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
View File

@@ -140,11 +140,11 @@ DatabaseCleaner.Callback {
this.clock = clock;
}
public void open(boolean resume) throws DbException, IOException {
public boolean open() throws DbException, IOException {
synchronized(openCloseLock) {
if(open) throw new IllegalStateException();
open = true;
db.open(resume);
boolean reopened = db.open();
cleaner.startCleaning(this, MS_BETWEEN_SWEEPS);
shutdownHandle = shutdown.addShutdownHook(new Runnable() {
public void run() {
@@ -162,6 +162,7 @@ DatabaseCleaner.Callback {
}
}
});
return reopened;
}
}

13
briar-core/src/net/sf/briar/db/H2Database.java
View File

@@ -23,23 +23,23 @@ class H2Database extends JdbcDatabase {
private static final String COUNTER_TYPE = "INT NOT NULL AUTO_INCREMENT";
private static final String SECRET_TYPE = "BINARY(32)";
private final File home;
private final File dir;
private final String url;
private final char[] password;
private final long maxSize;
@Inject
H2Database(DatabaseConfig config, Clock clock) {
super(HASH_TYPE, BINARY_TYPE, COUNTER_TYPE, SECRET_TYPE, clock);
home = new File(config.getDataDirectory(), "db");
url = "jdbc:h2:split:" + home.getPath()
super(HASH_TYPE, BINARY_TYPE, COUNTER_TYPE, SECRET_TYPE, config, clock);
dir = config.getDatabaseDirectory();
url = "jdbc:h2:split:" + new File(dir, "db").getPath()
+ ";CIPHER=AES;MULTI_THREADED=1;DB_CLOSE_ON_EXIT=false";
password = config.getPassword();
maxSize = config.getMaxSize();
}
public void open(boolean resume) throws DbException, IOException {
super.open(resume, home.getParentFile(), "org.h2.Driver");
public boolean open() throws DbException, IOException {
return super.open("org.h2.Driver");
}
public void close() throws DbException {
@@ -53,7 +53,6 @@ class H2Database extends JdbcDatabase {
public long getFreeSpace() throws DbException {
try {
File dir = home.getParentFile();
long free = FileUtils.getFreeSpace(dir);
long used = getDiskSpace(dir);
long quota = maxSize - used;

76
briar-core/src/net/sf/briar/db/JdbcDatabase.java
View File

@@ -10,7 +10,6 @@ import static net.sf.briar.api.messaging.Rating.UNRATED;
import static net.sf.briar.db.ExponentialBackoff.calculateExpiry;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -36,6 +35,7 @@ import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.db.DatabaseConfig;
import net.sf.briar.api.db.DbClosedException;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.GroupMessageHeader;
@@ -54,7 +54,6 @@ import net.sf.briar.api.messaging.TransportAck;
import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.api.transport.Endpoint;
import net.sf.briar.api.transport.TemporarySecret;
import net.sf.briar.util.FileUtils;
/**
* A generic database implementation that can be used with any JDBC-compatible
@@ -360,6 +359,7 @@ abstract class JdbcDatabase implements Database<Connection> {
// Different database libraries use different names for certain types
private final String hashType, binaryType, counterType, secretType;
private final DatabaseConfig config;
private final Clock clock;
private final LinkedList<Connection> connections =
@@ -371,38 +371,39 @@ abstract class JdbcDatabase implements Database<Connection> {
protected abstract Connection createConnection() throws SQLException;
JdbcDatabase(String hashType, String binaryType, String counterType,
String secretType, Clock clock) {
String secretType, DatabaseConfig config, Clock clock) {
this.hashType = hashType;
this.binaryType = binaryType;
this.counterType = counterType;
this.secretType = secretType;
this.config = config;
this.clock = clock;
}
protected void open(boolean resume, File dir, String driverClass)
throws DbException, IOException {
if(resume) {
if(!dir.exists()) throw new FileNotFoundException();
if(!dir.isDirectory()) throw new FileNotFoundException();
} else {
if(dir.exists()) FileUtils.delete(dir);
protected boolean open(String driverClass) throws DbException, IOException {
boolean reopen = config.databaseExists();
File dir = config.getDatabaseDirectory();
if(LOG.isLoggable(INFO)) {
LOG.info("Database directory: " + dir.getPath());
if(reopen) for(File f : dir.listFiles()) LOG.info(f.getPath());
}
if(!reopen) dir.mkdirs();
// Load the JDBC driver
try {
Class.forName(driverClass);
} catch(ClassNotFoundException e) {
throw new DbException(e);
}
// Open the database
// Open the database and create the tables if necessary
Connection txn = startTransaction();
try {
// If not resuming, create the tables
if(!resume) createTables(txn);
if(!reopen) createTables(txn);
commitTransaction(txn);
} catch(DbException e) {
abortTransaction(txn);
throw e;
}
return reopen;
}
private void createTables(Connection txn) throws DbException {
@@ -1246,11 +1247,12 @@ abstract class JdbcDatabase implements Database<Connection> {
rs = ps.executeQuery();
List<Endpoint> endpoints = new ArrayList<Endpoint>();
while(rs.next()) {
ContactId c = new ContactId(rs.getInt(1));
TransportId t = new TransportId(rs.getBytes(2));
ContactId contactId = new ContactId(rs.getInt(1));
TransportId transportId = new TransportId(rs.getBytes(2));
long epoch = rs.getLong(3);
boolean alice = rs.getBoolean(4);
endpoints.add(new Endpoint(c, t, epoch, alice));
endpoints.add(new Endpoint(contactId, transportId, epoch,
alice));
}
return Collections.unmodifiableList(endpoints);
} catch(SQLException e) {
@@ -1367,9 +1369,12 @@ abstract class JdbcDatabase implements Database<Connection> {
rs = ps.executeQuery();
List<LocalAuthor> authors = new ArrayList<LocalAuthor>();
while(rs.next()) {
AuthorId id = new AuthorId(rs.getBytes(1));
authors.add(new LocalAuthor(id, rs.getString(2), rs.getBytes(3),
rs.getBytes(4)));
AuthorId authorId = new AuthorId(rs.getBytes(1));
String name = rs.getString(2);
byte[] publicKey = rs.getBytes(3);
byte[] privateKey = rs.getBytes(4);
authors.add(new LocalAuthor(authorId, name, publicKey,
privateKey));
}
rs.close();
ps.close();
@@ -1392,9 +1397,12 @@ abstract class JdbcDatabase implements Database<Connection> {
rs = ps.executeQuery();
List<LocalGroup> groups = new ArrayList<LocalGroup>();
while(rs.next()) {
GroupId id = new GroupId(rs.getBytes(1));
groups.add(new LocalGroup(id, rs.getString(2), rs.getBytes(3),
rs.getBytes(4)));
GroupId groupId = new GroupId(rs.getBytes(1));
String name = rs.getString(2);
byte[] publicKey = rs.getBytes(3);
byte[] privateKey = rs.getBytes(4);
groups.add(new LocalGroup(groupId, name, publicKey,
privateKey));
}
rs.close();
ps.close();
@@ -2048,8 +2056,8 @@ abstract class JdbcDatabase implements Database<Connection> {
rs = ps.executeQuery();
List<TemporarySecret> secrets = new ArrayList<TemporarySecret>();
while(rs.next()) {
ContactId c = new ContactId(rs.getInt(1));
TransportId t = new TransportId(rs.getBytes(2));
ContactId contactId = new ContactId(rs.getInt(1));
TransportId transportId = new TransportId(rs.getBytes(2));
long epoch = rs.getLong(3);
boolean alice = rs.getBoolean(4);
long period = rs.getLong(5);
@@ -2057,8 +2065,8 @@ abstract class JdbcDatabase implements Database<Connection> {
long outgoing = rs.getLong(7);
long centre = rs.getLong(8);
byte[] bitmap = rs.getBytes(9);
secrets.add(new TemporarySecret(c, t, epoch, alice, period,
secret, outgoing, centre, bitmap));
secrets.add(new TemporarySecret(contactId, transportId, epoch,
alice, period, secret, outgoing, centre, bitmap));
}
rs.close();
ps.close();
@@ -2186,10 +2194,10 @@ abstract class JdbcDatabase implements Database<Connection> {
rs = ps.executeQuery();
List<Group> subs = new ArrayList<Group>();
while(rs.next()) {
GroupId id = new GroupId(rs.getBytes(1));
GroupId groupId = new GroupId(rs.getBytes(1));
String name = rs.getString(2);
byte[] publicKey = rs.getBytes(3);
subs.add(new Group(id, name, publicKey));
subs.add(new Group(groupId, name, publicKey));
}
rs.close();
ps.close();
@@ -2213,10 +2221,10 @@ abstract class JdbcDatabase implements Database<Connection> {
rs = ps.executeQuery();
List<Group> subs = new ArrayList<Group>();
while(rs.next()) {
GroupId id = new GroupId(rs.getBytes(1));
GroupId groupId = new GroupId(rs.getBytes(1));
String name = rs.getString(2);
byte[] publicKey = rs.getBytes(3);
subs.add(new Group(id, name, publicKey));
subs.add(new Group(groupId, name, publicKey));
}
rs.close();
ps.close();
@@ -2286,10 +2294,10 @@ abstract class JdbcDatabase implements Database<Connection> {
long version = 0;
int txCount = 0;
while(rs.next()) {
byte[] id = rs.getBytes(1);
GroupId groupId = new GroupId(rs.getBytes(1));
String name = rs.getString(2);
byte[] key = rs.getBytes(3);
subs.add(new Group(new GroupId(id), name, key));
subs.add(new Group(groupId, name, key));
version = rs.getLong(4);
txCount = rs.getInt(5);
}
@@ -2483,8 +2491,8 @@ abstract class JdbcDatabase implements Database<Connection> {
rs = ps.executeQuery();
Map<GroupId, Integer> counts = new HashMap<GroupId, Integer>();
while(rs.next()) {
GroupId g = new GroupId(rs.getBytes(1));
counts.put(g, rs.getInt(2));
GroupId groupId = new GroupId(rs.getBytes(1));
counts.put(groupId, rs.getInt(2));
}
rs.close();
ps.close();