Merge pull request #91 from NovusTheory/master

WSS Support for Sync

Author: lipp

.travis.yml

@@ -14,6 +14,7 @@ before_install:
     fi
   - sudo apt-get install $LUA
   - sudo apt-get install $LUA_DEV
+  - sudo apt-get install -y libssl-dev
   - lua$LUA_SFX -v
   # Install a recent luarocks release
   - wget https://github.com/keplerproject/luarocks/archive/v$LUAROCKS_VERSION.tar.gz -O $LUAROCKS_BASE.tar.gz
@@ -32,7 +33,7 @@ install:
   - sudo luarocks install luacov-coveralls
   - sudo luarocks install lua_cliargs 2.3-3
   - sudo luarocks install busted 1.10.0-1
-
+  - sudo luarocks install luasec OPENSSL_LIBDIR=/usr/lib/`gcc -print-multiarch`
 
 script: "sudo luarocks make rockspecs/lua-websockets-scm-1.rockspec && ./test.sh"
 

README.md

@@ -116,6 +116,7 @@ The client and server modules depend on:
 
   - luasocket
   - luabitop (if not using Lua 5.2 nor luajit)
+  - luasec
   - copas (optionally)
   - lua-ev (optionally)
 

lua-websockets.rockspec

@@ -17,7 +17,8 @@ dependencies = {
   "lua >= 5.1",
   "luasocket",
   "luabitop",
-  "copas"
+  "copas",
+  "luasec"
 }
 
 build = {

rockspecs/lua-websockets-scm-1.rockspec

@@ -17,7 +17,8 @@ dependencies = {
   "luasocket",
   "luabitop",
   "lua-ev",
-  "copas"
+  "copas",
+  "luasec"
 }
 
 build = {

src/websocket/client_sync.lua

@@ -27,7 +27,7 @@ local new = function(ws)
   end
 
   self.sock_close = function(self)
-    self.sock:shutdown()
+    --self.sock:shutdown() Causes errors?
     self.sock:close()
   end
 

src/websocket/sync.lua

@@ -1,10 +1,10 @@
 local frame = require'websocket.frame'
 local handshake = require'websocket.handshake'
 local tools = require'websocket.tools'
+local ssl = require'ssl'
 local tinsert = table.insert
 local tconcat = table.concat
 
-
 local receive = function(self)
   if self.state ~= 'OPEN' and not self.is_closing then
     return nil,nil,false,1006,'wrong state'
@@ -117,18 +117,22 @@ local close = function(self,code,reason)
   return was_clean,code,reason or ''
 end
 
-local connect = function(self,ws_url,ws_protocol)
+local connect = function(self,ws_url,ws_protocol,ssl_params)
   if self.state ~= 'CLOSED' then
     return nil,'wrong state'
   end
   local protocol,host,port,uri = tools.parse_url(ws_url)
-  if protocol ~= 'ws' then
-    return nil,'bad protocol'
-  end
+  -- Preconnect (for SSL if needed)
   local _,err = self:sock_connect(host,port)
   if err then
     return nil,err
   end
+  if protocol == 'wss' then
+    self.sock = ssl.wrap(self.sock, ssl_params)
+    self.sock:dohandshake()
+  elseif protocol ~= "ws" then
+    return nil, 'bad protocol'
+  end
   local ws_protocols_tbl = {''}
   if type(ws_protocol) == 'string' then
       ws_protocols_tbl = {ws_protocol}