Fix bad classifiers array

It doesn't handle builtins automatically, so follow the recommendations
from that time.

.github/workflows/test.yml

@@ -0,0 +1,35 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-18.04
+    strategy:
+      matrix:
+        python-version:
+          - 3.4
+          - 3.5
+          - 3.6
+          - 3.7
+          - 3.8
+          - 3.9
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install setuptools
+          python -m pip install -r test-requirements.txt
+      - name: Install old numpy
+        run: |
+          python -m pip install 'numpy<1.17'
+        if: ${{ matrix.python-version >= '3.4' && matrix.python-version < '3.7' }}
+      - name: Run tests
+        run: |
+          python setup.py nosetests --verbosity=3

.gitignore

@@ -1,11 +1,12 @@
 *.pyc
 *.o
 *.so
-other/.lein-deps-sum
-other/classes
-other/lib
-other/node_modules
 .project
 .pydevproject
 target.cfg
 target.cfg.d
+.tox
+
+build/
+dist/
+*.egg-info

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "include/web-socket-js-project"]
-	path = include/web-socket-js-project
-	url = https://github.com/gimite/web-socket-js.git

CHANGES.txt

@@ -1,6 +1,56 @@
 Changes
 =======
 
+0.10.0
+------
+
+* Python 3.4 or newer is now required
+* Empty message frames are now supported
+* Tokens can now specify a Unix domain socket file to connect to
+* Time limits on JWT tokens are now respected
+* Whitespace is better tolerated in token files
+* Lots of minor fixes...
+
+0.9.0
+-----
+
+* Base64 support removed and binary mode is now required
+* Low level WebSocket protocol handling now has its own class
+* Authentication now optionally required for web server
+* Server hostname can be used as the token
+* JWT/JWS/JWE can be used for the token
+* redis can be used for the token
+* Can now log to syslog
+* Improved latency by disabling Nagle for proxied connection
+* Added client certificate authentication
+* Support for password protected certificate key file
+* TLS ciphers and options are now configurable
+* Can be invoked via inetd
+* Lots of minor fixes...
+
+0.8.0
+-----
+
+* Make websockify properly terminate children on SIGTERM (#226)
+* Remove logging in signal handlers (this can cause Python to hang under certain conditions) (#219)
+* Make it easier to log to a file (#205)
+* Add support for IPv6 addresses in tokens in the TokenFile token plugins (#197)
+* Improve auth plugin framework to enable better support for HTTP auth (#194, #201)
+* Fix bug in JSONTokenAPI token plugin (#192)
+* Fix a missing variable in the exception handler (#178)
+
+0.7.0
+-----
+
+* Python 3 support fixes (#140, #155, #159)
+* Generic token-parsing plugins support (#162)
+* Generic authentication plugins support (#172)
+* Fixed frame corruption on big-endian systems (#161)
+* Support heartbeats (via PING) and automatic responses to PONG (#169)
+* Automatically reject unmasked client frames by default (strict mode) (#174)
+* Automatically restart interrupted select calls (#175)
+* Make 'run' respect environment settings (including virtualenv) (#176)
+
 0.6.1 - May 11, 2015
 --------------------
 

LICENSE.txt

@@ -1,16 +0,0 @@
-websockify is licensed under the LGPL version 3 (see docs/LICENSE.GPL-3 and
-docs/LICENSE.LGPL-3) with the following exceptions:
-
-    include/websock.js         : MPL 2.0
-
-    include/base64.js          : MPL 2.0
-
-    include/des.js             : Various BSD style licenses
-
-    include/web-socket-js/     : New BSD license (3-clause). Source code at
-                                 https://github.com/gimite/web-socket-js
-
-    other/kumina.c             : Simplified BSD license (2 clause).
-                                 Original source at
-                                 https://github.com/kumina/wsproxy
-

MANIFEST.in

@@ -1,2 +1 @@
-include CHANGES.txt README.md LICENSE.txt
-graft include
+include CHANGES.txt README.md COPYING

README.md

@@ -1,7 +1,7 @@
 ## websockify: WebSockets support for any application/server
 
 websockify was formerly named wsproxy and was part of the
-[noVNC](https://github.com/kanaka/noVNC) project.
+[noVNC](https://github.com/novnc/noVNC) project.
 
 At the most basic level, websockify just translates WebSockets traffic
 to normal socket traffic. Websockify accepts the WebSockets handshake,
@@ -19,7 +19,7 @@ href="https://groups.google.com/forum/?fromgroups#!forum/novnc">noVNC/websockify
 discussion group</a>
 
 Bugs and feature requests can be submitted via [github
-issues](https://github.com/kanaka/websockify/issues).
+issues](https://github.com/novnc/websockify/issues).
 
 If you want to show appreciation for websockify you could donate to a great
 non-profits such as: [Compassion
@@ -33,50 +33,34 @@ href="http://www.twitter.com/noVNC">@noVNC</a> if you do.
 ### WebSockets binary data
 
 Starting with websockify 0.5.0, only the HyBi / IETF
-6455 WebSocket protocol is supported.
-
-Websockify negotiates whether to base64 encode traffic to and from the
-client via the subprotocol header (Sec-WebSocket-Protocol). The valid
-subprotocol values are 'binary' and 'base64' and if the client sends
-both then the server (the python implementation) will prefer 'binary'.
-The 'binary' subprotocol indicates that the data will be sent raw
-using binary WebSocket frames. Some HyBi clients (such as the Flash
-fallback and older Chrome and iOS versions) do not support binary data
-which is why the negotiation is necessary.
+6455 WebSocket protocol is supported. There is no support for the older
+Base64 encoded data format.
 
 
 ### Encrypted WebSocket connections (wss://)
 
-To encrypt the traffic using the WebSocket 'wss://' URI scheme you
-need to generate a certificate for websockify to load. By default websockify
-loads a certificate file name `self.pem` but the `--cert=CERT` option can
-override the file name. You can generate a self-signed certificate using
-openssl. When asked for the common name, use the hostname of the server where
-the proxy will be running:
+To encrypt the traffic using the WebSocket 'wss://' URI scheme you need to
+generate a certificate and key for Websockify to load. By default, Websockify
+loads a certificate file name `self.pem` but the `--cert=CERT` and `--key=KEY`
+options can override the file name. You can generate a self-signed certificate
+using openssl. When asked for the common name, use the hostname of the server
+where the proxy will be running:
 
 ```
 openssl req -new -x509 -days 365 -nodes -out self.pem -keyout self.pem
 ```
 
+For a self-signed certificate to work, you need to make your client/browser
+understand it. You can do this by installing it as accepted certificate, or by
+using that same certificate for a HTTPS connection to which you navigate first
+and approve. Browsers generally don't give you the "trust certificate?" prompt
+by opening a WSS socket with invalid certificate, hence you need to have it
+accept it by either of those two methods.
 
-### Websock Javascript library
-
-
-The `include/websock.js` Javascript library library provides a Websock
-object that is similar to the standard WebSocket object but Websock
-enables communication with raw TCP sockets (i.e. the binary stream)
-via websockify. This is accomplished by base64 encoding the data
-stream between Websock and websockify.
-
-Websock has built-in receive queue buffering; the message event
-does not contain actual data but is simply a notification that
-there is new data available. Several rQ* methods are available to
-read binary data off of the receive queue.
-
-The Websock API is documented on the [websock.js API wiki page](https://github.com/kanaka/websockify/wiki/websock.js)
-
-See the "Wrap a Program" section below for an example of using Websock
-and websockify as a browser telnet client (`wstelnet.html`).
+If you have a commercial/valid SSL certificate with one or more intermediate
+certificates, concat them into one file, server certificate first, then the
+intermediate(s) from the CA, etc. Point to this file with the `--cert` option
+and then also to the key with `--key`. Finally, use `--ssl-only` as needed.
 
 
 ### Additional websockify features
@@ -91,34 +75,46 @@ These are not necessary for the basic operation.
   wrapping the socket if the data starts with '\x16' or '\x80'
   (indicating SSL).
 
-* Flash security policy: websockify detects flash security policy
-  requests (again by sniffing the first packet) and answers with an
-  appropriate flash security policy response (and then closes the
-  port). This means no separate flash security policy server is needed
-  for supporting the flash WebSockets fallback emulator.
-
 * Session recording: This feature that allows recording of the traffic
   sent and received from the client to a file using the `--record`
   option.
 
 * Mini-webserver: websockify can detect and respond to normal web
-  requests on the same port as the WebSockets proxy and Flash security
-  policy. This functionality is activate with the `--web DIR` option
-  where DIR is the root of the web directory to serve.
+  requests on the same port as the WebSockets proxy. This functionality
+  is activated with the `--web DIR` option where DIR is the root of the
+  web directory to serve.
 
 * Wrap a program: see the "Wrap a Program" section below.
 
+* Log files: websockify can save all logging information in a file.
+  This functionality is activated with the `--log-file FILE` option
+  where FILE is the file where the logs should be saved.
 
-### Implementations of websockify
+* Authentication plugins: websockify can demand authentication for
+  websocket connections and, if you use `--web-auth`, also for normal
+  web requests. This functionality is activated with the
+  `--auth-plugin CLASS` and `--auth-source ARG` options, where CLASS is
+  usually one from auth_plugins.py and ARG is the plugin's configuration.
+
+* Token plugins: a single instance of websockify can connect clients to
+  multiple different pre-configured targets, depending on the token sent
+  by the client using the `token` URL parameter, or the hostname used to
+  reach websockify, if you use `--host-token`. This functionality is
+  activated with the `--token-plugin CLASS` and `--token-source ARG`
+  options, where CLASS is usually one from token_plugins.py and ARG is
+  the plugin's configuration.
+
+### Other implementations of websockify
 
 The primary implementation of websockify is in python. There are
-several alternate implementations in other languages (C, Node.js,
-Clojure, Ruby) in the `other/` subdirectory (with varying levels of
-functionality).
+several alternate implementations in other languages available in
+our sister repositories [websockify-js](https://github.com/novnc/websockify-js)
+(JavaScript/Node.js) and [websockify-other](https://github.com/novnc/websockify-other)
+ (C, Clojure, Ruby).
 
 In addition there are several other external projects that implement
 the websockify "protocol". See the alternate implementation [Feature
-Matrix](https://github.com/kanaka/websockify/wiki/Feature_Matrix) for
+Matrix](https://github.com/novnc/websockify/wiki/Feature_Matrix) for
 more information.
 
 
@@ -129,7 +125,7 @@ In addition to proxying from a source address to a target address
 launch a program on the local system and proxy WebSockets traffic to
 a normal TCP port owned/bound by the program.
 
-The is accomplished with a small LD_PRELOAD library (`rebind.so`)
+This is accomplished by the LD_PRELOAD library (`rebind.so`)
 which intercepts bind() system calls by the program. The specified
 port is moved to a new localhost/loopback free high port. websockify
 then proxies WebSockets traffic directed to the original port to the
@@ -145,7 +141,7 @@ when the wrapped program exits or daemonizes.
 
 Here is an example of using websockify to wrap the vncserver command
 (which backgrounds itself) for use with
-[noVNC](https://github.com/kanaka/noVNC):
+[noVNC](https://github.com/novnc/noVNC):
 
     `./run 5901 --wrap-mode=ignore -- vncserver -geometry 1024x768 :1`
 
@@ -155,29 +151,20 @@ the command:
 
     `sudo ./run 2023 --wrap-mode=respawn -- telnetd -debug 2023`
 
-The `wstelnet.html` page demonstrates a simple WebSockets based telnet
-client (use 'localhost' and '2023' for the host and port
-respectively).
+The `wstelnet.html` page in the [websockify-js](https://github.com/novnc/websockify-js)
+project demonstrates a simple WebSockets based telnet client (use
+'localhost' and '2023' for the host and port respectively).
 
 
-### Building the Python ssl module (for python 2.5 and older)
+### Installing websockify
 
-* Install the build dependencies. On Ubuntu use this command:
-
-    `sudo aptitude install python-dev bluetooth-dev`
-
-* At the top level of the websockify repostory, download, build and
-  symlink the ssl module:
-
-    `wget --no-check-certificate http://pypi.python.org/packages/source/s/ssl/ssl-1.15.tar.gz`
-
-    `tar xvzf ssl-1.15.tar.gz`
-
-    `cd ssl-1.15`
-
-    `make`
-
-    `cd ../`
-
-    `ln -sf ssl-1.15/build/lib.linux-*/ssl ssl`
+Download one of the releases or the latest development version, extract
+it and run `python3 setup.py install` as root in the directory where you
+extracted the files. Normally, this will also install numpy for better
+performance, if you don't have it installed already. However, numpy is
+optional. If you don't want to install numpy or if you can't compile it,
+you can edit setup.py and remove the `install_requires=['numpy'],` line
+before running `python3 setup.py install`.
 
+Afterwards, websockify should be available in your path. Run
+`websockify --help` to confirm it's installed correctly.

Windows/Windows Service Readme.md

@@ -0,0 +1,61 @@
+Running Websockify as a Windows service
+=======================================
+
+Installation and configuration
+------------------------------
+
+Download the following software:
+
+ * Python, from https://www.python.org/downloads/windows/
+ * SrvAny, from http://simpleauto.byethost8.com/Zip/SrvAny.zip
+
+Note that there is [a modern alternative for SrvAny](https://github.com/rwmjones/rhsrvany),
+but that project does not provide binaries.
+
+Install Python for all users, not just the current one. Extract Websockify
+into a directory, e.g. `C:\Program Files\websockify`, so that e.g.
+`README.md` ends up there. Extract the `SrvAny.zip` archive, copy the
+`WIN7\SrvAny.exe` file into `C:\Program Files\websockify`.
+
+Then create a batch file, `C:\Program Files\websockify\run.bat`, that runs
+Websockify from its directory with the correct options under the correct
+Python interpreter:
+
+```
+C:
+cd "\Program Files\websockify"
+"C:\Program Files\Python39\python.exe" -m websockify 5901 127.0.0.1:5900
+```
+
+Run it by hand once so that Windows asks you about a firewall exception.
+After confirming the exception, press `Ctrl+C` to terminate the script.
+
+Then create a Windows service for Websockify (use an Administrator command
+prompt for that). For paths with spaces, like in this example, double-escaping
+is needed: once for `cmd.exe` and once for `SrvAny.exe`.
+
+```
+C:
+cd "\Program Files\websockify"
+SrvAny.exe -install Websockify 10s \\\"C:\Program Files\websockify\run.bat\\\"
+```
+
+In the Windows Control Panel, under Services, a new "Websockify" service will
+appear. In its properties dialog, you can change the startup type, e.g. make
+it start automatically at boot. Or, you can start the service manually.
+
+Uninstallation
+--------------
+
+If you want to remove the service, first set its startup type to Manual, then
+reboot the PC. Then run this command using the Administrator command prompt:
+
+```
+C:
+cd "\Program Files\websockify"
+SrvAny.exe -remove Websockify
+```
+
+After that, you will be able to remove the `C:\Program Files\websockify`
+directory completely.
+

Windows/Windows Service Readme.txt

@@ -1,39 +0,0 @@
------------------------------------
-Windows noVNC Websockify Service
------------------------------------ 
-
-The "noVNC Websocket Service.exe" file is a windows service wrapper created with Visual Studio 2010 to create a windows service to start stop the noVNC Websocket Server. All files used to create the wrapper can be found in 'noVNC Websocket Service Project' folder.
-
-To download the precompiled executables please grab the zip in the downloads section of websockify project:
-https://github.com/kanaka/websockify
-
----------------------------
-Installation
----------------------------
-
-1. This service requires websockify.exe be in the same directory. Instructions on how to compile websockify python script as a windows executable can be found here:
-https://github.com/kanaka/websockify/wiki/Compiling-Websockify-as-Windows-Executable
-
-2.To add this service to a Windows PC you need to run the commandline as administrator and then run this line:
-
-sc create "noVNC Websocket Server" binPath= "PATH TO noVNC eg C:\noVNC\utils\Windows\Websocket Service.exe" DisplayName= "noVNC Websocket Server"
-
-3 .Once this is run you will be able to access the service via Control Panel > Admin Tools > Services. In here you can specify whether you want the service to run automatically and start at stop the service.
-
----------------------------
-Configuration
----------------------------
-The file noVNCConfig.ini must be in the same directory as "noVNC Websocket Service.exe".
-
-This file contains a single line which is the websockify.exe statup arguements. An example is:
-192.168.0.1:5901 192.168.0.1:5900
-
-All websockify supported arguements will work if added here.
-
----------------------------
-Deletion
----------------------------
-
-You can delete the service at any time by running the commandline as admin and using this command:
-sc delete "noVNC Websocket Server".
-

Windows/noVNC Websocket Service Project/Program.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.ServiceProcess;
-using System.Text;
-
-namespace MELT_Command_Websocket
-{
-    static class Program
-    {
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
-        static void Main()
-        {
-            ServiceBase[] ServicesToRun;
-            ServicesToRun = new ServiceBase[] 
-			{ 
-				new Service1() 
-			};
-            ServiceBase.Run(ServicesToRun);
-        }
-    }
-}

Windows/noVNC Websocket Service Project/ProjectInstaller.Designer.cs

@@ -1,61 +0,0 @@
-namespace MELT_Command_Websocket
-{
-    partial class ProjectInstaller
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.serviceProcessInstaller1 = new System.ServiceProcess.ServiceProcessInstaller();
-            this.serviceInstaller1 = new System.ServiceProcess.ServiceInstaller();
-            // 
-            // serviceProcessInstaller1
-            // 
-            this.serviceProcessInstaller1.Account = System.ServiceProcess.ServiceAccount.NetworkService;
-            this.serviceProcessInstaller1.Installers.AddRange(new System.Configuration.Install.Installer[] {
-            this.serviceInstaller1});
-            this.serviceProcessInstaller1.Password = null;
-            this.serviceProcessInstaller1.Username = null;
-            // 
-            // serviceInstaller1
-            // 
-            this.serviceInstaller1.Description = "noVNC Websocket Service";
-            this.serviceInstaller1.DisplayName = "noVNC Websocket Service";
-            this.serviceInstaller1.ServiceName = "noVNC Websocket Service";
-            this.serviceInstaller1.StartType = System.ServiceProcess.ServiceStartMode.Automatic;
-            // 
-            // ProjectInstaller
-            // 
-            this.Installers.AddRange(new System.Configuration.Install.Installer[] {
-            this.serviceProcessInstaller1});
-
-        }
-
-        #endregion
-
-        private System.ServiceProcess.ServiceProcessInstaller serviceProcessInstaller1;
-        private System.ServiceProcess.ServiceInstaller serviceInstaller1;
-    }
-}

Windows/noVNC Websocket Service Project/ProjectInstaller.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Configuration.Install;
-using System.Linq;
-
-
-namespace MELT_Command_Websocket
-{
-    [RunInstaller(true)]
-    public partial class ProjectInstaller : System.Configuration.Install.Installer
-    {
-        public ProjectInstaller()
-        {
-            InitializeComponent();
-        }
-    }
-}

Windows/noVNC Websocket Service Project/ProjectInstaller.resx

@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="serviceProcessInstaller1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
-  </metadata>
-  <metadata name="serviceInstaller1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>196, 17</value>
-  </metadata>
-  <metadata name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-</root>

Windows/noVNC Websocket Service Project/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("MELT Command Websocket")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("MELT Command Websocket")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("5ab831cb-6852-4ce1-849c-b26725b0e10b")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

Windows/noVNC Websocket Service Project/Service1.Designer.cs

@@ -1,37 +0,0 @@
-namespace MELT_Command_Websocket
-{
-    partial class Service1
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            components = new System.ComponentModel.Container();
-            this.ServiceName = "Service1";
-        }
-
-        #endregion
-    }
-}

Windows/noVNC Websocket Service Project/Service1.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Diagnostics;
-using System.Linq;
-using System.ServiceProcess;
-using System.Text;
-using System.IO;
-
-namespace MELT_Command_Websocket
-{
-    public partial class Service1 : ServiceBase
-    {
-        Process websockify;
-        public Service1()
-        {
-            InitializeComponent();
-        }
-
-        protected override void OnStart(string[] args)
-        {
-
-            string configpath = AppDomain.CurrentDomain.BaseDirectory + "\\noVNCConfig.ini";
-            string sockifypath = AppDomain.CurrentDomain.BaseDirectory + "\\websockify.exe";
-            //Load commandline arguements from config file.
-            StreamReader streamReader = new StreamReader(configpath);
-            string arguements = streamReader.ReadLine();
-            streamReader.Close();
-           
-            //Start websockify.
-            websockify = System.Diagnostics.Process.Start(sockifypath, arguements);
-        }
-
-        protected override void OnStop()
-        {
-            //Service stopped. Close websockify.
-            websockify.Kill();
-        }
-    }
-}

Windows/noVNC Websocket Service Project/noVNC Websocket.csproj

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6B86AE7B-6BBD-4E74-8802-5995E8B6D27D}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>noVNC_Websocket_Service</RootNamespace>
-    <AssemblyName>noVNC Websocket Service</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration.Install" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ProjectInstaller.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ProjectInstaller.Designer.cs">
-      <DependentUpon>ProjectInstaller.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Service1.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Service1.Designer.cs">
-      <DependentUpon>Service1.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="ProjectInstaller.resx">
-      <DependentUpon>ProjectInstaller.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

Windows/noVNC Websocket Service Project/noVNC Websocket.sln

@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "noVNC Websocket", "noVNC Websocket.csproj", "{6B86AE7B-6BBD-4E74-8802-5995E8B6D27D}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6B86AE7B-6BBD-4E74-8802-5995E8B6D27D}.Debug|x86.ActiveCfg = Debug|x86
-		{6B86AE7B-6BBD-4E74-8802-5995E8B6D27D}.Debug|x86.Build.0 = Debug|x86
-		{6B86AE7B-6BBD-4E74-8802-5995E8B6D27D}.Release|x86.ActiveCfg = Release|x86
-		{6B86AE7B-6BBD-4E74-8802-5995E8B6D27D}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

docs/LICENSE.GPL-3

@@ -1,621 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS

docs/LICENSE.MPL-2.0

@@ -1,373 +0,0 @@
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in 
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.

docs/TODO

@@ -1,6 +0,0 @@
-- Go implementation
-- Rust implementation
-- Add sub-protocol support to upstream einaros/ws module and use that
-  instead of the patched module.
-- wstelnet: support CSI L and CSI M
-

docs/flash_policy.txt

@@ -1,4 +0,0 @@
-Manual setup:
-
-DATA="echo \'<cross-domain-policy><allow-access-from domain=\\\"*\\\" to-ports=\\\"*\\\" /></cross-domain-policy>\'"
-/usr/bin/socat -T 1 TCP-L:843,reuseaddr,fork,crlf SYSTEM:"$DATA"

docs/notes

@@ -1,21 +1,3 @@
-Some implementation notes:
-
-There is an included flash object (web-socket-js) that is used to
-emulate websocket support on browsers without websocket support
-(currently only Chrome has WebSocket support).
-
-Javascript doesn't have a bytearray type, so what you get out of
-a WebSocket object is just Javascript strings.  Javascript has UTF-16
-unicode strings and anything sent through the WebSocket gets converted
-to UTF-8 and vice-versa. So, one additional (and necessary) function
-of wsproxy is base64 encoding/decoding what is sent to/from the
-browser.
-
-Building web-socket-js emulator:
-
-    cd include/web-socket-js/flash-src
-    mxmlc -static-link-runtime-shared-libraries WebSocketMain.as
-
 Building release tarball:
     - not really necessary since tagged revision can be downloaded
       from github as tarballs

docs/release.txt

@@ -1,13 +1,10 @@
-- Update setup.py, CHANGES.txt and other/package.json and commit
+- Update setup.py and CHANGES.txt and commit
 - Create version tag and tarball from tag
     WVER=0.1.0
     git tag v${WVER}
     git push origin master
     git push origin v${WVER}
-- Register with pypi.python.org (once):
-    python setup.py register
-- Upload the source distribution to pypi
-    python setup.py sdist upload
-- Register with npmjs.org (once)
-- Upload websockify.js npmjs.org package
-    npm publish other/js
+- Create the source distribution
+    python3 setup.py sdist
+- Upload the source distribution
+    python3 -m twine upload dist/websockify-${WVER}.tar.gz

docs/websockify.1

@@ -42,18 +42,6 @@ To encrypt the traffic using the WebSocket 'wss://' URI scheme you need to gener
 
 openssl req -new -x509 -days 365 -nodes -out self.pem -keyout self.pem
 
-.SS Websock Javascript library
-
-The websock.js (see https://github.com/kanaka/websockify) Javascript library library provides a Websock object that is similar to the standard WebSocket object but Websock enables communication with raw TCP sockets (i.e. the binary stream) via websockify. This is accomplished by base64 encoding the data stream between Websock and websockify.
-
-Websock has built-in receive queue buffering; the message event does not contain actual data but is simply a notification that there is new data available. Several rQ* methods are available to read binary data off of the receive queue.
-
-The Websock API is documented on the websock.js API wiki page:
-
-https://github.com/kanaka/websockify/wiki/websock.js
-
-See the "Wrap a Program" section below for an example of using Websock and websockify as a browser telnet client (wstelnet.html).
-
 .SS Additional websockify features
 
 These are not necessary for the basic operation.
@@ -64,14 +52,11 @@ Daemonizing: When the -D option is specified, websockify runs in the background
 .IP *
 SSL (the wss:// WebSockets URI): This is detected automatically by websockify by sniffing the first byte sent from the client and then wrapping the socket if the data starts with '\\x16' or '\\x80' (indicating SSL).
 
-.IP *
-Flash security policy: websockify detects flash security policy requests (again by sniffing the first packet) and answers with an appropriate flash security policy response (and then closes the port). This means no separate flash security policy server is needed for supporting the flash WebSockets fallback emulator.
-
 .IP *
 Session recording: This feature that allows recording of the traffic sent and received from the client to a file using the --record option.
 
 .IP *
-Mini-webserver: websockify can detect and respond to normal web requests on the same port as the WebSockets proxy and Flash security policy. This functionality is activate with the --web DIR option where DIR is the root of the web directory to serve.
+Mini-webserver: websockify can detect and respond to normal web requests on the same port as the WebSockets proxy. This functionality is activate with the --web DIR option where DIR is the root of the web directory to serve.
 
 .IP *
 Wrap a program: see the "Wrap a Program" section below.
@@ -92,19 +77,34 @@ Here is an example of using websockify to wrap the vncserver command (which back
 
 `./websockify 5901 --wrap-mode=ignore -- vncserver -geometry 1024x768 :1`
 
-Here is an example of wrapping telnetd (from krb5-telnetd).telnetd exits after the connection closes so the wrap mode is set to respawn the command:
+Here is an example of wrapping telnetd (from krb5-telnetd). telnetd exits after the connection closes so the wrap mode is set to respawn the command:
 
 `sudo ./websockify 2023 --wrap-mode=respawn -- telnetd -debug 2023`
 
 The wstelnet.html page demonstrates a simple WebSockets based telnet client.
 
+.SS Use client certificate verification
+
+This feature requires Python 2.7.9 or newer or Python 3.4 or newer.
+
+The --verify-client option makes the server ask the client for a SSL certificate. Presenting a valid (not expired and trusted by any supplied certificate authority) certificate is required for the client connection. With -auth-plugin=ClientCertCNAuth, the client certificate can be checked against a list of authorised certificate users. Non-encrypted connection attempts always fail during authentication.
+
+Here is an example of a vncsevrer with password-less, certificate-driven authentication:
+
+`./websockify 5901 --cert=fullchain.pem --key=privkey.pem --ssl-only --verify-client --cafile=ca-certificates.crt --auth-plugin=ClientCertCNAuth --auth-source='jane@example.com Joe User9824510' --web=noVNC/ --wrap-mode=ignore -- vncserver :1 -geometry 1024x768 -SecurityTypes=None`
+
+The --auth-source option takes a white-space separated list of common names. Depending on your clients certificates they can be verified email addresses, user-names or any other string used for identification.
+
+The --cafile option selects a file containing concatenated certificates of authorities trusted for validating clients. If this option is omitted, system default list of CAs is used. Upon connect, the client should supply the whole certificate chain. If your clients are known not to send intermediate certificates, they can be appended to the ca-file as well.
+            
+Note: Most browsers ask the user to select a certificate only while connecting via HTTPS, not WebSockets. Connecting directly to the SSL secured WebSocket may cause the browser to abort the connection. If you want to connect via noVNC, the --web option should point to a copy of noVNC, so it is loaded from the same host.
 
 .SH AUTHOR
 Joel Martin (github@martintribe.org)
 
 .SH SEE ALSO
 
-https://github.com/kanaka/websockify/
+https://github.com/novnc/websockify/
 
-https://github.com/kanaka/websockify/wiki/
+https://github.com/novnc/websockify/wiki/
 

include/VT100.js

@@ -1,919 +0,0 @@
-// VT100.js -- a text terminal emulator in JavaScript with a ncurses-like
-// interface and a POSIX-like interface. (The POSIX-like calls are
-// implemented on top of the ncurses-like calls, not the other way round.)
-//
-// Released under the GNU LGPL v2.1, by Frank Bi <bi@zompower.tk>
-//
-// 2007-08-12	- refresh():
-//		  - factor out colour code to html_colours_()
-//		  - fix handling of A_REVERSE | A_DIM
-//		  - simplify initial <br /> output code
-//		  - fix underlining colour
-//		- fix attron() not to turn off attributes
-//		- decouple A_STANDOUT and A_BOLD
-// 2007-08-11	- getch() now calls refresh()
-// 2007-08-06	- Safari compat fix -- turn '\r' into '\n' for onkeypress
-// 2007-08-05	- Opera compat fixes for onkeypress
-// 2007-07-30	- IE compat fixes:
-//		  - change key handling code
-//		  - add <br />...<br />&nbsp; so that 1st and last lines align
-// 2007-07-28	- change wrapping behaviour -- writing at the right edge no
-//		  longer causes the cursor to immediately wrap around
-//		- add <b>...</b> to output to make A_STANDOUT stand out more
-//		- add handling of backspace, tab, return keys
-//		- fix doc. of VT100() constructor
-//		- change from GPL to LGPL
-// 2007-07-09	- initial release
-//
-// class VT100
-//	A_NORMAL, A_UNDERLINE, A_REVERSE, A_BLINK, A_DIM, A_BOLD, A_STANDOUT
-//	=class constants=
-//			Attribute constants.
-//	VT100(wd, ht, scr_id) =constructor=
-//			Creates a virtual terminal with width `wd', and
-//			height `ht'. The terminal will be displayed between
-//			<pre>...</pre> tags which have element ID `scr_id'.
-//	addch(ch [, attr])
-//			Writes out the character `ch'. If `attr' is given,
-//			it specifies the attributes for the character,
-//			otherwise the current attributes are used.
-//	addstr(stuff)	Writes out the string `stuff' using the current
-//			attributes.
-//	attroff(mode)	Turns off any current options given in mode.
-//	attron(mode)	Turns on any options given in mode.
-//	attrset(mode)	Sets the current options to mode.
-//	bkgdset(attr)	Sets the background attributes to attr.
-//	clear()		Clears the terminal using the background attributes,
-//			and homes the cursor.
-//	clrtobol()	Clears the portion of the terminal from the cursor
-//			to the bottom.
-//	clrtoeol()	Clears the portion of the current line after the
-//			cursor.
-//	curs_set(vis [, grab])
-//			If `vis' is 0, makes the cursor invisible; otherwise
-//			make it visible. If `grab' is given and true, starts
-//			capturing keyboard events (for `getch()'); if given
-//			and false, stops capturing events.
-//	echo()		Causes key strokes to be automatically echoed on the
-//			terminal.
-//	erase()		Same as `clear()'.
-//	getch(isr)	Arranges to call `isr' when a key stroke is
-//			received. The received character and the terminal
-//			object are passed as arguments to `isr'.
-//	getmaxyx()	Returns an associative array with the maximum row
-//			(`y') and column (`x') numbers for the terminal.
-//	getyx()		Returns an associative array with the current row
-//			(`y') and column (`x') of the cursor.
-//	move(r, c)	Moves the cursor to row `r', column `c'.
-//	noecho()	Stops automatically echoing key strokes.
-//	refresh()	Updates the display.
-//	scroll()	Scrolls the terminal up one line.
-//	standend()	Same as `attrset(VT100.A_NORMAL)'.
-//	standout()	Same as `attron(VT100.A_STANDOUT)'.
-//	write(stuff)	Writes `stuff' to the terminal and immediately
-//			updates the display; (some) escape sequences are
-//			interpreted and acted on.
-
-// constructor
-function VT100(wd, ht, scr_id)
-{
-	var r;
-	var c;
-	var scr = document.getElementById(scr_id);
-	this.wd_ = wd;
-	this.ht_ = ht;
-	this.scrolled_ = 0;
-	this.bkgd_ = {
-			mode: VT100.A_NORMAL,
-			fg: VT100.COLOR_WHITE,
-			bg: VT100.COLOR_BLACK
-		     };
-	this.c_attr_ = {
-			mode: VT100.A_NORMAL,
-			fg: VT100.COLOR_WHITE,
-			bg: VT100.COLOR_BLACK
-		     };
-	this.text_ = new Array(ht);
-	this.attr_ = new Array(ht);
-	for (r = 0; r < ht; ++r) {
-		this.text_[r] = new Array(wd);
-		this.attr_[r] = new Array(wd);
-	}
-	this.scr_ = scr;
-	this.cursor_vis_ = true;
-	this.grab_events_ = false;
-	this.getch_isr_ = undefined;
-	this.key_buf_ = [];
-	this.echo_ = true;
-	this.esc_state_ = 0;
-	// Internal debug setting.
-	this.debug_ = 0;
-	this.clear();
-	this.refresh();
-}
-
-// public constants -- colours and colour pairs
-VT100.COLOR_BLACK = 0;
-VT100.COLOR_BLUE = 1;
-VT100.COLOR_GREEN = 2;
-VT100.COLOR_CYAN = 3;
-VT100.COLOR_RED = 4;
-VT100.COLOR_MAGENTA = 5;
-VT100.COLOR_YELLOW = 6;
-VT100.COLOR_WHITE = 7;
-VT100.COLOR_PAIRS = 256;
-VT100.COLORS = 8;
-// public constants -- attributes
-VT100.A_NORMAL = 0;
-VT100.A_UNDERLINE = 1;
-VT100.A_REVERSE = 2;
-VT100.A_BLINK = 4;
-VT100.A_DIM = 8;
-VT100.A_BOLD = 16;
-VT100.A_STANDOUT = 32;
-VT100.A_PROTECT = VT100.A_INVIS = 0; // ?
-// other public constants
-VT100.TABSIZE = 8;
-// private constants
-VT100.ATTR_FLAGS_ = VT100.A_UNDERLINE | VT100.A_REVERSE | VT100.A_BLINK |
-		    VT100.A_DIM | VT100.A_BOLD | VT100.A_STANDOUT |
-		    VT100.A_PROTECT | VT100.A_INVIS;
-VT100.COLOR_SHIFT_ = 6;
-VT100.browser_ie_ = (navigator.appName.indexOf("Microsoft") != -1);
-VT100.browser_opera_ = (navigator.appName.indexOf("Opera") != -1);
-// class variables
-VT100.the_vt_ = undefined;
-
-// class methods
-
-// this is actually an event handler
-VT100.handle_onkeypress_ = function VT100_handle_onkeypress(event)
-{
-	var vt = VT100.the_vt_, ch;
-	if (vt === undefined)
-		return true;
-	if (VT100.browser_ie_ || VT100.browser_opera_) {
-		ch = event.keyCode;
-		if (ch == 13)
-			ch = 10;
-		else if (ch > 255 || (ch < 32 && ch != 8))
-			return true;
-		ch = String.fromCharCode(ch);
-	} else {
-		ch = event.charCode;
-		//dump("ch: " + ch + "\n");
-		//dump("ctrl?: " + event.ctrlKey + "\n");
-		vt.debug("onkeypress:: keyCode: " + event.keyCode + ", ch: " + event.charCode);
-		if (ch) {
-			if (ch > 255)
-				return true;
-			if (event.ctrlKey && event.shiftKey) {
-				// Don't send the copy/paste commands.
-				var charStr = String.fromCharCode(ch);
-				if (charStr == 'C' || charStr == 'V') {
-					return false;
-				}
-			}
-			if (event.ctrlKey) {
-				ch = String.fromCharCode(ch - 96);
-			} else {
-				ch = String.fromCharCode(ch);
-				if (ch == '\r')
-					ch = '\n';
-			}
-		} else {
-			switch (event.keyCode) {
-			    case event.DOM_VK_BACK_SPACE:
-				ch = '\b';
-				break;
-			    case event.DOM_VK_TAB:
-				ch = '\t';
-				// Stop tab from moving to another element.
-				event.preventDefault();
-				break;
-			    case event.DOM_VK_RETURN:
-			    case event.DOM_VK_ENTER:
-				ch = '\n';
-				break;
-			    case event.DOM_VK_UP:
-				ch = '\x1b[A';
-				break;
-			    case event.DOM_VK_DOWN:
-				ch = '\x1b[B';
-				break;
-			    case event.DOM_VK_RIGHT:
-				ch = '\x1b[C';
-				break;
-			    case event.DOM_VK_LEFT:
-				ch = '\x1b[D';
-				break;
-			    case event.DOM_VK_DELETE:
-				ch = '\x1b[3~';
-				break;
-			    case event.DOM_VK_HOME:
-				ch = '\x1b[H';
-				break;
-			    case event.DOM_VK_ESCAPE:
-				ch = '\x1bc';
-				break;
-			    default:
-				return true;
-			}
-		}
-	}
-	vt.key_buf_.push(ch);
-	setTimeout(VT100.go_getch_, 0);
-	return false;
-}
-
-// this is actually an event handler
-VT100.handle_onkeydown_ = function VT100_handle_onkeydown()
-{
-	var vt = VT100.the_vt_, ch;
-	switch (event.keyCode) {
-	    case 8:
-		ch = '\b';	break;
-	    default:
-		return true;
-	}
-	vt.key_buf_.push(ch);
-	setTimeout(VT100.go_getch_, 0);
-	return false;
-}
-
-VT100.go_getch_ = function VT100_go_getch()
-{
-	var vt = VT100.the_vt_;
-	if (vt === undefined)
-		return;
-	var isr = vt.getch_isr_;
-	vt.getch_isr_ = undefined;
-	if (isr === undefined)
-		return;
-	var ch = vt.key_buf_.shift();
-	if (ch === undefined) {
-		vt.getch_isr_ = isr;
-		return;
-	}
-	if (vt.echo_)
-		vt.addch(ch);
-	isr(ch, vt);
-}
-
-// object methods
-
-VT100.prototype.may_scroll_ = function()
-{
-	var ht = this.ht_, cr = this.row_;
-	while (cr >= ht) {
-		this.scroll();
-		--cr;
-	}
-	this.row_ = cr;
-}
-
-VT100.prototype.html_colours_ = function(attr)
-{
-	var fg, bg, co0, co1;
-	fg = attr.fg;
-	bg = attr.bg;
-	switch (attr.mode & (VT100.A_REVERSE | VT100.A_DIM | VT100.A_BOLD)) {
-	    case 0:
-	    case VT100.A_DIM | VT100.A_BOLD:
-		co0 = '00';  co1 = 'c0';
-		break;
-	    case VT100.A_BOLD:
-		co0 = '00';  co1 = 'ff';
-		break;
-	    case VT100.A_DIM:
-		if (fg == VT100.COLOR_BLACK)
-			co0 = '40';
-		else
-			co0 = '00';
-		co1 = '40';
-		break;
-	    case VT100.A_REVERSE:
-	    case VT100.A_REVERSE | VT100.A_DIM | VT100.A_BOLD:
-		co0 = 'c0';  co1 = '40';
-		break;
-	    case VT100.A_REVERSE | VT100.A_BOLD:
-		co0 = 'c0';  co1 = '00';
-		break;
-	    default:
-		if (fg == VT100.COLOR_BLACK)
-			co0 = '80';
-		else
-			co0 = 'c0';
-		co1 = 'c0';
-	}
-	return {
-		f: '#' + (fg & 4 ? co1 : co0) +
-			 (fg & 2 ? co1 : co0) +
-			 (fg & 1 ? co1 : co0),
-		b: '#' + (bg & 4 ? co1 : co0) +
-			 (bg & 2 ? co1 : co0) +
-			 (bg & 1 ? co1 : co0)
-	    };
-}
-
-VT100.prototype.addch = function(ch, attr)
-{
-	var cc = this.col_;
-	this.debug("addch:: ch: " + ch + ", attr: " + attr);
-	switch (ch) {
-	    case '\b':
-		if (cc != 0)
-			--cc;
-		break;
-	    case '\n':
-		++this.row_;
-		cc = 0;
-		this.clrtoeol();
-		this.may_scroll_();
-		break;
-	    case '\r':
-		this.may_scroll_();
-		cc = 0;
-		break;
-	    case '\t':
-		this.may_scroll_();
-		cc += VT100.TABSIZE - cc % VT100.TABSIZE;
-		if (cc >= this.wd_) {
-			++this.row_;
-			cc -= this.wd_;
-		}
-		break;
-	    default:
-		if (attr === undefined)
-			attr = this._cloneAttr(this.c_attr_);
-		if (cc >= this.wd_) {
-			++this.row_;
-			cc = 0;
-		}
-		this.may_scroll_();
-		this.text_[this.row_][cc] = ch;
-		this.attr_[this.row_][cc] = attr;
-		++cc;
-	}
-	this.col_ = cc;
-}
-
-VT100.prototype.addstr = function(stuff)
-{
-	for (var i = 0; i < stuff.length; ++i)
-		this.addch(stuff.charAt(i));
-}
-
-VT100.prototype._cloneAttr = function VT100_cloneAttr(a)
-{
-	return {
-		mode: a.mode,
-		fg: a.fg,
-		bg: a.bg
-	};
-}
-
-VT100.prototype.attroff = function(a)
-{
-	//dump("attroff: " + a + "\n");
-	a &= VT100.ATTR_FLAGS_;
-	this.c_attr_.mode &= ~a;
-}
-
-VT100.prototype.attron = function(a)
-{
-	//dump("attron: " + a + "\n");
-	a &= VT100.ATTR_FLAGS_;
-	this.c_attr_.mode |= a;
-}
-
-VT100.prototype.attrset = function(a)
-{
-	//dump("attrset: " + a + "\n");
-	this.c_attr_.mode = a;
-}
-
-VT100.prototype.fgset = function(fg)
-{
-	//dump("fgset: " + fg + "\n");
-	this.c_attr_.fg = fg;
-}
-
-VT100.prototype.bgset = function(bg)
-{
-	//dump("bgset: " + bg + "\n");
-	if (bg !== 0) {
-            this.warn("bgset: " + bg + "\n");
-        }
-	this.c_attr_.bg = bg;
-}
-
-VT100.prototype.bkgdset = function(a)
-{
-	this.bkgd_ = a;
-}
-
-VT100.prototype.clear = function()
-{
-	this.debug("clear");
-	this.row_ = this.col_ = 0;
-	this.scrolled_ = 0;
-	for (r = 0; r < this.ht_; ++r) {
-		for (c = 0; c < this.wd_; ++c) {
-			this.text_[r][c] = ' ';
-			this.attr_[r][c] = this._cloneAttr(this.bkgd_);
-		}
-	}
-}
-
-VT100.prototype.clrtobot = function()
-{
-	this.debug("clrtobot, row: " + this.row_);
-	var ht = this.ht_;
-	var wd = this.wd_;
-	this.clrtoeol();
-	for (var r = this.row_ + 1; r < ht; ++r) {
-		for (var c = 0; c < wd; ++c) {
-			this.text_[r][c] = ' ';
-			this.attr_[r][c] = this.bkgd_;
-		}
-	}
-}
-
-VT100.prototype.clrtoeol = function()
-{
-	this.debug("clrtoeol, col: " + this.col_);
-	var r = this.row_;
-	if (r >= this.ht_)
-		return;
-	for (var c = this.col_; c < this.wd_; ++c) {
-		this.text_[r][c] = ' ';
-		this.attr_[r][c] = this.bkgd_;
-	}
-}
-
-VT100.prototype.clearpos = function(row, col)
-{
-	this.debug("clearpos (" + row + ", " + col + ")");
-	if (row < 0 || row >= this.ht_)
-		return;
-	if (col < 0 || col >= this.wd_)
-		return;
-	this.text_[row][col] = ' ';
-	this.attr_[row][col] = this.bkgd_;
-}
-
-VT100.prototype.curs_set = function(vis, grab, eventist)
-{
-	this.debug("curs_set:: vis: " + vis + ", grab: " + grab);
-	if (vis !== undefined)
-		this.cursor_vis_ = (vis > 0);
-	if (eventist === undefined)
-		eventist = window;
-	if (grab === true || grab === false) {
-		if (grab === this.grab_events_)
-			return;
-		if (grab) {
-			this.grab_events_ = true;
-			VT100.the_vt_ = this;
-			eventist.addEventListener("keypress", VT100.handle_onkeypress_, false);
-			if (VT100.browser_ie_)
-				document.onkeydown = VT100.handle_onkeydown_;
-		} else {
-			eventist.removeEventListener("keypress", VT100.handle_onkeypress_, false);
-			if (VT100.browser_ie_)
-				document.onkeydown = VT100.handle_onkeydown_;
-			this.grab_events_ = false;
-			VT100.the_vt_ = undefined;
-		}
-	}
-}
-
-VT100.prototype.echo = function()
-{
-	this.debug("echo on");
-	this.echo_ = true;
-}
-
-VT100.prototype.erase = VT100.prototype.clear;
-
-VT100.prototype.getch = function(isr)
-{
-	this.debug("getch");
-	this.refresh();
-	this.getch_isr_ = isr;
-	setTimeout(VT100.go_getch_, 0);
-}
-
-VT100.prototype.getmaxyx = function()
-{
-	return { y: this.ht_ - 1, x: this.wd_ - 1 };
-}
-
-VT100.prototype.getyx = function()
-{
-	return { y: this.row_, x: this.col_ };
-}
-
-VT100.prototype.move = function(r, c)
-{
-	this.debug("move: (" + r + ", " + c + ")");
-	if (r < 0)
-		r = 0;
-	else if (r >= this.ht_)
-		r = this.ht_ - 1;
-	if (c < 0)
-		c = 0;
-	else if (c >= this.wd_)
-		c = this.wd_ - 1;
-	this.row_ = r;
-	this.col_ = c;
-}
-
-VT100.prototype.noecho = function()
-{
-	this.debug("echo off");
-	this.echo_ = false;
-}
-
-VT100.prototype.refresh = function()
-{
-	this.debug("refresh");
-	var r, c, stuff = "", start_tag = "", end_tag = "", at = -1, n_at, ch,
-	    pair, cr, cc, ht, wd, cv, added_end_tag;
-	ht = this.ht_;
-	wd = this.wd_;
-	cr = this.row_;
-	cc = this.col_;
-	cv = this.cursor_vis_;
-	var innerHTML = this.scr_.innerHTML;
-	if (cc >= wd)
-		cc = wd - 1;
-	for (r = 0; r < ht; ++r) {
-		if (r > 0) {
-			stuff += '\n';
-		}
-		for (c = 0; c < wd; ++c) {
-			added_end_tag = false;
-			n_at = this.attr_[r][c];
-			if (cv && r == cr && c == cc) {
-				// Draw the cursor here.
-				n_at = this._cloneAttr(n_at);
-				n_at.mode ^= VT100.A_REVERSE;
-			}
-			// If the attributes changed, make a new span.
-			if (n_at.mode != at.mode || n_at.fg != at.fg || n_at.bg != at.bg) {
-				if (c > 0) {
-					stuff += end_tag;
-				}
-				start_tag = "";
-				end_tag = "";
-				if (n_at.mode & VT100.A_BLINK) {
-					start_tag = "<blink>";
-					end_tag = "</blink>" + end_tag;
-				}
-				if (n_at.mode & VT100.A_STANDOUT)
-					n_at.mode |= VT100.A_BOLD;
-				pair = this.html_colours_(n_at);
-				start_tag += '<span style="color:' + pair.f +
-				             ';background-color:' + pair.b;
-				if (n_at.mode & VT100.A_UNDERLINE)
-					start_tag += ';text-decoration:underline';
-				start_tag += ';">';
-				stuff += start_tag;
-				end_tag = "</span>" + end_tag;
-				at = n_at;
-				added_end_tag = true;
-			} else if (c == 0) {
-				stuff += start_tag;
-			}
-			ch = this.text_[r][c];
-			switch (ch) {
-			    case '&':
-				stuff += '&amp;';	break;
-			    case '<':
-				stuff += '&lt;';	break;
-			    case '>':
-				stuff += '&gt;';	break;
-			    case ' ':
-				//stuff += '&nbsp;';	break;
-				stuff += ' ';	break;
-			    default:
-				stuff += ch;
-			}
-		}
-		if (!added_end_tag)
-			stuff += end_tag;
-	}
-	this.scr_.innerHTML = "<b>" + stuff + "</b>\n";
-}
-
-VT100.prototype.scroll = function()
-{
-	this.scrolled_ += 1;
-	this.debug("scrolled: " + this.scrolled_);
-	var n_text = this.text_[0], n_attr = this.attr_[0],
-	    ht = this.ht_, wd = this.wd_;
-	for (var r = 1; r < ht; ++r) {
-		this.text_[r - 1] = this.text_[r];
-		this.attr_[r - 1] = this.attr_[r];
-	}
-	this.text_[ht - 1] = n_text;
-	this.attr_[ht - 1] = n_attr;
-	for (var c = 0; c < wd; ++c) {
-		n_text[c] = ' ';
-		n_attr[c] = this.bkgd_;
-	}
-}
-
-VT100.prototype.standend = function()
-{
-	//this.debug("standend");
-	this.attrset(0);
-}
-
-VT100.prototype.standout = function()
-{
-	//this.debug("standout");
-	this.attron(VT100.A_STANDOUT);
-}
-
-VT100.prototype.write = function(stuff)
-{
-	var ch, x, r, c, i, j, yx, myx;
-	for (i = 0; i < stuff.length; ++i) {
-		ch = stuff.charAt(i);
-		if (ch == '\x0D') {
-			this.debug("write:: ch: " + ch.charCodeAt(0) + ", '\\x0D'");
-		} else {
-			this.debug("write:: ch: " + ch.charCodeAt(0) + ", '" + (ch == '\x1b' ? "ESC" : ch) + "'");
-		}
-		//dump("ch: " + ch.charCodeAt(0) + ", '" + (ch == '\x1b' ? "ESC" : ch) + "'\n");
-		switch (ch) {
-		    case '\x00':
-		    case '\x7f':
-		    case '\x07':  /* bell, ignore it */
-			this.debug("write:: ignoring bell character: " + ch);
-			continue;
-		    case '\a':
-		    case '\b':
-		    case '\t':
-		    case '\r':
-			this.addch(ch);
-			continue;
-		    case '\n':
-		    case '\v':
-		    case '\f': // what a mess
-			yx = this.getyx();
-			myx = this.getmaxyx();
-			if (yx.y >= myx.y) {
-				this.scroll();
-				this.move(myx.y, 0);
-			} else
-				this.move(yx.y + 1, 0);
-			continue;
-		    case '\x18':
-		    case '\x1a':
-			this.esc_state_ = 0;
-			this.debug("write:: set escape state: 0");
-			continue;
-		    case '\x1b':
-			this.esc_state_ = 1;
-			this.debug("write:: set escape state: 1");
-			continue;
-		    case '\x9b':
-			this.esc_state_ = 2;
-			this.debug("write:: set escape state: 2");
-			continue;
-		}
-		// not a recognized control character
-		switch (this.esc_state_) {
-		    case 0: // not in escape sequence
-			this.addch(ch);
-			break;
-		    case 1: // just saw ESC
-			switch (ch) {
-			    case '[':
-				this.esc_state_ = 2;
-				this.debug("write:: set escape state: 2");
-				break;
-			    case '=':
-				/* Set keypade mode (ignored) */
-				this.debug("write:: set keypade mode: ignored");
-				this.esc_state_ = 0;
-				break;
-			    case '>':
-				/* Reset keypade mode (ignored) */
-				this.debug("write:: reset keypade mode: ignored");
-				this.esc_state_ = 0;
-				break;
-			    case 'H':
-				/* Set tab at cursor column (ignored) */
-				this.debug("write:: set tab cursor column: ignored");
-				this.esc_state_ = 0;
-				break;
-			}
-			break;
-		    case 2: // just saw CSI
-			switch (ch) {
-			    case 'K':
-				/* Erase in Line */
-				this.esc_state_ = 0;
-				this.clrtoeol();
-				continue;
-			    case 'H':
-				/* Move to (0,0). */
-				this.esc_state_ = 0;
-				this.move(0, 0);
-				continue;
-			    case 'J':
-				/* Clear to the bottom. */
-				this.esc_state_ = 0;
-				this.clrtobot();
-				continue;
-			    case '?':
-				/* Special VT100 mode handling. */
-				this.esc_state_ = 5;
-				this.debug("write:: special vt100 mode");
-				continue;
-			}
-			// Drop through to next case.
-			this.csi_parms_ = [0];
-			this.debug("write:: set escape state: 3");
-			this.esc_state_ = 3;
-		    case 3: // saw CSI and parameters
-			switch (ch) {
-			    case '0':
-			    case '1':
-			    case '2':
-			    case '3':
-			    case '4':
-			    case '5':
-			    case '6':
-			    case '7':
-			    case '8':
-			    case '9':
-				x = this.csi_parms_.pop();
-				this.csi_parms_.push(x * 10 + ch * 1);
-				this.debug("csi_parms_: " + this.csi_parms_);
-				continue;
-			    case ';':
-				if (this.csi_parms_.length < 17)
-					this.csi_parms_.push(0);
-				continue;
-			}
-			this.esc_state_ = 0;
-			switch (ch) {
-			    case 'A':
-				// Cursor Up 		<ESC>[{COUNT}A
-				this.move(this.row_ - Math.max(1, this.csi_parms_[0]),
-					  this.col_);
-				break;
-			    case 'B':
-				// Cursor Down 		<ESC>[{COUNT}B
-				this.move(this.row_ + Math.max(1, this.csi_parms_[0]),
-					  this.col_);
-				break;
-			    case 'C':
-				// Cursor Forward 	<ESC>[{COUNT}C
-				this.move(this.row_,
-					  this.col_ + Math.max(1, this.csi_parms_[0]));
-				break;
-			    case 'c':
-				this.warn("write:: got TERM query");
-                                break;
-			    case 'D':
-				// Cursor Backward 	<ESC>[{COUNT}D
-				this.move(this.row_,
-					  this.col_ - Math.max(1, this.csi_parms_[0]));
-				break;
-			    case 'f':
-			    case 'H':
-				// Cursor Home 		<ESC>[{ROW};{COLUMN}H
-				this.csi_parms_.push(0);
-				this.move(this.csi_parms_[0] - 1,
-					  this.csi_parms_[1] - 1);
-				break;
-			    case 'J':
-				switch (this.csi_parms_[0]) {
-				    case 0:
-					this.clrtobot();
-					break;
-				    case 2:
-					this.clear();
-					this.move(0, 0);
-				}
-				break;
-			    case 'm':
-				for (j=0; j<this.csi_parms_.length; ++j) {
-					x = this.csi_parms_[j];
-					switch (x) {
-					    case 0:
-						this.standend();
-						this.fgset(this.bkgd_.fg);
-						this.bgset(this.bkgd_.bg);
-						break;
-					    case 1:
-						this.attron(VT100.A_BOLD);
-						break;
-					    case 30:
-						this.fgset(VT100.COLOR_BLACK);
-						break;
-					    case 31:
-						this.fgset(VT100.COLOR_RED);
-						break;
-					    case 32:
-						this.fgset(VT100.COLOR_GREEN);
-						break;
-					    case 33:
-						this.fgset(VT100.COLOR_YELLOW);
-						break;
-					    case 34:
-						this.fgset(VT100.COLOR_BLUE);
-						break;
-					    case 35:
-						this.fgset(VT100.COLOR_MAGENTA);
-						break;
-					    case 36:
-						this.fgset(VT100.COLOR_CYAN);
-						break;
-					    case 37:
-						this.fgset(VT100.COLOR_WHITE);
-						break;
-					    case 40:
-						this.bgset(VT100.COLOR_BLACK);
-						break;
-					    case 41:
-						this.bgset(VT100.COLOR_RED);
-						break;
-					    case 42:
-						this.bgset(VT100.COLOR_GREEN);
-						break;
-					    case 44:
-						this.bgset(VT100.COLOR_YELLOW);
-						break;
-					    case 44:
-						this.bgset(VT100.COLOR_BLUE);
-						break;
-					    case 45:
-						this.bgset(VT100.COLOR_MAGENTA);
-						break;
-					    case 46:
-						this.bgset(VT100.COLOR_CYAN);
-						break;
-					    case 47:
-						this.bgset(VT100.COLOR_WHITE);
-						break;
-					}
-				}
-				break;
-			    case 'r':
-				// 1,24r - set scrolling region (ignored)
-				break;
-			    case '[':
-				this.debug("write:: set escape state: 4");
-				this.esc_state_ = 4;
-				break;
-			    case 'g':
-				// 0g: clear tab at cursor (ignored)
-				// 3g: clear all tabs (ignored)
-				break;
-			    default:
-				this.warn("write:: unknown command: " + ch);
-				this.csi_parms_ = [];
-				break;
-			}
-			break;
-		    case 4: // saw CSI [
-			this.esc_state_ = 0; // gobble char.
-			break;
-		    case 5: // Special mode handling, saw <ESC>[?
-			// Expect a number - the reset type
-			this.csi_parms_ = [ch];
-			this.esc_state_ = 6;
-			break;
-		    case 6: // Reset mode handling, saw <ESC>[?1
-			// Expect a letter - the mode target, example:
-			// <ESC>[?1l : cursor key mode = cursor
-			// <ESC>[?1h : save current screen, create new empty
-			//             screen and position at 0,0
-			// <ESC>[?5l : White on blk
-			// XXX: Ignored for now.
-			//dump("Saw reset mode: <ESC>[?" + this.csi_parms_[0] + ch + "\n");
-			this.esc_state_ = 0;
-			this.debug("write:: set escape state: 0");
-			break;
-		}
-	}
-	this.refresh();
-}
-
-VT100.prototype.debug = function(message) {
-	if (this.debug_) {
-		dump(message + "\n");
-	}
-}
-
-VT100.prototype.warn = function(message) {
-	dump(message + "\n");
-}

include/base64.js

@@ -1,114 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// From: http://hg.mozilla.org/mozilla-central/raw-file/ec10630b1a54/js/src/devtools/jint/sunspider/string-base64.js
-
-/*jslint white: false, bitwise: false, plusplus: false */
-/*global console */
-
-var Base64 = {
-
-/* Convert data (an array of integers) to a Base64 string. */
-toBase64Table : 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split(''),
-base64Pad     : '=',
-
-encode: function (data) {
-    "use strict";
-    var result = '';
-    var toBase64Table = Base64.toBase64Table;
-    var base64Pad = Base64.base64Pad;
-    var length = data.length;
-    var i;
-    // Convert every three bytes to 4 ascii characters.
-  /* BEGIN LOOP */
-    for (i = 0; i < (length - 2); i += 3) {
-        result += toBase64Table[data[i] >> 2];
-        result += toBase64Table[((data[i] & 0x03) << 4) + (data[i+1] >> 4)];
-        result += toBase64Table[((data[i+1] & 0x0f) << 2) + (data[i+2] >> 6)];
-        result += toBase64Table[data[i+2] & 0x3f];
-    }
-  /* END LOOP */
-
-    // Convert the remaining 1 or 2 bytes, pad out to 4 characters.
-    if (length%3) {
-        i = length - (length%3);
-        result += toBase64Table[data[i] >> 2];
-        if ((length%3) === 2) {
-            result += toBase64Table[((data[i] & 0x03) << 4) + (data[i+1] >> 4)];
-            result += toBase64Table[(data[i+1] & 0x0f) << 2];
-            result += base64Pad;
-        } else {
-            result += toBase64Table[(data[i] & 0x03) << 4];
-            result += base64Pad + base64Pad;
-        }
-    }
-
-    return result;
-},
-
-/* Convert Base64 data to a string */
-toBinaryTable : [
-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
-    52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1, 0,-1,-1,
-    -1, 0, 1, 2,  3, 4, 5, 6,  7, 8, 9,10, 11,12,13,14,
-    15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1,
-    -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
-    41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1
-],
-
-decode: function (data, offset) {
-    "use strict";
-    offset = typeof(offset) !== 'undefined' ? offset : 0;
-    var toBinaryTable = Base64.toBinaryTable;
-    var base64Pad = Base64.base64Pad;
-    var result, result_length, idx, i, c, padding;
-    var leftbits = 0; // number of bits decoded, but yet to be appended
-    var leftdata = 0; // bits decoded, but yet to be appended
-    var data_length = data.indexOf('=') - offset;
-
-    if (data_length < 0) { data_length = data.length - offset; }
-
-    /* Every four characters is 3 resulting numbers */
-    result_length = (data_length >> 2) * 3 + Math.floor((data_length%4)/1.5);
-    result = new Array(result_length);
-
-    // Convert one by one.
-  /* BEGIN LOOP */
-    for (idx = 0, i = offset; i < data.length; i++) {
-        c = toBinaryTable[data.charCodeAt(i) & 0x7f];
-        padding = (data.charAt(i) === base64Pad);
-        // Skip illegal characters and whitespace
-        if (c === -1) {
-            console.error("Illegal character code " + data.charCodeAt(i) + " at position " + i);
-            continue;
-        }
-        
-        // Collect data into leftdata, update bitcount
-        leftdata = (leftdata << 6) | c;
-        leftbits += 6;
-
-        // If we have 8 or more bits, append 8 bits to the result
-        if (leftbits >= 8) {
-            leftbits -= 8;
-            // Append if not padding.
-            if (!padding) {
-                result[idx++] = (leftdata >> leftbits) & 0xff;
-            }
-            leftdata &= (1 << leftbits) - 1;
-        }
-    }
-  /* END LOOP */
-
-    // If there are any bits left, the base64 string was corrupted
-    if (leftbits) {
-        throw {name: 'Base64-Error', 
-               message: 'Corrupted base64 string'};
-    }
-
-    return result;
-}
-
-}; /* End of Base64 namespace */

include/keysym.js

@@ -1,99 +0,0 @@
-/*
- * from noVNC: HTML5 VNC client
- * Copyright (C) 2010 Joel Martin
- * Licensed under LGPL-3 (see LICENSE.txt)
- */
-
-/* Translate DOM key down/up event to keysym value */
-function getKeysym(e) {
-    var evt, keysym;
-    evt = (e ? e : window.event);
-
-    /* Remap modifier and special keys */
-    switch ( evt.keyCode ) {
-        case 8         : keysym = 0xFF08; break; // BACKSPACE
-        case 9         : keysym = 0xFF09; break; // TAB
-        case 13        : keysym = 0xFF0D; break; // ENTER
-        case 27        : keysym = 0xFF1B; break; // ESCAPE
-        case 45        : keysym = 0xFF63; break; // INSERT
-        case 46        : keysym = 0xFFFF; break; // DELETE
-        case 36        : keysym = 0xFF50; break; // HOME
-        case 35        : keysym = 0xFF57; break; // END
-        case 33        : keysym = 0xFF55; break; // PAGE_UP
-        case 34        : keysym = 0xFF56; break; // PAGE_DOWN
-        case 37        : keysym = 0xFF51; break; // LEFT
-        case 38        : keysym = 0xFF52; break; // UP
-        case 39        : keysym = 0xFF53; break; // RIGHT
-        case 40        : keysym = 0xFF54; break; // DOWN
-        case 112       : keysym = 0xFFBE; break; // F1
-        case 113       : keysym = 0xFFBF; break; // F2
-        case 114       : keysym = 0xFFC0; break; // F3
-        case 115       : keysym = 0xFFC1; break; // F4
-        case 116       : keysym = 0xFFC2; break; // F5
-        case 117       : keysym = 0xFFC3; break; // F6
-        case 118       : keysym = 0xFFC4; break; // F7
-        case 119       : keysym = 0xFFC5; break; // F8
-        case 120       : keysym = 0xFFC6; break; // F9
-        case 121       : keysym = 0xFFC7; break; // F10
-        case 122       : keysym = 0xFFC8; break; // F11
-        case 123       : keysym = 0xFFC9; break; // F12
-        case 16        : keysym = 0xFFE1; break; // SHIFT
-        case 17        : keysym = 0xFFE3; break; // CONTROL
-        //case 18        : keysym = 0xFFE7; break; // Left Meta (Mac Option)
-        case 18        : keysym = 0xFFE9; break; // Left ALT (Mac Command)
-        default        : keysym = evt.keyCode; break;
-    }
-
-    /* Remap symbols */
-    switch (keysym) {
-        case 186       : keysym = 59; break; // ;  (IE)
-        case 187       : keysym = 61; break; // =  (IE)
-        case 188       : keysym = 44; break; // ,  (Mozilla, IE)
-        case 109       :                     // -  (Mozilla)
-            if (Util.Engine.gecko) {
-                         keysym = 45; }
-                                      break;
-        case 189       : keysym = 45; break; // -  (IE)
-        case 190       : keysym = 46; break; // .  (Mozilla, IE)
-        case 191       : keysym = 47; break; // /  (Mozilla, IE)
-        case 192       : keysym = 96; break; // `  (Mozilla, IE)
-        case 219       : keysym = 91; break; // [  (Mozilla, IE)
-        case 220       : keysym = 92; break; // \  (Mozilla, IE)
-        case 221       : keysym = 93; break; // ]  (Mozilla, IE)
-        case 222       : keysym = 39; break; // '  (Mozilla, IE)
-    }
-    
-    /* Remap shifted and unshifted keys */
-    if (!!evt.shiftKey) {
-        switch (keysym) {
-            case 48        : keysym = 41 ; break; // )  (shifted 0)
-            case 49        : keysym = 33 ; break; // !  (shifted 1)
-            case 50        : keysym = 64 ; break; // @  (shifted 2)
-            case 51        : keysym = 35 ; break; // #  (shifted 3)
-            case 52        : keysym = 36 ; break; // $  (shifted 4)
-            case 53        : keysym = 37 ; break; // %  (shifted 5)
-            case 54        : keysym = 94 ; break; // ^  (shifted 6)
-            case 55        : keysym = 38 ; break; // &  (shifted 7)
-            case 56        : keysym = 42 ; break; // *  (shifted 8)
-            case 57        : keysym = 40 ; break; // (  (shifted 9)
-
-            case 59        : keysym = 58 ; break; // :  (shifted `)
-            case 61        : keysym = 43 ; break; // +  (shifted ;)
-            case 44        : keysym = 60 ; break; // <  (shifted ,)
-            case 45        : keysym = 95 ; break; // _  (shifted -)
-            case 46        : keysym = 62 ; break; // >  (shifted .)
-            case 47        : keysym = 63 ; break; // ?  (shifted /)
-            case 96        : keysym = 126; break; // ~  (shifted `)
-            case 91        : keysym = 123; break; // {  (shifted [)
-            case 92        : keysym = 124; break; // |  (shifted \)
-            case 93        : keysym = 125; break; // }  (shifted ])
-            case 39        : keysym = 34 ; break; // "  (shifted ')
-        }
-    } else if ((keysym >= 65) && (keysym <=90)) {
-        /* Remap unshifted A-Z */
-        keysym += 32;
-    } 
-
-    return keysym;
-}
-

include/util.js

@@ -1,379 +0,0 @@
-/*
- * from noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Licensed under MPL 2.0 (see LICENSE.txt)
- *
- * See README.md for usage and integration instructions.
- */
-
-"use strict";
-/*jslint bitwise: false, white: false */
-/*global window, console, document, navigator, ActiveXObject */
-
-// Globals defined here
-var Util = {};
-
-
-/*
- * Make arrays quack
- */
-
-Array.prototype.push8 = function (num) {
-    this.push(num & 0xFF);
-};
-
-Array.prototype.push16 = function (num) {
-    this.push((num >> 8) & 0xFF,
-              (num     ) & 0xFF  );
-};
-Array.prototype.push32 = function (num) {
-    this.push((num >> 24) & 0xFF,
-              (num >> 16) & 0xFF,
-              (num >>  8) & 0xFF,
-              (num      ) & 0xFF  );
-};
-
-// IE does not support map (even in IE9)
-//This prototype is provided by the Mozilla foundation and
-//is distributed under the MIT license.
-//http://www.ibiblio.org/pub/Linux/LICENSES/mit.license
-if (!Array.prototype.map)
-{
-  Array.prototype.map = function(fun /*, thisp*/)
-  {
-    var len = this.length;
-    if (typeof fun != "function")
-      throw new TypeError();
-
-    var res = new Array(len);
-    var thisp = arguments[1];
-    for (var i = 0; i < len; i++)
-    {
-      if (i in this)
-        res[i] = fun.call(thisp, this[i], i, this);
-    }
-
-    return res;
-  };
-}
-
-// 
-// requestAnimationFrame shim with setTimeout fallback
-//
-
-window.requestAnimFrame = (function(){
-    return  window.requestAnimationFrame       || 
-            window.webkitRequestAnimationFrame || 
-            window.mozRequestAnimationFrame    || 
-            window.oRequestAnimationFrame      || 
-            window.msRequestAnimationFrame     || 
-            function(callback){
-                window.setTimeout(callback, 1000 / 60);
-            };
-})();
-
-/* 
- * ------------------------------------------------------
- * Namespaced in Util
- * ------------------------------------------------------
- */
-
-/*
- * Logging/debug routines
- */
-
-Util._log_level = 'warn';
-Util.init_logging = function (level) {
-    if (typeof level === 'undefined') {
-        level = Util._log_level;
-    } else {
-        Util._log_level = level;
-    }
-    if (typeof window.console === "undefined") {
-        if (typeof window.opera !== "undefined") {
-            window.console = {
-                'log'  : window.opera.postError,
-                'warn' : window.opera.postError,
-                'error': window.opera.postError };
-        } else {
-            window.console = {
-                'log'  : function(m) {},
-                'warn' : function(m) {},
-                'error': function(m) {}};
-        }
-    }
-
-    Util.Debug = Util.Info = Util.Warn = Util.Error = function (msg) {};
-    switch (level) {
-        case 'debug': Util.Debug = function (msg) { console.log(msg); };
-        case 'info':  Util.Info  = function (msg) { console.log(msg); };
-        case 'warn':  Util.Warn  = function (msg) { console.warn(msg); };
-        case 'error': Util.Error = function (msg) { console.error(msg); };
-        case 'none':
-            break;
-        default:
-            throw("invalid logging type '" + level + "'");
-    }
-};
-Util.get_logging = function () {
-    return Util._log_level;
-};
-// Initialize logging level
-Util.init_logging();
-
-
-// Set configuration default for Crockford style function namespaces
-Util.conf_default = function(cfg, api, defaults, v, mode, type, defval, desc) {
-    var getter, setter;
-
-    // Default getter function
-    getter = function (idx) {
-        if ((type in {'arr':1, 'array':1}) &&
-            (typeof idx !== 'undefined')) {
-            return cfg[v][idx];
-        } else {
-            return cfg[v];
-        }
-    };
-
-    // Default setter function
-    setter = function (val, idx) {
-        if (type in {'boolean':1, 'bool':1}) {
-            if ((!val) || (val in {'0':1, 'no':1, 'false':1})) {
-                val = false;
-            } else {
-                val = true;
-            }
-        } else if (type in {'integer':1, 'int':1}) {
-            val = parseInt(val, 10);
-        } else if (type === 'str') {
-            val = String(val);
-        } else if (type === 'func') {
-            if (!val) {
-                val = function () {};
-            }
-        }
-        if (typeof idx !== 'undefined') {
-            cfg[v][idx] = val;
-        } else {
-            cfg[v] = val;
-        }
-    };
-
-    // Set the description
-    api[v + '_description'] = desc;
-
-    // Set the getter function
-    if (typeof api['get_' + v] === 'undefined') {
-        api['get_' + v] = getter;
-    }
-
-    // Set the setter function with extra sanity checks
-    if (typeof api['set_' + v] === 'undefined') {
-        api['set_' + v] = function (val, idx) {
-            if (mode in {'RO':1, 'ro':1}) {
-                throw(v + " is read-only");
-            } else if ((mode in {'WO':1, 'wo':1}) &&
-                       (typeof cfg[v] !== 'undefined')) {
-                throw(v + " can only be set once");
-            }
-            setter(val, idx);
-        };
-    }
-
-    // Set the default value
-    if (typeof defaults[v] !== 'undefined') {
-        defval = defaults[v];
-    } else if ((type in {'arr':1, 'array':1}) &&
-            (! (defval instanceof Array))) {
-        defval = [];
-    }
-    // Coerce existing setting to the right type
-    //Util.Debug("v: " + v + ", defval: " + defval + ", defaults[v]: " + defaults[v]);
-    setter(defval);
-};
-
-// Set group of configuration defaults
-Util.conf_defaults = function(cfg, api, defaults, arr) {
-    var i;
-    for (i = 0; i < arr.length; i++) {
-        Util.conf_default(cfg, api, defaults, arr[i][0], arr[i][1],
-                arr[i][2], arr[i][3], arr[i][4]);
-    }
-};
-
-
-/*
- * Cross-browser routines
- */
-
-
-// Dynamically load scripts without using document.write()
-// Reference: http://unixpapa.com/js/dyna.html
-//
-// Handles the case where load_scripts is invoked from a script that
-// itself is loaded via load_scripts. Once all scripts are loaded the
-// window.onscriptsloaded handler is called (if set).
-Util.get_include_uri = function() {
-    return (typeof INCLUDE_URI !== "undefined") ? INCLUDE_URI : "include/";
-}
-Util._loading_scripts = [];
-Util._pending_scripts = [];
-Util.load_scripts = function(files) {
-    var head = document.getElementsByTagName('head')[0], script,
-        ls = Util._loading_scripts, ps = Util._pending_scripts;
-    for (var f=0; f<files.length; f++) {
-        script = document.createElement('script');
-        script.type = 'text/javascript';
-        script.src = Util.get_include_uri() + files[f];
-        //console.log("loading script: " + script.src);
-        script.onload = script.onreadystatechange = function (e) {
-            while (ls.length > 0 && (ls[0].readyState === 'loaded' ||
-                                     ls[0].readyState === 'complete')) {
-                // For IE, append the script to trigger execution
-                var s = ls.shift();
-                //console.log("loaded script: " + s.src);
-                head.appendChild(s);
-            }
-            if (!this.readyState ||
-                (Util.Engine.presto && this.readyState === 'loaded') ||
-                this.readyState === 'complete') {
-                if (ps.indexOf(this) >= 0) {
-                    this.onload = this.onreadystatechange = null;
-                    //console.log("completed script: " + this.src);
-                    ps.splice(ps.indexOf(this), 1);
-
-                    // Call window.onscriptsload after last script loads
-                    if (ps.length === 0 && window.onscriptsload) {
-                        window.onscriptsload();
-                    }
-                }
-            }
-        };
-        // In-order script execution tricks
-        if (Util.Engine.trident) {
-            // For IE wait until readyState is 'loaded' before
-            // appending it which will trigger execution
-            // http://wiki.whatwg.org/wiki/Dynamic_Script_Execution_Order
-            ls.push(script);
-        } else {
-            // For webkit and firefox set async=false and append now
-            // https://developer.mozilla.org/en-US/docs/HTML/Element/script
-            script.async = false;
-            head.appendChild(script);
-        }
-        ps.push(script);
-    }
-}
-
-// Get DOM element position on page
-Util.getPosition = function (obj) {
-    var x = 0, y = 0;
-    if (obj.offsetParent) {
-        do {
-            x += obj.offsetLeft;
-            y += obj.offsetTop;
-            obj = obj.offsetParent;
-        } while (obj);
-    }
-    return {'x': x, 'y': y};
-};
-
-// Get mouse event position in DOM element
-Util.getEventPosition = function (e, obj, scale) {
-    var evt, docX, docY, pos;
-    //if (!e) evt = window.event;
-    evt = (e ? e : window.event);
-    evt = (evt.changedTouches ? evt.changedTouches[0] : evt.touches ? evt.touches[0] : evt);
-    if (evt.pageX || evt.pageY) {
-        docX = evt.pageX;
-        docY = evt.pageY;
-    } else if (evt.clientX || evt.clientY) {
-        docX = evt.clientX + document.body.scrollLeft +
-            document.documentElement.scrollLeft;
-        docY = evt.clientY + document.body.scrollTop +
-            document.documentElement.scrollTop;
-    }
-    pos = Util.getPosition(obj);
-    if (typeof scale === "undefined") {
-        scale = 1;
-    }
-    return {'x': (docX - pos.x) / scale, 'y': (docY - pos.y) / scale};
-};
-
-
-// Event registration. Based on: http://www.scottandrew.com/weblog/articles/cbs-events
-Util.addEvent = function (obj, evType, fn){
-    if (obj.attachEvent){
-        var r = obj.attachEvent("on"+evType, fn);
-        return r;
-    } else if (obj.addEventListener){
-        obj.addEventListener(evType, fn, false); 
-        return true;
-    } else {
-        throw("Handler could not be attached");
-    }
-};
-
-Util.removeEvent = function(obj, evType, fn){
-    if (obj.detachEvent){
-        var r = obj.detachEvent("on"+evType, fn);
-        return r;
-    } else if (obj.removeEventListener){
-        obj.removeEventListener(evType, fn, false);
-        return true;
-    } else {
-        throw("Handler could not be removed");
-    }
-};
-
-Util.stopEvent = function(e) {
-    if (e.stopPropagation) { e.stopPropagation(); }
-    else                   { e.cancelBubble = true; }
-
-    if (e.preventDefault)  { e.preventDefault(); }
-    else                   { e.returnValue = false; }
-};
-
-
-// Set browser engine versions. Based on mootools.
-Util.Features = {xpath: !!(document.evaluate), air: !!(window.runtime), query: !!(document.querySelector)};
-
-Util.Engine = {
-    // Version detection break in Opera 11.60 (errors on arguments.callee.caller reference)
-    //'presto': (function() {
-    //         return (!window.opera) ? false : ((arguments.callee.caller) ? 960 : ((document.getElementsByClassName) ? 950 : 925)); }()),
-    'presto': (function() { return (!window.opera) ? false : true; }()),
-
-    'trident': (function() {
-            return (!window.ActiveXObject) ? false : ((window.XMLHttpRequest) ? ((document.querySelectorAll) ? 6 : 5) : 4); }()),
-    'webkit': (function() {
-            try { return (navigator.taintEnabled) ? false : ((Util.Features.xpath) ? ((Util.Features.query) ? 525 : 420) : 419); } catch (e) { return false; } }()),
-    //'webkit': (function() {
-    //        return ((typeof navigator.taintEnabled !== "unknown") && navigator.taintEnabled) ? false : ((Util.Features.xpath) ? ((Util.Features.query) ? 525 : 420) : 419); }()),
-    'gecko': (function() {
-            return (!document.getBoxObjectFor && window.mozInnerScreenX == null) ? false : ((document.getElementsByClassName) ? 19 : 18); }())
-};
-if (Util.Engine.webkit) {
-    // Extract actual webkit version if available
-    Util.Engine.webkit = (function(v) {
-            var re = new RegExp('WebKit/([0-9\.]*) ');
-            v = (navigator.userAgent.match(re) || ['', v])[1];
-            return parseFloat(v, 10);
-        })(Util.Engine.webkit);
-}
-
-Util.Flash = (function(){
-    var v, version;
-    try {
-        v = navigator.plugins['Shockwave Flash'].description;
-    } catch(err1) {
-        try {
-            v = new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version');
-        } catch(err2) {
-            v = '0 r0';
-        }
-    }
-    version = v.match(/\d+/g);
-    return {version: parseInt(version[0] || 0 + '.' + version[1], 10) || 0, build: parseInt(version[2], 10) || 0};
-}()); 

include/web-socket-js/README.txt

@@ -1,109 +0,0 @@
-* How to try
-
-Assuming you have Web server (e.g. Apache) running at http://example.com/ .
-
-- Download web_socket.rb from:
-  http://github.com/gimite/web-socket-ruby/tree/master
-- Run sample Web Socket server (echo server) in example.com with: (#1)
-  $ ruby web-socket-ruby/samples/echo_server.rb example.com 10081
-- If your server already provides socket policy file at port 843, modify the file to allow access to port 10081. Otherwise you can skip this step. See below for details.
-- Publish the web-socket-js directory with your Web server (e.g. put it in ~/public_html).
-- Change ws://localhost:10081 to ws://example.com:10081 in sample.html.
-- Open sample.html in your browser.
-- After "onopen" is shown, input something, click [Send] and confirm echo back.
-
-#1: First argument of echo_server.rb means that it accepts Web Socket connection from HTML pages in example.com.
-
-
-* Troubleshooting
-
-If it doesn't work, try these:
-
-1. Try Chrome and Firefox 3.x.
-- It doesn't work on Chrome:
--- It's likely an issue of your code or the server. Debug your code as usual e.g. using console.log.
-- It works on Chrome but it doesn't work on Firefox:
--- It's likely an issue of web-socket-js specific configuration (e.g. 3 and 4 below).
-- It works on both Chrome and Firefox, but it doesn't work on your browser:
--- Check "Supported environment" section below. Your browser may not be supported by web-socket-js.
-
-2. Add this line before your code:
-  WEB_SOCKET_DEBUG = true;
-and use Developer Tools (Chrome/Safari) or Firebug (Firefox) to see if console.log outputs any errors.
-
-3. Make sure you do NOT open your HTML page as local file e.g. file:///.../sample.html. web-socket-js doesn't work on local file. Open it via Web server e.g. http:///.../sample.html.
-
-4. If you are NOT using web-socket-ruby as your WebSocket server, you need to place Flash socket policy file on your server. See "Flash socket policy file" section below for details.
-
-5. Check if sample.html bundled with web-socket-js works.
-
-6. Make sure the port used for WebSocket (10081 in example above) is not blocked by your server/client's firewall.
-
-7. Install debugger version of Flash Player available here to see Flash errors:
-http://www.adobe.com/support/flashplayer/downloads.html
-
-
-* Supported environments
-
-It should work on:
-- Google Chrome 4 or later (just uses native implementation)
-- Firefox 3.x, Internet Explorer 8 + Flash Player 9 or later
-
-It may or may not work on other browsers such as Safari, Opera or IE 6. Patch for these browsers are appreciated, but I will not work on fixing issues specific to these browsers by myself.
-
-
-* Flash socket policy file
-
-This implementation uses Flash's socket, which means that your server must provide Flash socket policy file to declare the server accepts connections from Flash.
-
-If you use web-socket-ruby available at
-http://github.com/gimite/web-socket-ruby/tree/master
-, you don't need anything special, because web-socket-ruby handles Flash socket policy file request. But if you already provide socket policy file at port 843, you need to modify the file to allow access to Web Socket port, because it precedes what web-socket-ruby provides.
-
-If you use other Web Socket server implementation, you need to provide socket policy file yourself. See
-http://www.lightsphere.com/dev/articles/flash_socket_policy.html
-for details and sample script to run socket policy file server. node.js implementation is available here:
-http://github.com/LearnBoost/Socket.IO-node/blob/master/lib/socket.io/transports/flashsocket.js
-
-Actually, it's still better to provide socket policy file at port 843 even if you use web-socket-ruby. Flash always try to connect to port 843 first, so providing the file at port 843 makes startup faster.
-
-
-* Cookie considerations
-
-Cookie is sent if Web Socket host is the same as the origin of JavaScript. Otherwise it is not sent, because I don't know way to send right Cookie (which is Cookie of the host of Web Socket, I heard).
-
-Note that it's technically possible that client sends arbitrary string as Cookie and any other headers (by modifying this library for example) once you place Flash socket policy file in your server. So don't trust Cookie and other headers if you allow connection from untrusted origin.
-
-
-* Proxy considerations
-
-The WebSocket spec (http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol) specifies instructions for User Agents to support proxied connections by implementing the HTTP CONNECT method.
-
-The AS3 Socket class doesn't implement this mechanism, which renders it useless for the scenarios where the user trying to open a socket is behind a proxy. 
-
-The class RFC2817Socket (by Christian Cantrell) effectively lets us implement this, as long as the proxy settings are known and provided by the interface that instantiates the WebSocket. As such, if you want to support proxied conncetions, you'll have to supply this information to the WebSocket constructor when Flash is being used. One way to go about it would be to ask the user for proxy settings information if the initial connection fails.
-
-
-* How to host HTML file and SWF file in different domains
-
-By default, HTML file and SWF file must be in the same domain. You can follow steps below to allow hosting them in different domain.
-
-WARNING: If you use the method below, HTML files in ANY domains can send arbitrary TCP data to your WebSocket server, regardless of configuration in Flash socket policy file. Arbitrary TCP data means that they can even fake request headers including Origin and Cookie.
-
-- Unzip WebSocketMainInsecure.zip to extract WebSocketMainInsecure.swf.
-- Put WebSocketMainInsecure.swf on your server, instead of WebSocketMain.swf.
-- In JavaScript, set WEB_SOCKET_SWF_LOCATION to URL of your WebSocketMainInsecure.swf.
-
-
-* How to build WebSocketMain.swf
-
-Install Flex 4 SDK:
-http://opensource.adobe.com/wiki/display/flexsdk/Download+Flex+4
-
-$ cd flash-src
-$ ./build.sh
-
-
-* License
-
-New BSD License.

include/web-socket-js/web_socket.js

@@ -1,391 +0,0 @@
-// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
-// License: New BSD License
-// Reference: http://dev.w3.org/html5/websockets/
-// Reference: http://tools.ietf.org/html/rfc6455
-
-(function() {
-  
-  if (window.WEB_SOCKET_FORCE_FLASH) {
-    // Keeps going.
-  } else if (window.WebSocket) {
-    return;
-  } else if (window.MozWebSocket) {
-    // Firefox.
-    window.WebSocket = MozWebSocket;
-    return;
-  }
-  
-  var logger;
-  if (window.WEB_SOCKET_LOGGER) {
-    logger = WEB_SOCKET_LOGGER;
-  } else if (window.console && window.console.log && window.console.error) {
-    // In some environment, console is defined but console.log or console.error is missing.
-    logger = window.console;
-  } else {
-    logger = {log: function(){ }, error: function(){ }};
-  }
-  
-  // swfobject.hasFlashPlayerVersion("10.0.0") doesn't work with Gnash.
-  if (swfobject.getFlashPlayerVersion().major < 10) {
-    logger.error("Flash Player >= 10.0.0 is required.");
-    return;
-  }
-  if (location.protocol == "file:") {
-    logger.error(
-      "WARNING: web-socket-js doesn't work in file:///... URL " +
-      "unless you set Flash Security Settings properly. " +
-      "Open the page via Web server i.e. http://...");
-  }
-
-  /**
-   * Our own implementation of WebSocket class using Flash.
-   * @param {string} url
-   * @param {array or string} protocols
-   * @param {string} proxyHost
-   * @param {int} proxyPort
-   * @param {string} headers
-   */
-  window.WebSocket = function(url, protocols, proxyHost, proxyPort, headers) {
-    var self = this;
-    self.__id = WebSocket.__nextId++;
-    WebSocket.__instances[self.__id] = self;
-    self.readyState = WebSocket.CONNECTING;
-    self.bufferedAmount = 0;
-    self.__events = {};
-    if (!protocols) {
-      protocols = [];
-    } else if (typeof protocols == "string") {
-      protocols = [protocols];
-    }
-    // Uses setTimeout() to make sure __createFlash() runs after the caller sets ws.onopen etc.
-    // Otherwise, when onopen fires immediately, onopen is called before it is set.
-    self.__createTask = setTimeout(function() {
-      WebSocket.__addTask(function() {
-        self.__createTask = null;
-        WebSocket.__flash.create(
-            self.__id, url, protocols, proxyHost || null, proxyPort || 0, headers || null);
-      });
-    }, 0);
-  };
-
-  /**
-   * Send data to the web socket.
-   * @param {string} data  The data to send to the socket.
-   * @return {boolean}  True for success, false for failure.
-   */
-  WebSocket.prototype.send = function(data) {
-    if (this.readyState == WebSocket.CONNECTING) {
-      throw "INVALID_STATE_ERR: Web Socket connection has not been established";
-    }
-    // We use encodeURIComponent() here, because FABridge doesn't work if
-    // the argument includes some characters. We don't use escape() here
-    // because of this:
-    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Guide/Functions#escape_and_unescape_Functions
-    // But it looks decodeURIComponent(encodeURIComponent(s)) doesn't
-    // preserve all Unicode characters either e.g. "\uffff" in Firefox.
-    // Note by wtritch: Hopefully this will not be necessary using ExternalInterface.  Will require
-    // additional testing.
-    var result = WebSocket.__flash.send(this.__id, encodeURIComponent(data));
-    if (result < 0) { // success
-      return true;
-    } else {
-      this.bufferedAmount += result;
-      return false;
-    }
-  };
-
-  /**
-   * Close this web socket gracefully.
-   */
-  WebSocket.prototype.close = function() {
-    if (this.__createTask) {
-      clearTimeout(this.__createTask);
-      this.__createTask = null;
-      this.readyState = WebSocket.CLOSED;
-      return;
-    }
-    if (this.readyState == WebSocket.CLOSED || this.readyState == WebSocket.CLOSING) {
-      return;
-    }
-    this.readyState = WebSocket.CLOSING;
-    WebSocket.__flash.close(this.__id);
-  };
-
-  /**
-   * Implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
-   *
-   * @param {string} type
-   * @param {function} listener
-   * @param {boolean} useCapture
-   * @return void
-   */
-  WebSocket.prototype.addEventListener = function(type, listener, useCapture) {
-    if (!(type in this.__events)) {
-      this.__events[type] = [];
-    }
-    this.__events[type].push(listener);
-  };
-
-  /**
-   * Implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
-   *
-   * @param {string} type
-   * @param {function} listener
-   * @param {boolean} useCapture
-   * @return void
-   */
-  WebSocket.prototype.removeEventListener = function(type, listener, useCapture) {
-    if (!(type in this.__events)) return;
-    var events = this.__events[type];
-    for (var i = events.length - 1; i >= 0; --i) {
-      if (events[i] === listener) {
-        events.splice(i, 1);
-        break;
-      }
-    }
-  };
-
-  /**
-   * Implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
-   *
-   * @param {Event} event
-   * @return void
-   */
-  WebSocket.prototype.dispatchEvent = function(event) {
-    var events = this.__events[event.type] || [];
-    for (var i = 0; i < events.length; ++i) {
-      events[i](event);
-    }
-    var handler = this["on" + event.type];
-    if (handler) handler.apply(this, [event]);
-  };
-
-  /**
-   * Handles an event from Flash.
-   * @param {Object} flashEvent
-   */
-  WebSocket.prototype.__handleEvent = function(flashEvent) {
-    
-    if ("readyState" in flashEvent) {
-      this.readyState = flashEvent.readyState;
-    }
-    if ("protocol" in flashEvent) {
-      this.protocol = flashEvent.protocol;
-    }
-    
-    var jsEvent;
-    if (flashEvent.type == "open" || flashEvent.type == "error") {
-      jsEvent = this.__createSimpleEvent(flashEvent.type);
-    } else if (flashEvent.type == "close") {
-      jsEvent = this.__createSimpleEvent("close");
-      jsEvent.wasClean = flashEvent.wasClean ? true : false;
-      jsEvent.code = flashEvent.code;
-      jsEvent.reason = flashEvent.reason;
-    } else if (flashEvent.type == "message") {
-      var data = decodeURIComponent(flashEvent.message);
-      jsEvent = this.__createMessageEvent("message", data);
-    } else {
-      throw "unknown event type: " + flashEvent.type;
-    }
-    
-    this.dispatchEvent(jsEvent);
-    
-  };
-  
-  WebSocket.prototype.__createSimpleEvent = function(type) {
-    if (document.createEvent && window.Event) {
-      var event = document.createEvent("Event");
-      event.initEvent(type, false, false);
-      return event;
-    } else {
-      return {type: type, bubbles: false, cancelable: false};
-    }
-  };
-  
-  WebSocket.prototype.__createMessageEvent = function(type, data) {
-    if (document.createEvent && window.MessageEvent && !window.opera) {
-      var event = document.createEvent("MessageEvent");
-      event.initMessageEvent("message", false, false, data, null, null, window, null);
-      return event;
-    } else {
-      // IE and Opera, the latter one truncates the data parameter after any 0x00 bytes.
-      return {type: type, data: data, bubbles: false, cancelable: false};
-    }
-  };
-  
-  /**
-   * Define the WebSocket readyState enumeration.
-   */
-  WebSocket.CONNECTING = 0;
-  WebSocket.OPEN = 1;
-  WebSocket.CLOSING = 2;
-  WebSocket.CLOSED = 3;
-
-  // Field to check implementation of WebSocket.
-  WebSocket.__isFlashImplementation = true;
-  WebSocket.__initialized = false;
-  WebSocket.__flash = null;
-  WebSocket.__instances = {};
-  WebSocket.__tasks = [];
-  WebSocket.__nextId = 0;
-  
-  /**
-   * Load a new flash security policy file.
-   * @param {string} url
-   */
-  WebSocket.loadFlashPolicyFile = function(url){
-    WebSocket.__addTask(function() {
-      WebSocket.__flash.loadManualPolicyFile(url);
-    });
-  };
-
-  /**
-   * Loads WebSocketMain.swf and creates WebSocketMain object in Flash.
-   */
-  WebSocket.__initialize = function() {
-    
-    if (WebSocket.__initialized) return;
-    WebSocket.__initialized = true;
-    
-    if (WebSocket.__swfLocation) {
-      // For backword compatibility.
-      window.WEB_SOCKET_SWF_LOCATION = WebSocket.__swfLocation;
-    }
-    if (!window.WEB_SOCKET_SWF_LOCATION) {
-      logger.error("[WebSocket] set WEB_SOCKET_SWF_LOCATION to location of WebSocketMain.swf");
-      return;
-    }
-    if (!window.WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR &&
-        !WEB_SOCKET_SWF_LOCATION.match(/(^|\/)WebSocketMainInsecure\.swf(\?.*)?$/) &&
-        WEB_SOCKET_SWF_LOCATION.match(/^\w+:\/\/([^\/]+)/)) {
-      var swfHost = RegExp.$1;
-      if (location.host != swfHost) {
-        logger.error(
-            "[WebSocket] You must host HTML and WebSocketMain.swf in the same host " +
-            "('" + location.host + "' != '" + swfHost + "'). " +
-            "See also 'How to host HTML file and SWF file in different domains' section " +
-            "in README.md. If you use WebSocketMainInsecure.swf, you can suppress this message " +
-            "by WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR = true;");
-      }
-    }
-    var container = document.createElement("div");
-    container.id = "webSocketContainer";
-    // Hides Flash box. We cannot use display: none or visibility: hidden because it prevents
-    // Flash from loading at least in IE. So we move it out of the screen at (-100, -100).
-    // But this even doesn't work with Flash Lite (e.g. in Droid Incredible). So with Flash
-    // Lite, we put it at (0, 0). This shows 1x1 box visible at left-top corner but this is
-    // the best we can do as far as we know now.
-    container.style.position = "absolute";
-    if (WebSocket.__isFlashLite()) {
-      container.style.left = "0px";
-      container.style.top = "0px";
-    } else {
-      container.style.left = "-100px";
-      container.style.top = "-100px";
-    }
-    var holder = document.createElement("div");
-    holder.id = "webSocketFlash";
-    container.appendChild(holder);
-    document.body.appendChild(container);
-    // See this article for hasPriority:
-    // http://help.adobe.com/en_US/as3/mobile/WS4bebcd66a74275c36cfb8137124318eebc6-7ffd.html
-    swfobject.embedSWF(
-      WEB_SOCKET_SWF_LOCATION,
-      "webSocketFlash",
-      "1" /* width */,
-      "1" /* height */,
-      "10.0.0" /* SWF version */,
-      null,
-      null,
-      {hasPriority: true, swliveconnect : true, allowScriptAccess: "always"},
-      null,
-      function(e) {
-        if (!e.success) {
-          logger.error("[WebSocket] swfobject.embedSWF failed");
-        }
-      }
-    );
-    
-  };
-  
-  /**
-   * Called by Flash to notify JS that it's fully loaded and ready
-   * for communication.
-   */
-  WebSocket.__onFlashInitialized = function() {
-    // We need to set a timeout here to avoid round-trip calls
-    // to flash during the initialization process.
-    setTimeout(function() {
-      WebSocket.__flash = document.getElementById("webSocketFlash");
-      WebSocket.__flash.setCallerUrl(location.href);
-      WebSocket.__flash.setDebug(!!window.WEB_SOCKET_DEBUG);
-      for (var i = 0; i < WebSocket.__tasks.length; ++i) {
-        WebSocket.__tasks[i]();
-      }
-      WebSocket.__tasks = [];
-    }, 0);
-  };
-  
-  /**
-   * Called by Flash to notify WebSockets events are fired.
-   */
-  WebSocket.__onFlashEvent = function() {
-    setTimeout(function() {
-      try {
-        // Gets events using receiveEvents() instead of getting it from event object
-        // of Flash event. This is to make sure to keep message order.
-        // It seems sometimes Flash events don't arrive in the same order as they are sent.
-        var events = WebSocket.__flash.receiveEvents();
-        for (var i = 0; i < events.length; ++i) {
-          WebSocket.__instances[events[i].webSocketId].__handleEvent(events[i]);
-        }
-      } catch (e) {
-        logger.error(e);
-      }
-    }, 0);
-    return true;
-  };
-  
-  // Called by Flash.
-  WebSocket.__log = function(message) {
-    logger.log(decodeURIComponent(message));
-  };
-  
-  // Called by Flash.
-  WebSocket.__error = function(message) {
-    logger.error(decodeURIComponent(message));
-  };
-  
-  WebSocket.__addTask = function(task) {
-    if (WebSocket.__flash) {
-      task();
-    } else {
-      WebSocket.__tasks.push(task);
-    }
-  };
-  
-  /**
-   * Test if the browser is running flash lite.
-   * @return {boolean} True if flash lite is running, false otherwise.
-   */
-  WebSocket.__isFlashLite = function() {
-    if (!window.navigator || !window.navigator.mimeTypes) {
-      return false;
-    }
-    var mimeType = window.navigator.mimeTypes["application/x-shockwave-flash"];
-    if (!mimeType || !mimeType.enabledPlugin || !mimeType.enabledPlugin.filename) {
-      return false;
-    }
-    return mimeType.enabledPlugin.filename.match(/flashlite/i) ? true : false;
-  };
-  
-  if (!window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION) {
-    // NOTE:
-    //   This fires immediately if web_socket.js is dynamically loaded after
-    //   the document is loaded.
-    swfobject.addDomLoadEvent(function() {
-      WebSocket.__initialize();
-    });
-  }
-  
-})();

include/websock.js

@@ -1,422 +0,0 @@
-/*
- * Websock: high-performance binary WebSockets
- * Copyright (C) 2012 Joel Martin
- * Licensed under MPL 2.0 (see LICENSE.txt)
- *
- * Websock is similar to the standard WebSocket object but Websock
- * enables communication with raw TCP sockets (i.e. the binary stream)
- * via websockify. This is accomplished by base64 encoding the data
- * stream between Websock and websockify.
- *
- * Websock has built-in receive queue buffering; the message event
- * does not contain actual data but is simply a notification that
- * there is new data available. Several rQ* methods are available to
- * read binary data off of the receive queue.
- */
-
-/*jslint browser: true, bitwise: false, plusplus: false */
-/*global Util, Base64 */
-
-
-// Load Flash WebSocket emulator if needed
-
-// To force WebSocket emulator even when native WebSocket available
-//window.WEB_SOCKET_FORCE_FLASH = true;
-// To enable WebSocket emulator debug:
-//window.WEB_SOCKET_DEBUG=1;
-
-if (window.WebSocket && !window.WEB_SOCKET_FORCE_FLASH) {
-    Websock_native = true;
-} else if (window.MozWebSocket && !window.WEB_SOCKET_FORCE_FLASH) {
-    Websock_native = true;
-    window.WebSocket = window.MozWebSocket;
-} else {
-    /* no builtin WebSocket so load web_socket.js */
-
-    Websock_native = false;
-    (function () {
-        window.WEB_SOCKET_SWF_LOCATION = Util.get_include_uri() +
-                    "web-socket-js/WebSocketMain.swf";
-        if (Util.Engine.trident) {
-            Util.Debug("Forcing uncached load of WebSocketMain.swf");
-            window.WEB_SOCKET_SWF_LOCATION += "?" + Math.random();
-        }
-        Util.load_scripts(["web-socket-js/swfobject.js",
-                           "web-socket-js/web_socket.js"]);
-    }());
-}
-
-
-function Websock() {
-"use strict";
-
-var api = {},         // Public API
-    websocket = null, // WebSocket object
-    mode = 'base64',  // Current WebSocket mode: 'binary', 'base64'
-    rQ = [],          // Receive queue
-    rQi = 0,          // Receive queue index
-    rQmax = 10000,    // Max receive queue size before compacting
-    sQ = [],          // Send queue
-
-    eventHandlers = {
-        'message' : function() {},
-        'open'    : function() {},
-        'close'   : function() {},
-        'error'   : function() {}
-    },
-
-    test_mode = false;
-
-
-//
-// Queue public functions
-//
-
-function get_sQ() {
-    return sQ;
-}
-
-function get_rQ() {
-    return rQ;
-}
-function get_rQi() {
-    return rQi;
-}
-function set_rQi(val) {
-    rQi = val;
-}
-
-function rQlen() {
-    return rQ.length - rQi;
-}
-
-function rQpeek8() {
-    return (rQ[rQi]      );
-}
-function rQshift8() {
-    return (rQ[rQi++]      );
-}
-function rQunshift8(num) {
-    if (rQi === 0) {
-        rQ.unshift(num);
-    } else {
-        rQi -= 1;
-        rQ[rQi] = num;
-    }
-
-}
-function rQshift16() {
-    return (rQ[rQi++] <<  8) +
-           (rQ[rQi++]      );
-}
-function rQshift32() {
-    return (rQ[rQi++] << 24) +
-           (rQ[rQi++] << 16) +
-           (rQ[rQi++] <<  8) +
-           (rQ[rQi++]      );
-}
-function rQshiftStr(len) {
-    if (typeof(len) === 'undefined') { len = rQlen(); }
-    var arr = rQ.slice(rQi, rQi + len);
-    rQi += len;
-    return String.fromCharCode.apply(null, arr);
-}
-function rQshiftBytes(len) {
-    if (typeof(len) === 'undefined') { len = rQlen(); }
-    rQi += len;
-    return rQ.slice(rQi-len, rQi);
-}
-
-function rQslice(start, end) {
-    if (end) {
-        return rQ.slice(rQi + start, rQi + end);
-    } else {
-        return rQ.slice(rQi + start);
-    }
-}
-
-// Check to see if we must wait for 'num' bytes (default to FBU.bytes)
-// to be available in the receive queue. Return true if we need to
-// wait (and possibly print a debug message), otherwise false.
-function rQwait(msg, num, goback) {
-    var rQlen = rQ.length - rQi; // Skip rQlen() function call
-    if (rQlen < num) {
-        if (goback) {
-            if (rQi < goback) {
-                throw("rQwait cannot backup " + goback + " bytes");
-            }
-            rQi -= goback;
-        }
-        //Util.Debug("   waiting for " + (num-rQlen) +
-        //           " " + msg + " byte(s)");
-        return true;  // true means need more data
-    }
-    return false;
-}
-
-//
-// Private utility routines
-//
-
-function encode_message() {
-    if (mode === 'binary') {
-        // Put in a binary arraybuffer
-        return (new Uint8Array(sQ)).buffer;
-    } else {
-        // base64 encode
-        return Base64.encode(sQ);
-    }
-}
-
-function decode_message(data) {
-    //Util.Debug(">> decode_message: " + data);
-    if (mode === 'binary') {
-        // push arraybuffer values onto the end
-        var u8 = new Uint8Array(data);
-        for (var i = 0; i < u8.length; i++) {
-            rQ.push(u8[i]);
-        }
-    } else {
-        // base64 decode and concat to the end
-        rQ = rQ.concat(Base64.decode(data, 0));
-    }
-    //Util.Debug(">> decode_message, rQ: " + rQ);
-}
-
-
-//
-// Public Send functions
-//
-
-function flush() {
-    if (websocket.bufferedAmount !== 0) {
-        Util.Debug("bufferedAmount: " + websocket.bufferedAmount);
-    }
-    if (websocket.bufferedAmount < api.maxBufferedAmount) {
-        //Util.Debug("arr: " + arr);
-        //Util.Debug("sQ: " + sQ);
-        if (sQ.length > 0) {
-            websocket.send(encode_message(sQ));
-            sQ = [];
-        }
-        return true;
-    } else {
-        Util.Info("Delaying send, bufferedAmount: " +
-                websocket.bufferedAmount);
-        return false;
-    }
-}
-
-// overridable for testing
-function send(arr) {
-    //Util.Debug(">> send_array: " + arr);
-    sQ = sQ.concat(arr);
-    return flush();
-}
-
-function send_string(str) {
-    //Util.Debug(">> send_string: " + str);
-    api.send(str.split('').map(
-        function (chr) { return chr.charCodeAt(0); } ) );
-}
-
-//
-// Other public functions
-
-function recv_message(e) {
-    //Util.Debug(">> recv_message: " + e.data.length);
-
-    try {
-        decode_message(e.data);
-        if (rQlen() > 0) {
-            eventHandlers.message();
-            // Compact the receive queue
-            if (rQ.length > rQmax) {
-                //Util.Debug("Compacting receive queue");
-                rQ = rQ.slice(rQi);
-                rQi = 0;
-            }
-        } else {
-            Util.Debug("Ignoring empty message");
-        }
-    } catch (exc) {
-        if (typeof exc.stack !== 'undefined') {
-            Util.Warn("recv_message, caught exception: " + exc.stack);
-        } else if (typeof exc.description !== 'undefined') {
-            Util.Warn("recv_message, caught exception: " + exc.description);
-        } else {
-            Util.Warn("recv_message, caught exception:" + exc);
-        }
-        if (typeof exc.name !== 'undefined') {
-            eventHandlers.error(exc.name + ": " + exc.message);
-        } else {
-            eventHandlers.error(exc);
-        }
-    }
-    //Util.Debug("<< recv_message");
-}
-
-
-// Set event handlers
-function on(evt, handler) { 
-    eventHandlers[evt] = handler;
-}
-
-function init(protocols) {
-    rQ         = [];
-    rQi        = 0;
-    sQ         = [];
-    websocket  = null;
-
-    var bt = false,
-        wsbt = false,
-        try_binary = false;
-
-    // Check for full typed array support
-    if (('Uint8Array' in window) &&
-        ('set' in Uint8Array.prototype)) {
-        bt = true;
-    }
-
-    // Check for full binary type support in WebSockets
-    // TODO: this sucks, the property should exist on the prototype
-    // but it does not.
-    try {
-        if (bt && ('binaryType' in (new WebSocket("ws://localhost:17523")))) {
-            Util.Info("Detected binaryType support in WebSockets");
-            wsbt = true;
-        }
-    } catch (exc) {
-        // Just ignore failed test localhost connections
-    }
-
-    // Default protocols if not specified
-    if (typeof(protocols) === "undefined") {
-        if (wsbt) {
-            protocols = ['binary', 'base64'];
-        } else {
-            protocols = 'base64';
-        }
-    }
-
-    // If no binary support, make sure it was not requested
-    if (!wsbt) {
-        if (protocols === 'binary') {
-            throw("WebSocket binary sub-protocol requested but not supported");
-        }
-        if (typeof(protocols) === "object") {
-            var new_protocols = [];
-            for (var i = 0; i < protocols.length; i++) {
-                if (protocols[i] === 'binary') {
-                    Util.Error("Skipping unsupported WebSocket binary sub-protocol");
-                } else {
-                    new_protocols.push(protocols[i]);
-                }
-            }
-            if (new_protocols.length > 0) {
-                protocols = new_protocols;
-            } else {
-                throw("Only WebSocket binary sub-protocol was requested and not supported.");
-            }
-        }
-    }
-
-    return protocols;
-}
-
-function open(uri, protocols) {
-    protocols = init(protocols);
-
-    if (test_mode) {
-        websocket = {};
-    } else {
-        websocket = new WebSocket(uri, protocols);
-        if (protocols.indexOf('binary') >= 0) {
-            websocket.binaryType = 'arraybuffer';
-        }
-    }
-
-    websocket.onmessage = recv_message;
-    websocket.onopen = function() {
-        Util.Debug(">> WebSock.onopen");
-        if (websocket.protocol) {
-            mode = websocket.protocol;
-            Util.Info("Server chose sub-protocol: " + websocket.protocol);
-        } else {
-            mode = 'base64';
-            Util.Error("Server select no sub-protocol!: " + websocket.protocol);
-        }
-        eventHandlers.open();
-        Util.Debug("<< WebSock.onopen");
-    };
-    websocket.onclose = function(e) {
-        Util.Debug(">> WebSock.onclose");
-        eventHandlers.close(e);
-        Util.Debug("<< WebSock.onclose");
-    };
-    websocket.onerror = function(e) {
-        Util.Debug(">> WebSock.onerror: " + e);
-        eventHandlers.error(e);
-        Util.Debug("<< WebSock.onerror");
-    };
-}
-
-function close() {
-    if (websocket) {
-        if ((websocket.readyState === WebSocket.OPEN) ||
-            (websocket.readyState === WebSocket.CONNECTING)) {
-            Util.Info("Closing WebSocket connection");
-            websocket.close();
-        }
-        websocket.onmessage = function (e) { return; };
-    }
-}
-
-// Override internal functions for testing
-// Takes a send function, returns reference to recv function
-function testMode(override_send, data_mode) {
-    test_mode = true;
-    mode = data_mode;
-    api.send = override_send;
-    api.close = function () {};
-    return recv_message;
-}
-
-function constructor() {
-    // Configuration settings
-    api.maxBufferedAmount = 200;
-
-    // Direct access to send and receive queues
-    api.get_sQ       = get_sQ;
-    api.get_rQ       = get_rQ;
-    api.get_rQi      = get_rQi;
-    api.set_rQi      = set_rQi;
-
-    // Routines to read from the receive queue
-    api.rQlen        = rQlen;
-    api.rQpeek8      = rQpeek8;
-    api.rQshift8     = rQshift8;
-    api.rQunshift8   = rQunshift8;
-    api.rQshift16    = rQshift16;
-    api.rQshift32    = rQshift32;
-    api.rQshiftStr   = rQshiftStr;
-    api.rQshiftBytes = rQshiftBytes;
-    api.rQslice      = rQslice;
-    api.rQwait       = rQwait;
-
-    api.flush        = flush;
-    api.send         = send;
-    api.send_string  = send_string;
-
-    api.on           = on;
-    api.init         = init;
-    api.open         = open;
-    api.close        = close;
-    api.testMode     = testMode;
-
-    return api;
-}
-
-return constructor();
-
-}

include/webutil.js

@@ -1,216 +0,0 @@
-/*
- * from noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Licensed under MPL 2.0 (see LICENSE.txt)
- *
- * See README.md for usage and integration instructions.
- */
-
-"use strict";
-/*jslint bitwise: false, white: false */
-/*global Util, window, document */
-
-// Globals defined here
-var WebUtil = {}, $D;
-
-/*
- * Simple DOM selector by ID
- */
-if (!window.$D) {
-    window.$D = function (id) {
-        if (document.getElementById) {
-            return document.getElementById(id);
-        } else if (document.all) {
-            return document.all[id];
-        } else if (document.layers) {
-            return document.layers[id];
-        }
-        return undefined;
-    };
-}
-
-
-/* 
- * ------------------------------------------------------
- * Namespaced in WebUtil
- * ------------------------------------------------------
- */
-
-// init log level reading the logging HTTP param
-WebUtil.init_logging = function(level) {
-    if (typeof level !== "undefined") {
-        Util._log_level = level;
-    } else {
-        Util._log_level = (document.location.href.match(
-            /logging=([A-Za-z0-9\._\-]*)/) ||
-            ['', Util._log_level])[1];
-    }
-    Util.init_logging();
-};
-
-
-WebUtil.dirObj = function (obj, depth, parent) {
-    var i, msg = "", val = "";
-    if (! depth) { depth=2; }
-    if (! parent) { parent= ""; }
-
-    // Print the properties of the passed-in object 
-    for (i in obj) {
-        if ((depth > 1) && (typeof obj[i] === "object")) { 
-            // Recurse attributes that are objects
-            msg += WebUtil.dirObj(obj[i], depth-1, parent + "." + i);
-        } else {
-            //val = new String(obj[i]).replace("\n", " ");
-            if (typeof(obj[i]) === "undefined") {
-                val = "undefined";
-            } else {
-                val = obj[i].toString().replace("\n", " ");
-            }
-            if (val.length > 30) {
-                val = val.substr(0,30) + "...";
-            } 
-            msg += parent + "." + i + ": " + val + "\n";
-        }
-    }
-    return msg;
-};
-
-// Read a query string variable
-WebUtil.getQueryVar = function(name, defVal) {
-    var re = new RegExp('[?][^#]*' + name + '=([^&#]*)'),
-        match = document.location.href.match(re);
-    if (typeof defVal === 'undefined') { defVal = null; }
-    if (match) {
-        return decodeURIComponent(match[1]);
-    } else {
-        return defVal;
-    }
-};
-
-
-/*
- * Cookie handling. Dervied from: http://www.quirksmode.org/js/cookies.html
- */
-
-// No days means only for this browser session
-WebUtil.createCookie = function(name,value,days) {
-    var date, expires;
-    if (days) {
-        date = new Date();
-        date.setTime(date.getTime()+(days*24*60*60*1000));
-        expires = "; expires="+date.toGMTString();
-    }
-    else {
-        expires = "";
-    }
-    document.cookie = name+"="+value+expires+"; path=/";
-};
-
-WebUtil.readCookie = function(name, defaultValue) {
-    var i, c, nameEQ = name + "=", ca = document.cookie.split(';');
-    for(i=0; i < ca.length; i += 1) {
-        c = ca[i];
-        while (c.charAt(0) === ' ') { c = c.substring(1,c.length); }
-        if (c.indexOf(nameEQ) === 0) { return c.substring(nameEQ.length,c.length); }
-    }
-    return (typeof defaultValue !== 'undefined') ? defaultValue : null;
-};
-
-WebUtil.eraseCookie = function(name) {
-    WebUtil.createCookie(name,"",-1);
-};
-
-/*
- * Setting handling.
- */
-
-WebUtil.initSettings = function(callback) {
-    var callbackArgs = Array.prototype.slice.call(arguments, 1);
-    if (window.chrome && window.chrome.storage) {
-        window.chrome.storage.sync.get(function (cfg) {
-            WebUtil.settings = cfg;
-            console.log(WebUtil.settings);
-            if (callback) {
-                callback.apply(this, callbackArgs);
-            }
-        });
-    } else {
-        // No-op
-        if (callback) {
-            callback.apply(this, callbackArgs);
-        }
-    }
-};
-
-// No days means only for this browser session
-WebUtil.writeSetting = function(name, value) {
-    if (window.chrome && window.chrome.storage) {
-        //console.log("writeSetting:", name, value);
-        if (WebUtil.settings[name] !== value) {
-            WebUtil.settings[name] = value;
-            window.chrome.storage.sync.set(WebUtil.settings);
-        }
-    } else {
-        localStorage.setItem(name, value);
-    }
-};
-
-WebUtil.readSetting = function(name, defaultValue) {
-    var value;
-    if (window.chrome && window.chrome.storage) {
-        value = WebUtil.settings[name];
-    } else {
-        value = localStorage.getItem(name);
-    }
-    if (typeof value === "undefined") {
-        value = null;
-    }
-    if (value === null && typeof defaultValue !== undefined) {
-        return defaultValue;
-    } else {
-        return value;
-    }
-};
-
-WebUtil.eraseSetting = function(name) {
-    if (window.chrome && window.chrome.storage) {
-        window.chrome.storage.sync.remove(name);
-        delete WebUtil.settings[name];
-    } else {
-        localStorage.removeItem(name);
-    }
-};
-
-/*
- * Alternate stylesheet selection
- */
-WebUtil.getStylesheets = function() { var i, links, sheets = [];
-    links = document.getElementsByTagName("link");
-    for (i = 0; i < links.length; i += 1) {
-        if (links[i].title &&
-            links[i].rel.toUpperCase().indexOf("STYLESHEET") > -1) {
-            sheets.push(links[i]);
-        }
-    }
-    return sheets;
-};
-
-// No sheet means try and use value from cookie, null sheet used to
-// clear all alternates.
-WebUtil.selectStylesheet = function(sheet) {
-    var i, link, sheets = WebUtil.getStylesheets();
-    if (typeof sheet === 'undefined') {
-        sheet = 'default';
-    }
-    for (i=0; i < sheets.length; i += 1) {
-        link = sheets[i];
-        if (link.title === sheet) {    
-            Util.Debug("Using stylesheet " + sheet);
-            link.disabled = false;
-        } else {
-            //Util.Debug("Skipping stylesheet " + link.title);
-            link.disabled = true;
-        }
-    }
-    return sheet;
-};

include/wsirc.js

@@ -1,235 +0,0 @@
-/*
- * WebSockets IRC client
- * Copyright (C) 2011 Joel Martin
- * Licensed under LGPL-3 (see LICENSE.txt)
- *
- * Includes VT100.js from:
- *   http://code.google.com/p/sshconsole
- * Which was modified from:
- *   http://fzort.org/bi/o.php#vt100_js
-
- * IRC Client protocol:
- *   http://www.faqs.org/rfcs/rfc2812.html   
- */
-
-
-function IRC(target, connect_callback, disconnect_callback) {
-
-var that = {},  // Public API interface
-    vt100, ws, sQ = [],
-    state = "unconnected",
-    irc_nick, irc_channel,
-    termType = "VT100";
-
-
-Array.prototype.pushStr = function (str) {
-    var n = str.length;
-    for (var i=0; i < n; i++) {
-        this.push(str.charCodeAt(i));
-    }
-}
-
-function do_send() {
-    if (sQ.length > 0) {
-        Util.Debug("Sending " + sQ);
-        ws.send(sQ);
-        sQ = [];
-    }
-}
-
-function do_recv() {
-    console.log(">> do_recv");
-    var rQ, rQi, i;
-
-    while (ws.rQlen() > 1) {
-        rQ = ws.get_rQ();
-        rQi = ws.get_rQi();
-        for (i = rQi; i < rQ.length; i++) {
-            if (rQ[i] === 10) {
-                break;
-            }
-        }
-        if (i >= rQ.length) {
-            // No line break found
-            break;
-        }
-        recvMsg(ws.rQshiftStr((i-rQi) + 1));
-    }
-    //console.log("<< do_recv");
-}
-
-// Handle an IRC message
-function recvMsg(msg) {
-    Util.Debug(">> recvMsg('" + msg + "')");
-
-    var tokens = msg.split(' '), in_params = true,
-        prefix, command, params = [], trailing = [];
-
-    Util.Info("   tokens: " + tokens);
-
-    if (tokens[0].charAt(0) === ":") {
-        prefix = tokens.shift();
-    }
-
-    command = tokens.shift();
-
-    while (tokens.length > 0) {
-        if (tokens[0].charAt(0) === ":") {
-            in_params = false;
-        }
-        if (in_params) {
-            params.push(tokens.shift());
-        } else {
-            trailing.push(tokens.shift());
-        }
-    }
-
-    Util.Info("   prefix: " + prefix);
-    Util.Info("   command: " + command);
-    Util.Info("   params: " + params);
-    Util.Info("   trailing: " + trailing);
-
-    // Show raw received
-    vt100.write(msg);
-
-    switch (command) {
-    case "004":
-        state = "registered";
-        vt100.write("Joining channel #" + irc_channel);
-        sendCmd("JOIN #" + irc_channel);
-        break;
-    case "JOIN":
-        state = "joined";
-        vt100.write("Joined channel #" + irc_channel);
-        break;
-        
-    }
-
-    Util.Debug("<< recvMsg('" + msg + "')");
-}
-
-function sendCmd(msg) {
-    Util.Info("Sending: " + msg);
-    sQ.pushStr(msg + "\r\n");
-    do_send();
-}
-
-that.sendMsg = function(msg) {
-    // TODO parse into message
-    sendCmd("PRIVMSG #" + irc_channel + " :" + msg);
-}
-
-
-that.connect = function(host, port, encrypt, nick, channel) {
-    var host = host,
-        port = port,
-        scheme = "ws://", uri;
-
-    irc_nick = nick;
-    irc_channel = channel;
-
-    Util.Debug(">> connect");
-    if ((!host) || (!port)) {
-        alert("must set host and port");
-        return false;
-    }
-
-    if (ws) {
-        ws.close();
-    }
-
-    if (encrypt) {
-        scheme = "wss://";
-    }
-    uri = scheme + host + ":" + port;
-    Util.Info("connecting to " + uri);
-
-    ws.open(uri);
-
-    Util.Debug("<< connect");
-
-    return true;
-}
-
-that.disconnect = function() {
-    Util.Debug(">> disconnect");
-    if (ws) {
-        ws.close();
-    }
-
-    disconnect_callback();
-    Util.Debug("<< disconnect");
-}
-
-
-function constructor() {
-    /* Initialize Websock object */
-    ws = new Websock();
-
-    ws.on('message', do_recv);
-    ws.on('open', function(e) {
-        Util.Info(">> WebSockets.onopen");
-        // Send registration commands
-        state = "connected";
-        sendCmd("NICK " + irc_nick);
-        // TODO: how to determine this?
-        sendCmd("USER joelm 0 * :Joel Martin");
-        connect_callback();
-        Util.Info("<< WebSockets.onopen");
-    });
-    ws.on('close', function(e) {
-        Util.Info(">> WebSockets.onclose");
-        that.disconnect();
-        Util.Info("<< WebSockets.onclose");
-    });
-    ws.on('error', function(e) {
-        Util.Info(">> WebSockets.onerror");
-        that.disconnect();
-        Util.Info("<< WebSockets.onerror");
-    });
-
-    /* Initialize the terminal emulator/renderer */
-
-    vt100 = new VT100(80, 24, target);
-
-    // Show cursor
-    vt100.curs_set(true, false);
-
-    /*
-     * Override VT100 I/O routines
-     */
-
-    // Set handler for sending characters
-    vt100.getch(
-        function send_chr(chr, vt) {
-            var i;
-            Util.Debug(">> send_chr: " + chr);
-            for (i = 0; i < chr.length; i++) {
-                sQ.push(chr.charCodeAt(i));
-            }
-            do_send();
-            vt100.getch(send_chr);
-        }
-    );
-
-    vt100.debug = function(message) {
-        Util.Debug(message + "\n");
-    }
-
-    vt100.warn = function(message) {
-        Util.Warn(message + "\n");
-    }
-
-    vt100.curs_set = function(vis, grab, eventist)
-    {
-        this.debug("curs_set:: vis: " + vis + ", grab: " + grab);
-        if (vis !== undefined)
-            this.cursor_vis_ = (vis > 0);
-    }
-
-    return that;
-}
-
-return constructor(); // Return the public API interface
-
-} // End of Telnet()

include/wstelnet.js

@@ -1,335 +0,0 @@
-/*
- * WebSockets telnet client
- * Copyright (C) 2011 Joel Martin
- * Licensed under LGPL-3 (see LICENSE.txt)
- *
- * Includes VT100.js from:
- *   http://code.google.com/p/sshconsole
- * Which was modified from:
- *   http://fzort.org/bi/o.php#vt100_js
- *
- * Telnet protocol:
- *   http://www.networksorcery.com/enp/protocol/telnet.htm
- *   http://www.networksorcery.com/enp/rfc/rfc1091.txt
- *
- * ANSI escape sequeneces:
- *   http://en.wikipedia.org/wiki/ANSI_escape_code
- *   http://ascii-table.com/ansi-escape-sequences-vt-100.php
- *   http://www.termsys.demon.co.uk/vtansi.htm
- *   http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
- *
- * ASCII codes:
- *   http://en.wikipedia.org/wiki/ASCII
- *   http://www.hobbyprojects.com/ascii-table/ascii-table.html
- *
- * Other web consoles:
- *   http://stackoverflow.com/questions/244750/ajax-console-window-with-ansi-vt100-support
- */
-
-
-
-
-function Telnet(target, connect_callback, disconnect_callback) {
-
-var that = {},  // Public API interface
-    vt100, ws, sQ = [];
-    termType = "VT100";
-
-
-Array.prototype.pushStr = function (str) {
-    var n = str.length;
-    for (var i=0; i < n; i++) {
-        this.push(str.charCodeAt(i));
-    }
-}
-
-function do_send() {
-    if (sQ.length > 0) {
-        Util.Debug("Sending " + sQ);
-        ws.send(sQ);
-        sQ = [];
-    }
-}
-
-function do_recv() {
-    //console.log(">> do_recv");
-    var arr = ws.rQshiftBytes(ws.rQlen()), str = "",
-        chr, cmd, code, value;
-
-    Util.Debug("Received array '" + arr + "'");
-    while (arr.length > 0) {
-        chr = arr.shift();
-        switch (chr) {
-        case 255:   // IAC
-            cmd = chr;
-            code = arr.shift();
-            value = arr.shift();
-            switch (code) {
-            case 254: // DONT
-                Util.Debug("Got Cmd DONT '" + value + "', ignoring");
-                break;
-            case 253: // DO
-                Util.Debug("Got Cmd DO '" + value + "'");
-                if (value === 24) {
-                    // Terminal type
-                    Util.Info("Send WILL '" + value + "' (TERM-TYPE)");
-                    sQ.push(255, 251, value);
-                } else {
-                    // Refuse other DO requests with a WONT
-                    Util.Debug("Send WONT '" + value + "'");
-                    sQ.push(255, 252, value);
-                }
-                break;
-            case 252: // WONT
-                Util.Debug("Got Cmd WONT '" + value + "', ignoring");
-                break;
-            case 251: // WILL
-                Util.Debug("Got Cmd WILL '" + value + "'");
-                if (value === 1) {
-                    // Server will echo, turn off local echo
-                    vt100.noecho();
-                    // Affirm echo with DO
-                    Util.Info("Send Cmd DO '" + value + "' (echo)");
-                    sQ.push(255, 253, value);
-                } else {
-                    // Reject other WILL offers with a DONT
-                    Util.Debug("Send Cmd DONT '" + value + "'");
-                    sQ.push(255, 254, value);
-                }
-                break;
-            case 250: // SB (subnegotiation)
-                if (value === 24) {
-                    Util.Info("Got IAC SB TERM-TYPE SEND(1) IAC SE");
-                    // TERM-TYPE subnegotiation
-                    if (arr[0] === 1 &&
-                        arr[1] === 255 &&
-                        arr[2] === 240) {
-                        arr.shift(); arr.shift(); arr.shift();
-                        Util.Info("Send IAC SB TERM-TYPE IS(0) '" + 
-                                  termType + "' IAC SE");
-                        sQ.push(255, 250, 24, 0); 
-                        sQ.pushStr(termType);
-                        sQ.push(255, 240);
-                    } else {
-                        Util.Info("Invalid subnegotiation received" + arr);
-                    }
-                } else {
-                    Util.Info("Ignoring SB " + value);
-                }
-                break;
-            default:
-                Util.Info("Got Cmd " + cmd + " " + value + ", ignoring"); }
-            continue;
-        case 242:   // Data Mark (Synch)
-            cmd = chr;
-            code = arr.shift();
-            value = arr.shift();
-            Util.Info("Ignoring Data Mark (Synch)");
-            break;
-        default:   // everything else
-            str += String.fromCharCode(chr);
-        }
-    }
-
-    if (sQ) {
-        do_send();
-    }
-
-    if (str) {
-        vt100.write(str);
-    }
-
-    //console.log("<< do_recv");
-}
-
-
-
-that.connect = function(host, port, encrypt) {
-    var host = host,
-        port = port,
-        scheme = "ws://", uri;
-
-    Util.Debug(">> connect");
-    if ((!host) || (!port)) {
-        console.log("must set host and port");
-        return;
-    }
-
-    if (ws) {
-        ws.close();
-    }
-
-    if (encrypt) {
-        scheme = "wss://";
-    }
-    uri = scheme + host + ":" + port;
-    Util.Info("connecting to " + uri);
-
-    ws.open(uri);
-
-    Util.Debug("<< connect");
-}
-
-that.disconnect = function() {
-    Util.Debug(">> disconnect");
-    if (ws) {
-        ws.close();
-    }
-    vt100.curs_set(true, false);
-
-    disconnect_callback();
-    Util.Debug("<< disconnect");
-}
-
-
-function constructor() {
-    /* Initialize Websock object */
-    ws = new Websock();
-
-    ws.on('message', do_recv);
-    ws.on('open', function(e) {
-        Util.Info(">> WebSockets.onopen");
-        vt100.curs_set(true, true);
-        connect_callback();
-        Util.Info("<< WebSockets.onopen");
-    });
-    ws.on('close', function(e) {
-        Util.Info(">> WebSockets.onclose");
-        that.disconnect();
-        Util.Info("<< WebSockets.onclose");
-    });
-    ws.on('error', function(e) {
-        Util.Info(">> WebSockets.onerror");
-        that.disconnect();
-        Util.Info("<< WebSockets.onerror");
-    });
-
-    /* Initialize the terminal emulator/renderer */
-
-    vt100 = new VT100(80, 24, target);
-
-
-    /*
-     * Override VT100 I/O routines
-     */
-
-    // Set handler for sending characters
-    vt100.getch(
-        function send_chr(chr, vt) {
-            var i;
-            Util.Debug(">> send_chr: " + chr);
-            for (i = 0; i < chr.length; i++) {
-                sQ.push(chr.charCodeAt(i));
-            }
-            do_send();
-            vt100.getch(send_chr);
-        }
-    );
-
-    vt100.debug = function(message) {
-        Util.Debug(message + "\n");
-    }
-
-    vt100.warn = function(message) {
-        Util.Warn(message + "\n");
-    }
-
-    vt100.curs_set = function(vis, grab, eventist)
-    {
-        this.debug("curs_set:: vis: " + vis + ", grab: " + grab);
-        if (vis !== undefined)
-            this.cursor_vis_ = (vis > 0);
-        if (eventist === undefined)
-            eventist = window;
-        if (grab === true || grab === false) {
-            if (grab === this.grab_events_)
-                return;
-            if (grab) {
-                this.grab_events_ = true;
-                VT100.the_vt_ = this;
-                Util.addEvent(eventist, 'keydown', vt100.key_down);
-                Util.addEvent(eventist, 'keyup', vt100.key_up);
-            } else {
-                Util.removeEvent(eventist, 'keydown', vt100.key_down);
-                Util.removeEvent(eventist, 'keyup', vt100.key_up);
-                this.grab_events_ = false;
-                VT100.the_vt_ = undefined;
-            }
-        }
-    }
-
-    vt100.key_down = function(e) {
-        var vt = VT100.the_vt_, keysym, ch, str = "";
-
-        if (vt === undefined)
-            return true;
-
-        keysym = getKeysym(e);
-
-        if (keysym < 128) {
-            if (e.ctrlKey) {
-                if (keysym == 64) {
-                    // control 0
-                    ch = 0;
-                } else if ((keysym >= 97) && (keysym <= 122)) {
-                    // control codes 1-26
-                    ch = keysym - 96;
-                } else if ((keysym >= 91) && (keysym <= 95)) {
-                    // control codes 27-31
-                    ch = keysym - 64;
-                } else {
-                    Util.Info("Debug unknown control keysym: " + keysym);
-                }
-            } else {
-                ch = keysym;
-            }
-            str = String.fromCharCode(ch);
-        } else {
-            switch (keysym) {
-            case 65505: // Shift, do not send directly
-                break;
-            case 65507: // Ctrl, do not send directly
-                break;
-            case 65293: // Carriage return, line feed
-                str = '\n'; break;
-            case 65288: // Backspace
-                str = '\b'; break;
-            case 65307: // Escape
-                str = '\x1b'; break;
-            case 65361: // Left arrow 
-                str = '\x1b[D'; break;
-            case 65362: // Up arrow 
-                str = '\x1b[A'; break;
-            case 65363: // Right arrow 
-                str = '\x1b[C'; break;
-            case 65364: // Down arrow 
-                str = '\x1b[B'; break;
-            default:
-                Util.Info("Unrecoginized keysym " + keysym);
-            }
-        }
-
-        if (str) {
-            vt.key_buf_.push(str);
-            setTimeout(VT100.go_getch_, 0);
-        }
-
-        Util.stopEvent(e);
-        return false;
-    }
-
-    vt100.key_up = function(e) {
-        var vt = VT100.the_vt_;
-        if (vt === undefined)
-            return true;
-        Util.stopEvent(e);
-        return false;
-    }
-
-
-    return that;
-}
-
-return constructor(); // Return the public API interface
-
-} // End of Telnet()

other/Makefile

@@ -1,14 +0,0 @@
-TARGETS=websockify
-CFLAGS += -fPIC
-
-all: $(TARGETS)
-
-websockify: websockify.o websocket.o
-	$(CC) $(LDFLAGS) $^ -lssl -lcrypto -lresolv -o $@
-
-websocket.o: websocket.c websocket.h
-websockify.o: websockify.c websocket.h
-
-clean:
-	rm -f websockify *.o
-

other/README.md

@@ -1,51 +0,0 @@
-This directory contain alternate implementations of
-WebSockets-to-TCP-Socket proxies (for noVNC).
-
-## websockify.c (C)
-
-### Description
-
-This is a C version of the original websockify. It is more limited in
-functionality than the original.
-
-
-## websockify.js
-
-### Description
-
-This is a Node.JS (server-side event driven Javascript) implementation
-of websockify.
-
-
-## kumina.c (C)
-
-### Description
-
-The upstream source of the kumina proxy is [here](https://github.com/kumina/wsproxy).
-
-[This article](http://blog.kumina.nl/2011/06/proxying-and-multiplexing-novnc-using-wsproxy/)
-describes the kumina proxy.
-
-kumina is an application that is run from inetd, which allows noVNC
-to connect to an unmodified VNC server. Furthermore, it makes use of
-the recently added support in noVNC for file names. The file name is
-used to denote the port number. Say, you connect to:
-
-  ws://host:41337/25900
-
-The kumina proxy opens a connection to:
-
-  vnc://host:25900/
-
-The address to which kumina connects, is the same as the address to
-which the client connected (using getsockname()).
-
-### Configuration
-
-kumina can be enabled by adding the following line to inetd.conf:
-
-  41337 stream tcp nowait nobody /usr/sbin/kumina kumina 25900 25909
-
-The two parameters of kumina denote the minimum and the maximum allowed
-port numbers. This allows a single kumina instance to multiplex
-connections to multiple VNC servers.

other/js/README.md

@@ -1,7 +0,0 @@
-A JavaScript implementation of the websockify WebSocket-to-TCP bridge/proxy.
-
-Copyright (C) 2013 - Joel Martin (github.com/kanaka)
-
-Licensed under LGPL-3.
-
-See http://github.com/kanaka/websockify for more info.

other/js/package.json

@@ -1,24 +0,0 @@
-{
-  "author": "Joel Martin <github@martintribe.org> (http://github.com/kanaka)",
-  "name": "websockify",
-  "description": "websockify is a WebSocket-to-TCP proxy/bridge",
-  "license": "LGPL-3",
-  "version": "0.6.1",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/kanaka/websockify.git"
-  },
-  "files": ["../../docs/LICENSE.LGPL-3"],
-  "bin": {
-    "websockify": "./websockify.js"
-  },
-  "engines": {
-    "node": ">=0.8.9"
-  },
-  "dependencies": {
-    "ws": ">=0.4.27",
-    "base64": "latest",
-    "optimist": "latest",
-    "policyfile": "latest"
-  }
-}

other/js/websockify.js

@@ -1,192 +0,0 @@
-#!/usr/bin/env node
-
-// A WebSocket to TCP socket proxy
-// Copyright 2012 Joel Martin
-// Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3)
-
-// Known to work with node 0.8.9
-// Requires node modules: ws, optimist and policyfile
-//     npm install ws optimist policyfile
-
-
-var argv = require('optimist').argv,
-    net = require('net'),
-    http = require('http'),
-    https = require('https'),
-    url = require('url'),
-    path = require('path'),
-    fs = require('fs'),
-    policyfile = require('policyfile'),
-
-    Buffer = require('buffer').Buffer,
-    WebSocketServer = require('ws').Server,
-
-    webServer, wsServer,
-    source_host, source_port, target_host, target_port,
-    web_path = null;
-
-
-// Handle new WebSocket client
-new_client = function(client) {
-    var clientAddr = client._socket.remoteAddress, log;
-    console.log(client.upgradeReq.url);
-    log = function (msg) {
-        console.log(' ' + clientAddr + ': '+ msg);
-    };
-    log('WebSocket connection');
-    log('Version ' + client.protocolVersion + ', subprotocol: ' + client.protocol);
-
-    var target = net.createConnection(target_port,target_host, function() {
-        log('connected to target');
-    });
-    target.on('data', function(data) {
-        //log("sending message: " + data);
-        try {
-            if (client.protocol === 'base64') {
-                client.send(new Buffer(data).toString('base64'));
-            } else {
-                client.send(data,{binary: true});
-            }
-        } catch(e) {
-            log("Client closed, cleaning up target");
-            target.end();
-        }
-    });
-    target.on('end', function() {
-        log('target disconnected');
-        client.close();
-    });
-    target.on('error', function() {
-        log('target connection error');
-        target.end();
-        client.close();
-    });
-
-    client.on('message', function(msg) {
-        //log('got message: ' + msg);
-        if (client.protocol === 'base64') {
-            target.write(new Buffer(msg, 'base64'));
-        } else {
-            target.write(msg,'binary');
-        }
-    });
-    client.on('close', function(code, reason) {
-        log('WebSocket client disconnected: ' + code + ' [' + reason + ']');
-        target.end();
-    });
-    client.on('error', function(a) {
-        log('WebSocket client error: ' + a);
-        target.end();
-    });
-};
-
-
-// Send an HTTP error response
-http_error = function (response, code, msg) {
-    response.writeHead(code, {"Content-Type": "text/plain"});
-    response.write(msg + "\n");
-    response.end();
-    return;
-}
-
-// Process an HTTP static file request
-http_request = function (request, response) {
-//    console.log("pathname: " + url.parse(req.url).pathname);
-//    res.writeHead(200, {'Content-Type': 'text/plain'});
-//    res.end('okay');
-
-    if (! argv.web) {
-        return http_error(response, 403, "403 Permission Denied");
-    }
-
-    var uri = url.parse(request.url).pathname
-        , filename = path.join(argv.web, uri);
-    
-    fs.exists(filename, function(exists) {
-        if(!exists) {
-            return http_error(response, 404, "404 Not Found");
-        }
-
-        if (fs.statSync(filename).isDirectory()) {
-            filename += '/index.html';
-        }
-
-        fs.readFile(filename, "binary", function(err, file) {
-            if(err) {
-                return http_error(response, 500, err);
-            }
-
-            response.writeHead(200);
-            response.write(file, "binary");
-            response.end();
-        });
-    });
-};
-
-// Select 'binary' or 'base64' subprotocol, preferring 'binary'
-selectProtocol = function(protocols, callback) {
-    if (protocols.indexOf('binary') >= 0) {
-        callback(true, 'binary');
-    } else if (protocols.indexOf('base64') >= 0) {
-        callback(true, 'base64');
-    } else {
-        console.log("Client must support 'binary' or 'base64' protocol");
-        callback(false);
-    }
-}
-
-// parse source and target arguments into parts
-try {
-    source_arg = argv._[0].toString();
-    target_arg = argv._[1].toString();
-
-    var idx;
-    idx = source_arg.indexOf(":");
-    if (idx >= 0) {
-        source_host = source_arg.slice(0, idx);
-        source_port = parseInt(source_arg.slice(idx+1), 10);
-    } else {
-        source_host = "";
-        source_port = parseInt(source_arg, 10);
-    }
-
-    idx = target_arg.indexOf(":");
-    if (idx < 0) {
-        throw("target must be host:port");
-    }
-    target_host = target_arg.slice(0, idx);
-    target_port = parseInt(target_arg.slice(idx+1), 10);
-
-    if (isNaN(source_port) || isNaN(target_port)) {
-        throw("illegal port");
-    }
-} catch(e) {
-    console.error("websockify.js [--web web_dir] [--cert cert.pem [--key key.pem]] [source_addr:]source_port target_addr:target_port");
-    process.exit(2);
-}
-
-console.log("WebSocket settings: ");
-console.log("    - proxying from " + source_host + ":" + source_port +
-            " to " + target_host + ":" + target_port);
-if (argv.web) {
-    console.log("    - Web server active. Serving: " + argv.web);
-}
-
-if (argv.cert) {
-    argv.key = argv.key || argv.cert;
-    var cert = fs.readFileSync(argv.cert),
-        key = fs.readFileSync(argv.key);
-    console.log("    - Running in encrypted HTTPS (wss://) mode using: " + argv.cert + ", " + argv.key);
-    webServer = https.createServer({cert: cert, key: key}, http_request);
-} else {
-    console.log("    - Running in unencrypted HTTP (ws://) mode");
-    webServer = http.createServer(http_request);
-}
-webServer.listen(source_port, function() {
-    wsServer = new WebSocketServer({server: webServer,
-                                    handleProtocols: selectProtocol});
-    wsServer.on('connection', new_client);
-});
-
-// Attach Flash policyfile answer service
-policyfile.createServer().listen(-1, webServer);

other/launch.sh

@@ -1,118 +0,0 @@
-#!/usr/bin/env bash
-
-usage() {
-    if [ "$*" ]; then
-        echo "$*"
-        echo
-    fi
-    echo "Usage: ${NAME} [--listen PORT] [--vnc VNC_HOST:PORT] [--cert CERT]"
-    echo
-    echo "Starts the WebSockets proxy and a mini-webserver and "
-    echo "provides a cut-and-paste URL to go to."
-    echo 
-    echo "    --listen PORT         Port for proxy/webserver to listen on"
-    echo "                          Default: 6080"
-    echo "    --vnc VNC_HOST:PORT   VNC server host:port proxy target"
-    echo "                          Default: localhost:5900"
-    echo "    --cert CERT           Path to combined cert/key file"
-    echo "                          Default: self.pem"
-    echo "    --web WEB             Path to web files (e.g. vnc.html)"
-    echo "                          Default: ./"
-    exit 2
-}
-
-NAME="$(basename $0)"
-HERE="$(cd "$(dirname "$0")" && pwd)"
-PORT="6080"
-VNC_DEST="localhost:5900"
-CERT=""
-WEB=""
-proxy_pid=""
-
-die() {
-    echo "$*"
-    exit 1
-}
-
-cleanup() {
-    trap - TERM QUIT INT EXIT
-    trap "true" CHLD   # Ignore cleanup messages
-    echo
-    if [ -n "${proxy_pid}" ]; then
-        echo "Terminating WebSockets proxy (${proxy_pid})"
-        kill ${proxy_pid}
-    fi
-}
-
-# Process Arguments
-
-# Arguments that only apply to chrooter itself
-while [ "$*" ]; do
-    param=$1; shift; OPTARG=$1
-    case $param in
-    --listen)  PORT="${OPTARG}"; shift            ;;
-    --vnc)     VNC_DEST="${OPTARG}"; shift        ;;
-    --cert)    CERT="${OPTARG}"; shift            ;;
-    --web)     WEB="${OPTARG}"; shift            ;;
-    -h|--help) usage                              ;;
-    -*) usage "Unknown chrooter option: ${param}" ;;
-    *) break                                      ;;
-    esac
-done
-
-# Sanity checks
-which netstat >/dev/null 2>&1 \
-    || die "Must have netstat installed"
-
-netstat -ltn | grep -qs "${PORT} .*LISTEN" \
-    && die "Port ${PORT} in use. Try --listen PORT"
-
-trap "cleanup" TERM QUIT INT EXIT
-
-# Find vnc.html
-if [ -n "${WEB}" ]; then
-    if [ ! -e "${WEB}/vnc.html" ]; then
-        die "Could not find ${WEB}/vnc.html"
-    fi
-elif [ -e "$(pwd)/vnc.html" ]; then
-    WEB=$(pwd)
-elif [ -e "${HERE}/../vnc.html" ]; then
-    WEB=${HERE}/../
-elif [ -e "${HERE}/vnc.html" ]; then
-    WEB=${HERE}
-elif [ -e "${HERE}/../share/novnc/vnc.html" ]; then
-    WEB=${HERE}/../share/novnc/
-else
-    die "Could not find vnc.html"
-fi
-
-# Find self.pem
-if [ -n "${CERT}" ]; then
-    if [ ! -e "${CERT}" ]; then
-        die "Could not find ${CERT}"
-    fi
-elif [ -e "$(pwd)/self.pem" ]; then
-    CERT="$(pwd)/self.pem"
-elif [ -e "${HERE}/../self.pem" ]; then
-    CERT="${HERE}/../self.pem"
-elif [ -e "${HERE}/self.pem" ]; then
-    CERT="${HERE}/self.pem"
-else
-    echo "Warning: could not find self.pem"
-fi
-
-echo "Starting webserver and WebSockets proxy on port ${PORT}"
-${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
-proxy_pid="$!"
-sleep 1
-if ! ps -p ${proxy_pid} >/dev/null; then
-    proxy_pid=
-    echo "Failed to start WebSockets proxy"
-    exit 1
-fi
-
-echo -e "\n\nNavigate to this URL:\n"
-echo -e "    http://$(hostname):${PORT}/vnc.html?host=$(hostname)&port=${PORT}\n"
-echo -e "Press Ctrl-C to exit\n\n"
-
-wait ${proxy_pid}

other/project.clj

@@ -1,13 +0,0 @@
-(defproject websockify "1.0.0-SNAPSHOT"
-  :description "Clojure implementation of Websockify"
-  :url "https://github.com/kanaka/websockify"
-  :dependencies [[org.clojure/clojure "1.2.1"]
-                 [org.clojure/tools.cli "0.2.1"]
-                 [ring/ring-jetty-adapter "1.0.0-beta2"]
-                 [org.eclipse.jetty/jetty-websocket "7.5.4.v20111024"]
-                 [org.eclipse.jetty/jetty-server "7.5.4.v20111024"]
-                 [org.eclipse.jetty/jetty-servlet "7.5.4.v20111024"]
-                 [org.jboss.netty/netty "3.2.5.Final"]]
-  ;:dev-dependencies [[swank-clojure "1.3.0-SNAPSHOT"]]
-  :main websockify
-  )

other/websocket.c

@@ -1,802 +0,0 @@
-/*
- * WebSocket lib with support for "wss://" encryption.
- * Copyright 2010 Joel Martin
- * Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3)
- *
- * You can make a cert/key with openssl using:
- * openssl req -new -x509 -days 365 -nodes -out self.pem -keyout self.pem
- * as taken from http://docs.python.org/dev/library/ssl.html#certificates
- */
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <strings.h>
-#include <sys/types.h> 
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <signal.h> // daemonizing
-#include <fcntl.h>  // daemonizing
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-#include <resolv.h>      /* base64 encode/decode */
-#include <openssl/md5.h> /* md5 hash */
-#include <openssl/sha.h> /* sha1 hash */
-#include "websocket.h"
-
-/*
- * Global state
- *
- *   Warning: not thread safe
- */
-int ssl_initialized = 0;
-int pipe_error = 0;
-settings_t settings;
-
-
-void traffic(char * token) {
-    if ((settings.verbose) && (! settings.daemon)) {
-        fprintf(stdout, "%s", token);
-        fflush(stdout);
-    }
-}
-
-void error(char *msg)
-{
-    perror(msg);
-}
-
-void fatal(char *msg)
-{
-    perror(msg);
-    exit(1);
-}
-
-/* resolve host with also IP address parsing */ 
-int resolve_host(struct in_addr *sin_addr, const char *hostname) 
-{ 
-    if (!inet_aton(hostname, sin_addr)) { 
-        struct addrinfo *ai, *cur; 
-        struct addrinfo hints; 
-        memset(&hints, 0, sizeof(hints)); 
-        hints.ai_family = AF_INET; 
-        if (getaddrinfo(hostname, NULL, &hints, &ai)) 
-            return -1; 
-        for (cur = ai; cur; cur = cur->ai_next) { 
-            if (cur->ai_family == AF_INET) { 
-                *sin_addr = ((struct sockaddr_in *)cur->ai_addr)->sin_addr; 
-                freeaddrinfo(ai); 
-                return 0; 
-            } 
-        } 
-        freeaddrinfo(ai); 
-        return -1; 
-    } 
-    return 0; 
-} 
-
-
-/*
- * SSL Wrapper Code
- */
-
-ssize_t ws_recv(ws_ctx_t *ctx, void *buf, size_t len) {
-    if (ctx->ssl) {
-        //handler_msg("SSL recv\n");
-        return SSL_read(ctx->ssl, buf, len);
-    } else {
-        return recv(ctx->sockfd, buf, len, 0);
-    }
-}
-
-ssize_t ws_send(ws_ctx_t *ctx, const void *buf, size_t len) {
-    if (ctx->ssl) {
-        //handler_msg("SSL send\n");
-        return SSL_write(ctx->ssl, buf, len);
-    } else {
-        return send(ctx->sockfd, buf, len, 0);
-    }
-}
-
-ws_ctx_t *alloc_ws_ctx() {
-    ws_ctx_t *ctx;
-    if (! (ctx = malloc(sizeof(ws_ctx_t))) )
-        { fatal("malloc()"); }
-
-    if (! (ctx->cin_buf = malloc(BUFSIZE)) )
-        { fatal("malloc of cin_buf"); }
-    if (! (ctx->cout_buf = malloc(BUFSIZE)) )
-        { fatal("malloc of cout_buf"); }
-    if (! (ctx->tin_buf = malloc(BUFSIZE)) )
-        { fatal("malloc of tin_buf"); }
-    if (! (ctx->tout_buf = malloc(BUFSIZE)) )
-        { fatal("malloc of tout_buf"); }
-
-    ctx->headers = malloc(sizeof(headers_t));
-    ctx->ssl = NULL;
-    ctx->ssl_ctx = NULL;
-    return ctx;
-}
-
-int free_ws_ctx(ws_ctx_t *ctx) {
-    free(ctx->cin_buf);
-    free(ctx->cout_buf);
-    free(ctx->tin_buf);
-    free(ctx->tout_buf);
-    free(ctx);
-}
-
-ws_ctx_t *ws_socket(ws_ctx_t *ctx, int socket) {
-    ctx->sockfd = socket;
-}
-
-ws_ctx_t *ws_socket_ssl(ws_ctx_t *ctx, int socket, char * certfile, char * keyfile) {
-    int ret;
-    char msg[1024];
-    char * use_keyfile;
-    ws_socket(ctx, socket);
-
-    if (keyfile && (keyfile[0] != '\0')) {
-        // Separate key file
-        use_keyfile = keyfile;
-    } else {
-        // Combined key and cert file
-        use_keyfile = certfile;
-    }
-
-    // Initialize the library
-    if (! ssl_initialized) {
-        SSL_library_init();
-        OpenSSL_add_all_algorithms();
-        SSL_load_error_strings();
-        ssl_initialized = 1;
-
-    }
-
-    ctx->ssl_ctx = SSL_CTX_new(TLSv1_server_method());
-    if (ctx->ssl_ctx == NULL) {
-        ERR_print_errors_fp(stderr);
-        fatal("Failed to configure SSL context");
-    }
-
-    if (SSL_CTX_use_PrivateKey_file(ctx->ssl_ctx, use_keyfile,
-                                    SSL_FILETYPE_PEM) <= 0) {
-        sprintf(msg, "Unable to load private key file %s\n", use_keyfile);
-        fatal(msg);
-    }
-
-    if (SSL_CTX_use_certificate_file(ctx->ssl_ctx, certfile,
-                                     SSL_FILETYPE_PEM) <= 0) {
-        sprintf(msg, "Unable to load certificate file %s\n", certfile);
-        fatal(msg);
-    }
-
-//    if (SSL_CTX_set_cipher_list(ctx->ssl_ctx, "DEFAULT") != 1) {
-//        sprintf(msg, "Unable to set cipher\n");
-//        fatal(msg);
-//    }
-
-    // Associate socket and ssl object
-    ctx->ssl = SSL_new(ctx->ssl_ctx);
-    SSL_set_fd(ctx->ssl, socket);
-
-    ret = SSL_accept(ctx->ssl);
-    if (ret < 0) {
-        ERR_print_errors_fp(stderr);
-        return NULL;
-    }
-
-    return ctx;
-}
-
-int ws_socket_free(ws_ctx_t *ctx) {
-    if (ctx->ssl) {
-        SSL_free(ctx->ssl);
-        ctx->ssl = NULL;
-    }
-    if (ctx->ssl_ctx) {
-        SSL_CTX_free(ctx->ssl_ctx);
-        ctx->ssl_ctx = NULL;
-    }
-    if (ctx->sockfd) {
-        shutdown(ctx->sockfd, SHUT_RDWR);
-        close(ctx->sockfd);
-        ctx->sockfd = 0;
-    }
-}
-
-/* ------------------------------------------------------- */
-
-
-int encode_hixie(u_char const *src, size_t srclength,
-                 char *target, size_t targsize) {
-    int sz = 0, len = 0;
-    target[sz++] = '\x00';
-    len = b64_ntop(src, srclength, target+sz, targsize-sz);
-    if (len < 0) {
-        return len;
-    }
-    sz += len;
-    target[sz++] = '\xff';
-    return sz;
-}
-
-int decode_hixie(char *src, size_t srclength,
-                 u_char *target, size_t targsize,
-                 unsigned int *opcode, unsigned int *left) {
-    char *start, *end, cntstr[4];
-    int i, len, framecount = 0, retlen = 0;
-    unsigned char chr;
-    if ((src[0] != '\x00') || (src[srclength-1] != '\xff')) {
-        handler_emsg("WebSocket framing error\n");
-        return -1;
-    }
-    *left = srclength;
-
-    if (srclength == 2 &&
-        (src[0] == '\xff') && 
-        (src[1] == '\x00')) {
-        // client sent orderly close frame
-        *opcode = 0x8; // Close frame
-        return 0;
-    }
-    *opcode = 0x1; // Text frame
-
-    start = src+1; // Skip '\x00' start
-    do {
-        /* We may have more than one frame */
-        end = (char *)memchr(start, '\xff', srclength);
-        *end = '\x00';
-        len = b64_pton(start, target+retlen, targsize-retlen);
-        if (len < 0) {
-            return len;
-        }
-        retlen += len;
-        start = end + 2; // Skip '\xff' end and '\x00' start 
-        framecount++;
-    } while (end < (src+srclength-1));
-    if (framecount > 1) {
-        snprintf(cntstr, 3, "%d", framecount);
-        traffic(cntstr);
-    }
-    *left = 0;
-    return retlen;
-}
-
-int encode_hybi(u_char const *src, size_t srclength,
-                char *target, size_t targsize, unsigned int opcode)
-{
-    unsigned long long b64_sz, len_offset = 1, payload_offset = 2, len = 0;
-    
-    if ((int)srclength <= 0)
-    {
-        return 0;
-    }
-
-    b64_sz = ((srclength - 1) / 3) * 4 + 4;
-
-    target[0] = (char)(opcode & 0x0F | 0x80);
-
-    if (b64_sz <= 125) {
-        target[1] = (char) b64_sz;
-        payload_offset = 2;
-    } else if ((b64_sz > 125) && (b64_sz < 65536)) {
-        target[1] = (char) 126;
-        *(u_short*)&(target[2]) = htons(b64_sz);
-        payload_offset = 4;
-    } else {
-        handler_emsg("Sending frames larger than 65535 bytes not supported\n");
-        return -1;
-        //target[1] = (char) 127;
-        //*(u_long*)&(target[2]) = htonl(b64_sz);
-        //payload_offset = 10;
-    }
-
-    len = b64_ntop(src, srclength, target+payload_offset, targsize-payload_offset);
-    
-    if (len < 0) {
-        return len;
-    }
-
-    return len + payload_offset;
-}
-
-int decode_hybi(unsigned char *src, size_t srclength,
-                u_char *target, size_t targsize,
-                unsigned int *opcode, unsigned int *left)
-{
-    unsigned char *frame, *mask, *payload, save_char, cntstr[4];;
-    int masked = 0;
-    int i = 0, len, framecount = 0;
-    size_t remaining;
-    unsigned int target_offset = 0, hdr_length = 0, payload_length = 0;
-    
-    *left = srclength;
-    frame = src;
-
-    //printf("Deocde new frame\n");
-    while (1) {
-        // Need at least two bytes of the header
-        // Find beginning of next frame. First time hdr_length, masked and
-        // payload_length are zero
-        frame += hdr_length + 4*masked + payload_length;
-        //printf("frame[0..3]: 0x%x 0x%x 0x%x 0x%x (tot: %d)\n",
-        //       (unsigned char) frame[0],
-        //       (unsigned char) frame[1],
-        //       (unsigned char) frame[2],
-        //       (unsigned char) frame[3], srclength);
-
-        if (frame > src + srclength) {
-            //printf("Truncated frame from client, need %d more bytes\n", frame - (src + srclength) );
-            break;
-        }
-        remaining = (src + srclength) - frame;
-        if (remaining < 2) {
-            //printf("Truncated frame header from client\n");
-            break;
-        }
-        framecount ++;
-
-        *opcode = frame[0] & 0x0f;
-        masked = (frame[1] & 0x80) >> 7;
-
-        if (*opcode == 0x8) {
-            // client sent orderly close frame
-            break;
-        }
-
-        payload_length = frame[1] & 0x7f;
-        if (payload_length < 126) {
-            hdr_length = 2;
-            //frame += 2 * sizeof(char);
-        } else if (payload_length == 126) {
-            payload_length = (frame[2] << 8) + frame[3];
-            hdr_length = 4;
-        } else {
-            handler_emsg("Receiving frames larger than 65535 bytes not supported\n");
-            return -1;
-        }
-        if ((hdr_length + 4*masked + payload_length) > remaining) {
-            continue;
-        }
-        //printf("    payload_length: %u, raw remaining: %u\n", payload_length, remaining);
-        payload = frame + hdr_length + 4*masked;
-
-        if (*opcode != 1 && *opcode != 2) {
-            handler_msg("Ignoring non-data frame, opcode 0x%x\n", *opcode);
-            continue;
-        }
-
-        if (payload_length == 0) {
-            handler_msg("Ignoring empty frame\n");
-            continue;
-        }
-
-        if ((payload_length > 0) && (!masked)) {
-            handler_emsg("Received unmasked payload from client\n");
-            return -1;
-        }
-
-        // Terminate with a null for base64 decode
-        save_char = payload[payload_length];
-        payload[payload_length] = '\0';
-
-        // unmask the data
-        mask = payload - 4;
-        for (i = 0; i < payload_length; i++) {
-            payload[i] ^= mask[i%4];
-        }
-
-        // base64 decode the data
-        len = b64_pton((const char*)payload, target+target_offset, targsize);
-
-        // Restore the first character of the next frame
-        payload[payload_length] = save_char;
-        if (len < 0) {
-            handler_emsg("Base64 decode error code %d", len);
-            return len;
-        }
-        target_offset += len;
-
-        //printf("    len %d, raw %s\n", len, frame);
-    }
-
-    if (framecount > 1) {
-        snprintf(cntstr, 3, "%d", framecount);
-        traffic(cntstr);
-    }
-    
-    *left = remaining;
-    return target_offset;
-}
-
-
-
-int parse_handshake(ws_ctx_t *ws_ctx, char *handshake) {
-    char *start, *end;
-    headers_t *headers = ws_ctx->headers;
-
-    headers->key1[0] = '\0';
-    headers->key2[0] = '\0';
-    headers->key3[0] = '\0';
-    
-    if ((strlen(handshake) < 92) || (bcmp(handshake, "GET ", 4) != 0)) {
-        return 0;
-    }
-    start = handshake+4;
-    end = strstr(start, " HTTP/1.1");
-    if (!end) { return 0; }
-    strncpy(headers->path, start, end-start);
-    headers->path[end-start] = '\0';
-
-    start = strstr(handshake, "\r\nHost: ");
-    if (!start) { return 0; }
-    start += 8;
-    end = strstr(start, "\r\n");
-    strncpy(headers->host, start, end-start);
-    headers->host[end-start] = '\0';
-
-    headers->origin[0] = '\0';
-    start = strstr(handshake, "\r\nOrigin: ");
-    if (start) {
-        start += 10;
-    } else {
-        start = strstr(handshake, "\r\nSec-WebSocket-Origin: ");
-        if (!start) { return 0; }
-        start += 24;
-    }
-    end = strstr(start, "\r\n");
-    strncpy(headers->origin, start, end-start);
-    headers->origin[end-start] = '\0';
-   
-    start = strstr(handshake, "\r\nSec-WebSocket-Version: ");
-    if (start) {
-        // HyBi/RFC 6455
-        start += 25;
-        end = strstr(start, "\r\n");
-        strncpy(headers->version, start, end-start);
-        headers->version[end-start] = '\0';
-        ws_ctx->hixie = 0;
-        ws_ctx->hybi = strtol(headers->version, NULL, 10);
-
-        start = strstr(handshake, "\r\nSec-WebSocket-Key: ");
-        if (!start) { return 0; }
-        start += 21;
-        end = strstr(start, "\r\n");
-        strncpy(headers->key1, start, end-start);
-        headers->key1[end-start] = '\0';
-   
-        start = strstr(handshake, "\r\nConnection: ");
-        if (!start) { return 0; }
-        start += 14;
-        end = strstr(start, "\r\n");
-        strncpy(headers->connection, start, end-start);
-        headers->connection[end-start] = '\0';
-   
-        start = strstr(handshake, "\r\nSec-WebSocket-Protocol: ");
-        if (!start) { return 0; }
-        start += 26;
-        end = strstr(start, "\r\n");
-        strncpy(headers->protocols, start, end-start);
-        headers->protocols[end-start] = '\0';
-    } else {
-        // Hixie 75 or 76
-        ws_ctx->hybi = 0;
-
-        start = strstr(handshake, "\r\n\r\n");
-        if (!start) { return 0; }
-        start += 4;
-        if (strlen(start) == 8) {
-            ws_ctx->hixie = 76;
-            strncpy(headers->key3, start, 8);
-            headers->key3[8] = '\0';
-
-            start = strstr(handshake, "\r\nSec-WebSocket-Key1: ");
-            if (!start) { return 0; }
-            start += 22;
-            end = strstr(start, "\r\n");
-            strncpy(headers->key1, start, end-start);
-            headers->key1[end-start] = '\0';
-        
-            start = strstr(handshake, "\r\nSec-WebSocket-Key2: ");
-            if (!start) { return 0; }
-            start += 22;
-            end = strstr(start, "\r\n");
-            strncpy(headers->key2, start, end-start);
-            headers->key2[end-start] = '\0';
-        } else {
-            ws_ctx->hixie = 75;
-        }
-
-    }
-
-    return 1;
-}
-
-int parse_hixie76_key(char * key) {
-    unsigned long i, spaces = 0, num = 0;
-    for (i=0; i < strlen(key); i++) {
-        if (key[i] == ' ') {
-            spaces += 1;
-        }
-        if ((key[i] >= 48) && (key[i] <= 57)) {
-            num = num * 10 + (key[i] - 48);
-        }
-    }
-    return num / spaces;
-}
-
-int gen_md5(headers_t *headers, char *target) {
-    unsigned long key1 = parse_hixie76_key(headers->key1);
-    unsigned long key2 = parse_hixie76_key(headers->key2);
-    char *key3 = headers->key3;
-
-    MD5_CTX c;
-    char in[HIXIE_MD5_DIGEST_LENGTH] = {
-        key1 >> 24, key1 >> 16, key1 >> 8, key1,
-        key2 >> 24, key2 >> 16, key2 >> 8, key2,
-        key3[0], key3[1], key3[2], key3[3],
-        key3[4], key3[5], key3[6], key3[7]
-    };
-
-    MD5_Init(&c);
-    MD5_Update(&c, (void *)in, sizeof in);
-    MD5_Final((void *)target, &c);
-
-    target[HIXIE_MD5_DIGEST_LENGTH] = '\0';
-
-    return 1;
-}
-
-static void gen_sha1(headers_t *headers, char *target) {
-    SHA_CTX c;
-    unsigned char hash[SHA_DIGEST_LENGTH];
-    int r;
-
-    SHA1_Init(&c);
-    SHA1_Update(&c, headers->key1, strlen(headers->key1));
-    SHA1_Update(&c, HYBI_GUID, 36);
-    SHA1_Final(hash, &c);
-
-    r = b64_ntop(hash, sizeof hash, target, HYBI10_ACCEPTHDRLEN);
-    //assert(r == HYBI10_ACCEPTHDRLEN - 1);
-}
-
-
-ws_ctx_t *do_handshake(int sock) {
-    char handshake[4096], response[4096], sha1[29], trailer[17];
-    char *scheme, *pre;
-    headers_t *headers;
-    int len, ret, i, offset;
-    ws_ctx_t * ws_ctx;
-
-    // Peek, but don't read the data
-    len = recv(sock, handshake, 1024, MSG_PEEK);
-    handshake[len] = 0;
-    if (len == 0) {
-        handler_msg("ignoring empty handshake\n");
-        return NULL;
-    } else if (bcmp(handshake, "<policy-file-request/>", 22) == 0) {
-        len = recv(sock, handshake, 1024, 0);
-        handshake[len] = 0;
-        handler_msg("sending flash policy response\n");
-        send(sock, POLICY_RESPONSE, sizeof(POLICY_RESPONSE), 0);
-        return NULL;
-    } else if ((bcmp(handshake, "\x16", 1) == 0) ||
-               (bcmp(handshake, "\x80", 1) == 0)) {
-        // SSL
-        if (!settings.cert) {
-            handler_msg("SSL connection but no cert specified\n");
-            return NULL;
-        } else if (access(settings.cert, R_OK) != 0) {
-            handler_msg("SSL connection but '%s' not found\n",
-                        settings.cert);
-            return NULL;
-        }
-        ws_ctx = alloc_ws_ctx();
-        ws_socket_ssl(ws_ctx, sock, settings.cert, settings.key);
-        if (! ws_ctx) { return NULL; }
-        scheme = "wss";
-        handler_msg("using SSL socket\n");
-    } else if (settings.ssl_only) {
-        handler_msg("non-SSL connection disallowed\n");
-        return NULL;
-    } else {
-        ws_ctx = alloc_ws_ctx();
-        ws_socket(ws_ctx, sock);
-        if (! ws_ctx) { return NULL; }
-        scheme = "ws";
-        handler_msg("using plain (not SSL) socket\n");
-    }
-    offset = 0;
-    for (i = 0; i < 10; i++) {
-        len = ws_recv(ws_ctx, handshake+offset, 4096);
-        if (len == 0) {
-            handler_emsg("Client closed during handshake\n");
-            return NULL;
-        }
-        offset += len;
-        handshake[offset] = 0;
-        if (strstr(handshake, "\r\n\r\n")) {
-            break;
-        }
-        usleep(10);
-    }
-
-    //handler_msg("handshake: %s\n", handshake);
-    if (!parse_handshake(ws_ctx, handshake)) {
-        handler_emsg("Invalid WS request\n");
-        return NULL;
-    }
-
-    headers = ws_ctx->headers;
-    if (ws_ctx->hybi > 0) {
-        handler_msg("using protocol HyBi/IETF 6455 %d\n", ws_ctx->hybi);
-        gen_sha1(headers, sha1);
-        sprintf(response, SERVER_HANDSHAKE_HYBI, sha1, "base64");
-    } else {
-        if (ws_ctx->hixie == 76) {
-            handler_msg("using protocol Hixie 76\n");
-            gen_md5(headers, trailer);
-            pre = "Sec-";
-        } else {
-            handler_msg("using protocol Hixie 75\n");
-            trailer[0] = '\0';
-            pre = "";
-        }
-        sprintf(response, SERVER_HANDSHAKE_HIXIE, pre, headers->origin, pre, scheme,
-                headers->host, headers->path, pre, "base64", trailer);
-    }
-    
-    //handler_msg("response: %s\n", response);
-    ws_send(ws_ctx, response, strlen(response));
-
-    return ws_ctx;
-}
-
-void signal_handler(sig) {
-    switch (sig) {
-        case SIGHUP: break; // ignore for now
-        case SIGPIPE: pipe_error = 1; break; // handle inline
-        case SIGTERM: exit(0); break;
-    }
-}
-
-void daemonize(int keepfd) {
-    int pid, i;
-
-    umask(0);
-    chdir("/");
-    setgid(getgid());
-    setuid(getuid());
-
-    /* Double fork to daemonize */
-    pid = fork();
-    if (pid<0) { fatal("fork error"); }
-    if (pid>0) { exit(0); }  // parent exits
-    setsid();                // Obtain new process group
-    pid = fork();
-    if (pid<0) { fatal("fork error"); }
-    if (pid>0) { exit(0); }  // parent exits
-
-    /* Signal handling */
-    signal(SIGHUP, signal_handler);   // catch HUP
-    signal(SIGTERM, signal_handler);  // catch kill
-
-    /* Close open files */
-    for (i=getdtablesize(); i>=0; --i) {
-        if (i != keepfd) {
-            close(i);
-        } else if (settings.verbose) {
-            printf("keeping fd %d\n", keepfd);
-        }
-    }
-    i=open("/dev/null", O_RDWR);  // Redirect stdin
-    dup(i);                       // Redirect stdout
-    dup(i);                       // Redirect stderr
-}
-
-
-void start_server() {
-    int lsock, csock, pid, clilen, sopt = 1, i;
-    struct sockaddr_in serv_addr, cli_addr;
-    ws_ctx_t *ws_ctx;
-
-
-    /* Initialize buffers */
-    lsock = socket(AF_INET, SOCK_STREAM, 0);
-    if (lsock < 0) { error("ERROR creating listener socket"); }
-    bzero((char *) &serv_addr, sizeof(serv_addr));
-    serv_addr.sin_family = AF_INET;
-    serv_addr.sin_port = htons(settings.listen_port);
-
-    /* Resolve listen address */
-    if (settings.listen_host && (settings.listen_host[0] != '\0')) {
-        if (resolve_host(&serv_addr.sin_addr, settings.listen_host) < -1) {
-            fatal("Could not resolve listen address");
-        }
-    } else {
-        serv_addr.sin_addr.s_addr = INADDR_ANY;
-    }
-
-    setsockopt(lsock, SOL_SOCKET, SO_REUSEADDR, (char *)&sopt, sizeof(sopt));
-    if (bind(lsock, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
-        fatal("ERROR on binding listener socket");
-    }
-    listen(lsock,100);
-
-    signal(SIGPIPE, signal_handler);  // catch pipe
-
-    if (settings.daemon) {
-        daemonize(lsock);
-    }
-
-
-    // Reep zombies
-    signal(SIGCHLD, SIG_IGN);
-
-    printf("Waiting for connections on %s:%d\n",
-            settings.listen_host, settings.listen_port);
-
-    while (1) {
-        clilen = sizeof(cli_addr);
-        pipe_error = 0;
-        pid = 0;
-        csock = accept(lsock, 
-                       (struct sockaddr *) &cli_addr, 
-                       &clilen);
-        if (csock < 0) {
-            error("ERROR on accept");
-            continue;
-        }
-        handler_msg("got client connection from %s\n",
-                    inet_ntoa(cli_addr.sin_addr));
-
-        if (!settings.run_once) {
-            handler_msg("forking handler process\n");
-            pid = fork();
-        }
-
-        if (pid == 0) {  // handler process
-            ws_ctx = do_handshake(csock);
-            if (settings.run_once) {
-                if (ws_ctx == NULL) {
-                    // Not a real WebSocket connection
-                    continue;
-                } else {
-                    // Successful connection, stop listening for new
-                    // connections
-                    close(lsock);
-                }
-            }
-            if (ws_ctx == NULL) {
-                handler_msg("No connection after handshake\n");
-                break;   // Child process exits
-            }
-
-            settings.handler(ws_ctx);
-            if (pipe_error) {
-                handler_emsg("Closing due to SIGPIPE\n");
-            }
-            break;   // Child process exits
-        } else {         // parent process
-            settings.handler_id += 1;
-        }
-    }
-    if (pid == 0) {
-        if (ws_ctx) {
-            ws_socket_free(ws_ctx);
-            free_ws_ctx(ws_ctx);
-        } else {
-            shutdown(csock, SHUT_RDWR);
-            close(csock);
-        }
-        handler_msg("handler exit\n");
-    } else {
-        handler_msg("websockify exit\n");
-    }
-
-}
-

other/websocket.h

@@ -1,84 +0,0 @@
-#include <openssl/ssl.h>
-
-#define BUFSIZE 65536
-#define DBUFSIZE (BUFSIZE * 3) / 4 - 20
-
-#define SERVER_HANDSHAKE_HIXIE "HTTP/1.1 101 Web Socket Protocol Handshake\r\n\
-Upgrade: WebSocket\r\n\
-Connection: Upgrade\r\n\
-%sWebSocket-Origin: %s\r\n\
-%sWebSocket-Location: %s://%s%s\r\n\
-%sWebSocket-Protocol: %s\r\n\
-\r\n%s"
-
-#define SERVER_HANDSHAKE_HYBI "HTTP/1.1 101 Switching Protocols\r\n\
-Upgrade: websocket\r\n\
-Connection: Upgrade\r\n\
-Sec-WebSocket-Accept: %s\r\n\
-Sec-WebSocket-Protocol: %s\r\n\
-\r\n"
-
-#define HYBI_GUID "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
-
-#define HYBI10_ACCEPTHDRLEN 29
-
-#define HIXIE_MD5_DIGEST_LENGTH 16
-
-#define POLICY_RESPONSE "<cross-domain-policy><allow-access-from domain=\"*\" to-ports=\"*\" /></cross-domain-policy>\n"
-
-typedef struct {
-    char path[1024+1];
-    char host[1024+1];
-    char origin[1024+1];
-    char version[1024+1];
-    char connection[1024+1];
-    char protocols[1024+1];
-    char key1[1024+1];
-    char key2[1024+1];
-    char key3[8+1];
-} headers_t;
-
-typedef struct {
-    int        sockfd;
-    SSL_CTX   *ssl_ctx;
-    SSL       *ssl;
-    int        hixie;
-    int        hybi;
-    headers_t *headers;
-    char      *cin_buf;
-    char      *cout_buf;
-    char      *tin_buf;
-    char      *tout_buf;
-} ws_ctx_t;
-
-typedef struct {
-    int verbose;
-    char listen_host[256];
-    int listen_port;
-    void (*handler)(ws_ctx_t*);
-    int handler_id;
-    char *cert;
-    char *key;
-    int ssl_only;
-    int daemon;
-    int run_once;
-} settings_t;
-
-
-ssize_t ws_recv(ws_ctx_t *ctx, void *buf, size_t len);
-
-ssize_t ws_send(ws_ctx_t *ctx, const void *buf, size_t len);
-
-/* base64.c declarations */
-//int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize);
-//int b64_pton(char const *src, u_char *target, size_t targsize);
-
-#define gen_handler_msg(stream, ...) \
-    if (! settings.daemon) { \
-        fprintf(stream, "  %d: ", settings.handler_id); \
-        fprintf(stream, __VA_ARGS__); \
-    }
-
-#define handler_msg(...) gen_handler_msg(stdout, __VA_ARGS__);
-#define handler_emsg(...) gen_handler_msg(stderr, __VA_ARGS__);
-

other/websocket.rb

@@ -1,493 +0,0 @@
-
-# Python WebSocket library with support for "wss://" encryption.
-# Copyright 2011 Joel Martin
-# Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3)
-# 
-# Supports following protocol versions:
-#     - http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-75
-#     - http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76
-#     - http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10
-
-require 'gserver'
-require 'openssl'
-require 'stringio'
-require 'digest/md5'
-require 'digest/sha1'
-require 'base64'
-
-unless OpenSSL::SSL::SSLSocket.instance_methods.index("read_nonblock")
-  module OpenSSL
-    module SSL
-      class SSLSocket
-        alias :read_nonblock :readpartial
-      end
-    end
-  end
-end
-
-class EClose < Exception
-end
-
-class WebSocketServer < GServer
-  @@Buffer_size = 65536
-
-  #
-  # WebSocket constants
-  #
-  @@Server_handshake_hixie = "HTTP/1.1 101 Web Socket Protocol Handshake\r
-Upgrade: WebSocket\r
-Connection: Upgrade\r
-%sWebSocket-Origin: %s\r
-%sWebSocket-Location: %s://%s%s\r
-"
-
-  @@Server_handshake_hybi = "HTTP/1.1 101 Switching Protocols\r
-Upgrade: websocket\r
-Connection: Upgrade\r
-Sec-WebSocket-Accept: %s\r
-"
-  @@GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
-
-
-  def initialize(opts)
-    vmsg "in WebSocketServer.initialize"
-    port = opts['listen_port']
-    host = opts['listen_host'] || GServer::DEFAULT_HOST
-
-    super(port, host)
-    msg opts.inspect
-    if opts['server_cert']
-      msg "creating ssl context"
-      @sslContext = OpenSSL::SSL::SSLContext.new
-      @sslContext.cert = OpenSSL::X509::Certificate.new(File.open(opts['server_cert']))
-      @sslContext.key = OpenSSL::PKey::RSA.new(File.open(opts['server_key']))
-      @sslContext.ca_file = opts['server_cert']
-      @sslContext.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      @sslContext.verify_depth = 0
-    end
-
-    @@client_id = 0  # Track client number total on class
-
-    @verbose = opts['verbose']
-    @opts = opts
-  end
-  
-  def serve(io)
-    @@client_id += 1
-    msg self.inspect
-    if @sslContext
-      msg "Enabling SSL context"
-      ssl = OpenSSL::SSL::SSLSocket.new(io, @sslContext)
-      #ssl.sync_close = true
-      #ssl.sync = true
-      msg "SSL accepting"
-      ssl.accept
-      io = ssl # replace the unencrypted handle with the encrypted one
-    end
-    
-    msg "initializing thread"
-
-    # Initialize per thread state
-    t = Thread.current
-    t[:my_client_id] = @@client_id
-    t[:send_parts] = []
-    t[:recv_part] = nil
-    t[:base64] = nil
-
-    puts "in serve, client: #{t[:my_client_id].inspect}"
-
-    begin
-      t[:client] = do_handshake(io)
-      new_websocket_client(t[:client])
-    rescue EClose => e
-      msg "Client closed: #{e.message}"
-      return
-    rescue Exception => e
-      msg "Uncaught exception: #{e.message}"
-      msg "Trace: #{e.backtrace}"
-      return
-    end
-
-    msg "Client disconnected"
-  end
-
-  #
-  # WebSocketServer logging/output functions
-  #
-  def traffic(token)
-    if @verbose then print token; STDOUT.flush; end
-  end
-
-  def msg(m)
-    printf("% 3d: %s\n", Thread.current[:my_client_id] || 0, m)
-  end
-
-  def vmsg(m)
-    if @verbose then msg(m) end
-  end
-
-  #
-  # WebSocketServer general support routines
-  #
-  def gen_md5(h)
-    key1 = h['sec-websocket-key1']
-    key2 = h['sec-websocket-key2']
-    key3 = h['key3']
-    spaces1 = key1.count(" ")
-    spaces2 = key2.count(" ")
-    num1 = key1.scan(/[0-9]/).join('').to_i / spaces1
-    num2 = key2.scan(/[0-9]/).join('').to_i / spaces2
-
-    return Digest::MD5.digest([num1, num2, key3].pack('NNa8'))
-  end
-
-  def unmask(buf, hlen, length)
-    pstart = hlen + 4
-    mask = buf[hlen...hlen+4].each_byte.map{|b|b}
-    data = buf[pstart...pstart+length]
-    #data = data.bytes.zip(mask.bytes.cycle(length)).map { |d,m| d^m }
-    i=-1
-    data = data.each_byte.map{|b| i+=1; (b ^ mask[i % 4]).chr}.join("")
-    return data
-  end
-
-  def encode_hybi(buf, opcode, base64=false)
-    if base64
-      buf = Base64.encode64(buf).gsub(/\n/, '')
-    end
-
-    b1 = 0x80 | (opcode & 0x0f) # FIN + opcode
-    payload_len = buf.length
-    if payload_len <= 125
-      header = [b1, payload_len].pack('CC')
-    elsif payload_len > 125 && payload_len < 65536
-      header = [b1, 126, payload_len].pack('CCn')
-    elsif payload_len >= 65536
-      header = [b1, 127, payload_len >> 32,
-                         payload_len & 0xffffffff].pack('CCNN')
-    end
-
-    return [header + buf, header.length, 0]
-  end
-
-  def decode_hybi(buf, base64=false)
-    f = {'fin'          => 0,
-         'opcode'       => 0,
-         'hlen'         => 2,
-         'length'       => 0,
-         'payload'      => nil,
-         'left'         => 0,
-         'close_code'   => nil,
-         'close_reason' => nil}
-
-    blen = buf.length
-    f['left'] = blen
-
-    if blen < f['hlen'] then return f end # incomplete frame
-
-    b1, b2 = buf.unpack('CC')
-    f['opcode'] = b1 & 0x0f
-    f['fin']    = (b1 & 0x80) >> 7
-    has_mask    = (b2 & 0x80) >> 7
-
-    f['length'] = b2 & 0x7f
-
-    if f['length'] == 126
-      f['hlen'] = 4
-      if blen < f['hlen'] then return f end # incomplete frame
-      f['length'] = buf.unpack('xxn')[0]
-    elsif f['length'] == 127
-      f['hlen'] = 10
-      if blen < f['hlen'] then return f end # incomplete frame
-      top, bottom = buf.unpack('xxNN')
-      f['length'] = (top << 32) & bottom
-    end
-
-    full_len = f['hlen'] + has_mask * 4 + f['length']
-
-    if blen < full_len then return f end # incomplete frame
-
-    # number of bytes that are part of the next frame(s)
-    f['left'] = blen - full_len
-
-    if has_mask > 0
-      f['payload'] = unmask(buf, f['hlen'], f['length'])
-    else
-      f['payload'] = buf[f['hlen']...full_len]
-    end
-
-    if base64 and [1, 2].include?(f['opcode'])
-      f['payload'] = Base64.decode64(f['payload'])
-    end
-
-    # close frame
-    if f['opcode'] == 0x08
-      if f['length'] >= 2
-        f['close_code'] = f['payload'].unpack('n')
-      end
-      if f['length'] > 3
-        f['close_reason'] = f['payload'][2...f['payload'].length]
-      end
-    end
-
-    return f
-  end
-
-  def encode_hixie(buf)
-    return ["\x00" + Base64.encode64(buf).gsub(/\n/, '') + "\xff", 1, 1]
-  end
-
-  def decode_hixie(buf)
-    last = buf.index("\377")
-    return {'payload' => Base64.decode64(buf[1...last]),
-            'hlen' => 1,
-            'length' => last - 1,
-            'left' => buf.length - (last + 1)}
-  end
-
-  def send_frames(bufs)
-    t = Thread.current
-    if bufs.length > 0
-      encbuf = ""
-      bufs.each do |buf|
-        if t[:version].start_with?("hybi")
-          if t[:base64]
-            encbuf, lenhead, lentail = encode_hybi(
-              buf, opcode=1, base64=true)
-          else
-            encbuf, lenhead, lentail = encode_hybi(
-              buf, opcode=2, base64=false)
-          end
-        else
-          encbuf, lenhead, lentail = encode_hixie(buf)
-        end
-      
-        t[:send_parts] << encbuf
-      end
-
-    end
-
-    while t[:send_parts].length > 0
-      buf = t[:send_parts].shift
-      sent = t[:client].write(buf)
-
-      if sent == buf.length
-        traffic "<"
-      else
-        traffic "<."
-        t[:send_parts].unshift(buf[sent...buf.length])
-      end
-    end
-
-    return t[:send_parts].length
-  end
-
-  # Receive and decode Websocket frames
-  # Returns: [bufs_list, closed_string]
-  def recv_frames()
-    t = Thread.current
-    closed = false
-    bufs = []
-
-    buf = t[:client].read_nonblock(@@Buffer_size)
-
-    if buf.length == 0
-      return bufs, "Client closed abrubtly"
-    end
-
-    if t[:recv_part]
-      buf = t[:recv_part] + buf
-      t[:recv_part] = nil
-    end
-
-    while buf.length > 0
-      if t[:version].start_with?("hybi")
-        frame = decode_hybi(buf, base64=t[:base64])
-
-        if frame['payload'] == nil
-          traffic "}."
-          if frame['left'] > 0
-            t[:recv_part] = buf[-frame['left']...buf.length]
-          end
-          break
-        else
-          if frame['opcode'] == 0x8
-            closed = "Client closed, reason: %s - %s" % [
-              frame['close_code'], frame['close_reason']]
-            break
-          end
-        end
-      else
-        if buf[0...2] == "\xff\x00"
-          closed = "Client sent orderly close frame"
-          break
-        elsif buf[0...2] == "\x00\xff"
-          buf = buf[2...buf.length]
-          continue # No-op frame
-        elsif buf.count("\xff") == 0
-          # Partial frame
-          traffic "}."
-          t[:recv_part] = buf
-          break
-        end
-
-        frame = decode_hixie(buf)
-      end
-
-      #msg "Receive frame: #{frame.inspect}"
-
-      traffic "}"
-
-      bufs << frame['payload']
-
-      if frame['left'] > 0
-        buf = buf[-frame['left']...buf.length]
-      else
-        buf = ''
-      end
-    end
-
-    return bufs, closed
-  end
-
-
-  def send_close(code=nil, reason='')
-    t = Thread.current
-    if t[:version].start_with?("hybi")
-      msg = ''
-      if code
-        msg = [reason.length, code].pack("na8")
-      end
-
-      buf, lenh, lent = encode_hybi(msg, opcode=0x08, base64=false)
-      t[:client].write(buf)
-    elsif t[:version] == "hixie-76"
-      buf = "\xff\x00"
-      t[:client].write(buf)
-    end
-  end
-
-  def do_handshake(sock)
-  
-    t = Thread.current
-    stype = ""
-
-    if !IO.select([sock], nil, nil, 3)
-      raise EClose, "ignoring socket not ready"
-    end
-
-    handshake = ""
-    msg "About to read from sock [#{sock.inspect}]"
-    handshake = sock.read_nonblock(1024)
-    msg "Handshake [#{handshake.inspect}]"
-
-    if handshake == nil or handshake == ""
-      raise(EClose, "ignoring empty handshake")
-    else
-      stype = "Plain non-SSL (ws://)"
-      scheme = "ws"
-      if sock.class == OpenSSL::SSL::SSLSocket
-        stype = "SSL (wss://)"
-        scheme = "wss"
-      end
-      retsock = sock
-    end
-
-    h = t[:headers] = {}
-    hlines = handshake.split("\r\n")
-    req_split = hlines.shift.match(/^(\w+) (\/[^\s]*) HTTP\/1\.1$/) 
-    t[:path] = req_split[2].strip
-    hlines.each do |hline|
-      break if hline == ""
-      hsplit = hline.match(/^([^:]+):\s*(.+)$/)
-      h[hsplit[1].strip.downcase] = hsplit[2]
-    end
-    puts "Headers: #{h.inspect}"
-
-    unless h.has_key?('upgrade') &&
-       h['upgrade'].downcase == 'websocket'
-      raise EClose, "Non-WebSocket connection"
-    end
-
-    protocols = h.fetch("sec-websocket-protocol", h["websocket-protocol"])
-    ver = h.fetch('sec-websocket-version', nil)
-
-    if ver
-      # HyBi/IETF vesrion of the protocol
-
-      # HyBi 07 reports version 7
-      # HyBi 08 - 12 report version 8
-      # HyBi 13 and up report version 13
-      if ['7', '8', '13'].include?(ver)
-        t[:version] = "hybi-%02d" % [ver.to_i]
-      else
-        raise EClose, "Unsupported protocol version %s" % [ver]
-      end
-
-      # choose binary if client supports it
-      if protocols.include?('binary')
-        t[:base64] = false
-      elsif protocols.include?('base64')
-        t[:base64] = true
-      else
-        raise EClose, "Client must support 'binary' or 'base64' sub-protocol"
-      end
-
-      key = h['sec-websocket-key']
-
-      # Generate the hash value for the accpet header
-      accept = Base64.encode64(
-        Digest::SHA1.digest(key + @@GUID)).gsub(/\n/, '')
-
-      response = @@Server_handshake_hybi % [accept]
-
-      if t[:base64]
-        response += "Sec-WebSocket-Protocol: base64\r\n"
-      else
-        response += "Sec-WebSocket-Protocol: binary\r\n"
-      end
-      response += "\r\n"
-
-    else
-      # Hixie vesrion of the protocol (75 or 76)
-      body = handshake.match(/\r\n\r\n(........)/)
-      if body
-        h['key3'] = body[1]
-        trailer = gen_md5(h)
-        pre = "Sec-"
-        t[:version] = "hixie-76"
-      else
-        trailer = ""
-        pre = ""
-        t[:version] = "hixie-75"
-      end
-      
-      # base64 required for Hixie since payload is only UTF-8
-      t[:base64] = true
-
-      response = @@Server_handshake_hixie % [pre, h['origin'], pre,
-        "ws", h['host'], t[:path]]
-
-      if protocols && protocols.include?('base64')
-        response += "%sWebSocket-Protocol: base64\r\n" % [pre]
-      else
-        msg "Warning: client does not report 'base64' protocol support"
-      end
-
-      response += "\r\n" + trailer
-    end
-
-    msg "%s WebSocket connection" % [stype]
-    msg "Version %s, base64: '%s'" % [t[:version], t[:base64]]
-    if t[:path] then msg "Path: '%s'" % [t[:path]] end
-
-    #puts "sending reponse #{response.inspect}"
-    retsock.write(response)
-
-    # Return the WebSocket socket which may be SSL wrapped
-    return retsock
-  end
-
-end
-
-# vim: sw=2

other/websockify.c

@@ -1,385 +0,0 @@
-/*
- * A WebSocket to TCP socket proxy with support for "wss://" encryption.
- * Copyright 2010 Joel Martin
- * Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3)
- *
- * You can make a cert/key with openssl using:
- * openssl req -new -x509 -days 365 -nodes -out self.pem -keyout self.pem
- * as taken from http://docs.python.org/dev/library/ssl.html#certificates
- */
-#include <stdio.h>
-#include <errno.h>
-#include <limits.h>
-#include <getopt.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/select.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include "websocket.h"
-
-char traffic_legend[] = "\n\
-Traffic Legend:\n\
-    }  - Client receive\n\
-    }. - Client receive partial\n\
-    {  - Target receive\n\
-\n\
-    >  - Target send\n\
-    >. - Target send partial\n\
-    <  - Client send\n\
-    <. - Client send partial\n\
-";
-
-char USAGE[] = "Usage: [options] " \
-               "[source_addr:]source_port target_addr:target_port\n\n" \
-               "  --verbose|-v       verbose messages and per frame traffic\n" \
-               "  --daemon|-D        become a daemon (background process)\n" \
-               "  --cert CERT        SSL certificate file\n" \
-               "  --key KEY          SSL key file (if separate from cert)\n" \
-               "  --ssl-only         disallow non-encrypted connections";
-
-#define usage(fmt, args...) \
-    fprintf(stderr, "%s\n\n", USAGE); \
-    fprintf(stderr, fmt , ## args); \
-    exit(1);
-
-char target_host[256];
-int target_port;
-
-extern pipe_error;
-extern settings_t settings;
-
-void do_proxy(ws_ctx_t *ws_ctx, int target) {
-    fd_set rlist, wlist, elist;
-    struct timeval tv;
-    int i, maxfd, client = ws_ctx->sockfd;
-    unsigned int opcode, left, ret;
-    unsigned int tout_start, tout_end, cout_start, cout_end;
-    unsigned int tin_start, tin_end;
-    ssize_t len, bytes;
-
-    tout_start = tout_end = cout_start = cout_end;
-    tin_start = tin_end = 0;
-    maxfd = client > target ? client+1 : target+1;
-
-    while (1) {
-        tv.tv_sec = 1;
-        tv.tv_usec = 0;
-
-        FD_ZERO(&rlist);
-        FD_ZERO(&wlist);
-        FD_ZERO(&elist);
-
-        FD_SET(client, &elist);
-        FD_SET(target, &elist);
-
-        if (tout_end == tout_start) {
-            // Nothing queued for target, so read from client
-            FD_SET(client, &rlist);
-        } else {
-            // Data queued for target, so write to it
-            FD_SET(target, &wlist);
-        }
-        if (cout_end == cout_start) {
-            // Nothing queued for client, so read from target
-            FD_SET(target, &rlist);
-        } else {
-            // Data queued for client, so write to it
-            FD_SET(client, &wlist);
-        }
-
-        ret = select(maxfd, &rlist, &wlist, &elist, &tv);
-        if (pipe_error) { break; }
-
-        if (FD_ISSET(target, &elist)) {
-            handler_emsg("target exception\n");
-            break;
-        }
-        if (FD_ISSET(client, &elist)) {
-            handler_emsg("client exception\n");
-            break;
-        }
-
-        if (ret == -1) {
-            handler_emsg("select(): %s\n", strerror(errno));
-            break;
-        } else if (ret == 0) {
-            //handler_emsg("select timeout\n");
-            continue;
-        }
-
-        if (FD_ISSET(target, &wlist)) {
-            len = tout_end-tout_start;
-            bytes = send(target, ws_ctx->tout_buf + tout_start, len, 0);
-            if (pipe_error) { break; }
-            if (bytes < 0) {
-                handler_emsg("target connection error: %s\n",
-                             strerror(errno));
-                break;
-            }
-            tout_start += bytes;
-            if (tout_start >= tout_end) {
-                tout_start = tout_end = 0;
-                traffic(">");
-            } else {
-                traffic(">.");
-            }
-        }
-
-        if (FD_ISSET(client, &wlist)) {
-            len = cout_end-cout_start;
-            bytes = ws_send(ws_ctx, ws_ctx->cout_buf + cout_start, len);
-            if (pipe_error) { break; }
-            if (len < 3) {
-                handler_emsg("len: %d, bytes: %d: %d\n",
-                             (int) len, (int) bytes,
-                             (int) *(ws_ctx->cout_buf + cout_start));
-            }
-            cout_start += bytes;
-            if (cout_start >= cout_end) {
-                cout_start = cout_end = 0;
-                traffic("<");
-            } else {
-                traffic("<.");
-            }
-        }
-
-        if (FD_ISSET(target, &rlist)) {
-            bytes = recv(target, ws_ctx->cin_buf, DBUFSIZE , 0);
-            if (pipe_error) { break; }
-            if (bytes <= 0) {
-                handler_emsg("target closed connection\n");
-                break;
-            }
-            cout_start = 0;
-            if (ws_ctx->hybi) {
-                cout_end = encode_hybi(ws_ctx->cin_buf, bytes,
-                                   ws_ctx->cout_buf, BUFSIZE, 1);
-            } else {
-                cout_end = encode_hixie(ws_ctx->cin_buf, bytes,
-                                    ws_ctx->cout_buf, BUFSIZE);
-            }
-            /*
-            printf("encoded: ");
-            for (i=0; i< cout_end; i++) {
-                printf("%u,", (unsigned char) *(ws_ctx->cout_buf+i));
-            }
-            printf("\n");
-            */
-            if (cout_end < 0) {
-                handler_emsg("encoding error\n");
-                break;
-            }
-            traffic("{");
-        }
-
-        if (FD_ISSET(client, &rlist)) {
-            bytes = ws_recv(ws_ctx, ws_ctx->tin_buf + tin_end, BUFSIZE-1);
-            if (pipe_error) { break; }
-            if (bytes <= 0) {
-                handler_emsg("client closed connection\n");
-                break;
-            }
-            tin_end += bytes;
-            /*
-            printf("before decode: ");
-            for (i=0; i< bytes; i++) {
-                printf("%u,", (unsigned char) *(ws_ctx->tin_buf+i));
-            }
-            printf("\n");
-            */
-            if (ws_ctx->hybi) {
-                len = decode_hybi(ws_ctx->tin_buf + tin_start,
-                                  tin_end-tin_start,
-                                  ws_ctx->tout_buf, BUFSIZE-1,
-                                  &opcode, &left);
-            } else {
-                len = decode_hixie(ws_ctx->tin_buf + tin_start,
-                                   tin_end-tin_start,
-                                   ws_ctx->tout_buf, BUFSIZE-1,
-                                   &opcode, &left);
-            }
-
-            if (opcode == 8) {
-                handler_emsg("client sent orderly close frame\n");
-                break;
-            }
-
-            /*
-            printf("decoded: ");
-            for (i=0; i< len; i++) {
-                printf("%u,", (unsigned char) *(ws_ctx->tout_buf+i));
-            }
-            printf("\n");
-            */
-            if (len < 0) {
-                handler_emsg("decoding error\n");
-                break;
-            }
-            if (left) {
-                tin_start = tin_end - left;
-                //printf("partial frame from client");
-            } else {
-                tin_start = 0;
-                tin_end = 0;
-            }
-
-            traffic("}");
-            tout_start = 0;
-            tout_end = len;
-        }
-    }
-}
-
-void proxy_handler(ws_ctx_t *ws_ctx) {
-    int tsock = 0;
-    struct sockaddr_in taddr;
-
-    handler_msg("connecting to: %s:%d\n", target_host, target_port);
-
-    tsock = socket(AF_INET, SOCK_STREAM, 0);
-    if (tsock < 0) {
-        handler_emsg("Could not create target socket: %s\n",
-                     strerror(errno));
-        return;
-    }
-    bzero((char *) &taddr, sizeof(taddr));
-    taddr.sin_family = AF_INET;
-    taddr.sin_port = htons(target_port);
-
-    /* Resolve target address */
-    if (resolve_host(&taddr.sin_addr, target_host) < -1) {
-        handler_emsg("Could not resolve target address: %s\n",
-                     strerror(errno));
-    }
-
-    if (connect(tsock, (struct sockaddr *) &taddr, sizeof(taddr)) < 0) {
-        handler_emsg("Could not connect to target: %s\n",
-                     strerror(errno));
-        close(tsock);
-        return;
-    }
-
-    if ((settings.verbose) && (! settings.daemon)) {
-        printf("%s", traffic_legend);
-    }
-
-    do_proxy(ws_ctx, tsock);
-
-    shutdown(tsock, SHUT_RDWR);
-    close(tsock);
-}
-
-int main(int argc, char *argv[])
-{
-    int fd, c, option_index = 0;
-    static int ssl_only = 0, daemon = 0, run_once = 0, verbose = 0;
-    char *found;
-    static struct option long_options[] = {
-        {"verbose",    no_argument,       &verbose,    'v'},
-        {"ssl-only",   no_argument,       &ssl_only,    1 },
-        {"daemon",     no_argument,       &daemon,     'D'},
-        /* ---- */
-        {"run-once",   no_argument,       0,           'r'},
-        {"cert",       required_argument, 0,           'c'},
-        {"key",        required_argument, 0,           'k'},
-        {0, 0, 0, 0}
-    };
-
-    settings.cert = realpath("self.pem", NULL);
-    if (!settings.cert) {
-        /* Make sure it's always set to something */
-        settings.cert = "self.pem";
-    }
-    settings.key = "";
-
-    while (1) {
-        c = getopt_long (argc, argv, "vDrc:k:",
-                         long_options, &option_index);
-
-        /* Detect the end */
-        if (c == -1) { break; }
-
-        switch (c) {
-            case 0:
-                break; // ignore
-            case 1:
-                break; // ignore
-            case 'v':
-                verbose = 1;
-                break;
-            case 'D':
-                daemon = 1;
-                break;
-            case 'r':
-                run_once = 1;
-                break;
-            case 'c':
-                settings.cert = realpath(optarg, NULL);
-                if (! settings.cert) {
-                    usage("No cert file at %s\n", optarg);
-                }
-                break;
-            case 'k':
-                settings.key = realpath(optarg, NULL);
-                if (! settings.key) {
-                    usage("No key file at %s\n", optarg);
-                }
-                break;
-            default:
-                usage("");
-        }
-    }
-    settings.verbose      = verbose;
-    settings.ssl_only     = ssl_only;
-    settings.daemon       = daemon;
-    settings.run_once     = run_once;
-
-    if ((argc-optind) != 2) {
-        usage("Invalid number of arguments\n");
-    }
-
-    found = strstr(argv[optind], ":");
-    if (found) {
-        memcpy(settings.listen_host, argv[optind], found-argv[optind]);
-        settings.listen_port = strtol(found+1, NULL, 10);
-    } else {
-        settings.listen_host[0] = '\0';
-        settings.listen_port = strtol(argv[optind], NULL, 10);
-    }
-    optind++;
-    if (settings.listen_port == 0) {
-        usage("Could not parse listen_port\n");
-    }
-
-    found = strstr(argv[optind], ":");
-    if (found) {
-        memcpy(target_host, argv[optind], found-argv[optind]);
-        target_port = strtol(found+1, NULL, 10);
-    } else {
-        usage("Target argument must be host:port\n");
-    }
-    if (target_port == 0) {
-        usage("Could not parse target port\n");
-    }
-
-    if (ssl_only) {
-        if (access(settings.cert, R_OK) != 0) {
-            usage("SSL only and cert file '%s' not found\n", settings.cert);
-        }
-    } else if (access(settings.cert, R_OK) != 0) {
-        fprintf(stderr, "Warning: '%s' not found\n", settings.cert);
-    }
-
-    //printf("  verbose: %d\n",   settings.verbose);
-    //printf("  ssl_only: %d\n",  settings.ssl_only);
-    //printf("  daemon: %d\n",    settings.daemon);
-    //printf("  run_once: %d\n",  settings.run_once);
-    //printf("  cert: %s\n",      settings.cert);
-    //printf("  key: %s\n",       settings.key);
-
-    settings.handler = proxy_handler; 
-    start_server();
-
-}

other/websockify.clj

@@ -1,233 +0,0 @@
-(ns websockify
-  ;(:use ring.adapter.jetty)
-  (:require [clojure.tools.cli :as cli]
-            [clojure.string :as string])
-
-  (:import
-   
-   ;; Netty TCP Client 
-   [java.util.concurrent Executors]
-   [java.net InetSocketAddress]
-   [org.jboss.netty.channel
-    Channels SimpleChannelHandler ChannelPipelineFactory]
-   [org.jboss.netty.buffer ChannelBuffers]
-   [org.jboss.netty.channel.socket.nio NioClientSocketChannelFactory]
-   [org.jboss.netty.bootstrap ClientBootstrap]
-   [org.jboss.netty.handler.codec.base64 Base64]
-   [org.jboss.netty.util CharsetUtil]
-   
-   ;; Jetty WebSocket Server
-   [org.eclipse.jetty.server Server]
-   [org.eclipse.jetty.server.nio BlockingChannelConnector]
-   [org.eclipse.jetty.servlet
-    ServletContextHandler ServletHolder DefaultServlet]
-   [org.eclipse.jetty.websocket
-    WebSocket WebSocket$OnTextMessage
-    WebSocketClientFactory WebSocketClient WebSocketServlet]))
-
-
-;; TCP / NIO
-
-;; (defn tcp-channel [host port]
-;;   (try
-;;     (let [address (InetSocketAddress. host port)
-;;          channel (doto (SocketChannel/open)
-;;                    (.connect address))]
-;;       channel)
-;;     (catch Exception e
-;;       (println (str "Failed to connect to'" host ":" port "':" e))
-;;       nil)))
-
-;; http://docs.jboss.org/netty/3.2/guide/html/start.html#d0e51
-;; http://stackoverflow.com/questions/5453602/highly-concurrent-http-with-netty-and-nio
-;; https://github.com/datskos/ring-netty-adapter/blob/master/src/ring/adapter/netty.clj
-
-
-(defn netty-client [host port open close message]
-  (let [handler (proxy [SimpleChannelHandler] []
-                  (channelConnected [ctx e] (open ctx e))
-                  (channelDisconnected [ctx e] (close ctx e))
-                  (messageReceived [ctx e] (message ctx e))
-                  (exceptionCaught [ctx e]
-                    (println "exceptionCaught:" e)))
-        pipeline (proxy [ChannelPipelineFactory] []
-                   (getPipeline []
-                     (doto (Channels/pipeline)
-                       (.addLast "handler" handler))))
-        bootstrap (doto (ClientBootstrap.
-                         (NioClientSocketChannelFactory.
-                          (Executors/newCachedThreadPool)
-                          (Executors/newCachedThreadPool)))
-                    (.setPipelineFactory pipeline)
-                    (.setOption "tcpNoDelay" true)
-                    (.setOption "keepAlive" true))
-        channel-future (.connect bootstrap (InetSocketAddress. host port))
-        channel (.. channel-future (awaitUninterruptibly) (getChannel))]
-    channel))
-
-
-
-;; WebSockets
-
-;; http://wiki.eclipse.org/Jetty/Feature/WebSockets
-(defn make-websocket-servlet [open close message]
-  (proxy [WebSocketServlet] []
-    (doGet [request response]
-      ;;(println "doGet" request)
-      (.. (proxy-super getServletContext)
-          (getNamedDispatcher (proxy-super getServletName))
-          (forward request response)))
-    (doWebSocketConnect [request response]
-      (println "doWebSocketConnect")
-      (reify WebSocket$OnTextMessage
-        (onOpen [this connection] (open this connection))
-        (onClose [this code message] (close this code message))
-        (onMessage [this data] (message this data))))))
-
-(defn websocket-server
-  [port & {:keys [open close message ws-path web]
-           :or {open (fn [_ conn]
-                       (println "New websocket client:" conn))
-                close (fn [_ code reason]
-                        (println "Websocket client closed:" code reason))
-                message (fn [_ data]
-                          (println "Websocket message:" data))
-                
-                ws-path "/websocket"}}]
-  (let [http-servlet (doto (ServletHolder. (DefaultServlet.))
-                       (.setInitParameter "dirAllowed" "true")
-                       (.setInitParameter "resourceBase" web))
-        ws-servlet (ServletHolder.
-                    (make-websocket-servlet open close message))
-        context (doto (ServletContextHandler.)
-                  (.setContextPath "/")
-                  (.addServlet ws-servlet ws-path))
-        connector (doto (BlockingChannelConnector.)
-                    (.setPort port)
-                    (.setMaxIdleTime Integer/MAX_VALUE))
-        server (doto (Server.)
-                 (.setHandler context)
-                 (.addConnector connector))]
-    
-    (when web (.addServlet context http-servlet "/"))
-    server))
-
-
-
-;; Websockify
-
-(defonce settings (atom {}))
-
-;; WebSocket client to TCP target mappings
-
-(defonce clients (atom {}))
-(defonce targets (atom {}))
-
-
-(defn target-open [ctx e]
-  (println "Connected to target")
-  #_(println "channelConnected:" e))
-
-(defn target-close [ctx e]
-  #_(println "channelDisconnected:" e)
-  (println "Target closed")
-  (when-let [channel (get @targets (.getChannel ctx))]
-    (.disconnect channel)))
-
-(defn target-message [ctx e]
-  (let [channel (.getChannel ctx)
-        client (get @targets channel)
-        msg (.getMessage e)
-        len (.readableBytes msg)
-        b64 (Base64/encode msg false)
-        blen (.readableBytes b64)]
-    #_(println "received" len "bytes from target")
-    #_(println "target receive:" (.toString msg 0 len CharsetUtil/UTF_8))
-    #_(println "sending to client:" (.toString b64 0 blen CharsetUtil/UTF_8))
-    (.sendMessage client (.toString b64 0 blen CharsetUtil/UTF_8))))
-
-(defn client-open [this connection]
-  #_(println "Got WebSocket connection:" connection)
-  (println "New client")
-  (let [target (netty-client
-                (:target-host @settings)
-                (:target-port @settings)
-                target-open target-close target-message)]
-    (swap! clients assoc this {:client connection
-                               :target target})
-    (swap! targets assoc target connection)))
-
-(defn client-close [this code message]
-  (println "WebSocket connection closed")
-  (when-let [target (:target (get @clients this))]
-    (println "Closing target")
-    (.close target)
-    (println "Target closed")
-    (swap! targets dissoc target))
-  (swap! clients dissoc this))
-
-(defn client-message [this data]
-  #_(println "WebSocket onMessage:" data)
-  (let [target (:target (get @clients this))
-        cbuf (ChannelBuffers/copiedBuffer data CharsetUtil/UTF_8)
-        decbuf (Base64/decode cbuf)
-        rlen (.readableBytes decbuf)]
-    #_(println "Sending" rlen "bytes to target")
-    #_(println "Sending to target:" (.toString decbuf 0 rlen CharsetUtil/UTF_8))
-    (.write target decbuf)))
-
-(defn start-websockify
-  [& {:keys [listen-port target-host target-port web]
-      :or {listen-port 6080
-           target-host "localhost"
-           target-port 5900
-           }}]
-  
-  (reset! clients {})
-  (reset! targets {})
-
-  (reset! settings {:target-host target-host
-                    :target-port target-port})
-  (let [server (websocket-server listen-port
-                                 :web web
-                                 :ws-path "/websockify"
-                                 :open client-open
-                                 :close client-close
-                                 :message client-message)]
-    
-    (.start server)
-    
-    (if web
-      (println "Serving web requests from:" web)
-      (println "Not serving web requests"))
-    
-    (defn stop-websockify []
-      (doseq [client (vals @clients)]
-        (.disconnect (:client client))
-        (.close (:target client)))
-      (.stop server)
-      (reset! clients {})
-      (reset! targets {})
-      nil)))
-
-(defn -main [& args]
-  (let [[options args banner]
-        (cli/cli
-         args
-         ["-v" "--[no-]verbose" "Verbose output"]
-         ["--web" "Run webserver with root at given location"]
-         ["-h" "--help" "Show help" :default false :flag true]
-         )]
-    (when (or (:help options)
-              (not= 2 (count args)))
-      (println banner)
-      (System/exit 0))
-    (println options)
-    (println args)
-    (let [target (second args)
-          [target-host target-port] (string/split target #":")]
-      (start-websockify :listen-port (Integer/parseInt (first args))
-                        :target-host target-host 
-                        :target-port (Integer/parseInt target-port)
-                        :web (:web options))))
-  nil)

other/websockify.rb

@@ -1,171 +0,0 @@
-#!/usr/bin/env ruby
-
-# A WebSocket to TCP socket proxy
-# Copyright 2011 Joel Martin
-# Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3)
-
-require 'socket'
-$: << "other"
-$: << "../other"
-require 'websocket'
-require 'optparse'
-
-# Proxy traffic to and from a WebSockets client to a normal TCP
-# socket server target. All traffic to/from the client is base64
-# encoded/decoded to allow binary data to be sent/received to/from
-# the target.
-class WebSocketProxy < WebSocketServer
-
-  @@Traffic_legend = "
-Traffic Legend:
-    }  - Client receive
-    }. - Client receive partial
-    {  - Target receive
-
-    >  - Target send
-    >. - Target send partial
-    <  - Client send
-    <. - Client send partial
-"
-
-
-  def initialize(opts)
-    vmsg "in WebSocketProxy.initialize"
-
-    super(opts)
-    
-    @target_host = opts["target_host"]
-    @target_port = opts["target_port"]
-  end
-
-  # Echo back whatever is received    
-  def new_websocket_client(client)
-
-    msg "connecting to: %s:%s" % [@target_host, @target_port]
-    tsock = TCPSocket.open(@target_host, @target_port)
-
-    if @verbose then puts @@Traffic_legend end
-
-    begin
-      do_proxy(client, tsock)
-    rescue
-      tsock.shutdown(Socket::SHUT_RDWR)
-      tsock.close
-      raise
-    end
-  end
-
-  # Proxy client WebSocket to normal target socket.
-  def do_proxy(client, target)
-    cqueue = []
-    c_pend = 0
-    tqueue = []
-    rlist = [client, target]
-
-    loop do
-      wlist = []
-
-      if tqueue.length > 0
-        wlist << target
-      end
-      if cqueue.length > 0 || c_pend > 0
-        wlist << client
-      end
-
-      ins, outs, excepts = IO.select(rlist, wlist, nil, 0.001)
-      if excepts && excepts.length > 0
-        raise Exception, "Socket exception"
-      end
-
-      # Send queued client data to the target
-      if outs && outs.include?(target)
-        dat = tqueue.shift
-        sent = target.send(dat, 0)
-        if sent == dat.length
-          traffic ">"
-        else
-          tqueue.unshift(dat[sent...dat.length])
-          traffic ".>"
-        end
-      end
-
-      # Receive target data and queue for the client
-      if ins && ins.include?(target)
-        buf = target.recv(@@Buffer_size)
-        if buf.length == 0
-          raise EClose, "Target closed"
-        end
-
-        cqueue << buf
-        traffic "{"
-      end
-
-      # Encode and send queued data to the client
-      if outs && outs.include?(client)
-        c_pend = send_frames(cqueue)
-        cqueue = []
-      end
-
-      # Receive client data, decode it, and send it back
-      if ins && ins.include?(client)
-        frames, closed = recv_frames
-        tqueue += frames
-
-        if closed
-          send_close
-          raise EClose, closed
-        end
-      end
-
-    end  # loop
-  end
-end
-
-# Parse parameters
-opts = {}
-parser = OptionParser.new do |o|
-  o.on('--verbose', '-v') { |b| opts['verbose'] = b }
-  o.parse!
-end
-
-if ARGV.length < 2
-  puts "Too few arguments"
-  exit 2
-end
-
-# Parse host:port and convert ports to numbers
-if ARGV[0].count(":") > 0
-  opts['listen_host'], _, opts['listen_port'] = ARGV[0].rpartition(':')
-else
-  opts['listen_host'], opts['listen_port'] = nil, ARGV[0]
-end
-
-begin
-  opts['listen_port'] = opts['listen_port'].to_i
-rescue
-  puts "Error parsing listen port"
-  exit 2
-end
-
-if ARGV[1].count(":") > 0
-  opts['target_host'], _, opts['target_port'] = ARGV[1].rpartition(':')
-else
-  puts "Error parsing target"
-  exit 2
-end
-
-begin
-  opts['target_port'] = opts['target_port'].to_i
-rescue
-  puts "Error parsing target port"
-  exit 2
-end
-
-puts "Starting server on #{opts['listen_host']}:#{opts['listen_port']}"
-server = WebSocketProxy.new(opts)
-server.start(100)
-server.join
-
-puts "Server has been terminated"
-
-# vim: sw=2

other/wswrap

@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-usage() {
-    echo "Usage: $(basename $0) PORT CMDLINE"
-    echo
-    echo "    PORT     Port to wrap with WebSockets support"
-    echo "    CMDLINE  Command line to wrap"
-    exit 2
-}
-
-# Parameter defaults
-mydir=$(readlink -f $(dirname ${0}))
-
-# Process parameters
-#while [ "${1}" != "${1#-}" ]; do
-#    param=$1; shift
-#done
-
-export WSWRAP_PORT="${1}"; shift
-
-LD_PRELOAD=${mydir}/wswrapper.so "${@}"
-

run

@@ -1,5 +1,4 @@
-#!/usr/bin/python
-
-import websockify
-
-websockify.websocketproxy.websockify_init()
+#!/usr/bin/env sh
+set -e
+cd "$(dirname "$0")"
+exec python3 -m websockify "$@"

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.6.1'
+version = '0.10.0'
 name = 'websockify'
 long_description = open("README.md").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
@@ -9,20 +9,21 @@ setup(name=name,
       version=version,
       description="Websockify.",
       long_description=long_description,
+      long_description_content_type="text/markdown",
       classifiers=[
           "Programming Language :: Python",
+          "Programming Language :: Python :: 3",
+          "Programming Language :: Python :: 3 :: Only",
+          "Programming Language :: Python :: 3.4",
+          "Programming Language :: Python :: 3.5",
+          "Programming Language :: Python :: 3.6",
+          "Programming Language :: Python :: 3.7",
+          "Programming Language :: Python :: 3.8",
+          "Programming Language :: Python :: 3.9",
         ],
-      data_files=[('share/websockify/include',
-                      ['include/util.js',
-                       'include/base64.js',
-                       'include/websock.js']),
-                  ('share/websockify/include/web-socket-js',
-                      ['include/web-socket-js/WebSocketMain.swf',
-                       'include/web-socket-js/swfobject.js',
-                       'include/web-socket-js/web_socket.js'])],
       keywords='noVNC websockify',
       license='LGPLv3',
-      url="https://github.com/kanaka/websockify",
+      url="https://github.com/novnc/websockify",
       author="Joel Martin",
       author_email="github@martintribe.org",
 

test-requirements.txt

@@ -0,0 +1,6 @@
+mock
+nose
+jwcrypto
+six
+redis
+simplejson

tests/b64_vs_utf8.py

@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-
-from base64 import b64encode, b64decode
-from codecs import (utf_8_encode, utf_8_decode,
-                    latin_1_encode, latin_1_decode)
-import random, time
-
-buf_len = 10000
-iterations = 10000
-
-print "Generating random input buffer"
-r = random.Random()
-buf = "".join([chr(r.randint(0, 255)) for i in range(buf_len)])
-
-tests = {'UTF8 encode': lambda: utf_8_encode(unicode(buf, 'latin-1'))[0],
-         'B64 encode': lambda: b64encode(buf)}
-utf8_buf = tests['UTF8 encode']()
-b64_buf = tests['B64 encode']()
-tests.update({'UTF8 decode': lambda: latin_1_encode(utf_8_decode(utf8_buf)[0])[0],
-              'B64 decode': lambda: b64decode(b64_buf)})
-
-print "Running tests"
-for test in 'UTF8 encode', 'B64 encode', 'UTF8 decode', 'B64 decode':
-    start = time.time()
-    for i in range(iterations):
-        res_buf = tests[test]()
-    print "%s took %s seconds (result size %s)" % (
-            test, (time.time() -  start), len(res_buf))
-

tests/base64.html

@@ -1,91 +0,0 @@
-<!DOCTYPE html> 
-<html xmlns="http://www.w3.org/1999/xhtml"> 
-  <head> 
-    <title>Native Base64 Tests</title> 
-    <script src="include/util.js"></script> 
-    <script src="include/webutil.js"></script> 
-    <script src="include/base64.js"></script> 
-  </head> 
-  <body> 
-        <h1>Native Base64 Tests</h1> 
- 
-        <br> 
-        Messages:<br> 
-        <textarea id="debug" style="font-size: 9px;" cols=80 rows=25></textarea> 
-    
-        <br>
-  </body> 
- 
-<script> 
-    function debug(str) {
-        console.log(str);
-        cell = $D('debug');
-        cell.innerHTML += str + "\n";
-        cell.scrollTop = cell.scrollHeight;
-    }
-
-    function assertRun(code, result) {
-        try {
-            var actual = eval(code);
-        } catch (exc) {
-            debug("FAIL: '" + code + "' threw an exception");
-            fail += 1;
-            return false;
-        }
-        if (actual !== result) {
-            debug("FAIL: '" + code + "' returned '" + actual + "', expected '" + result + "'");
-            fail += 1;
-            return false;
-        }
-        debug("PASS: '" + code + "' returned expected '" + result +"'");
-        pass += 1;
-        return true;
-    }
-
-    function Base64_decode(data) {
-        var arr = Base64.decode (data);
-        return arr.map(function (num) {
-            return String.fromCharCode(num); } ).join('');
-
-    }
-
-    window.onload = function() {
-        var str;
-        debug('onload');
-        fail = 0;
-        pass = 0;
-        assertRun('window.btoa("hello world")', 'aGVsbG8gd29ybGQ=');
-        assertRun('window.btoa("a")', 'YQ==');
-        assertRun('window.btoa("ab")', 'YWI=');
-        assertRun('window.btoa("abc")', 'YWJj');
-        assertRun('window.btoa("abcd")', 'YWJjZA==');
-        assertRun('window.btoa("abcde")', 'YWJjZGU=');
-        assertRun('window.btoa("abcdef")', 'YWJjZGVm');
-        assertRun('window.btoa("abcdefg")', 'YWJjZGVmZw==');
-        assertRun('window.btoa("abcdefgh")', 'YWJjZGVmZ2g=');
-
-        assertRun('window.atob("aGVsbG8gd29ybGQ=")', 'hello world');
-        assertRun('Base64_decode("aGVsbG8gd29ybGQ=")', 'hello world');
-        assertRun('window.atob("YQ==")', 'a');
-        assertRun('Base64_decode("YQ==")', 'a');
-        assertRun('window.atob("YWI=")', 'ab');
-        assertRun('Base64_decode("YWI=")', 'ab');
-        assertRun('window.atob("YWJj")', 'abc');
-        assertRun('Base64_decode("YWJj")', 'abc');
-        assertRun('window.atob("YWJjZA==")', 'abcd');
-        assertRun('Base64_decode("YWJjZA==")', 'abcd');
-        assertRun('window.atob("YWJjZGU=")', 'abcde');
-        assertRun('Base64_decode("YWJjZGU=")', 'abcde');
-        assertRun('window.atob("YWJjZGVm")', 'abcdef');
-        assertRun('Base64_decode("YWJjZGVm")', 'abcdef');
-
-        assertRun('typeof window.btoa', 'function');
-        assertRun('window.btoa("")', '');
-        assertRun('window.btoa(null)', '');
-        assertRun('window.atob(window.btoa(window))', window.toString()); // "[object DOMWindow]"
-        assertRun('window.btoa("\\u0080\\u0081")', 'gIE=');
-
-        debug("Tests failed: " + fail);
-        debug("Tests passed: " + pass);
-    }
-</script> 

tests/base64.js

@@ -1,12 +0,0 @@
-// The following results in 'hello [MANGLED]'
-//
-// Filed as https://github.com/ry/node/issues/issue/402
-
-var sys = require("sys"),
-    buf = new Buffer(1024), len,
-    str1 = "aGVsbG8g",  // 'hello '
-    str2 = "d29ybGQ=",  // 'world'
-
-len = buf.write(str1, 0, 'base64');
-len += buf.write(str2, len, 'base64');
-sys.log("decoded result: " + buf.toString('binary', 0, len));

tests/echo.html

@@ -2,17 +2,6 @@
 
     <head>
         <title>WebSockets Echo Test</title>
-        <script src="include/util.js"></script>
-        <script src="include/webutil.js"></script> 
-        <script src="include/base64.js"></script>
-        <script src="include/websock.js"></script> 
-        <!-- Uncomment to activate firebug lite -->
-        <!--
-        <script type='text/javascript' 
-            src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>
-        -->
-
-
     </head>
 
     <body>
@@ -37,7 +26,7 @@
 
         function message(str) {
             console.log(str);
-            cell = $D('messages');
+            cell = document.getElementById('messages');
             cell.innerHTML += msg_cnt + ": " + str + "\n";
             cell.scrollTop = cell.scrollHeight;
             msg_cnt++;
@@ -52,20 +41,21 @@
 
         function send_msg() {
             var str = "Message #" + send_cnt;
-            ws.send_string(str);
+            var encoder = new TextEncoder();
+            ws.send(encoder.encode(str));
             message("Sent message: '" + str + "'");
             send_cnt++;
         }
 
         function update_stats() {
-            $D('sent').innerHTML = sent;
-            $D('received').innerHTML = received;
-            $D('errors').innerHTML = errors;
+            document.getElementById('sent').innerHTML = sent;
+            document.getElementById('received').innerHTML = received;
+            document.getElementById('errors').innerHTML = errors;
         }
 
         function connect() {
-            var host = $D('host').value,
-                port = $D('port').value,
+            var host = document.getElementById('host').value,
+                port = document.getElementById('port').value,
                 scheme = "ws://", uri;
 
             console.log(">> connect");
@@ -78,28 +68,29 @@
                 ws.close();
             }
 
-            if ($D('encrypt').checked) {
+            if (document.getElementById('encrypt').checked) {
                 scheme = "wss://";
             }
             uri = scheme + host + ":" + port;
             message("connecting to " + uri);
 
-            ws = new Websock();
-            ws.open(uri);
+            ws = new WebSocket(uri);
+            ws.binaryType = 'arraybuffer';
 
-            ws.on('message', function(e) {
+            ws.addEventListener('message', function(e) {
                 //console.log(">> WebSockets.onmessage");
-                var str = ws.rQshiftStr();
+                var decoder = new TextDecoder('UTF-8');
+                var str = decoder.decode(e.data);
 
                 message("Received message '" + str + "'");
                 //console.log("<< WebSockets.onmessage");
             });
-            ws.on('open', function(e) {
+            ws.addEventListener('open', function(e) {
                 console.log(">> WebSockets.onopen");
                 echo_ref = setInterval(send_msg, echoDelay);
                 console.log("<< WebSockets.onopen");
             });
-            ws.on('close', function(e) {
+            ws.addEventListener('close', function(e) {
                 console.log(">> WebSockets.onclose");
                 if (echo_ref) {
                     clearInterval(echo_ref);
@@ -107,7 +98,7 @@
                 }
                 console.log("<< WebSockets.onclose");
             });
-            ws.on('error', function(e) {
+            ws.addEventListener('error', function(e) {
                 console.log(">> WebSockets.onerror");
                 if (echo_ref) {
                     clearInterval(echo_ref);
@@ -116,8 +107,8 @@
                 console.log("<< WebSockets.onerror");
             });
 
-            $D('connectButton').value = "Stop";
-            $D('connectButton').onclick = disconnect;
+            document.getElementById('connectButton').value = "Stop";
+            document.getElementById('connectButton').onclick = disconnect;
             console.log("<< connect");
         }
 
@@ -131,8 +122,8 @@
                 clearInterval(echo_ref);
             }
 
-            $D('connectButton').value = "Start";
-            $D('connectButton').onclick = connect;
+            document.getElementById('connectButton').value = "Start";
+            document.getElementById('connectButton').onclick = connect;
             console.log("<< disconnect");
         }
 
@@ -140,8 +131,8 @@
         window.onload = function() {
             console.log("onload");
             var url = document.location.href;
-            $D('host').value = (url.match(/host=([^&#]*)/) || ['',window.location.hostname])[1];
-            $D('port').value = (url.match(/port=([^&#]*)/) || ['',window.location.port])[1];
+            document.getElementById('host').value = (url.match(/host=([^&#]*)/) || ['',window.location.hostname])[1];
+            document.getElementById('port').value = (url.match(/port=([^&#]*)/) || ['',window.location.port])[1];
         }
     </script>
 

tests/echo.py

@@ -12,9 +12,9 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates
 
 import os, sys, select, optparse, logging
 sys.path.insert(0,os.path.join(os.path.dirname(__file__), ".."))
-from websockify.websocket import WebSocketServer, WebSocketRequestHandler
+from websockify.websockifyserver import WebSockifyServer, WebSockifyRequestHandler
 
-class WebSocketEcho(WebSocketRequestHandler):
+class WebSocketEcho(WebSockifyRequestHandler):
     """
     WebSockets server that echos back whatever is received from the
     client.  """
@@ -48,7 +48,7 @@ class WebSocketEcho(WebSocketRequestHandler):
                 cqueue.extend(frames)
 
                 if closed:
-                    self.send_close()
+                    break
 
 if __name__ == '__main__':
     parser = optparse.OptionParser(usage="%prog [options] listen_port")
@@ -63,14 +63,14 @@ if __name__ == '__main__':
     (opts, args) = parser.parse_args()
 
     try:
-        if len(args) != 1: raise
+        if len(args) != 1: raise ValueError
         opts.listen_port = int(args[0])
-    except:
+    except ValueError:
         parser.error("Invalid arguments")
 
     logging.basicConfig(level=logging.INFO)
 
     opts.web = "."
-    server = WebSocketServer(WebSocketEcho, **opts.__dict__)
+    server = WebSockifyServer(WebSocketEcho, **opts.__dict__)
     server.start_server()
 

tests/echo.rb

@@ -1,69 +0,0 @@
-#!/usr/bin/env ruby
-
-# A WebSocket server that echos back whatever it receives from the client.
-# Copyright 2011 Joel Martin
-# Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3)
-
-require 'socket'
-$: << "other"
-$: << "../other"
-require 'websocket'
-
-class WebSocketEcho < WebSocketServer
-
-  # Echo back whatever is received    
-  def new_websocket_client(client)
-
-    cqueue = []
-    c_pend = 0
-    rlist = [client]
-
-    loop do
-      wlist = []
-
-      if cqueue.length > 0 or c_pend
-        wlist << client
-      end
-
-      ins, outs, excepts = IO.select(rlist, wlist, nil, 1)
-      if excepts.length > 0
-        raise Exception, "Socket exception"
-      end
-
-      if outs.include?(client)
-        # Send queued data to the client
-        c_pend = send_frames(cqueue)
-        cqueue = []
-      end
-
-      if ins.include?(client)
-        # Receive client data, decode it, and send it back
-        frames, closed = recv_frames
-        cqueue += frames
-
-        if closed
-          raise EClose, closed
-        end
-      end
-
-    end  # loop
-  end
-end
-
-port = ARGV[0].to_i || 8080
-puts "Starting server on port #{port}"
-server_cert = nil
-server_key = nil
-if ARGV.length > 2
-  server_cert = ARGV[1]
-  server_key = ARGV[2]
-end
-
-server = WebSocketEcho.new('listen_port' => port, 'verbose' => true, 
-  'server_cert' => server_cert, 'server_key' => server_key)
-server.start
-server.join
-
-puts "Server has been terminated"
-
-# vim: sw=2

tests/echo_client.py

@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+
+import os
+import sys
+import optparse
+import select
+
+sys.path.insert(0,os.path.join(os.path.dirname(__file__), ".."))
+from websockify.websocket import WebSocket, \
+    WebSocketWantReadError, WebSocketWantWriteError
+
+parser = optparse.OptionParser(usage="%prog URL")
+(opts, args) = parser.parse_args()
+
+if len(args) == 1:
+    URL = args[0]
+else:
+    parser.error("Invalid arguments")
+
+sock = WebSocket()
+print("Connecting to %s..." % URL)
+sock.connect(URL)
+print("Connected.")
+
+def send(msg):
+    while True:
+        try:
+            sock.sendmsg(msg)
+            break
+        except WebSocketWantReadError:
+            msg = ''
+            ins, outs, excepts = select.select([sock], [], [])
+            if excepts: raise Exception("Socket exception")
+        except WebSocketWantWriteError:
+            msg = ''
+            ins, outs, excepts = select.select([], [sock], [])
+            if excepts: raise Exception("Socket exception")
+
+def read():
+    while True:
+        try:
+            return sock.recvmsg()
+        except WebSocketWantReadError:
+            ins, outs, excepts = select.select([sock], [], [])
+            if excepts: raise Exception("Socket exception")
+        except WebSocketWantWriteError:
+            ins, outs, excepts = select.select([], [sock], [])
+            if excepts: raise Exception("Socket exception")
+
+counter = 1
+while True:
+    msg = "Message #%d" % counter
+    counter += 1
+    send(msg)
+    print("Sent message: %r" % msg)
+
+    while True:
+        ins, outs, excepts = select.select([sock], [], [], 1.0)
+        if excepts: raise Exception("Socket exception")
+
+        if ins == []:
+            break
+
+        while True:
+            msg = read()
+            print("Received message: %r" % msg)
+
+            if not sock.pending():
+                break

tests/fixtures/private.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEArwNQal2INbSfoVT50dZ0s8lQ+yMhu45TDc91iuwtDjlFBJ50
+E4m3/M6ESBW0S7UTP1bIOGkd/M+u38h0Aruo4qkngdguu9N3BnsU2kOeicdjxc+v
+tqRc7/kbkTdT4SrpG8EFP6T2U9U1gtBpLnau02gPrzjaQzyYDLGOBq+Ozt/mN0YJ
+UhJ3hlwi18dNKreTzWgJ6mmXQWS0eAmHx8TIs2Nz9x3EfRo9CIMuaaeUjRogIEg5
+Tg4xC00ZtDO0/EfgpFkeHJGVQA2DgdBJsr6rq69MjhMfFxRJItxJMJzP6an2HkJ8
+onUPBtjEBmk3/fnfiaflzRyEb5zdii6r2TD8TwIDAQABAoIBAGDrzu742WQUoYqx
+CqDAyWR/is9px1adHTW6vHexD8qewLAsKFBhpnjkzbE2A+EhaIVdRAipfifxxAC+
+fDC/SGouD2kDFe6Cz5nRM90kMXpP59s2hzL4l1d2d2PWZid+ohXysTtr2dbXbokB
+bh6DL5J4QKdjLsypk/MDqYneU5IQ1k9ezWzcRgM8/V3M+t+1dLRFLIWsSLbNUgbF
+px81efNw8E0voV/d7kZ+6RwUThPHqR0eyLm6djPwHE7/FarZIx4AImwV+9ex44CH
+OkrTFOVYenF6jEtYoUuqYCouaWtG7jNVM/f1fksoR8SD6PTq2vn7F4wTLXG1b+K7
+45PKMhECgYEA22NH8mK9ICFVd7S6caeAnki+K9cpwmiOUWEIuDInmPn5FOlv7awE
+uBFN86v14PqDBtF7Aagyib0NUPo7rIw5+V5SCBZv8gQatjZUkT0vZvpxPU5jmB++
+w58yfK7zgdAWCepLxIPyTA7CAT1dmiVmuosz2pJjbo4fecVG222IE10CgYEAzDg+
+RVlvMYGy04UMmUoUNeeRlW6km/W6dqQ7EtcxfDv4O7boRDTBSRBzfIsRdXHZhcHN
+gCeB2Uiz8IO3s0Yt0+y/6cTI60uJ4S7Mb2JvWJvDCKWhS3pE1BL+LJJC4Hn7khJH
+yHYFOLOfnuCbOs8VA7IMmbdTPHirIKWTT5j5H5sCgYEAygK/KweUUlOfWVyHGUQ9
+gIJG6iNzhlm0QmbxGnrET25N1t2kfNsadUsp1igPfhvuLocRltMDxiTYcCoabKWq
+dF5PdrcCWX1CA2o/sIUAcvhE8UiPGHKSu5qJaJnIC05KHNMq9UbyAurL5UxWNiwe
+TcMD+k01VYV0ojHvLvnKhNkCgYArkoh+xXE7D+A2zzl771lWkvz19DB88jYBoFLW
+V0HArw7str7h5pui2ja5yPZFp6/woQQWptdGpAN4erIUNxIKGIZt+0WfJnPZruGB
+lnAJaNp5GtXKQ+ExmofOvLo2KPCrHulf9QZyLakN/gBA0PQ74J5docbJrTld8tX2
+cr4cpwKBgHqr2zybmywAmjn8wY0bUjRAyhdN8eiwYaGPtOSFt6IcWxEnNbAo5Jc2
+KsywpagjFsXZsi4Obn2XsqR7VX5bNbpNXIyLaMwBOy7MixyecgPF8tu7I4zo/CWm
+7gewTKBhwVPTDAOzHqIpJGrOnUgzJM3ijkCWMn3eAh4ccOjsrKq9
+-----END RSA PRIVATE KEY-----

tests/fixtures/public.pem

@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwNQal2INbSfoVT50dZ0
+s8lQ+yMhu45TDc91iuwtDjlFBJ50E4m3/M6ESBW0S7UTP1bIOGkd/M+u38h0Aruo
+4qkngdguu9N3BnsU2kOeicdjxc+vtqRc7/kbkTdT4SrpG8EFP6T2U9U1gtBpLnau
+02gPrzjaQzyYDLGOBq+Ozt/mN0YJUhJ3hlwi18dNKreTzWgJ6mmXQWS0eAmHx8TI
+s2Nz9x3EfRo9CIMuaaeUjRogIEg5Tg4xC00ZtDO0/EfgpFkeHJGVQA2DgdBJsr6r
+q69MjhMfFxRJItxJMJzP6an2HkJ8onUPBtjEBmk3/fnfiaflzRyEb5zdii6r2TD8
+TwIDAQAB
+-----END PUBLIC KEY-----

tests/fixtures/symmetric.key

@@ -0,0 +1 @@
+secret_sauce

tests/include

@@ -1 +0,0 @@
-../include

tests/latency.html

@@ -2,17 +2,6 @@
 
     <head>
         <title>WebSockets Latency Test</title>
-        <script src="include/base64.js"></script>
-        <script src="include/util.js"></script>
-        <script src="include/webutil.js"></script> 
-        <script src="include/websock.js"></script> 
-        <!-- Uncomment to activate firebug lite -->
-        <!--
-        <script type='text/javascript' 
-            src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>
-        -->
-
-
     </head>
 
     <body>
@@ -57,7 +46,7 @@
 
     <script>
 
-        var host = null, port = null, sendDelay = 0, actualSendDelay,
+        var host = null, port = null, sendDelay = 0,
             ws = null, send_ref = null,
             sent, received, latencies, ltotal, laverage, lrunning, lmin, lmax,
             run_length = 40,
@@ -74,7 +63,7 @@
 
         function message(str) {
             console.log(str);
-            cell = $D('messages');
+            cell = document.getElementById('messages');
             msg_cnt++;
             cell.innerHTML += msg_cnt + ": " + str + "\n";
             cell.scrollTop = cell.scrollHeight;
@@ -91,9 +80,9 @@
 
             now = (new Date()).getTime(); // Early as possible
 
-            arr = ws.rQshiftBytes(ws.rQlen());
-            first = String.fromCharCode(arr.shift());
-            last = String.fromCharCode(arr.pop());
+            arr = new Uint8Array(data);
+            first = String.fromCharCode(arr[0]);
+            last = String.fromCharCode(arr[arr.length-1]);
 
             if (first != "^") {
                 message("Error: packet missing start char '^'");
@@ -105,9 +94,11 @@
                 disconnect();
                 return;
             }
-            arr = arr.map(function(num) {
-                    return String.fromCharCode(num); 
-                } ).join('').split(':');
+            text = ''
+            for (var i = 1; i < arr.length-1; i++) {
+                text += String.fromCharCode(arr[i]);
+            }
+            arr = text.split(':');
             seq       = arr[0];
             timestamp = parseInt(arr[1],10);
             rpayload  = arr[2];
@@ -152,60 +143,46 @@
 
         function sendMsg() {
             var arr = [];
-            if (! ws.flush() ) {
-                message("WebSocket not ready, backing off");
-                actualSendDelay = actualSendDelay * 2;
-                send_ref = setTimeout(sendMsg, actualSendDelay);
-                return false;
-            } else {
-                // Scale the delay down to the requested minimum
-                if (actualSendDelay > sendDelay) {
-                    message("WebSocket ready, increasing presure");
-                    actualSendDelay = Math.max(actualSendDelay / 2, sendDelay);
-                }
-            }
-
             timestamp = (new Date()).getTime();
             arr.pushStr("^" + send_seq + ":" + timestamp + ":" + payload + "$");
             send_seq ++;
-            ws.send(arr);
+            ws.send(new Uint8Array(arr));
             sent++;
 
             showStats();
-            send_ref = setTimeout(sendMsg, actualSendDelay);
+            send_ref = setTimeout(sendMsg, sendDelay);
         }
 
         function showStats() {
-            $D('sent').innerHTML     = sent;
-            $D('received').innerHTML = received;
-            $D('laverage').innerHTML = laverage.toFixed(2);
-            $D('lrunning').innerHTML = lrunning.toFixed(2);
-            $D('lmin').innerHTML     = lmin.toFixed(2);
-            $D('lmax').innerHTML     = lmax.toFixed(2);
+            document.getElementById('sent').innerHTML     = sent;
+            document.getElementById('received').innerHTML = received;
+            document.getElementById('laverage').innerHTML = laverage.toFixed(2);
+            document.getElementById('lrunning').innerHTML = lrunning.toFixed(2);
+            document.getElementById('lmin').innerHTML     = lmin.toFixed(2);
+            document.getElementById('lmax').innerHTML     = lmax.toFixed(2);
         }
 
         function init_ws() {
             console.log(">> init_ws");
             var scheme = "ws://";
-            if ($D('encrypt').checked) {
+            if (document.getElementById('encrypt').checked) {
                 scheme = "wss://";
             }
             var uri = scheme + host + ":" + port;
             console.log("connecting to " + uri);
-            ws = new Websock();
-            ws.maxBufferedAmount = 5000;
-            ws.open(uri);
+            ws = new WebSocket(uri);
+            ws.binaryType = 'arraybuffer';
 
-            ws.on('message', function() {
-                recvMsg();
+            ws.addEventListener('message', function(e) {
+                recvMsg(e.data);
             });
-            ws.on('open', function() {
+            ws.addEventListener('open', function() {
                 send_ref = setTimeout(sendMsg, sendDelay);
             });
-            ws.on('close', function(e) {
+            ws.addEventListener('close', function(e) {
                 disconnect();
             });
-            ws.on('error', function(e) {
+            ws.addEventListener('error', function(e) {
                 message("Websock error: " + e);
                 disconnect();
             });
@@ -215,10 +192,10 @@
 
         function connect() {
             console.log(">> connect");
-            host = $D('host').value;
-            port = $D('port').value;
-            payload_size = parseInt($D('payload_size').value, 10);
-            sendDelay = parseInt($D('sendDelay').value, 10);
+            host = document.getElementById('host').value;
+            port = document.getElementById('port').value;
+            payload_size = parseInt(document.getElementById('payload_size').value, 10);
+            sendDelay = parseInt(document.getElementById('sendDelay').value, 10);
 
             if ((!host) || (!port)) {
                 console.log("must set host and port");
@@ -246,10 +223,9 @@
             lrunning  = 0;
             lmin      = 999999999;
             lmax      = 0;
-            actualSendDelay = sendDelay;
 
-            $D('connectButton').value = "Stop";
-            $D('connectButton').onclick = disconnect;
+            document.getElementById('connectButton').value = "Stop";
+            document.getElementById('connectButton').onclick = disconnect;
             console.log("<< connect");
         }
 
@@ -267,23 +243,18 @@
             recv_seq = 0;
             send_seq = 0;
 
-            $D('connectButton').value = "Start";
-            $D('connectButton').onclick = connect;
+            document.getElementById('connectButton').value = "Start";
+            document.getElementById('connectButton').onclick = connect;
             console.log("<< disconnect");
         }
 
 
         window.onload = function() {
             console.log("onload");
-            if (Websock_native) {
-                message("Using native WebSockets");
-            } else {
-                message("initializing web-socket-js flash bridge");
-            }
             var url = document.location.href;
-            $D('host').value = (url.match(/host=([^&#]*)/) || ['',window.location.hostname])[1];
-            $D('port').value = (url.match(/port=([^&#]*)/) || ['',window.location.port])[1];
-            $D('payload_size').value = payload_size;
+            document.getElementById('host').value = (url.match(/host=([^&#]*)/) || ['',window.location.hostname])[1];
+            document.getElementById('port').value = (url.match(/port=([^&#]*)/) || ['',window.location.port])[1];
+            document.getElementById('payload_size').value = payload_size;
         }
     </script>
 

tests/load.html

@@ -2,17 +2,6 @@
 
     <head>
         <title>WebSockets Load Test</title>
-        <script src="include/util.js"></script>
-        <script src="include/webutil.js"></script> 
-        <script src="include/base64.js"></script>
-        <script src="include/websock.js"></script> 
-        <!-- Uncomment to activate firebug lite -->
-        <!--
-        <script type='text/javascript' 
-            src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>
-        -->
-
-
     </head>
 
     <body>
@@ -48,7 +37,7 @@
 
         function error(str) {
             console.error(str);
-            cell = $D('error');
+            cell = document.getElementById('error');
             cell.innerHTML += errors + ": " + str + "\n";
             cell.scrollTop = cell.scrollHeight;
         }
@@ -75,8 +64,8 @@
         function check_respond(data) {
             //console.log(">> check_respond");
             var first, last, str, length, chksum, nums, arr;
-            first = String.fromCharCode(data.shift());
-            last = String.fromCharCode(data.pop());
+            first = String.fromCharCode(data[0]);
+            last = String.fromCharCode(data[data.length-1]);
 
             if (first != "^") {
                 errors++;
@@ -88,9 +77,11 @@
                 error("Packet missing end char '$'");
                 return;
             }
-            arr = data.map(function(num) {
-                    return String.fromCharCode(num); 
-                } ).join('').split(':');
+            text = ''
+            for (var i = 1; i < data.length-1; i++) {
+                text += String.fromCharCode(data[i]);
+            }
+            arr = text.split(':');
             seq    = arr[0];
             length = arr[1];
             chksum = arr[2];
@@ -138,44 +129,44 @@
             var nums = numlist.join('');
             arr.pushStr("^" + send_seq + ":" + length + ":" + chksum + ":" + nums + "$")
             send_seq ++;
-            ws.send(arr);
+            ws.send(new Uint8Array(arr));
             sent++;
         }
 
         function update_stats() {
-            $D('sent').innerHTML = sent;
-            $D('received').innerHTML = received;
-            $D('errors').innerHTML = errors;
+            document.getElementById('sent').innerHTML = sent;
+            document.getElementById('received').innerHTML = received;
+            document.getElementById('errors').innerHTML = errors;
         }
 
         function init_ws() {
             console.log(">> init_ws");
             var scheme = "ws://";
-            if ($D('encrypt').checked) {
+            if (document.getElementById('encrypt').checked) {
                 scheme = "wss://";
             }
             var uri = scheme + host + ":" + port;
             console.log("connecting to " + uri);
-            ws = new Websock();
-            ws.open(uri);
+            ws = new WebSocket(uri);
+            ws.binaryType = 'arraybuffer';
 
-            ws.on('message', function() {
+            ws.addEventListener('message', function(e) {
                 //console.log(">> WebSockets.onmessage");
-                arr = ws.rQshiftBytes(ws.rQlen());
+                arr = new Uint8Array(e.data);
                 check_respond(arr);
                 //console.log("<< WebSockets.onmessage");
             });
-            ws.on('open', function() {
+            ws.addEventListener('open', function() {
                 console.log(">> WebSockets.onopen");
                 send_ref = setInterval(send, sendDelay);
                 console.log("<< WebSockets.onopen");
             });
-            ws.on('close', function(e) {
+            ws.addEventListener('close', function(e) {
                 console.log(">> WebSockets.onclose");
                 clearInterval(send_ref);
                 console.log("<< WebSockets.onclose");
             });
-            ws.on('error', function(e) {
+            ws.addEventListener('error', function(e) {
                 console.log(">> WebSockets.onerror");
                 console.log("   " + e);
                 console.log("<< WebSockets.onerror");
@@ -186,9 +177,9 @@
 
         function connect() {
             console.log(">> connect");
-            host = $D('host').value;
-            port = $D('port').value;
-            sendDelay = parseInt($D('sendDelay').value, 10);
+            host = document.getElementById('host').value;
+            port = document.getElementById('port').value;
+            sendDelay = parseInt(document.getElementById('sendDelay').value, 10);
             if ((!host) || (!port)) {
                 console.log("must set host and port");
                 return;
@@ -200,8 +191,8 @@
             init_ws();
             update_ref = setInterval(update_stats, 1);
 
-            $D('connectButton').value = "Stop";
-            $D('connectButton').onclick = disconnect;
+            document.getElementById('connectButton').value = "Stop";
+            document.getElementById('connectButton').onclick = disconnect;
             console.log("<< connect");
         }
 
@@ -216,34 +207,16 @@
             recv_seq = 0;
             send_seq = 0;
 
-            $D('connectButton').value = "Start";
-            $D('connectButton').onclick = connect;
+            document.getElementById('connectButton').value = "Start";
+            document.getElementById('connectButton').onclick = connect;
             console.log("<< disconnect");
         }
 
-
-        /* If no builtin websockets then load web_socket.js */
-        if (window.WebSocket) {
-            VNC_native_ws = true;
-        } else {
-            VNC_native_ws = false;
-            console.log("Loading web-socket-js flash bridge");
-            var extra = "<script src='include/web-socket-js/swfobject.js'><\/script>";
-            extra += "<script src='include/web-socket-js/FABridge.js'><\/script>";
-            extra += "<script src='include/web-socket-js/web_socket.js'><\/script>";
-            document.write(extra);
-        }
-
         window.onload = function() {
             console.log("onload");
-            if (!VNC_native_ws) {
-                console.log("initializing web-socket-js flash bridge");
-                WebSocket.__swfLocation = "include/web-socket-js/WebSocketMain.swf";
-                WebSocket.__initialize();
-            }
             var url = document.location.href;
-            $D('host').value = (url.match(/host=([^&#]*)/) || ['',''])[1];
-            $D('port').value = (url.match(/port=([^&#]*)/) || ['',''])[1];
+            document.getElementById('host').value = (url.match(/host=([^&#]*)/) || ['',window.location.hostname])[1];
+            document.getElementById('port').value = (url.match(/port=([^&#]*)/) || ['',window.location.port])[1];
         }
     </script>
 

tests/load.py

@@ -8,9 +8,9 @@ given a sequence number. Any errors are reported and counted.
 
 import sys, os, select, random, time, optparse, logging
 sys.path.insert(0,os.path.join(os.path.dirname(__file__), ".."))
-from websockify.websocket import WebSocketServer, WebSocketRequestHandler
+from websockify.websockifyserver import WebSockifyServer, WebSockifyRequestHandler
 
-class WebSocketLoadServer(WebSocketServer):
+class WebSocketLoadServer(WebSockifyServer):
 
     recv_cnt = 0
     send_cnt = 0
@@ -18,10 +18,10 @@ class WebSocketLoadServer(WebSocketServer):
     def __init__(self, *args, **kwargs):
         self.delay = kwargs.pop('delay')
 
-        WebSocketServer.__init__(self, *args, **kwargs)
+        WebSockifyServer.__init__(self, *args, **kwargs)
 
 
-class WebSocketLoad(WebSocketRequestHandler):
+class WebSocketLoad(WebSockifyRequestHandler):
 
     max_packet_size = 10000
 
@@ -35,12 +35,10 @@ class WebSocketLoad(WebSocketRequestHandler):
         self.send_cnt = 0
         self.recv_cnt = 0
 
-        try:
-            self.responder(self.request)
-        except:
-            print "accumulated errors:", self.errors
-            self.errors = 0
-            raise
+        self.responder(self.request)
+
+        print "accumulated errors:", self.errors
+        self.errors = 0
 
     def responder(self, client):
         c_pend = 0
@@ -62,7 +60,7 @@ class WebSocketLoad(WebSocketRequestHandler):
                     print err
 
                 if closed:
-                    self.send_close()
+                    break
 
             now = time.time() * 1000
             if client in outs:
@@ -107,7 +105,7 @@ class WebSocketLoad(WebSocketRequestHandler):
                 cnt    = int(cnt)
                 length = int(length)
                 chksum = int(chksum)
-            except:
+            except ValueError:
                 print "\n<BOF>" + repr(data) + "<EOF>"
                 err += "Invalid data format\n"
                 continue
@@ -150,16 +148,16 @@ if __name__ == '__main__':
     (opts, args) = parser.parse_args()
 
     try:
-        if len(args) != 1: raise
+        if len(args) != 1: raise ValueError
         opts.listen_port = int(args[0])
 
-        if len(args) not in [1,2]: raise
+        if len(args) not in [1,2]: raise ValueError
         opts.listen_port = int(args[0])
         if len(args) == 2:
             opts.delay = int(args[1])
         else:
             opts.delay = 10
-    except:
+    except ValueError:
         parser.error("Invalid arguments")
 
     logging.basicConfig(level=logging.INFO)

tests/plain_echo.html

@@ -2,15 +2,6 @@
 
     <head>
         <title>WebSockets Echo Test</title>
-        <script src="include/util.js"></script>
-        <script src="include/webutil.js"></script> 
-        <!-- Uncomment to activate firebug lite -->
-        <!--
-        <script type='text/javascript' 
-            src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>
-        -->
-
-
     </head>
 
     <body>
@@ -35,7 +26,7 @@
 
         function message(str) {
             console.log(str);
-            cell = $D('messages');
+            cell = document.getElementById('messages');
             cell.innerHTML += msg_cnt + ": " + str + "\n";
             cell.scrollTop = cell.scrollHeight;
             msg_cnt++;
@@ -54,15 +45,16 @@
                 return;
             }
             var str = "Message #" + send_cnt, arr = [];
-            ws.send(str);
+            var encoder = new TextEncoder();
+            ws.send(encoder.encode(str));
             message("Sent message: '" + str + "'");
             send_cnt++;
         }
 
         function update_stats() {
-            $D('sent').innerHTML = sent;
-            $D('received').innerHTML = received;
-            $D('errors').innerHTML = errors;
+            document.getElementById('sent').innerHTML = sent;
+            document.getElementById('received').innerHTML = received;
+            document.getElementById('errors').innerHTML = errors;
         }
 
         function init_ws() {
@@ -71,8 +63,8 @@
         }
 
         function connect() {
-            var host = $D('host').value,
-                port = $D('port').value,
+            var host = document.getElementById('host').value,
+                port = document.getElementById('port').value,
                 scheme = "ws://", uri;
 
             console.log(">> connect");
@@ -85,42 +77,45 @@
                 ws.close();
             }
 
-            if ($D('encrypt').checked) {
+            if (document.getElementById('encrypt').checked) {
                 scheme = "wss://";
             }
             uri = scheme + host + ":" + port;
             message("connecting to " + uri);
-            ws = new WebSocket(uri, "base64");
+            ws = new WebSocket(uri);
+            ws.binaryType = 'arraybuffer';
 
-            ws.onmessage = function(e) {
+            ws.addEventListener('message', function(e) {
                 //console.log(">> WebSockets.onmessage");
-                message("Received message '" + e.data + "'");
+                var decoder = new TextDecoder('UTF-8');
+                var str = decoder.decode(e.data);
+                message("Received message '" + str + "'");
                 //console.log("<< WebSockets.onmessage");
-            };
-            ws.onopen = function(e) {
+            });
+            ws.addEventListener('open', function(e) {
                 console.log(">> WebSockets.onopen");
                 echo_ref = setInterval(send_msg, echoDelay);
                 console.log("<< WebSockets.onopen");
-            };
-            ws.onclose = function(e) {
+            });
+            ws.addEventListener('close', function(e) {
                 console.log(">> WebSockets.onclose");
                 if (echo_ref) {
                     clearInterval(echo_ref);
                     echo_ref = null;
                 }
                 console.log("<< WebSockets.onclose");
-            };
-            ws.onerror = function(e) {
+            });
+            ws.addEventListener('error', function(e) {
                 console.log(">> WebSockets.onerror");
                 if (echo_ref) {
                     clearInterval(echo_ref);
                     echo_ref = null;
                 }
                 console.log("<< WebSockets.onerror");
-            };
+            });
 
-            $D('connectButton').value = "Stop";
-            $D('connectButton').onclick = disconnect;
+            document.getElementById('connectButton').value = "Stop";
+            document.getElementById('connectButton').onclick = disconnect;
             console.log("<< connect");
         }
 
@@ -134,34 +129,16 @@
                 clearInterval(echo_ref);
             }
 
-            $D('connectButton').value = "Start";
-            $D('connectButton').onclick = connect;
+            document.getElementById('connectButton').value = "Start";
+            document.getElementById('connectButton').onclick = connect;
             console.log("<< disconnect");
         }
 
-
-        /* If no builtin websockets then load web_socket.js */
-        if (window.WebSocket) {
-            VNC_native_ws = true;
-        } else {
-            VNC_native_ws = false;
-            console.log("Loading web-socket-js flash bridge");
-            var extra = "<script src='include/web-socket-js/swfobject.js'><\/script>";
-            extra += "<script src='include/web-socket-js/FABridge.js'><\/script>";
-            extra += "<script src='include/web-socket-js/web_socket.js'><\/script>";
-            document.write(extra);
-        }
-
         window.onload = function() {
             console.log("onload");
-            if (!VNC_native_ws) {
-                console.log("initializing web-socket-js flash bridge");
-                WebSocket.__swfLocation = "include/web-socket-js/WebSocketMain.swf";
-                WebSocket.__initialize();
-            }
             var url = document.location.href;
-            $D('host').value = (url.match(/host=([^&#]*)/) || ['',''])[1];
-            $D('port').value = (url.match(/port=([^&#]*)/) || ['',''])[1];
+            document.getElementById('host').value = (url.match(/host=([^&#]*)/) || ['',window.location.hostname])[1];
+            document.getElementById('port').value = (url.match(/port=([^&#]*)/) || ['',window.location.port])[1];
         }
     </script>
 

tests/simple.html

@@ -2,9 +2,6 @@
 
     <head>
         <title>Websock Simple Client</title>
-        <script src="include/util.js"></script>
-        <script src="include/base64.js"></script>
-        <script src="include/websock.js"></script> 
     </head>
 
     <body>
@@ -21,8 +18,8 @@
 
 
     <script>
-        var $D = function(id) { return document.getElementById(id); },
-            ws = null, msgs = $D('messages');
+        var document.getElementById = function(id) { return document.getElementById(id); },
+            ws = null, msgs = document.getElementById('messages');
 
         function msg(str) {
             msgs.innerHTML += str + "\n";
@@ -30,38 +27,38 @@
         }
 
         function connect() {
-            var uri = $D('target').value;
-            ws = new Websock()
+            var uri = document.getElementById('target').value;
             msg("connecting to: " + uri);
-            ws.open(uri);
-            ws.on('open', function () {
+            ws = new WebSocket(uri);
+            ws.binaryType = 'arraybuffer';
+            ws.addEventListener('open', function () {
                 msg("Connected");
             });
-            ws.on('message', function () {
-                msg("Received: " + ws.rQshiftStr());
+            ws.addEventListener('message', function (e) {
+                msg("Received: " + e.data);
             });
-            ws.on('close', function () {
+            ws.addEventListener('close', function () {
                 disconnect();
                 msg("Disconnected");
             });
 
-            $D('connectButton').value = "Disconnect";
-            $D('connectButton').onclick = disconnect;
-            $D('sendButton').disabled = false;
+            document.getElementById('connectButton').value = "Disconnect";
+            document.getElementById('connectButton').onclick = disconnect;
+            document.getElementById('sendButton').disabled = false;
         }
 
         function disconnect() {
             if (ws) { ws.close(); }
             ws = null;
 
-            $D('connectButton').value = "Connect";
-            $D('connectButton').onclick = connect;
-            $D('sendButton').disabled = true;
+            document.getElementById('connectButton').value = "Connect";
+            document.getElementById('connectButton').onclick = connect;
+            document.getElementById('sendButton').disabled = true;
         }
 
         function send() {
-            msg("Sending: " + $D('sendText').value);
-            ws.send_string($D('sendText').value);
+            msg("Sending: " + document.getElementById('sendText').value);
+            ws.send_string(document.getElementById('sendText').value);
         };
     </script>
 

tests/test_auth_plugins.py

@@ -0,0 +1,28 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+""" Unit tests for Authentication plugins"""
+
+from websockify.auth_plugins import BasicHTTPAuth, AuthenticationError
+import unittest
+
+
+class BasicHTTPAuthTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.plugin = BasicHTTPAuth('Aladdin:open sesame')
+
+    def test_no_auth(self):
+        headers = {}
+        self.assertRaises(AuthenticationError, self.plugin.authenticate, headers, 'localhost', '1234')
+
+    def test_invalid_password(self):
+        headers = {'Authorization': 'Basic QWxhZGRpbjpzZXNhbWUgc3RyZWV0'}
+        self.assertRaises(AuthenticationError, self.plugin.authenticate, headers, 'localhost', '1234')
+
+    def test_valid_password(self):
+        headers = {'Authorization': 'Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ=='}
+        self.plugin.authenticate(headers, 'localhost', '1234')
+
+    def test_garbage_auth(self):
+        headers = {'Authorization': 'Basic xxxxxxxxxxxxxxxxxxxxxxxxxxxx'}
+        self.assertRaises(AuthenticationError, self.plugin.authenticate, headers, 'localhost', '1234')

tests/test_token_plugins.py

@@ -0,0 +1,179 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+""" Unit tests for Token plugins"""
+
+import unittest
+from unittest.mock import patch, mock_open, MagicMock
+from jwcrypto import jwt
+
+from websockify.token_plugins import ReadOnlyTokenFile, JWTTokenApi
+
+class ReadOnlyTokenFileTestCase(unittest.TestCase):
+    patch('os.path.isdir', MagicMock(return_value=False))
+    def test_empty(self):
+        plugin = ReadOnlyTokenFile('configfile')
+
+        config = ""
+        pyopen = mock_open(read_data=config)
+
+        with patch("websockify.token_plugins.open", pyopen, create=True):
+            result = plugin.lookup('testhost')
+
+        pyopen.assert_called_once_with('configfile')
+        self.assertIsNone(result)
+
+    patch('os.path.isdir', MagicMock(return_value=False))
+    def test_simple(self):
+        plugin = ReadOnlyTokenFile('configfile')
+
+        config = "testhost: remote_host:remote_port"
+        pyopen = mock_open(read_data=config)
+
+        with patch("websockify.token_plugins.open", pyopen, create=True):
+            result = plugin.lookup('testhost')
+
+        pyopen.assert_called_once_with('configfile')
+        self.assertIsNotNone(result)
+        self.assertEqual(result[0], "remote_host")
+        self.assertEqual(result[1], "remote_port")
+
+    patch('os.path.isdir', MagicMock(return_value=False))
+    def test_tabs(self):
+        plugin = ReadOnlyTokenFile('configfile')
+
+        config = "testhost:\tremote_host:remote_port"
+        pyopen = mock_open(read_data=config)
+
+        with patch("websockify.token_plugins.open", pyopen, create=True):
+            result = plugin.lookup('testhost')
+
+        pyopen.assert_called_once_with('configfile')
+        self.assertIsNotNone(result)
+        self.assertEqual(result[0], "remote_host")
+        self.assertEqual(result[1], "remote_port")
+
+class JWSTokenTestCase(unittest.TestCase):
+    def test_asymmetric_jws_token_plugin(self):
+        plugin = JWTTokenApi("./tests/fixtures/public.pem")
+
+        key = jwt.JWK()
+        private_key = open("./tests/fixtures/private.pem", "rb").read()
+        key.import_from_pem(private_key)
+        jwt_token = jwt.JWT({"alg": "RS256"}, {'host': "remote_host", 'port': "remote_port"})
+        jwt_token.make_signed_token(key)
+
+        result = plugin.lookup(jwt_token.serialize())
+
+        self.assertIsNotNone(result)
+        self.assertEqual(result[0], "remote_host")
+        self.assertEqual(result[1], "remote_port")
+
+    def test_asymmetric_jws_token_plugin_with_illigal_key_exception(self):
+        plugin = JWTTokenApi("wrong.pub")
+
+        key = jwt.JWK()
+        private_key = open("./tests/fixtures/private.pem", "rb").read()
+        key.import_from_pem(private_key)
+        jwt_token = jwt.JWT({"alg": "RS256"}, {'host': "remote_host", 'port': "remote_port"})
+        jwt_token.make_signed_token(key)
+
+        result = plugin.lookup(jwt_token.serialize())
+
+        self.assertIsNone(result)
+
+    @patch('time.time')
+    def test_jwt_valid_time(self, mock_time):
+        plugin = JWTTokenApi("./tests/fixtures/public.pem")
+
+        key = jwt.JWK()
+        private_key = open("./tests/fixtures/private.pem", "rb").read()
+        key.import_from_pem(private_key)
+        jwt_token = jwt.JWT({"alg": "RS256"}, {'host': "remote_host", 'port': "remote_port", 'nbf': 100, 'exp': 200 })
+        jwt_token.make_signed_token(key)
+        mock_time.return_value = 150
+
+        result = plugin.lookup(jwt_token.serialize())
+
+        self.assertIsNotNone(result)
+        self.assertEqual(result[0], "remote_host")
+        self.assertEqual(result[1], "remote_port")
+
+    @patch('time.time')
+    def test_jwt_early_time(self, mock_time):
+        plugin = JWTTokenApi("./tests/fixtures/public.pem")
+
+        key = jwt.JWK()
+        private_key = open("./tests/fixtures/private.pem", "rb").read()
+        key.import_from_pem(private_key)
+        jwt_token = jwt.JWT({"alg": "RS256"}, {'host': "remote_host", 'port': "remote_port", 'nbf': 100, 'exp': 200 })
+        jwt_token.make_signed_token(key)
+        mock_time.return_value = 50
+
+        result = plugin.lookup(jwt_token.serialize())
+
+        self.assertIsNone(result)
+
+    @patch('time.time')
+    def test_jwt_late_time(self, mock_time):
+        plugin = JWTTokenApi("./tests/fixtures/public.pem")
+
+        key = jwt.JWK()
+        private_key = open("./tests/fixtures/private.pem", "rb").read()
+        key.import_from_pem(private_key)
+        jwt_token = jwt.JWT({"alg": "RS256"}, {'host': "remote_host", 'port': "remote_port", 'nbf': 100, 'exp': 200 })
+        jwt_token.make_signed_token(key)
+        mock_time.return_value = 250
+
+        result = plugin.lookup(jwt_token.serialize())
+
+        self.assertIsNone(result)
+
+    def test_symmetric_jws_token_plugin(self):
+        plugin = JWTTokenApi("./tests/fixtures/symmetric.key")
+
+        secret = open("./tests/fixtures/symmetric.key").read()
+        key = jwt.JWK()
+        key.import_key(kty="oct",k=secret)
+        jwt_token = jwt.JWT({"alg": "HS256"}, {'host': "remote_host", 'port': "remote_port"})
+        jwt_token.make_signed_token(key)
+
+        result = plugin.lookup(jwt_token.serialize())
+
+        self.assertIsNotNone(result)
+        self.assertEqual(result[0], "remote_host")
+        self.assertEqual(result[1], "remote_port")
+
+    def test_symmetric_jws_token_plugin_with_illigal_key_exception(self):
+        plugin = JWTTokenApi("wrong_sauce")
+
+        secret = open("./tests/fixtures/symmetric.key").read()
+        key = jwt.JWK()
+        key.import_key(kty="oct",k=secret)
+        jwt_token = jwt.JWT({"alg": "HS256"}, {'host': "remote_host", 'port': "remote_port"})
+        jwt_token.make_signed_token(key)
+
+        result = plugin.lookup(jwt_token.serialize())
+
+        self.assertIsNone(result)
+
+    def test_asymmetric_jwe_token_plugin(self):
+        plugin = JWTTokenApi("./tests/fixtures/private.pem")
+
+        private_key = jwt.JWK()
+        public_key = jwt.JWK()
+        private_key_data = open("./tests/fixtures/private.pem", "rb").read()
+        public_key_data = open("./tests/fixtures/public.pem", "rb").read()
+        private_key.import_from_pem(private_key_data)
+        public_key.import_from_pem(public_key_data)
+        jwt_token = jwt.JWT({"alg": "RS256"}, {'host': "remote_host", 'port': "remote_port"})
+        jwt_token.make_signed_token(private_key)
+        jwe_token = jwt.JWT(header={"alg": "RSA1_5", "enc": "A256CBC-HS512"},
+                    claims=jwt_token.serialize())
+        jwe_token.make_encrypted_token(public_key)
+
+        result = plugin.lookup(jwt_token.serialize())
+
+        self.assertIsNotNone(result)
+        self.assertEqual(result[0], "remote_host")
+        self.assertEqual(result[1], "remote_port")
+

tests/test_websocket.py

@@ -15,229 +15,198 @@
 #    under the License.
 
 """ Unit tests for websocket """
-import errno
-import os
-import logging
-import select
-import shutil
-import socket
-import ssl
-import stubout
-import sys
-import tempfile
 import unittest
-from ssl import SSLError
-from websockify import websocket as websocket
-from SimpleHTTPServer import SimpleHTTPRequestHandler
+from websockify import websocket
 
+class FakeSocket:
+    def __init__(self):
+        self.data = b''
 
-class MockConnection(object):
-    def __init__(self, path):
-        self.path = path
+    def send(self, buf):
+        self.data += buf
+        return len(buf)
 
-    def makefile(self, mode='r', bufsize=-1):
-        return open(self.path, mode, bufsize)
+class AcceptTestCase(unittest.TestCase):
+    def test_success(self):
+        ws = websocket.WebSocket()
+        sock = FakeSocket()
+        ws.accept(sock, {'upgrade': 'websocket',
+                         'Sec-WebSocket-Version': '13',
+                         'Sec-WebSocket-Key': 'DKURYVK9cRFul1vOZVA56Q=='})
+        self.assertEqual(sock.data[:13], b'HTTP/1.1 101 ')
+        self.assertTrue(b'\r\nUpgrade: websocket\r\n' in sock.data)
+        self.assertTrue(b'\r\nConnection: Upgrade\r\n' in sock.data)
+        self.assertTrue(b'\r\nSec-WebSocket-Accept: pczpYSQsvE1vBpTQYjFQPcuoj6M=\r\n' in sock.data)
 
+    def test_bad_version(self):
+        ws = websocket.WebSocket()
+        sock = FakeSocket()
+        self.assertRaises(Exception, ws.accept,
+                          sock, {'upgrade': 'websocket',
+                                 'Sec-WebSocket-Key': 'DKURYVK9cRFul1vOZVA56Q=='})
+        self.assertRaises(Exception, ws.accept,
+                          sock, {'upgrade': 'websocket',
+                                 'Sec-WebSocket-Version': '5',
+                                 'Sec-WebSocket-Key': 'DKURYVK9cRFul1vOZVA56Q=='})
+        self.assertRaises(Exception, ws.accept,
+                          sock, {'upgrade': 'websocket',
+                                 'Sec-WebSocket-Version': '20',
+                                 'Sec-WebSocket-Key': 'DKURYVK9cRFul1vOZVA56Q=='})
 
-class WebSocketTestCase(unittest.TestCase):
+    def test_bad_upgrade(self):
+        ws = websocket.WebSocket()
+        sock = FakeSocket()
+        self.assertRaises(Exception, ws.accept,
+                          sock, {'Sec-WebSocket-Version': '13',
+                                 'Sec-WebSocket-Key': 'DKURYVK9cRFul1vOZVA56Q=='})
+        self.assertRaises(Exception, ws.accept,
+                          sock, {'upgrade': 'websocket2',
+                                 'Sec-WebSocket-Version': '13',
+                                 'Sec-WebSocket-Key': 'DKURYVK9cRFul1vOZVA56Q=='})
 
-    def _init_logger(self, tmpdir):
-        name = 'websocket-unittest'
-        logger = logging.getLogger(name)
-        logger.setLevel(logging.DEBUG)
-        logger.propagate = True
-        filename = "%s.log" % (name)
-        handler = logging.FileHandler(filename)
-        handler.setFormatter(logging.Formatter("%(message)s"))
-        logger.addHandler(handler)
+    def test_missing_key(self):
+        ws = websocket.WebSocket()
+        sock = FakeSocket()
+        self.assertRaises(Exception, ws.accept,
+                          sock, {'upgrade': 'websocket',
+                                 'Sec-WebSocket-Version': '13'})
 
+    def test_protocol(self):
+        class ProtoSocket(websocket.WebSocket):
+            def select_subprotocol(self, protocol):
+                return 'gazonk'
+
+        ws = ProtoSocket()
+        sock = FakeSocket()
+        ws.accept(sock, {'upgrade': 'websocket',
+                         'Sec-WebSocket-Version': '13',
+                         'Sec-WebSocket-Key': 'DKURYVK9cRFul1vOZVA56Q==',
+                         'Sec-WebSocket-Protocol': 'foobar gazonk'})
+        self.assertEqual(sock.data[:13], b'HTTP/1.1 101 ')
+        self.assertTrue(b'\r\nSec-WebSocket-Protocol: gazonk\r\n' in sock.data)
+
+    def test_no_protocol(self):
+        ws = websocket.WebSocket()
+        sock = FakeSocket()
+        ws.accept(sock, {'upgrade': 'websocket',
+                         'Sec-WebSocket-Version': '13',
+                         'Sec-WebSocket-Key': 'DKURYVK9cRFul1vOZVA56Q=='})
+        self.assertEqual(sock.data[:13], b'HTTP/1.1 101 ')
+        self.assertFalse(b'\r\nSec-WebSocket-Protocol:' in sock.data)
+
+    def test_missing_protocol(self):
+        ws = websocket.WebSocket()
+        sock = FakeSocket()
+        self.assertRaises(Exception, ws.accept,
+                          sock, {'upgrade': 'websocket',
+                                 'Sec-WebSocket-Version': '13',
+                                 'Sec-WebSocket-Key': 'DKURYVK9cRFul1vOZVA56Q==',
+                                 'Sec-WebSocket-Protocol': 'foobar gazonk'})
+
+    def test_protocol(self):
+        class ProtoSocket(websocket.WebSocket):
+            def select_subprotocol(self, protocol):
+                return 'oddball'
+
+        ws = ProtoSocket()
+        sock = FakeSocket()
+        self.assertRaises(Exception, ws.accept,
+                          sock, {'upgrade': 'websocket',
+                                 'Sec-WebSocket-Version': '13',
+                                 'Sec-WebSocket-Key': 'DKURYVK9cRFul1vOZVA56Q==',
+                                 'Sec-WebSocket-Protocol': 'foobar gazonk'})
+
+class PingPongTest(unittest.TestCase):
     def setUp(self):
-        """Called automatically before each test."""
-        super(WebSocketTestCase, self).setUp()
-        self.stubs = stubout.StubOutForTesting()
-        # Temporary dir for test data
-        self.tmpdir = tempfile.mkdtemp()
-        # Put log somewhere persistent
-        self._init_logger('./')
-        # Mock this out cause it screws tests up
-        self.stubs.Set(os, 'chdir', lambda *args, **kwargs: None)
-        self.server = self._get_websockserver(daemon=True,
-                                              ssl_only=False)
-        self.soc = self.server.socket('localhost')
+        self.ws = websocket.WebSocket()
+        self.sock = FakeSocket()
+        self.ws.accept(self.sock, {'upgrade': 'websocket',
+                                   'Sec-WebSocket-Version': '13',
+                                   'Sec-WebSocket-Key': 'DKURYVK9cRFul1vOZVA56Q=='})
+        self.assertEqual(self.sock.data[:13], b'HTTP/1.1 101 ')
+        self.sock.data = b''
 
-    def tearDown(self):
-        """Called automatically after each test."""
-        self.stubs.UnsetAll()
-        shutil.rmtree(self.tmpdir)
-        super(WebSocketTestCase, self).tearDown()
+    def test_ping(self):
+        self.ws.ping()
+        self.assertEqual(self.sock.data, b'\x89\x00')
 
-    def _get_websockserver(self, **kwargs):
-        return websocket.WebSocketServer(listen_host='localhost',
-                                         listen_port=80,
-                                         key=self.tmpdir,
-                                         web=self.tmpdir,
-                                         record=self.tmpdir,
-                                         **kwargs)        
+    def test_pong(self):
+        self.ws.pong()
+        self.assertEqual(self.sock.data, b'\x8a\x00')
 
-    def _mock_os_open_oserror(self, file, flags):
-        raise OSError('')
+    def test_ping_data(self):
+        self.ws.ping(b'foo')
+        self.assertEqual(self.sock.data, b'\x89\x03foo')
 
-    def _mock_os_close_oserror(self, fd):
-        raise OSError('')
+    def test_pong_data(self):
+        self.ws.pong(b'foo')
+        self.assertEqual(self.sock.data, b'\x8a\x03foo')
 
-    def _mock_os_close_oserror_EBADF(self, fd):
-        raise OSError(errno.EBADF, '')
+class HyBiEncodeDecodeTestCase(unittest.TestCase):
+    def test_decode_hybi_text(self):
+        buf = b'\x81\x85\x37\xfa\x21\x3d\x7f\x9f\x4d\x51\x58'
+        ws = websocket.WebSocket()
+        res = ws._decode_hybi(buf)
 
-    def _mock_socket(self, *args, **kwargs):
-        return self.soc
+        self.assertEqual(res['fin'], 1)
+        self.assertEqual(res['opcode'], 0x1)
+        self.assertEqual(res['masked'], True)
+        self.assertEqual(res['length'], len(buf))
+        self.assertEqual(res['payload'], b'Hello')
 
-    def _mock_select(self, rlist, wlist, xlist, timeout=None):
-        return '_mock_select'
+    def test_decode_hybi_binary(self):
+        buf = b'\x82\x04\x01\x02\x03\x04'
+        ws = websocket.WebSocket()
+        res = ws._decode_hybi(buf)
 
-    def _mock_select_exception(self, rlist, wlist, xlist, timeout=None):
-        raise Exception
+        self.assertEqual(res['fin'], 1)
+        self.assertEqual(res['opcode'], 0x2)
+        self.assertEqual(res['length'], len(buf))
+        self.assertEqual(res['payload'], b'\x01\x02\x03\x04')
 
-    def _mock_select_keyboardinterrupt(self, rlist, wlist,
-                                       xlist, timeout=None):
-        raise KeyboardInterrupt
+    def test_decode_hybi_extended_16bit_binary(self):
+        data = (b'\x01\x02\x03\x04' * 65)  # len > 126 -- len == 260
+        buf = b'\x82\x7e\x01\x04' + data
+        ws = websocket.WebSocket()
+        res = ws._decode_hybi(buf)
 
-    def _mock_select_systemexit(self, rlist, wlist, xlist, timeout=None):
-        sys.exit()
+        self.assertEqual(res['fin'], 1)
+        self.assertEqual(res['opcode'], 0x2)
+        self.assertEqual(res['length'], len(buf))
+        self.assertEqual(res['payload'], data)
 
-    def test_daemonize_error(self):
-        soc = self._get_websockserver(daemon=True, ssl_only=1, idle_timeout=1)
-        self.stubs.Set(os, 'fork', lambda *args: None)
-        self.stubs.Set(os, 'setsid', lambda *args: None)
-        self.stubs.Set(os, 'close', self._mock_os_close_oserror)
-        self.assertRaises(OSError, soc.daemonize, keepfd=None, chdir='./')
+    def test_decode_hybi_extended_64bit_binary(self):
+        data = (b'\x01\x02\x03\x04' * 65)  # len > 126 -- len == 260
+        buf = b'\x82\x7f\x00\x00\x00\x00\x00\x00\x01\x04' + data
+        ws = websocket.WebSocket()
+        res = ws._decode_hybi(buf)
 
-    def test_daemonize_EBADF_error(self):
-        soc = self._get_websockserver(daemon=True, ssl_only=1, idle_timeout=1)
-        self.stubs.Set(os, 'fork', lambda *args: None)
-        self.stubs.Set(os, 'setsid', lambda *args: None)
-        self.stubs.Set(os, 'close', self._mock_os_close_oserror_EBADF)
-        self.stubs.Set(os, 'open', self._mock_os_open_oserror)
-        self.assertRaises(OSError, soc.daemonize, keepfd=None, chdir='./')
+        self.assertEqual(res['fin'], 1)
+        self.assertEqual(res['opcode'], 0x2)
+        self.assertEqual(res['length'], len(buf))
+        self.assertEqual(res['payload'], data)
 
-    def test_decode_hybi(self):
-        soc = self._get_websockserver(daemon=False, ssl_only=1, idle_timeout=1)
-        self.assertRaises(Exception, soc.decode_hybi, 'a' * 128,
-                          base64=True)
+    def test_decode_hybi_multi(self):
+        buf1 = b'\x01\x03\x48\x65\x6c'
+        buf2 = b'\x80\x02\x6c\x6f'
 
-    def test_do_websocket_handshake(self):
-        soc = self._get_websockserver(daemon=True, ssl_only=0, idle_timeout=1)
-        soc.scheme = 'scheme'
-        headers = {'Sec-WebSocket-Protocol': 'binary',
-                   'Sec-WebSocket-Version': '7',
-                   'Sec-WebSocket-Key': 'foo'}
-        soc.do_websocket_handshake(headers, '127.0.0.1')
+        ws = websocket.WebSocket()
 
-    def test_do_handshake(self):
-        soc = self._get_websockserver(daemon=True, ssl_only=0, idle_timeout=1)
-        self.stubs.Set(select, 'select', self._mock_select)
-        self.stubs.Set(socket._socketobject, 'recv', lambda *args: 'mock_recv')
-        self.assertRaises(Exception, soc.do_handshake, self.soc, '127.0.0.1')
+        res1 = ws._decode_hybi(buf1)
+        self.assertEqual(res1['fin'], 0)
+        self.assertEqual(res1['opcode'], 0x1)
+        self.assertEqual(res1['length'], len(buf1))
+        self.assertEqual(res1['payload'], b'Hel')
 
-    def test_do_handshake_ssl_error(self):
-        soc = self._get_websockserver(daemon=True, ssl_only=0, idle_timeout=1)
+        res2 = ws._decode_hybi(buf2)
+        self.assertEqual(res2['fin'], 1)
+        self.assertEqual(res2['opcode'], 0x0)
+        self.assertEqual(res2['length'], len(buf2))
+        self.assertEqual(res2['payload'], b'lo')
 
-        def _mock_wrap_socket(*args, **kwargs):
-            from ssl import SSLError
-            raise SSLError('unit test exception')
+    def test_encode_hybi_basic(self):
+        ws = websocket.WebSocket()
+        res = ws._encode_hybi(0x1, b'Hello')
+        expected = b'\x81\x05\x48\x65\x6c\x6c\x6f'
 
-        self.stubs.Set(select, 'select', self._mock_select)
-        self.stubs.Set(socket._socketobject, 'recv', lambda *args: '\x16')
-        self.stubs.Set(ssl, 'wrap_socket', _mock_wrap_socket)
-        self.assertRaises(SSLError, soc.do_handshake, self.soc, '127.0.0.1')
-
-    def test_fallback_SIGCHILD(self):
-        soc = self._get_websockserver(daemon=True, ssl_only=0, idle_timeout=1)
-        soc.fallback_SIGCHLD(None, None)
-
-    def test_start_server_Exception(self):
-        soc = self._get_websockserver(daemon=False, ssl_only=1, idle_timeout=1)
-        self.stubs.Set(websocket.WebSocketServer, 'socket', self._mock_socket)
-        self.stubs.Set(websocket.WebSocketServer, 'daemonize',
-                       lambda *args, **kwargs: None)
-        self.stubs.Set(select, 'select', self._mock_select_exception)
-        self.assertEqual(None, soc.start_server())
-
-    def test_start_server_KeyboardInterrupt(self):
-        soc = self._get_websockserver(daemon=False, ssl_only=1, idle_timeout=1)
-        self.stubs.Set(websocket.WebSocketServer, 'socket', self._mock_socket)
-        self.stubs.Set(websocket.WebSocketServer, 'daemonize',
-                       lambda *args, **kwargs: None)
-        self.stubs.Set(select, 'select', self._mock_select_keyboardinterrupt)
-        self.assertEqual(None, soc.start_server())
-
-    def test_start_server_systemexit(self):
-        websocket.ssl = None
-        self.stubs.Set(websocket.WebSocketServer, 'socket', self._mock_socket)
-        self.stubs.Set(websocket.WebSocketServer, 'daemonize',
-                       lambda *args, **kwargs: None)
-        self.stubs.Set(select, 'select', self._mock_select_systemexit)
-        soc = self._get_websockserver(daemon=True, ssl_only=0, idle_timeout=1,
-                                      verbose=True)
-        self.assertEqual(None, soc.start_server())
-
-    def test_WSRequestHandle_do_GET_nofile(self):
-        request = 'GET /tmp.txt HTTP/0.9'
-        with tempfile.NamedTemporaryFile() as test_file:
-            test_file.write(request)
-            test_file.flush()
-            test_file.seek(0)
-            con = MockConnection(test_file.name)
-            soc = websocket.WSRequestHandler(con, "127.0.0.1", file_only=True)
-            soc.path = ''
-            soc.headers = {'upgrade': ''}
-            self.stubs.Set(SimpleHTTPRequestHandler, 'send_response',
-                           lambda *args: None)
-            soc.do_GET()
-            self.assertEqual(404, soc.last_code)
-
-    def test_WSRequestHandle_do_GET_hidden_resource(self):
-        request = 'GET /tmp.txt HTTP/0.9'
-        with tempfile.NamedTemporaryFile() as test_file:
-            test_file.write(request)
-            test_file.flush()
-            test_file.seek(0)
-            con = MockConnection(test_file.name)
-            soc = websocket.WSRequestHandler(con, '127.0.0.1', no_parent=True)
-            soc.path = test_file.name + '?'
-            soc.headers = {'upgrade': ''}
-            soc.webroot = 'no match startswith'
-            self.stubs.Set(SimpleHTTPRequestHandler,
-                           'send_response',
-                           lambda *args: None)
-        soc.do_GET()
-        self.assertEqual(403, soc.last_code)
-
-    def testsocket_set_keepalive_options(self):
-        keepcnt = 12
-        keepidle = 34
-        keepintvl = 56
-
-        sock = self.server.socket('localhost',
-                                  tcp_keepcnt=keepcnt,
-                                  tcp_keepidle=keepidle,
-                                  tcp_keepintvl=keepintvl)
-
-        self.assertEqual(sock.getsockopt(socket.SOL_TCP,
-                                         socket.TCP_KEEPCNT), keepcnt)
-        self.assertEqual(sock.getsockopt(socket.SOL_TCP,
-                                         socket.TCP_KEEPIDLE), keepidle)
-        self.assertEqual(sock.getsockopt(socket.SOL_TCP,
-                                         socket.TCP_KEEPINTVL), keepintvl)
-
-        sock = self.server.socket('localhost',
-                                  tcp_keepalive=False,
-                                  tcp_keepcnt=keepcnt,
-                                  tcp_keepidle=keepidle,
-                                  tcp_keepintvl=keepintvl)
-
-        self.assertNotEqual(sock.getsockopt(socket.SOL_TCP,
-                                            socket.TCP_KEEPCNT), keepcnt)
-        self.assertNotEqual(sock.getsockopt(socket.SOL_TCP,
-                                            socket.TCP_KEEPIDLE), keepidle)
-        self.assertNotEqual(sock.getsockopt(socket.SOL_TCP,
-                                            socket.TCP_KEEPINTVL), keepintvl)
+        self.assertEqual(res, expected)

tests/test_websocketproxy.py

@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright(c)2013 NTT corp. All Rights Reserved.
+# Copyright(c) 2015 Red Hat, Inc All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -15,113 +15,117 @@
 #    under the License.
 
 """ Unit tests for websocketproxy """
-import os
-import logging
-import select
-import shutil
-import stubout
-import subprocess
-import tempfile
-import time
+
+import sys
 import unittest
+import unittest
+import socket
+from io import StringIO
+from io import BytesIO
+from unittest.mock import patch, MagicMock
 
 from websockify import websocketproxy
+from websockify import token_plugins
+from websockify import auth_plugins
 
 
-class MockSocket(object):
-    def __init__(*args, **kwargs):
+class FakeSocket(object):
+    def __init__(self, data=b''):
+        self._data = data
+
+    def recv(self, amt, flags=None):
+        res = self._data[0:amt]
+        if not (flags & socket.MSG_PEEK):
+            self._data = self._data[amt:]
+
+        return res
+
+    def makefile(self, mode='r', buffsize=None):
+        if 'b' in mode:
+            return BytesIO(self._data)
+        else:
+            return StringIO(self._data.decode('latin_1'))
+
+
+class FakeServer(object):
+    class EClose(Exception):
         pass
 
-    def shutdown(*args):
-        pass
-
-    def close(*args):
-        pass
-
-
-class WebSocketProxyTest(unittest.TestCase):
-
-    def _init_logger(self, tmpdir):
-        name = 'websocket-unittest'
-        logger = logging.getLogger(name)
-        logger.setLevel(logging.DEBUG)
-        logger.propagate = True
-        filename = "%s.log" % (name)
-        handler = logging.FileHandler(filename)
-        handler.setFormatter(logging.Formatter("%(message)s"))
-        logger.addHandler(handler)
+    def __init__(self):
+        self.token_plugin = None
+        self.auth_plugin = None
+        self.wrap_cmd = None
+        self.ssl_target = None
+        self.unix_target = None
 
+class ProxyRequestHandlerTestCase(unittest.TestCase):
     def setUp(self):
-        """Called automatically before each test."""
-        super(WebSocketProxyTest, self).setUp()
-        self.soc = ''
-        self.stubs = stubout.StubOutForTesting()
-        # Temporary dir for test data
-        self.tmpdir = tempfile.mkdtemp()
-        # Put log somewhere persistent
-        self._init_logger('./')
-        # Mock this out cause it screws tests up
-        self.stubs.Set(os, 'chdir', lambda *args, **kwargs: None)
+        super(ProxyRequestHandlerTestCase, self).setUp()
+        self.handler = websocketproxy.ProxyRequestHandler(
+            FakeSocket(), "127.0.0.1", FakeServer())
+        self.handler.path = "https://localhost:6080/websockify?token=blah"
+        self.handler.headers = None
+        patch('websockify.websockifyserver.WebSockifyServer.socket').start()
 
     def tearDown(self):
-        """Called automatically after each test."""
-        self.stubs.UnsetAll()
-        shutil.rmtree(self.tmpdir)
-        super(WebSocketProxyTest, self).tearDown()
+        patch.stopall()
+        super(ProxyRequestHandlerTestCase, self).tearDown()
 
-    def _get_websockproxy(self, **kwargs):
-        return websocketproxy.WebSocketProxy(key=self.tmpdir,
-                                             web=self.tmpdir,
-                                             record=self.tmpdir,
-                                             **kwargs)
+    def test_get_target(self):
+        class TestPlugin(token_plugins.BasePlugin):
+            def lookup(self, token):
+                return ("some host", "some port")
 
-    def test_run_wrap_cmd(self):
-        web_socket_proxy = self._get_websockproxy()
-        web_socket_proxy.__dict__["wrap_cmd"] = "wrap_cmd"
+        host, port = self.handler.get_target(
+            TestPlugin(None))
 
-        def mock_Popen(*args, **kwargs):
-            return '_mock_cmd'
+        self.assertEqual(host, "some host")
+        self.assertEqual(port, "some port")
 
-        self.stubs.Set(subprocess, 'Popen', mock_Popen)
-        web_socket_proxy.run_wrap_cmd()
-        self.assertEquals(web_socket_proxy.spawn_message, True)
+    def test_get_target_unix_socket(self):
+        class TestPlugin(token_plugins.BasePlugin):
+            def lookup(self, token):
+                return ("unix_socket", "/tmp/socket")
 
-    def test_started(self):
-        web_socket_proxy = self._get_websockproxy()
-        web_socket_proxy.__dict__["spawn_message"] = False
-        web_socket_proxy.__dict__["wrap_cmd"] = "wrap_cmd"
+        _, socket = self.handler.get_target(
+            TestPlugin(None))
 
-        def mock_run_wrap_cmd(*args, **kwargs):
-            web_socket_proxy.__dict__["spawn_message"] = True
+        self.assertEqual(socket, "/tmp/socket")
 
-        self.stubs.Set(web_socket_proxy, 'run_wrap_cmd', mock_run_wrap_cmd)
-        web_socket_proxy.started()
-        self.assertEquals(web_socket_proxy.__dict__["spawn_message"], True)
+    def test_get_target_raises_error_on_unknown_token(self):
+        class TestPlugin(token_plugins.BasePlugin):
+            def lookup(self, token):
+                return None
 
-    def test_poll(self):
-        web_socket_proxy = self._get_websockproxy()
-        web_socket_proxy.__dict__["wrap_cmd"] = "wrap_cmd"
-        web_socket_proxy.__dict__["wrap_mode"] = "respawn"
-        web_socket_proxy.__dict__["wrap_times"] = [99999999]
-        web_socket_proxy.__dict__["spawn_message"] = True
-        web_socket_proxy.__dict__["cmd"] = None
-        self.stubs.Set(time, 'time', lambda: 100000000.000)
-        web_socket_proxy.poll()
-        self.assertEquals(web_socket_proxy.spawn_message, False)
+        with self.assertRaises(FakeServer.EClose):
+            self.handler.get_target(TestPlugin(None))
 
-    def test_new_client(self):
-        web_socket_proxy = self._get_websockproxy()
-        web_socket_proxy.__dict__["verbose"] = "verbose"
-        web_socket_proxy.__dict__["daemon"] = None
-        web_socket_proxy.__dict__["client"] = "client"
+    @patch('websockify.websocketproxy.ProxyRequestHandler.send_auth_error', MagicMock())
+    def test_token_plugin(self):
+        class TestPlugin(token_plugins.BasePlugin):
+            def lookup(self, token):
+                return (self.source + token).split(',')
 
-        self.stubs.Set(web_socket_proxy, 'socket', MockSocket)
+        self.handler.server.token_plugin = TestPlugin("somehost,")
+        self.handler.validate_connection()
 
-        def mock_select(*args, **kwargs):
-            ins = None
-            outs = None
-            excepts = "excepts"
-            return ins, outs, excepts
+        self.assertEqual(self.handler.server.target_host, "somehost")
+        self.assertEqual(self.handler.server.target_port, "blah")
+
+    @patch('websockify.websocketproxy.ProxyRequestHandler.send_auth_error', MagicMock())
+    def test_auth_plugin(self):
+        class TestPlugin(auth_plugins.BasePlugin):
+            def authenticate(self, headers, target_host, target_port):
+                if target_host == self.source:
+                    raise auth_plugins.AuthenticationError(response_msg="some_error")
+
+        self.handler.server.auth_plugin = TestPlugin("somehost")
+        self.handler.server.target_host = "somehost"
+        self.handler.server.target_port = "someport"
+
+        with self.assertRaises(auth_plugins.AuthenticationError):
+            self.handler.auth_connection()
+
+        self.handler.server.target_host = "someotherhost"
+        self.handler.auth_connection()
 
-        self.stubs.Set(select, 'select', mock_select)
-        self.assertRaises(Exception, web_socket_proxy.new_websocket_client)

tests/test_websockifyserver.py

@@ -0,0 +1,400 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright(c)2013 NTT corp. All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+""" Unit tests for websockifyserver """
+import errno
+import os
+import logging
+import select
+import shutil
+import socket
+import ssl
+from unittest.mock import patch, MagicMock, ANY
+import sys
+import tempfile
+import unittest
+import socket
+import signal
+from http.server import BaseHTTPRequestHandler
+from io import StringIO
+from io import BytesIO
+
+from websockify import websockifyserver
+
+
+def raise_oserror(*args, **kwargs):
+    raise OSError('fake error')
+
+
+class FakeSocket(object):
+    def __init__(self, data=b''):
+        self._data = data
+
+    def recv(self, amt, flags=None):
+        res = self._data[0:amt]
+        if not (flags & socket.MSG_PEEK):
+            self._data = self._data[amt:]
+
+        return res
+
+    def makefile(self, mode='r', buffsize=None):
+        if 'b' in mode:
+            return BytesIO(self._data)
+        else:
+            return StringIO(self._data.decode('latin_1'))
+
+
+class WebSockifyRequestHandlerTestCase(unittest.TestCase):
+    def setUp(self):
+        super(WebSockifyRequestHandlerTestCase, self).setUp()
+        self.tmpdir = tempfile.mkdtemp('-websockify-tests')
+        # Mock this out cause it screws tests up
+        patch('os.chdir').start()
+
+    def tearDown(self):
+        """Called automatically after each test."""
+        patch.stopall()
+        os.rmdir(self.tmpdir)
+        super(WebSockifyRequestHandlerTestCase, self).tearDown()
+
+    def _get_server(self, handler_class=websockifyserver.WebSockifyRequestHandler,
+                    **kwargs):
+        web = kwargs.pop('web', self.tmpdir)
+        return websockifyserver.WebSockifyServer(
+            handler_class, listen_host='localhost',
+            listen_port=80, key=self.tmpdir, web=web,
+            record=self.tmpdir, daemon=False, ssl_only=0, idle_timeout=1,
+            **kwargs)
+
+    @patch('websockify.websockifyserver.WebSockifyRequestHandler.send_error')
+    def test_normal_get_with_only_upgrade_returns_error(self, send_error):
+        server = self._get_server(web=None)
+        handler = websockifyserver.WebSockifyRequestHandler(
+            FakeSocket(b'GET /tmp.txt HTTP/1.1'), '127.0.0.1', server)
+
+        handler.do_GET()
+        send_error.assert_called_with(405, ANY)
+
+    @patch('websockify.websockifyserver.WebSockifyRequestHandler.send_error')
+    def test_list_dir_with_file_only_returns_error(self, send_error):
+        server = self._get_server(file_only=True)
+        handler = websockifyserver.WebSockifyRequestHandler(
+            FakeSocket(b'GET / HTTP/1.1'), '127.0.0.1', server)
+
+        handler.path = '/'
+        handler.do_GET()
+        send_error.assert_called_with(404, ANY)
+
+
+class WebSockifyServerTestCase(unittest.TestCase):
+    def setUp(self):
+        super(WebSockifyServerTestCase, self).setUp()
+        self.tmpdir = tempfile.mkdtemp('-websockify-tests')
+        # Mock this out cause it screws tests up
+        patch('os.chdir').start()
+
+    def tearDown(self):
+        """Called automatically after each test."""
+        patch.stopall()
+        os.rmdir(self.tmpdir)
+        super(WebSockifyServerTestCase, self).tearDown()
+
+    def _get_server(self, handler_class=websockifyserver.WebSockifyRequestHandler,
+                    **kwargs):
+        return websockifyserver.WebSockifyServer(
+            handler_class, listen_host='localhost',
+            listen_port=80, key=self.tmpdir, web=self.tmpdir,
+            record=self.tmpdir, **kwargs)
+
+    def test_daemonize_raises_error_while_closing_fds(self):
+        server = self._get_server(daemon=True, ssl_only=1, idle_timeout=1)
+        patch('os.fork').start().return_value = 0
+        patch('signal.signal').start()
+        patch('os.setsid').start()
+        patch('os.close').start().side_effect = raise_oserror
+        self.assertRaises(OSError, server.daemonize, keepfd=None, chdir='./')
+
+    def test_daemonize_ignores_ebadf_error_while_closing_fds(self):
+        def raise_oserror_ebadf(fd):
+            raise OSError(errno.EBADF, 'fake error')
+
+        server = self._get_server(daemon=True, ssl_only=1, idle_timeout=1)
+        patch('os.fork').start().return_value = 0
+        patch('signal.signal').start()
+        patch('os.setsid').start()
+        patch('os.close').start().side_effect = raise_oserror_ebadf
+        patch('os.open').start().side_effect = raise_oserror
+        self.assertRaises(OSError, server.daemonize, keepfd=None, chdir='./')
+
+    def test_handshake_fails_on_not_ready(self):
+        server = self._get_server(daemon=True, ssl_only=0, idle_timeout=1)
+
+        def fake_select(rlist, wlist, xlist, timeout=None):
+            return ([], [], [])
+
+        patch('select.select').start().side_effect = fake_select
+        self.assertRaises(
+            websockifyserver.WebSockifyServer.EClose, server.do_handshake,
+            FakeSocket(), '127.0.0.1')
+
+    def test_empty_handshake_fails(self):
+        server = self._get_server(daemon=True, ssl_only=0, idle_timeout=1)
+
+        sock = FakeSocket('')
+
+        def fake_select(rlist, wlist, xlist, timeout=None):
+            return ([sock], [], [])
+
+        patch('select.select').start().side_effect = fake_select
+        self.assertRaises(
+            websockifyserver.WebSockifyServer.EClose, server.do_handshake,
+            sock, '127.0.0.1')
+
+    def test_handshake_policy_request(self):
+        # TODO(directxman12): implement
+        pass
+
+    def test_handshake_ssl_only_without_ssl_raises_error(self):
+        server = self._get_server(daemon=True, ssl_only=1, idle_timeout=1)
+
+        sock = FakeSocket(b'some initial data')
+
+        def fake_select(rlist, wlist, xlist, timeout=None):
+            return ([sock], [], [])
+
+        patch('select.select').start().side_effect = fake_select
+        self.assertRaises(
+            websockifyserver.WebSockifyServer.EClose, server.do_handshake,
+            sock, '127.0.0.1')
+
+    def test_do_handshake_no_ssl(self):
+        class FakeHandler(object):
+            CALLED = False
+            def __init__(self, *args, **kwargs):
+                type(self).CALLED = True
+
+        FakeHandler.CALLED = False
+
+        server = self._get_server(
+            handler_class=FakeHandler, daemon=True,
+            ssl_only=0, idle_timeout=1)
+
+        sock = FakeSocket(b'some initial data')
+
+        def fake_select(rlist, wlist, xlist, timeout=None):
+            return ([sock], [], [])
+
+        patch('select.select').start().side_effect = fake_select
+        self.assertEqual(server.do_handshake(sock, '127.0.0.1'), sock)
+        self.assertTrue(FakeHandler.CALLED, True)
+
+    def test_do_handshake_ssl(self):
+        # TODO(directxman12): implement this
+        pass
+
+    def test_do_handshake_ssl_without_ssl_raises_error(self):
+        # TODO(directxman12): implement this
+        pass
+
+    def test_do_handshake_ssl_without_cert_raises_error(self):
+        server = self._get_server(daemon=True, ssl_only=0, idle_timeout=1,
+                                  cert='afdsfasdafdsafdsafdsafdas')
+
+        sock = FakeSocket(b"\x16some ssl data")
+
+        def fake_select(rlist, wlist, xlist, timeout=None):
+            return ([sock], [], [])
+
+        patch('select.select').start().side_effect = fake_select
+        self.assertRaises(
+            websockifyserver.WebSockifyServer.EClose, server.do_handshake,
+            sock, '127.0.0.1')
+
+    def test_do_handshake_ssl_error_eof_raises_close_error(self):
+        server = self._get_server(daemon=True, ssl_only=0, idle_timeout=1)
+
+        sock = FakeSocket(b"\x16some ssl data")
+
+        def fake_select(rlist, wlist, xlist, timeout=None):
+            return ([sock], [], [])
+
+        def fake_wrap_socket(*args, **kwargs):
+            raise ssl.SSLError(ssl.SSL_ERROR_EOF)
+
+        class fake_create_default_context():
+            def __init__(self, purpose):
+                self.verify_mode = None
+                self.options = 0
+            def load_cert_chain(self, certfile, keyfile, password):
+                pass
+            def set_default_verify_paths(self):
+                pass
+            def load_verify_locations(self, cafile):
+                pass
+            def wrap_socket(self, *args, **kwargs):
+                raise ssl.SSLError(ssl.SSL_ERROR_EOF)
+
+        patch('select.select').start().side_effect = fake_select
+        patch('ssl.create_default_context').start().side_effect = fake_create_default_context
+        self.assertRaises(
+            websockifyserver.WebSockifyServer.EClose, server.do_handshake,
+            sock, '127.0.0.1')
+
+    def test_do_handshake_ssl_sets_ciphers(self):
+        test_ciphers = 'TEST-CIPHERS-1:TEST-CIPHER-2'
+
+        class FakeHandler(object):
+            def __init__(self, *args, **kwargs):
+                pass
+
+        server = self._get_server(handler_class=FakeHandler, daemon=True, 
+                                  idle_timeout=1, ssl_ciphers=test_ciphers)
+        sock = FakeSocket(b"\x16some ssl data")
+
+        def fake_select(rlist, wlist, xlist, timeout=None):
+            return ([sock], [], [])
+
+        class fake_create_default_context():
+            CIPHERS = ''
+            def __init__(self, purpose):
+                self.verify_mode = None
+                self.options = 0
+            def load_cert_chain(self, certfile, keyfile, password):
+                pass
+            def set_default_verify_paths(self):
+                pass
+            def load_verify_locations(self, cafile):
+                pass
+            def wrap_socket(self, *args, **kwargs):
+                pass
+            def set_ciphers(self, ciphers_to_set):
+                fake_create_default_context.CIPHERS = ciphers_to_set
+
+        patch('select.select').start().side_effect = fake_select
+        patch('ssl.create_default_context').start().side_effect = fake_create_default_context
+        server.do_handshake(sock, '127.0.0.1')
+        self.assertEqual(fake_create_default_context.CIPHERS, test_ciphers)
+
+    def test_do_handshake_ssl_sets_opions(self):
+        test_options = 0xCAFEBEEF
+
+        class FakeHandler(object):
+            def __init__(self, *args, **kwargs):
+                pass
+
+        server = self._get_server(handler_class=FakeHandler, daemon=True, 
+                                  idle_timeout=1, ssl_options=test_options)
+        sock = FakeSocket(b"\x16some ssl data")
+
+        def fake_select(rlist, wlist, xlist, timeout=None):
+            return ([sock], [], [])
+
+        class fake_create_default_context(object):
+            OPTIONS = 0
+            def __init__(self, purpose):
+                self.verify_mode = None
+                self._options = 0
+            def load_cert_chain(self, certfile, keyfile, password):
+                pass
+            def set_default_verify_paths(self):
+                pass
+            def load_verify_locations(self, cafile):
+                pass
+            def wrap_socket(self, *args, **kwargs):
+                pass
+            def get_options(self):
+                return self._options
+            def set_options(self, val):
+                fake_create_default_context.OPTIONS = val
+            options = property(get_options, set_options)
+
+        patch('select.select').start().side_effect = fake_select
+        patch('ssl.create_default_context').start().side_effect = fake_create_default_context
+        server.do_handshake(sock, '127.0.0.1')
+        self.assertEqual(fake_create_default_context.OPTIONS, test_options)
+
+    def test_fallback_sigchld_handler(self):
+        # TODO(directxman12): implement this
+        pass
+
+    def test_start_server_error(self):
+        server = self._get_server(daemon=False, ssl_only=1, idle_timeout=1)
+        sock = server.socket('localhost')
+
+        def fake_select(rlist, wlist, xlist, timeout=None):
+            raise Exception("fake error")
+
+        patch('websockify.websockifyserver.WebSockifyServer.socket').start()
+        patch('websockify.websockifyserver.WebSockifyServer.daemonize').start()
+        patch('select.select').start().side_effect = fake_select
+        server.start_server()
+
+    def test_start_server_keyboardinterrupt(self):
+        server = self._get_server(daemon=False, ssl_only=0, idle_timeout=1)
+        sock = server.socket('localhost')
+
+        def fake_select(rlist, wlist, xlist, timeout=None):
+            raise KeyboardInterrupt
+
+        patch('websockify.websockifyserver.WebSockifyServer.socket').start()
+        patch('websockify.websockifyserver.WebSockifyServer.daemonize').start()
+        patch('select.select').start().side_effect = fake_select
+        server.start_server()
+
+    def test_start_server_systemexit(self):
+        server = self._get_server(daemon=False, ssl_only=0, idle_timeout=1)
+        sock = server.socket('localhost')
+
+        def fake_select(rlist, wlist, xlist, timeout=None):
+            sys.exit()
+
+        patch('websockify.websockifyserver.WebSockifyServer.socket').start()
+        patch('websockify.websockifyserver.WebSockifyServer.daemonize').start()
+        patch('select.select').start().side_effect = fake_select
+        server.start_server()
+
+    def test_socket_set_keepalive_options(self):
+        keepcnt = 12
+        keepidle = 34
+        keepintvl = 56
+
+        server = self._get_server(daemon=False, ssl_only=0, idle_timeout=1)
+        sock = server.socket('localhost',
+                             tcp_keepcnt=keepcnt,
+                             tcp_keepidle=keepidle,
+                             tcp_keepintvl=keepintvl)
+
+        if hasattr(socket, 'TCP_KEEPCNT'):
+            self.assertEqual(sock.getsockopt(socket.SOL_TCP,
+                                             socket.TCP_KEEPCNT), keepcnt)
+        self.assertEqual(sock.getsockopt(socket.SOL_TCP,
+                                         socket.TCP_KEEPIDLE), keepidle)
+        self.assertEqual(sock.getsockopt(socket.SOL_TCP,
+                                         socket.TCP_KEEPINTVL), keepintvl)
+
+        sock = server.socket('localhost',
+                             tcp_keepalive=False,
+                             tcp_keepcnt=keepcnt,
+                             tcp_keepidle=keepidle,
+                             tcp_keepintvl=keepintvl)
+
+        if hasattr(socket, 'TCP_KEEPCNT'):
+            self.assertNotEqual(sock.getsockopt(socket.SOL_TCP,
+                                                socket.TCP_KEEPCNT), keepcnt)
+        self.assertNotEqual(sock.getsockopt(socket.SOL_TCP,
+                                            socket.TCP_KEEPIDLE), keepidle)
+        self.assertNotEqual(sock.getsockopt(socket.SOL_TCP,
+                                            socket.TCP_KEEPINTVL), keepintvl)

tests/utf8-list.py

@@ -1,19 +0,0 @@
-#!/usr/bin/python
-
-'''
-Display UTF-8 encoding for 0-255.'''
-
-import sys, os, socket, ssl, time, traceback
-from select import select
-sys.path.insert(0,os.path.join(os.path.dirname(__file__), ".."))
-from websockify.websocket import WebSocketServer
-
-if __name__ == '__main__':
-    print "val: hybi_base64 | hybi_binary"
-    for c in range(0, 256):
-        hybi_base64 = WebSocketServer.encode_hybi(chr(c), opcode=1,
-                base64=True)
-        hybi_binary = WebSocketServer.encode_hybi(chr(c), opcode=2,
-                base64=False)
-        print "%d: %s | %s" % (c, repr(hybi_base64), repr(hybi_binary))
-

tox.ini

@@ -4,17 +4,14 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py24,py25,py26,py27,py30
-setupdir = ../
+envlist = py34
 
 [testenv]
 commands = nosetests {posargs}
-deps =
-    mox
-    nose
+deps = -r{toxinidir}/test-requirements.txt
 
-# At some point we should enable this since tox epdctes it to exist but
-# the code will need pep8ising first. 
+# At some point we should enable this since tox expects it to exist but
+# the code will need pep8ising first.
 #[testenv:pep8]
 #commands = flake8
 #dep = flake8

websockify/__init__.py

@@ -1,2 +1,2 @@
-from websocket import *
-from websocketproxy import *
+from websockify.websocket import *
+from websockify.websocketproxy import *

websockify/__main__.py

@@ -0,0 +1,4 @@
+import websockify
+
+if __name__ == '__main__':
+    websockify.websocketproxy.websockify_init()

websockify/auth_plugins.py

@@ -0,0 +1,102 @@
+class BasePlugin():
+    def __init__(self, src=None):
+        self.source = src
+
+    def authenticate(self, headers, target_host, target_port):
+        pass
+
+
+class AuthenticationError(Exception):
+    def __init__(self, log_msg=None, response_code=403, response_headers={}, response_msg=None):
+        self.code = response_code
+        self.headers = response_headers
+        self.msg = response_msg
+
+        if log_msg is None:
+            log_msg = response_msg
+
+        super().__init__('%s %s' % (self.code, log_msg))
+
+
+class InvalidOriginError(AuthenticationError):
+    def __init__(self, expected, actual):
+        self.expected_origin = expected
+        self.actual_origin = actual
+
+        super().__init__(
+            response_msg='Invalid Origin',
+            log_msg="Invalid Origin Header: Expected one of "
+                    "%s, got '%s'" % (expected, actual))
+
+
+class BasicHTTPAuth():
+    """Verifies Basic Auth headers. Specify src as username:password"""
+
+    def __init__(self, src=None):
+        self.src = src
+
+    def authenticate(self, headers, target_host, target_port):
+        import base64
+        auth_header = headers.get('Authorization')
+        if auth_header:
+            if not auth_header.startswith('Basic '):
+                self.auth_error()
+
+            try:
+                user_pass_raw = base64.b64decode(auth_header[6:])
+            except TypeError:
+                self.auth_error()
+
+            try:
+                # http://stackoverflow.com/questions/7242316/what-encoding-should-i-use-for-http-basic-authentication
+                user_pass_as_text = user_pass_raw.decode('ISO-8859-1')
+            except UnicodeDecodeError:
+                self.auth_error()
+
+            user_pass = user_pass_as_text.split(':', 1)
+            if len(user_pass) != 2:
+                self.auth_error()
+
+            if not self.validate_creds(*user_pass):
+                self.demand_auth()
+
+        else:
+            self.demand_auth()
+
+    def validate_creds(self, username, password):
+        if '%s:%s' % (username, password) == self.src:
+            return True
+        else:
+            return False
+
+    def auth_error(self):
+        raise AuthenticationError(response_code=403)
+
+    def demand_auth(self):
+        raise AuthenticationError(response_code=401,
+                                  response_headers={'WWW-Authenticate': 'Basic realm="Websockify"'})
+
+class ExpectOrigin():
+    def __init__(self, src=None):
+        if src is None:
+            self.source = []
+        else:
+            self.source = src.split()
+
+    def authenticate(self, headers, target_host, target_port):
+        origin = headers.get('Origin', None)
+        if origin is None or origin not in self.source:
+            raise InvalidOriginError(expected=self.source, actual=origin)
+
+class ClientCertCNAuth():
+    """Verifies client by SSL certificate. Specify src as whitespace separated list of common names."""
+
+    def __init__(self, src=None):
+        if src is None:
+            self.source = []
+        else:
+            self.source = src.split()
+
+    def authenticate(self, headers, target_host, target_port):
+        if headers.get('SSL_CLIENT_S_DN_CN', None) not in self.source:
+            raise AuthenticationError(response_code=403)

websockify/sysloghandler.py

@@ -0,0 +1,118 @@
+import logging.handlers as handlers, socket, os, time
+
+
+class WebsockifySysLogHandler(handlers.SysLogHandler):
+    """
+    A handler class that sends proper Syslog-formatted messages,
+    as defined by RFC 5424.
+    """
+
+    _legacy_head_fmt = '<{pri}>{ident}[{pid}]: '
+    _rfc5424_head_fmt = '<{pri}>1 {timestamp} {hostname} {ident} {pid} - - '
+    _head_fmt = _rfc5424_head_fmt
+    _legacy = False
+    _timestamp_fmt = '%Y-%m-%dT%H:%M:%SZ'
+    _max_hostname = 255
+    _max_ident = 24 #safer for old daemons
+    _send_length = False
+    _tail = '\n'
+
+
+    ident = None
+
+
+    def __init__(self, address=('localhost', handlers.SYSLOG_UDP_PORT),
+                 facility=handlers.SysLogHandler.LOG_USER,
+                 socktype=None, ident=None, legacy=False):
+        """
+        Initialize a handler.
+
+        If address is specified as a string, a UNIX socket is used. To log to a
+        local syslogd, "WebsockifySysLogHandler(address="/dev/log")" can be
+        used. If facility is not specified, LOG_USER is used. If socktype is
+        specified as socket.SOCK_DGRAM or socket.SOCK_STREAM, that specific
+        socket type will be used. For Unix sockets, you can also specify a
+        socktype of None, in which case socket.SOCK_DGRAM will be used, falling
+        back to socket.SOCK_STREAM. If ident is specified, this string will be
+        used as the application name in all messages sent. Set legacy to True
+        to use the old version of the protocol.
+        """
+
+        self.ident = ident
+
+        if legacy:
+            self._legacy = True
+            self._head_fmt = self._legacy_head_fmt
+
+        super().__init__(address, facility, socktype)
+
+
+    def emit(self, record):
+        """
+        Emit a record.
+
+        The record is formatted, and then sent to the syslog server. If
+        exception information is present, it is NOT sent to the server.
+        """
+
+        try:
+            # Gather info.
+            text = self.format(record).replace(self._tail, ' ')
+            if not text: # nothing to log
+                return
+
+            pri = self.encodePriority(self.facility,
+                                      self.mapPriority(record.levelname))
+
+            timestamp = time.strftime(self._timestamp_fmt, time.gmtime());
+
+            hostname = socket.gethostname()[:self._max_hostname]
+
+            if self.ident:
+                ident = self.ident[:self._max_ident]
+            else:
+                ident = ''
+
+            pid = os.getpid() # shouldn't need truncation
+
+            # Format the header.
+            head = {
+                'pri': pri,
+                'timestamp': timestamp,
+                'hostname': hostname,
+                'ident': ident,
+                'pid': pid,
+            }
+            msg = self._head_fmt.format(**head).encode('ascii', 'ignore')
+
+            # Encode text as plain ASCII if possible, else use UTF-8 with BOM.
+            try:
+                msg += text.encode('ascii')
+            except UnicodeEncodeError:
+                msg += text.encode('utf-8-sig')
+
+            # Add length or tail character, if necessary.
+            if self.socktype != socket.SOCK_DGRAM:
+                if self._send_length:
+                    msg = ('%d ' % len(msg)).encode('ascii') + msg
+                else:
+                    msg += self._tail.encode('ascii')
+
+            # Send the message.
+            if self.unixsocket:
+                try:
+                    self.socket.send(msg)
+                except socket.error:
+                    self._connect_unixsocket(self.address)
+                    self.socket.send(msg)
+
+            else:
+                if self.socktype == socket.SOCK_DGRAM:
+                    self.socket.sendto(msg, self.address)
+                else:
+                    self.socket.sendall(msg)
+
+        except (KeyboardInterrupt, SystemExit):
+            raise
+        except:
+            self.handleError(record)

websockify/token_plugins.py

@@ -0,0 +1,232 @@
+import os
+import sys
+import time
+import re
+
+class BasePlugin():
+    def __init__(self, src):
+        self.source = src
+
+    def lookup(self, token):
+        return None
+
+
+class ReadOnlyTokenFile(BasePlugin):
+    # source is a token file with lines like
+    #   token: host:port
+    # or a directory of such files
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._targets = None
+
+    def _load_targets(self):
+        if os.path.isdir(self.source):
+            cfg_files = [os.path.join(self.source, f) for
+                         f in os.listdir(self.source)]
+        else:
+            cfg_files = [self.source]
+
+        self._targets = {}
+        index = 1
+        for f in cfg_files:
+            for line in [l.strip() for l in open(f).readlines()]:
+                if line and not line.startswith('#'):
+                    try:
+                        tok, target = re.split(':\s', line)
+                        self._targets[tok] = target.strip().rsplit(':', 1)
+                    except ValueError:
+                        print("Syntax error in %s on line %d" % (self.source, index), file=sys.stderr)
+                index += 1
+
+    def lookup(self, token):
+        if self._targets is None:
+            self._load_targets()
+
+        if token in self._targets:
+            return self._targets[token]
+        else:
+            return None
+
+
+# the above one is probably more efficient, but this one is
+# more backwards compatible (although in most cases
+# ReadOnlyTokenFile should suffice)
+class TokenFile(ReadOnlyTokenFile):
+    # source is a token file with lines like
+    #   token: host:port
+    # or a directory of such files
+    def lookup(self, token):
+        self._load_targets()
+
+        return super().lookup(token)
+
+
+class BaseTokenAPI(BasePlugin):
+    # source is a url with a '%s' in it where the token
+    # should go
+
+    # we import things on demand so that other plugins
+    # in this file can be used w/o unnecessary dependencies
+
+    def process_result(self, resp):
+        host, port = resp.text.split(':')
+        port = port.encode('ascii','ignore')
+        return [ host, port ]
+
+    def lookup(self, token):
+        import requests
+
+        resp = requests.get(self.source % token)
+
+        if resp.ok:
+            return self.process_result(resp)
+        else:
+            return None
+
+
+class JSONTokenApi(BaseTokenAPI):
+    # source is a url with a '%s' in it where the token
+    # should go
+
+    def process_result(self, resp):
+        resp_json = resp.json()
+        return (resp_json['host'], resp_json['port'])
+
+
+class JWTTokenApi(BasePlugin):
+    # source is a JWT-token, with hostname and port included
+    # Both JWS as JWE tokens are accepted. With regards to JWE tokens, the key is re-used for both validation and decryption.
+
+    def lookup(self, token):
+        try:
+            from jwcrypto import jwt
+            import json
+
+            key = jwt.JWK()
+
+            try:
+                with open(self.source, 'rb') as key_file:
+                    key_data = key_file.read()
+            except Exception as e:
+                print("Error loading key file: %s" % str(e), file=sys.stderr)
+                return None
+
+            try:
+                key.import_from_pem(key_data)
+            except:
+                try:
+                    key.import_key(k=key_data.decode('utf-8'),kty='oct')
+                except:
+                    print('Failed to correctly parse key data!', file=sys.stderr)
+                    return None
+
+            try:
+                token = jwt.JWT(key=key, jwt=token)
+                parsed_header = json.loads(token.header)
+
+                if 'enc' in parsed_header:
+                    # Token is encrypted, so we need to decrypt by passing the claims to a new instance
+                    token = jwt.JWT(key=key, jwt=token.claims)
+
+                parsed = json.loads(token.claims)
+                
+                if 'nbf' in parsed:
+                    # Not Before is present, so we need to check it
+                    if time.time() < parsed['nbf']:
+                        print('Token can not be used yet!', file=sys.stderr)
+                        return None
+
+                if 'exp' in parsed:
+                    # Expiration time is present, so we need to check it
+                    if time.time() > parsed['exp']:
+                        print('Token has expired!', file=sys.stderr)
+                        return None
+
+                return (parsed['host'], parsed['port'])
+            except Exception as e:
+                print("Failed to parse token: %s" % str(e), file=sys.stderr)
+                return None
+        except ImportError as e:
+            print("package jwcrypto not found, are you sure you've installed it correctly?", file=sys.stderr)
+            return None
+
+class TokenRedis():
+    """
+    The TokenRedis plugin expects the format of the data in a form of json.
+    
+    Prepare data with:
+        redis-cli set hello '{"host":"127.0.0.1:5000"}'
+    
+    Verify with:
+        redis-cli --raw get hello
+    
+    Spawn a test "server" using netcat
+        nc -l 5000 -v
+    
+    Note: you have to install also the 'redis' and 'simplejson' modules
+          pip install redis simplejson
+    """
+    def __init__(self, src):
+        try:
+            # import those ahead of time so we provide error earlier
+            import redis
+            import simplejson
+            self._server, self._port = src.split(":")
+            print("TokenRedis backend initilized (%s:%s)" %
+                  (self._server, self._port), file=sys.stderr)
+        except ValueError:
+            print("The provided --token-source='%s' is not in an expected format <host>:<port>" %
+                  src, file=sys.stderr)
+            sys.exit()
+        except ImportError:
+            print("package redis or simplejson not found, are you sure you've installed them correctly?", file=sys.stderr)
+            sys.exit()
+
+    def lookup(self, token):
+        try:
+            import redis
+            import simplejson
+        except ImportError:
+            print("package redis or simplejson not found, are you sure you've installed them correctly?", file=sys.stderr)
+            sys.exit()
+
+        print("resolving token '%s'" % token, file=sys.stderr)
+        client = redis.Redis(host=self._server, port=self._port)
+        stuff = client.get(token)
+        if stuff is None:
+            return None
+        else:
+            responseStr = stuff.decode("utf-8")
+            print("response from redis : %s" % responseStr, file=sys.stderr)
+            combo = simplejson.loads(responseStr)
+            (host, port) = combo["host"].split(':')
+            print("host: %s, port: %s" % (host,port), file=sys.stderr)
+            return [host, port]
+
+
+class UnixDomainSocketDirectory(BasePlugin):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._dir_path = os.path.abspath(self.source)
+
+    def lookup(self, token):
+        try:
+            import stat
+
+            if not os.path.isdir(self._dir_path):
+                return None
+
+            uds_path = os.path.abspath(os.path.join(self._dir_path, token))
+            if not uds_path.startswith(self._dir_path):
+                return None
+
+            if not os.path.exists(uds_path):
+                return None
+
+            if not stat.S_ISSOCK(os.stat(uds_path).st_mode):
+                return None
+
+            return [ 'unix_socket', uds_path ]
+        except Exception as e:
+                print("Error finding unix domain socket: %s" % str(e), file=sys.stderr)
+                return None

websockify/websocketproxy.py

@@ -11,20 +11,18 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates
 
 '''
 
-import signal, socket, optparse, time, os, sys, subprocess, logging
-try:    from socketserver import ForkingMixIn
-except: from SocketServer import ForkingMixIn
-try:    from http.server import HTTPServer
-except: from BaseHTTPServer import HTTPServer
-from select import select
-import websocket
-try:
-    from urllib.parse import parse_qs, urlparse
-except:
-    from cgi import parse_qs
-    from urlparse import urlparse
+import signal, socket, optparse, time, os, sys, subprocess, logging, errno, ssl
+from socketserver import ThreadingMixIn
+from http.server import HTTPServer
 
-class ProxyRequestHandler(websocket.WebSocketRequestHandler):
+import select
+from websockify import websockifyserver
+from websockify import auth_plugins as auth
+from urllib.parse import parse_qs, urlparse
+
+class ProxyRequestHandler(websockifyserver.WebSockifyRequestHandler):
+
+    buffer_size = 65536
 
     traffic_legend = """
 Traffic Legend:
@@ -37,15 +35,58 @@ Traffic Legend:
     <  - Client send
     <. - Client send partial
 """
+    
+    def send_auth_error(self, ex):
+        self.send_response(ex.code, ex.msg)
+        self.send_header('Content-Type', 'text/html')
+        for name, val in ex.headers.items():
+            self.send_header(name, val)
+        
+        self.end_headers()
+    
+    def validate_connection(self):
+        if not self.server.token_plugin:
+            return
+
+        host, port = self.get_target(self.server.token_plugin)
+        if host == 'unix_socket':
+            self.server.unix_target = port
+
+        else:
+            self.server.target_host = host
+            self.server.target_port = port
+
+    def auth_connection(self):
+        if not self.server.auth_plugin:
+            return
+
+        try:
+            # get client certificate data
+            client_cert_data = self.request.getpeercert()
+            # extract subject information
+            client_cert_subject = client_cert_data['subject']
+            # flatten data structure
+            client_cert_subject = dict([x[0] for x in client_cert_subject])
+            # add common name to headers (apache +StdEnvVars style)
+            self.headers['SSL_CLIENT_S_DN_CN'] = client_cert_subject['commonName']
+        except (TypeError, AttributeError, KeyError):
+            # not a SSL connection or client presented no certificate with valid data
+            pass
+            
+        try:
+            self.server.auth_plugin.authenticate(
+                headers=self.headers, target_host=self.server.target_host,
+                target_port=self.server.target_port)
+        except auth.AuthenticationError:
+            ex = sys.exc_info()[1]
+            self.send_auth_error(ex)
+            raise
 
     def new_websocket_client(self):
         """
         Called after a new WebSocket connection has been established.
         """
-        # Checks if we receive a token, and look
-        # for a valid target for it then
-        if self.server.target_cfg:
-            (self.server.target_host, self.server.target_port) = self.get_target(self.server.target_cfg, self.path)
+        # Checking for a token is done in validate_connection()
 
         # Connect to the target
         if self.server.wrap_cmd:
@@ -60,62 +101,72 @@ Traffic Legend:
             msg += " (using SSL)"
         self.log_message(msg)
 
-        tsock = websocket.WebSocketServer.socket(self.server.target_host,
-                                                 self.server.target_port,
-                connect=True, use_ssl=self.server.ssl_target, unix_socket=self.server.unix_target)
+        try:
+            tsock = websockifyserver.WebSockifyServer.socket(self.server.target_host,
+                                                           self.server.target_port,
+                                                           connect=True,
+                                                           use_ssl=self.server.ssl_target,
+                                                           unix_socket=self.server.unix_target)
+        except Exception as e:
+            self.log_message("Failed to connect to %s:%s: %s",
+                             self.server.target_host, self.server.target_port, e)
+            raise self.CClose(1011, "Failed to connect to downstream server")
+
+        self.request.setsockopt(socket.SOL_TCP, socket.TCP_NODELAY, 1)
+        if not self.server.wrap_cmd and not self.server.unix_target:
+            tsock.setsockopt(socket.SOL_TCP, socket.TCP_NODELAY, 1)
 
         self.print_traffic(self.traffic_legend)
 
         # Start proxying
         try:
             self.do_proxy(tsock)
-        except:
+        finally:
             if tsock:
                 tsock.shutdown(socket.SHUT_RDWR)
                 tsock.close()
-                if self.verbose: 
-                    self.log_message("%s:%s: Closed target" %(
-                            self.server.target_host, self.server.target_port))
-            raise
+                if self.verbose:
+                    self.log_message("%s:%s: Closed target",
+                            self.server.target_host, self.server.target_port)
 
-    def get_target(self, target_cfg, path):
+    def get_target(self, target_plugin):
         """
-        Parses the path, extracts a token, and looks for a valid
-        target for that token in the configuration file(s). Sets
-        target_host and target_port if successful
+        Gets a token from either the path or the host,
+        depending on --host-token, and looks up a target
+        for that token using the token plugin. Used by
+        validate_connection() to set target_host and target_port.
         """
         # The files in targets contain the lines
         # in the form of token: host:port
 
-        # Extract the token parameter from url
-        args = parse_qs(urlparse(path)[4]) # 4 is the query from url
+        if self.host_token:
+            # Use hostname as token
+            token = self.headers.get('Host')
 
-        if not args.has_key('token') or not len(args['token']):
-            raise self.EClose("Token not present")
+            # Remove port from hostname, as it'll always be the one where
+            # websockify listens (unless something between the client and
+            # websockify is redirecting traffic, but that's beside the point)
+            if token:
+                token = token.partition(':')[0]
 
-        token = args['token'][0].rstrip('\n')
-
-        # target_cfg can be a single config file or directory of
-        # config files
-        if os.path.isdir(target_cfg):
-            cfg_files = [os.path.join(target_cfg, f)
-                         for f in os.listdir(target_cfg)]
         else:
-            cfg_files = [target_cfg]
+            # Extract the token parameter from url
+            args = parse_qs(urlparse(self.path)[4]) # 4 is the query from url
 
-        targets = {}
-        for f in cfg_files:
-            for line in [l.strip() for l in file(f).readlines()]:
-                if line and not line.startswith('#'):
-                    ttoken, target = line.split(': ')
-                    targets[ttoken] = target.strip()
+            if 'token' in args and len(args['token']):
+                token = args['token'][0].rstrip('\n')
+            else:
+                token = None
 
-        self.vmsg("Target config: %s" % repr(targets))
+        if token is None:
+            raise self.server.EClose("Token not present")
 
-        if targets.has_key(token):
-            return targets[token].split(':')
+        result_pair = target_plugin.lookup(token)
+
+        if result_pair is not None:
+            return result_pair
         else:
-            raise self.EClose("Token '%s' not found" % token)
+            raise self.server.EClose("Token '%s' not found" % token)
 
     def do_proxy(self, target):
         """
@@ -126,12 +177,37 @@ Traffic Legend:
         tqueue = []
         rlist = [self.request, target]
 
+        if self.server.heartbeat:
+            now = time.time()
+            self.heartbeat = now + self.server.heartbeat
+        else:
+            self.heartbeat = None
+
         while True:
             wlist = []
 
+            if self.heartbeat is not None:
+                now = time.time()
+                if now > self.heartbeat:
+                    self.heartbeat = now + self.server.heartbeat
+                    self.send_ping()
+
             if tqueue: wlist.append(target)
             if cqueue or c_pend: wlist.append(self.request)
-            ins, outs, excepts = select(rlist, wlist, [], 1)
+            try:
+                ins, outs, excepts = select.select(rlist, wlist, [], 1)
+            except (select.error, OSError):
+                exc = sys.exc_info()[1]
+                if hasattr(exc, 'errno'):
+                    err = exc.errno
+                else:
+                    err = exc[0]
+
+                if err != errno.EINTR:
+                    raise
+                else:
+                    continue
+
             if excepts: raise Exception("Socket exception")
 
             if self.request in outs:
@@ -147,9 +223,9 @@ Traffic Legend:
 
                 if closed:
                     # TODO: What about blocking on client socket?
-                    if self.verbose: 
-                        self.log_message("%s:%s: Client closed connection" %(
-                                self.server.target_host, self.server.target_port))
+                    if self.verbose:
+                        self.log_message("%s:%s: Client closed connection",
+                                self.server.target_host, self.server.target_port)
                     raise self.CClose(closed['code'], closed['reason'])
 
 
@@ -170,19 +246,17 @@ Traffic Legend:
                 buf = target.recv(self.buffer_size)
                 if len(buf) == 0:
                     if self.verbose:
-                        self.log_message("%s:%s: Target closed connection" %(
-                                self.server.target_host, self.server.target_port))
+                        self.log_message("%s:%s: Target closed connection",
+                                self.server.target_host, self.server.target_port)
                     raise self.CClose(1000, "Target closed")
 
                 cqueue.append(buf)
                 self.print_traffic("{")
 
-class WebSocketProxy(websocket.WebSocketServer):
+class WebSocketProxy(websockifyserver.WebSockifyServer):
     """
     Proxy traffic to and from a WebSockets client to a normal TCP
-    socket server target. All traffic to/from the client is base64
-    encoded/decoded to allow binary data to be sent/received to/from
-    the target.
+    socket server target.
     """
 
     buffer_size = 65536
@@ -195,7 +269,12 @@ class WebSocketProxy(websocket.WebSocketServer):
         self.wrap_mode      = kwargs.pop('wrap_mode', None)
         self.unix_target    = kwargs.pop('unix_target', None)
         self.ssl_target     = kwargs.pop('ssl_target', None)
-        self.target_cfg     = kwargs.pop('target_cfg', None)
+        self.heartbeat      = kwargs.pop('heartbeat', None)
+
+        self.token_plugin = kwargs.pop('token_plugin', None)
+        self.host_token = kwargs.pop('host_token', None)
+        self.auth_plugin = kwargs.pop('auth_plugin', None)
+
         # Last 3 timestamps command was run
         self.wrap_times    = [0, 0, 0]
 
@@ -203,6 +282,7 @@ class WebSocketProxy(websocket.WebSocketServer):
             wsdir = os.path.dirname(sys.argv[0])
             rebinder_path = [os.path.join(wsdir, "..", "lib"),
                              os.path.join(wsdir, "..", "lib", "websockify"),
+                             os.path.join(wsdir, ".."),
                              wsdir]
             self.rebinder = None
 
@@ -228,7 +308,7 @@ class WebSocketProxy(websocket.WebSocketServer):
                 "REBIND_OLD_PORT": str(kwargs['listen_port']),
                 "REBIND_NEW_PORT": str(self.target_port)})
 
-        websocket.WebSocketServer.__init__(self, RequestHandlerClass, *args, **kwargs)
+        super().__init__(RequestHandlerClass, *args, **kwargs)
 
     def run_wrap_cmd(self):
         self.msg("Starting '%s'", " ".join(self.wrap_cmd))
@@ -251,12 +331,17 @@ class WebSocketProxy(websocket.WebSocketServer):
         else:
             dst_string = "%s:%s" % (self.target_host, self.target_port)
 
-        if self.target_cfg:
-            msg = "  - proxying from %s:%s to targets in %s" % (
-                self.listen_host, self.listen_port, self.target_cfg)
+        if self.listen_fd != None:
+            src_string = "inetd"
         else:
-            msg = "  - proxying from %s:%s to %s" % (
-                self.listen_host, self.listen_port, dst_string)
+            src_string = "%s:%s" % (self.listen_host, self.listen_port)
+
+        if self.token_plugin:
+            msg = "  - proxying from %s to targets generated by %s" % (
+                src_string, type(self.token_plugin).__name__)
+        else:
+            msg = "  - proxying from %s to %s" % (
+                src_string, dst_string)
 
         if self.ssl_target:
             msg += " (using SSL)"
@@ -299,19 +384,45 @@ def _subprocess_setup():
     signal.signal(signal.SIGPIPE, signal.SIG_DFL)
 
 
-def logger_init():
+SSL_OPTIONS = {
+    'default': ssl.OP_ALL,
+    'tlsv1_1': ssl.PROTOCOL_SSLv23 | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3 |
+    ssl.OP_NO_TLSv1,
+    'tlsv1_2': ssl.PROTOCOL_SSLv23 | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3 |
+    ssl.OP_NO_TLSv1 | ssl.OP_NO_TLSv1_1,
+    'tlsv1_3': ssl.PROTOCOL_SSLv23 | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3 |
+    ssl.OP_NO_TLSv1 | ssl.OP_NO_TLSv1_1 | ssl.OP_NO_TLSv1_2,
+}
+
+def select_ssl_version(version):
+    """Returns SSL options for the most secure TSL version available on this
+    Python version"""
+    if version in SSL_OPTIONS:
+        return SSL_OPTIONS[version]
+    else:
+        # It so happens that version names sorted lexicographically form a list
+        # from the least to the most secure
+        keys = list(SSL_OPTIONS.keys())
+        keys.sort() 
+        fallback = keys[-1]
+        logger = logging.getLogger(WebSocketProxy.log_prefix)
+        logger.warn("TLS version %s unsupported. Falling back to %s",
+                    version, fallback)
+
+        return SSL_OPTIONS[fallback]
+
+def websockify_init():
+    # Setup basic logging to stderr.
     logger = logging.getLogger(WebSocketProxy.log_prefix)
     logger.propagate = False
     logger.setLevel(logging.INFO)
-    h = logging.StreamHandler()
-    h.setLevel(logging.DEBUG)
-    h.setFormatter(logging.Formatter("%(message)s"))
-    logger.addHandler(h)
-
-
-def websockify_init():
-    logger_init()
+    stderr_handler = logging.StreamHandler()
+    stderr_handler.setLevel(logging.DEBUG)
+    log_formatter = logging.Formatter("%(message)s")
+    stderr_handler.setFormatter(log_formatter)
+    logger.addHandler(stderr_handler)
 
+    # Setup optparse.
     usage = "\n    %prog [options]"
     usage += " [source_addr:]source_port [target_addr:target_port]"
     usage += "\n    %prog [options]"
@@ -337,14 +448,33 @@ def websockify_init():
             help="SSL certificate file")
     parser.add_option("--key", default=None,
             help="SSL key file (if separate from cert)")
+    parser.add_option("--key-password", default=None,
+            help="SSL key password")
     parser.add_option("--ssl-only", action="store_true",
             help="disallow non-encrypted client connections")
     parser.add_option("--ssl-target", action="store_true",
             help="connect to SSL target as SSL client")
+    parser.add_option("--verify-client", action="store_true",
+            help="require encrypted client to present a valid certificate "
+            "(needs Python 2.7.9 or newer or Python 3.4 or newer)")
+    parser.add_option("--cafile", metavar="FILE",
+            help="file of concatenated certificates of authorities trusted "
+            "for validating clients (only effective with --verify-client). "
+            "If omitted, system default list of CAs is used.")
+    parser.add_option("--ssl-version", type="choice", default="default",
+            choices=["default", "tlsv1_1", "tlsv1_2", "tlsv1_3"], action="store",
+            help="minimum TLS version to use (default, tlsv1_1, tlsv1_2, tlsv1_3)")
+    parser.add_option("--ssl-ciphers", action="store",
+            help="list of ciphers allowed for connection. For a list of "
+            "supported ciphers run `openssl ciphers`")
     parser.add_option("--unix-target",
             help="connect to unix socket target", metavar="FILE")
+    parser.add_option("--inetd",
+            help="inetd mode, receive listening socket from stdin", action="store_true")
     parser.add_option("--web", default=None, metavar="DIR",
             help="run webserver on same port. Serve files from DIR.")
+    parser.add_option("--web-auth", action="store_true",
+            help="require authentication to access webserver.")
     parser.add_option("--wrap-mode", default="exit", metavar="MODE",
             choices=["exit", "ignore", "respawn"],
             help="action to take when the wrapped program exits "
@@ -352,59 +482,206 @@ def websockify_init():
     parser.add_option("--prefer-ipv6", "-6",
             action="store_true", dest="source_is_ipv6",
             help="prefer IPv6 when resolving source_addr")
+    parser.add_option("--libserver", action="store_true",
+            help="use Python library SocketServer engine")
     parser.add_option("--target-config", metavar="FILE",
             dest="target_cfg",
             help="Configuration file containing valid targets "
             "in the form 'token: host:port' or, alternatively, a "
-            "directory containing configuration files of this form")
-    parser.add_option("--libserver", action="store_true",
-            help="use Python library SocketServer engine")
+            "directory containing configuration files of this form "
+            "(DEPRECATED: use `--token-plugin TokenFile --token-source "
+            " path/to/token/file` instead)")
+    parser.add_option("--token-plugin", default=None, metavar="CLASS",
+                      help="use a Python class, usually one from websockify.token_plugins, "
+                           "such as TokenFile, to process tokens into host:port pairs")
+    parser.add_option("--token-source", default=None, metavar="ARG",
+                      help="an argument to be passed to the token plugin "
+                           "on instantiation")
+    parser.add_option("--host-token", action="store_true",
+                      help="use the host HTTP header as token instead of the "
+                           "token URL query parameter")
+    parser.add_option("--auth-plugin", default=None, metavar="CLASS",
+                      help="use a Python class, usually one from websockify.auth_plugins, "
+                           "such as BasicHTTPAuth, to determine if a connection is allowed")
+    parser.add_option("--auth-source", default=None, metavar="ARG",
+                      help="an argument to be passed to the auth plugin "
+                           "on instantiation")
+    parser.add_option("--heartbeat", type=int, default=0, metavar="INTERVAL",
+            help="send a ping to the client every INTERVAL seconds")
+    parser.add_option("--log-file", metavar="FILE",
+            dest="log_file",
+            help="File where logs will be saved")
+    parser.add_option("--syslog", default=None, metavar="SERVER",
+            help="Log to syslog server. SERVER can be local socket, "
+                 "such as /dev/log, or a UDP host:port pair.")
+    parser.add_option("--legacy-syslog", action="store_true",
+                      help="Use the old syslog protocol instead of RFC 5424. "
+                           "Use this if the messages produced by websockify seem abnormal.")
+
     (opts, args) = parser.parse_args()
 
-    if opts.verbose:
-        logging.getLogger(WebSocketProxy.log_prefix).setLevel(logging.DEBUG)
 
-    # Sanity checks
-    if len(args) < 2 and not (opts.target_cfg or opts.unix_target):
-        parser.error("Too few arguments")
+    # Validate options.
+
+    if opts.token_source and not opts.token_plugin:
+        parser.error("You must use --token-plugin to use --token-source")
+
+    if opts.host_token and not opts.token_plugin:
+        parser.error("You must use --token-plugin to use --host-token")
+
+    if opts.auth_source and not opts.auth_plugin:
+        parser.error("You must use --auth-plugin to use --auth-source")
+
+    if opts.web_auth and not opts.auth_plugin:
+        parser.error("You must use --auth-plugin to use --web-auth")
+
+    if opts.web_auth and not opts.web:
+        parser.error("You must use --web to use --web-auth")
+
+    if opts.legacy_syslog and not opts.syslog:
+        parser.error("You must use --syslog to use --legacy-syslog")
+
+
+    opts.ssl_options = select_ssl_version(opts.ssl_version)
+    del opts.ssl_version
+
+
+    if opts.log_file:
+        # Setup logging to user-specified file.
+        opts.log_file = os.path.abspath(opts.log_file)
+        log_file_handler = logging.FileHandler(opts.log_file)
+        log_file_handler.setLevel(logging.DEBUG)
+        log_file_handler.setFormatter(log_formatter)
+        logger.addHandler(log_file_handler)
+
+    del opts.log_file
+
+    if opts.syslog:
+        # Determine how to connect to syslog...
+        if opts.syslog.count(':'):
+            # User supplied a host:port pair.
+            syslog_host, syslog_port = opts.syslog.rsplit(':', 1)
+            try:
+                syslog_port = int(syslog_port)
+            except ValueError:
+                parser.error("Error parsing syslog port")
+            syslog_dest = (syslog_host, syslog_port)
+        else:
+            # User supplied a local socket file.
+            syslog_dest = os.path.abspath(opts.syslog)
+
+        from websockify.sysloghandler import WebsockifySysLogHandler
+
+        # Determine syslog facility.
+        if opts.daemon:
+            syslog_facility = WebsockifySysLogHandler.LOG_DAEMON
+        else:
+            syslog_facility = WebsockifySysLogHandler.LOG_USER
+
+        # Start logging to syslog.
+        syslog_handler = WebsockifySysLogHandler(address=syslog_dest,
+                                                 facility=syslog_facility,
+                                                 ident='websockify',
+                                                 legacy=opts.legacy_syslog)
+        syslog_handler.setLevel(logging.DEBUG)
+        syslog_handler.setFormatter(log_formatter)
+        logger.addHandler(syslog_handler)
+
+    del opts.syslog
+    del opts.legacy_syslog
+
+    if opts.verbose:
+        logger.setLevel(logging.DEBUG)
+
+
+    # Transform to absolute path as daemon may chdir
+    if opts.target_cfg:
+        opts.target_cfg = os.path.abspath(opts.target_cfg)
+
+    if opts.target_cfg:
+        opts.token_plugin = 'TokenFile'
+        opts.token_source = opts.target_cfg
+
+    del opts.target_cfg
+
     if sys.argv.count('--'):
         opts.wrap_cmd = args[1:]
     else:
         opts.wrap_cmd = None
-        if len(args) > 2:
-            parser.error("Too many arguments")
 
-    if not websocket.ssl and opts.ssl_target:
+    if not websockifyserver.ssl and opts.ssl_target:
         parser.error("SSL target requested and Python SSL module not loaded.");
 
     if opts.ssl_only and not os.path.exists(opts.cert):
         parser.error("SSL only and %s not found" % opts.cert)
 
-    # Parse host:port and convert ports to numbers
-    if args[0].count(':') > 0:
-        opts.listen_host, opts.listen_port = args[0].rsplit(':', 1)
-        opts.listen_host = opts.listen_host.strip('[]')
+    if opts.inetd:
+        opts.listen_fd = sys.stdin.fileno()
     else:
-        opts.listen_host, opts.listen_port = '', args[0]
+        if len(args) < 1:
+            parser.error("Too few arguments")
+        arg = args.pop(0)
+        # Parse host:port and convert ports to numbers
+        if arg.count(':') > 0:
+            opts.listen_host, opts.listen_port = arg.rsplit(':', 1)
+            opts.listen_host = opts.listen_host.strip('[]')
+        else:
+            opts.listen_host, opts.listen_port = '', arg
 
-    try:    opts.listen_port = int(opts.listen_port)
-    except: parser.error("Error parsing listen port")
+        try:
+            opts.listen_port = int(opts.listen_port)
+        except ValueError:
+            parser.error("Error parsing listen port")
 
-    if opts.wrap_cmd or opts.unix_target or opts.target_cfg:
+    del opts.inetd
+
+    if opts.wrap_cmd or opts.unix_target or opts.token_plugin:
         opts.target_host = None
         opts.target_port = None
     else:
-        if args[1].count(':') > 0:
-            opts.target_host, opts.target_port = args[1].rsplit(':', 1)
+        if len(args) < 1:
+            parser.error("Too few arguments")
+        arg = args.pop(0)
+        if arg.count(':') > 0:
+            opts.target_host, opts.target_port = arg.rsplit(':', 1)
             opts.target_host = opts.target_host.strip('[]')
         else:
             parser.error("Error parsing target")
-        try:    opts.target_port = int(opts.target_port)
-        except: parser.error("Error parsing target port")
 
-    # Transform to absolute path as daemon may chdir
-    if opts.target_cfg:
-        opts.target_cfg = os.path.abspath(opts.target_cfg)
+        try:
+            opts.target_port = int(opts.target_port)
+        except ValueError:
+            parser.error("Error parsing target port")
+
+    if len(args) > 0 and opts.wrap_cmd == None:
+        parser.error("Too many arguments")
+
+    if opts.token_plugin is not None:
+        if '.' not in opts.token_plugin:
+            opts.token_plugin = (
+                'websockify.token_plugins.%s' % opts.token_plugin)
+
+        token_plugin_module, token_plugin_cls = opts.token_plugin.rsplit('.', 1)
+
+        __import__(token_plugin_module)
+        token_plugin_cls = getattr(sys.modules[token_plugin_module], token_plugin_cls)
+
+        opts.token_plugin = token_plugin_cls(opts.token_source)
+
+    del opts.token_source
+
+    if opts.auth_plugin is not None:
+        if '.' not in opts.auth_plugin:
+            opts.auth_plugin = 'websockify.auth_plugins.%s' % opts.auth_plugin
+
+        auth_plugin_module, auth_plugin_cls = opts.auth_plugin.rsplit('.', 1)
+
+        __import__(auth_plugin_module)
+        auth_plugin_cls = getattr(sys.modules[auth_plugin_module], auth_plugin_cls)
+
+        opts.auth_plugin = auth_plugin_cls(opts.auth_source)
+
+    del opts.auth_source
 
     # Create and start the WebSockets proxy
     libserver = opts.libserver
@@ -419,7 +696,7 @@ def websockify_init():
         server.start_server()
 
 
-class LibProxyServer(ForkingMixIn, HTTPServer):
+class LibProxyServer(ThreadingMixIn, HTTPServer):
     """
     Just like WebSocketProxy, but uses standard Python SocketServer
     framework.
@@ -433,9 +710,13 @@ class LibProxyServer(ForkingMixIn, HTTPServer):
         self.wrap_mode      = kwargs.pop('wrap_mode', None)
         self.unix_target    = kwargs.pop('unix_target', None)
         self.ssl_target     = kwargs.pop('ssl_target', None)
-        self.target_cfg     = kwargs.pop('target_cfg', None)
+        self.token_plugin   = kwargs.pop('token_plugin', None)
+        self.auth_plugin    = kwargs.pop('auth_plugin', None)
+        self.heartbeat      = kwargs.pop('heartbeat', None)
+
+        self.token_plugin = None
+        self.auth_plugin = None
         self.daemon = False
-        self.target_cfg = None
 
         # Server configuration
         listen_host    = kwargs.pop('listen_host', '')
@@ -456,15 +737,14 @@ class LibProxyServer(ForkingMixIn, HTTPServer):
 
         if web:
             os.chdir(web)
-            
-        HTTPServer.__init__(self, (listen_host, listen_port), 
-                            RequestHandlerClass)
+
+        super().__init__((listen_host, listen_port), RequestHandlerClass)
 
 
     def process_request(self, request, client_address):
         """Override process_request to implement a counter"""
         self.handler_id += 1
-        ForkingMixIn.process_request(self, request, client_address)
+        super().process_request(request, client_address)
 
 
 if __name__ == '__main__':

websockify/websocketserver.py

@@ -0,0 +1,95 @@
+#!/usr/bin/env python
+
+'''
+Python WebSocket server base
+Copyright 2011 Joel Martin
+Copyright 2016-2018 Pierre Ossman
+Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3)
+'''
+
+import sys
+from http.server import BaseHTTPRequestHandler, HTTPServer
+
+from websockify.websocket import WebSocket, WebSocketWantReadError, WebSocketWantWriteError
+
+class WebSocketRequestHandlerMixIn:
+    """WebSocket request handler mix-in class
+
+    This class modifies and existing request handler to handle
+    WebSocket requests. The request handler will continue to function
+    as before, except that WebSocket requests are intercepted and the
+    methods handle_upgrade() and handle_websocket() are called. The
+    standard do_GET() will be called for normal requests.
+
+    The class instance SocketClass can be overridden with the class to
+    use for the WebSocket connection.
+    """
+
+    SocketClass = WebSocket
+
+    def handle_one_request(self):
+        """Extended request handler
+
+        This is where WebSocketRequestHandler redirects requests to the
+        new methods. Any sub-classes must call this method in order for
+        the calls to function.
+        """
+        self._real_do_GET = self.do_GET
+        self.do_GET = self._websocket_do_GET
+        try:
+            super().handle_one_request()
+        finally:
+            self.do_GET = self._real_do_GET
+
+    def _websocket_do_GET(self):
+        # Checks if it is a websocket request and redirects
+        self.do_GET = self._real_do_GET
+
+        if (self.headers.get('upgrade') and
+            self.headers.get('upgrade').lower() == 'websocket'):
+            self.handle_upgrade()
+        else:
+            self.do_GET()
+
+    def handle_upgrade(self):
+        """Initial handler for a WebSocket request
+
+        This method is called when a WebSocket is requested. By default
+        it will create a WebSocket object and perform the negotiation.
+        The WebSocket object will then replace the request object and
+        handle_websocket() will be called.
+        """
+        websocket = self.SocketClass()
+        try:
+            websocket.accept(self.request, self.headers)
+        except Exception:
+            exc = sys.exc_info()[1]
+            self.send_error(400, str(exc))
+            return
+
+        self.log_request(101)
+
+        self.request = websocket
+
+        # Other requests cannot follow Websocket data
+        self.close_connection = True
+
+        self.handle_websocket()
+
+    def handle_websocket(self):
+        """Handle a WebSocket connection.
+        
+        This is called when the WebSocket is ready to be used. A
+        sub-class should perform the necessary communication here and
+        return once done.
+        """
+        pass
+
+# Convenient ready made classes
+
+class WebSocketRequestHandler(WebSocketRequestHandlerMixIn,
+                              BaseHTTPRequestHandler):
+    pass
+
+class WebSocketServer(HTTPServer):
+    pass

websockify/websockifyserver.py

@@ -0,0 +1,834 @@
+#!/usr/bin/env python
+
+'''
+Python WebSocket server base with support for "wss://" encryption.
+Copyright 2011 Joel Martin
+Copyright 2016 Pierre Ossman
+Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3)
+
+You can make a cert/key with openssl using:
+openssl req -new -x509 -days 365 -nodes -out self.pem -keyout self.pem
+as taken from http://docs.python.org/dev/library/ssl.html#certificates
+
+'''
+
+import os, sys, time, errno, signal, socket, select, logging
+import multiprocessing
+from http.server import SimpleHTTPRequestHandler
+
+# Degraded functionality if these imports are missing
+for mod, msg in [('ssl', 'TLS/SSL/wss is disabled'),
+                 ('resource', 'daemonizing is disabled')]:
+    try:
+        globals()[mod] = __import__(mod)
+    except ImportError:
+        globals()[mod] = None
+        print("WARNING: no '%s' module, %s" % (mod, msg))
+
+if sys.platform == 'win32':
+    # make sockets pickle-able/inheritable
+    import multiprocessing.reduction
+
+from websockify.websocket import WebSocket, WebSocketWantReadError, WebSocketWantWriteError
+from websockify.websocketserver import WebSocketRequestHandlerMixIn
+
+class CompatibleWebSocket(WebSocket):
+    def select_subprotocol(self, protocols):
+        # Handle old websockify clients that still specify a sub-protocol
+        if 'binary' in protocols:
+            return 'binary'
+        else:
+            return ''
+
+# HTTP handler with WebSocket upgrade support
+class WebSockifyRequestHandler(WebSocketRequestHandlerMixIn, SimpleHTTPRequestHandler):
+    """
+    WebSocket Request Handler Class, derived from SimpleHTTPRequestHandler.
+    Must be sub-classed with new_websocket_client method definition.
+    The request handler can be configured by setting optional
+    attributes on the server object:
+
+    * only_upgrade: If true, SimpleHTTPRequestHandler will not be enabled,
+      only websocket is allowed.
+    * verbose: If true, verbose logging is activated.
+    * daemon: Running as daemon, do not write to console etc
+    * record: Record raw frame data as JavaScript array into specified filename
+    * run_once: Handle a single request
+    * handler_id: A sequence number for this connection, appended to record filename
+    """
+    server_version = "WebSockify"
+
+    protocol_version = "HTTP/1.1"
+
+    SocketClass = CompatibleWebSocket
+
+    # An exception while the WebSocket client was connected
+    class CClose(Exception):
+        pass
+
+    def __init__(self, req, addr, server):
+        # Retrieve a few configuration variables from the server
+        self.only_upgrade = getattr(server, "only_upgrade", False)
+        self.verbose = getattr(server, "verbose", False)
+        self.daemon = getattr(server, "daemon", False)
+        self.record = getattr(server, "record", False)
+        self.run_once = getattr(server, "run_once", False)
+        self.rec        = None
+        self.handler_id = getattr(server, "handler_id", False)
+        self.file_only = getattr(server, "file_only", False)
+        self.traffic = getattr(server, "traffic", False)
+        self.web_auth = getattr(server, "web_auth", False)
+        self.host_token = getattr(server, "host_token", False)
+
+        self.logger = getattr(server, "logger", None)
+        if self.logger is None:
+            self.logger = WebSockifyServer.get_logger()
+
+        super().__init__(req, addr, server)
+
+    def log_message(self, format, *args):
+        self.logger.info("%s - - [%s] %s" % (self.client_address[0], self.log_date_time_string(), format % args))
+
+    #
+    # WebSocketRequestHandler logging/output functions
+    #
+
+    def print_traffic(self, token="."):
+        """ Show traffic flow mode. """
+        if self.traffic:
+            sys.stdout.write(token)
+            sys.stdout.flush()
+
+    def msg(self, msg, *args, **kwargs):
+        """ Output message with handler_id prefix. """
+        prefix = "% 3d: " % self.handler_id
+        self.logger.log(logging.INFO, "%s%s" % (prefix, msg), *args, **kwargs)
+
+    def vmsg(self, msg, *args, **kwargs):
+        """ Same as msg() but as debug. """
+        prefix = "% 3d: " % self.handler_id
+        self.logger.log(logging.DEBUG, "%s%s" % (prefix, msg), *args, **kwargs)
+
+    def warn(self, msg, *args, **kwargs):
+        """ Same as msg() but as warning. """
+        prefix = "% 3d: " % self.handler_id
+        self.logger.log(logging.WARN, "%s%s" % (prefix, msg), *args, **kwargs)
+
+    #
+    # Main WebSocketRequestHandler methods
+    #
+    def send_frames(self, bufs=None):
+        """ Encode and send WebSocket frames. Any frames already
+        queued will be sent first. If buf is not set then only queued
+        frames will be sent. Returns True if any frames could not be
+        fully sent, in which case the caller should call again when
+        the socket is ready. """
+
+        tdelta = int(time.time()*1000) - self.start_time
+
+        if bufs:
+            for buf in bufs:
+                if self.rec:
+                    # Python 3 compatible conversion
+                    bufstr = buf.decode('latin1').encode('unicode_escape').decode('ascii').replace("'", "\\'")
+                    self.rec.write("'{{{0}{{{1}',\n".format(tdelta, bufstr))
+                self.send_parts.append(buf)
+
+        while self.send_parts:
+            # Send pending frames
+            try:
+                self.request.sendmsg(self.send_parts[0])
+            except WebSocketWantWriteError:
+                self.print_traffic("<.")
+                return True
+            self.send_parts.pop(0)
+            self.print_traffic("<")
+
+        return False
+
+    def recv_frames(self):
+        """ Receive and decode WebSocket frames.
+
+        Returns:
+            (bufs_list, closed_string)
+        """
+
+        closed = False
+        bufs = []
+        tdelta = int(time.time()*1000) - self.start_time
+
+        while True:
+            try:
+                buf = self.request.recvmsg()
+            except WebSocketWantReadError:
+                self.print_traffic("}.")
+                break
+
+            if buf is None:
+                closed = {'code': self.request.close_code,
+                          'reason': self.request.close_reason}
+                return bufs, closed
+
+            self.print_traffic("}")
+
+            if self.rec:
+                # Python 3 compatible conversion
+                bufstr = buf.decode('latin1').encode('unicode_escape').decode('ascii').replace("'", "\\'")
+                self.rec.write("'}}{0}}}{1}',\n".format(tdelta, bufstr))
+
+            bufs.append(buf)
+
+            if not self.request.pending():
+                break
+
+        return bufs, closed
+
+    def send_close(self, code=1000, reason=''):
+        """ Send a WebSocket orderly close frame. """
+        self.request.shutdown(socket.SHUT_RDWR, code, reason)
+
+    def send_pong(self, data=''.encode('ascii')):
+        """ Send a WebSocket pong frame. """
+        self.request.pong(data)
+
+    def send_ping(self, data=''.encode('ascii')):
+        """ Send a WebSocket ping frame. """
+        self.request.ping(data)
+
+    def handle_upgrade(self):
+        # ensure connection is authorized, and determine the target
+        self.validate_connection()
+        self.auth_connection()
+
+        super().handle_upgrade()
+
+    def handle_websocket(self):
+        # Indicate to server that a Websocket upgrade was done
+        self.server.ws_connection = True
+        # Initialize per client settings
+        self.send_parts = []
+        self.recv_part  = None
+        self.start_time = int(time.time()*1000)
+
+        # client_address is empty with, say, UNIX domain sockets
+        client_addr = ""
+        is_ssl = False
+        try:
+            client_addr = self.client_address[0]
+            is_ssl = self.client_address[2]
+        except IndexError:
+            pass
+
+        if is_ssl:
+            self.stype = "SSL/TLS (wss://)"
+        else:
+            self.stype = "Plain non-SSL (ws://)"
+
+        self.log_message("%s: %s WebSocket connection", client_addr,
+                         self.stype)
+        if self.path != '/':
+            self.log_message("%s: Path: '%s'", client_addr, self.path)
+
+        if self.record:
+            # Record raw frame data as JavaScript array
+            fname = "%s.%s" % (self.record,
+                               self.handler_id)
+            self.log_message("opening record file: %s", fname)
+            self.rec = open(fname, 'w+')
+            self.rec.write("var VNC_frame_data = [\n")
+
+        try:
+            self.new_websocket_client()
+        except self.CClose:
+            # Close the client
+            _, exc, _ = sys.exc_info()
+            self.send_close(exc.args[0], exc.args[1])
+
+    def do_GET(self):
+        if self.web_auth:
+            # ensure connection is authorized, this seems to apply to list_directory() as well
+            self.auth_connection()
+
+        if self.only_upgrade:
+            self.send_error(405, "Method Not Allowed")
+        else:
+            super().do_GET()
+
+    def list_directory(self, path):
+        if self.file_only:
+            self.send_error(404, "No such file")
+        else:
+            return super().list_directory(path)
+
+    def new_websocket_client(self):
+        """ Do something with a WebSockets client connection. """
+        raise Exception("WebSocketRequestHandler.new_websocket_client() must be overloaded")
+
+    def validate_connection(self):
+        """ Ensure that the connection has a valid token, and set the target. """
+        pass
+
+    def auth_connection(self):
+        """ Ensure that the connection is authorized. """
+        pass
+
+    def do_HEAD(self):
+        if self.web_auth:
+            self.auth_connection()
+
+        if self.only_upgrade:
+            self.send_error(405, "Method Not Allowed")
+        else:
+            super().do_HEAD()
+
+    def finish(self):
+        if self.rec:
+            self.rec.write("'EOF'];\n")
+            self.rec.close()
+        super().finish()
+
+    def handle(self):
+        # When using run_once, we have a single process, so
+        # we cannot loop in BaseHTTPRequestHandler.handle; we
+        # must return and handle new connections
+        if self.run_once:
+            self.handle_one_request()
+        else:
+            super().handle()
+
+    def log_request(self, code='-', size='-'):
+        if self.verbose:
+            super().log_request(code, size)
+
+
+class WebSockifyServer():
+    """
+    WebSockets server class.
+    As an alternative, the standard library SocketServer can be used
+    """
+
+    policy_response = """<cross-domain-policy><allow-access-from domain="*" to-ports="*" /></cross-domain-policy>\n"""
+    log_prefix = "websocket"
+
+    # An exception before the WebSocket connection was established
+    class EClose(Exception):
+        pass
+
+    class Terminate(Exception):
+        pass
+
+    def __init__(self, RequestHandlerClass, listen_fd=None,
+            listen_host='', listen_port=None, source_is_ipv6=False,
+            verbose=False, cert='', key='', key_password=None, ssl_only=None,
+            verify_client=False, cafile=None,
+            daemon=False, record='', web='', web_auth=False,
+            file_only=False,
+            run_once=False, timeout=0, idle_timeout=0, traffic=False,
+            tcp_keepalive=True, tcp_keepcnt=None, tcp_keepidle=None,
+            tcp_keepintvl=None, ssl_ciphers=None, ssl_options=0):
+
+        # settings
+        self.RequestHandlerClass = RequestHandlerClass
+        self.verbose        = verbose
+        self.listen_fd      = listen_fd
+        self.listen_host    = listen_host
+        self.listen_port    = listen_port
+        self.prefer_ipv6    = source_is_ipv6
+        self.ssl_only       = ssl_only
+        self.ssl_ciphers    = ssl_ciphers
+        self.ssl_options    = ssl_options
+        self.verify_client  = verify_client
+        self.daemon         = daemon
+        self.run_once       = run_once
+        self.timeout        = timeout
+        self.idle_timeout   = idle_timeout
+        self.traffic        = traffic
+        self.file_only      = file_only
+        self.web_auth       = web_auth
+
+        self.launch_time    = time.time()
+        self.ws_connection  = False
+        self.handler_id     = 1
+        self.terminating    = False
+
+        self.logger         = self.get_logger()
+        self.tcp_keepalive  = tcp_keepalive
+        self.tcp_keepcnt    = tcp_keepcnt
+        self.tcp_keepidle   = tcp_keepidle
+        self.tcp_keepintvl  = tcp_keepintvl
+
+        # keyfile path must be None if not specified
+        self.key = None
+        self.key_password = key_password
+
+        # Make paths settings absolute
+        self.cert = os.path.abspath(cert)
+        self.web = self.record = self.cafile = ''
+        if key:
+            self.key = os.path.abspath(key)
+        if web:
+            self.web = os.path.abspath(web)
+        if record:
+            self.record = os.path.abspath(record)
+        if cafile:
+            self.cafile = os.path.abspath(cafile)
+
+        if self.web:
+            os.chdir(self.web)
+        self.only_upgrade = not self.web
+
+        # Sanity checks
+        if not ssl and self.ssl_only:
+            raise Exception("No 'ssl' module and SSL-only specified")
+        if self.daemon and not resource:
+            raise Exception("Module 'resource' required to daemonize")
+
+        # Show configuration
+        self.msg("WebSocket server settings:")
+        if self.listen_fd != None:
+            self.msg("  - Listen for inetd connections")
+        else:
+            self.msg("  - Listen on %s:%s",
+                    self.listen_host, self.listen_port)
+        if self.web:
+            if self.file_only:
+                self.msg("  - Web server (no directory listings). Web root: %s", self.web)
+            else:
+                self.msg("  - Web server. Web root: %s", self.web)
+        if ssl:
+            if os.path.exists(self.cert):
+                self.msg("  - SSL/TLS support")
+                if self.ssl_only:
+                    self.msg("  - Deny non-SSL/TLS connections")
+            else:
+                self.msg("  - No SSL/TLS support (no cert file)")
+        else:
+            self.msg("  - No SSL/TLS support (no 'ssl' module)")
+        if self.daemon:
+            self.msg("  - Backgrounding (daemon)")
+        if self.record:
+            self.msg("  - Recording to '%s.*'", self.record)
+
+    #
+    # WebSockifyServer static methods
+    #
+
+    @staticmethod
+    def get_logger():
+        return logging.getLogger("%s.%s" % (
+            WebSockifyServer.log_prefix,
+            WebSockifyServer.__class__.__name__))
+
+    @staticmethod
+    def socket(host, port=None, connect=False, prefer_ipv6=False,
+               unix_socket=None, use_ssl=False, tcp_keepalive=True,
+               tcp_keepcnt=None, tcp_keepidle=None, tcp_keepintvl=None):
+        """ Resolve a host (and optional port) to an IPv4 or IPv6
+        address. Create a socket. Bind to it if listen is set,
+        otherwise connect to it. Return the socket.
+        """
+        flags = 0
+        if host == '':
+            host = None
+        if connect and not (port or unix_socket):
+            raise Exception("Connect mode requires a port")
+        if use_ssl and not ssl:
+            raise Exception("SSL socket requested but Python SSL module not loaded.");
+        if not connect and use_ssl:
+            raise Exception("SSL only supported in connect mode (for now)")
+        if not connect:
+            flags = flags | socket.AI_PASSIVE
+
+        if not unix_socket:
+            addrs = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM,
+                    socket.IPPROTO_TCP, flags)
+            if not addrs:
+                raise Exception("Could not resolve host '%s'" % host)
+            addrs.sort(key=lambda x: x[0])
+            if prefer_ipv6:
+                addrs.reverse()
+            sock = socket.socket(addrs[0][0], addrs[0][1])
+
+            if  tcp_keepalive:
+                sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
+                if tcp_keepcnt:
+                    sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPCNT,
+                                    tcp_keepcnt)
+                if tcp_keepidle:
+                    sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPIDLE,
+                                    tcp_keepidle)
+                if tcp_keepintvl:
+                    sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPINTVL,
+                                    tcp_keepintvl)
+
+            if connect:
+                sock.connect(addrs[0][4])
+                if use_ssl:
+                    sock = ssl.wrap_socket(sock)
+            else:
+                sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+                sock.bind(addrs[0][4])
+                sock.listen(100)
+        else:
+            sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+            sock.connect(unix_socket)
+
+        return sock
+
+    @staticmethod
+    def daemonize(keepfd=None, chdir='/'):
+        
+        if keepfd is None:
+            keepfd = []
+
+        os.umask(0)
+        if chdir:
+            os.chdir(chdir)
+        else:
+            os.chdir('/')
+        os.setgid(os.getgid())  # relinquish elevations
+        os.setuid(os.getuid())  # relinquish elevations
+
+        # Double fork to daemonize
+        if os.fork() > 0: os._exit(0)  # Parent exits
+        os.setsid()                    # Obtain new process group
+        if os.fork() > 0: os._exit(0)  # Parent exits
+
+        # Signal handling
+        signal.signal(signal.SIGTERM, signal.SIG_IGN)
+        signal.signal(signal.SIGINT, signal.SIG_IGN)
+
+        # Close open files
+        maxfd = resource.getrlimit(resource.RLIMIT_NOFILE)[1]
+        if maxfd == resource.RLIM_INFINITY: maxfd = 256
+        for fd in reversed(range(maxfd)):
+            try:
+                if fd not in keepfd:
+                    os.close(fd)
+            except OSError:
+                _, exc, _ = sys.exc_info()
+                if exc.errno != errno.EBADF: raise
+
+        # Redirect I/O to /dev/null
+        os.dup2(os.open(os.devnull, os.O_RDWR), sys.stdin.fileno())
+        os.dup2(os.open(os.devnull, os.O_RDWR), sys.stdout.fileno())
+        os.dup2(os.open(os.devnull, os.O_RDWR), sys.stderr.fileno())
+
+    def do_handshake(self, sock, address):
+        """
+        do_handshake does the following:
+        - Peek at the first few bytes from the socket.
+        - If the connection is an HTTPS/SSL/TLS connection then SSL
+          wrap the socket.
+        - Read from the (possibly wrapped) socket.
+        - If we have received a HTTP GET request and the webserver
+          functionality is enabled, answer it, close the socket and
+          return.
+        - Assume we have a WebSockets connection, parse the client
+          handshake data.
+        - Send a WebSockets handshake server response.
+        - Return the socket for this WebSocket client.
+        """
+        ready = select.select([sock], [], [], 3)[0]
+
+        if not ready:
+            raise self.EClose("")
+        # Peek, but do not read the data so that we have a opportunity
+        # to SSL wrap the socket first
+        handshake = sock.recv(1024, socket.MSG_PEEK)
+        #self.msg("Handshake [%s]" % handshake)
+
+        if not handshake:
+            raise self.EClose("")
+
+        elif handshake[0] in (22, 128):
+            # SSL wrap the connection
+            if not ssl:
+                raise self.EClose("SSL connection but no 'ssl' module")
+            if not os.path.exists(self.cert):
+                raise self.EClose("SSL connection but '%s' not found"
+                                  % self.cert)
+            retsock = None
+            try:
+                # create new-style SSL wrapping for extended features
+                context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
+                if self.ssl_ciphers is not None:
+                    context.set_ciphers(self.ssl_ciphers)
+                context.options = self.ssl_options
+                context.load_cert_chain(certfile=self.cert, keyfile=self.key, password=self.key_password)
+                if self.verify_client:
+                    context.verify_mode = ssl.CERT_REQUIRED
+                    if self.cafile:
+                        context.load_verify_locations(cafile=self.cafile)
+                    else:
+                        context.set_default_verify_paths()
+                retsock = context.wrap_socket(
+                        sock,
+                        server_side=True)
+            except ssl.SSLError:
+                _, x, _ = sys.exc_info()
+                if x.args[0] == ssl.SSL_ERROR_EOF:
+                    if len(x.args) > 1:
+                        raise self.EClose(x.args[1])
+                    else:
+                        raise self.EClose("Got SSL_ERROR_EOF")
+                else:
+                    raise
+
+        elif self.ssl_only:
+            raise self.EClose("non-SSL connection received but disallowed")
+
+        else:
+            retsock = sock
+
+        # If the address is like (host, port), we are extending it
+        # with a flag indicating SSL. Not many other options
+        # available...
+        if len(address) == 2:
+            address = (address[0], address[1], (retsock != sock))
+
+        self.RequestHandlerClass(retsock, address, self)
+
+        # Return the WebSockets socket which may be SSL wrapped
+        return retsock
+
+    #
+    # WebSockifyServer logging/output functions
+    #
+
+    def msg(self, *args, **kwargs):
+        """ Output message as info """
+        self.logger.log(logging.INFO, *args, **kwargs)
+
+    def vmsg(self, *args, **kwargs):
+        """ Same as msg() but as debug. """
+        self.logger.log(logging.DEBUG, *args, **kwargs)
+
+    def warn(self, *args, **kwargs):
+        """ Same as msg() but as warning. """
+        self.logger.log(logging.WARN, *args, **kwargs)
+
+
+    #
+    # Events that can/should be overridden in sub-classes
+    #
+    def started(self):
+        """ Called after WebSockets startup """
+        self.vmsg("WebSockets server started")
+
+    def poll(self):
+        """ Run periodically while waiting for connections. """
+        #self.vmsg("Running poll()")
+        pass
+
+    def terminate(self):
+        if not self.terminating:
+            self.terminating = True
+            raise self.Terminate()
+
+    def multiprocessing_SIGCHLD(self, sig, stack):
+        # TODO: figure out a way to actually log this information without
+        #       calling `log` in the signal handlers
+        multiprocessing.active_children()
+
+    def fallback_SIGCHLD(self, sig, stack):
+        # Reap zombies when using os.fork() (python 2.4)
+        # TODO: figure out a way to actually log this information without
+        #       calling `log` in the signal handlers
+        try:
+            result = os.waitpid(-1, os.WNOHANG)
+            while result[0]:
+                self.vmsg("Reaped child process %s" % result[0])
+                result = os.waitpid(-1, os.WNOHANG)
+        except (OSError):
+            pass
+
+    def do_SIGINT(self, sig, stack):
+        # TODO: figure out a way to actually log this information without
+        #       calling `log` in the signal handlers
+        self.terminate()
+
+    def do_SIGTERM(self, sig, stack):
+        # TODO: figure out a way to actually log this information without
+        #       calling `log` in the signal handlers
+        self.terminate()
+
+    def top_new_client(self, startsock, address):
+        """ Do something with a WebSockets client connection. """
+        # handler process
+        client = None
+        try:
+            try:
+                client = self.do_handshake(startsock, address)
+            except self.EClose:
+                _, exc, _ = sys.exc_info()
+                # Connection was not a WebSockets connection
+                if exc.args[0]:
+                    self.msg("%s: %s" % (address[0], exc.args[0]))
+            except WebSockifyServer.Terminate:
+                raise
+            except Exception:
+                _, exc, _ = sys.exc_info()
+                self.msg("handler exception: %s" % str(exc))
+                self.vmsg("exception", exc_info=True)
+        finally:
+
+            if client and client != startsock:
+                # Close the SSL wrapped socket
+                # Original socket closed by caller
+                client.close()
+
+    def get_log_fd(self):
+        """
+        Get file descriptors for the loggers.
+        They should not be closed when the process is forked.
+        """
+        descriptors = []
+        for handler in self.logger.parent.handlers:
+            if isinstance(handler, logging.FileHandler):
+                descriptors.append(handler.stream.fileno())
+
+        return descriptors
+
+    def start_server(self):
+        """
+        Daemonize if requested. Listen for for connections. Run
+        do_handshake() method for each connection. If the connection
+        is a WebSockets client then call new_websocket_client() method (which must
+        be overridden) for each new client connection.
+        """
+
+        if self.listen_fd != None:
+            lsock = socket.fromfd(self.listen_fd, socket.AF_INET, socket.SOCK_STREAM)
+        else:
+            lsock = self.socket(self.listen_host, self.listen_port, False,
+                                self.prefer_ipv6,
+                                tcp_keepalive=self.tcp_keepalive,
+                                tcp_keepcnt=self.tcp_keepcnt,
+                                tcp_keepidle=self.tcp_keepidle,
+                                tcp_keepintvl=self.tcp_keepintvl)
+
+        if self.daemon:
+            keepfd = self.get_log_fd()
+            keepfd.append(lsock.fileno())
+            self.daemonize(keepfd=keepfd, chdir=self.web)
+
+        self.started()  # Some things need to happen after daemonizing
+
+        # Allow override of signals
+        original_signals = {
+            signal.SIGINT: signal.getsignal(signal.SIGINT),
+            signal.SIGTERM: signal.getsignal(signal.SIGTERM),
+        }
+        if getattr(signal, 'SIGCHLD', None) is not None:
+            original_signals[signal.SIGCHLD] = signal.getsignal(signal.SIGCHLD)
+        signal.signal(signal.SIGINT, self.do_SIGINT)
+        signal.signal(signal.SIGTERM, self.do_SIGTERM)
+        # make sure that _cleanup is called when children die
+        # by calling active_children on SIGCHLD
+        if getattr(signal, 'SIGCHLD', None) is not None:
+            signal.signal(signal.SIGCHLD, self.multiprocessing_SIGCHLD)
+
+        last_active_time = self.launch_time
+        try:
+            while True:
+                try:
+                    try:
+                        startsock = None
+                        pid = err = 0
+                        child_count = 0
+
+                        # Collect zombie child processes
+                        child_count = len(multiprocessing.active_children())
+
+                        time_elapsed = time.time() - self.launch_time
+                        if self.timeout and time_elapsed > self.timeout:
+                            self.msg('listener exit due to --timeout %s'
+                                    % self.timeout)
+                            break
+
+                        if self.idle_timeout:
+                            idle_time = 0
+                            if child_count == 0:
+                                idle_time = time.time() - last_active_time
+                            else:
+                                idle_time = 0
+                                last_active_time = time.time()
+
+                            if idle_time > self.idle_timeout and child_count == 0:
+                                self.msg('listener exit due to --idle-timeout %s'
+                                            % self.idle_timeout)
+                                break
+
+                        try:
+                            self.poll()
+
+                            ready = select.select([lsock], [], [], 1)[0]
+                            if lsock in ready:
+                                startsock, address = lsock.accept()
+                            else:
+                                continue
+                        except self.Terminate:
+                            raise
+                        except Exception:
+                            _, exc, _ = sys.exc_info()
+                            if hasattr(exc, 'errno'):
+                                err = exc.errno
+                            elif hasattr(exc, 'args'):
+                                err = exc.args[0]
+                            else:
+                                err = exc[0]
+                            if err == errno.EINTR:
+                                self.vmsg("Ignoring interrupted syscall")
+                                continue
+                            else:
+                                raise
+
+                        if self.run_once:
+                            # Run in same process if run_once
+                            self.top_new_client(startsock, address)
+                            if self.ws_connection :
+                                self.msg('%s: exiting due to --run-once'
+                                        % address[0])
+                                break
+                        else:
+                            self.vmsg('%s: new handler Process' % address[0])
+                            p = multiprocessing.Process(
+                                    target=self.top_new_client,
+                                    args=(startsock, address))
+                            p.start()
+                            # child will not return
+
+                        # parent process
+                        self.handler_id += 1
+
+                    except (self.Terminate, SystemExit, KeyboardInterrupt):
+                        self.msg("In exit")
+                        # terminate all child processes
+                        if not self.run_once:
+                            children = multiprocessing.active_children()
+
+                            for child in children:
+                                self.msg("Terminating child %s" % child.pid)
+                                child.terminate()
+
+                        break
+                    except Exception:
+                        exc = sys.exc_info()[1]
+                        self.msg("handler exception: %s", str(exc))
+                        self.vmsg("exception", exc_info=True)
+
+                finally:
+                    if startsock:
+                        startsock.close()
+        finally:
+            # Close listen port
+            self.vmsg("Closing socket listening at %s:%s",
+                      self.listen_host, self.listen_port)
+            lsock.close()
+
+            # Restore signals
+            for sig, func in original_signals.items():
+                signal.signal(sig, func)
+
+

wsirc.html

@@ -1,99 +0,0 @@
-<html>
-
-    <head>
-        <title>IRC Client using WebSockets</title>
-        <script src="include/base64.js"></script>
-        <script src="include/websock.js"></script>
-        <script src="include/util.js"></script>
-        <script src="include/webutil.js"></script> 
-        <script src="include/keysym.js"></script> 
-        <script src="include/VT100.js"></script> 
-        <script src="include/wsirc.js"></script> 
-        <!-- Uncomment to activate firebug lite -->
-        <!--
-        <script type='text/javascript' 
-            src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>
-        -->
-
-
-    </head>
-
-    <body>
-
-        Host: <input id='host' style='width:100'>&nbsp;
-        Port: <input id='port' style='width:50'>&nbsp;
-        Encrypt: <input id='encrypt' type='checkbox'>&nbsp;
-        <input id='connectButton' type='button' value='Connect' style='width:100px'>
-        <br>
-        Nick: <input id='nick' style='width:120'>&nbsp;
-        <br>
-        Channel: #<input id='channel' style='width:70'>&nbsp;
-
-        <br><br>
-
-        <div><pre id="irc"></pre></div>
-        &gt;
-        <input id="msg" type="text" size=80 onkeypress="sendMsg();">
-
-        <script>
-            var irc;
-
-            function sendMsg() {
-                if (event.keyCode === 13) {
-                    var msg = $D('msg').value;
-                    $D('msg').value = "";
-
-                    Util.Debug("calling sendMsg('" + msg + "')");
-                    irc.sendMsg(msg);
-                }
-            }
-
-            function connect() {
-                var ret;
-                ret  = irc.connect($D('host').value,
-                                   $D('port').value,
-                                   $D('encrypt').checked,
-                                   $D('nick').value,
-                                   $D('channel').value);
-                if (! ret) { return false; }
-                $D('connectButton').disabled = true;
-                $D('connectButton').value = "Connecting";
-            }
-
-            function disconnect() {
-                $D('connectButton').disabled = true;
-                $D('connectButton').value = "Disconnecting";
-                irc.disconnect();
-            }
-
-            function connected() {
-                $D('msg').disabled = false;
-                $D('connectButton').disabled = false;
-                $D('connectButton').value = "Disconnect";
-                $D('connectButton').onclick = disconnect;
-            }
-
-            function disconnected() {
-                $D('msg').disabled = true;
-                $D('connectButton').disabled = false;
-                $D('connectButton').value = "Connect";
-                $D('connectButton').onclick = connect;
-            }
-
-            window.onload = function() {
-                console.log("onload");
-                var url = document.location.href;
-                $D('host').value = (url.match(/host=([^&#]*)/) || ['',''])[1];
-                $D('port').value = (url.match(/port=([^&#]*)/) || ['',''])[1];
-                $D('nick').value = (url.match(/nick=([^&#]*)/) || ['',''])[1];
-                $D('channel').value = (url.match(/channel=([^&#]*)/) || ['',''])[1];
-
-                disconnected();
-                
-                irc = IRC('irc', connected, disconnected);
-            }
-        </script>
-
-    </body>
-
-</html>

wstelnet.html

@@ -1,74 +0,0 @@
-<html>
-
-    <head>
-        <title>Telnet client using WebSockets</title>
-        <script src="include/base64.js"></script>
-        <script src="include/util.js"></script>
-        <script src="include/websock.js"></script>
-        <script src="include/webutil.js"></script> 
-        <script src="include/keysym.js"></script> 
-        <script src="include/VT100.js"></script> 
-        <script src="include/wstelnet.js"></script> 
-        <!-- Uncomment to activate firebug lite -->
-        <!--
-        <script type='text/javascript' 
-            src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>
-        -->
-
-
-    </head>
-
-    <body>
-
-        Host: <input id='host' style='width:100'>&nbsp;
-        Port: <input id='port' style='width:50'>&nbsp;
-        Encrypt: <input id='encrypt' type='checkbox'>&nbsp;
-        <input id='connectButton' type='button' value='Connect' style='width:100px'
-            onclick="connect();">&nbsp;
-
-        <br><br>
-
-        <pre id="terminal"></pre>
-
-        <script>
-            var telnet;
-
-            function connect() {
-                telnet.connect($D('host').value,
-                               $D('port').value,
-                               $D('encrypt').checked);
-                $D('connectButton').disabled = true;
-                $D('connectButton').value = "Connecting";
-            }
-
-            function disconnect() {
-                $D('connectButton').disabled = true;
-                $D('connectButton').value = "Disconnecting";
-                telnet.disconnect();
-            }
-
-            function connected() {
-                $D('connectButton').disabled = false;
-                $D('connectButton').value = "Disconnect";
-                $D('connectButton').onclick = disconnect;
-            }
-
-            function disconnected() {
-                $D('connectButton').disabled = false;
-                $D('connectButton').value = "Connect";
-                $D('connectButton').onclick = connect;
-            }
-
-            window.onload = function() {
-                console.log("onload");
-                var url = document.location.href;
-                $D('host').value = (url.match(/host=([^&#]*)/) || ['',''])[1];
-                $D('port').value = (url.match(/port=([^&#]*)/) || ['',''])[1];
-                
-                telnet = Telnet('terminal', connected, disconnected);
-            }
-        </script>
-
-    </body>
-
-</html>