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

Fix bug with re-starting listening on a tcp socket

Browse Source
This commit is contained in:
ameba23
2021-04-21 09:54:42 +02:00
parent b401232736
commit c6046a1c38
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
briar-core/src/main/java/org/briarproject/briar/socialbackup/recovery/SecretOwnerTaskImpl.java
View File

@@ -6,7 +6,6 @@ import org.briarproject.bramble.api.crypto.AgreementPublicKey;
import org.briarproject.bramble.api.crypto.AuthenticatedCipher; import org.briarproject.bramble.api.crypto.AuthenticatedCipher;
import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.CryptoComponent;
import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.BdfList;
import org.briarproject.briar.api.socialbackup.MessageParser;
import org.briarproject.briar.api.socialbackup.ReturnShardPayload; import org.briarproject.briar.api.socialbackup.ReturnShardPayload;
import org.briarproject.briar.api.socialbackup.recovery.SecretOwnerTask; import org.briarproject.briar.api.socialbackup.recovery.SecretOwnerTask;
@@ -28,16 +27,12 @@ import static java.util.logging.Logger.getLogger;
public class SecretOwnerTaskImpl extends ReturnShardTaskImpl public class SecretOwnerTaskImpl extends ReturnShardTaskImpl
implements SecretOwnerTask { implements SecretOwnerTask {
private boolean cancelled = false; private boolean closedSocket = false;
private InetSocketAddress socketAddress; private InetSocketAddress socketAddress;
private ClientHelper clientHelper; private ClientHelper clientHelper;
private Observer observer; private Observer observer;
private ServerSocket serverSocket; private ServerSocket serverSocket;
private Socket socket; private Socket socket;
private MessageParser messageParser;
// private final StreamReaderFactory streamReaderFactory;
// private final StreamWriterFactory streamWriterFactory;
private static final Logger LOG = private static final Logger LOG =
getLogger(SecretOwnerTaskImpl.class.getName()); getLogger(SecretOwnerTaskImpl.class.getName());
@@ -47,8 +42,6 @@ public class SecretOwnerTaskImpl extends ReturnShardTaskImpl
ClientHelper clientHelper) { ClientHelper clientHelper) {
super(cipher, crypto); super(cipher, crypto);
this.clientHelper = clientHelper; this.clientHelper = clientHelper;
// this.streamReaderFactory = streamReaderFactory;
// this.streamWriterFactory = streamWriterFactory;
} }
@Override @Override
@@ -60,20 +53,23 @@ public class SecretOwnerTaskImpl extends ReturnShardTaskImpl
new State.Failure(State.Failure.Reason.NO_CONNECTION)); new State.Failure(State.Failure.Reason.NO_CONNECTION));
} }
LOG.info("InetAddress is " + inetAddress); LOG.info("InetAddress is " + inetAddress);
socketAddress = new InetSocketAddress(inetAddress, PORT);
// If we have a socket already open, close it and start fresh // If we have a socket already open, close it and start fresh
if (serverSocket != null) { if (serverSocket != null) {
try { try {
LOG.info("Closing existing socket with port " + serverSocket.getLocalPort());
closedSocket = true;
serverSocket.close(); serverSocket.close();
} catch (IOException ignored) {} } catch (IOException ignored) {
LOG.info("Ignoring error when closing socket");
}
} }
// Start listening on socketAddress // Start listening on socketAddress
try { try {
LOG.info("Binding socket"); LOG.info("Binding socket");
serverSocket = new ServerSocket(); serverSocket = new ServerSocket(0, 1, inetAddress);
serverSocket.bind(socketAddress); // serverSocket.bind(socketAddress);
LOG.info("Binding socket done"); LOG.info("Binding socket done");
} catch (IOException e) { } catch (IOException e) {
LOG.warning( LOG.warning(
@@ -84,6 +80,8 @@ public class SecretOwnerTaskImpl extends ReturnShardTaskImpl
return; return;
} }
socketAddress = new InetSocketAddress(inetAddress, serverSocket.getLocalPort());
LOG.info("Using port: " + serverSocket.getLocalPort());
try { try {
// TODO add version number // TODO add version number
BdfList payloadList = new BdfList(); BdfList payloadList = new BdfList();
@@ -104,7 +102,7 @@ public class SecretOwnerTaskImpl extends ReturnShardTaskImpl
private void receivePayload() { private void receivePayload() {
try { try {
LOG.info("Waiting for a connection..."); LOG.info("Waiting for a connection on port:" + serverSocket.getLocalPort());
socket = serverSocket.accept(); socket = serverSocket.accept();
LOG.info("Client connected"); LOG.info("Client connected");
observer.onStateChanged(new State.ReceivingShard()); observer.onStateChanged(new State.ReceivingShard());
@@ -129,18 +127,12 @@ public class SecretOwnerTaskImpl extends ReturnShardTaskImpl
byte[] payloadRaw = read(inputStream, payloadLength); byte[] payloadRaw = read(inputStream, payloadLength);
// InputStream clearInputStream = streamReaderFactory.createContactExchangeStreamReader(inputStream, sharedSecret);
// byte[] payloadClear = read(clearInputStream, payloadLength);
byte[] payloadClear = decrypt(payloadRaw, payloadNonce); byte[] payloadClear = decrypt(payloadRaw, payloadNonce);
ReturnShardPayload returnShardPayload = ReturnShardPayload ReturnShardPayload returnShardPayload = ReturnShardPayload
.fromList(clientHelper.toList(payloadClear)); .fromList(clientHelper.toList(payloadClear));
LOG.info("Payload decrypted and parsed successfully"); LOG.info("Payload decrypted and parsed successfully");
// StreamWriter streamWriter = streamWriterFactory.createContactExchangeStreamWriter(socket.getOutputStream(), sharedSecret);
// OutputStream outputStream = streamWriter.getOutputStream();
DataOutputStream outputStream = DataOutputStream outputStream =
new DataOutputStream(socket.getOutputStream()); new DataOutputStream(socket.getOutputStream());
byte[] ackNonce = generateNonce(); byte[] ackNonce = generateNonce();
@@ -155,6 +147,11 @@ public class SecretOwnerTaskImpl extends ReturnShardTaskImpl
observer.onStateChanged(new State.Success(returnShardPayload)); observer.onStateChanged(new State.Success(returnShardPayload));
} catch (IOException e) { } catch (IOException e) {
LOG.warning("IO Error receiving payload " + e.getMessage()); LOG.warning("IO Error receiving payload " + e.getMessage());
// Only change state to fail if we did not intentionally close
if (closedSocket) {
closedSocket = false;
return;
}
// TODO reasons // TODO reasons
observer.onStateChanged( observer.onStateChanged(
new State.Failure(State.Failure.Reason.NO_CONNECTION)); new State.Failure(State.Failure.Reason.NO_CONNECTION));
@@ -167,10 +164,10 @@ public class SecretOwnerTaskImpl extends ReturnShardTaskImpl
@Override @Override
public void cancel() { public void cancel() {
cancelled = true;
LOG.info("Cancel called, failing..."); LOG.info("Cancel called, failing...");
if (serverSocket != null) { if (serverSocket != null) {
try { try {
closedSocket = true;
serverSocket.close(); serverSocket.close();
} catch (IOException e) { } catch (IOException e) {
observer.onStateChanged( observer.onStateChanged(