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

feat(listener): add depth for ssl listener

This commit is contained in:
zhanghongtong 2020-11-30 17:28:03 +08:00 committed by turtleDeng
parent f5162562a4
commit a3cdae3b42
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -41,3 +41,4 @@ erlang.mk
*.coverdata *.coverdata
etc/emqx.conf.rendered etc/emqx.conf.rendered
Mnesia.*/ Mnesia.*/
.stamp

7
etc/listeners.conf
View File

@ -301,6 +301,11 @@ listener.ssl.external.access.1 = allow all
## Value: Duration ## Value: Duration
listener.ssl.external.handshake_timeout = 15s listener.ssl.external.handshake_timeout = 15s
## Maximum number of non-self-issued intermediate certificates that can follow the peer certificate in a valid certification path.
##
## Value: Number
## listener.ssl.external.depth = 10
## Path to the file containing the user's private PEM-encoded key. ## Path to the file containing the user's private PEM-encoded key.
## ##
## See: http://erlang.org/doc/man/ssl.html ## See: http://erlang.org/doc/man/ssl.html
@ -932,4 +937,4 @@ listener.wss.external.send_timeout_close = on
## Whether a WebSocket message is allowed to contain multiple MQTT packets ## Whether a WebSocket message is allowed to contain multiple MQTT packets
## ##
## Value: single | multiple ## Value: single | multiple
listener.wss.external.mqtt_piggyback = multiple listener.wss.external.mqtt_piggyback = multiple

6
priv/emqx.schema
View File

@ -1372,6 +1372,11 @@ end}.
{datatype, {duration, ms}} {datatype, {duration, ms}}
]}. ]}.
{mapping, "listener.ssl.$name.depth", "emqx.listeners", [
{default, 10},
{datatype, integer}
]}.
{mapping, "listener.ssl.$name.dhfile", "emqx.listeners", [ {mapping, "listener.ssl.$name.dhfile", "emqx.listeners", [
{datatype, string} {datatype, string}
]}. ]}.
@ -1890,6 +1895,7 @@ end}.
{ciphers, Ciphers}, {ciphers, Ciphers},
{user_lookup_fun, UserLookupFun}, {user_lookup_fun, UserLookupFun},
{handshake_timeout, cuttlefish:conf_get(Prefix ++ ".handshake_timeout", Conf, undefined)}, {handshake_timeout, cuttlefish:conf_get(Prefix ++ ".handshake_timeout", Conf, undefined)},
{depth, cuttlefish:conf_get(Prefix ++ ".depth", Conf, undefined)},
{dhfile, cuttlefish:conf_get(Prefix ++ ".dhfile", Conf, undefined)}, {dhfile, cuttlefish:conf_get(Prefix ++ ".dhfile", Conf, undefined)},
{keyfile, cuttlefish:conf_get(Prefix ++ ".keyfile", Conf, undefined)}, {keyfile, cuttlefish:conf_get(Prefix ++ ".keyfile", Conf, undefined)},
{certfile, cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)}, {certfile, cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)},