Commit graph

44867 commits

Author SHA1 Message Date
Joey Hess
ea8c50ec8a
remove unused import 2024-06-27 12:38:32 -04:00
Joey Hess
19137ae780
avoid unfiltered debugging from git-annex-shell
When --debugfilter or annex.debugfilter is set, avoid propigating debug
output from git-annex-shell, since it cannot be filtered.

It would be possible to pass --debugfilter on to git-annex-shell,
but it only started accepting that option in 2022. So it would break
interop with older versions.
2024-06-27 12:37:25 -04:00
Joey Hess
53598e5154
merge from proxy branch 2024-06-20 11:20:16 -04:00
Joey Hess
d89ac8c6ee
Merge branch 'master' of ssh://git-annex.branchable.com 2024-06-20 11:03:30 -04:00
Joey Hess
9173095d11
add my distribits talk 2024-06-20 11:03:19 -04:00
joris
b35be4b656 Added a comment 2024-06-20 09:58:05 +00:00
jochen.keil@38b1f86ab65128dab3e62e726403ceee4f5141bf
4da453e30c 2024-06-19 15:46:26 +00:00
yarikoptic
28029d6668 original report / question 2024-06-18 13:57:23 +00:00
Joey Hess
af79728ac3
tab complete special remotes
An oversight..

And with the work in progress proxy and cluster, there
can be additional remotes that are not listed in .git/config, but are
available. Making those more discoverable is another big benefit of
this.
2024-06-17 09:26:03 -04:00
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec
f707baf908 Added a comment 2024-06-15 07:37:07 +00:00
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec
0062ac1b49 Added a comment: Grafting? a special remote for tuned migration 2024-06-15 00:57:27 +00:00
Joey Hess
9895e6659d
update 2024-06-13 19:08:04 -04:00
Joey Hess
d16e19b8ca
comment 2024-06-13 14:30:32 -04:00
Joey Hess
ebebc04273
comment 2024-06-13 13:40:04 -04:00
Joey Hess
6ea78ec867
partial reproducer 2024-06-13 13:03:38 -04:00
Joey Hess
d8daabe9ec
Merge branch 'master' of ssh://git-annex.branchable.com 2024-06-13 06:44:22 -04:00
Joey Hess
22a329c57e
copied over some changes from proxy branch 2024-06-13 06:43:59 -04:00
m.risse@77eac2c22d673d5f10305c0bade738ad74055f92
c855b50f04 2024-06-12 15:42:42 +00:00
Joey Hess
345494e3b4
expanding on the exporttree=yes design 2024-06-12 09:43:59 -04:00
yarikoptic
c6f2a5d372 TODO for log --key 2024-06-12 13:20:29 +00:00
yarikoptic
b96ff82871 Added a comment 2024-06-11 17:36:51 +00:00
Joey Hess
dd429ba8fe
Merge branch 'master' of ssh://git-annex.branchable.com 2024-06-11 13:08:45 -04:00
Joey Hess
d2e3c5c89f
update 2024-06-11 13:07:53 -04:00
NewUser
124c1313bb 2024-06-11 13:31:01 +00:00
Joey Hess
9a8391078a
git-annex-shell: block relay requests
connRepo is only used when relaying git upload-pack and receive-pack.
That's only supposed to be used when git-annex-remotedaemon is serving
git-remote-tor-annex connections over tor. But, it was always set, and
so could be used in other places possibly.

Fixed by making connRepo optional in the P2P protocol interface.

In Command.EnableTor, it's not needed, because it only speaks the
protocol in order to check that it's able to connect back to itself via
the hidden service. So changed that to pass Nothing rather than the git
repo.

In Remote.Helper.Ssh, it's connecting to git-annex-shell p2pstdio,
so is making the requests, so will never need connRepo.

In git-annex-shell p2pstdio, it was accepting git upload-pack and
receive-pack requests over the P2P protocol, even though nothing sent
them. This is arguably a security hole, particularly if the user has
set environment variables like GIT_ANNEX_SHELL_LIMITED to prevent
git push/pull via git-annex-shell.
2024-06-10 14:16:27 -04:00
Joey Hess
783eb8879a
notes on behavior 2024-06-10 11:07:04 -04:00
jlueters@79a910340cdff27611c6a650c108afbe2f61c5f6
daa2c6cce1 2024-06-10 14:24:34 +00:00
Joey Hess
b1cc8c6837
Merge branch 'master' of ssh://git-annex.branchable.com 2024-06-07 16:52:04 -04:00
Joey Hess
25a6ab6f11
Avoid grafting in export tree objects that are missing
They could be missing due to an interrupted git-annex at just the wrong
time during a prior graft, after which the tree objects got garbage
collected.

Or they could be missing because of manual messing with the git-annex
branch, eg resetting it to back before the graft commit.

Sponsored-by: Dartmouth College's OpenNeuro project
2024-06-07 16:51:50 -04:00
emilymaers
3947a51cc8 removed 2024-06-07 20:46:34 +00:00
emilymaers
4fbfc5e5ac Added a comment: blockchain 2024-06-07 20:46:20 +00:00
Joey Hess
b32c4c2e98
atomic git-annex branch update when regrafting in transition
Fix a bug where interrupting git-annex while it is updating the git-annex
branch could lead to git fsck complaining about missing tree objects.

Interrupting git-annex while regraftexports is running in a transition
that is forgetting git-annex branch history would leave the
repository with a git-annex branch that did not contain the tree shas
listed in export.log. That lets those trees be garbage collected.

A subsequent run of the same transition then regrafts the trees listed
in export.log into the git-annex branch. But those trees have been lost.

Note that both sides of `if neednewlocalbranch` are atomic now. I had
thought only the True side needed to be, but I do think there may be
cases where the False side needs to be as well.

Sponsored-by: Dartmouth College's OpenNeuro project
2024-06-07 16:34:10 -04:00
Joey Hess
f5532be954
graft in exported tree before updating the export log
It was possible for the export.log to get written and then git-annex was
interrupted, before it could graft in the exported tree. Which could
result in export.log referencing a tree that got garbage collected.
2024-06-07 15:25:02 -04:00
Joey Hess
43ff697f25
update status and design work on proxy encryption and chunking 2024-06-07 12:35:04 -04:00
Joey Hess
a0e59c1d17
comment 2024-06-07 12:35:00 -04:00
Joey Hess
058726ee86
next step identified 2024-06-06 18:06:45 -04:00
Joey Hess
d59383beaf
update 2024-06-06 17:25:22 -04:00
ruslan@302cb7f8d398fcce72f88b26b0c2f3a53aaf0bcd
1e6b4f324a removed 2024-06-06 13:40:26 +00:00
ruslan@302cb7f8d398fcce72f88b26b0c2f3a53aaf0bcd
6274d16102 Added a comment 2024-06-06 11:23:55 +00:00
ruslan@302cb7f8d398fcce72f88b26b0c2f3a53aaf0bcd
d4993248eb Added a comment 2024-06-06 11:23:34 +00:00
ruslan@302cb7f8d398fcce72f88b26b0c2f3a53aaf0bcd
a1e1af35af 2024-06-06 10:29:21 +00:00
nobodyinperson
6985c62a47 Added a comment 2024-06-06 09:09:03 +00:00
ruslan@302cb7f8d398fcce72f88b26b0c2f3a53aaf0bcd
7dbfb16415 2024-06-05 17:45:49 +00:00
ruslan@302cb7f8d398fcce72f88b26b0c2f3a53aaf0bcd
93b11da4db Added a comment 2024-06-05 17:34:32 +00:00
ruslan@302cb7f8d398fcce72f88b26b0c2f3a53aaf0bcd
6b4ae7b635 2024-06-05 17:22:04 +00:00
ruslan@302cb7f8d398fcce72f88b26b0c2f3a53aaf0bcd
ca687413ef Added a comment 2024-06-05 16:53:51 +00:00
Joey Hess
1761e971ee
status update after day 1 of new project 2024-06-04 14:55:54 -04:00
Joey Hess
3df70c5c0c
implementation plan 2024-06-04 07:51:33 -04:00
Joey Hess
6375e3be3b
recieved funding to work on this, which comes with a schedule 2024-06-04 06:53:59 -04:00
Joey Hess
ac3fe92956
comment 2024-06-04 06:41:14 -04:00