55f1fe2603
Explicitly include "six" for jwt tests
...
It is not properly listed as a dependency for jwcrypto, so we need to
pull it in manually.
2021-02-08 15:46:43 +01:00
f1e33fa4c7
Use older numpy for older Python versions
...
The latest version refuses to run on anything older than Python 3.7.
2021-02-08 15:33:37 +01:00
72704b3fe8
Update classifiers to just Python 3
...
We no longer support anything older than Python 3.4.
2021-02-08 14:55:49 +01:00
4afdcb00ab
Update references in egg manifest
...
We changed things when we purged all the non-Python stuff out of the
tree.
2021-02-08 14:55:15 +01:00
982e475936
Run all tests even on failure
...
Issues might be specific to certain versions of Python, so let all tests
run.
2021-02-08 14:42:41 +01:00
6012052686
Use Ubuntu 18.04 for tests
...
We want to test on Python 3.4, which requires us to use an older Ubuntu
image for tests.
2021-02-08 11:11:39 +01:00
e4e85f8082
Replace Travis with Github actions
2021-02-08 11:02:48 +01:00
f7b0867471
Merge branch 'fix467_redis' of https://github.com/PexMor/websockify
2021-02-08 10:42:01 +01:00
9dab8b360b
add details on format of redis and leave port as number
2021-02-07 20:39:02 +01:00
4afafcd152
Simplify Windows instructions
...
Instead of a Websockify-specific tool that needs to be compiled, and
that doesn't work on Windows 10 anyway (the service takes forever to
start), let's switch to the industry standard SrvAny tool. This also
gets rid of .Net Framework requirement and lets one run modern
versions of Websockify easily.
2021-01-30 17:11:20 +05:00
b22a6b0ce0
Add unit tests for jwt token time checks
2021-01-29 13:11:07 +01:00
980237c9cd
Merge branch 'new_branch' of https://github.com/jprietove/websockify
2021-01-29 13:10:49 +01:00
fadb25e026
Use assertRaises() as a context manager
...
Makes the code a lot easier to read.
2021-01-29 13:10:16 +01:00
3f17696dc6
Use patch() as a decorator in tests
...
Cleaner and more robust.
2021-01-29 13:09:19 +01:00
a82eb10b48
Remove Python version check
...
We require Python 3 now, so no need for this check.
2021-01-29 12:58:26 +01:00
1f618c8f41
Added JWT nbf, not before
2021-01-27 16:50:19 +01:00
e9367b03be
Added exp claim for JWT token
2021-01-27 15:16:08 +01:00
adc278657a
docs: fix simple typo, acccept -> accept
...
There is a small typo in README.md.
Should read `accept` rather than `acccept`.
2020-12-25 20:37:15 +11:00
108f993eb3
Explicitly request Python 3
...
It varies between systems if /usr/bin/python is Python 2.x or Python
3.x. Since we now only work with Python 3.x we should be more explicit
in our scripts and documentation.
2020-12-15 16:10:43 +01:00
33710b3972
Use frombytes() instead of fromstring()
...
Both the Python library and NumPy have changed the names of these
functions to better match the new bytes data type it actually uses.
2020-12-14 16:08:16 +01:00
96eda1a5c7
Remove support for older Python
...
All active distributions should now support at least Python 3.4, so
let's clean things up by removing older compatibility code.
2020-12-14 13:48:54 +01:00
e80739b296
Add more search paths for rebind.so
...
If we're run as a module then sys.argv[0] will be the main module, not
some startup script.
2020-12-04 13:57:21 +01:00
4c2edaabc2
Merge pull request #459 from nwtgck/patch-1
...
fix a typo
2020-11-18 09:15:42 +01:00
d2155697fc
fix a typo
2020-11-18 08:53:09 +09:00
2b44803f83
fixed a bug in the function of send_frames.
2020-11-10 13:14:54 +01:00
01ef6a6a55
Require same arguments on insufficient socket space
...
This matches the behaviour of SSLSocket, which we are trying to mimic.
It also closely matches the behaviour of normal Socket which can be
assumed to not have sent anything if an error occurs. We might actually
send some data, but the caller cannot really see that and must call us
again as if no data was sent.
2020-09-30 14:58:19 +02:00
6caf23c067
Add type checking when sendning data
...
We use this in various ways so add an early check to make things clear
in case anything is called incorrectly.
2020-09-30 14:53:19 +02:00
d72ace2ae6
Allow sending empty messages
...
This is perfectly valid in the protocol, and may be meningful to some
applications. However send() is still stream oriented so it will ignore
an empty buffer.
2020-09-30 14:51:07 +02:00
536a548db5
Merge pull request #441 from RangeForce/python-gitignore
...
Add build and dist directories to .gitignore
2020-09-02 02:19:12 +02:00
997b3897e7
Add build and dist directories to .gitignore
2020-09-01 10:26:46 +03:00
7d4841c49a
Merge pull request #440 from gamtiq/patch-1
...
Fix a typo in README
2020-08-25 16:51:00 +02:00
9851dd9012
Fix a typo in README
2020-08-24 15:36:35 +03:00
9b1780f068
Fix bad reset of fragmented frame
...
The Python 2/3 binary data type compatibility hack was backwards here.
2020-08-21 10:58:55 +02:00
e5b6dfe17f
Merge branch 'sisou/fix-print-statement' of https://github.com/sisou/websockify
2020-08-21 10:51:37 +02:00
992e09eac4
Convert tests from mox to mock
...
mox is deprecated upstream in favour of mock
2020-08-21 10:50:11 +02:00
57be17d7f5
Convert old print statement into function
...
For Python 3 compatibility.
2020-07-28 14:35:49 +02:00
86a20b23f5
Update test requirements
...
Travis are dropping older Python environments, so update things to
something that reflects what current distributions are using (e.g. Red
Hat Enterprise Linux 7).
2020-04-08 09:18:09 +02:00
7bd955a379
Add UnixDomainSocketDirectory token plugin
2020-03-18 10:40:18 +08:00
6d48b1507e
Make sure port is a simple string (again)
...
The redis token plugin also needs to make sure the port string isn't
unicode for compatibility with Python 2.x.
2020-02-27 15:55:35 +01:00
76897b5093
Log connection errors better
2020-02-27 15:54:29 +01:00
4ecff119c4
Merge pull request #405 from andersk/shell
...
run: Fix shell scripting bugs
2019-09-26 08:42:17 +02:00
5052f823d7
run: Fix shell scripting bugs
...
* Use double quotes around `"$@"` to fix invocation with arguments
including spaces.
* Use double quotes around `"$(dirname "$0")"` to fix invocation
inside a directory path including spaces.
* Use `set -e` to abort in case `cd` fails.
* Use `exec` to avoid forking an unnecessary wrapper process.
* Skip an unnecessary `cd` → `pwd` → `cd` dance, just use `cd`.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2019-08-17 11:39:46 -07:00
654cbac77e
websockify 0.9.0
2019-08-13 13:56:31 +02:00
4ed68eab97
Update release instructions
2019-08-13 13:56:31 +02:00
312a6d200c
Mark package description as being Markdown
...
PyPi is now very picky about the format and will not accept things
blindly.
2019-08-13 13:53:16 +02:00
53004a071d
Remove javascript files from setup.py
...
The js implementation of websockify has been split into a different
repository, this means that these files are no longer present here.
2019-07-14 23:22:10 +02:00
1553fa791e
Merge pull request #362 from CendioOssman/split
...
Remove all non-Python stuff from the tree
2019-07-12 13:44:22 +02:00
6d82536d2b
Fix all old kanaka links
...
We now have our own organisation for noVNC and friends.
2019-07-04 13:11:13 +02:00
368ec2c06e
Remove all non-Python stuff from the tree
...
We're splitting the repository into multiple ones. This one will
only retain the Python stuff (and rebind, used by websocketproxy).
Only once license is needed after this, so use the standard COPYING
filename.
2019-07-04 11:27:40 +02:00
60acf3cd3c
Use direct javascript in test files
...
Avoid relying on our own modules as we are about to split things up.
2019-07-03 15:56:25 +02:00
Pierre Ossman
PexMor
Alexander E. Patrakov
Javier Prieto
Tim Gates
Samuel Mannehed
Ryo Ota
JasonYang
Chris Kerr
Denis Sikuler
Sören Schwert
Feng Ye
Anders Kaseorg