Joey Hess
212e5d04e6
oops
2024-07-26 13:54:37 -04:00
Joey Hess
ad025b8e5e
clean up protocol version for proxying
...
The proxy always checks the protocol version of a remote before talking
to it in a version-specific way, so the protocol version in the ProxyParams
is the client's protocol version. The remote will always be at the same or
an older protocol version than the client.
Note that in relayDATAFinish, when the client is at protocol version 0,
the remote must thus be as well, and that's why its version is not
checked in the case for that.
With that clarified, it's evident that, in P2P.Http.State, there's no
need to look at the proxied remote's protocol version at all.
2024-07-26 13:49:05 -04:00
Joey Hess
de7730f51f
fix setting protocol version for v0 server
...
Before it was leaving the protocol version at the default, when it
was actually v0.
v0 has only ever been used over tor, which is probably why this bug was
never noticed.
2024-07-26 13:24:56 -04:00
Joey Hess
576ec6ed71
fix hang in GET from http p2p proxy
...
serverP2PConnection = proxyfromclientconn causes serveGet to
signalFullyConsumedByteString to it, which is what it's waiting for
2024-07-26 12:51:00 -04:00
Joey Hess
60ccbc4fe6
improve comment
2024-07-26 12:48:47 -04:00
Joey Hess
cc1da2d516
http p2p proxy is now largely working
2024-07-26 10:44:10 -04:00
Joey Hess
96ad0ccc5b
wip
2024-07-25 15:39:57 -04:00
Joey Hess
6ef6ad808f
use a record to reduce the huge number of parameters
2024-07-25 15:23:18 -04:00
Joey Hess
7b56fe1350
factored out proxyRequest
...
This will allow the HTTP server to keep a connection to a proxied
remote open, and only enter the Annex monad when handling a client
request.
2024-07-25 15:00:36 -04:00
Joey Hess
3d14e2cf58
http server support for proxies, incomplete
...
Refactored git-annex-shell code so this can use checkCanProxy'.
At this point all that remains is opening a proxy connection,
and using a proxy connection.
2024-07-25 13:19:24 -04:00
Joey Hess
b13c2407af
p2phttp drop supports checking proof timestamps
...
At this point the p2phttp implementation is fully complete!
2024-07-25 10:11:09 -04:00
Joey Hess
6a3f755bfa
add common parameters to generic get API
...
Honestly this was just done to make the documentation correct. There's
no point in using these parameters. And they're optional.
2024-07-24 20:55:58 -04:00
Joey Hess
ab22938c0b
fix build without servant
2024-07-24 15:13:02 -04:00
Joey Hess
515c42e1e3
testremote passes on p2phttp remote
2024-07-24 14:42:24 -04:00
Joey Hess
f5624a69e3
expire lock after 10 minutes initially
...
Once keeplocked is called, the lock will expire at the end
of that call. But if keeplocked never gets called, this avoids
the lock persisting forever.
2024-07-24 14:25:40 -04:00
Joey Hess
97836aafba
Remote.Git lockContent works with annex+http urls
2024-07-24 13:42:57 -04:00
Joey Hess
9fa9678585
Remote.Git removeKey works with annex+http urls
...
Does not yet handle drop proof lock timestamp checking.
2024-07-24 12:33:26 -04:00
Joey Hess
cfdb80cd05
progress meter for p2phttp storeKey
2024-07-24 12:14:56 -04:00
Joey Hess
b3915b88ba
Remote.Git storeKey works with annex+http urls
...
Does not yet update progress meter.
2024-07-24 12:05:10 -04:00
Joey Hess
5b1ac1a313
more generic clientGet
2024-07-24 11:10:19 -04:00
Joey Hess
10f2c23fd7
fix slowloris timeout in hashing resume of download of large file
...
Hash the data that is already present in the file before connecting to
the http server.
2024-07-24 11:03:59 -04:00
Joey Hess
7bd616e169
Remote.Git retrieveKeyFile works with annex+http urls
...
This includes a bugfix to serveGet, it hung at the end.
2024-07-24 10:28:44 -04:00
Joey Hess
a2d1844292
factor out resumeVerifyFromOffset
2024-07-24 09:29:44 -04:00
Joey Hess
ad945896c9
avoid needing ifdefs when using P2P.Http.Client
2024-07-24 08:33:59 -04:00
Joey Hess
48657405c6
cache credentials for p2phttp in memory
2024-07-23 18:45:02 -04:00
Joey Hess
75771772ec
remove uuid from url when calling git credential
...
The user doesn't want to see a uuid in the prompt.
Also, when a http server is proxying, multiple remotes will have the
same base url, and the same password will work for them all.
2024-07-23 18:21:01 -04:00
Joey Hess
b89c784a9b
use git credential when p2phttp needs auth
2024-07-23 18:11:15 -04:00
Joey Hess
b7454f1eeb
protocol version fallback on 404
...
and prettified errors
2024-07-23 14:58:49 -04:00
Joey Hess
4e15b786ca
Remote.Git checkpresent works with annex+http urls.
2024-07-23 14:31:32 -04:00
Joey Hess
b0eed55d4f
factor out http server and client into own modules
...
To avoid a cycle when Remote.Git uses the client.
2024-07-23 14:12:38 -04:00
Joey Hess
6bbc4565e6
started wiring p2phttp into Remote.Git
...
but we have a cycle, ugh
2024-07-23 13:53:10 -04:00
Joey Hess
2aa9154b1f
require a valid uuid at the end of an annex+http url
2024-07-23 12:30:27 -04:00
Joey Hess
75b1d50b99
add remoteAnnexP2PHttpUrl to RemoveGitConfig
...
This is always parsed, when building without servant, a Baseurl is not
generated, and users of it will need to fail.
2024-07-23 09:57:01 -04:00
Joey Hess
5c39652235
starting support for remote.name.annexUrl set to annex+http
...
In this case, Remote.Git should not use that url for all access to
the repository. It will only be used for annex operations, which isn't
done yet.
2024-07-23 09:12:21 -04:00
Joey Hess
37373fad38
refactor
2024-07-22 21:19:32 -04:00
Joey Hess
06de2ad972
change default port to 9417
...
Port 80 would need root, not a good idea, so pick something that might
work by default.
9418 is git protocol's port. 9419 is used by something, but nothing
known uses 9417, so it's as good a default as any.
2024-07-22 20:52:17 -04:00
Joey Hess
53000cf06e
exit cleanly on eg, failure to bind socket
2024-07-22 20:37:37 -04:00
Joey Hess
163a7e91c4
make keeplocked client UUID optional
...
It's not used, but it makes the protocol simpler if this parameter can
always be sent.
2024-07-22 19:48:54 -04:00
Joey Hess
7f4cff7ae9
locking over http basically working
2024-07-22 19:44:26 -04:00
Joey Hess
e979e85bff
make serveKeepLocked check auth just to be safe
2024-07-22 19:15:52 -04:00
Joey Hess
63e42aa1bc
implement clientLockContent
2024-07-22 18:55:12 -04:00
Joey Hess
f5dd7a8bc0
implemented serveLockContent (untested)
2024-07-22 17:38:42 -04:00
Joey Hess
d5eaf0f567
improve clientKeepLocked
2024-07-22 16:56:44 -04:00
Joey Hess
10682eb882
variable name
2024-07-22 16:50:11 -04:00
Joey Hess
8a48d08abd
refactor
2024-07-22 16:49:05 -04:00
Joey Hess
8d36e597f1
finished clientGet validity checking
2024-07-22 16:31:39 -04:00
Joey Hess
48eb6671e4
improve clientGet types
2024-07-22 16:23:08 -04:00
Joey Hess
b697c6b9da
fix TMVar left full crash affecting servePutOffset
...
Problem is that whatever is reading from the TMVar may not have read
from it yet before the client writes the next thing to it.
2024-07-22 15:48:46 -04:00
Joey Hess
3069e28dd8
implemented servePutOffset and clientPutOffset
...
But, it's buggy: the server hangs without processing the VALIDITY,
and I can't seem to work out why. As far as I can see, storefile
is getting as far as running the validitycheck, which is supposed to
read that, but never does.
This is especially strange because what seems like the same protocol
doesn't hang when servePut runs it. This made me think that it needed
to use inAnnexWorker to be more like servePut, but that didn't help.
Another small problem with this is that it does create an empty
.git/annex/tmp/ file for the key. Since this will usually be used in
combination with servePut, that doesn't seem worth worrying about much.
2024-07-22 15:04:10 -04:00
Joey Hess
c36b9cd1fc
fix crash in servePut when client sends from too high offset
...
Have to consume all the content from the client, but force an Invalid
result, so it will just get discarded.
2024-07-22 13:12:15 -04:00
