From bd0409879b6105e76b16bbd6776a64fc1a8d1273 Mon Sep 17 00:00:00 2001
From: Feng Lee <feng@emqtt.io>
Date: Sun, 28 Jan 2018 15:26:56 +0800
Subject: [PATCH] Add 'proxy_port_address', 'proxy_port_header' options for
 WebSocket listener

---
 etc/emq.conf    | 22 ++++++++++++++++++----
 priv/emq.schema |  8 ++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/etc/emq.conf b/etc/emq.conf
index 70fcd762c..a5ca15d9c 100644
--- a/etc/emq.conf
+++ b/etc/emq.conf
@@ -1084,9 +1084,17 @@ listener.ws.external.max_clients = 102400
 ## Value: ACL Rule
 listener.ws.external.access.1 = allow all
 
-## listener.ws.external.proxy_address_header = x-forwarded-for
+## Use X-Forwarded-For header for real source IP if the EMQ cluster is
+## deployed behind NGINX or HAProxy.
+##
+## Value: String
+## listener.ws.external.proxy_address_header = X-Forwarded-For
 
-## listener.ws.external.proxy_port_header = x-remote-port
+## Use X-Forwarded-Port header for real source port if the EMQ cluster is
+## deployed behind NGINX or HAProxy.
+##
+## Value: String
+## listener.ws.external.proxy_port_header = X-Forwarded-Port
 
 ## Enable the Proxy Protocol V1/2 if the EMQ cluster is deployed behind
 ## HAProxy or Nginx.
@@ -1204,9 +1212,15 @@ listener.wss.external.max_clients = 64
 ## Value: ACL Rule
 listener.wss.external.access.1 = allow all
 
-## listener.wss.external.proxy_address_header = x-forwarded-for
+## See: listener.ws.external.proxy_address_header
+##
+## Value: String
+## listener.wss.external.proxy_address_header = X-Forwarded-For
 
-## listener.wss.external.proxy_port_header = x-remote-port
+## See: listener.ws.external.proxy_port_header
+##
+## Value: String
+## listener.wss.external.proxy_port_header = X-Forwarded-Port
 
 ## Enable the Proxy Protocol V1/2 support.
 ##
diff --git a/priv/emq.schema b/priv/emq.schema
index 9f8dbcf74..8c1e64a9f 100644
--- a/priv/emq.schema
+++ b/priv/emq.schema
@@ -1029,12 +1029,12 @@ end}.
   {datatype, string}
 ]}.
 
-{mapping, "listener.ws.$name.proxy_port_header", "emqttd.listeners", [
+{mapping, "listener.ws.$name.proxy_address_header", "emqttd.listeners", [
   {datatype, string},
   hidden
 ]}.
 
-{mapping, "listener.ws.$name.proxy_address_header", "emqttd.listeners", [
+{mapping, "listener.ws.$name.proxy_port_header", "emqttd.listeners", [
   {datatype, string},
   hidden
 ]}.
@@ -1125,12 +1125,12 @@ end}.
   {datatype, string}
 ]}.
 
-{mapping, "listener.wss.$name.proxy_port_header", "emqttd.listeners", [
+{mapping, "listener.wss.$name.proxy_address_header", "emqttd.listeners", [
   {datatype, string},
   hidden
 ]}.
 
-{mapping, "listener.wss.$name.proxy_address_header", "emqttd.listeners", [
+{mapping, "listener.wss.$name.proxy_port_header", "emqttd.listeners", [
   {datatype, string},
   hidden
 ]}.