Commit graph

34267 commits

Author SHA1 Message Date
Joey Hess
7b1548dbfa
correct AUTH-SUCCESS and AUTH-FAILURE
It's AUTH_SUCCESS internally in git-annex, but the line based
serialization uses AUTH-SUCCESS.
2024-06-10 15:06:27 -04:00
Joey Hess
649b87bedd
Merge branch 'master' into proxy 2024-06-10 14:26:18 -04:00
Joey Hess
d2576e5f1a
git-annex-shell: accept uuid of remote that proxying is enabled for
For NotifyChanges and also for the fallthrough case where
git-annex-shell passes a command off to git-shell, proxying is currently
ignored. So every remote that is accessed via a proxy will be treated as
the same git repository.

Every other command listed in cmdsMap will need to check if
Annex.proxyremote is set, and if so handle the proxying appropriately.
Probably only P2PStdio will need to support proxying. For now,
everything else refuses to work when proxying.

The part of that I don't like is that there's the possibility a command
later gets added to the list that doesn't check proxying.

When proxying is not enabled, it's important that git-annex-shell not
leak information that it would not have exposed before. Such as the
names or uuids of remotes.

I decided that, in the case where a repository used to have proxying
enabled, but no longer supports any proxies, it's ok to give the user a
clear error message indicating that proxying is not configured, rather
than a confusing uuid mismatch message.

Similarly, if a repository has proxying enabled, but not for the
requested repository, give a clear error message.

A tricky thing here is how to handle the case where there is more than
one remote, with proxying enabled, with the specified uuid. One way to
handle that would be to plumb the proxyRemoteName all the way through
from the remote git-annex to git-annex-shell, eg as a field, and use
only a remote with the same name. That would be very intrusive though.

Instead, I decided to let the proxy pick which remote it uses to access
a given Remote. And so it picks the least expensive one.
The client after all doesn't necessarily know any details about the
proxy's configuration. This does mean though, that if the least
expensive remote is not accessible, but another remote would have
worked, an access via the proxy will fail.
2024-06-10 12:44:35 -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
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
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
6568ba4904
Merge branch 'master' into proxy 2024-06-07 12:35:47 -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
5aaa285083
Merge branch 'master' into proxy 2024-06-07 10:43:13 -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
Joey Hess
9bc4dd635c
update 2024-06-06 17:23:51 -04:00
Joey Hess
a72d0f69d0
filter out illegal remote names when reading proxy log 2024-06-06 12:51:30 -04:00
Joey Hess
d208b03e5d
Merge branch 'master' into proxy 2024-06-06 12:42:18 -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
f97f4b8bdb
Added updateproxy command and remote.name.annex-proxy configuration
So far this only records proxy information on the git-annex branch.
2024-06-04 14:52:03 -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
Joey Hess
3db94f1b71
Merge branch 'master' of ssh://git-annex.branchable.com 2024-06-04 06:40:08 -04:00
Joey Hess
3be7163771
update 2024-06-04 06:40:04 -04:00
Joey Hess
5992e1729a
fixed by git release 2024-06-04 06:39:08 -04:00
nobodyinperson
c606b6a35d Added a comment: Yes, GitLab fixed! 2024-06-04 07:38:47 +00:00
datamanager
82b891de7a Added a comment: GitLab fixed? 2024-06-04 01:18:25 +00:00
Joey Hess
61ed0b3f03
root cause analysis 2024-06-03 13:56:43 -04:00
yarikoptic
4a48933867 Added a comment 2024-06-03 17:54:43 +00:00
Joey Hess
c382555cf8
comment 2024-06-03 12:31:55 -04:00
jkniiv
313a0285e5 a small clarification 2024-06-01 22:11:32 +00:00
jkniiv
5badd2ae4e report on git-remote-annex on Windows not quite working 2024-06-01 21:59:27 +00:00
Joey Hess
0e96f0acd8
add news item for git-annex 10.20240531 2024-05-31 12:32:42 -04:00
Joey Hess
a51c5d1cde
some analysis 2024-05-31 11:47:59 -04:00
yarikoptic
8706a6faf1 report on git repo getting broken 2024-05-31 14:38:58 +00:00
yarikoptic
d313dc22e3 reporting that annex merge should not merge into main branch 2024-05-31 13:49:17 +00:00
Joey Hess
d8cf23ffdb
tweak 2024-05-30 13:31:49 -04:00
Joey Hess
69c9e8c11c
tweak 2024-05-30 13:30:57 -04:00
Joey Hess
19454917eb
tweak 2024-05-30 13:30:33 -04:00
Joey Hess
3a48eafce4
tweaks 2024-05-30 13:30:10 -04:00
Joey Hess
adf17f5038
Merge branch 'master' of ssh://git-annex.branchable.com 2024-05-30 13:26:44 -04:00
Joey Hess
f877afe930
tip 2024-05-30 13:26:34 -04:00
Joey Hess
0155abfba4
git-remote-annex: Support urls like annex::https://example.com/foo-repo
Using the usual url download machinery even allows these urls to need
http basic auth, which is prompted for with git-credential. Which opens
the possibility for urls that contain a secret to be used, eg the cipher
for encryption=shared. Although the user is currently on their own
constructing such an url, I do think it would work.

Limited to httpalso for now, for security reasons. Since both httpalso
(and retrieving this very url) is limited by the usual
annex.security.allowed-ip-addresses configs, it's not possible for an
attacker to make one of these urls that sets up a httpalso url that
opens the garage door. Which is one class of attacks to keep in mind
with this thing.

It seems that there could be either a git-config that allows other types
of special remotes to be set up this way, or special remotes could
indicate when they are safe. I do worry that the git-config would
encourage users to set it without thinking through the security
implications. One remote config might be safe to access this way, but
another config, for one with the same type, might not be. This will need
further thought, and real-world examples to decide what to do.
2024-05-30 12:24:16 -04:00
yarikoptic
d23ae92da8 Added a comment 2024-05-30 14:34:32 +00:00
yarikoptic
285a7ff3c3 Added a comment 2024-05-30 14:29:43 +00:00
Joey Hess
3f33616068
security 2024-05-29 22:55:06 -04:00
Joey Hess
efa684ab8a
todo 2024-05-29 18:21:17 -04:00
yarikoptic
f186485fab Added a comment 2024-05-29 18:31:16 +00:00
yarikoptic
09626c8114 Added a comment: odd odd odd 2024-05-29 18:25:23 +00:00
yarikoptic
e05564c297 Added a comment: odd odd odd 2024-05-29 18:25:11 +00:00
yarikoptic
60a7dea828 get is silently stuck. 2024-05-29 18:14:44 +00:00
Joey Hess
98762a2f96
group: Added --list option
Seemed to make sense to exclude groups used only by dead repositories.
2024-05-29 13:37:35 -04:00
Joey Hess
09a0552489
split off todo, comment 2024-05-29 13:16:36 -04:00
Joey Hess
14daed9db7
Merge branch 'master' of ssh://git-annex.branchable.com 2024-05-29 13:00:34 -04:00
Joey Hess
e19916f54b
add config-uuid to annex:: url for --sameas remotes
And use it to set annex-config-uuid in git config. This makes
using the origin special remote work after cloning.

Without the added Logs.Remote.configSet, instantiating the remote will
look at the annex-config-uuid's config in the remote log, which will be
empty, and so it will fail to find a special remote.

The added deletion of files in the alternatejournaldir is just to make
100% sure they don't get committed to the git-annex branch. Now that
they contain things that definitely should not be committed.
2024-05-29 12:50:00 -04:00
derphysiker
dfb0c4683c Added a comment 2024-05-29 06:58:16 +00:00
Joey Hess
b0ff819850
clarify which rclone special remote
Now that there are several.
2024-05-28 16:56:27 -04:00
Joey Hess
06cf131ef6
document using git-remote-annex with httpalso 2024-05-28 16:52:36 -04:00
Joey Hess
bbf49c9de7
httpalso just worked, with one small issue to fix 2024-05-28 16:26:16 -04:00
Joey Hess
2106cb0fce
Merge branch 'master' of ssh://git-annex.branchable.com 2024-05-28 16:10:13 -04:00
Joey Hess
cb7f15e733
clean up man page 2024-05-28 15:29:38 -04:00
yarikoptic
4ba024cc08 Added a comment 2024-05-28 17:51:02 +00:00
Joey Hess
d2efa141bb
update 2024-05-28 13:36:27 -04:00
Joey Hess
2ffe077cc2
git-remote-annex: brought back max-git-bundles config
An incremental push that gets converted to a full push due to this
config results in the inManifest having just one bundle in it, and the
outManifest listing every other bundle. So it actually takes up more
space on the special remote. But, it speeds up clone and fetch to not
have to download a long series of bundles for incremental pushes.
2024-05-28 13:28:19 -04:00
Joey Hess
e9a2e4e94d
comment 2024-05-28 13:00:54 -04:00
Joey Hess
cb9f7b5646
update 2024-05-28 12:50:54 -04:00
Joey Hess
14443fd307
update 2024-05-28 12:46:56 -04:00
Joey Hess
3318d25c65
adjust unlocked execute bit handling
When building an adjusted unlocked branch, make pointer files executable
when the annex object file is executable.

This slows down git-annex adjust --unlock/--unlock-present by needing to
stat all annex object files in the tree. Probably not a significant
slowdown compared to other work they do, but I have not benchmarked.

I chose to leave git-annex adjust --unlock marked as stable, even though
get or drop of an object file can change whether it would make the pointer
file executable. Partly because making it unstable would slow down
re-adjustment, and partly for symmetry with the handling of an unlocked
pointer file that is executable when the content is dropped, which does not
remove its execute bit.
2024-05-28 12:39:42 -04:00
Joey Hess
1bb819f597
retitle and comment 2024-05-28 12:07:58 -04:00
Joey Hess
e19f56e7d8
Merge branch 'master' of ssh://git-annex.branchable.com 2024-05-28 10:27:50 -04:00
Joey Hess
c6669990fb
update 2024-05-28 09:19:00 -04:00
nobodyinperson
f6c0f55ad1 Added a comment: Yep, would be nice! 2024-05-28 12:18:59 +00:00
m.risse@77eac2c22d673d5f10305c0bade738ad74055f92
bab6d3e58f Added a comment: Re: worktree provisioning 2024-05-28 12:06:39 +00:00
Joey Hess
c2483f6e6d
update 2024-05-27 22:44:35 -04:00
derphysiker
f90511ec43 2024-05-27 18:33:44 +00:00
Joey Hess
0975e792ea
git-remote-annex: Fix error display on clone
cleanupInitialization gets run when an exception is thrown, so needs to
avoid throwing exceptions itself, as that would hide the error message
that the user needs to see.
2024-05-27 13:28:05 -04:00
Joey Hess
a766475d14
split out a todo 2024-05-27 12:50:46 -04:00
Joey Hess
e64add7cdf
git-remote-annex: support importrree=yes remotes
When exporttree=yes is also set. Probably it would also be possible to
support ones with only importtree=yes, by enabling exporttree=yes for
the remote only when using git-remote-annex, but let's keep this
simple... I'm not sure what gets recorded in .git/annex/ state
differently in the two cases that might cause a problem when doing that.

Note that the full annex:: urls generated and displayed for such a
remote omit the importree=yes. Which is ok, cloning from such an url
uses an exporttree=remote, but the git-annex branch doesn't get written
by this program, so once the real config is available from the git-annex
branch, it will still function as an importree=yes remote.
2024-05-27 12:35:42 -04:00
Joey Hess
5a48f7b34e
Merge branch 'master' of ssh://git-annex.branchable.com 2024-05-27 11:16:25 -04:00
Joey Hess
6f51ba740d
comment 2024-05-27 11:16:21 -04:00
derphysiker
9442937865 Added a comment 2024-05-25 13:00:08 +00:00
Joey Hess
5e0d9c2029
comment 2024-05-24 17:32:50 -04:00
Joey Hess
4c8e57b907
Merge branch 'master' of ssh://git-annex.branchable.com 2024-05-24 17:16:39 -04:00
Joey Hess
19418e81ee
git-remote-annex: Display full url when using remote with the shorthand url 2024-05-24 17:15:31 -04:00
derphysiker
2d380f9941 Added a comment 2024-05-24 20:32:15 +00:00
Joey Hess
04a256a0f8
work around git "defense in depth" breakage with git clone checking for hooks
This git bug also broke git-lfs, and I am confident it will be reverted
in the next release.

For now, cloning from an annex:: url wastes some bandwidth on the next
pull by not caching bundles locally.

If git doesn't fix this in the next version, I'd be tempted to rethink
whether bundle objects need to be cached locally. It would be possible to
instead remember which bundles have been seen and their heads, and
respond to the list command with the heads, and avoid unbundling them
agian in fetch. This might even be a useful performance improvement in
the latter case. It would be quite a complication to a currently simple
implementation though.
2024-05-24 15:49:53 -04:00
Joey Hess
6ccd09298b
convert srcref to a sha
This fixes pushing a new ref that is the same as something already
pushed. In findotherprereq, it compares two shas, which didn't work when
one is actually not a sha but a ref.

This is one of those cases where Sha being an alias for Ref makes it
hard to catch mistakes. One of these days those need to be
differentiated at the type level, but not today..
2024-05-24 15:33:35 -04:00
Joey Hess
96c66a7ca9
bug 2024-05-24 15:15:42 -04:00
Joey Hess
58301e40d2
sync with special remotes with an annex:: url
Check explicitly for an annex:: url, not just any url. While no built-in
special remotes set an url, except ones that can be synced with, it
seems possible that some external special remote sets an url for its own
use, but did not expect it to be used by git-annex sync et al.

The assistant also syncs with them.
2024-05-24 14:57:29 -04:00
Joey Hess
22bf23782f
initremote, enableremote: Added --with-url to enable using git-remote-annex
Also sets remote.name.fetch to a typical value, same as git remote add does.
2024-05-24 14:29:36 -04:00
Joey Hess
7d61a99da3
todo 2024-05-24 13:57:33 -04:00
Joey Hess
2670508b97
also broke git-remote-annex 2024-05-24 13:35:45 -04:00