Commit graph

5270 commits

Author SHA1 Message Date
Joey Hess
5cfa5213d2 Merge branch 'master' of ssh://git-annex.branchable.com 2014-09-26 15:37:59 -04:00
JerSou
b827558f39 Added a comment 2014-09-25 19:27:43 +00:00
JerSou
3cc9b960d9 removed 2014-09-25 19:26:58 +00:00
JerSou
62e2c3e9c9 Added a comment 2014-09-25 19:26:03 +00:00
Joey Hess
459db7a367 Merge branch 'master' of ssh://git-annex.branchable.com 2014-09-24 10:52:03 -04:00
http://svario.it/gioele
f47cebf38e Added a comment 2014-09-24 07:15:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmK0703vNSIQsP1mGf-4MAPnsBZiSc6yVo
7c8f63107d Added a comment 2014-09-23 21:15:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmK0703vNSIQsP1mGf-4MAPnsBZiSc6yVo
a29dba3027 Added a comment 2014-09-23 20:58:10 +00:00
http://joeyh.name/
c31ea37104 Added a comment 2014-09-23 20:27:25 +00:00
Joey Hess
21672e7b17 close 2014-09-23 16:19:45 -04:00
dirkz
b0c4300868 2014-09-20 14:55:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmK0703vNSIQsP1mGf-4MAPnsBZiSc6yVo
70813b0e29 2014-09-19 21:45:42 +00:00
http://joeyh.name/
9ad3746abb Added a comment 2014-09-19 18:33:17 +00:00
annexuser
80232ac871 Added a comment 2014-09-19 04:43:42 +00: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
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
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
Joey Hess
2abeae7582 Windows: Avoid crashing trying to list gpg secret keys, for gcrypt which is not yet supported on Windows. 2014-09-16 13:40:44 -04:00
Kim
734c1fa4a3 2014-09-14 22:03:23 +00:00
Joey Hess
632e5aee35 fixed 2014-09-13 16:27:07 -04:00
http://joeyh.name/
ac0945b9d0 Added a comment: turns out to be an upstream bug already filed 2014-09-12 17:46:23 +00:00
http://joeyh.name/
61b75d0475 Added a comment 2014-09-12 16:38:48 +00:00
http://joeyh.name/
6ae36f5445 Added a comment 2014-09-12 16:34:56 +00:00
http://joeyh.name/
db0f679f54 Added a comment 2014-09-12 16:03:09 +00:00
http://grossmeier.net/
cc58b5089c initial 2014-09-12 01:24:47 +00:00
https://andrew.aylett.co.uk/
64d9e0b580 Added a comment 2014-09-11 19:03:07 +00:00
Joey Hess
ea1891cbca Merge branch 'master' of ssh://git-annex.branchable.com 2014-09-11 14:50:47 -04:00
Joey Hess
9711d529c8 WORM backend: Switched to include the relative path to the file inside the repository, rather than just the file's base name. Note that if you're relying on such things to keep files separate with WORM, you should really be using a better backend. 2014-09-11 14:50:18 -04:00
http://joeyh.name/
4953fafd68 Added a comment 2014-09-11 18:41:45 +00:00
Joey Hess
ea9f66ef6a Merge branch 'master' of ssh://git-annex.branchable.com 2014-09-11 14:35:55 -04:00
Joey Hess
4c429ad7ee sync: Ensure that pending changes to git-annex branch are committed when in direct mode. (Fixing a very minor reversion.) 2014-09-11 14:35:28 -04:00
http://joeyh.name/
2139c55986 Added a comment 2014-09-11 18:34:02 +00:00
http://joeyh.name/
f08a6c96f8 Added a comment 2014-09-11 18:11:43 +00:00
Joey Hess
e82eeab3c4 close 2014-09-11 14:07:35 -04:00
Joey Hess
843396ea2f Merge branch 'master' of ssh://git-annex.branchable.com 2014-09-11 14:06:26 -04:00
Joey Hess
de05ac11af document need for msysgit installer to put it into PATH 2014-09-11 14:01:08 -04:00
http://joeyh.name/
4d4e1f9237 Added a comment 2014-09-11 17:55:28 +00:00
Joey Hess
0598412e5c Fix transfer lock file FD leak that could occur when two separate git-annex processes were both working to perform the same set of transfers. 2014-09-11 13:53:26 -04:00
http://joeyh.name/
8a4d030aae Added a comment 2014-09-11 17:45:31 +00:00
Joey Hess
c489dff1a7 dup of old, long fixed bug 2014-09-11 13:45:26 -04:00
Joey Hess
80ba5b4935 close 2014-09-11 13:39:28 -04:00
Joey Hess
9ed63d1545 Promote file not found warning message to an error. 2014-09-11 13:36:28 -04:00
Joey Hess
79deba1f51 Merge branch 'master' of ssh://git-annex.branchable.com 2014-09-11 13:22:49 -04:00
Joey Hess
a97c9e43b7 The annex-rsync-transport configuration is now also used when checking if a key is present on a rsync remote, and when dropping a key from the remote. 2014-09-11 13:21:35 -04:00
pot
5961191981 2014-09-11 06:02:37 +00:00
Joey Hess
286021cebc Merge branch 'master' of ssh://git-annex.branchable.com 2014-09-10 15:15:26 -04:00
Joey Hess
3814b664a7 retitle 2014-09-10 14:27:25 -04:00