summaryrefslogtreecommitdiff
path: root/doc/design/assistant/telehash.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/design/assistant/telehash.mdwn')
-rw-r--r--doc/design/assistant/telehash.mdwn25
1 files changed, 14 insertions, 11 deletions
diff --git a/doc/design/assistant/telehash.mdwn b/doc/design/assistant/telehash.mdwn
index 5c410999f..6a098ba51 100644
--- a/doc/design/assistant/telehash.mdwn
+++ b/doc/design/assistant/telehash.mdwn
@@ -66,18 +66,17 @@ or [cjdns](https://github.com/cjdelisle/cjdns) or tor or i2p or [magic wormhole]
## general design
-* Make address.log that contains (uuid, transport, address, Maybe authtoken)
-* The authtoken is an additional guard, to protect against transports
- where the address might be able to be guessed, or observed by the rest of
- the network.
-* Some addresses can be used with only the provided authtoken
- from the address.log. Remotes can be auto-enabled for these.
-* Other addresses have Nothing povided for the authtoken, and one
- has to instead be provided during manual enabling of the remote.
+* There is a generic P2P protocol, which should be usable with any P2P
+ system that can send messages between peers.
+* A p2p remote has an url like tor-annex::fijdksajdksjfkj, which connects
+ to a specific peer. The peer's address may be kept private, but
+ the design allows the address to be public without giving access to
+ the peer.
+* An authtoken also needs to be presented when connecting with a peer.
+ This is stored in local creds storage and must be kept private.
* The remotedaemon runs, and/or communicates with the program implementing
- the network transport. For example for tor, the remotedaemon runs
- the hidden service, and also connects to the tor hidden services of
- other nodes.
+ the P2P network. For example for tor, the remotedaemon runs the
+ hidden service.
* The remotedaemon handles both sides of git push over the transport.
* The remotedaemon may also support sending objects over the transport,
depending on the transport.
@@ -123,6 +122,10 @@ so won't want to type that in. Need discovery.
for Bob to confirm he's ready to finish pairing, this will fail,
because Bob won't get to that point if the authtoken is intercepted.
+ Check out
+ <https://en.wikipedia.org/wiki/Password-authenticated_key_agreement>
+ for more MITM resistance.
+
## local lan detection
At connection time, after authentication, the remote can send