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

Check that createLogHandler() isn't called more than once.

Browse Source 
This would result in multiple log files encrypted with the same key.
This commit is contained in:
akwizgran
2018-10-23 15:16:29 +01:00
parent dfb581ef12
commit 7ce91066f5
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-api/src/main/java/org/briarproject/briar/api/logging/PersistentLogManager.java
View File

@@ -24,6 +24,8 @@ public interface PersistentLogManager {
/** /**
* Creates and returns a persistent log handler that stores its logs in * Creates and returns a persistent log handler that stores its logs in
* the given directory. * the given directory.
* <p>
* This method should only be called once.
*/ */
Handler createLogHandler(File dir) throws IOException; Handler createLogHandler(File dir) throws IOException;

3
briar-core/src/main/java/org/briarproject/briar/logging/PersistentLogManagerImpl.java
View File

@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Scanner; import java.util.Scanner;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Formatter; import java.util.logging.Formatter;
import java.util.logging.Handler; import java.util.logging.Handler;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -63,6 +64,7 @@ class PersistentLogManagerImpl implements PersistentLogManager,
private final StreamWriterFactory streamWriterFactory; private final StreamWriterFactory streamWriterFactory;
private final Formatter formatter; private final Formatter formatter;
private final SecretKey logKey; private final SecretKey logKey;
private final AtomicBoolean handlerCreated = new AtomicBoolean(false);
@Nullable @Nullable
private volatile SecretKey oldLogKey = null; private volatile SecretKey oldLogKey = null;
@@ -103,6 +105,7 @@ class PersistentLogManagerImpl implements PersistentLogManager,
@Override @Override
public Handler createLogHandler(File dir) throws IOException { public Handler createLogHandler(File dir) throws IOException {
if (handlerCreated.getAndSet(true)) throw new IllegalStateException();
File logFile = new File(dir, LOG_FILE); File logFile = new File(dir, LOG_FILE);
File oldLogFile = new File(dir, OLD_LOG_FILE); File oldLogFile = new File(dir, OLD_LOG_FILE);
if (oldLogFile.exists() && !oldLogFile.delete()) if (oldLogFile.exists() && !oldLogFile.delete())