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

secret owner listens, and custodian connects

Browse Source
This commit is contained in:
ameba23
2021-04-13 12:20:17 +02:00
parent cd1ac43b7d
commit 1bf9f57ad9
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
briar-core/src/main/java/org/briarproject/briar/socialbackup/recovery/CustodianTaskImpl.java
View File

@@ -6,8 +6,10 @@ import org.briarproject.bramble.api.crypto.AgreementPublicKey;
import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.BdfList;
import org.briarproject.briar.api.socialbackup.recovery.CustodianTask; import org.briarproject.briar.api.socialbackup.recovery.CustodianTask;
import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.Socket;
import java.security.PublicKey; import java.security.PublicKey;
import javax.inject.Inject; import javax.inject.Inject;
@@ -47,6 +49,15 @@ public class CustodianTaskImpl implements CustodianTask {
observer.onStateChanged(new CustodianTask.State.SendingShard()); observer.onStateChanged(new CustodianTask.State.SendingShard());
} catch (Exception e) { } catch (Exception e) {
observer.onStateChanged(new CustodianTask.State.Failure(State.Failure.Reason.QR_CODE_INVALID)); observer.onStateChanged(new CustodianTask.State.Failure(State.Failure.Reason.QR_CODE_INVALID));
return;
} }
Socket s = new Socket();
try {
s.connect(remoteSocketAddress);
} catch (IOException e) {
observer.onStateChanged(new CustodianTask.State.Failure(State.Failure.Reason.QR_CODE_INVALID));
}
System.out.println("Connected *****");
} }
} }

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

@@ -8,8 +8,10 @@ import org.briarproject.bramble.api.data.BdfList;
import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.IoExecutor;
import org.briarproject.briar.api.socialbackup.recovery.SecretOwnerTask; import org.briarproject.briar.api.socialbackup.recovery.SecretOwnerTask;
import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import javax.inject.Inject; import javax.inject.Inject;
@@ -37,7 +39,18 @@ public class SecretOwnerTaskImpl implements SecretOwnerTask {
if (inetAddress == null) observer.onStateChanged(new State.Failure()); if (inetAddress == null) observer.onStateChanged(new State.Failure());
System.out.println("InetAddress is " + inetAddress); System.out.println("InetAddress is " + inetAddress);
socketAddress = new InetSocketAddress(inetAddress, 3002); socketAddress = new InetSocketAddress(inetAddress, 3002);
// TODO start listening on socketAddress
// start listening on socketAddress
ServerSocket ss = null;
try {
ss = new ServerSocket();
ss.bind(socketAddress);
} catch (IOException e) {
observer.onStateChanged(new State.Failure());
// TODO could try incrementing the port number
return;
}
try { try {
// TODO add version number // TODO add version number
BdfList payloadList = new BdfList(); BdfList payloadList = new BdfList();