joshua
/
websockify
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
732 Commits 1 Branch 0 Tags 4.8 MiB
Commit Graph

53 Commits

Author SHA1 Message Date
Pierre Ossman 10e13d7a7e Remove last bits of Flash WebSocket emulation 
We require native support from the browsers now.
 2017-02-03 16:09:08 +01:00
Pierre Ossman 4099949984 Remove Base64 support 
This is an older protocol used before browsers got native
support for Websockets.
 2017-02-01 08:09:53 +01:00
Gernot Tenchio 192ec6f5f9 C websockify: free memory after failed handshake 
Conflicts:
	other/websocket.c
 2016-04-22 12:04:31 -05:00
Solly Ross 1f132f9d84 Update to 0.8.0 
See CHANGES.txt for more information
 2016-02-18 14:11:15 -05:00
Solly Ross 8dacbc974c Bump NPM Version 
This commit is prep for releasing the Node version for v0.7.1
on NPM.

Closes #199.
 2015-10-12 15:37:03 -04:00
Solly b445296816 Merge pull request #185 from timkurvers/fix/js/drop-base64-dependency 
Drop pkrumins/node-base64 dependency
 2015-08-27 17:58:24 -04:00
Tim Kurvers 2051c2419f Correct SPDX license identifier for LGPL-3.0 2015-08-01 16:32:56 +02:00
Tim Kurvers addc2e6b20 Drop pkrumins/node-base64 dependency 2015-08-01 16:10:58 +02:00
Solly Ross 69c04c819c Update to 0.7.0 
See CHANGES.txt for details.
 2015-07-23 21:02:37 -04:00
ags131 67a12a2394 Fixed Package.json 
Added websockify.js to the files section, this fixes #90 and allows NPM to properly install
 2014-05-16 11:56:24 -05:00
Solly Ross 739af6ecb4 Update to v0.6.0 
*** NOTE ***

This version of websockify will break existing code which sub-classes
`WebsocketProxy` -- see pull requests #110 and #111
 2014-02-18 17:03:09 -05:00
Peter Åstrand (astrand) 047ce47742 Rename new_client to new_websocket_client, in order to have a better 
name in the SocketServer/HTTPServer request handler hierarchy. Prepare
for merge pull request #72. This work has been picked out of
7b3dd8a6f5 .
 2013-11-28 13:33:28 +01:00
dellsystem 82fe329129 Fix syntax errors in other/websockify.rb 2013-10-21 20:59:16 -04:00
chrislee35 eee946d2cf fixed 1.8 compatibility bug for OpenSSL::SSL::SSLSocket#read_nonblock vs #readpartial 
tested in 1.8 and 2.0
 2013-07-02 22:16:01 +09:00
chrislee35 73af324a3a adding SSL support and Ruby1.9 support 2013-07-02 21:38:22 +09:00
Joel Martin 264f8fdd7f Update to version 0.5.1 
*** NOTE ***

This version of websockify no longer supports the old Hixie protocol.
 2013-06-27 16:35:54 -05:00
Joel Martin 36cb8f4676 Move javascript websockify files to other/js 2013-06-27 16:29:17 -05:00
Joel Martin 36fcd5784f Add package file for websockify.js 2013-06-27 16:29:17 -05:00
Joel Martin 46450577c2 Use upstream einaros/ws 0.4.27 with sub-protocol support. 
Also, some connection error handling.
 2013-06-27 16:29:17 -05:00
Joel Martin 477947ba96 Remove wsproxy references. Sync launch.sh from noVNC. 2013-04-15 12:22:08 -05:00
Joel Martin 805026360e Use Buffer base64 support instead of pkrumins/node-base64 2013-02-19 13:12:10 -06:00
Joel Martin a670af376e websockify.js: add encrypted HTTPS/WSS support. 
This works a bit differently than python websockify implementation
since the server either runs in HTTP or in HTTPS and both web and
websocket servers only support the same mode. Specifying the --cert
parameter activates encrypted HTTPS/WSS mode.
 2012-10-29 16:59:46 -05:00
Joel Martin 3018cf8c1a websockify.js: executable, fix usage statement. 2012-10-26 18:01:05 -05:00
Joel Martin 6a126405bd websockify.js: binary data, better logs and err handling. 
This version requires a patched version of einaros/ws that can be
found here: https://github.com/kanaka/ws You can use the patched
version like this:

    cd websockify/other
    git clone https://github.com/kanaka/ws
    npm link ./ws

Once the upstream 'ws' module supports subprotocol negotiation then
this will no longer be necessary.

Changes:
- Adds support for binary data and subprotocol negotiation of 'base64'
  vs 'binary' with 'binary' preferred if the client offers it.
- Add client address to log messages.
- Close the target when the client closes.
- Catch errors when we try and send to a client that is no longer
  connected.
 2012-10-26 16:08:47 -05:00
Joel Martin 8b3125bcf3 other/websockify.js: arg cleanup, remove deprecated call. 
Change deprecated path.exists call to fs.exists.

Confirmed that this runs with node v0.8.9
 2012-09-21 08:19:40 -05:00
Joel Martin 00e9d3bf29 websockify.rb: correct comment, no SSL support yet. 2012-07-24 09:31:26 -05:00
Joel Martin 37c0c80a93 C websockify: add --run-once option. 2012-04-13 10:36:16 -05:00
Joel Martin aef7ab3a57 Clean socket shutdown in C version too. 
Related to https://github.com/kanaka/noVNC/issues/58 (supporting Apple
Remote Desktop).
 2012-03-23 12:17:50 -05:00
Joel Martin 9fcd92c39a Remove copy of kumina implementation. 
The canonical location is https://github.com/kumina/wsproxy

There are now several external implementations of Websockify that
I link to from
https://github.com/kanaka/websockify/wiki/Feature_Matrix
 2012-02-23 17:18:10 -06:00
Joel Martin 7ea468b5d7 Node impl to use einaros/ws and support HyBi. 
Also adds web serving functionality and Flash policy service.
 2012-02-23 17:06:35 -06:00
Joel Martin bea32aebed Handle partial HyBi client frames. Cleanup buffer names. 
Significant refactor of decode_hybi() and use of it in do_proxy().
 2012-02-03 11:55:03 -06:00
Joel Martin bc1ea59867 Fix response to empty close frame. 2012-02-02 11:06:19 -06:00
Joel Martin b76c357f3f Fix --ssl-only option. 2012-02-02 08:11:06 -06:00
Joel Martin 27ec5cff89 Remove more wswrapper Makefile references. 2012-02-02 06:51:39 -06:00
Joel Martin e2497313f5 Remove pointless md5_test.c file. 2012-02-01 19:17:56 -06:00
Joel Martin 04b3b2057c HyBi/IETF 6455 support to C websockify. 
It's probably broken and it's definitely still messy in several ways,
but basic tests work with Chrome.

Several other C websockify cleanups:

- Remove most of the non-thread safe global variable usage (still
  a little bit that could be fixed so that threading would be easier).

- Remove wswrapper. It is unmaintained, out of date, and never worked
  well anyways (since it really needed a way to do asynchronous queued
  work but it was running in another process context making that
  hard).

- Use md5 routines from openssl.

- Remove md5.c and md5.h since no longer needed.

Thanks to https://github.com/dew111 for spurring me on to get this
done by writing code. I didn't end up using much his forked code, but
having something there goaded me enough to just get it working.
 2012-02-01 19:10:39 -06:00
Joel Martin 2c053f349c Clojure websockify: -main and command line args. 
Can now be launched like so:

lein run websockify --web ../../noVNC/ 6080 localhost:5901
 2012-01-30 13:38:18 -06:00
Joel Martin f2f838f7e2 Split generic websocket code out from websockify. 
Generic TCP client and Websocket server code is now split out from the
websockify specific code.
 2012-01-27 16:01:17 -06:00
Joel Martin 3278905ead Better error handling in Clojure Websockify. 
Also, disable verbose debug.
 2012-01-27 15:37:35 -06:00
Joel Martin a5d4fe1d18 Working vesrion Clojure Websockify. 
Still needs some cleanup related to cleaning up client and target
connections.
 2012-01-27 15:14:45 -06:00
Joel Martin 297a818066 Working Clojure Netty client code. 2012-01-27 13:11:38 -06:00
Joel Martin 9aa2844856 Switch to Jetty for Clojure WebSocket support. 
This current code accepts WebSocket connections and can send data back
and forth.
 2012-01-26 15:36:58 -06:00
Joel Martin 0664584843 Clojure Websockify using Aleph - broken. 2012-01-26 15:31:21 -06:00
Joel Martin 545b6c80de Update kumina with HyBi-10+ support. 
Pull 63aa9ce07 from https://github.com/kumina/wsproxy
 2011-10-25 17:02:04 -05:00
Joel Martin acacb4527d HyBi and threading support to ruby websockify. 2011-10-05 17:53:36 -05:00
Joel Martin 6b9d6c39be Add ruby version of websockify. 
Initial version is very basic but works: Hixie-76 only, no embedded
webserver, no SSL, etc.
 2011-10-04 01:20:14 -05:00
Joel Martin 6a7b56d56f READMEs: kumina features, clarifications. 2011-07-14 12:27:04 -05:00
Joel Martin 108b617eef Note kumina license, and link to kumina blog post. 
Ed Schouten blog article:
http://blog.kumina.nl/2011/06/proxying-and-multiplexing-novnc-using-wsproxy/

Also, clarify external code licenses.
 2011-07-13 13:01:03 -05:00
Joel Martin 9c2a41fe0e Merge commit 'kumina/master' 
Conflicts:

	wsproxy.c

Conflicts:
	.gitignore
	Makefile
	README.md
 2011-07-11 19:14:11 -05:00
Joel Martin 7307be683f Fix chdir call to use string instead of character. 2011-04-12 22:46:32 -05:00