summaryrefslogtreecommitdiff
path: root/websockify
Commit message (Collapse)AuthorAgeFilesLines
* Allow empty options in redis token source string when using default valuesJavier Cacheiro2023-01-191-4/+21
|
* Token Redis: Support both json and plain text tokensJavier Cacheiro2023-01-191-8/+37
|
* Token Redis source: add optional redis port, redis database and redis passwordJavier Cacheiro2023-01-191-10/+45
|
* Remove simplejson dependency: use json module from stdlib.Javier Cacheiro2023-01-191-7/+6
| | | | Add missing redis dependency.
* 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
| |
* | 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-161-3/+3
| | | | | | | | Python can provide this for us, so avoid duplication.
* | 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-082-4/+21
| | | | | | | | | | | | 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.
* | 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
| | |
* | | Support for jwcrypto>=1.3Javier Cacheiro2022-05-251-2/+2
|/ /
* | 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
|/
* 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.
* | 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.
* | add details on format of redis and leave port as numberPexMor2021-02-071-7/+38
| |
* | Added JWT nbf, not beforeJavier Prieto2021-01-271-0/+6
| |
* | Added exp claim for JWT tokenJavier Prieto2021-01-271-0/+7
| |
* | Use frombytes() instead of fromstring()Pierre Ossman2020-12-141-4/+4
| | | | | | | | | | Both the Python library and NumPy have changed the names of these functions to better match the new bytes data type it actually uses.
* | Remove support for older PythonPierre Ossman2020-12-147-182/+78
| | | | | | | | | | All active distributions should now support at least Python 3.4, so let's clean things up by removing older compatibility code.
* | Add more search paths for rebind.soPierre Ossman2020-12-041-0/+1
| | | | | | | | | | If we're run as a module then sys.argv[0] will be the main module, not some startup script.
* | fix a typoRyo Ota2020-11-181-1/+1
| |
* | fixed a bug in the function of send_frames.JasonYang2020-11-101-1/+1
| |
* | Require same arguments on insufficient socket spacePierre Ossman2020-09-302-21/+72
| | | | | | | | | | | | | | | | 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.
* | Add type checking when sendning dataPierre Ossman2020-09-301-0/+9
| | | | | | | | | | We use this in various ways so add an early check to make things clear in case anything is called incorrectly.
* | Allow sending empty messagesPierre Ossman2020-09-301-2/+4
| | | | | | | | | | | | 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.
* | Fix bad reset of fragmented framePierre Ossman2020-08-211-1/+1
| | | | | | | | The Python 2/3 binary data type compatibility hack was backwards here.
* | Convert old print statement into functionSören Schwert2020-07-281-1/+1
|/ | | For Python 3 compatibility.
* Add UnixDomainSocketDirectory token pluginFeng Ye2020-03-181-1/+29
|
* Make sure port is a simple string (again)Pierre Ossman2020-02-271-2/+3
| | | | | The redis token plugin also needs to make sure the port string isn't unicode for compatibility with Python 2.x.
* Log connection errors betterPierre Ossman2020-02-271-3/+3
|
* Make sure the port is a simple stringPierre Ossman2019-07-031-2/+4
| | | | | | | | 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.
* Add a __main__.py file for invocation as a moduleSkia2019-06-131-0/+4
| | | | | 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 ...`.
* Make TokenRedis optionalPierre Ossman2019-05-241-17/+18
| | | | | | Most installations will not have redis or simplejson installed, so avoid having them as a hard requirement unless actually using the TokenRedis plugin.
* [websocketproxy] Fixed base class call to process_request() when usingGiuseppe Corbelli2019-05-151-1/+1
| | | | ThreadingMixIn
* Merge branch 'master' of https://github.com/PexMor/websockifyPierre Ossman2019-05-092-1/+21
|\
| * novnc redis backed token_plyugins.pyPexMor2019-04-292-1/+21
| |
* | Use client IP in logs, not hostPierre Ossman2019-04-251-1/+1
|/ | | | | | 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.
* Re-enable Windows supportPierre Ossman2019-04-021-3/+0
| | | | It works well enough now with the recent fixes and a modern Python.
* Use ThreadingMixIn for the simple serverPierre Ossman2019-04-021-3/+3
| | | | | ForkingMixIn isn't available on Windows. This is the simple server without features, so use ThreadingMixIn to keep things consistent.
* Rename certificate key password optionTommy Brunn2019-03-042-4/+4
|
View Lorry Controller Status