aboutsummaryrefslogtreecommitdiff
path: root/CmdLine
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-11-30 16:38:16 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-11-30 16:46:02 -0400
commitad7afb05bba11b372d66a6d5b685e013bb79a1a3 (patch)
tree2b7b6f94a0d61e10d7e80807e8ad216da27ec382 /CmdLine
parentdeca4cd90ad599f859fc9efafe509ed7375c6f39 (diff)
actually check p2p authtokens for tor connections
This commit was sponsored by Ethan Aubin.
Diffstat (limited to 'CmdLine')
-rw-r--r--CmdLine/GitRemoteTorAnnex.hs8
1 files changed, 7 insertions, 1 deletions
diff --git a/CmdLine/GitRemoteTorAnnex.hs b/CmdLine/GitRemoteTorAnnex.hs
index ea4532ae6..72211c995 100644
--- a/CmdLine/GitRemoteTorAnnex.hs
+++ b/CmdLine/GitRemoteTorAnnex.hs
@@ -60,7 +60,13 @@ connectService address port service = do
myuuid <- getUUID
g <- Annex.gitRepo
h <- liftIO $ torHandle =<< connectHiddenService address port
- runNetProtoHandle h h g $ do
+ let runenv = RunEnv
+ { runRepo = g
+ , runCheckAuth = const False
+ , runIhdl = h
+ , runOhdl = h
+ }
+ runNetProtoHandle runenv $ do
v <- auth myuuid authtoken
case v of
Just _theiruuid -> connect service stdin stdout