mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

use P2P auth for git-remote-tor-annex

Browse source 
This changes the environment variable name to the more generic
GIT_ANNEX_P2P_AUTHTOKEN.

This commit was sponsored by andrea rota.
This commit is contained in:
Joey Hess 2016-11-30 15:26:16 -04:00
parent 3ab12ba923
commit b88e44ea9a
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
4 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CmdLine/GitRemoteTorAnnex.hs
View file

@ -16,6 +16,8 @@ import Remote.Helper.Tor
import Utility.Tor
import Utility.AuthToken
import Annex.UUID
import P2P.Address
import P2P.Auth
run :: [String] -> IO ()
run (_remotename:address:[]) = forever $ do
@ -54,7 +56,7 @@ connectService address port service = do
state <- Annex.new =<< Git.CurrentRepo.get
Annex.eval state $ do
authtoken <- fromMaybe nullAuthToken
<$> getTorAuthTokenFor address
<$> loadP2PRemoteAuthToken (TorAnnex address port)
myuuid <- getUUID
g <- Annex.gitRepo
h <- liftIO $ torHandle =<< connectHiddenService address port
@ -62,4 +64,4 @@ connectService address port service = do
v <- auth myuuid authtoken
case v of
Just _theiruuid -> connect service stdin stdout
Nothing -> giveup $ "authentication failed, perhaps you need to set " ++ torAuthTokenEnv
Nothing -> giveup $ "authentication failed, perhaps you need to set " ++ p2pAuthTokenEnv