aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* glacier, S3: Fix bug that caused embedded creds to not be encypted using the ↵Gravatar Joey Hess2014-09-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remote's key. encryptionSetup must be called before setRemoteCredPair. Otherwise, the RemoteConfig doesn't have the cipher in it, and so no cipher is used to encrypt the embedded creds. This is a security fix for non-shared encryption methods! For encryption=shared, there's no security problem, just an inconsistentency in whether the embedded creds are encrypted. This is very important to get right, so used some types to help ensure that setRemoteCredPair is only run after encryptionSetup. Note that the external special remote bypasses the type safety, since creds can be set after the initial remote config, if the external special remote program requests it. Also note that IA remotes never use encryption, so encryptionSetup is not run for them at all, and again the type safety is bypassed. This leaves two open questions: 1. What to do about S3 and glacier remotes that were set up using encryption=pubkey/hybrid with embedcreds? Such a git repo has a security hole embedded in it, and this needs to be communicated to the user. Is the changelog enough? 2. enableremote won't work in such a repo, because git-annex will try to decrypt the embedded creds, which are not encrypted, so fails. This needs to be dealt with, especially for ecryption=shared repos, which are not really broken, just inconsistently configured. Noticing that problem for encryption=shared is what led to commit cc54ff9e49260cd94f938e69e926a273e231ef4e, which tried to fix the problem by not decrypting the embedded creds. This commit was sponsored by Josh Taylor.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-09-18
|\
* | clarify that sync only commits changes to files already added to the repoGravatar Joey Hess2014-09-18
| |
| * Added a commentGravatar http://joeyh.name/2014-09-18
| |
| * Added a commentGravatar http://joeyh.name/2014-09-18
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-09-18
|\
* | Revert "S3, Glacier, WebDAV: Fix bug that prevented accessing the creds when ↵Gravatar Joey Hess2014-09-18
| | | | | | | | | | | | | | | | | | | | the repository was configured with encryption=shared embedcreds=yes." This reverts commit cc54ff9e49260cd94f938e69e926a273e231ef4e. I can find no basis for that commit and think that I made it in error. setRemoteCredPair always encrypts using the cipher from remoteCipher, even when the cipher is shared.
| * Added a commentGravatar xn2014-09-18
| |
* | mention old-style chunkingGravatar Joey Hess2014-09-18
| |
| * Added a commentGravatar http://joeyh.name/2014-09-18
| |
| * Added a commentGravatar http://joeyh.name/2014-09-18
| |
| * Added a commentGravatar http://joeyh.name/2014-09-18
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-09-18
|\
* | add: In direct mode, adding an annex symlink will check it into git, as was ↵Gravatar Joey Hess2014-09-18
| | | | | | | | already done in indirect mode.
| * Added a commentGravatar http://joeyh.name/2014-09-18
| |
| * Added a commentGravatar http://joeyh.name/2014-09-18
| |
| * Added a commentGravatar http://joeyh.name/2014-09-18
| |
| * Added a commentGravatar http://joeyh.name/2014-09-18
| |
| * Added a commentGravatar http://joeyh.name/2014-09-18
| |
| * Added a commentGravatar http://joeyh.name/2014-09-18
| |
| * Added a commentGravatar http://joeyh.name/2014-09-18
| |
| * Added a commentGravatar http://joeyh.name/2014-09-18
| |
* | retitleGravatar Joey Hess2014-09-18
| |
| * Added a commentGravatar rasmus2014-09-18
| |
| * Added a commentGravatar anarcat2014-09-17
| |
| * Added a comment: CamlistoreGravatar https://www.google.com/accounts/o8/id?id=AItOawmH7o6q2l99M-PQolOfbR3_i5B_jtTIcAE2014-09-17
| |
| * Added a commentGravatar http://joeyh.name/2014-09-17
| |
| * Added a comment: camlistoreGravatar anarcat2014-09-17
|/
* fix display of git-annex test command name in usageGravatar Joey Hess2014-09-17
| | | | | | This needs optparse-applicative 0.10. Dropped support for 0.9 and older, but kept 0.9.1 working since autobuilders and debian testing still use it. (The display is not perfect with 0.9.1.)
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-09-17
|\
* | WebDav: Fix enableremote crash when the remote already exists. (Bug ↵Gravatar Joey Hess2014-09-17
| | | | | | | | introduced in version 5.20140817.)
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawlog_5wIICaMcrKTexlFNA6IO6UTp323aE2014-09-17
| |
| * removedGravatar pot2014-09-17
| |
| * Added a commentGravatar pot2014-09-17
| |
| * Added a commentGravatar https://id.koumbit.net/anarcat2014-09-16
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-09-16
|\
* | devblogGravatar Joey Hess2014-09-16
| |
| * Added a commentGravatar http://joeyh.name/2014-09-16
| |
| * Added a commentGravatar http://joeyh.name/2014-09-16
| |
| * Added a comment: no need for c2hsGravatar http://joeyh.name/2014-09-16
| |
| * Added a commentGravatar http://joeyh.name/2014-09-16
|/
* comment reorgGravatar Joey Hess2014-09-16
|
* improveGravatar Joey Hess2014-09-16
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-09-16
|\
* | reorg and rewrote build-from-source instructionsGravatar Joey Hess2014-09-16
| |
| * Added a commentGravatar http://joeyh.name/2014-09-16
| |
| * Added a commentGravatar http://joeyh.name/2014-09-16
| |
| * Added a commentGravatar http://joeyh.name/2014-09-16
| |
| * Added a commentGravatar http://joeyh.name/2014-09-16
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-09-16
|\