]> dgit.raspbian.org Git - git-annex.git/log
git-annex.git
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 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 agoplumb assicated files through P2P protocol for updating transfer logs
Joey Hess [Fri, 2 Dec 2016 20:39:01 +0000 (16:39 -0400)]
plumb assicated files through P2P protocol for updating transfer logs

ReadContent can't update the log, since it reads lazily. This part of
the P2P monad will need to be rethought.

Associated files are heavily sanitized when received from a peer;
they could be an exploit vector.

This commit was sponsored by Jochen Bartl on Patreon.

9 years agoplumb peer uuid through to runLocal
Joey Hess [Fri, 2 Dec 2016 19:34:15 +0000 (15:34 -0400)]
plumb peer uuid through to runLocal

This will allow updating transfer logs with the uuid.

9 years agoinitial implementation of P2P.Annex runner
Joey Hess [Fri, 2 Dec 2016 18:49:22 +0000 (14:49 -0400)]
initial implementation of P2P.Annex runner

Untested, and it does not yet update transfer logs.

Verifying transferred content is modeled on git-annex-shell recvkey.
In a direct mode or annex.thin repository, content can change while it's
being transferred. So, verification is always done, even if annex.verify
would normally prevent it.

Note that a WORM or URL key could change in a way the verification
doesn't catch. That can happen in git-annex-shell recvkey too. We don't
worry about it, because those key backends don't guarantee preservation
of data. (Which is to say, I worried about it, and then convinced myself
again it was ok.)

9 years agocatch non-IO exceptions too
Joey Hess [Fri, 2 Dec 2016 18:16:50 +0000 (14:16 -0400)]
catch non-IO exceptions too

9 years agomake remote-daemon able to send and receive objects over tor
Joey Hess [Fri, 2 Dec 2016 17:50:56 +0000 (13:50 -0400)]
make remote-daemon able to send and receive objects over tor

Each worker thread needs to run in the Annex monad, but the
remote-daemon's liftAnnex can only run 1 action at a time. Used
Annex.Concurrent to deal with that.

P2P.Annex is incomplete as of yet.

9 years agoimprove Local monad
Joey Hess [Fri, 2 Dec 2016 17:47:42 +0000 (13:47 -0400)]
improve Local monad

9 years agomake sure that the specified number of bytes of DATA are always sent
Joey Hess [Fri, 2 Dec 2016 17:45:45 +0000 (13:45 -0400)]
make sure that the specified number of bytes of DATA are always sent

It's possible, in direct or thin mode, that an object file gets
truncated or appended to as it's being sent. This would break the
protocol badly, so make sure never to send too many bytes, and to
close the protocol connection if too few bytes are available.

9 years agocleanups
Joey Hess [Thu, 1 Dec 2016 04:41:01 +0000 (00:41 -0400)]
cleanups

9 years agomore flexible types for Proto runners
Joey Hess [Thu, 1 Dec 2016 04:27:07 +0000 (00:27 -0400)]
more flexible types for Proto runners

This will allow a runner in the Annex monad.

9 years agobetter comments
Joey Hess [Thu, 1 Dec 2016 03:54:00 +0000 (23:54 -0400)]
better comments

9 years agoactually check p2p authtokens for tor connections
Joey Hess [Wed, 30 Nov 2016 20:38:16 +0000 (16:38 -0400)]
actually check p2p authtokens for tor connections

This commit was sponsored by Ethan Aubin.

9 years agouse P2P auth for git-remote-tor-annex
Joey Hess [Wed, 30 Nov 2016 19:26:16 +0000 (15:26 -0400)]
use P2P auth for git-remote-tor-annex

This changes the environment variable name to the more generic
GIT_ANNEX_P2P_AUTHTOKEN.

This commit was sponsored by andrea rota.

9 years agoimplement p2p --link
Joey Hess [Wed, 30 Nov 2016 19:14:54 +0000 (15:14 -0400)]
implement p2p --link

This commit was sponsored by Riku Voipio.

9 years agoimplement p2p command
Joey Hess [Wed, 30 Nov 2016 18:35:24 +0000 (14:35 -0400)]
implement p2p command

9 years agomax authtoken length is 128
Joey Hess [Wed, 30 Nov 2016 18:19:26 +0000 (14:19 -0400)]
max authtoken length is 128

It was stopping at 128, so the 512 was only incorrect, it didn't change
behavior.

9 years agoavoid too-long command synopsis
Joey Hess [Wed, 30 Nov 2016 18:16:57 +0000 (14:16 -0400)]
avoid too-long command synopsis

It was making git-annex usage output columns far too wide

9 years agoMerge branch 'master' into tor
Joey Hess [Wed, 30 Nov 2016 18:16:36 +0000 (14:16 -0400)]
Merge branch 'master' into tor

9 years agoprefer xdot over dot
Joey Hess [Wed, 30 Nov 2016 16:50:49 +0000 (12:50 -0400)]
prefer xdot over dot

* map: Run xdot if it's available in PATH. On OSX, the dot command
  does not support graphical display, while xdot does.
* Debian: xdot is a better interactive viewer than dot, so Suggest
  xdot, rather than graphviz.

9 years agosupposedly unused import was used
Joey Hess [Wed, 30 Nov 2016 16:46:44 +0000 (12:46 -0400)]
supposedly unused import was used

9 years agoMerge branch 'master' into tor
Joey Hess [Wed, 30 Nov 2016 03:45:25 +0000 (23:45 -0400)]
Merge branch 'master' into tor

9 years agoremove unused import
Joey Hess [Wed, 30 Nov 2016 03:44:54 +0000 (23:44 -0400)]
remove unused import

9 years agocleanup
Joey Hess [Tue, 29 Nov 2016 21:52:46 +0000 (17:52 -0400)]
cleanup

9 years agodevblog
Joey Hess [Tue, 29 Nov 2016 21:36:03 +0000 (17:36 -0400)]
devblog

9 years agocomments
Joey Hess [Tue, 29 Nov 2016 21:33:49 +0000 (17:33 -0400)]
comments

9 years agoupdate docs for git-annex p2p command
Joey Hess [Tue, 29 Nov 2016 21:31:10 +0000 (17:31 -0400)]
update docs for git-annex p2p command

It is not yet implemented.

9 years agofinish git-annex enable-tor
Joey Hess [Tue, 29 Nov 2016 21:30:27 +0000 (17:30 -0400)]
finish git-annex enable-tor

Make it stash the address away for git-annex p2p to use later, rather
than outputting it. And, look up the UUID itself.

9 years agoMerge branch 'master' into tor
Joey Hess [Tue, 29 Nov 2016 19:45:29 +0000 (15:45 -0400)]
Merge branch 'master' into tor

9 years agofix
Joey Hess [Tue, 29 Nov 2016 19:43:34 +0000 (15:43 -0400)]
fix

9 years agoenable remotedaemon when assistant is not enabled
Joey Hess [Tue, 29 Nov 2016 19:41:28 +0000 (15:41 -0400)]
enable remotedaemon when assistant is not enabled

Needed to serve tor hidden services.

9 years agomove tor hidden service socket to /etc, temporarily violating the FHS
Joey Hess [Tue, 29 Nov 2016 17:02:19 +0000 (13:02 -0400)]
move tor hidden service socket to /etc, temporarily violating the FHS

On Debian, apparmor prevents tor from reading from most locations. And,
it silently fails if it is prevented from reading the hidden service
socket. I filed #846275 about this; violating the FHS is the least bad of a
bad set of choices until that bug is fixed.

9 years agotighten added language
Joey Hess [Tue, 29 Nov 2016 17:37:16 +0000 (13:37 -0400)]
tighten added language

Removed part about neeing to install git-annex and git in the same
location. The installer checks if the location given exists, and if not,
tells the user that git is not installed there. And the default should
work if the user just picks it in both installers.

9 years agoRevert "Added link to Windows installation instructions. The page was not easy to...
Joey Hess [Tue, 29 Nov 2016 17:32:20 +0000 (13:32 -0400)]
Revert "Added link to Windows installation instructions. The page was not easy to find."

This reverts commit c68d4305eb016e026d655dff7c7cb96cbb8296ea.

With all due respect, the link to the instructions for each OS is in the
"detailed instructions" column. Adding a second link to the same thing
is unlikely to help.

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 29 Nov 2016 17:32:10 +0000 (13:32 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agoWindows autobuilder is going to be hosted at Dartmouth now
Joey Hess [Tue, 29 Nov 2016 16:05:37 +0000 (12:05 -0400)]
Windows autobuilder is going to be hosted at Dartmouth now

9 years agoAdded more explanations of my experience with the Windows install process.
senatorzergling@c1d78877a6120a80f0f4005210eda262c1586555 [Tue, 29 Nov 2016 15:13:16 +0000 (15:13 +0000)]
Added more explanations of my experience with the Windows install process.

9 years agoAdded link to Windows installation instructions. The page was not easy to find.
senatorzergling@c1d78877a6120a80f0f4005210eda262c1586555 [Tue, 29 Nov 2016 15:02:47 +0000 (15:02 +0000)]
Added link to Windows installation instructions. The page was not easy to find.

9 years ago(no commit message)
db48x [Tue, 29 Nov 2016 12:24:43 +0000 (12:24 +0000)]

9 years agoAdded a comment: Temporary workaround until the brew formula is updated
palday@91f366b5178879146d2b6e1e53bfa21389ee89a8 [Tue, 29 Nov 2016 02:17:52 +0000 (02:17 +0000)]
Added a comment: Temporary workaround until the brew formula is updated

9 years agoAdded a comment
https://launchpad.net/~felixonmars [Mon, 28 Nov 2016 04:17:13 +0000 (04:17 +0000)]
Added a comment

9 years agoremoved
https://launchpad.net/~felixonmars [Mon, 28 Nov 2016 04:16:22 +0000 (04:16 +0000)]
removed

9 years agoAdded a comment
https://launchpad.net/~felixonmars [Mon, 28 Nov 2016 04:12:18 +0000 (04:12 +0000)]
Added a comment

9 years ago(no commit message)
annexuser [Sun, 27 Nov 2016 20:39:26 +0000 (20:39 +0000)]

9 years agoAdded a comment
boh [Sun, 27 Nov 2016 12:23:20 +0000 (12:23 +0000)]
Added a comment

9 years agoAdded a comment
CandyAngel [Fri, 25 Nov 2016 20:27:07 +0000 (20:27 +0000)]
Added a comment

9 years ago(no commit message)
edaneault@c9ac084da568ceb4d4566371a2da53f847258e7e [Fri, 25 Nov 2016 18:12:39 +0000 (18:12 +0000)]

9 years ago(no commit message)
edaneault@c9ac084da568ceb4d4566371a2da53f847258e7e [Fri, 25 Nov 2016 18:10:54 +0000 (18:10 +0000)]

9 years agofix build
Joey Hess [Thu, 24 Nov 2016 20:36:16 +0000 (16:36 -0400)]
fix build

9 years agoAdded a comment: Sharing rsync special remote between repository
davidriod@e75b369a4b1cced29c14354bce7493c61f00b1c7 [Thu, 24 Nov 2016 19:23:43 +0000 (19:23 +0000)]
Added a comment: Sharing rsync special remote between repository

9 years agoFixed typo in Schedule.hs.
Markus Hauru [Thu, 24 Nov 2016 03:08:04 +0000 (22:08 -0500)]
Fixed typo in Schedule.hs.

9 years agoAdded a comment: Walkthrough of a prudent retroactive annex.
StephaneGourichon [Thu, 24 Nov 2016 11:27:59 +0000 (11:27 +0000)]
Added a comment: Walkthrough of a prudent retroactive annex.

9 years agoAdded a comment: IgnoreUnknown Include considered harmful?
scottgorlin@a32946b2aad278883c1690a0753241583a9855b9 [Wed, 23 Nov 2016 20:07:46 +0000 (20:07 +0000)]
Added a comment: IgnoreUnknown Include considered harmful?

9 years agoAdded a comment: Known bug, fixed.
https://launchpad.net/~stephane-gourichon-lpad [Wed, 23 Nov 2016 18:04:27 +0000 (18:04 +0000)]
Added a comment: Known bug, fixed.

9 years ago(no commit message)
binx [Wed, 23 Nov 2016 18:01:06 +0000 (18:01 +0000)]

9 years ago(no commit message)
whlabratz@d10941ab2681deb87122fd8f6da51f3dcdb8dbe5 [Wed, 23 Nov 2016 03:26:37 +0000 (03:26 +0000)]

9 years ago(no commit message)
neocryptek@659edac901ffbc8e541a974f8f18987eeafc63bd [Tue, 22 Nov 2016 21:12:51 +0000 (21:12 +0000)]

9 years agodocs for stuff not fully implemented yet
Joey Hess [Tue, 22 Nov 2016 19:17:27 +0000 (15:17 -0400)]
docs for stuff not fully implemented yet

9 years agoadd P2P.Auth
Joey Hess [Tue, 22 Nov 2016 18:37:19 +0000 (14:37 -0400)]
add P2P.Auth

9 years agoreorg
Joey Hess [Tue, 22 Nov 2016 18:34:49 +0000 (14:34 -0400)]
reorg

9 years agounified AuthToken type between webapp and tor
Joey Hess [Tue, 22 Nov 2016 18:18:34 +0000 (14:18 -0400)]
unified AuthToken type between webapp and tor

9 years agofix regression
Joey Hess [Tue, 22 Nov 2016 15:12:33 +0000 (11:12 -0400)]
fix regression

The file matcher needs to be run on the destination file not the tmp
file, in order for filename matches to work properly. However, it also
needs to be able to probe the file for size and mime type.

This is a quick fix to a regression. The double rename is not pretty.
It would be good to either have a way to run the largeFileMatcher
such that it is matching on the final filename but looks at the temp
file, or to make addAnnexedFile not need the temp file in a different
location.

9 years agoavoid backtrace when rekey cntent verification fails
Joey Hess [Tue, 22 Nov 2016 05:16:18 +0000 (01:16 -0400)]
avoid backtrace when rekey cntent verification fails

9 years agocleanup
Joey Hess [Tue, 22 Nov 2016 05:04:17 +0000 (01:04 -0400)]
cleanup

9 years agoRelicense 5 source files that are not part of the webapp from AGPL to GPL.
Joey Hess [Tue, 22 Nov 2016 03:46:59 +0000 (23:46 -0400)]
Relicense 5 source files that are not part of the webapp from AGPL to GPL.

Building w/o the webapp is not supposed to pull in any AGPLed files.

I appear to have written all the code in these files;
the only commit by anyone else is 64e844e1fefca513d143e3f74a54dfc6d526a2ff
and is a spelling fix that is not copyrightable.

9 years agodevblog
Joey Hess [Tue, 22 Nov 2016 02:36:34 +0000 (22:36 -0400)]
devblog

9 years agoremove debug
Joey Hess [Tue, 22 Nov 2016 02:11:53 +0000 (22:11 -0400)]
remove debug

9 years agoavoid serving more than 10 tor connections at a time
Joey Hess [Tue, 22 Nov 2016 02:03:29 +0000 (22:03 -0400)]
avoid serving more than 10 tor connections at a time

Another 10 clients can be accepted and waiting their turn. After that,
start dropping connections.

This is to avoid DOS attacks..

9 years agodetect EOF on socket and cleanly shutdown the service process
Joey Hess [Tue, 22 Nov 2016 01:45:56 +0000 (21:45 -0400)]
detect EOF on socket and cleanly shutdown the service process

9 years agostop cleanly when there's a IO error accessing the Handle
Joey Hess [Tue, 22 Nov 2016 01:22:58 +0000 (21:22 -0400)]
stop cleanly when there's a IO error accessing the Handle

All other exceptions are let through, but IO errors accessing the handle
are to be expected, so quietly ignore.

9 years agotry to gather scattered writes
Joey Hess [Tue, 22 Nov 2016 00:56:58 +0000 (20:56 -0400)]
try to gather scattered writes

git upload-pack makes some uncessary writes in sequence, this tries to
gather them together to avoid needing to send multiple DATA packets when
just one will do.

In a small pull, this reduces the average number of DATA packets from
4.5 to 2.5.

9 years agofix parse of CONNECTDONE
Joey Hess [Mon, 21 Nov 2016 23:33:57 +0000 (19:33 -0400)]
fix parse of CONNECTDONE

9 years agopull/push over tor working now
Joey Hess [Mon, 21 Nov 2016 23:24:55 +0000 (19:24 -0400)]
pull/push over tor working now

Still a couple bugs:

* Closing the connection to the server leaves git upload-pack /
  receive-pack running, which could be used to DOS.

* Sometimes the data is transferred, but it fails at the end, sometimes
  with:

  git-remote-tor-annex: <socket: 10>: commitBuffer: resource vanished (Broken pipe)

  Must be a race condition around shutdown.

9 years agoAdded a comment
neocryptek@659edac901ffbc8e541a974f8f18987eeafc63bd [Mon, 21 Nov 2016 22:26:52 +0000 (22:26 +0000)]
Added a comment

9 years ago(no commit message)
binx [Mon, 21 Nov 2016 22:16:04 +0000 (22:16 +0000)]

9 years agoAdded git-remote-tor-annex, which allows git pull and push to the tor hidden service.
Joey Hess [Mon, 21 Nov 2016 21:27:38 +0000 (17:27 -0400)]
Added git-remote-tor-annex, which allows git pull and push to the tor hidden service.

Almost working, but there's a bug in the relaying.

Also, made tor hidden service setup pick a random port, to make it harder
to port scan.

This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.

9 years agoadded meta field for myself
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4 [Mon, 21 Nov 2016 16:36:34 +0000 (16:36 +0000)]
added meta field for myself

9 years agotodo
Joey Hess [Mon, 21 Nov 2016 16:30:15 +0000 (12:30 -0400)]
todo

9 years agoaddurl: Fix bug in checking annex.largefiles expressions using largerthan, mimetype...
Joey Hess [Mon, 21 Nov 2016 15:30:53 +0000 (11:30 -0400)]
addurl: Fix bug in checking annex.largefiles expressions using largerthan, mimetype, and smallerthan; the first two always failed to match, and the latter always matched.

9 years agoAdded a comment: Coldline
scottgorlin@a32946b2aad278883c1690a0753241583a9855b9 [Mon, 21 Nov 2016 00:49:23 +0000 (00:49 +0000)]
Added a comment: Coldline

9 years agoimprove p2p protocol implementation
Joey Hess [Sun, 20 Nov 2016 20:42:18 +0000 (16:42 -0400)]
improve p2p protocol implementation

Tested it in ghci a little now.

9 years agoremotedaemon: serve tor hidden service
Joey Hess [Sun, 20 Nov 2016 19:45:01 +0000 (15:45 -0400)]
remotedaemon: serve tor hidden service

9 years agoremotedaemon: Fork to background by default. Added --foreground switch to enable...
Joey Hess [Sun, 20 Nov 2016 18:39:26 +0000 (14:39 -0400)]
remotedaemon: Fork to background by default. Added --foreground switch to enable old behavior.

Groundwork for tor hidden services, which the remotedaemon will serve.

9 years agoimplement p2p protocol for Handle
Joey Hess [Sun, 20 Nov 2016 16:08:16 +0000 (12:08 -0400)]
implement p2p protocol for Handle

This is most of the way to having the p2p protocol working over tor
hidden services, at least enough to do git push/pull.

The free monad was split into two, one for network operations and the
other for local (Annex) operations. This will allow git-remote-tor-annex
to run only an IO action, not needing the Annex monad.

This commit was sponsored by Remy van Elst on Patreon.

9 years agoinitial whining
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4 [Sun, 20 Nov 2016 04:26:59 +0000 (04:26 +0000)]
initial whining

9 years agoAdded a comment
justin.lebar@7a36fcafc322d9a381e89f08ab6289033c6dde91 [Sun, 20 Nov 2016 03:47:23 +0000 (03:47 +0000)]
Added a comment

9 years agoextend p2p protocol to support gitremote-helpers connect
Joey Hess [Sat, 19 Nov 2016 20:30:57 +0000 (16:30 -0400)]
extend p2p protocol to support gitremote-helpers connect

A bit tricky since Proto doesn't support threads. Rather than adding
threading support to it, ended up using a callback that waits for both
data on a Handle, and incoming messages at the same time.

This commit was sponsored by Denis Dzyubenko on Patreon.

9 years ago(no commit message)
ilovezfs [Sat, 19 Nov 2016 16:00:50 +0000 (16:00 +0000)]

9 years agoAdded a comment
t.z.mates [Sat, 19 Nov 2016 04:42:25 +0000 (04:42 +0000)]
Added a comment

9 years agoMerge branch 'master' into tor
Joey Hess [Sat, 19 Nov 2016 00:05:34 +0000 (20:05 -0400)]
Merge branch 'master' into tor

9 years agoadd news item for git-annex 6.20161118
Joey Hess [Fri, 18 Nov 2016 16:00:20 +0000 (12:00 -0400)]
add news item for git-annex 6.20161118

9 years agoreleasing package git-annex version 6.20161118
Joey Hess [Fri, 18 Nov 2016 15:59:49 +0000 (11:59 -0400)]
releasing package git-annex version 6.20161118

9 years agocomment
Joey Hess [Fri, 18 Nov 2016 15:40:52 +0000 (11:40 -0400)]
comment

9 years agoAdded a comment
yomguy [Fri, 18 Nov 2016 14:00:51 +0000 (14:00 +0000)]
Added a comment