summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Explicitly include "six" for jwt testsPierre Ossman2021-02-081-0/+1
| | | | | | | | | | It is not properly listed as a dependency for jwcrypto, so we need to pull it in manually.
* | Use older numpy for older Python versionsPierre Ossman2021-02-081-0/+4
| | | | | | | | The latest version refuses to run on anything older than Python 3.7.
* | Update classifiers to just Python 3Pierre Ossman2021-02-081-4/+6
| | | | | | | | We no longer support anything older than Python 3.4.
* | Update references in egg manifestPierre Ossman2021-02-081-2/+1
| | | | | | | | | | We changed things when we purged all the non-Python stuff out of the tree.
* | Run all tests even on failurePierre Ossman2021-02-081-0/+1
| | | | | | | | | | Issues might be specific to certain versions of Python, so let all tests run.
* | Use Ubuntu 18.04 for testsPierre Ossman2021-02-081-1/+1
| | | | | | | | | | We want to test on Python 3.4, which requires us to use an older Ubuntu image for tests.
* | Replace Travis with Github actionsPierre Ossman2021-02-082-9/+30
| |
* | Merge branch 'fix467_redis' of https://github.com/PexMor/websockifyPierre Ossman2021-02-081-7/+38
|\ \
| * | add details on format of redis and leave port as numberPexMor2021-02-071-7/+38
| | |
* | | Simplify Windows instructionsAlexander E. Patrakov2021-01-3011-481/+61
|/ / | | | | | | | | | | | | | | 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.
* | Add unit tests for jwt token time checksPierre Ossman2021-01-291-0/+48
| |
* | Merge branch 'new_branch' of https://github.com/jprietove/websockifyPierre Ossman2021-01-291-0/+13
|\ \
| * | Added JWT nbf, not beforeJavier Prieto2021-01-271-0/+6
| | |
| * | Added exp claim for JWT tokenJavier Prieto2021-01-271-0/+7
| | |
* | | Use assertRaises() as a context managerPierre Ossman2021-01-291-6/+6
| | | | | | | | | | | | Makes the code a lot easier to read.
* | | Use patch() as a decorator in testsPierre Ossman2021-01-291-17/+10
| | | | | | | | | | | | Cleaner and more robust.
* | | Remove Python version checkPierre Ossman2021-01-291-84/+83
|/ / | | | | | | We require Python 3 now, so no need for this check.
* | docs: fix simple typo, acccept -> acceptTim Gates2020-12-251-1/+1
| | | | | | | | | | | | There is a small typo in README.md. Should read `accept` rather than `acccept`.
* | Explicitly request Python 3Pierre Ossman2020-12-153-4/+4
| | | | | | | | | | | | 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.
* | 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-1412-262/+112
| | | | | | | | | | 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.
* | Merge pull request #459 from nwtgck/patch-1Samuel Mannehed2020-11-181-1/+1
|\ \ | | | | | | fix a typo
| * | 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.
* | Merge pull request #441 from RangeForce/python-gitignoreSamuel Mannehed2020-09-021-0/+3
|\ \ | | | | | | Add build and dist directories to .gitignore
| * | Add build and dist directories to .gitignoreChris Kerr2020-09-011-0/+3
| | |
* | | Merge pull request #440 from gamtiq/patch-1Samuel Mannehed2020-08-251-1/+1
|\ \ \ | |/ / |/| | Fix a typo in README
| * | Fix a typo in READMEDenis Sikuler2020-08-241-1/+1
|/ /
* | Fix bad reset of fragmented framePierre Ossman2020-08-211-1/+1
| | | | | | | | The Python 2/3 binary data type compatibility hack was backwards here.
* | Merge branch 'sisou/fix-print-statement' of https://github.com/sisou/websockifyPierre Ossman2020-08-211-1/+1
|\ \
| * | Convert old print statement into functionSören Schwert2020-07-281-1/+1
| |/ | | | | For Python 3 compatibility.
* | Convert tests from mox to mockPierre Ossman2020-08-213-89/+58
|/ | | | mox is deprecated upstream in favour of mock
* Update test requirementsPierre Ossman2020-04-082-7/+1
| | | | | | 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).
* 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
|
* Merge pull request #405 from andersk/shellSamuel Mannehed2019-09-261-6/+3
|\ | | | | run: Fix shell scripting bugs
| * run: Fix shell scripting bugsAnders Kaseorg2019-08-171-6/+3
|/ | | | | | | | | | | | * 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>
* websockify 0.9.0v0.9.0Pierre Ossman2019-08-132-1/+18
|
* Update release instructionsPierre Ossman2019-08-131-4/+4
|
* Mark package description as being MarkdownPierre Ossman2019-08-131-0/+1
| | | | | PyPi is now very picky about the format and will not accept things blindly.
* Remove javascript files from setup.pySamuel Mannehed2019-07-141-3/+0
| | | | | The js implementation of websockify has been split into a different repository, this means that these files are no longer present here.
* Merge pull request #362 from CendioOssman/splitSamuel Mannehed2019-07-1242-6720/+143
|\ | | | | Remove all non-Python stuff from the tree
| * Fix all old kanaka linksPierre Ossman2019-07-044-9/+9
| | | | | | | | We now have our own organisation for noVNC and friends.
| * Remove all non-Python stuff from the treePierre Ossman2019-07-0435-6553/+10
| | | | | | | | | | | | | | | | 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.
| * Use direct javascript in test filesPierre Ossman2019-07-035-158/+124
|/ | | | Avoid relying on our own modules as we are about to split things up.