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
b46fab5608
Make sure the port is a simple string
...
getaddrinfo() gladly allows unicode for the host, but the port must
be in ascii (e.g. "https"). Make sure this is properly converted
before we pass it on.
Patch by @caderize on GitHub.
2019-07-03 12:29:02 +02:00
6a268a09b6
Use safer method to get base directory
...
realpath isn't available on older systems, so use a safer approach
using just very basic commands.
2019-06-24 15:38:52 +02:00
1f717e83af
Remove information on building Python SSL module
...
Even old systems have this module these days, so these instructions
only serve to confuse people.
2019-06-24 15:32:21 +02:00
60413587ac
Merge branch 'patch-1' of https://github.com/Hyask/websockify
2019-06-17 15:21:14 +02:00
4f6a82159c
run: invoke websockify through 'python -m'
2019-06-17 15:04:43 +02:00
f21a7d33a2
Add a __main__.py file for invocation as a module
...
This file allows an easy invocation of websockify as a module, which is handy when running into shebang issues (https://github.com/pypa/virtualenv/issues/596 ).
With this patch, `python -m websockify ...` has just the same behavior as `./run ...`.
2019-06-13 17:16:25 +02:00
b382c4f6a7
Use Ubuntu Trusty (14.04) for Travis
...
Python 2.6 is not available in the newer environment, so make sure
we're getting the one we need for now.
2019-06-13 13:38:43 +02:00
01a184f4a9
Make TokenRedis optional
...
Most installations will not have redis or simplejson installed, so
avoid having them as a hard requirement unless actually using the
TokenRedis plugin.
2019-05-24 12:56:23 +02:00
70911c6d6e
[websocketproxy] Fixed base class call to process_request() when using
...
ThreadingMixIn
2019-05-15 14:58:47 +02:00
c1edd7818d
Merge branch 'master' of https://github.com/PexMor/websockify
2019-05-09 15:51:45 +02:00
ff3fdd149d
novnc redis backed token_plyugins.py
2019-04-29 20:32:04 +02:00
be9823bf93
Use client IP in logs, not host
...
This is the more common behaviour, and it is also more reliable as
it may require some time to look up hostnames and they may change
over time.
2019-04-25 10:05:14 +02:00
e4658ada2e
Re-enable Windows support
...
It works well enough now with the recent fixes and a modern Python.
2019-04-02 17:04:19 +02:00
85074b6eb5
Use ThreadingMixIn for the simple server
...
ForkingMixIn isn't available on Windows. This is the simple server
without features, so use ThreadingMixIn to keep things consistent.
2019-04-02 17:03:08 +02:00
d751ec44a8
Allow main script to be imported
...
We should only start the server if we are the main module, and not
imported some other way. This is important for multiprocessing to
work correctly on Windows.
2019-04-02 17:02:08 +02:00
6e09ec2548
Merge pull request #382 from Nevon/ssl-key-passphrase
...
Add option for cert key password
2019-03-13 13:34:03 +01:00
92cb3d8355
Rename certificate key password option
2019-03-04 09:31:01 +01:00
0163e4060b
Add option for cert key password
2019-03-02 17:21:28 +01:00
Pierre Ossman
Samuel Mannehed
Ryo Ota
JasonYang
Chris Kerr
Denis Sikuler
Sören Schwert
Feng Ye
Anders Kaseorg
Skia
Giuseppe Corbelli
PexMor
Tommy Brunn