Commit graph

21499 commits

Author SHA1 Message Date
Joey Hess
0ed33c8b74 deal with old repositories with non-encrypted creds
See 2f3c3aa01f for backstory about how a repo
could be in this state.

When decryption fails, the repo must be using non-encrypted creds. Note
that creds are encrypted/decrypted using the encryption cipher which is
stored in the repo, so the decryption cannot fail due to missing gpg keys
etc. (For !shared encryptiom, the cipher is iteself encrypted using some
gpg key(s), and the decryption of the cipher happens earlier, so not
affected by this change.

Print a warning message for !shared repos, and continue on using the
cipher. Wrote a page explaining what users hit by this bug should do.

This commit was sponsored by Samuel Tardieu.
2014-09-18 17:58:03 -04:00
Joey Hess
2f3c3aa01f glacier, S3: Fix bug that caused embedded creds to not be encypted using the 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
   fbdeeeed5f, which tried to
   fix the problem by not decrypting the embedded creds.

This commit was sponsored by Josh Taylor.
2014-09-18 17:26:12 -04:00
Joey Hess
3becc6a433 Merge branch 'master' of ssh://git-annex.branchable.com 2014-09-18 15:44:26 -04:00
Joey Hess
fe994e58e5 clarify that sync only commits changes to files already added to the repo 2014-09-18 15:43:20 -04:00
http://joeyh.name/
e26f28f5fc Added a comment 2014-09-18 19:41:39 +00:00
http://joeyh.name/
ac635f7ada Added a comment 2014-09-18 19:28:56 +00:00
Joey Hess
4b38a572ab Merge branch 'master' of ssh://git-annex.branchable.com 2014-09-18 15:23:01 -04:00
Joey Hess
d84eab8a8a Revert "S3, Glacier, WebDAV: Fix bug that prevented accessing the creds when the repository was configured with encryption=shared embedcreds=yes."
This reverts commit fbdeeeed5f.

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.
2014-09-18 15:21:47 -04:00
xn
2ebcc69d63 Added a comment 2014-09-18 19:03:30 +00:00
Joey Hess
2d99b6b931 mention old-style chunking 2014-09-18 14:54:35 -04:00
http://joeyh.name/
74ad8ebb0c Added a comment 2014-09-18 18:52:17 +00:00
http://joeyh.name/
ce0f2dd114 Added a comment 2014-09-18 18:49:43 +00:00
http://joeyh.name/
019a0ec802 Added a comment 2014-09-18 18:27:37 +00:00
Joey Hess
282a1d2a5d Merge branch 'master' of ssh://git-annex.branchable.com 2014-09-18 14:26:45 -04:00
Joey Hess
44e7d6e1fe add: In direct mode, adding an annex symlink will check it into git, as was already done in indirect mode. 2014-09-18 14:24:47 -04:00
http://joeyh.name/
4c2724f8f6 Added a comment 2014-09-18 18:05:33 +00:00
http://joeyh.name/
2abc00a182 Added a comment 2014-09-18 18:00:43 +00:00
http://joeyh.name/
4ba10c8dfe Added a comment 2014-09-18 17:55:21 +00:00
http://joeyh.name/
2889b97903 Added a comment 2014-09-18 17:43:44 +00:00
http://joeyh.name/
df8af94f4b Added a comment 2014-09-18 17:39:19 +00:00
http://joeyh.name/
c174d75745 Added a comment 2014-09-18 17:32:09 +00:00
http://joeyh.name/
8fb0256d8d Added a comment 2014-09-18 17:27:36 +00:00
http://joeyh.name/
baa937acf5 Added a comment 2014-09-18 16:54:10 +00:00
Joey Hess
d01829bb4e retitle 2014-09-18 12:38:49 -04:00
rasmus
ca5e79ff39 Added a comment 2014-09-18 11:28:45 +00:00
anarcat
dc254a62cc Added a comment 2014-09-17 20:53:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmH7o6q2l99M-PQolOfbR3_i5B_jtTIcAE
47cf94793f Added a comment: Camlistore 2014-09-17 20:36:43 +00:00
http://joeyh.name/
68d614d90d Added a comment 2014-09-17 20:20:40 +00:00
anarcat
e0e324779e Added a comment: camlistore 2014-09-17 20:18:57 +00:00
Joey Hess
90d172365d fix display of git-annex test command name in usage
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.)
2014-09-17 13:46:01 -04:00
Joey Hess
692928128a Merge branch 'master' of ssh://git-annex.branchable.com 2014-09-17 13:06:17 -04:00
Joey Hess
9964584c34 WebDav: Fix enableremote crash when the remote already exists. (Bug introduced in version 5.20140817.) 2014-09-17 13:04:55 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlog_5wIICaMcrKTexlFNA6IO6UTp323aE
3014165ad1 Added a comment 2014-09-17 08:47:03 +00:00
pot
18b919df06 removed 2014-09-17 03:52:04 +00:00
pot
8282ad1513 Added a comment 2014-09-17 03:51:37 +00:00
https://id.koumbit.net/anarcat
ff9cbf3d36 Added a comment 2014-09-16 20:35:24 +00:00
Joey Hess
2843b17706 Merge branch 'master' of ssh://git-annex.branchable.com 2014-09-16 16:18:10 -04:00
Joey Hess
2f09a59241 devblog 2014-09-16 16:16:25 -04:00
http://joeyh.name/
b46b46918e Added a comment 2014-09-16 19:50:42 +00:00
http://joeyh.name/
f6bac63edb Added a comment 2014-09-16 19:33:11 +00:00
http://joeyh.name/
481b3bb7ef Added a comment: no need for c2hs 2014-09-16 19:28:10 +00:00
http://joeyh.name/
e3f804a748 Added a comment 2014-09-16 19:19:00 +00:00
Joey Hess
fd36ff4e85 comment reorg 2014-09-16 15:16:13 -04:00
Joey Hess
552169bac5 improve 2014-09-16 15:12:09 -04:00
Joey Hess
5b8515c6d5 Merge branch 'master' of ssh://git-annex.branchable.com 2014-09-16 15:07:36 -04:00
Joey Hess
fb706ed194 reorg and rewrote build-from-source instructions 2014-09-16 15:05:12 -04:00
http://joeyh.name/
27f10e6081 Added a comment 2014-09-16 18:36:18 +00:00
http://joeyh.name/
8f1dfae463 Added a comment 2014-09-16 18:22:11 +00:00
http://joeyh.name/
9f3dc342e9 Added a comment 2014-09-16 18:13:18 +00:00
http://joeyh.name/
506aa25359 Added a comment 2014-09-16 18:07:54 +00:00