e63dcbf36c
Fix bug that made enableremote of S3 and webdav remotes, that have embedcreds=yes, fail to set up the embedded creds, so accessing the remotes failed. (Regression introduced in version 7.20200202.7 in when reworking all the remote configs to be parsed.) Root problem is that parseEncryptionConfig excludes all other config keys except encryption ones, so it is then unable to find the credPairRemoteField. And since that field is not required to be present, it proceeds as if it's not, rather than failing in any visible way. This causes it to not find any creds, and so it does not cache them. When when the S3 remote tries to make a S3 connection, it finds no creds, so assumes it's being used in no-creds mode, and tries to find a public url. With no public url available, it fails, but the failure doesn't say a lack of creds is the problem. Fix is to provide setRemoteCredPair with a ParsedRemoteConfig, so the full set of configs of the remote can be parsed. A bit annoying to need to parse the remote config before the full config (as returned by setRemoteCredPair) is available, but this avoids the problem. I assume webdav also had the problem by inspection, but didn't try to reproduce it with it. Also, getRemoteCredPair used getRemoteConfigValue to get a ProposedAccepted String, but that does not seem right. Now that it runs that code, it crashed saying it had just a String. Remotes that have already been enableremoted, and so lack the cached creds file will work after this fix, because getRemoteCredPair will extract the creds from the remote config, writing the missing file. This commit was sponsored by Ilya Shlyakhter on Patreon.
220 lines
7.5 KiB
Haskell
220 lines
7.5 KiB
Haskell
{- Credentials storage
|
|
-
|
|
- Copyright 2012-2020 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
module Creds (
|
|
module Types.Creds,
|
|
CredPairStorage(..),
|
|
setRemoteCredPair,
|
|
setRemoteCredPair',
|
|
getRemoteCredPair,
|
|
getRemoteCredPairFor,
|
|
missingCredPairFor,
|
|
getEnvCredPair,
|
|
writeCreds,
|
|
readCreds,
|
|
credsFile,
|
|
removeCreds,
|
|
includeCredsInfo,
|
|
) where
|
|
|
|
import Annex.Common
|
|
import qualified Annex
|
|
import Types.Creds
|
|
import Types.RemoteConfig
|
|
import Annex.SpecialRemote.Config
|
|
import Annex.Perms
|
|
import Utility.FileMode
|
|
import Crypto
|
|
import Types.Remote (RemoteConfig, RemoteConfigField)
|
|
import Types.ProposedAccepted
|
|
import Remote.Helper.Encryptable (remoteCipher, remoteCipher', embedCreds, EncryptionIsSetup, extractCipher)
|
|
import Utility.Env (getEnv)
|
|
|
|
import qualified Data.ByteString.Lazy.Char8 as L
|
|
import qualified Data.Map as M
|
|
import Utility.Base64
|
|
|
|
{- A CredPair can be stored in a file, or in the environment, or
|
|
- in a remote's configuration. -}
|
|
data CredPairStorage = CredPairStorage
|
|
{ credPairFile :: FilePath
|
|
, credPairEnvironment :: (String, String)
|
|
, credPairRemoteField :: RemoteConfigField
|
|
}
|
|
|
|
{- Stores creds in a remote's configuration, if the remote allows
|
|
- that. Also caches them locally.
|
|
-
|
|
- The creds are found from the CredPairStorage storage if not provided,
|
|
- so may be provided by an environment variable etc.
|
|
-
|
|
- The remote's configuration should have already had a cipher stored in it
|
|
- if that's going to be done, so that the creds can be encrypted using the
|
|
- cipher. The EncryptionIsSetup is witness to that being the case.
|
|
-}
|
|
setRemoteCredPair :: EncryptionIsSetup -> ParsedRemoteConfig -> RemoteGitConfig -> CredPairStorage -> Maybe CredPair -> Annex RemoteConfig
|
|
setRemoteCredPair encsetup pc = setRemoteCredPair' id (const pc) encsetup (unparsedRemoteConfig pc)
|
|
|
|
setRemoteCredPair'
|
|
:: (ProposedAccepted String -> a)
|
|
-> (M.Map RemoteConfigField a -> ParsedRemoteConfig)
|
|
-> EncryptionIsSetup
|
|
-> M.Map RemoteConfigField a
|
|
-> RemoteGitConfig
|
|
-> CredPairStorage
|
|
-> Maybe CredPair
|
|
-> Annex (M.Map RemoteConfigField a)
|
|
setRemoteCredPair' mkval parseconfig encsetup c gc storage mcreds = case mcreds of
|
|
Nothing -> maybe (return c) (setRemoteCredPair' mkval parseconfig encsetup c gc storage . Just)
|
|
=<< getRemoteCredPair pc gc storage
|
|
Just creds
|
|
| embedCreds pc -> do
|
|
let key = credPairRemoteField storage
|
|
localcache creds
|
|
storeconfig creds key =<< remoteCipher pc gc
|
|
| otherwise -> do
|
|
localcache creds
|
|
return c
|
|
where
|
|
localcache creds = writeCacheCredPair creds storage
|
|
|
|
storeconfig creds key (Just cipher) = do
|
|
cmd <- gpgCmd <$> Annex.getGitConfig
|
|
s <- liftIO $ encrypt cmd (pc, gc) cipher
|
|
(feedBytes $ L.pack $ encodeCredPair creds)
|
|
(readBytes $ return . L.unpack)
|
|
return $ M.insert key (mkval (Accepted (toB64 s))) c
|
|
storeconfig creds key Nothing =
|
|
return $ M.insert key (mkval (Accepted (toB64 $ encodeCredPair creds))) c
|
|
|
|
pc = parseconfig c
|
|
|
|
{- Gets a remote's credpair, from the environment if set, otherwise
|
|
- from the cache in gitAnnexCredsDir, or failing that, from the
|
|
- value in RemoteConfig. -}
|
|
getRemoteCredPair :: ParsedRemoteConfig -> RemoteGitConfig -> CredPairStorage -> Annex (Maybe CredPair)
|
|
getRemoteCredPair c gc storage = maybe fromcache (return . Just) =<< fromenv
|
|
where
|
|
fromenv = liftIO $ getEnvCredPair storage
|
|
fromcache = maybe fromconfig (return . Just) =<< readCacheCredPair storage
|
|
fromconfig = do
|
|
let key = credPairRemoteField storage
|
|
mcipher <- remoteCipher' c gc
|
|
case (getRemoteConfigValue key c, mcipher) of
|
|
(Nothing, _) -> return Nothing
|
|
(Just enccreds, Just (cipher, storablecipher)) ->
|
|
fromenccreds enccreds cipher storablecipher
|
|
(Just bcreds, Nothing) ->
|
|
fromcreds $ fromB64 bcreds
|
|
fromenccreds enccreds cipher storablecipher = do
|
|
cmd <- gpgCmd <$> Annex.getGitConfig
|
|
mcreds <- liftIO $ catchMaybeIO $ decrypt cmd (c, gc) cipher
|
|
(feedBytes $ L.pack $ fromB64 enccreds)
|
|
(readBytes $ return . L.unpack)
|
|
case mcreds of
|
|
Just creds -> fromcreds creds
|
|
Nothing -> do
|
|
-- Work around un-encrypted creds storage
|
|
-- bug in old S3 and glacier remotes.
|
|
-- Not a problem for shared cipher.
|
|
case storablecipher of
|
|
SharedCipher {} -> showLongNote "gpg error above was caused by an old git-annex bug in credentials storage. Working around it.."
|
|
_ -> giveup "*** Insecure credentials storage detected for this remote! See https://git-annex.branchable.com/upgrades/insecure_embedded_creds/"
|
|
fromcreds $ fromB64 enccreds
|
|
fromcreds creds = case decodeCredPair creds of
|
|
Just credpair -> do
|
|
writeCacheCredPair credpair storage
|
|
|
|
return $ Just credpair
|
|
_ -> error "bad creds"
|
|
|
|
getRemoteCredPairFor :: String -> ParsedRemoteConfig -> RemoteGitConfig -> CredPairStorage -> Annex (Maybe CredPair)
|
|
getRemoteCredPairFor this c gc storage = go =<< getRemoteCredPair c gc storage
|
|
where
|
|
go Nothing = do
|
|
warning $ missingCredPairFor this storage
|
|
return Nothing
|
|
go (Just credpair) = return $ Just credpair
|
|
|
|
missingCredPairFor :: String -> CredPairStorage -> String
|
|
missingCredPairFor this storage = unwords
|
|
[ "Set both", loginvar
|
|
, "and", passwordvar
|
|
, "to use", this
|
|
]
|
|
where
|
|
(loginvar, passwordvar) = credPairEnvironment storage
|
|
|
|
{- Gets a CredPair from the environment. -}
|
|
getEnvCredPair :: CredPairStorage -> IO (Maybe CredPair)
|
|
getEnvCredPair storage = liftM2 (,)
|
|
<$> getEnv uenv
|
|
<*> getEnv penv
|
|
where
|
|
(uenv, penv) = credPairEnvironment storage
|
|
|
|
{- Writes a cred pair to local cache, unless prevented by configuration. -}
|
|
writeCacheCredPair :: CredPair -> CredPairStorage -> Annex ()
|
|
writeCacheCredPair credpair storage =
|
|
whenM (annexCacheCreds <$> Annex.getGitConfig) $
|
|
writeCreds (encodeCredPair credpair) (credPairFile storage)
|
|
|
|
readCacheCredPair :: CredPairStorage -> Annex (Maybe CredPair)
|
|
readCacheCredPair storage = maybe Nothing decodeCredPair
|
|
<$> readCreds (credPairFile storage)
|
|
|
|
existsCacheCredPair :: CredPairStorage -> Annex Bool
|
|
existsCacheCredPair storage =
|
|
liftIO . doesFileExist =<< credsFile (credPairFile storage)
|
|
|
|
{- Stores the creds in a file inside gitAnnexCredsDir that only the user
|
|
- can read. -}
|
|
writeCreds :: Creds -> FilePath -> Annex ()
|
|
writeCreds creds file = do
|
|
d <- fromRepo gitAnnexCredsDir
|
|
createAnnexDirectory d
|
|
liftIO $ writeFileProtected (d </> file) creds
|
|
|
|
readCreds :: FilePath -> Annex (Maybe Creds)
|
|
readCreds f = liftIO . catchMaybeIO . readFileStrict =<< credsFile f
|
|
|
|
credsFile :: FilePath -> Annex FilePath
|
|
credsFile basefile = do
|
|
d <- fromRepo gitAnnexCredsDir
|
|
return $ d </> basefile
|
|
|
|
encodeCredPair :: CredPair -> Creds
|
|
encodeCredPair (l, p) = unlines [l, p]
|
|
|
|
decodeCredPair :: Creds -> Maybe CredPair
|
|
decodeCredPair creds = case lines creds of
|
|
l:p:[] -> Just (l, p)
|
|
_ -> Nothing
|
|
|
|
removeCreds :: FilePath -> Annex ()
|
|
removeCreds file = do
|
|
d <- fromRepo gitAnnexCredsDir
|
|
let f = d </> file
|
|
liftIO $ nukeFile f
|
|
|
|
includeCredsInfo :: ParsedRemoteConfig -> CredPairStorage -> [(String, String)] -> Annex [(String, String)]
|
|
includeCredsInfo pc@(ParsedRemoteConfig cm _) storage info = do
|
|
v <- liftIO $ getEnvCredPair storage
|
|
case v of
|
|
Just _ -> do
|
|
let (uenv, penv) = credPairEnvironment storage
|
|
ret $ "from environment variables (" ++ unwords [uenv, penv] ++ ")"
|
|
Nothing -> case (`M.lookup` cm) (credPairRemoteField storage) of
|
|
Nothing -> ifM (existsCacheCredPair storage)
|
|
( ret "stored locally"
|
|
, ret "not available"
|
|
)
|
|
Just _ -> case extractCipher pc of
|
|
Just (EncryptedCipher {}) -> ret "embedded in git repository (gpg encrypted)"
|
|
_ -> ret "embedded in git repository (not encrypted)"
|
|
where
|
|
ret s = return $ ("creds", s) : info
|