add retrievalSecurityPolicy
This will be used to protect against CVE-2018-10859, where an encrypted special remote is fed the wrong encrypted data, and so tricked into decrypting something that the user encrypted with their gpg key and did not store in git-annex. It also protects against CVE-2018-10857, where a remote follows a http redirect to a file:// url or to a local private web server. While that's already been prevented in git-annex's own use of http, external special remotes, hooks, etc use other http implementations and could still be vulnerable. The policy is not yet enforced, this commit only adds the appropriate metadata to remotes. This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
This commit is contained in:
parent
537935333f
commit
4315bb9e42
19 changed files with 91 additions and 2 deletions
|
@ -162,6 +162,14 @@ specialRemote' cfg c preparestorer prepareretriever prepareremover preparecheckp
|
|||
(retrieveKeyFileCheap baser k f d)
|
||||
-- retrieval of encrypted keys is never cheap
|
||||
(\_ -> return False)
|
||||
-- When encryption is used, the remote could provide
|
||||
-- some other content encrypted by the user, and trick
|
||||
-- git-annex into decrypting it, leaking the decryption
|
||||
-- into the git-annex repository. Verifiable keys
|
||||
-- are the main protection against this attack.
|
||||
, retrievalSecurityPolicy = if isencrypted
|
||||
then RetrievalVerifiableKeysSecure
|
||||
else retrievalSecurityPolicy baser
|
||||
, removeKey = \k -> cip >>= removeKeyGen k
|
||||
, checkPresent = \k -> cip >>= checkPresentGen k
|
||||
, cost = if isencrypted
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue