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

15
P2P/Auth.hs
View file

@ -12,6 +12,7 @@ import Creds
import P2P.Address
import Utility.AuthToken
import Utility.Tor
import Utility.Env
import qualified Data.Text as T
@ -38,9 +39,19 @@ p2pAuthCredsFile :: FilePath
p2pAuthCredsFile = "p2pauth"
-- | Loads the AuthToken to use when connecting with a given P2P address.
--
-- It's loaded from the first line of the creds file, but
-- GIT_ANNEX_P2P_AUTHTOKEN overrides.
loadP2PRemoteAuthToken :: P2PAddress -> Annex (Maybe AuthToken)
loadP2PRemoteAuthToken addr = maybe Nothing (toAuthToken . T.pack)
<$> readCacheCreds (addressCredsFile addr)
loadP2PRemoteAuthToken addr = maybe Nothing mk <$> getM id
[ liftIO $ getEnv "GIT_ANNEX_P2P_AUTHTOKEN"
, readCacheCreds (addressCredsFile addr)
]
where
mk = toAuthToken . T.pack . takeWhile (/= '\n')
p2pAuthTokenEnv :: String
p2pAuthTokenEnv = "GIT_ANNEX_P2P_AUTHTOKEN"
-- | Stores the AuthToken o use when connecting with a given P2P address.
storeP2PRemoteAuthToken :: P2PAddress -> AuthToken -> Annex ()