git-annex.git
9 years agoAdded a comment: Corrupt Links Produced, Significant Data Loss
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730 [Sat, 10 Dec 2016 12:31:32 +0000 (12:31 +0000)]
Added a comment: Corrupt Links Produced, Significant Data Loss

9 years agoAdded a comment
alpernebbi [Sat, 10 Dec 2016 07:36:04 +0000 (07:36 +0000)]
Added a comment

9 years agohang up connection after relaying
Joey Hess [Fri, 9 Dec 2016 21:11:16 +0000 (17:11 -0400)]
hang up connection after relaying

Seems that git upload-pack outputs a "ONCDN " that is not read by the
remote git receive-pack. This fixes:

[2016-12-09 17:08:32.77159731] P2P > ERROR protocol parse error: "ONCDN "

9 years agoupdate
Joey Hess [Fri, 9 Dec 2016 21:07:32 +0000 (17:07 -0400)]
update

9 years agofix uuid comparison
Joey Hess [Fri, 9 Dec 2016 21:02:21 +0000 (17:02 -0400)]
fix uuid comparison

9 years agoavoid exposing auth tokens in debug
Joey Hess [Fri, 9 Dec 2016 20:55:48 +0000 (16:55 -0400)]
avoid exposing auth tokens in debug

9 years agodevblog
Joey Hess [Fri, 9 Dec 2016 20:46:37 +0000 (16:46 -0400)]
devblog

9 years agodebug dump P2P messages
Joey Hess [Fri, 9 Dec 2016 20:45:36 +0000 (16:45 -0400)]
debug dump P2P messages

9 years agomake tor hidden service work when directory watching is not available
Joey Hess [Fri, 9 Dec 2016 20:27:20 +0000 (16:27 -0400)]
make tor hidden service work when directory watching is not available

Avoid crashing when built w/o inotify..

9 years agocleanup
Joey Hess [Fri, 9 Dec 2016 20:22:00 +0000 (16:22 -0400)]
cleanup

9 years agobump maxConnections to 100
Joey Hess [Fri, 9 Dec 2016 20:03:25 +0000 (16:03 -0400)]
bump maxConnections to 100

10 seemed too low because more than 10 friends could be linked to a repo
over tor, and if all were running the remotedaemon, which makes a
persistent connection for change notification, then the 11th friend
would not be able to access that repo.

100 might be too low, but it's a much larger group of people. And at
that size group, it probably makes sense to structure the network so
that 100 peers are not all trying to access one central node.

9 years agoremotedaemon: git change detection over tor hidden service
Joey Hess [Fri, 9 Dec 2016 20:02:43 +0000 (16:02 -0400)]
remotedaemon: git change detection over tor hidden service

9 years agoonly start ref change watcher thread once per P2P connection
Joey Hess [Fri, 9 Dec 2016 19:08:54 +0000 (15:08 -0400)]
only start ref change watcher thread once per P2P connection

This is more efficient. Note that the peer will get CHANGED messages for
all refs changed since the connection opened, even if those changes
happened before it sent NOTIFYCHANGE.

9 years agorefactor ref change watching
Joey Hess [Fri, 9 Dec 2016 18:52:38 +0000 (14:52 -0400)]
refactor ref change watching

Added to change notification to P2P protocol.

Switched to a TBChan so that a single long-running thread can be
started, and serve perhaps intermittent requests for change
notifications, without buffering all changes in memory.

The P2P runner currently starts up a new thread each times it waits
for a change, but that should allow later reusing a thread. Although
each connection from a peer will still need a new watcher thread to run.

The dependency on stm-chans is more or less free; some stuff in yesod
uses it, so it was already indirectly pulled in when building with the
webapp.

This commit was sponsored by Francois Marier on Patreon.

9 years agoupdate
Joey Hess [Fri, 9 Dec 2016 17:38:50 +0000 (13:38 -0400)]
update

9 years agogit-annex-shell, remotedaemon, git remote: Fix some memory DOS attacks.
Joey Hess [Fri, 9 Dec 2016 17:34:00 +0000 (13:34 -0400)]
git-annex-shell, remotedaemon, git remote: Fix some memory DOS attacks.

The attacker could just send a very lot of data, with no \n and it would
all be buffered in memory until the kernel killed git-annex or perhaps OOM
killed some other more valuable process.

This is a low impact security hole, only affecting communication between
local git-annex and git-annex-shell on the remote system. (With either
able to be the attacker). Only those with the right ssh key can do it. And,
there are probably lots of ways to construct git repositories that make git
use a lot of memory in various ways, which would have similar impact as
this attack.

The fix in P2P/IO.hs would have been higher impact, if it had made it to a
released version, since it would have allowed DOSing the tor hidden
service without needing to authenticate.

(The LockContent and NotifyChanges instances may not be really
exploitable; since the line is read and ignored, it probably gets read
lazily and does not end up staying buffered in memory.)

9 years agodebug on error serving peer
Joey Hess [Fri, 9 Dec 2016 17:00:19 +0000 (13:00 -0400)]
debug on error serving peer

9 years agofix
Joey Hess [Fri, 9 Dec 2016 16:56:38 +0000 (12:56 -0400)]
fix

9 years agomake clear that log is only updated after successful removal
Joey Hess [Fri, 9 Dec 2016 16:54:18 +0000 (12:54 -0400)]
make clear that log is only updated after successful removal

This does not change behavior, because an exception is thrown on
unsuccessful removal. But is clearer.

9 years agotypo
Joey Hess [Fri, 9 Dec 2016 16:54:12 +0000 (12:54 -0400)]
typo

9 years agocontent removal is supposed to succed if the content was already not present
Joey Hess [Fri, 9 Dec 2016 16:47:57 +0000 (12:47 -0400)]
content removal is supposed to succed if the content was already not present

9 years agoimprove warning on connection loss
Joey Hess [Fri, 9 Dec 2016 16:35:45 +0000 (12:35 -0400)]
improve warning on connection loss

9 years agotodo
Joey Hess [Fri, 9 Dec 2016 00:55:46 +0000 (20:55 -0400)]
todo

9 years agomore todo
Joey Hess [Fri, 9 Dec 2016 00:15:12 +0000 (20:15 -0400)]
more todo

9 years agoupdate progress logs in remotedaemon send/receive
Joey Hess [Thu, 8 Dec 2016 23:56:02 +0000 (19:56 -0400)]
update progress logs in remotedaemon send/receive

9 years agoavoid remotedaemon outputting misc Messages when running
Joey Hess [Thu, 8 Dec 2016 22:42:59 +0000 (18:42 -0400)]
avoid remotedaemon outputting misc Messages when running

It's a daemon or is communictaing with the assistant over stdio, so
should not display checksum messages etc while serving the P2P protocol
etc.

9 years agofix memory leak
Joey Hess [Thu, 8 Dec 2016 22:26:03 +0000 (18:26 -0400)]
fix memory leak

I'm unsure why this fixed it, but it did. Seems to suggest that the
memory leak is not due to a bug in my code, but that ghc didn't manage
to take full advantage of laziness, or was failing to gc something it
could have.

9 years agocorrection
Joey Hess [Thu, 8 Dec 2016 22:25:51 +0000 (18:25 -0400)]
correction

9 years agoanalysis
Joey Hess [Thu, 8 Dec 2016 21:50:59 +0000 (17:50 -0400)]
analysis

9 years agoprofiling
Joey Hess [Thu, 8 Dec 2016 21:34:26 +0000 (17:34 -0400)]
profiling

9 years agoconsistent caps
Joey Hess [Thu, 8 Dec 2016 21:17:01 +0000 (17:17 -0400)]
consistent caps

9 years agocomment
Joey Hess [Thu, 8 Dec 2016 21:12:02 +0000 (17:12 -0400)]
comment

9 years agodidn't mean to commit this change yet
Joey Hess [Thu, 8 Dec 2016 21:10:48 +0000 (17:10 -0400)]
didn't mean to commit this change yet

9 years agocomment
Joey Hess [Thu, 8 Dec 2016 21:10:24 +0000 (17:10 -0400)]
comment

9 years agoupdate instructions to work better
Joey Hess [Thu, 8 Dec 2016 20:55:40 +0000 (16:55 -0400)]
update instructions to work better

9 years agowe have a memory leak
Joey Hess [Thu, 8 Dec 2016 20:35:33 +0000 (16:35 -0400)]
we have a memory leak

9 years agomove byteable to main dep list
Joey Hess [Thu, 8 Dec 2016 20:31:08 +0000 (16:31 -0400)]
move byteable to main dep list

Only the webapp had pulled it in, but the authtoken code uses it now.

9 years agoforce sofar calculation
Joey Hess [Thu, 8 Dec 2016 20:28:07 +0000 (16:28 -0400)]
force sofar calculation

This could avoid a memory leak. It would only happen when
the meter didn't look at sofar.

9 years agobetter format error
Joey Hess [Thu, 8 Dec 2016 20:02:26 +0000 (16:02 -0400)]
better format error

9 years agoupdate
Joey Hess [Thu, 8 Dec 2016 20:00:29 +0000 (16:00 -0400)]
update

9 years agomove to debug
Joey Hess [Thu, 8 Dec 2016 19:56:36 +0000 (15:56 -0400)]
move to debug

9 years agoconvert P2P runners from Maybe to Either String
Joey Hess [Thu, 8 Dec 2016 19:47:49 +0000 (15:47 -0400)]
convert P2P runners from Maybe to Either String

So we get some useful error messages when things fail.

This commit was sponsored by Peter Hogg on Patreon.

9 years agofix laziness problem in git relaying
Joey Hess [Thu, 8 Dec 2016 19:15:29 +0000 (15:15 -0400)]
fix laziness problem in git relaying

The switch to hGetMetered subtly changed the laziness of how DATA was
read, and broke git protocol relaying. Fix by sending received data to
the git process's stdin immediately, which ensures that the lazy
bytestring is all read from the peer before going on to process the next
message from the peer.

9 years agoinclude error message when unable to connect to peer
Joey Hess [Thu, 8 Dec 2016 18:14:08 +0000 (14:14 -0400)]
include error message when unable to connect to peer

9 years agoupdate
Joey Hess [Thu, 8 Dec 2016 17:58:11 +0000 (13:58 -0400)]
update

9 years agofix build with old ghc
Joey Hess [Thu, 8 Dec 2016 17:58:03 +0000 (13:58 -0400)]
fix build with old ghc

9 years agofix links
Joey Hess [Wed, 7 Dec 2016 20:11:30 +0000 (16:11 -0400)]
fix links

9 years agolink to git-annex-metadata-gui
Joey Hess [Wed, 7 Dec 2016 20:09:30 +0000 (16:09 -0400)]
link to git-annex-metadata-gui

9 years agoadd git-annex-adaptor
Joey Hess [Wed, 7 Dec 2016 20:06:56 +0000 (16:06 -0400)]
add git-annex-adaptor

9 years agogit-annex-metadata-gui yay!
Joey Hess [Wed, 7 Dec 2016 20:00:12 +0000 (16:00 -0400)]
git-annex-metadata-gui yay!

9 years agodevblog
Joey Hess [Wed, 7 Dec 2016 19:50:54 +0000 (15:50 -0400)]
devblog

9 years agotodo
Joey Hess [Wed, 7 Dec 2016 19:49:15 +0000 (15:49 -0400)]
todo

9 years agoadd page for tor special remote
Joey Hess [Wed, 7 Dec 2016 19:44:18 +0000 (15:44 -0400)]
add page for tor special remote

9 years agoupdate
Joey Hess [Wed, 7 Dec 2016 19:38:37 +0000 (15:38 -0400)]
update

9 years agofix math error that caused resumes to always fail
Joey Hess [Wed, 7 Dec 2016 19:36:39 +0000 (15:36 -0400)]
fix math error that caused resumes to always fail

9 years agoReadWriteMode not AppendMode
Joey Hess [Wed, 7 Dec 2016 19:24:28 +0000 (15:24 -0400)]
ReadWriteMode not AppendMode

AppendMode does not allow seeking..

9 years agoadd section on tor speed
Joey Hess [Wed, 7 Dec 2016 19:21:38 +0000 (15:21 -0400)]
add section on tor speed

9 years agoopen file for append, not write, so resuming works
Joey Hess [Wed, 7 Dec 2016 19:06:07 +0000 (15:06 -0400)]
open file for append, not write, so resuming works

WriteMode zeros any existing content, so the seek filled with zeros, and
verification failed after download.

9 years agooffset meters when resuming
Joey Hess [Wed, 7 Dec 2016 18:52:10 +0000 (14:52 -0400)]
offset meters when resuming

9 years agotodo
Joey Hess [Wed, 7 Dec 2016 18:46:27 +0000 (14:46 -0400)]
todo

9 years agoMerge branch 'master' into tor
Joey Hess [Wed, 7 Dec 2016 18:32:25 +0000 (14:32 -0400)]
Merge branch 'master' into tor

9 years agomore p2p progress meters
Joey Hess [Wed, 7 Dec 2016 18:25:01 +0000 (14:25 -0400)]
more p2p progress meters

Display progress meter on send and receive from remote.

Added a new hGetMetered that can read an exact number of bytes (or
less), updating a meter as it goes.

This commit was sponsored by Andreas on Patreon.

9 years agoadd section on security
Joey Hess [Wed, 7 Dec 2016 17:58:10 +0000 (13:58 -0400)]
add section on security

9 years agoupdate progress meter when sending to p2p remote
Joey Hess [Wed, 7 Dec 2016 17:37:35 +0000 (13:37 -0400)]
update progress meter when sending to p2p remote

This commit was sponsored by Thom May on Patreon.

9 years agoupdate
Joey Hess [Wed, 7 Dec 2016 16:48:24 +0000 (12:48 -0400)]
update

9 years agovalidate peer uuid each time we talk to it
Joey Hess [Wed, 7 Dec 2016 16:39:28 +0000 (12:39 -0400)]
validate peer uuid each time we talk to it

In case the repo on the peer changes uuid (eg by a new repo being moved
into place).

Also, added some warning messages when unable to communicate with a
peer.

This commit was sponsored by Anthony DeRobertis on Patreon.

9 years agoremote uuid discovery in p2p --link
Joey Hess [Wed, 7 Dec 2016 16:38:21 +0000 (12:38 -0400)]
remote uuid discovery in p2p --link

This also tests that we can connect to the peer.

This commit was sponsored by Jeff Goeke-Smith on Patreon.

9 years agoadd todo list for remaining tor stuff
Joey Hess [Wed, 7 Dec 2016 16:11:38 +0000 (12:11 -0400)]
add todo list for remaining tor stuff

9 years agofix up some commands
Joey Hess [Wed, 7 Dec 2016 16:00:27 +0000 (12:00 -0400)]
fix up some commands

9 years agodevbog
Joey Hess [Tue, 6 Dec 2016 21:08:39 +0000 (17:08 -0400)]
devbog

9 years agoPAKE
Joey Hess [Tue, 6 Dec 2016 20:55:53 +0000 (16:55 -0400)]
PAKE

9 years agoneed to auth with the peer
Joey Hess [Tue, 6 Dec 2016 19:49:39 +0000 (15:49 -0400)]
need to auth with the peer

9 years agorefactor
Joey Hess [Tue, 6 Dec 2016 19:40:31 +0000 (15:40 -0400)]
refactor

9 years agofinish implementation of Remote.P2P (untested)
Joey Hess [Tue, 6 Dec 2016 19:08:00 +0000 (15:08 -0400)]
finish implementation of Remote.P2P (untested)

Not tested at all, but it just might work.
Only known problem is that progress is not updated when storing to a P2P
remote.

This commit was sponsored by Nick Daly on Patreon.

9 years agoadded StoreContentTo
Joey Hess [Tue, 6 Dec 2016 19:05:44 +0000 (15:05 -0400)]
added StoreContentTo

This is needed in addition to StoreContent, because retrieveKeyFile can
be used to retrieve to different destination files, not only the tmp
file for a key.

This commit was sponsored by Ole-Morten Duesund on Patreon.

9 years agostub Remote.P2P
Joey Hess [Tue, 6 Dec 2016 16:19:47 +0000 (12:19 -0400)]
stub Remote.P2P

Similar to GCrypt remotes, P2P remotes have an url, so Remote.Git has to
separate them out and handle them, passing off to Remote.P2P.

This commit was sponsored by Ignacio on Patreon.

9 years ago(no commit message)
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730 [Tue, 6 Dec 2016 14:59:40 +0000 (14:59 +0000)]

9 years ago(no commit message)
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730 [Tue, 6 Dec 2016 13:56:13 +0000 (13:56 +0000)]

9 years ago(no commit message)
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730 [Tue, 6 Dec 2016 13:03:51 +0000 (13:03 +0000)]

9 years ago(no commit message)
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730 [Tue, 6 Dec 2016 13:01:51 +0000 (13:01 +0000)]

9 years ago(no commit message)
alpernebbi [Mon, 5 Dec 2016 21:55:55 +0000 (21:55 +0000)]

9 years agoAdded a comment: UTF-8 problems in some other commands
alpernebbi [Mon, 5 Dec 2016 20:46:07 +0000 (20:46 +0000)]
Added a comment: UTF-8 problems in some other commands

9 years ago(no commit message)
alpernebbi [Mon, 5 Dec 2016 19:34:55 +0000 (19:34 +0000)]

9 years agoadd: Stage modified non-large files when running in indirect mode.
Joey Hess [Mon, 5 Dec 2016 18:02:11 +0000 (14:02 -0400)]
add: Stage modified non-large files when running in indirect mode.

(This was already done in v6 mode and direct mode.)

9 years agofix formatting
Joey Hess [Mon, 5 Dec 2016 17:52:40 +0000 (13:52 -0400)]
fix formatting

mdwn2man gets confused as `command` spanning multiple lines..

9 years agorekey: Added --batch mode.
Joey Hess [Mon, 5 Dec 2016 16:55:50 +0000 (12:55 -0400)]
rekey: Added --batch mode.

Would have liked to make the Parser parse the file and key pairs, but it
seems that optparse-applicative is unable to handle eg:

many ((,) <$> argument <*> argument)

This commit was sponsored by Thomas Hochstein on Patreon.

9 years agochangelog
Joey Hess [Mon, 5 Dec 2016 16:16:35 +0000 (12:16 -0400)]
changelog

9 years agominor style
Joey Hess [Mon, 5 Dec 2016 16:16:07 +0000 (12:16 -0400)]
minor style

9 years agoMerge kite:tmp/git-annex
Joey Hess [Mon, 5 Dec 2016 16:15:48 +0000 (12:15 -0400)]
Merge kite:tmp/git-annex

9 years agocleanup
Joey Hess [Mon, 5 Dec 2016 16:13:25 +0000 (12:13 -0400)]
cleanup

9 years agormurl: --batch
Joey Hess [Mon, 5 Dec 2016 16:10:07 +0000 (12:10 -0400)]
rmurl: --batch

* rmurl: Multiple pairs of files and urls can be provided on the
  command line.
* rmurl: Added --batch mode.

This commit was sponsored by Trenton Cronholm on Patreon.

9 years agogit-annex fromkey now takes multiple pairs of keys and filenames
Daniel Brooks [Mon, 5 Dec 2016 14:59:20 +0000 (09:59 -0500)]
git-annex fromkey now takes multiple pairs of keys and filenames

It also still reads from stdin when none are specified.

9 years ago"fixed" by reading --help
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4 [Sun, 4 Dec 2016 16:20:00 +0000 (16:20 +0000)]
"fixed" by reading --help

9 years agoadded forgotten author tag
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4 [Sun, 4 Dec 2016 15:54:32 +0000 (15:54 +0000)]
added forgotten author tag

9 years agoinitial report
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4 [Sun, 4 Dec 2016 15:52:29 +0000 (15:52 +0000)]
initial report

9 years ago(no commit message)
marek@33e8ba4fbc201af14a2badcc0656024401f5c916 [Sun, 4 Dec 2016 15:28:41 +0000 (15:28 +0000)]

9 years agoAdded a comment
justin.lebar@7a36fcafc322d9a381e89f08ab6289033c6dde91 [Sun, 4 Dec 2016 04:30:38 +0000 (04:30 +0000)]
Added a comment

9 years agouse list
Joey Hess [Sat, 3 Dec 2016 20:52:18 +0000 (16:52 -0400)]
use list

9 years agoupdate
Joey Hess [Sat, 3 Dec 2016 20:51:16 +0000 (16:51 -0400)]
update

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Sat, 3 Dec 2016 20:32:42 +0000 (16:32 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com