be stricter about rejecting invalid configurations for remotes
This is a first step toward that goal, using the ProposedAccepted type in RemoteConfig lets initremote/enableremote reject bad parameters that were passed in a remote's configuration, while avoiding enableremote rejecting bad parameters that have already been stored in remote.log This does not eliminate every place where a remote config is parsed and a default value is used if the parse false. But, I did fix several things that expected foo=yes/no and so confusingly accepted foo=true but treated it like foo=no. There are still some fields that are parsed with yesNo but not not checked when initializing a remote, and there are other fields that are parsed in other ways and not checked when initializing a remote. This also lays groundwork for rejecting unknown/typoed config keys.
This commit is contained in:
parent
ea3f206fd1
commit
71ecfbfccf
45 changed files with 395 additions and 224 deletions
|
@ -11,6 +11,7 @@ import Utility.Gpg
|
|||
import Utility.UserInfo
|
||||
import Types.Remote (RemoteConfigField)
|
||||
import Annex.SpecialRemote.Config
|
||||
import Types.ProposedAccepted
|
||||
|
||||
import qualified Data.Map as M
|
||||
import Control.Applicative
|
||||
|
@ -31,7 +32,7 @@ data EnableEncryption = HybridEncryption | SharedEncryption | NoEncryption
|
|||
deriving (Eq)
|
||||
|
||||
{- Generates Remote configuration for encryption. -}
|
||||
configureEncryption :: EnableEncryption -> (RemoteConfigField, String)
|
||||
configureEncryption SharedEncryption = (encryptionField, "shared")
|
||||
configureEncryption NoEncryption = (encryptionField, "none")
|
||||
configureEncryption HybridEncryption = (encryptionField, "hybrid")
|
||||
configureEncryption :: EnableEncryption -> (RemoteConfigField, ProposedAccepted String)
|
||||
configureEncryption SharedEncryption = (encryptionField, Proposed "shared")
|
||||
configureEncryption NoEncryption = (encryptionField, Proposed "none")
|
||||
configureEncryption HybridEncryption = (encryptionField, Proposed "hybrid")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue