From 765ab5ad7b78450adae749266f24d6a50b50ecaa Mon Sep 17 00:00:00 2001
From: Gilbert Wong <gilbertwong96@icloud.com>
Date: Thu, 6 Sep 2018 19:09:29 +0800
Subject: [PATCH] Add condition to handle when mqx_topic_alias do not exist

---
 src/emqx_mqtt_caps.erl        |  2 ++
 src/emqx_protocol.erl         | 60 +++++++++++++++++------------------
 test/emqx_mqtt_caps_SUITE.erl | 32 ++++++++++++-------
 3 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/src/emqx_mqtt_caps.erl b/src/emqx_mqtt_caps.erl
index baec9920c..b8b7a5b3a 100644
--- a/src/emqx_mqtt_caps.erl
+++ b/src/emqx_mqtt_caps.erl
@@ -69,6 +69,8 @@ do_check_pub(Props = #{ topic_alias := TopicAlias}, [{max_topic_alias, MaxTopicA
     end;
 do_check_pub(#{retain := true}, [{mqtt_retain_available, false}|_Caps]) ->
     {error, ?RC_RETAIN_NOT_SUPPORTED};
+do_check_pub(Props, [{max_topic_alias, _} | Caps]) ->
+    do_check_pub(Props, Caps);
 do_check_pub(Props, [{mqtt_retain_available, _}|Caps]) ->
     do_check_pub(Props, Caps).
 
diff --git a/src/emqx_protocol.erl b/src/emqx_protocol.erl
index 025fe9c93..38f55d204 100644
--- a/src/emqx_protocol.erl
+++ b/src/emqx_protocol.erl
@@ -33,36 +33,36 @@
 -export([shutdown/2]).
 
 -record(pstate, {
-                 zone,
-                 sendfun,
-                 peername,
-                 peercert,
-                 proto_ver,
-                 proto_name,
-                 ackprops,
-                 client_id,
-                 is_assigned,
-                 conn_pid,
-                 conn_props,
-                 ack_props,
-                 username,
-                 session,
-                 clean_start,
-                 topic_aliases,
-                 packet_size,
-                 will_topic,
-                 will_msg,
-                 keepalive,
-                 mountpoint,
-                 is_super,
-                 is_bridge,
-                 enable_ban,
-                 enable_acl,
-                 recv_stats,
-                 send_stats,
-                 connected,
-                 connected_at
-                }).
+         zone,
+         sendfun,
+         peername,
+         peercert,
+         proto_ver,
+         proto_name,
+         ackprops,
+         client_id,
+         is_assigned,
+         conn_pid,
+         conn_props,
+         ack_props,
+         username,
+         session,
+         clean_start,
+         topic_aliases,
+         packet_size,
+         will_topic,
+         will_msg,
+         keepalive,
+         mountpoint,
+         is_super,
+         is_bridge,
+         enable_ban,
+         enable_acl,
+         recv_stats,
+         send_stats,
+         connected,
+         connected_at
+        }).
 
 -type(state() :: #pstate{}).
 -export_type([state/0]).
diff --git a/test/emqx_mqtt_caps_SUITE.erl b/test/emqx_mqtt_caps_SUITE.erl
index 8b840b91c..1d4c81b8d 100644
--- a/test/emqx_mqtt_caps_SUITE.erl
+++ b/test/emqx_mqtt_caps_SUITE.erl
@@ -38,7 +38,7 @@ t_get_set_caps(_) ->
         mqtt_wildcard_subscription => true
     },
     Caps2 = Caps#{max_packet_size => 1048576},
-    case emqx_mqtt_caps:get_caps(zone) of 
+    case emqx_mqtt_caps:get_caps(zone) of
         Caps -> ok;
         Caps2 -> ok
     end,
@@ -63,20 +63,28 @@ t_check_pub(_) ->
     {ok, _} = emqx_zone:start_link(),
     PubCaps = #{
         max_qos_allowed => ?QOS_1,
-        mqtt_retain_available => false
+        mqtt_retain_available => false,
+        max_topic_alias => 4
     },
     emqx_zone:set_env(zone, '$mqtt_pub_caps', PubCaps),
     timer:sleep(100),
+    ct:log("~p", [emqx_mqtt_caps:get_caps(zone, publish)]),
     BadPubProps1 = #{
         qos => ?QOS_2,
         retain => false
-    }, 
+    },
     {error, ?RC_QOS_NOT_SUPPORTED} = emqx_mqtt_caps:check_pub(zone, BadPubProps1),
     BadPubProps2 = #{
         qos => ?QOS_1,
         retain => true
-    }, 
+    },
     {error, ?RC_RETAIN_NOT_SUPPORTED} = emqx_mqtt_caps:check_pub(zone, BadPubProps2),
+    BadPubProps3 = #{
+        qos => ?QOS_1,
+        retain => false,
+        topic_alias => 5
+    },
+    {error, ?RC_TOPIC_ALIAS_INVALID} = emqx_mqtt_caps:check_pub(zone, BadPubProps3),
     PubProps = #{
         qos => ?QOS_1,
         retain => false
@@ -94,18 +102,18 @@ t_check_sub(_) ->
         mqtt_wildcard_subscription => true
     },
 
-    ok = do_check_sub([{<<"client/stat">>, Opts}], [{<<"client/stat">>, Opts}]), 
+    ok = do_check_sub([{<<"client/stat">>, Opts}], [{<<"client/stat">>, Opts}]),
     ok = do_check_sub(Caps#{max_qos_allowed => ?QOS_1}, [{<<"client/stat">>, Opts}], [{<<"client/stat">>, Opts#{qos => ?QOS_1}}]),
-    ok = do_check_sub(Caps#{max_topic_levels => 1}, 
-                        [{<<"client/stat">>, Opts}], 
+    ok = do_check_sub(Caps#{max_topic_levels => 1},
+                        [{<<"client/stat">>, Opts}],
                         [{<<"client/stat">>, Opts#{rc => ?RC_TOPIC_FILTER_INVALID}}]),
-    ok = do_check_sub(Caps#{mqtt_shared_subscription => false}, 
-                        [{<<"client/stat">>, Opts}], 
+    ok = do_check_sub(Caps#{mqtt_shared_subscription => false},
+                        [{<<"client/stat">>, Opts}],
                         [{<<"client/stat">>, Opts#{rc => ?RC_SHARED_SUBSCRIPTIONS_NOT_SUPPORTED}}]),
-    ok = do_check_sub(Caps#{mqtt_wildcard_subscription => false}, 
-                        [{<<"vlient/+/dsofi">>, Opts}], 
+    ok = do_check_sub(Caps#{mqtt_wildcard_subscription => false},
+                        [{<<"vlient/+/dsofi">>, Opts}],
                         [{<<"vlient/+/dsofi">>, Opts#{rc => ?RC_WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED}}]).
-        
+