Commit Graph

15425 Commits

Author SHA1 Message Date
Jean-Paul Calderone
cb082b2094 Merge remote-tracking branch 'origin/master' into 3998-new-pyopenssl 2023-06-13 10:35:51 -04:00
Jean-Paul Calderone
0b0e5c5c93 Keep using our dontBuildDocs helper function
It does the necessary overrides for stopping doc builds and excluding certain
inputs and outputs.  We can't just set `dontBuildDocs` in the derivation
because that's not a setting recognized by the Nixpkgs Python build system.
2023-06-13 10:34:36 -04:00
Jean-Paul Calderone
8421d406e9 Fix the name metadata as well
It was already computed for the derivation we're going to override.  It won't
be recomputed again as a result of `overrideAttrs` so we recompute it and
include it in the override.
2023-06-13 10:33:54 -04:00
Jean-Paul Calderone
608fbce9f9 match the source tarball hash 2023-06-13 10:18:56 -04:00
Jean-Paul Calderone
e5b6049329 match the package name on pypi, case and all
otherwise urls are misconstructed and stuff fails
2023-06-13 10:16:50 -04:00
Itamar Turner-Trauring
9cf69c5253 Merge remote-tracking branch 'origin/master' into 3910-http-storage-server-tor-support 2023-06-12 13:42:02 -04:00
Itamar Turner-Trauring
839140c6ab
Merge pull request #1303 from tahoe-lafs/4029-http-storage-client-respects-request-to-use-tor
Http storage client respects request to use tor

Fixes ticket:4029
2023-06-12 13:41:49 -04:00
Itamar Turner-Trauring
7ff20a34e0 Skip on macOS :( 2023-06-12 13:22:45 -04:00
Itamar Turner-Trauring
e8150015ad Try newer Python in the hopes this will speed things up. 2023-06-12 12:34:22 -04:00
Itamar Turner-Trauring
939f0ded25 It's OK if some nodes are down. 2023-06-12 12:00:12 -04:00
Itamar Turner-Trauring
eba1ed0226 More isolated test setup. 2023-06-12 12:00:05 -04:00
Itamar Turner-Trauring
4b495bbe85 Slightly improved logging. 2023-06-12 09:54:45 -04:00
Itamar Turner-Trauring
20d4175abc Fix typecheck complaint 2023-06-06 12:18:02 -04:00
Itamar Turner-Trauring
a977180baf Fix lint 2023-06-06 12:15:31 -04:00
Itamar Turner-Trauring
57a6721670 News file. 2023-06-06 12:07:13 -04:00
Itamar Turner-Trauring
e8744f91e5 Hook up HTTP storage for servers listening on .onion addresses 2023-06-06 12:06:51 -04:00
Itamar Turner-Trauring
74a121da74 Fix bug which meant object could not be created. 2023-06-06 11:47:36 -04:00
Itamar Turner-Trauring
5af0ead5b9 Refactor HTTP client creation to be more centralized. 2023-06-06 10:58:16 -04:00
Itamar Turner-Trauring
940600e0ed Link to ticket. 2023-06-05 12:54:51 -04:00
Itamar Turner-Trauring
43e4e1b09a Get rid of prefix. 2023-06-05 11:52:24 -04:00
Itamar Turner-Trauring
6e6bae9bf6 Some random other hash who knows 2023-06-05 11:34:52 -04:00
Itamar Turner-Trauring
203fd84a88 Need to import it. 2023-06-05 11:30:11 -04:00
Itamar Turner-Trauring
894cb46304 Try merging the two overrides. 2023-06-05 11:27:23 -04:00
Itamar Turner-Trauring
01bc35f129 Try to update nix pyopenssl. 2023-06-05 10:29:57 -04:00
Itamar Turner-Trauring
96670ded65 Switch to using officially support constants, now part of pyOpenSSL's public
API.

The cryptography APIs we were previously using were not supported and aren't
available in all releases.
2023-06-01 17:27:21 -04:00
Jean-Paul Calderone
0e28c8ed4a bump the nix package of txtorcon 2023-05-24 08:54:56 -04:00
Itamar Turner-Trauring
f4a099c801 Merge remote-tracking branch 'origin/master' into 4029-http-storage-client-respects-request-to-use-tor 2023-05-23 14:53:55 -04:00
Itamar Turner-Trauring
d510103f96
Merge pull request #1301 from tahoe-lafs/4027-invalid-unicode
Invalid unicode in Authorization header should give better response

Fixes ticket:4027
2023-05-23 14:53:22 -04:00
Itamar Turner-Trauring
41131ca755
Merge pull request #1302 from tahoe-lafs/4028-more-integration
Fix another integration test failure

Fixes ticket:4028
2023-05-23 14:51:07 -04:00
Itamar Turner-Trauring
b03db14d70 Merge branch '4028-more-integration' into 4027-invalid-unicode 2023-05-23 14:08:09 -04:00
Itamar Turner-Trauring
652c179602 Remove comment. 2023-05-23 14:08:03 -04:00
Itamar Turner-Trauring
1e46e36ee2 More direct approach. 2023-05-23 13:46:32 -04:00
Itamar Turner-Trauring
d15ea8cb52 Shutdown more immediately. 2023-05-23 13:24:29 -04:00
Itamar Turner-Trauring
71cb357f45 Upstream code should make sure this doesn't happen. 2023-05-22 13:03:46 -04:00
Itamar Turner-Trauring
084499dd4b Fix lint. 2023-05-22 13:02:58 -04:00
Itamar Turner-Trauring
1ed440812a Add a safety check. 2023-05-22 13:00:20 -04:00
Itamar Turner-Trauring
2741fb2b46 Don't persist state unnecessarily (and this appears to cause test failures) 2023-05-22 12:51:40 -04:00
Itamar Turner-Trauring
546a51355a Merge branch '4028-more-integration' into 4029-http-storage-client-respects-request-to-use-tor 2023-05-22 11:43:12 -04:00
Itamar Turner-Trauring
f5520fdf74 Better name. 2023-05-22 11:42:13 -04:00
Itamar Turner-Trauring
1b54853d3f News file. 2023-05-19 14:01:08 -04:00
Itamar Turner-Trauring
a1e00ffc3f Add a test that triggers client-side HTTP storage client to use Tor. 2023-05-19 13:59:43 -04:00
Itamar Turner-Trauring
83d8efbb62 Require the appropriate version of txtorcon. 2023-05-19 13:59:29 -04:00
Itamar Turner-Trauring
0ccee4e958 Hook up the Tor-based Agent when necessary. 2023-05-19 13:59:18 -04:00
Itamar Turner-Trauring
2e0e0467fb Hook up HTTP storage client Tor support. 2023-05-18 11:14:51 -04:00
Itamar Turner-Trauring
47991f23fa More refactoring to make it easier to get a txtorcon.Tor instance. 2023-05-18 11:05:38 -04:00
Itamar Turner-Trauring
34accd694c Refactor to return something more useful. 2023-05-18 10:51:31 -04:00
Itamar Turner-Trauring
ffecdf8c77 Switch to non-deprecated API. 2023-05-18 10:18:46 -04:00
Itamar Turner-Trauring
3cf03a5c33 More glue to connect Tor up to the HTTP-based storage client. 2023-05-18 09:28:58 -04:00
Itamar Turner-Trauring
f83b73b5f3 Make Tor provider available at the right place to enable it for HTTP storage
client connections.
2023-05-16 10:44:34 -04:00
Jean-Paul Calderone
6a6d4d7e02
Merge pull request #1298 from tahoe-lafs/4024.remove-werkzeug-pin
Switch to modern Klein so we can remove werkzeug pin

Fixes: ticket:4024
2023-05-13 08:17:04 -04:00