yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed ssl opts fail_if_no_peer_cert

This commit is contained in:
turtled 2016-11-07 13:40:52 +08:00
parent 3db876781b
commit 186d512038
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/emq.conf
View File

@ -211,7 +211,7 @@ mqtt.listener.ssl.keyfile = etc/certs/key.pem
mqtt.listener.ssl.certfile = etc/certs/cert.pem mqtt.listener.ssl.certfile = etc/certs/cert.pem
## mqtt.listener.ssl.cacertfile = etc/certs/cacert.pem ## mqtt.listener.ssl.cacertfile = etc/certs/cacert.pem
## mqtt.listener.ssl.verify = verify_peer ## mqtt.listener.ssl.verify = verify_peer
## mqtt.listener.ssl.failed_if_no_peer_cert = true ## mqtt.listener.ssl.fail_if_no_peer_cert = true
## HTTP and WebSocket Listener ## HTTP and WebSocket Listener
mqtt.listener.http = 8083 mqtt.listener.http = 8083
@ -227,7 +227,7 @@ mqtt.listener.http.max_clients = 64
## mqtt.listener.https.keyfile = etc/certs/key.pem ## mqtt.listener.https.keyfile = etc/certs/key.pem
## mqtt.listener.https.cacertfile = etc/certs/cacert.pem ## mqtt.listener.https.cacertfile = etc/certs/cacert.pem
## mqtt.listener.https.verify = verify_peer ## mqtt.listener.https.verify = verify_peer
## mqtt.listener.https.failed_if_no_peer_cert = true ## mqtt.listener.https.fail_if_no_peer_cert = true
##------------------------------------------------------------------- ##-------------------------------------------------------------------
## System Monitor ## System Monitor

6
priv/emq.schema
View File

@ -536,7 +536,7 @@ end}.
{datatype, atom} {datatype, atom}
]}. ]}.
{mapping, "mqtt.listener.ssl.failed_if_no_peer_cert", "emqttd.listeners", [ {mapping, "mqtt.listener.ssl.fail_if_no_peer_cert", "emqttd.listeners", [
{datatype, {enum, [true, false]}} {datatype, {enum, [true, false]}}
]}. ]}.
@ -592,7 +592,7 @@ end}.
{datatype, atom} {datatype, atom}
]}. ]}.
{mapping, "mqtt.listener.https.failed_if_no_peer_cert", "emqttd.listeners", [ {mapping, "mqtt.listener.https.fail_if_no_peer_cert", "emqttd.listeners", [
{datatype, {enum, [true, false]}} {datatype, {enum, [true, false]}}
]}. ]}.
@ -616,7 +616,7 @@ end}.
{certfile, cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)}, {certfile, cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)},
{cacertfile, cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf, undefined)}, {cacertfile, cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf, undefined)},
{verify, cuttlefish:conf_get(Prefix ++ ".verify", Conf, undefined)}, {verify, cuttlefish:conf_get(Prefix ++ ".verify", Conf, undefined)},
{failed_if_no_peer_cert, cuttlefish:conf_get(Prefix ++ ".failed_if_no_peer_cert", Conf, undefined)}]) {fail_if_no_peer_cert, cuttlefish:conf_get(Prefix ++ ".fail_if_no_peer_cert", Conf, undefined)}])
end, end,
Listeners = fun(Name) when is_atom(Name) -> Listeners = fun(Name) when is_atom(Name) ->

4
test/emqttd_SUITE_data/emqttd.conf
View File

@ -211,7 +211,7 @@ mqtt.listener.ssl.keyfile = etc/certs/key.pem
mqtt.listener.ssl.certfile = etc/certs/cert.pem mqtt.listener.ssl.certfile = etc/certs/cert.pem
## mqtt.listener.ssl.cacertfile = etc/certs/cacert.pem ## mqtt.listener.ssl.cacertfile = etc/certs/cacert.pem
## mqtt.listener.ssl.verify = verify_peer ## mqtt.listener.ssl.verify = verify_peer
## mqtt.listener.ssl.failed_if_no_peer_cert = true ## mqtt.listener.ssl.fail_if_no_peer_cert = true
## HTTP and WebSocket Listener ## HTTP and WebSocket Listener
mqtt.listener.http = 8083 mqtt.listener.http = 8083
@ -227,7 +227,7 @@ mqtt.listener.http.max_clients = 64
## mqtt.listener.https.keyfile = etc/certs/key.pem ## mqtt.listener.https.keyfile = etc/certs/key.pem
## mqtt.listener.https.cacertfile = etc/certs/cacert.pem ## mqtt.listener.https.cacertfile = etc/certs/cacert.pem
## mqtt.listener.https.verify = verify_peer ## mqtt.listener.https.verify = verify_peer
## mqtt.listener.https.failed_if_no_peer_cert = true ## mqtt.listener.https.fail_if_no_peer_cert = true
##------------------------------------------------------------------- ##-------------------------------------------------------------------
## System Monitor ## System Monitor

6
test/emqttd_SUITE_data/emqttd.schema
View File

@ -536,7 +536,7 @@ end}.
{datatype, atom} {datatype, atom}
]}. ]}.
{mapping, "mqtt.listener.ssl.failed_if_no_peer_cert", "emqttd.listeners", [ {mapping, "mqtt.listener.ssl.fail_if_no_peer_cert", "emqttd.listeners", [
{datatype, {enum, [true, false]}} {datatype, {enum, [true, false]}}
]}. ]}.
@ -592,7 +592,7 @@ end}.
{datatype, atom} {datatype, atom}
]}. ]}.
{mapping, "mqtt.listener.https.failed_if_no_peer_cert", "emqttd.listeners", [ {mapping, "mqtt.listener.https.fail_if_no_peer_cert", "emqttd.listeners", [
{datatype, {enum, [true, false]}} {datatype, {enum, [true, false]}}
]}. ]}.
@ -616,7 +616,7 @@ end}.
{certfile, cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)}, {certfile, cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)},
{cacertfile, cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf, undefined)}, {cacertfile, cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf, undefined)},
{verify, cuttlefish:conf_get(Prefix ++ ".verify", Conf, undefined)}, {verify, cuttlefish:conf_get(Prefix ++ ".verify", Conf, undefined)},
{failed_if_no_peer_cert, cuttlefish:conf_get(Prefix ++ ".failed_if_no_peer_cert", Conf, undefined)}]) {fail_if_no_peer_cert, cuttlefish:conf_get(Prefix ++ ".fail_if_no_peer_cert", Conf, undefined)}])
end, end,
Listeners = fun(Name) when is_atom(Name) -> Listeners = fun(Name) when is_atom(Name) ->