From d9e60faa2420169cbae52bc85fa18e43aa483eda Mon Sep 17 00:00:00 2001
From: Ery Lee <ery.lee@gmail.com>
Date: Tue, 31 Mar 2015 10:22:27 +0800
Subject: [PATCH] fix ipaddr match

---
 apps/emqttd/src/emqttd_access.erl        |  2 +-
 apps/emqttd/test/emqttd_access_tests.erl | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/apps/emqttd/src/emqttd_access.erl b/apps/emqttd/src/emqttd_access.erl
index c422bba86..0b44dcb7a 100644
--- a/apps/emqttd/src/emqttd_access.erl
+++ b/apps/emqttd/src/emqttd_access.erl
@@ -114,7 +114,7 @@ match_who(#mqtt_user{clientid = ClientId}, {client, ClientId}) ->
     true;
 match_who(#mqtt_user{username = Username}, {user, Username}) ->
     true;
-match_who(#mqtt_user{ipaddr = IP}, {_CDIR, Start, End}) ->
+match_who(#mqtt_user{ipaddr = IP}, {ipaddr, {_CDIR, Start, End}}) ->
     I = esockd_access:atoi(IP),
     I >= Start andalso I =< End;
 match_who(_User, _Who) ->
diff --git a/apps/emqttd/test/emqttd_access_tests.erl b/apps/emqttd/test/emqttd_access_tests.erl
index 1ed436b0b..8e45f172e 100644
--- a/apps/emqttd/test/emqttd_access_tests.erl
+++ b/apps/emqttd/test/emqttd_access_tests.erl
@@ -52,8 +52,25 @@ compile_test() ->
 
 match_test() ->
     User = #mqtt_user{ipaddr = {127,0,0,1}, clientid = <<"testClient">>, username = <<"TestUser">>},
+    User2 = #mqtt_user{ipaddr = {192,168,0,10}, clientid = <<"testClient">>, username = <<"TestUser">>},
     ?assertEqual({matched, allow}, emqttd_access:match(User, <<"Test/Topic">>, {allow, all})),
-    ?assertEqual({matched, deny},  emqttd_access:match(User, <<"Test/Topic">>, {deny, all})).
+    ?assertEqual({matched, deny},  emqttd_access:match(User, <<"Test/Topic">>, {deny, all})),
+    ?assertMatch({matched, allow}, emqttd_access:match(User, <<"Test/Topic">>,
+                 emqttd_access:compile({allow, {ipaddr, "127.0.0.1"}, subscribe, ["$SYS/#", "#"]}))),
+    ?assertMatch({matched, allow}, emqttd_access:match(User2, <<"Test/Topic">>,
+                 emqttd_access:compile({allow, {ipaddr, "192.168.0.1/24"}, subscribe, ["$SYS/#", "#"]}))),
+    ?assertMatch({matched, allow}, emqttd_access:match(User, <<"d/e/f/x">>,
+                                                       emqttd_access:compile({allow, {user, "TestUser"}, subscribe, ["a/b/c", "d/e/f/#"]}))),
+    ?assertEqual(nomatch, emqttd_access:match(User, <<"d/e/f/x">>, emqttd_access:compile({allow, {user, "admin"}, pubsub, ["d/e/f/#"]}))),
+    ?assertMatch({matched, allow}, emqttd_access:match(User, <<"testTopics/testClient">>,
+                 emqttd_access:compile({allow, {client, "testClient"}, publish, ["testTopics/testClient"]}))),
+    ?assertMatch({matched, allow}, emqttd_access:match(User, <<"clients/testClient">>,
+                                                       emqttd_access:compile({allow, all, pubsub, ["clients/$c"]}))),
+    ?assertMatch({matched, allow}, emqttd_access:match(#mqtt_user{username = <<"user2">>}, <<"users/user2/abc/def">>,
+                                                                  emqttd_access:compile({allow, all, subscribe, ["users/$u/#"]}))),
+    ?assertMatch({matched, deny}, 
+                 emqttd_access:match(User, <<"d/e/f">>,
+                                     emqttd_access:compile({deny, all, subscribe, ["$SYS/#", "#"]}))).
 
 -endif.