open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,529 Commits 1 Branch 0 Tags 2.9 MiB
337102d02c
Commit Graph

1529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Warner
8fe41e135d make blocking/send-text work on py3, add dependency on 'six' 
* use modern/portable "next(iter)" instead of "iter.next()"
* use six.moves.input() instead of raw_input()
* tell requests' Response.iter_lines that we want str, not bytes
 2015-09-28 00:24:36 -07:00
Brian Warner
a7213d9c9a enforce bytes-vs-str in the API 
The main wormhole code is str (unicode in py3, bytes in py2). Most
everything else must be passed as bytes in both py2/py3.

Keep the internal "side" string as a str, to make it easier to merge
with other URL pieces.
 2015-09-28 00:24:36 -07:00
Brian Warner
6614783c43 make relay work under py3 
Current twisted.web wants bytes in most places (this will probably
change when twisted.web is properly ported to py3).
 2015-09-28 00:24:00 -07:00
Brian Warner
15cc0a1429 test_server: make sure the server is reachable 
used to exercise py3 issues with the server
 2015-09-28 00:24:00 -07:00
Brian Warner
5d93dccb88 appid and derive_key(purpose=) must be bytes, not unicode 2015-09-28 00:24:00 -07:00
Brian Warner
e8626fcea2 relay: deliver EventSource as utf-8 
This allows the client (requests.py) to produce unicode fields and
lines, instead of binary, which is necessary for py3 compatibility.
 2015-09-27 14:35:10 -07:00
Brian Warner
2b37c62150 server: add -n/--no-daemon, to run on py3 
The twisted.python.logfile in Twisted-15.4.0 is not yet compatible with
py3, but can be bypassed by not daemonizing the server (so it doesn't
write to a logfile). This has been fixed in twisted trunk, so when
15.4.1 or 15.5.0 comes out, this will no longer be needed. But I think
we'll leave it in place, since sometimes it's handy to run a server
without daemonization.
 2015-09-27 14:24:03 -07:00
Brian Warner
e9d87828c2 scripts/runner: make py3-compatible 2015-09-27 13:54:20 -07:00
Brian Warner
2e2bd1bb5f tests: split blocking out to its own file 
also clean up the output when pip-e -vs- entrypoint -vs- Versioneer
makes the entrypoint script refuse to run from a version mismatch.
 2015-09-27 10:43:25 -07:00
Brian Warner
0cd7471c06 travis: turn on py3 testing (failures allowed) 2015-09-26 18:32:02 -07:00
Brian Warner
adf55175fb test_scripts: wormhole should live next to python 
not necessarily beneath the current working directory
 2015-09-26 18:29:46 -07:00
Brian Warner
d3ef3aa29a more verbose, to figure out travis failure 2015-09-26 18:21:56 -07:00
Brian Warner
5ee37cab64 test_scripts: make found-wrong-wormhole error more verbose 2015-09-26 18:17:50 -07:00
Brian Warner
be124e686a relay: avoid using Twisted strports 
strports aren't ported to py3 yet, so we stick with Endpoints and
Services, which have been.
 2015-09-26 18:15:35 -07:00
Brian Warner
b069e69d35 test scripts too (with spawnToThread) 2015-09-26 18:02:02 -07:00
Brian Warner
1e6fc4601e tests: split common code out 2015-09-26 18:02:02 -07:00
Brian Warner
bdb8b395b5 database: make py3-compatible 2015-09-26 17:51:21 -07:00
Brian Warner
cbc40697f7 use "except x as y:" everywhere, for py3 2015-09-26 17:47:13 -07:00
Brian Warner
4c4b5d081b RelayServer: use in-memory DB for tests 
This avoids problems where a leftover DB from one run causes "wrong
code" errors in the next.
 2015-09-26 17:44:20 -07:00
Brian Warner
797074d03e runner.py: cosmetic changes 2015-09-23 18:13:35 -07:00
Brian Warner
9c94871e74 travis: use sudo:false for faster builds 2015-09-22 13:33:04 -07:00
Brian Warner
d76893c07e update docs/api.md for 0.4.0 2015-09-22 01:27:17 -07:00
Brian Warner
bc1142586e add docs for 0.4.0 2015-09-22 01:18:01 -07:00
Brian Warner
262cc960cf Merge branch 'only-symmetric' 
magic-wormhole now only uses the "SPAKE2_Symmetric" protocol, which does
not require the two participants to decide ahead of time which one is
which.

Previously, the blocking form used an asymmetric protocol, and the
non-blocking/Twisted form used a symmetric protocol (however it used an
earlier+slower version from SPAKE2-0.2.0, which is not compatible with
the current SPAKE2-0.3.0 one).

This breaks compatibility for the built-in "wormhole" script: a sender
using 0.3.0 will get errors when talking to a recipient running this
version or newer (including the upcoming 0.4.0 release).
 2015-09-22 01:10:29 -07:00
Brian Warner
532aa0811c update idSymmetric= to match SPAKE2-0.3 2015-09-22 01:07:46 -07:00
Brian Warner
b97b7ccd8c switch to spake2==0.3, with the faster symmetric algorithm 
Note that this breaks compatibility of SymmetricWormhole, which was
previously only used by the Twisted flavor.
 2015-09-22 01:03:43 -07:00
Brian Warner
88dab265de test blocking code, using twisted+deferToThread 
Unfortunately Twisted still requires python2, so we can't use this to
test the intended python3-compatibility of the blocking code.
 2015-09-21 23:21:40 -07:00
Brian Warner
46f1fd2cd0 factor error classes into a common file 2015-09-21 23:21:26 -07:00
Brian Warner
8f1ce1f835 update twisted/demo.py 2015-07-24 18:04:15 -07:00
Brian Warner
aec8b65724 rename twisted/eventsource.py in prep for directory merge 2015-07-24 17:55:23 -07:00
Brian Warner
efd6d27cc6 rename SymmetricWormhole to just "Wormhole" 
Update docs too. Now both blocking/ and twisted/ use "Wormhole".
 2015-07-24 17:47:46 -07:00
Brian Warner
d8ca850d1a blocking: finish alignment 2015-07-24 17:28:55 -07:00
Brian Warner
2ad65e13fe blocking: more alignment with twisted/transcribe.py 2015-07-24 17:22:02 -07:00
Brian Warner
2e44181e6d blocking: introduce _post_message()/_post_json() 2015-07-24 17:16:33 -07:00
Brian Warner
5951015f79 rearrange twisted+blocking to look roughly the same 2015-07-24 17:02:32 -07:00
Brian Warner
cebfa71563 minor reformatting, improve test error messages 2015-07-24 16:57:19 -07:00
Brian Warner
cdeaac0ad0 twisted: deallocate in more errorful situations 2015-07-24 16:56:41 -07:00
Brian Warner
62ebd07036 twisted/transcribe: refactoring 2015-07-24 16:46:39 -07:00
Brian Warner
77b80495c9 improve typechecking, nacl.utils.EncryptedMessage is not a bytestring 
but it derives from one
 2015-07-24 16:45:20 -07:00
Brian Warner
a46a405487 refactor: _get_message() (singular) does unhexlify too 2015-07-24 16:33:29 -07:00
Brian Warner
5e1690cad8 rearrange slightly 2015-07-24 16:26:01 -07:00
Brian Warner
e5fcc6a8c8 rename some methods to make them more private 2015-07-24 16:18:03 -07:00
Brian Warner
effbd27047 minor rearrangement 2015-07-24 16:00:13 -07:00
Brian Warner
cfe51f73c1 replace base asserts with UsageError 2015-07-24 15:55:42 -07:00
Brian Warner
056cf107fc replace blocking Initiator/Receiver with just symmetric Wormhole 
first pass, seems to work
 2015-07-17 17:23:07 -07:00
Brian Warner
bc54a0bbca move blocking/eventsource out to a separate file 2015-07-17 16:55:29 -07:00
Brian Warner
f6eeaab0e4 add docs for 0.3.0 2015-06-24 00:26:03 -07:00
Brian Warner
894da44244 relay: make it possible to omit the Transit server 2015-06-21 21:08:21 -07:00
Brian Warner
dc65b4354d twisted: split allocate_ports() out to util.py 
so it can be used by downstream projects
 2015-06-21 21:04:33 -07:00
Brian Warner
eb18b1359e Merge branch 'twisted' 2015-06-20 19:21:16 -07:00