Commit Graph

1532 Commits

Author SHA1 Message Date
Brian Warner
64f973b0e9 docs/state-machines: build all images 2017-10-29 21:42:05 +08:00
Brian Warner
5feffe7fdb Merge PR256: accept $WORMHOLE_RELAY_URL and $WORMHOLE_TRANSIT_HELPER 2017-10-05 15:31:39 -04:00
Jaye Doepke
b362adf7ca Relay and transit url conf from env vars
Added the click option to look for relay and transit urls in environment
variables. If you're running your own relay/transit servers (such as
inside a corporate firewall), this will make client's lives easier.
2017-10-04 14:38:00 -05:00
Brian Warner
7ad006950a Merge branch '252-tor-control-port'
closes #252
2017-09-14 16:51:56 -07:00
Brian Warner
0aeae9ce10 tor_manager: expose errors when --tor-control-port= is provided
If you pass --tor-control-port= and we can't use it, throw an error that will
kill the whole process, instead of falling back to the default SOCKS port.

If you omit --tor-control-port=, then if all default control port connections
fail, we'll fall back to the default SOCKS port.

Also, test each combination separately, and improve the status messages.
2017-09-14 16:46:26 -07:00
Brian Warner
ed420e0001 tor_manager: pass endpoints to txtorcon.connect(), not descriptors
This was breaking any uses of --tor-control-port=: the client would always
fall back to using the default SOCKS port.
2017-09-14 15:48:35 -07:00
Brian Warner
be166b483c NEWS: update for 0.10.3 release 2017-09-12 23:09:25 -07:00
Brian Warner
155e3b5398 README: expand git install, explain --user/venv install options
refs #249
2017-09-12 22:52:00 -07:00
Brian Warner
0a762c5bfd README: mention 'sudo' for install commands
refs #249
2017-09-12 17:13:07 -07:00
Brian Warner
25afce41fb _rlcompleter: re-raise exception with plain 'raise', not 'raise e' 2017-09-12 16:39:05 -07:00
Brian Warner
22bc382543 Merge PR225: instructions for compiling on windows
closes #225
2017-09-03 14:10:25 -07:00
Brian Warner
80f6e8ef90 expand on compile-on-windows instructions 2017-09-03 14:10:08 -07:00
Buckaroo9
d9b47c4f84 Added Other Requirement for Installing on Windows.
Microsoft Visual C++ 9.0 is required for installation. Otherwise large errors are show when executing pip install magic-wormhole.
2017-09-03 14:08:04 -07:00
Brian Warner
68ce54ad3a setup.py: add dep on attrs, >=16.3.0 to get __attrs_post_init__
I should have added this when I switched to the new state machines, since
they definitely depend on attrs. The only reason this worked at all was that
some subdependency was also depending upon attrs.

We need at least 16.3.0, since we use __attrs_post_init__, and that feature
wasn't included in attrs-16.2.0 or earlier.

Closess #248
2017-09-03 14:04:00 -07:00
Brian Warner
50a1df386e README: mention github and IRC channel 2017-08-11 14:31:28 -07:00
Brian Warner
407409c117 Merge PR239: set RLIMIT_NOFILE higher on server
closes #238
2017-07-31 17:14:41 -07:00
Brian Warner
b9d1d11b03 server.py: windows doesn't even have the 'resource' module
I thought it might exist, but be empty. But it doesn't even exist on windows,
so we must guard against an ImportError.
2017-07-31 15:56:55 -07:00
Brian Warner
d44c7d2c1a server: increase RLIMIT_NOFILE to let us use more sockets
Linux defaults to a soft limit of 1024, which limits us to 512 simultaneous
non-transit-using connections. The transit relay runs in the same process, so
long-running relayed transfers will compete for those sockets too.

This raises the soft limit to equal the hard limit (if possible), or as much
as we can manage, if the soft limit was less than 10k. If the
resource.setrlimit calls aren't available (e.g. windows), or some other error
happens, this will log a message and continue without changing the limits.

closes #238
2017-07-31 14:16:26 -07:00
Brian Warner
0c679e74ce server.py: move twisted.web.resource out of the way 2017-07-31 14:01:54 -07:00
Brian Warner
615986b0dc Merge PR237
closes #235
2017-07-31 12:29:21 -07:00
Brian Warner
da9f2504d9 Merge PR236
closes #234
2017-07-31 12:27:25 -07:00
Leo Arias
049fd7c880 use versioneer to set the version of the snap 2017-07-30 23:19:28 +00:00
Leo Arias
1559e4ad90 hack to make the snap version not dirty 2017-07-30 23:10:18 +00:00
Brian Warner
d8102c5217 NEWS: preliminary release notes for upcoming release 2017-07-27 18:40:52 -07:00
Brian Warner
534ff82ad2 Merge PR229: make misc/demo-journal.py flake8-clean 2017-07-24 14:15:48 -05:00
Brian Warner
769dafc94a Merge PR228: add flake8 tests to travis (py36 only, for now) 2017-07-24 14:15:13 -05:00
cclauss
ed7962f7d8 Replacement for #220 2017-07-23 23:14:01 +02:00
cclauss
17eb84b2a2 *.py (with the dot) 2017-07-23 19:38:46 +02:00
cclauss
19dc466789 flake8 tests in .travis.yml 2017-07-23 18:53:10 +02:00
Brian Warner
54036c231f Merge branch '212-bad-nameplates'
closes #212
2017-07-23 01:56:31 -05:00
Brian Warner
8b0a245e19 reject invalid codes with KeyFormatError
refs #212
2017-07-23 00:02:09 -05:00
Brian Warner
de0af837cc test_cli: fix unicode problems
should fix #223
2017-07-22 23:19:43 -05:00
Brian Warner
62382b7ac4 Merge PR197: add --websocket-protocol-option= to server
closes #197
closes #196
2017-07-15 17:40:22 -07:00
Brian Warner
b3b6e1ba8a test_cli: one more test, with argument split off from the name
This is probably an easier way to pass in JSON with embedded spaces:

 wormhole-server start --websocket-protocol-option 'x=["foo": "bar"]'
2017-07-15 17:39:02 -07:00
Jean-Paul Calderone
ba0e8997c5 accept protocol options and set them on the ws factory 2017-07-15 17:30:59 -07:00
Jean-Paul Calderone
aa7013e6f5 Factor duplicate RelayServer construction out 2017-07-15 17:30:59 -07:00
Jean-Paul Calderone
55b4b333dc accept some options on the cli 2017-07-15 17:30:59 -07:00
Brian Warner
2bf27b2e7a Merge branch '61-help'
refs #61
2017-07-15 17:29:20 -07:00
Brian Warner
fb03620fe9 test_cli: hush Click unicode_literals warnings 2017-07-15 17:27:11 -07:00
Brian Warner
1ca51168c5 add test for 'wormhole help' 2017-07-15 17:27:11 -07:00
Brian Warner
b34165d4fb 'wormhole help' should print the same thing as 'wormhole --help'
refs #61
2017-07-15 17:27:06 -07:00
Brian Warner
d2c91c7154 Merge PR189 (in rebased form)
closes #189
2017-07-15 17:20:03 -07:00
Jean-Paul Calderone
efb77443bf Avoid corrupting state if creating a new db fails 2017-07-15 17:05:35 -07:00
cclauss
2ecdd02d24 import contextlib, random
Also on line 239, where is `parse()` defined and on line 241, where is `update_my_state()` defined?
2017-07-10 18:44:05 +02:00
Brian Warner
a836f5e3b8 Merge branch 'open-crowded'
closes #211
2017-07-01 01:18:01 -07:00
Brian Warner
13b4a1793f server: OPEN/CLOSE on crowded mailbox should provoke "crowded" error
The Mailbox object throws CrowdedError, but WebSocketRendezvous wasn't
handling it specifically. The server responded by dropping the connection and
logging an "Unhandled Error", so the client would reconnect and then get the
same error again and again.

This changes WebSocketRendezvous to handle CrowdedError by sending a
"crowded" error response. The client should react to this by giving up on the
connection entirely, and not reconnecting.
2017-07-01 01:17:48 -07:00
Brian Warner
c58172632c Merge PR210 2017-07-01 01:10:03 -07:00
Brian Warner
af4df47fe7 rendezvous: fix misleading log message
We only log the internal (sqlite) ID of the nameplate, not the actual
small-integer name. While investigating misbehavior due to overload, I was
confused into thinking that users were getting nameplates in the 15000+
range, when in fact those were merely the internal database row ids.
2017-06-30 12:46:02 -07:00
Leo Arias
97b194ccd8 Fix the xkcd link markup 2017-06-30 12:51:28 -06:00
Brian Warner
c9ef7a64a2 Merge PR206
closes #206
2017-06-29 15:49:55 -07:00