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
24c3f75ede
Remove setuptools version restriction
...
We're fine with current versions now.
2021-02-08 15:51:34 +01:00
8b724074e0
Use older PROTOCOL_SSLv23 instead of PROTOCOL_TLS
...
We need to support Python older than 3.6, so use the older name.
2021-02-08 15:47:29 +01:00
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
Pierre Ossman