43c371fc7a
Don't fake a close code in close response
...
If the peer doesn't send us a close code, then don't send any code back
in the response. Sending 1005 is explicitly wrong as the specification
states that code should only be used locally and never be sent over the
network.
2023-09-06 12:25:19 +02:00
354668143f
Use Ubuntu 20.04 runner for tests
...
GitHub has deprecated 18.04, so we can't continue running tests on that
old distribution. Unfortunately, we can't switch to the latest 22.04
since GitHub doesn't package anything older than Python 3.7 for that
runner.
And unfortunately the oldest version in 20.04 is Python 3.5, so we have
to remove the test runs for Python 3.4.
2023-08-23 08:49:17 +02:00
e28b7c8c75
Fix usage syntax in regular TCP case
...
You always need to specify the target on the command line as the system
has no default target address.
2023-08-21 16:28:58 +02:00
a1346552fb
Merge branch 'token_redis_improvements' of https://github.com/javicacheiro/websockify
2023-01-20 17:01:32 +01:00
3d2e93aeb0
Allow empty options in redis token source string when using default values
2023-01-19 17:19:30 +01:00
e23d4e337c
Token Redis: Support both json and plain text tokens
2023-01-19 17:19:27 +01:00
8121a5265a
Token Redis source: add optional redis port, redis database and redis password
2023-01-19 17:17:07 +01:00
5dd81a0363
Remove simplejson dependency: use json module from stdlib.
...
Add missing redis dependency.
2023-01-19 16:35:53 +01:00
7f53e9c22c
Update README.md
...
adding WSS exceptions for dummies
2023-01-07 16:34:17 -06:00
d54020538d
Merge branch 'master' of https://github.com/shiomax/websockify
2022-12-22 14:15:46 +01:00
ac74ade2ca
Test current versions of Python
2022-12-16 14:15:23 +01:00
9ac3272d2b
Switch to nose2 for tests
...
The original nosetests is long abandoned, and doesn't work properly on
newer versions of Python.
2022-12-16 14:14:54 +01:00
5d17281187
Remove redundant test requirements
...
These should get pulled in via setup.py.
2022-12-16 14:14:54 +01:00
789b80f719
Explicitly install dependencies
...
It is very buggy if we let setuptools do it for some reason, so have
this as an explicit step instead.
2022-12-16 14:14:23 +01:00
06e61fa4cc
websockify 0.11.0
2022-12-16 13:11:04 +01:00
4f9d496dfe
Use local websockify when building container
...
It's very surprising to get some external copy of websockify when you
are building an image in your local websockify source tree. Make sure we
are using the local copy of everything.
2022-12-16 13:10:58 +01:00
1979e92f0e
Also require all token plugin requirements
...
Token plugins are technically optional, but if you are installing
websockify via pip then all of these are available anyway. So let's make
things simple for users.
2022-12-16 13:08:23 +01:00
63eb24dd8e
Add option to listen to unix socket
2022-12-14 20:51:29 +01:00
d2affc73b5
Insert rebinder at the head of the (possibly empty) LD_PRELOAD pathlist,
...
required for use cases relying on other preloaded libraries e.g. nss_wrapper.
2022-11-16 16:35:39 -08:00
27ee353401
Don't include default message to send_error()
...
Python can provide this for us, so avoid duplication.
2022-11-16 15:28:18 +01:00
39c7cb0115
Merge branch 'http_api' of https://github.com/CendioOssman/websockify
2022-11-08 14:29:12 +01:00
be7b868518
Remove logging from handle_upgrade()
...
The logging should be handled directly in send_response() instead, which
is the default of Python's built-in send_response(). Remove this manual
logging to avoid logging the same call twice.
2022-11-08 14:24:46 +01:00
4695f96728
Add new websocket class HttpWebSocket
...
This class acts as a glue between websocket and http functionality by
taking a 'request_handler' and using its functions for send_response(),
send_header() and end_headers().
2022-11-08 14:24:46 +01:00
832ae23f00
Make websocket's API more intuitive
...
Functions connect() and accept() are using http functionality, like
sending requests and headers. Let's create separate functions with more
intuitive names for these calls. This allows subclasses to override
these functions, as well as makes the code easier to understand at a
glance.
2022-11-08 14:05:46 +01:00
c123bfbbff
Add requests module
2022-10-20 11:28:34 +00:00
70579756f3
expose --file-only option to disable dir listing
2022-10-18 04:10:44 -07:00
e9c80aa32a
Merge branch 'master' of https://github.com/msnatepg/websockify
2022-10-10 10:13:01 +02:00
caef680fff
ensure that queues are empty when closing connections
2022-10-07 14:24:53 +02:00
7133f85df6
Merge branch 'verbose_logging' of https://github.com/javicacheiro/websockify
2022-08-18 11:11:22 +02:00
33910d758d
Merge pull request #521 from javicacheiro/fix_jwcrypto
...
Tests break with jwcrypto>=1.3
2022-05-26 15:59:39 +02:00
0f17500348
Support for jwcrypto>=1.3
2022-05-25 12:40:29 +02:00
4b194636e2
Merge branch 'dockerfile' of https://github.com/javicacheiro/websockify
2022-05-11 14:23:40 +02:00
ffa31d6c2c
When using verbose set root log level to DEBUG
2022-05-03 09:58:50 +02:00
dec26a6a2d
Docker support
2022-04-22 13:21:57 +02:00
d96ecf0859
Add more alternatives to usage string
...
If you use a token plugin, or a Unix socket target, then you should no
longer specify a target on the command line. Add these to the usage
string to make this clear.
2022-04-22 10:19:54 +02:00
d0ad4a1b2a
Merge branches 'use_logging' and 'fix_logging_configuration' of https://github.com/javicacheiro/websockify
2022-04-14 09:15:21 +02:00
e1f903b9e8
Apply configuration to the root logger
2022-04-13 17:02:05 +02:00
62ac4aeb03
Use logging instead of directly printing messages to sys.stderr
2022-04-13 16:12:31 +02:00
e4cff3746d
Explicitly install old wrapt on Python 3.4
...
Something is broken in pip so it installs a wrapt that doesn't support
Python 3.4. Work around this by manually request a version that is known
to work.
2022-04-13 12:50:25 +02:00
d5e8d709d7
Add tests for TokenRedis
2022-04-12 10:58:42 +02:00
dc345815c0
Use RSA-OAEP instead of RSA1_5 for jwt tests
...
The latest version of jwcrypto has disabled RSA1_5 by default, making
the tests fail.
2021-07-23 09:38:58 +02:00
71d55fcaa8
Fix bad classifiers array
2021-07-22 17:20:45 +02:00
1c35fdd72b
websockify 0.10.0
2021-07-22 17:11:08 +02:00
eca301c05b
Fix patching of open() for Python 3.4
...
It doesn't handle builtins automatically, so follow the recommendations
from that time.
2021-05-03 14:34:07 +02:00
b9b269c73f
Add unit test for token file with tab
2021-04-16 13:02:07 +02:00
da130946eb
Merge branch 'sisou/split-tokens-tab' of https://github.com/sisou/websockify
2021-04-16 13:00:36 +02:00
100a776409
Add unit tests for ReadOnlyTokenFile
2021-04-16 12:59:17 +02:00
984dcc62d3
Move JWT token plugins tests to separate file
...
Let's try to match the test units with the modules we have.
2021-04-16 11:27:56 +02:00
c5d365dd1d
Merge pull request #479 from llopisdon/patch-1
...
Update README.md
2021-03-22 09:23:15 +01:00
27e0ce71ed
Update README.md
...
Fixed typo and clarified sentence.
2021-03-20 10:17:55 -04:00
Pierre Ossman