- 15 Dec, 2011 1 commit
-
-
Joel Martin authored
Pull from websockify: 008a5118e728. Should address issue https://github.com/kanaka/noVNC/issues/107 - Also add ability to force use of web-socket-js using window.WEB_SOCKET_FORCE_FLASH - in websock.js, for rQshift*, assume length is the full length if not specified.
-
- 29 Sep, 2011 1 commit
-
-
Joel Martin authored
Pull websockify 724aa3a. - Use array module for unmasking HyBi when no numpy module is available. - Detect client close properly when using python 3. - Print request URL path is specified. - New option --run-once will exit after handling a single WebSocket connection (but not ater flash policy or normal web requests). - New option --timeout TIME will stop listening for new connections after exit after TIME seconds (the master process shuts down). Existing WebSocket connections will continue but once all connections are closed all processes will terminate.
-
- 10 Sep, 2011 1 commit
-
-
Joel Martin authored
Pull from websockify 1c39c7f1f001.
-
- 31 Aug, 2011 3 commits
-
-
Joel Martin authored
Pull from websockify 6e26306.
-
Joel Martin authored
Pull from websockify ada02f2.
-
Joel Martin authored
Pull from websockify 0da91c7.
-
- 24 Aug, 2011 1 commit
-
-
Joel Martin authored
Pull 86af0b614d and 7b496ce5b from websockify. Fix HyBi support on 64-bit systems. https://github.com/kanaka/noVNC/issues/76 - cleanup/update TODO. - remove explicit check for ctypes module for HyBi. Clarify that we support HyBi 07-10. HyBi 07 reports version 7 in the handshake. HyBi 08-10 report version 8 in the handshake. Remove version 9 since that is not yet actually defined.
-
- 14 Jul, 2011 1 commit
-
-
Joel Martin authored
noVNC version 0.1 Add debian packaging directory loosely based on http://trac.zentyal.org/browser/trunk/extra/novnc/debian Show web root directory on startup (pulled from websockify f1c8223). Lintian fixups: - Some license text clarifications. - remove executable permission on utils/launch.sh and include/web-socket-js/web_socket.js - Add executable permission to utils/launch.sh
-
- 09 Jul, 2011 1 commit
-
-
Joel Martin authored
Pull websockify 46e2fbe. WebSocketServer.socket() is a static method takes a host and port and an optional connect parameter. If connect is not set then it returns a socket listening on host and port. If connect is set then a connection will be made host and port and the socket returned. This has IPv6 support like the addrinfo method it replaces. Also, prefer IPv4 resolutions if they are in the list. This can be overriden to prefer IPv6 resolutions for the same host using the optional prefer_ipv6 parameter.
-
- 07 Jul, 2011 2 commits
-
-
Joel Martin authored
Pull 7ae8711 from websockify.
-
Joel Martin authored
Pull from websockify 247b74950d.
-
- 26 Jun, 2011 1 commit
-
-
Joel Martin authored
Pull websockify 7f487fdbd. The reocrd parameter will turn on recording of all messages sent to and from the client. The record parameter is a file prefix. The full file-name will be the prefix with an extension '.HANDLER_ID' based on the handler ID.
-
- 12 May, 2011 2 commits
-
-
Joel Martin authored
-
Joel Martin authored
Including HyBi-07 support and refactor of send/recv.
-
- 19 Apr, 2011 1 commit
-
-
Joel Martin authored
Derived classes will almost certainly want to make use of the raw info.
-
- 26 Mar, 2011 1 commit
-
-
Phil Phillips authored
-
- 01 Feb, 2011 1 commit
-
-
Joel Martin authored
Call waitpid in loop to catch SIGCHLD signals that happen while handling the original SIGCHLD signal. Pulled from websockify.
-
- 31 Jan, 2011 2 commits
-
-
Joel Martin authored
-
Joel Martin authored
-
- 13 Jan, 2011 1 commit
-
-
Joel Martin authored
-
- 12 Jan, 2011 1 commit
-
-
Joel Martin authored
wswrapper: Getting the wswrapper.c LD_PRELOAD model working has turned out to involve too many dark corners of the glibc/POSIX file descriptor space. I realized that 95% of what I want can be accomplished by adding a "wrap command" mode to wsproxy. The code is still there for now, but consider it experimental at best. Minor fix to dup2 and add dup and dup3 logging. wsproxy Wrap Command: In wsproxy wrap command mode, a command line is specified instead of a target address and port. wsproxy then uses a much simpler LD_PRELOAD library, rebind.so, to move intercept any bind() system calls made by the program. If the bind() call is for the wsproxy listen port number then the real bind() system call is issued for an alternate (free high) port on loopback/localhost. wsproxy then forwards from the listen address/port to the moved port. The --wrap-mode argument takes three options that determine the behavior of wsproxy when the wrapped command returns an exit code (exit or daemonizing): ignore, exit, respawn. For example, this runs vncserver on turns port 5901 into a WebSockets port (rebind.so must be built first): ./utils/wsproxy.py --wrap-mode=ignore 5901 -- vncserver :1 The vncserver command backgrounds itself so the wrap mode is set to "ignore" so that wsproxy keeps running even after it receives an exit code from vncserver. wstelnet: To demonstrate the wrap command mode, I added WebSockets telnet client. For example, this runs telnetd (krb5-telnetd) on turns port 2023 into a WebSockets port (using "respawn" mode since telnetd exits after each connection closes): sudo ./utils/wsproxy.py --wrap-mode=respawn 2023 -- telnetd -debug 2023 Then the utils/wstelnet.html page can be used to connect to the telnetd server on port 2023. The telnet client includes VT100.js (from http://code.google.com/p/sshconsole) which handles the terminal emulation and rendering. rebind: The rebind LD_PRELOAD library is used by wsproxy in wrap command mode to intercept bind() system calls and move the port to a different port on loopback/localhost. The rebind.so library can be built by running make in the utils directory. The rebind library can be used separately from wsproxy by setting the REBIND_OLD_PORT and REBIND_NEW_PORT environment variables prior to executing a command. For example: export export REBIND_PORT_OLD="23" export export REBIND_PORT_NEW="65023" LD_PRELOAD=./rebind.so telnetd -debug 23 Alternately, the rebind script does the same thing: rebind 23 65023 telnetd -debug 23 Other changes/notes: - wsproxy no longer daemonizes by default. Remove -f/--foreground option and add -D/--deamon option. - When wsproxy is used to wrap a command in "respawn" mode, the command will not be respawn more often than 3 times within 10 seconds. - Move getKeysym routine out of Canvas object so that it can be called directly.
-
- 08 Jan, 2011 1 commit
-
-
Joel Martin authored
Moved websocket.py code into a class WebSocketServer. WebSockets server implementations will sub-class and define a handler() method which is passed the client socket after. Global variable settings have been changed to be parameters for WebSocketServer when created. Subclass implementations still have to handle queueing and sending but the parent class handles everything else (daemonizing, websocket handshake, encode/decode, etc). It would be better if the parent class could handle queueing and sending. This adds some buffering and polling complexity to the parent class but it would be better to do so at some point. However, the result is still much cleaner as can be seen in wsecho.py. Refactored wsproxy.py and wstest.py (formerly ws.py) to use the new class. Added wsecho.py as a simple echo server. - rename tests/ws.py to utils/wstest.py and add a symlink from tests/wstest.py - rename tests/ws.html to tests/wstest.html to match utils/wstest.py. - add utils/wsecho.py - add tests/wsecho.html which communicates with wsecho.py and simply sends periodic messages and shows what is received.
-
- 07 Jan, 2011 1 commit
-
-
Joel Martin authored
- Added ability to respond to normal web requests. This is basically integrating web.py functionality into wsproxy. This is only in the python version and it is off by default when calling wsproxy. Turn it on with --web DIR where DIR is the web root directory. Next task is to clean up wsproxy.py. It's gotten unwieldy and it really no longer needs to be parallel to the C version.
-
- 04 Jan, 2011 1 commit
-
-
Joel Martin authored
Warn early about no SSL cert and add clearer warning when a connection comes in as SSL but no cert file exists. For the C version, cleanup closing of the connection socket. Use shutdown for a cleaner cleanup with the client.
-
- 06 Nov, 2010 1 commit
-
-
Joel Martin authored
If only --cert is specified then continue to assume both certificate and key are in the same file (key first).
-
- 15 Sep, 2010 1 commit
-
-
Joel Martin authored
Addresses this issue: http://github.com/kanaka/noVNC/issues#issue/14 Safari starts with '\x80' rather than '\x16' like Chrome and Firefox and having PROTOCOL_TLSv1 doesn't work with Safari. But just removing the ssl_version allows things to work with Safari wss:// connections. Also, if the handshake (after SSL wrapping) is null then terminate the connection. This probably means the certificate was refused by the client. Unfortunately Safari (the version I have) doesn't cleanly shutdown WebSockets connections until the page is reloaded (even if the object is no longer referenced).
-
- 11 Sep, 2010 1 commit
-
-
Joel Martin authored
Always fork handlers processes. Instead printing traffic when single-processing, print traffic if verbose flag given.
-
- 10 Sep, 2010 2 commits
-
-
Joel Martin authored
-
Joel Martin authored
Add -m, --multiprocess option which forks a handler for each connection allowing multiple connections to the same target using the same proxy instance. Cleaned up the output of the handler process. Each process' output is prefixed with an ordinal value. Changed both the C and python versions of the proxy.
-
- 27 Aug, 2010 1 commit
-
-
Joel Martin authored
It's less efficient on average that base64 (150% vs 133%). It's non-standard (0 shifted to 256 before encoding). And I rarely use it.
-
- 04 Aug, 2010 2 commits
-
-
Joel Martin authored
- Fallback to md5 module if hashlib not there. - Import parse_qsl from cgi where it is in both 2.4 and 2.6
-
Joel Martin authored
- Replace URL parsing using "".partition() with urlparse module.
-
- 17 Jul, 2010 1 commit
-
-
Joel Martin authored
The listen port should be opened before daemonizing otherwise if opening the port fails, the user will get no feedback. The only complication was that the listen socket needs to not be closed as part of daemonizing. Thanks to http://github.com/rickr for finding it.
-
- 01 Jul, 2010 2 commits
-
-
Joel Martin authored
-
Joel Martin authored
Pull in LGPL md5.c and md5.h files (written by Ulrich Drepper). Now both python and C version of the proxy support both protocol 75 and protocol 76 (hybi 00). Reorganize websocket.py slightly to match websocket.c.
-
- 24 Jun, 2010 2 commits
-
-
Joel Martin authored
-
Joel Martin authored
Looks like disabling web-socket-js debug messages by default that we get a minor speedup. Python proxy should support both 75 and 76 (00) modes. Also, update ws test to more reliably hit the WebSockets ordering/drop issue.
-
- 17 Jun, 2010 1 commit
-
-
Joel Martin authored
Refactor how settings are passed around.
-
- 16 Jun, 2010 2 commits
-
-
Joel Martin authored
-
Joel Martin authored
This allows forwarding from an external port to the same port on localhost (loopback). I.e. ./utils/wsproxy `hostname -f`:5901 localhost:5901
-