handshake_timeout change

etc/emq.conf

@@ -206,7 +206,7 @@ mqtt.listener.ssl.max_clients = 512
 
 ## Configuring SSL Options
 ## See http://erlang.org/doc/man/ssl.html
-mqtt.listener.ssl.handshake_timeout = 2000
+mqtt.listener.ssl.handshake_timeout = 15
 mqtt.listener.ssl.keyfile = etc/certs/key.pem
 mqtt.listener.ssl.certfile = etc/certs/cert.pem
 ## mqtt.listener.ssl.cacertfile = etc/certs/cacert.pem
@@ -222,7 +222,7 @@ mqtt.listener.http.max_clients = 64
 ## mqtt.listener.https = 8084
 ## mqtt.listener.https.acceptors = 4
 ## mqtt.listener.https.max_clients = 64
-## mqtt.listener.https.handshake_timeout = 10
+## mqtt.listener.https.handshake_timeout = 15
 ## mqtt.listener.https.certfile = etc/certs/cert.pem
 ## mqtt.listener.https.keyfile = etc/certs/key.pem
 ## mqtt.listener.https.cacertfile = etc/certs/cacert.pem

priv/emq.schema

@@ -611,7 +611,7 @@ end}.
                            {nodelay, cuttlefish:conf_get(Prefix ++ ".nodelay", Conf, true)}])
               end,
     SslOpts = fun(Prefix) ->
-                  Filter([{handshake_timeout, cuttlefish:conf_get(Prefix ++ ".handshake_timeout", Conf)},
+                  Filter([{handshake_timeout, cuttlefish:conf_get(Prefix ++ ".handshake_timeout", Conf) * 1000},
                           {keyfile,    cuttlefish:conf_get(Prefix ++ ".keyfile", Conf, undefined)},
                           {certfile,   cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)},
                           {cacertfile, cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf, undefined)},

src/emqttd_http.erl

@@ -137,6 +137,8 @@ authorized(Req) ->
         case emqttd_access_control:auth(#mqtt_client{username = Username, peername = Peer}, Password) of
             ok ->
                 true;
+            {ok, _IsSuper} -> 
+                true;
             {error, Reason} ->
                 lager:error("HTTP Auth failure: username=~s, reason=~p", [Username, Reason]),
                 false

test/emqttd_SUITE_data/emqttd.conf

@@ -206,7 +206,7 @@ mqtt.listener.ssl.max_clients = 512
 
 ## Configuring SSL Options
 ## See http://erlang.org/doc/man/ssl.html
-mqtt.listener.ssl.handshake_timeout = 2000
+mqtt.listener.ssl.handshake_timeout = 15
 mqtt.listener.ssl.keyfile = etc/certs/key.pem
 mqtt.listener.ssl.certfile = etc/certs/cert.pem
 ## mqtt.listener.ssl.cacertfile = etc/certs/cacert.pem
@@ -222,7 +222,7 @@ mqtt.listener.http.max_clients = 64
 ## mqtt.listener.https = 8084
 ## mqtt.listener.https.acceptors = 4
 ## mqtt.listener.https.max_clients = 64
-## mqtt.listener.https.handshake_timeout = 10
+## mqtt.listener.https.handshake_timeout = 15
 ## mqtt.listener.https.certfile = etc/certs/cert.pem
 ## mqtt.listener.https.keyfile = etc/certs/key.pem
 ## mqtt.listener.https.cacertfile = etc/certs/cacert.pem

test/emqttd_SUITE_data/emqttd.schema

@@ -611,7 +611,7 @@ end}.
                            {nodelay, cuttlefish:conf_get(Prefix ++ ".nodelay", Conf, true)}])
               end,
     SslOpts = fun(Prefix) ->
-                  Filter([{handshake_timeout, cuttlefish:conf_get(Prefix ++ ".handshake_timeout", Conf)},
+                  Filter([{handshake_timeout, cuttlefish:conf_get(Prefix ++ ".handshake_timeout", Conf) * 1000},
                           {keyfile,    cuttlefish:conf_get(Prefix ++ ".keyfile", Conf, undefined)},
                           {certfile,   cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)},
                           {cacertfile, cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf, undefined)},