summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'token_redis_improvements' of ↵HEADmasterPierre Ossman2023-01-204-23/+254
|\ | | | | | | https://github.com/javicacheiro/websockify
| * Allow empty options in redis token source string when using default valuesJavier Cacheiro2023-01-192-4/+85
| |
| * Token Redis: Support both json and plain text tokensJavier Cacheiro2023-01-192-8/+91
| |
| * Token Redis source: add optional redis port, redis database and redis passwordJavier Cacheiro2023-01-192-10/+77
| |
| * Remove simplejson dependency: use json module from stdlib.Javier Cacheiro2023-01-193-8/+8
|/ | | | Add missing redis dependency.
* Update README.mddon bright2023-01-071-1/+7
| | | adding WSS exceptions for dummies
* Merge branch 'master' of https://github.com/shiomax/websockifyPierre Ossman2022-12-222-34/+78
|\
| * Add option to listen to unix socketmax2022-12-142-34/+78
| |
* | Test current versions of PythonPierre Ossman2022-12-161-0/+2
| |
* | Switch to nose2 for testsPierre Ossman2022-12-162-2/+2
| | | | | | | | | | The original nosetests is long abandoned, and doesn't work properly on newer versions of Python.
* | Remove redundant test requirementsPierre Ossman2022-12-161-3/+0
| | | | | | | | These should get pulled in via setup.py.
* | Explicitly install dependenciesPierre Ossman2022-12-161-1/+4
| | | | | | | | | | It is very buggy if we let setuptools do it for some reason, so have this as an explicit step instead.
* | websockify 0.11.0v0.11.0Pierre Ossman2022-12-162-1/+7
| |
* | Use local websockify when building containerPierre Ossman2022-12-164-18/+11
| | | | | | | | | | | | 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.
* | Also require all token plugin requirementsPierre Ossman2022-12-161-1/+5
| | | | | | | | | | | | 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.
* | Insert rebinder at the head of the (possibly empty) LD_PRELOAD pathlist,Adam Tilghman2022-11-161-1/+4
| | | | | | | | required for use cases relying on other preloaded libraries e.g. nss_wrapper.
* | Don't include default message to send_error()Pierre Ossman2022-11-162-5/+5
| | | | | | | | Python can provide this for us, so avoid duplication.
* | Merge branch 'http_api' of https://github.com/CendioOssman/websockifyPierre Ossman2022-11-084-21/+117
|\ \
| * | Remove logging from handle_upgrade()Linn Mattsson2022-11-081-2/+0
| | | | | | | | | | | | | | | | | | 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.
| * | Add new websocket class HttpWebSocketLinn Mattsson2022-11-083-4/+90
| | | | | | | | | | | | | | | | | | 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().
| * | Make websocket's API more intuitiveLinn Mattsson2022-11-081-15/+27
|/ / | | | | | | | | | | | | | | 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.
* | Add requests moduleJokin2022-10-201-1/+1
| |
* | expose --file-only option to disable dir listingManoj Ghosh2022-10-181-0/+2
| |
* | Merge branch 'master' of https://github.com/msnatepg/websockifyPierre Ossman2022-10-101-0/+22
|\ \
| * | ensure that queues are empty when closing connectionsMaximilian Sesterhenn2022-10-071-0/+22
| | |
* | | Merge branch 'verbose_logging' of https://github.com/javicacheiro/websockifyPierre Ossman2022-08-181-4/+3
|\ \ \ | |/ / |/| |
| * | When using verbose set root log level to DEBUGJavier Cacheiro2022-05-031-4/+3
| | |
* | | Merge pull request #521 from javicacheiro/fix_jwcryptoSamuel Mannehed2022-05-262-12/+12
|\ \ \ | | | | | | | | Tests break with jwcrypto>=1.3
| * | | Support for jwcrypto>=1.3Javier Cacheiro2022-05-252-12/+12
| |/ /
* | | Merge branch 'dockerfile' of https://github.com/javicacheiro/websockifyPierre Ossman2022-05-113-0/+60
|\ \ \ | |/ / |/| |
| * | Docker supportJavier Cacheiro2022-04-223-0/+60
| | |
* | | Add more alternatives to usage stringPierre Ossman2022-04-221-0/+4
| | | | | | | | | | | | | | | | | | 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.
| | |
| \ \
*-. \ \ Merge branches 'use_logging' and 'fix_logging_configuration' of ↵Pierre Ossman2022-04-142-31/+38
|\ \ \ \ | |_|/ / |/| | | | | | | https://github.com/javicacheiro/websockify
| | * | Apply configuration to the root loggerJavier Cacheiro2022-04-131-8/+11
| |/ / |/| |
| * | Use logging instead of directly printing messages to sys.stderrJavier Cacheiro2022-04-131-23/+27
|/ /
* | Explicitly install old wrapt on Python 3.4Pierre Ossman2022-04-131-0/+1
| | | | | | | | | | | | 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.
* | Add tests for TokenRedisJavier Cacheiro2022-04-121-1/+27
| |
* | Use RSA-OAEP instead of RSA1_5 for jwt testsPierre Ossman2021-07-231-1/+1
|/ | | | | The latest version of jwcrypto has disabled RSA1_5 by default, making the tests fail.
* Fix bad classifiers arrayv0.10.0Pierre Ossman2021-07-221-6/+6
|
* websockify 0.10.0Pierre Ossman2021-07-222-1/+11
|
* Fix patching of open() for Python 3.4Pierre Ossman2021-05-031-3/+3
| | | | | It doesn't handle builtins automatically, so follow the recommendations from that time.
* Add unit test for token file with tabPierre Ossman2021-04-161-0/+15
|
* Merge branch 'sisou/split-tokens-tab' of https://github.com/sisou/websockifyPierre Ossman2021-04-161-1/+2
|\
| * Split token file by any whitespace after the colon, not just a spaceSören Schwert2020-07-281-1/+2
| | | | | | | | | | With the current parser logic, only tokens and servers that are separated by _exactly_ a colon and a space `: ` are detected as tokens. But when formatting one's token file with tabs, this breaks. This commit changes the split characters to be a regular expression that matches all forms of whitespace, including spaces and tabs.
* | Add unit tests for ReadOnlyTokenFilePierre Ossman2021-04-161-2/+31
| |
* | Move JWT token plugins tests to separate filePierre Ossman2021-04-162-129/+135
| | | | | | | | Let's try to match the test units with the modules we have.
* | Merge pull request #479 from llopisdon/patch-1Samuel Mannehed2021-03-221-1/+1
|\ \ | | | | | | Update README.md
| * | Update README.mdDon E. Llopis2021-03-201-1/+1
|/ / | | | | Fixed typo and clarified sentence.
* | Remove setuptools version restrictionPierre Ossman2021-02-081-1/+1
| | | | | | | | We're fine with current versions now.
* | Use older PROTOCOL_SSLv23 instead of PROTOCOL_TLSPierre Ossman2021-02-081-3/+3
| | | | | | | | We need to support Python older than 3.6, so use the older name.
View Lorry Controller Status