Commit graph

22010 commits

Author SHA1 Message Date
Joey Hess
6b52fcbb7e
SHA1 collisions in key names was more exploitable than I thought
Yesterday's SHA1 collision attack could be used to generate eg:

SHA256-sfoo--whatever.good
SHA256-sfoo--whatever.bad

Such that they collide. A repository with the good one could have the
bad one swapped in and signed commits would still verify.

I've already mitigated this.
2017-02-24 19:54:36 -04:00
Joey Hess
634a485b50
update 2017-02-24 17:57:21 -04:00
Joey Hess
1f0d0ab4b3
Revert "pointer to a todo"
This reverts commit ae3f6705eb.

todo is not ready yet
2017-02-24 15:40:28 -04:00
Joey Hess
ae3f6705eb
pointer to a todo 2017-02-24 13:41:29 -04:00
Joey Hess
9de0767d0e
update 2017-02-24 12:31:23 -04:00
Joey Hess
6346704a04
clarify that annex.backends is used when adding new files
Even if annex.backends does not include a backend, that does not prevent
git-annex commands from acting on a file using the missing backend.

(There's really no reason at all for annex.backends to be a list.)
2017-02-24 11:53:59 -04:00
Joey Hess
8971949d60
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-24 11:33:57 -04:00
Joey Hess
35739a74c2
make file2key reject E* backend keys with a long extension
I am not happy that I had to put backend-specific code in file2key. But
it would be very difficult to avoid this layering violation.

Most of the time, when parsing a Key from a symlink target, git-annex
never looks up its Backend at all, so adding this check to a method of
the Backend object would not work.

The Key could be made to contain the appropriate
Backend, but since Backend is parameterized on an "a" that is fixed to
the Annex monad later, that would need Key to change to "Key a".

The only way to clean this up that I can see would be to have the Key
contain a LowlevelBackend, and put the validation in LowlevelBackend.
Perhaps later, but that would be an extensive change, so let's not do
it in this commit which may want to cherry-pick to backports.

This commit was sponsored by Ethan Aubin.
2017-02-24 11:22:15 -04:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
4a7ae6f9c0 Added a comment 2017-02-24 13:00:10 +00:00
Joey Hess
63df8d8966
update 2017-02-24 02:14:36 -04:00
Joey Hess
44b9ac41a4
update 2017-02-24 01:21:54 -04:00
Joey Hess
4cad401629
updates 2017-02-24 00:28:15 -04:00
Joey Hess
969da82b5c
update 2017-02-24 00:21:58 -04:00
Joey Hess
60d99a80a6
Tighten key parser to not accept keys containing a non-numeric fields, which could be used to embed data useful for a SHA1 attack against git.
Also todo about why this is important, and with some further hardening to
add.

This commit was sponsored by Ignacio on Patreon.
2017-02-24 00:17:25 -04:00
Joey Hess
0dec2257f0
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-23 19:08:03 -04:00
Joey Hess
5a88cab005
add para 2017-02-23 19:06:06 -04:00
unicell@9c0b0afd4176d5933d4b5c41350ebe61488c1df0
342e256bc5 Added a comment 2017-02-23 23:05:10 +00:00
Joey Hess
9bee19ed38
slight correction 2017-02-23 17:11:46 -04:00
Joey Hess
aa8ab352f2
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-23 16:44:07 -04:00
Joey Hess
aae9e15a97
devblog 2017-02-23 16:43:15 -04:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
9f9d7ae029 Added a comment 2017-02-22 16:48:04 +00:00
lhunath@3b4ff15f4600f3276d1776a490b734fca0f5c245
a9a15f63a4 2017-02-22 16:12:10 +00:00
jean.jordaan@4bb3bd508a9eb0a4bab5d1b587dadd2b6c4a7edc
581144a988 2017-02-22 04:23:29 +00:00
jean.jordaan@4bb3bd508a9eb0a4bab5d1b587dadd2b6c4a7edc
3c7b7ebf0c 2017-02-22 04:22:51 +00:00
db48x
283aca3dfb 2017-02-22 00:37:22 +00:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
69f7b8af48 Added a comment 2017-02-21 06:20:35 +00:00
Joey Hess
75a15e1ad7
status: Pass --ignore-submodules=when option on to git status.
Didn't make --ignore-submodules without a value be handled because I can't
see a way to make optparse-applicative parse that. I've opened a bug
requesting a way to do that:
https://github.com/pcapriotti/optparse-applicative/issues/243
2017-02-20 17:01:24 -04:00
Joey Hess
a53daff32c
question 2017-02-20 16:14:43 -04:00
Joey Hess
7a0d6d81a0
make curl show http errors to stderr
* Run curl with -S, so HTTP errors are displayed, even when
  it's otherwise silent.
* When downloading in --json or --quiet mode, use curl in preference
  to wget, since curl is able to display only errors to stderr, unlike
  wget.

This does mean that downloadQuiet is only silent on stdout, not necessarily
on stderr, which affects a couple other calls of it. For example,
downloading the .git/config of a http remote may show an error message now,
perhaps with slightly suboptimal formatting due to other output.
2017-02-20 16:09:32 -04:00
Joey Hess
07de7c2c76
update 2017-02-20 15:44:43 -04:00
Joey Hess
302370d5c3
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-20 15:25:57 -04:00
Joey Hess
4a397b5313
Run wget with -nv instead of -q, so it will display HTTP errors.
This adds one extra line of output when a download is successful,
after the progress bar. I don't much like that, but wget does not provide a
way to show HTTP errors without it.
2017-02-20 15:25:02 -04:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
2e2bc1895f removed 2017-02-20 19:07:55 +00:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
15cf298271 Added a comment 2017-02-20 19:07:22 +00:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
6728330b2c Added a comment 2017-02-20 19:06:58 +00:00
Joey Hess
3488679a81
comment 2017-02-20 14:49:03 -04:00
Joey Hess
221f62ea5e
comment 2017-02-20 14:37:59 -04:00
andrew
bfb38eecea Added a comment: the problem files 2017-02-20 18:11:03 +00:00
Joey Hess
a13c0ce66c
adjust: Fix behavior when used in a repository that contains submodules.
Also fixed the LsFiles parser to not assume its output has a fixed width
type field.
2017-02-20 13:44:55 -04:00
Joey Hess
5169f84f22
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-20 13:11:19 -04:00
Joey Hess
6e6a36fd5b
comment 2017-02-20 13:10:48 -04:00
Joey Hess
5d2e99a5ac
comment 2017-02-20 12:55:58 -04:00
Joey Hess
da207245f1
comment 2017-02-20 12:49:16 -04:00
Joey Hess
6ba8b557e8
remove
I've seen this thing, whatever it is, mentioned in spam links before,
so even if it's valid for some OS (probably not the one being asked
about), it's verboten here.
2017-02-20 12:24:15 -04:00
Joey Hess
d80cf5b9e9
comment 2017-02-20 12:23:22 -04:00
Joey Hess
c5cf5cf03a
git-annex.cabal: Make crypto-api a dependency even when built w/o webapp and test suite.
The p2p code made it always be needed.

This commit was sponsored by Anthony DeRobertis on Patreon.
2017-02-20 12:21:35 -04:00
Joey Hess
f31aadc7c2
comment 2017-02-20 12:17:09 -04:00
Joey Hess
74a942382d
comment 2017-02-20 12:07:20 -04:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
76f4cde9cc 2017-02-20 08:12:10 +00:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
27a40a97cd 2017-02-20 07:58:33 +00:00
openmedi
8c00d695aa Added a comment 2017-02-19 22:03:26 +00:00
m@2be305d83b52202ec4364229a836f463a6701336
2a9599c176 2017-02-19 19:03:24 +00:00
mhauru
f49066d9c6 2017-02-19 18:48:59 +00:00
openmedi
f339047be9 Added a comment 2017-02-19 15:27:08 +00:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
a1e43697b6 2017-02-18 16:28:45 +00:00
openmedi
66c822b489 2017-02-18 13:42:45 +00:00
openmedi
475773a06b 2017-02-18 13:41:57 +00:00
Joey Hess
32782ab324
linkify 2017-02-17 15:58:32 -04:00
Joey Hess
4bc1e03bb7
devblog 2017-02-17 15:56:38 -04:00
Joey Hess
a700fdf5cf
documentation updates for new receive.denyCurrentBranch=updateInstead support
This commit was sponsored by andrea rota.
2017-02-17 15:43:16 -04:00
Joey Hess
d074532aff
post-recive hook to make updateInstead work in direct mode and adjusted branches
* Added post-recieve hook, which makes updateInstead work with direct
  mode and adjusted branches.
* init: Set up the post-receive hook.

This commit was sponsored by Fernando Jimenez on Patreon.
2017-02-17 14:04:43 -04:00
Joey Hess
de4d50e9d0
thoughts 2017-02-17 12:57:55 -04:00
Joey Hess
f36d789eef
comment 2017-02-17 12:36:23 -04:00
Joey Hess
e93d4bfa85
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-17 12:31:47 -04:00
yarikoptic
7fa1329877 initial whining 2017-02-17 15:30:32 +00:00
lasitus
ccdb4bdfa1 Added a comment 2017-02-17 03:23:46 +00:00
yarikoptic
2f601791bf 2017-02-17 01:57:11 +00:00
binx
54ce959986 2017-02-17 00:01:12 +00:00
Joey Hess
a2b848aba2
cleanup 2017-02-16 16:00:18 -04:00
JohnKozak
fa244ac433 removed 2017-02-16 18:45:41 +00:00
JohnKozak
b15ad04f33 Added a comment 2017-02-16 18:44:36 +00:00
JohnKozak
9d563d6f4c remove crud from transcript 2017-02-16 17:59:54 +00:00
Joey Hess
d0651bb567
make query commands not output extraneous messages
config group groupwanted numcopies schedule wanted required:  Avoid
displaying extraneous messages about repository auto-init, git-annex branch
merging, etc, when being used to get information.
2017-02-16 13:24:35 -04:00
yarikoptic
baa2ab2c7d Added a comment 2017-02-16 15:54:18 +00:00
CandyAngel
bb262be6f0 Added a comment 2017-02-16 14:10:56 +00:00
JohnKozak
81d0eb3567 2017-02-16 13:56:30 +00:00
andy
b36e8e53c3 Added a comment 2017-02-16 06:34:50 +00:00
yarikoptic
9cdb0125c7 2017-02-16 03:49:46 +00:00
Joey Hess
de671658ee
devblog 2017-02-15 16:44:10 -04:00
Joey Hess
a73c8ce4a1
sync: Improve integration with receive.denyCurrentBranch=updateInstead
By displaying error messages from the remote then it fails to update
its checked out branch.

Error messages in the default receive.denyCurrentBranch are still
suppressed, which matches user expectations.

This commit was sponsored by Nick Daly on Patreon.
2017-02-15 16:13:30 -04:00
Joey Hess
f07af03018
Run ssh with -n whenever input is not being piped into it
... to avoid it consuming stdin that it shouldn't.

This fixes git-annex-checkpresentkey --batch remote, which didn't output
results for all keys passed into it.

Other git-annex commands that communicate with a remote over ssh may also
have been consuming stdin that they shouldn't have, which could have
impacted using them in eg, shell scripts. For example, a shell script
reading files from stdin and passing them to git annex drop would be
impacted by this bug, whenever git annex drop ran git-annex-shell
checkpresent, it would consume part/all of the stdin that the shell script
was supposed to consume.

Fixed by adding a ConsumeStdin parameter to Annex.Ssh.sshOptions, which
is used throughout git-annex to run ssh (in order for ssh connection
caching to work). Every call site was checked to see if it used
CreatePipe for stdin, and if not was marked NoConsumeStdin.
2017-02-15 15:08:46 -04:00
Joey Hess
a0222ea7eb
add the new armel-ancient build 2017-02-15 14:43:19 -04:00
lasitus
c8f87f1433 Added a comment 2017-02-15 16:01:39 +00:00
CandyAngel
aadd43e81c 2017-02-15 11:13:25 +00:00
lasitus
fb356bd39c Added a comment 2017-02-15 02:17:25 +00:00
lasitus
aec64ce496 removed 2017-02-15 02:14:05 +00:00
lasitus
5227da6d8a Added a comment 2017-02-15 02:13:25 +00:00
Joey Hess
9fe402187e
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-14 17:42:25 -04:00
Joey Hess
e8b9565b6f
thoughts 2017-02-14 17:39:37 -04:00
db48x
1f7b8373cc Added a comment 2017-02-14 21:10:13 +00:00
https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e
f84a16f2fa Added a comment 2017-02-14 20:21:41 +00:00
lasitus
9d690a18bd Added a comment 2017-02-14 19:08:38 +00:00
Joey Hess
248f48f754
add news item for git-annex 6.20170214 2017-02-14 14:56:57 -04:00
Joey Hess
4e3f4f6e4e
comment 2017-02-14 14:54:53 -04:00
Joey Hess
2d4a24bc6b
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-14 14:49:23 -04:00
lasitus
2233a50f45 Added a comment 2017-02-14 18:46:22 +00:00
Joey Hess
3aecb1d059
response 2017-02-14 14:21:58 -04:00
http://xgm.de/oid/
61f362b4ff 2017-02-14 18:14:24 +00:00
http://xgm.de/oid/
6a711d4a1d Added a comment 2017-02-14 18:03:27 +00:00
https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e
79e8d19850 removed 2017-02-14 00:05:09 +00:00