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

Fix issue #1335 - Forward real client IP using a reverse proxy for websocket

This commit is contained in:
Feng Lee 2017-12-02 17:59:29 +08:00
parent 4915195b1e
commit bceb72853d
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/emq.conf
View File

@ -496,9 +496,9 @@ listener.ws.external.max_clients = 64
listener.ws.external.access.1 = allow all listener.ws.external.access.1 = allow all
listener.ws.external.proxy_ipaddress_header = x-forwarded-for ## listener.ws.external.proxy_address_header = x-forwarded-for
listener.ws.external.proxy_port_header = x-remote-port ## listener.ws.external.proxy_port_header = x-remote-port
## TCP Options ## TCP Options
listener.ws.external.backlog = 1024 listener.ws.external.backlog = 1024
@ -522,9 +522,9 @@ listener.wss.external.max_clients = 64
listener.wss.external.access.1 = allow all listener.wss.external.access.1 = allow all
listener.wss.external.proxy_ipaddress_header = x-forwarded-for ## listener.wss.external.proxy_address_header = x-forwarded-for
listener.wss.external.proxy_port_header = x-remote-port ## listener.wss.external.proxy_port_header = x-remote-port
## SSL Options ## SSL Options
listener.wss.external.handshake_timeout = 15s listener.wss.external.handshake_timeout = 15s

19
priv/emq.schema
View File

@ -992,7 +992,7 @@ end}.
hidden hidden
]}. ]}.
{mapping, "listener.ws.$name.proxy_ipaddress_header", "emqttd.listeners", [ {mapping, "listener.ws.$name.proxy_address_header", "emqttd.listeners", [
{datatype, string}, {datatype, string},
hidden hidden
]}. ]}.
@ -1065,7 +1065,7 @@ end}.
hidden hidden
]}. ]}.
{mapping, "listener.wss.$name.proxy_ipaddress_header", "emqttd.listeners", [ {mapping, "listener.wss.$name.proxy_address_header", "emqttd.listeners", [
{datatype, string}, {datatype, string},
hidden hidden
]}. ]}.
@ -1147,13 +1147,6 @@ end}.
end end
end, end,
WsProxyOpts = fun(Prefix) when Prefix =:= "listener.ws.external" orelse
Prefix =:= "listener.wss.external" ->
Filter([{proxy_port_header, cuttlefish:conf_get(Prefix ++ ".proxy_port_header", Conf, undefined)},
{proxy_ipaddress_header, cuttlefish:conf_get(Prefix ++ ".proxy_ipaddress_header", Conf, undefined)}]);
(_) -> []
end,
MountPoint = fun(undefined) -> undefined; (S) -> list_to_binary(S) end, MountPoint = fun(undefined) -> undefined; (S) -> list_to_binary(S) end,
ConnOpts = fun(Prefix) -> ConnOpts = fun(Prefix) ->
@ -1162,7 +1155,9 @@ end}.
{proxy_protocol, cuttlefish:conf_get(Prefix ++ ".proxy_protocol", Conf, undefined)}, {proxy_protocol, cuttlefish:conf_get(Prefix ++ ".proxy_protocol", Conf, undefined)},
{proxy_protocol_timeout, cuttlefish:conf_get(Prefix ++ ".proxy_protocol_timeout", Conf, undefined)}, {proxy_protocol_timeout, cuttlefish:conf_get(Prefix ++ ".proxy_protocol_timeout", Conf, undefined)},
{mountpoint, MountPoint(cuttlefish:conf_get(Prefix ++ ".mountpoint", Conf, undefined))}, {mountpoint, MountPoint(cuttlefish:conf_get(Prefix ++ ".mountpoint", Conf, undefined))},
{peer_cert_as_username, cuttlefish:conf_get(Prefix ++ ".peer_cert_as_username", Conf, undefined)}]) {peer_cert_as_username, cuttlefish:conf_get(Prefix ++ ".peer_cert_as_username", Conf, undefined)},
{proxy_port_header, cuttlefish:conf_get(Prefix ++ ".proxy_port_header", Conf, undefined)},
{proxy_address_header, cuttlefish:conf_get(Prefix ++ ".proxy_address_header", Conf, undefined)}])
end, end,
LisOpts = fun(Prefix) -> LisOpts = fun(Prefix) ->
@ -1206,7 +1201,7 @@ end}.
[]; [];
ListenOn -> ListenOn ->
[{Atom(Type), ListenOn, [{connopts, ConnOpts(Prefix)}, [{Atom(Type), ListenOn, [{connopts, ConnOpts(Prefix)},
{sockopts, TcpOpts(Prefix)} | LisOpts(Prefix) ++ WsProxyOpts(Prefix)]}] {sockopts, TcpOpts(Prefix)} | LisOpts(Prefix)]}]
end end
end, end,
@ -1218,7 +1213,7 @@ end}.
ListenOn -> ListenOn ->
[{Atom(Type), ListenOn, [{connopts, ConnOpts(Prefix)}, [{Atom(Type), ListenOn, [{connopts, ConnOpts(Prefix)},
{sockopts, TcpOpts(Prefix)}, {sockopts, TcpOpts(Prefix)},
{sslopts, SslOpts(Prefix)} | LisOpts(Prefix) ++ WsProxyOpts(Prefix)]}] {sslopts, SslOpts(Prefix)} | LisOpts(Prefix)]}]
end end
end, end,