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

initremote: Prevent enabling encryption with exporttree=yes/importtree=yes

Browse source 
I do think this was a reversion, but I have not tracked back to what
version. While involving the remote config, it's not the same class of
problems that I kept having to chase down for a while after the remote
config parser reworking.
This commit is contained in:
Joey Hess 2020-12-15 12:08:08 -04:00
parent 74c1e0660b
commit 6c890d62f6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -22,6 +22,7 @@ git-annex (8.20201128) UNRELEASED; urgency=medium
current directory, rather than the path from the top of the repository. current directory, rather than the path from the top of the repository.
* importfeed: Avoid using youtube-dl when a feed does not contain an * importfeed: Avoid using youtube-dl when a feed does not contain an
enclosure, but only a link to an url which youtube-dl does not support. enclosure, but only a link to an url which youtube-dl does not support.
* initremote: Prevent enabling encryption with exporttree=yes/importtree=yes.
-- Joey Hess <id@joeyh.name> Mon, 30 Nov 2020 12:55:49 -0400 -- Joey Hess <id@joeyh.name> Mon, 30 Nov 2020 12:55:49 -0400

9
Remote/Helper/Encryptable.hs
View file

@ -20,6 +20,7 @@ module Remote.Helper.Encryptable (
cipherKey, cipherKey,
extractCipher, extractCipher,
isEncrypted, isEncrypted,
encryptionIsEnabled,
describeEncryption, describeEncryption,
encryptionField, encryptionField,
highRandomQualityField highRandomQualityField
@ -282,6 +283,14 @@ extractCipher c = case (getRemoteConfigValue cipherField c,
isEncrypted :: ParsedRemoteConfig -> Bool isEncrypted :: ParsedRemoteConfig -> Bool
isEncrypted = isJust . extractCipher isEncrypted = isJust . extractCipher
-- Check if encryption is enabled. This can be done before encryption
-- is fully set up yet, so the cipher might not be present yet.
encryptionIsEnabled :: ParsedRemoteConfig -> Bool
encryptionIsEnabled c = case getRemoteConfigValue encryptionField c of
Nothing -> False
Just NoneEncryption -> False
Just _ -> True
describeEncryption :: ParsedRemoteConfig -> String describeEncryption :: ParsedRemoteConfig -> String
describeEncryption c = case extractCipher c of describeEncryption c = case extractCipher c of
Nothing -> "none" Nothing -> "none"

4
Remote/Helper/ExportImport.hs
View file

@ -14,7 +14,7 @@ import Types.Remote
import Types.Key import Types.Key
import Types.ProposedAccepted import Types.ProposedAccepted
import Backend import Backend
import Remote.Helper.Encryptable (isEncrypted) import Remote.Helper.Encryptable (encryptionIsEnabled)
import qualified Database.Export as Export import qualified Database.Export as Export
import qualified Database.ContentIdentifier as ContentIdentifier import qualified Database.ContentIdentifier as ContentIdentifier
import Annex.Export import Annex.Export
@ -83,7 +83,7 @@ adjustExportImportRemoteType rt = rt { setup = setup' }
ifM (supported rt pc gc) ifM (supported rt pc gc)
( case st of ( case st of
Init Init
| configured pc && isEncrypted pc -> | configured pc && encryptionIsEnabled pc ->
giveup $ "cannot enable both encryption and " ++ fromProposedAccepted configfield giveup $ "cannot enable both encryption and " ++ fromProposedAccepted configfield
| otherwise -> cont | otherwise -> cont
Enable oldc -> do Enable oldc -> do

2
doc/bugs/initremote_with_export_and_import_allowed_with_encryption.mdwn
View file

@ -4,3 +4,5 @@ This should be rejected, but currently succeeds:
There is code in adjustExportImportRemoteType, and I remember it used to There is code in adjustExportImportRemoteType, and I remember it used to
work. --[[Joey]] work. --[[Joey]]
> [[fixed|done]] --[[Joey]]