From b4a582e0f5aa36df0e7d4999a6653c7175f287d1 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Wed, 22 Apr 2015 15:05:02 +0800 Subject: [PATCH] rm demo acl, auth modules --- .../src/emqttd_demo_acl.erl | 51 ------------------- .../src/emqttd_demo_auth.erl | 41 --------------- rebar.config | 3 +- 3 files changed, 2 insertions(+), 93 deletions(-) delete mode 100644 plugins/emqttd_plugin_demo/src/emqttd_demo_acl.erl delete mode 100644 plugins/emqttd_plugin_demo/src/emqttd_demo_auth.erl diff --git a/plugins/emqttd_plugin_demo/src/emqttd_demo_acl.erl b/plugins/emqttd_plugin_demo/src/emqttd_demo_acl.erl deleted file mode 100644 index e92fd9733..000000000 --- a/plugins/emqttd_plugin_demo/src/emqttd_demo_acl.erl +++ /dev/null @@ -1,51 +0,0 @@ -%%%----------------------------------------------------------------------------- -%%% @Copyright (C) 2012-2015, Feng Lee -%%% -%%% Permission is hereby granted, free of charge, to any person obtaining a copy -%%% of this software and associated documentation files (the "Software"), to deal -%%% in the Software without restriction, including without limitation the rights -%%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -%%% copies of the Software, and to permit persons to whom the Software is -%%% furnished to do so, subject to the following conditions: -%%% -%%% The above copyright notice and this permission notice shall be included in all -%%% copies or substantial portions of the Software. -%%% -%%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -%%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -%%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -%%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -%%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -%%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -%%% SOFTWARE. -%%%----------------------------------------------------------------------------- -%%% @doc -%%% emqttd demo acl module. -%%% -%%% @end -%%%----------------------------------------------------------------------------- --module(emqttd_demo_acl). - --author('feng@emqtt.io'). - --include_lib("emqttd/include/emqttd.hrl"). - --behaviour(emqttd_acl). - --export([check_acl/3, reload_acl/0, description/0]). - --spec check_acl(User, PubSub, Topic) -> {ok, allow | deny} | ignore | {error, any()} when - User :: mqtt_user(), - PubSub :: publish | subscribe, - Topic :: binary(). -check_acl(_User, _PubSub, _Topic) -> - ignore. - -reload_acl() -> - ok. - -description() -> - "Demo ACL Module". - - - diff --git a/plugins/emqttd_plugin_demo/src/emqttd_demo_auth.erl b/plugins/emqttd_plugin_demo/src/emqttd_demo_auth.erl deleted file mode 100644 index 956d2dcf1..000000000 --- a/plugins/emqttd_plugin_demo/src/emqttd_demo_auth.erl +++ /dev/null @@ -1,41 +0,0 @@ -%%%----------------------------------------------------------------------------- -%%% @Copyright (C) 2012-2015, Feng Lee -%%% -%%% Permission is hereby granted, free of charge, to any person obtaining a copy -%%% of this software and associated documentation files (the "Software"), to deal -%%% in the Software without restriction, including without limitation the rights -%%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -%%% copies of the Software, and to permit persons to whom the Software is -%%% furnished to do so, subject to the following conditions: -%%% -%%% The above copyright notice and this permission notice shall be included in all -%%% copies or substantial portions of the Software. -%%% -%%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -%%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -%%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -%%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -%%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -%%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -%%% SOFTWARE. -%%%----------------------------------------------------------------------------- -%%% @doc -%%% emqttd demo auth module. -%%% -%%% @end -%%%----------------------------------------------------------------------------- --module(emqttd_demo_auth). - --author('feng@emqtt.io'). - --include_lib("emqttd/include/emqttd.hrl"). - --behaviour(emqttd_auth). - -%% callbacks... --export([check_login/2]). - --spec check_login(mqtt_user(), undefined | binary()) -> true | false | ignore. -check_login(User, Password) -> - true. - diff --git a/rebar.config b/rebar.config index 2b3406b51..91420f44e 100644 --- a/rebar.config +++ b/rebar.config @@ -20,7 +20,8 @@ {sub_dirs, [ "rel", "apps/emqtt", - "apps/emqttd"]}. + "apps/emqttd", + "plugins/emqttd_plugin_demo"]}. {deps, [ {gproc, "0.3.*", {git, "git://github.com/uwiger/gproc.git", {branch, "master"}}},