mirror of
https://github.com/processone/ejabberd.git
synced 2024-12-20 17:27:00 +01:00
3dc55c6d47
- add API versionning - changed error handling, based on exception - commands moved/merged from mod_admin_p1 to mod_admin_extra - command bufixes - add some elixir unit test cases Squashed commit of the following: commit dd59855b3486f78a9349756e4f102e79b3accff8 Merge: 14e8ffc 506e08e Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Fri Oct 30 11:43:18 2015 +0100 Merge branch '3.2.x' into api commit 14e8ffce78cbea6c8605371d1fc50a0c1d1e012c Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Tue Oct 27 16:35:17 2015 +0100 Added OAuth tests to ejabberd_commands commit f81c550c14628edfe4861c228576cb767924366a Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Tue Oct 27 16:34:55 2015 +0100 Added some mod_http_api tests commit 6a64578d5b2ba532a2feb6503ed98561e56d5d53 Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Mon Oct 26 15:29:36 2015 +0100 Fix get_last command test Previous version won't work with dst. commit 27e0cde9e9c1f001effe68f8424a365ad947c068 Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Fri Oct 23 17:59:34 2015 +0200 Add tests on admin command policy commit 19dad8d54f54c9fabd454280483cccfb06c8e78a Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Fri Oct 23 16:49:36 2015 +0200 Added command related tests (http api & user policy) commit e0e596ab4a3f3a70aba5f374f028939ab794de33 Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Fri Oct 23 16:49:16 2015 +0200 Fix command call. commit 128cd7d1ede3c47a34f8ec3a750c980ccad2c61d Merge: 60c4c4c 447313c Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Thu Oct 22 14:48:39 2015 +0200 Merge branch '3.2.x' into api commit 60c4c4c0751302524c14219c6bc8c56a6069a689 Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Thu Oct 22 14:45:57 2015 +0200 Fix ejabberd_commands spec. commit 8e145c28c5da762c2b93ee32327eff1db94ebfed Merge: 397273a f13dc94 Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Wed Oct 21 18:26:07 2015 +0200 Merge branch '3.2.x' into api commit 397273a23ed415feac87aed33da6452229793387 Merge: c30e89b f289e27 Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Wed Oct 21 15:27:45 2015 +0200 Merge branch '3.2.x' into api commit c30e89bb8a0013bff37e61e4c6953350c9c1f313 Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Wed Oct 21 12:47:02 2015 +0200 Merge mod_http_api commit 7b0db22b4acd48ff6fabce41c1b2525e6580a3c5 Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Fri Oct 16 11:55:48 2015 +0200 Fix exunit tests to run with common_test suites commit d8b1a89800ac7379a57a7eb4a09c3c93c3e1e5eb Merge: 2879ae8 63455b3 Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Thu Oct 15 11:39:45 2015 +0200 Merge branch '3.2.x' into api commit 2879ae87ff3eee369ef3d780136b96ecff5285d1 Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Wed Oct 14 14:53:44 2015 +0200 Fix update_roster command. commit a1d453dd7a3afda9861a8d747494a45057ad574b Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Tue Oct 13 16:14:28 2015 +0200 API commands refactor Moving and/or merging commands from mod_admin_p1 to mod_admin_extra commit b709ed26b0fc0ca4f3bdd5a59fa58ec7e3db97fa Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Wed Oct 7 15:10:01 2015 +0200 Add tests on commands commit 6711687bee9c672cb3d5aed0744e13420ecf6dbd Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Tue Sep 29 15:58:16 2015 +0200 Add ejabberd_commands tests commit df8682f419cf3877e77e36a19bca0fc55dc991f8 Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Mon Sep 28 14:54:39 2015 +0200 Added API versioning for ejabberdctl and rest commands commit cd017b0e3aac431bc3ee807ceb7f8641e1523ef5 Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Fri Sep 18 11:21:45 2015 +0200 Better error handling of HTTP API commands. commit ca5cb6acd8e4643f9d6c484d2277b0d7e88471e5 Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Tue Sep 15 15:03:05 2015 +0200 add commands to mod_admin_extra: - get_offline_count - get_presence - change_password commit 7f583fa099e30ac2b0915669fd8f102ac565b833 Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Tue Sep 15 15:02:16 2015 +0200 Improve REST API error handling commit 14753b1c02cdce434a786b7f80f6c09f0d210075 Author: Jerome Sautret <jerome.sautret@process-one.net> Date: Mon Sep 14 10:51:17 2015 +0200 Change REST API return codes for integer type.
700 lines
25 KiB
Elixir
700 lines
25 KiB
Elixir
# ----------------------------------------------------------------------
|
|
#
|
|
# ejabberd, Copyright (C) 2002-2015 ProcessOne
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU General Public License as
|
|
# published by the Free Software Foundation; either version 2 of the
|
|
# License, or (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License along
|
|
# with this program; if not, write to the Free Software Foundation, Inc.,
|
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
#
|
|
# ----------------------------------------------------------------------
|
|
|
|
defmodule EjabberdModAdminExtraTest do
|
|
use ExUnit.Case, async: false
|
|
|
|
@author "jsautret@process-one.net"
|
|
|
|
@user "user"
|
|
@domain "domain"
|
|
@password "password"
|
|
@resource "resource"
|
|
|
|
require Record
|
|
Record.defrecord :jid, Record.extract(:jid,
|
|
from: "jlib.hrl")
|
|
|
|
setup_all do
|
|
try do
|
|
:stringprep.start
|
|
:mnesia.start
|
|
:p1_sha.load_nif
|
|
rescue
|
|
_ -> :ok
|
|
end
|
|
:ejabberd_commands.init
|
|
:mod_admin_extra.start(@domain, [])
|
|
:sel_application.start_app(:moka)
|
|
{:ok, _pid} = :ejabberd_hooks.start_link
|
|
:ok
|
|
end
|
|
|
|
setup do
|
|
:meck.unload
|
|
EjabberdAuthMock.init
|
|
EjabberdSmMock.init
|
|
ModRosterMock.init(@domain, :mod_admin_extra)
|
|
:ok
|
|
end
|
|
|
|
###################### Accounts
|
|
test "check_account works" do
|
|
EjabberdAuthMock.create_user @user, @domain, @password
|
|
|
|
assert :ejabberd_commands.execute_command(:check_account, [@user, @domain])
|
|
refute :ejabberd_commands.execute_command(:check_account, [@user, "bad_domain"])
|
|
refute :ejabberd_commands.execute_command(:check_account, ["bad_user", @domain])
|
|
|
|
assert :meck.validate :ejabberd_auth
|
|
end
|
|
|
|
test "check_password works" do
|
|
|
|
EjabberdAuthMock.create_user @user, @domain, @password
|
|
|
|
assert :ejabberd_commands.execute_command(:check_password,
|
|
[@user, @domain, @password])
|
|
refute :ejabberd_commands.execute_command(:check_password,
|
|
[@user, @domain, "bad_password"])
|
|
refute :ejabberd_commands.execute_command(:check_password,
|
|
[@user, "bad_domain", @password])
|
|
refute :ejabberd_commands.execute_command(:check_password,
|
|
["bad_user", @domain, @password])
|
|
|
|
assert :meck.validate :ejabberd_auth
|
|
|
|
end
|
|
|
|
test "check_password_hash works" do
|
|
|
|
EjabberdAuthMock.create_user @user, @domain, @password
|
|
hash = "5F4DCC3B5AA765D61D8327DEB882CF99" # echo -n password|md5
|
|
|
|
assert :ejabberd_commands.execute_command(:check_password_hash,
|
|
[@user, @domain, hash, "md5"])
|
|
refute :ejabberd_commands.execute_command(:check_password_hash,
|
|
[@user, @domain, "bad_hash", "md5"])
|
|
refute :ejabberd_commands.execute_command(:check_password_hash,
|
|
[@user, "bad_domain", hash, "md5"])
|
|
refute :ejabberd_commands.execute_command(:check_password_hash,
|
|
["bad_user", @domain, hash, "md5"])
|
|
|
|
hash = "5BAA61E4C9B93F3F0682250B6CF8331B7EE68FD8" # echo -n password|shasum
|
|
assert :ejabberd_commands.execute_command(:check_password_hash,
|
|
[@user, @domain, hash, "sha"])
|
|
|
|
assert :unkown_hash_method ==
|
|
catch_throw :ejabberd_commands.execute_command(:check_password_hash,
|
|
[@user, @domain, hash, "bad_method"])
|
|
|
|
assert :meck.validate :ejabberd_auth
|
|
|
|
end
|
|
|
|
test "change_password works" do
|
|
EjabberdAuthMock.create_user @user, @domain, @password
|
|
|
|
assert :ejabberd_commands.execute_command(:change_password,
|
|
[@user, @domain, "new_password"])
|
|
refute :ejabberd_commands.execute_command(:check_password,
|
|
[@user, @domain, @password])
|
|
assert :ejabberd_commands.execute_command(:check_password,
|
|
[@user, @domain, "new_password"])
|
|
assert {:not_found, 'unknown_user'} ==
|
|
catch_throw :ejabberd_commands.execute_command(:change_password,
|
|
["bad_user", @domain,
|
|
@password])
|
|
assert :meck.validate :ejabberd_auth
|
|
end
|
|
|
|
test "check_users_registration works" do
|
|
EjabberdAuthMock.create_user @user<>"1", @domain, @password
|
|
EjabberdAuthMock.create_user @user<>"2", @domain, @password
|
|
EjabberdAuthMock.create_user @user<>"3", @domain, @password
|
|
|
|
assert [{@user<>"0", @domain, 0},
|
|
{@user<>"1", @domain, 1},
|
|
{@user<>"2", @domain, 1},
|
|
{@user<>"3", @domain, 1}] ==
|
|
:ejabberd_commands.execute_command(:check_users_registration,
|
|
[[{@user<>"0", @domain},
|
|
{@user<>"1", @domain},
|
|
{@user<>"2", @domain},
|
|
{@user<>"3", @domain}]])
|
|
|
|
assert :meck.validate :ejabberd_auth
|
|
|
|
end
|
|
|
|
###################### Sessions
|
|
|
|
test "num_resources works" do
|
|
assert 0 == :ejabberd_commands.execute_command(:num_resources,
|
|
[@user, @domain])
|
|
|
|
EjabberdSmMock.connect_resource @user, @domain, @resource
|
|
assert 1 == :ejabberd_commands.execute_command(:num_resources,
|
|
[@user, @domain])
|
|
|
|
EjabberdSmMock.connect_resource @user, @domain, @resource<>"2"
|
|
assert 2 == :ejabberd_commands.execute_command(:num_resources,
|
|
[@user, @domain])
|
|
|
|
EjabberdSmMock.connect_resource @user<>"1", @domain, @resource
|
|
assert 2 == :ejabberd_commands.execute_command(:num_resources,
|
|
[@user, @domain])
|
|
|
|
EjabberdSmMock.disconnect_resource @user, @domain, @resource
|
|
assert 1 == :ejabberd_commands.execute_command(:num_resources,
|
|
[@user, @domain])
|
|
|
|
assert :meck.validate :ejabberd_sm
|
|
end
|
|
|
|
test "resource_num works" do
|
|
EjabberdSmMock.connect_resource @user, @domain, @resource<>"3"
|
|
EjabberdSmMock.connect_resource @user, @domain, @resource<>"2"
|
|
EjabberdSmMock.connect_resource @user, @domain, @resource<>"1"
|
|
|
|
assert :bad_argument ==
|
|
elem(catch_throw(:ejabberd_commands.execute_command(:resource_num,
|
|
[@user, @domain, 0])), 0)
|
|
assert @resource<>"1" ==
|
|
:ejabberd_commands.execute_command(:resource_num, [@user, @domain, 1])
|
|
assert @resource<>"3" ==
|
|
:ejabberd_commands.execute_command(:resource_num, [@user, @domain, 3])
|
|
assert :bad_argument ==
|
|
elem(catch_throw(:ejabberd_commands.execute_command(:resource_num,
|
|
[@user, @domain, 4])), 0)
|
|
assert :meck.validate :ejabberd_sm
|
|
end
|
|
|
|
test "kick_session works" do
|
|
EjabberdSmMock.connect_resource @user, @domain, @resource<>"1"
|
|
EjabberdSmMock.connect_resource @user, @domain, @resource<>"2"
|
|
EjabberdSmMock.connect_resource @user, @domain, @resource<>"3"
|
|
|
|
assert 3 == length EjabberdSmMock.get_sessions @user, @domain
|
|
assert 1 == length EjabberdSmMock.get_session @user, @domain, @resource<>"2"
|
|
|
|
assert :ok ==
|
|
:ejabberd_commands.execute_command(:kick_session,
|
|
[@user, @domain,
|
|
@resource<>"2", "kick"])
|
|
|
|
assert 2 == length EjabberdSmMock.get_sessions @user, @domain
|
|
assert 0 == length EjabberdSmMock.get_session @user, @domain, @resource<>"2"
|
|
|
|
assert :meck.validate :ejabberd_sm
|
|
end
|
|
|
|
###################### Last
|
|
|
|
test "get_last works" do
|
|
|
|
assert 'Never' ==
|
|
:ejabberd_commands.execute_command(:get_last, [@user, @domain])
|
|
|
|
EjabberdSmMock.connect_resource @user, @domain, @resource<>"1"
|
|
EjabberdSmMock.connect_resource @user, @domain, @resource<>"2"
|
|
|
|
assert 'Online' ==
|
|
:ejabberd_commands.execute_command(:get_last, [@user, @domain])
|
|
|
|
EjabberdSmMock.disconnect_resource @user, @domain, @resource<>"1"
|
|
|
|
assert 'Online' ==
|
|
:ejabberd_commands.execute_command(:get_last, [@user, @domain])
|
|
|
|
now = {megasecs, secs, _microsecs} = :os.timestamp
|
|
timestamp = megasecs * 1000000 + secs
|
|
EjabberdSmMock.disconnect_resource(@user, @domain, @resource<>"2",
|
|
timestamp)
|
|
{{year, month, day}, {hour, minute, second}} = :calendar.now_to_local_time now
|
|
result = List.flatten(:io_lib.format(
|
|
"~w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w ",
|
|
[year, month, day, hour, minute, second]))
|
|
assert result ==
|
|
:ejabberd_commands.execute_command(:get_last, [@user, @domain])
|
|
|
|
assert :meck.validate :mod_last
|
|
end
|
|
|
|
###################### Roster
|
|
|
|
test "add_rosteritem and delete_rosteritem work" do
|
|
# Connect user
|
|
# Add user1 & user2 to user's roster
|
|
# Remove user1 & user2 from user's roster
|
|
|
|
EjabberdSmMock.connect_resource @user, @domain, @resource
|
|
|
|
assert [] == ModRosterMock.get_roster(@user, @domain)
|
|
|
|
assert :ok ==
|
|
:ejabberd_commands.execute_command(:add_rosteritem, [@user, @domain,
|
|
@user<>"1", @domain,
|
|
"nick1",
|
|
"group1",
|
|
"both"])
|
|
# Check that user1 is the only item of the user's roster
|
|
result = ModRosterMock.get_roster(@user, @domain)
|
|
assert 1 == length result
|
|
[{{@user, @domain, jid}, opts}] = result
|
|
assert @user<>"1@"<>@domain == jid
|
|
assert "nick1" == opts.nick
|
|
assert ["group1"] == opts.groups
|
|
assert :both == opts.subs
|
|
|
|
# Check that the item roster user1 was pushed with subscription
|
|
# 'both' to user online ressource
|
|
jid = :jlib.make_jid(@user, @domain, @resource)
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user<>"1", @domain, ""}, :both}}])
|
|
|
|
assert :ok ==
|
|
:ejabberd_commands.execute_command(:add_rosteritem, [@user, @domain,
|
|
@user<>"2", @domain,
|
|
"nick2",
|
|
"group2",
|
|
"both"])
|
|
result = ModRosterMock.get_roster(@user, @domain)
|
|
assert 2 == length result
|
|
|
|
|
|
# Check that the item roster user2 was pushed with subscription
|
|
# 'both' to user online ressource
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user<>"2", @domain, ""}, :both}}])
|
|
|
|
|
|
:ejabberd_commands.execute_command(:delete_rosteritem, [@user, @domain,
|
|
@user<>"1", @domain])
|
|
result = ModRosterMock.get_roster(@user, @domain)
|
|
assert 1 == length result
|
|
[{{@user, @domain, jid}, opts}] = result
|
|
assert @user<>"2@"<>@domain == jid
|
|
assert "nick2" == opts.nick
|
|
assert ["group2"] == opts.groups
|
|
assert :both == opts.subs
|
|
|
|
# Check that the item roster user1 was pushed with subscription
|
|
# 'none' to user online ressource
|
|
jid = :jlib.make_jid(@user, @domain, @resource)
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user<>"1", @domain, ""}, :none}}])
|
|
|
|
:ejabberd_commands.execute_command(:delete_rosteritem, [@user, @domain,
|
|
@user<>"2", @domain])
|
|
|
|
# Check that the item roster user2 was pushed with subscription
|
|
# 'none' to user online ressource
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user<>"2", @domain, ""}, :none}}])
|
|
|
|
# Check that nothing else was pushed to user resource
|
|
jid = jid(user: @user, server: @domain, resource: :_,
|
|
luser: @user, lserver: @domain, lresource: :_)
|
|
assert 4 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, :_, :_}}])
|
|
|
|
assert [] == ModRosterMock.get_roster(@user, @domain)
|
|
assert :meck.validate :ejabberd_sm
|
|
|
|
end
|
|
|
|
test "get_roster works" do
|
|
assert [] == ModRosterMock.get_roster(@user, @domain)
|
|
assert [] == :ejabberd_commands.execute_command(:get_roster, [@user, @domain],
|
|
:admin)
|
|
|
|
assert :ok ==
|
|
:ejabberd_commands.execute_command(:add_rosteritem, [@user, @domain,
|
|
@user<>"1", @domain,
|
|
"nick1",
|
|
"group1",
|
|
"both"])
|
|
assert [{@user<>"1@"<>@domain, "", 'both', 'none', "group1"}] ==
|
|
:ejabberd_commands.execute_command(:get_roster, [@user, @domain], :admin)
|
|
assert :ok ==
|
|
:ejabberd_commands.execute_command(:add_rosteritem, [@user, @domain,
|
|
@user<>"2", @domain,
|
|
"nick2",
|
|
"group2",
|
|
"none"])
|
|
result = :ejabberd_commands.execute_command(:get_roster, [@user, @domain], :admin)
|
|
assert 2 == length result
|
|
assert Enum.member?(result, {@user<>"1@"<>@domain, "", 'both', 'none', "group1"})
|
|
assert Enum.member?(result, {@user<>"2@"<>@domain, "", 'none', 'none', "group2"})
|
|
|
|
end
|
|
|
|
|
|
test "link_contacts & unlink_contacts work" do
|
|
# Create user1 and keep it offline
|
|
EjabberdAuthMock.create_user @user<>"1", @domain, @password
|
|
|
|
# fail if one of the users doesn't exist locally
|
|
assert 404 ==
|
|
:ejabberd_commands.execute_command(:link_contacts, [@user<>"1@"<>@domain,
|
|
"nick1",
|
|
"group1",
|
|
@user<>"2@"<>@domain,
|
|
"nick2",
|
|
"group2"])
|
|
|
|
# Create user2 and connect 2 resources
|
|
EjabberdAuthMock.create_user @user<>"2", @domain, @password
|
|
|
|
EjabberdSmMock.connect_resource @user<>"2", @domain, @resource<>"1"
|
|
EjabberdSmMock.connect_resource @user<>"2", @domain, @resource<>"2"
|
|
|
|
# Link both user1 & user2 (returns 0 if OK)
|
|
assert 0 ==
|
|
:ejabberd_commands.execute_command(:link_contacts, [@user<>"1@"<>@domain,
|
|
"nick1",
|
|
"group2",
|
|
@user<>"2@"<>@domain,
|
|
"nick2",
|
|
"group1"])
|
|
assert [{@user<>"2@"<>@domain, "", 'both', 'none', "group2"}] ==
|
|
:ejabberd_commands.execute_command(:get_roster, [@user<>"1", @domain], :admin)
|
|
|
|
assert [{@user<>"1@"<>@domain, "", 'both', 'none', "group1"}] ==
|
|
:ejabberd_commands.execute_command(:get_roster, [@user<>"2", @domain], :admin)
|
|
|
|
# Check that the item roster user1 was pushed with subscription
|
|
# 'both' to the 2 user2 online ressources
|
|
jid = :jlib.make_jid(@user<>"2", @domain, @resource<>"1")
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user<>"1", @domain, ""}, :both}}])
|
|
jid = :jlib.make_jid(@user<>"2", @domain, @resource<>"2")
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user<>"1", @domain, ""}, :both}}])
|
|
|
|
|
|
# Ulink both user1 & user2 (returns 0 if OK)
|
|
assert 0 ==
|
|
:ejabberd_commands.execute_command(:unlink_contacts, [@user<>"1@"<>@domain,
|
|
@user<>"2@"<>@domain])
|
|
assert [] ==
|
|
:ejabberd_commands.execute_command(:get_roster, [@user<>"1", @domain], :admin)
|
|
|
|
assert [] ==
|
|
:ejabberd_commands.execute_command(:get_roster, [@user<>"2", @domain], :admin)
|
|
|
|
# Check that the item roster user1 was pushed with subscription
|
|
# 'none' to the 2 user2 online ressources
|
|
jid = :jlib.make_jid(@user<>"2", @domain, @resource<>"1")
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user<>"1", @domain, ""}, :none}}])
|
|
jid = :jlib.make_jid(@user<>"2", @domain, @resource<>"2")
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user<>"1", @domain, ""}, :none}}])
|
|
|
|
# Check that nothing else was pushed to user2 resources
|
|
jid = jid(user: @user<>"2", server: @domain, resource: :_,
|
|
luser: @user<>"2", lserver: @domain, lresource: :_)
|
|
assert 4 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, :_, :_}}])
|
|
|
|
# Check nothing was pushed to user1
|
|
jid = jid(user: @user<>"1", server: @domain, resource: :_,
|
|
luser: @user<>"1", lserver: @domain, lresource: :_)
|
|
refute :meck.called(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, :_, :_}}])
|
|
|
|
assert :meck.validate :ejabberd_sm
|
|
assert :meck.validate :ejabberd_auth
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
test "add_contacts and delete_contacts work" do
|
|
# Create user, user1 & user2
|
|
# Connect user & user1
|
|
# Add user0, user1 & user2 to user's roster
|
|
# Remove user0, user1 & user2 from user's roster
|
|
|
|
# user doesn't exists yet, command must fail
|
|
assert 404 ==
|
|
:ejabberd_commands.execute_command(:add_contacts, [@user, @domain,
|
|
[{@user<>"1"<>@domain,
|
|
"group1",
|
|
"nick1"},
|
|
{@user<>"2"<>@domain,
|
|
"group2",
|
|
"nick2"}]
|
|
])
|
|
|
|
EjabberdAuthMock.create_user @user, @domain, @password
|
|
EjabberdSmMock.connect_resource @user, @domain, @resource
|
|
EjabberdAuthMock.create_user @user<>"1", @domain, @password
|
|
EjabberdSmMock.connect_resource @user<>"1", @domain, @resource
|
|
EjabberdAuthMock.create_user @user<>"2", @domain, @password
|
|
|
|
# Add user1 & user2 in user's roster. Try also to add user0 that
|
|
# doesn't exists. Command is supposed to return number of added items.
|
|
assert 2 ==
|
|
:ejabberd_commands.execute_command(:add_contacts, [@user, @domain,
|
|
[{@user<>"0@"<>@domain,
|
|
"group0",
|
|
"nick0"},
|
|
{@user<>"1@"<>@domain,
|
|
"group1",
|
|
"nick1"},
|
|
{@user<>"2@"<>@domain,
|
|
"group2",
|
|
"nick2"}]
|
|
])
|
|
# Check that user1 & user2 are the only items in user's roster
|
|
result = ModRosterMock.get_roster(@user, @domain)
|
|
assert 2 == length result
|
|
opts1 = %{nick: "nick1", groups: ["group1"], subs: :both,
|
|
ask: :none, askmessage: ""}
|
|
assert Enum.member?(result, {{@user, @domain, @user<>"1@"<>@domain}, opts1})
|
|
opts2 = %{nick: "nick2", groups: ["group2"], subs: :both,
|
|
ask: :none, askmessage: ""}
|
|
assert Enum.member?(result, {{@user, @domain, @user<>"2@"<>@domain}, opts2})
|
|
|
|
# Check that user is the only item in user1's roster
|
|
assert [{{@user<>"1", @domain, @user<>"@"<>@domain}, %{opts1|:nick => ""}}] ==
|
|
ModRosterMock.get_roster(@user<>"1", @domain)
|
|
|
|
# Check that user is the only item in user2's roster
|
|
assert [{{@user<>"2", @domain, @user<>"@"<>@domain}, %{opts2|:nick => ""}}] ==
|
|
ModRosterMock.get_roster(@user<>"2", @domain)
|
|
|
|
|
|
# Check that the roster items user1 & user2 were pushed with subscription
|
|
# 'both' to the user online ressource
|
|
jid = :jlib.make_jid(@user, @domain, @resource)
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user<>"1", @domain, ""}, :both}}])
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user<>"2", @domain, ""}, :both}}])
|
|
|
|
# Check that the roster item user was pushed with subscription
|
|
# 'both' to the user1 online ressource
|
|
jid = :jlib.make_jid(@user<>"1", @domain, @resource)
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user, @domain, ""}, :both}}])
|
|
|
|
# Check that nothing else was pushed to online resources
|
|
assert 3 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[:_, :_,
|
|
{:broadcast, {:item, :_, :_}}])
|
|
|
|
# Remove user1 & user2 from user's roster. Try also to remove
|
|
# user0 that doesn't exists. Command is supposed to return number
|
|
# of removed items.
|
|
assert 2 ==
|
|
:ejabberd_commands.execute_command(:remove_contacts, [@user, @domain,
|
|
[@user<>"0@"<>@domain,
|
|
@user<>"1@"<>@domain,
|
|
@user<>"2@"<>@domain]
|
|
])
|
|
# Check that roster of user, user1 & user2 are empty
|
|
assert [] == ModRosterMock.get_roster(@user, @domain)
|
|
assert [] == ModRosterMock.get_roster(@user<>"1", @domain)
|
|
assert [] == ModRosterMock.get_roster(@user<>"2", @domain)
|
|
|
|
# Check that the roster items user1 & user2 were pushed with subscription
|
|
# 'none' to the user online ressource
|
|
jid = :jlib.make_jid(@user, @domain, @resource)
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user<>"1", @domain, ""}, :none}}])
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user<>"2", @domain, ""}, :none}}])
|
|
|
|
# Check that the roster item user was pushed with subscription
|
|
# 'none' to the user1 online ressource
|
|
jid = :jlib.make_jid(@user<>"1", @domain, @resource)
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user, @domain, ""}, :none}}])
|
|
|
|
# Check that nothing else was pushed to online resources
|
|
assert 6 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[:_, :_,
|
|
{:broadcast, {:item, :_, :_}}])
|
|
|
|
assert :meck.validate :ejabberd_sm
|
|
assert :meck.validate :ejabberd_auth
|
|
end
|
|
|
|
|
|
test "update_roster works" do
|
|
# user doesn't exists yet, command must fail
|
|
result =
|
|
:ejabberd_commands.execute_command(:update_roster,
|
|
[@user, @domain,
|
|
[{@user<>"1"<>@domain,
|
|
"group1",
|
|
"nick1"},
|
|
{@user<>"2"<>@domain,
|
|
"group2",
|
|
"nick2"}],
|
|
[]
|
|
])
|
|
assert :invalid_user == elem(result, 0)
|
|
|
|
EjabberdAuthMock.create_user @user, @domain, @password
|
|
EjabberdSmMock.connect_resource @user, @domain, @resource
|
|
EjabberdAuthMock.create_user @user<>"1", @domain, @password
|
|
EjabberdSmMock.connect_resource @user<>"1", @domain, @resource
|
|
EjabberdAuthMock.create_user @user<>"2", @domain, @password
|
|
EjabberdAuthMock.create_user @user<>"3", @domain, @password
|
|
|
|
assert :ok ==
|
|
:ejabberd_commands.execute_command(:update_roster,
|
|
[@user, @domain,
|
|
[{[{"username", @user<>"1"},
|
|
{"nick", "nick1"}]},
|
|
{[{"username", @user<>"2"},
|
|
{"nick", "nick2"},
|
|
{"subscription", "from"}]}],
|
|
[]])
|
|
|
|
|
|
# Check that user1 & user2 are the only items in user's roster
|
|
result = ModRosterMock.get_roster(@user, @domain)
|
|
|
|
assert 2 == length result
|
|
opts1 = %{nick: "nick1", groups: [""], subs: :both,
|
|
ask: :none, askmessage: ""}
|
|
assert Enum.member?(result, {{@user, @domain, @user<>"1@"<>@domain}, opts1})
|
|
opts2 = %{nick: "nick2", groups: [""], subs: :from,
|
|
ask: :none, askmessage: ""}
|
|
assert Enum.member?(result, {{@user, @domain, @user<>"2@"<>@domain}, opts2})
|
|
|
|
# Check that the roster items user1 & user2 were pushed with subscription
|
|
# 'both' to the user online ressource
|
|
jid = :jlib.make_jid(@user, @domain, @resource)
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user<>"1", @domain, ""}, :both}}])
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user<>"2", @domain, ""}, :from}}])
|
|
|
|
# Check that nothing else was pushed to online resources
|
|
assert 2 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[:_, :_,
|
|
{:broadcast, {:item, :_, :_}}])
|
|
|
|
# Add user3 & remove user1
|
|
assert :ok ==
|
|
:ejabberd_commands.execute_command(:update_roster,
|
|
[@user, @domain,
|
|
[{[{"username", @user<>"3"},
|
|
{"nick", "nick3"},
|
|
{"subscription", "to"}]}],
|
|
[{[{"username", @user<>"1"}]}]
|
|
])
|
|
|
|
# Check that user2 & user3 are the only items in user's roster
|
|
result = ModRosterMock.get_roster(@user, @domain)
|
|
assert 2 == length result
|
|
opts2 = %{nick: "nick2", groups: [""], subs: :from,
|
|
ask: :none, askmessage: ""}
|
|
assert Enum.member?(result, {{@user, @domain, @user<>"2@"<>@domain}, opts2})
|
|
opts1 = %{nick: "nick3", groups: [""], subs: :to,
|
|
ask: :none, askmessage: ""}
|
|
assert Enum.member?(result, {{@user, @domain, @user<>"3@"<>@domain}, opts1})
|
|
|
|
# Check that the roster items user1 & user3 were pushed with subscription
|
|
# 'none' & 'to' to the user online ressource
|
|
jid = :jlib.make_jid(@user, @domain, @resource)
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user<>"1", @domain, ""}, :none}}])
|
|
assert 1 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[jid, jid,
|
|
{:broadcast, {:item, {@user<>"3", @domain, ""}, :to}}])
|
|
|
|
# Check that nothing else was pushed to online resources
|
|
assert 4 ==
|
|
:meck.num_calls(:ejabberd_sm, :route,
|
|
[:_, :_,
|
|
{:broadcast, {:item, :_, :_}}])
|
|
|
|
assert :meck.validate :ejabberd_sm
|
|
assert :meck.validate :ejabberd_auth
|
|
end
|
|
|
|
|
|
# kick_user command is defined in ejabberd_sm, move to extra?
|
|
# test "kick_user works" do
|
|
# assert 0 == :ejabberd_commands.execute_command(:num_resources,
|
|
# [@user, @domain])
|
|
# EjabberdSmMock.connect_resource(@user, @domain, @resource<>"1")
|
|
# EjabberdSmMock.connect_resource(@user, @domain, @resource<>"2")
|
|
# assert 2 ==
|
|
# :ejabberd_commands.execute_command(:kick_user, [@user, @domain])
|
|
# assert 0 == :ejabberd_commands.execute_command(:num_resources,
|
|
# [@user, @domain])
|
|
# assert :meck.validate :ejabberd_sm
|
|
# end
|
|
|
|
end
|