]>
granicus.if.org Git - ejabberd/log
Prasad Vaidya [Fri, 21 Oct 2016 09:32:39 +0000 (15:02 +0530)]
Rollback minor change, to avoid redundant use of fail-safe function
Prasad Vaidya [Fri, 21 Oct 2016 08:27:47 +0000 (13:57 +0530)]
Fix: Replace erlang function with fail-safe jlib function.
Badlop [Thu, 20 Oct 2016 19:56:19 +0000 (21:56 +0200)]
Nidx may be integer or binary, so use jlib:i2l instead
As reported in
https://www.ejabberd.im/forum/28580/erlang-function-integertobinary1-throwing-badargs-exception
Badlop [Thu, 20 Oct 2016 18:34:48 +0000 (20:34 +0200)]
If a participant can change subject, let asubscriber too (#1345)
Christophe Romain [Wed, 19 Oct 2016 11:57:19 +0000 (13:57 +0200)]
Let mix be able to cope with configured deps
badlop [Wed, 19 Oct 2016 10:32:09 +0000 (12:32 +0200)]
Merge pull request #1343 from gardenia/mod_muc_configurable_max_discoitems
New option max_rooms_discoitems instead of constant (#1236)
colm [Tue, 18 Oct 2016 20:59:34 +0000 (21:59 +0100)]
mod_muc: made the constant MAX_ROOMS_DISCOITEMS configurable
Evgeniy Khramtsov [Tue, 18 Oct 2016 05:35:47 +0000 (08:35 +0300)]
Fix randoms:uniform/1 return
Make sure randoms:uniform/1 returns values from the same interval
as deprecated random:uniform/1
Evgeniy Khramtsov [Tue, 18 Oct 2016 05:17:21 +0000 (08:17 +0300)]
Get rid of compile warnings for random/crypto modules on R19
badlop [Mon, 17 Oct 2016 15:46:25 +0000 (17:46 +0200)]
Merge pull request #1338 from marcphilipp/muc_invite_hook
Introduce muc_invite hook
Jerome Sautret [Mon, 10 Oct 2016 09:32:36 +0000 (11:32 +0200)]
Fix delete_old_messages command for SQL backends
Paweł Chmielowski [Fri, 14 Oct 2016 11:55:50 +0000 (13:55 +0200)]
Convert ejabberd_xmlrpc to new api_permissions
Marc Philipp [Fri, 14 Oct 2016 10:52:59 +0000 (12:52 +0200)]
Introduce muc_invite hook
This adds a new hook that is triggered for each invite to an MUC room:
- muc_invite(RoomJID, RoomConfig, From, To, Reason) -> ok
where
- RoomJID = From = To = #jid (see jlib.h)
- RoomConfig = #config (see mod_muc_room.hrl)
- Reason = binary()
Holger Weiss [Thu, 13 Oct 2016 20:34:29 +0000 (22:34 +0200)]
Always include <actions/> with ad-hoc responses
XEP-0050 says: "The result for each stage (other than the last) of a
command's execution SHOULD include an <actions/> element." Some clients
insist on this.
Holger Weiss [Wed, 12 Oct 2016 21:10:25 +0000 (23:10 +0200)]
Don't let MAM messages go into offline storage
badlop [Wed, 12 Oct 2016 11:52:27 +0000 (13:52 +0200)]
Merge pull request #1331 from weiss/send-message-omit-copies
Don't let "send_message" duplicate the message
Holger Weiss [Tue, 11 Oct 2016 20:20:22 +0000 (22:20 +0200)]
Ignore offline sessions in statistics
Offline sessions should not be counted when reporting the number of
connected resources.
Apart from that, this number is now also reported when using a
non-default session management backend.
Holger Weiss [Sun, 9 Oct 2016 22:17:17 +0000 (00:17 +0200)]
Don't let "send_message" duplicate the message
In the past, the "send_message" command sent a copy of the message to
each resource if the message was addressed to the bare JID of a local
online user. When message carbons are enabled, this creates duplicates;
and with MAM enabled, each copy is archived. Therefore, "send_message"
no longer creates copies of the message.
Holger Weiss [Thu, 6 Oct 2016 22:36:47 +0000 (00:36 +0200)]
Make map syntax compatible with Erlang/OTP 17
Holger Weiss [Thu, 6 Oct 2016 21:20:45 +0000 (23:20 +0200)]
XEP-0198: Cope with invalid 'from'/'to' attributes
Check whether the 'from' and 'to' attributes are valid before bouncing
or resending a stanza from the stream management queue. They might be
invalid in certain corner cases.
Thanks to Evgeniy for spotting this.
Paweł Chmielowski [Thu, 6 Oct 2016 09:17:10 +0000 (11:17 +0200)]
Disable one test for now, we may change how this part is handled
Paweł Chmielowski [Thu, 6 Oct 2016 09:03:26 +0000 (11:03 +0200)]
Use correct field for oauth scope
Paweł Chmielowski [Thu, 6 Oct 2016 08:59:31 +0000 (10:59 +0200)]
Make handling of oauth clauses be more consistent with other rules
Paweł Chmielowski [Thu, 6 Oct 2016 08:47:17 +0000 (10:47 +0200)]
Use proper default value for api_permissions
Badlop [Wed, 5 Oct 2016 13:01:33 +0000 (15:01 +0200)]
Fix typos in Czech translation (#1318)
Paweł Chmielowski [Wed, 5 Oct 2016 11:54:29 +0000 (13:54 +0200)]
Initialize ejabberd_access_permissions in elixir tests
Paweł Chmielowski [Wed, 5 Oct 2016 11:21:11 +0000 (13:21 +0200)]
New api permissions framework
Holger Weiss [Sun, 2 Oct 2016 20:01:03 +0000 (22:01 +0200)]
ejabberd_sm: Clean up old offline session entries
If the number of offline sessions exceeds the 'max_user_sessions' limit,
remove the oldest entry from the table.
Christophe Romain [Thu, 29 Sep 2016 14:10:11 +0000 (16:10 +0200)]
PubSub: creation jid must be bare jid
Christophe Romain [Thu, 29 Sep 2016 10:00:59 +0000 (12:00 +0200)]
PubSub: fix notification on subscription change
Christophe Romain [Thu, 29 Sep 2016 09:20:56 +0000 (11:20 +0200)]
PubSub: fix error type on item deletion with insufficient priviledge
Badlop [Wed, 28 Sep 2016 09:03:46 +0000 (11:03 +0200)]
Fix 404 response formatting (thanks to Kaggggggga)(#1306)
Holger Weiss [Tue, 27 Sep 2016 21:22:30 +0000 (23:22 +0200)]
ejabberd_http: Handle missing POST data gracefully
Return a "bad request" error instead of crashing if receiving POST/PUT
data fails.
Alexey Shchepin [Tue, 27 Sep 2016 04:12:10 +0000 (07:12 +0300)]
Use inets instead of lhttpc in http_p1
Alexey Shchepin [Tue, 27 Sep 2016 02:57:14 +0000 (05:57 +0300)]
Add http_p1.erl, rest.erl, and oauth2 ReST backend for tokens.
Holger Weiss [Mon, 19 Sep 2016 20:46:36 +0000 (22:46 +0200)]
mod_carboncopy: Don't copy MUC PMs
Carbon copies of private MUC message are generally not desired,
especially not when multiple clients joined the room with the same nick.
In this case, the MUC service usually sends PMs to all joined resources
anyway, so carbon-copying those PMs would create duplicates.
Badlop [Mon, 19 Sep 2016 11:46:01 +0000 (13:46 +0200)]
When getting list of subscribed rooms, check all including temporary ones (#1242)
Badlop [Mon, 19 Sep 2016 10:54:19 +0000 (12:54 +0200)]
Revert "Fix getting of subscribed rooms: consider also temporary ones (#1242)"
This reverts commit
f2cc81dfead352d4e8c4b3f546d1c2d734076c5c .
Badlop [Mon, 19 Sep 2016 10:35:53 +0000 (12:35 +0200)]
Fix getting of subscribed rooms: consider also temporary ones (#1242)
Badlop [Mon, 19 Sep 2016 10:35:32 +0000 (12:35 +0200)]
Store the Allow Subscription room option (#1301)
Badlop [Mon, 19 Sep 2016 09:59:40 +0000 (11:59 +0200)]
Don't worry about storage_type of the Acl mnesia table (#1206)
Badlop [Mon, 19 Sep 2016 09:54:46 +0000 (11:54 +0200)]
Use mnesia calls instead of ets for Acl and Access tables (#1206)
Christophe Romain [Fri, 16 Sep 2016 12:59:06 +0000 (14:59 +0200)]
Update riakc to support r19
Holger Weiss [Thu, 15 Sep 2016 21:02:04 +0000 (23:02 +0200)]
node_mb_sql: Add missing (SQL-specific) functions
Christophe Romain [Tue, 13 Sep 2016 12:29:47 +0000 (14:29 +0200)]
Merge pull request #1249 from weiss:push-requirements
Christophe Romain [Tue, 13 Sep 2016 12:29:14 +0000 (14:29 +0200)]
Merge branch 'push-requirements' of https://github.com/weiss/ejabberd into weiss-push-requirements
Christophe Romain [Tue, 13 Sep 2016 09:52:59 +0000 (11:52 +0200)]
Allow to create room with custom config
Paweł Chmielowski [Thu, 4 Aug 2016 14:04:43 +0000 (16:04 +0200)]
Expand parsing of json input to be able to handle update_roster command
Paweł Chmielowski [Mon, 12 Sep 2016 13:39:00 +0000 (15:39 +0200)]
Add X-Admin and basic auth header to CORS allowed headers in http_api
Paweł Chmielowski [Mon, 12 Sep 2016 13:38:27 +0000 (15:38 +0200)]
Properly process OPTIONS header in http_api for all paths
Evgeniy Khramtsov [Mon, 12 Sep 2016 11:41:33 +0000 (14:41 +0300)]
Fix nick-to-jid mapping for MUC subscribers
Badlop [Fri, 9 Sep 2016 10:17:54 +0000 (12:17 +0200)]
Support multiple room invitations (#1285)
Evgeniy Khramtsov [Fri, 9 Sep 2016 10:04:47 +0000 (13:04 +0300)]
Fix subscribed rooms list retreivement
Holger Weiss [Thu, 8 Sep 2016 22:21:36 +0000 (00:21 +0200)]
XEP-0198: Cancel timer when waiting for resumption
If an ACK timer is active while going into the 'wait_for_resume' state,
cancel that timer.
Holger Weiss [Thu, 8 Sep 2016 16:11:54 +0000 (18:11 +0200)]
Revert "Don't log an [error] message if Elixir is missing"
This reverts commit
41386d718dbc5f6e846baaac568ba1cae5eb7ec4 . The issue
was fixed with commit
4bd45bada70fc233bb87bc7ab099fc2407cea30b .
Holger Weiss [Thu, 8 Sep 2016 15:59:40 +0000 (17:59 +0200)]
Don't log an [error] message if Elixir is missing
The Elixir support is still optional.
Closes #1250.
Christophe Romain [Thu, 8 Sep 2016 14:31:59 +0000 (16:31 +0200)]
Fix typo on previous commit (#1284)
Paweł Chmielowski [Thu, 8 Sep 2016 14:29:19 +0000 (16:29 +0200)]
Start elixir config code only if elixir was enabled in configure script
Christophe Romain [Thu, 8 Sep 2016 14:27:16 +0000 (16:27 +0200)]
Full jid entity subscriptions should include bare jid records (#1284)
Evgeniy Khramtsov [Thu, 8 Sep 2016 13:39:34 +0000 (16:39 +0300)]
Fix message routing from subscribers
Paweł Chmielowski [Thu, 8 Sep 2016 10:45:16 +0000 (12:45 +0200)]
Merge pull request #1287 from weiss/ack-timeout
New stream management option: ack_timeout
gabrielgatu [Thu, 8 Sep 2016 09:34:42 +0000 (11:34 +0200)]
Support for Elixir configuration file #1208
Contribution for Google Summer of code 2016 by Gabriel Gatu
Mickael Remond [Thu, 8 Sep 2016 08:52:43 +0000 (10:52 +0200)]
Support for publishing to hex.pm with latest Elixir mix
Mickael Remond [Thu, 8 Sep 2016 08:29:44 +0000 (10:29 +0200)]
Fix compilation with Elixir 1.3 / R19
Paweł Chmielowski [Thu, 8 Sep 2016 08:27:14 +0000 (10:27 +0200)]
Typo
Paweł Chmielowski [Thu, 8 Sep 2016 06:44:49 +0000 (08:44 +0200)]
Properly normalize resource_regexp acl rule
This fixes issue #1288.
Holger Weiss [Wed, 7 Sep 2016 21:16:54 +0000 (23:16 +0200)]
New stream management option: ack_timeout
Close the connection if a stream management client fails to respond to
an acknowledgement request within 60 seconds. This number of seconds
can be changed with the new "ack_timeout" option, and the mechanism can
be disabled by specifying 'infinity'.
As a side effect of this change, a new acknowledgement is no longer
requested before the response to the previous request is received.
Christophe Romain [Wed, 7 Sep 2016 15:38:04 +0000 (17:38 +0200)]
Enforce pathtype use with config path (#1264)
Christophe Romain [Wed, 7 Sep 2016 12:34:31 +0000 (14:34 +0200)]
Merge pull request #1253 from Amuhar/xep0356
Evgeniy Khramtsov [Wed, 7 Sep 2016 08:15:19 +0000 (11:15 +0300)]
Create room on configuration request as per XEP-0045, 10.1.3
Evgeniy Khramtsov [Wed, 7 Sep 2016 07:33:37 +0000 (10:33 +0300)]
Link MUC subscription to bare JID
Holger Weiss [Wed, 7 Sep 2016 05:15:12 +0000 (07:15 +0200)]
Add SQL support for microblogging node plugin
Evgeniy Khramtsov [Tue, 6 Sep 2016 16:06:02 +0000 (19:06 +0300)]
Handle <subscriptions/> request to list MUC subscribers
Evgeniy Khramtsov [Tue, 6 Sep 2016 15:17:30 +0000 (18:17 +0300)]
Do not update muc_online_users table on MUC/Sub operations
Evgeniy Khramtsov [Tue, 6 Sep 2016 14:55:18 +0000 (17:55 +0300)]
Add get_subscribers command to list MUC subscribers
Holger Weiss [Mon, 5 Sep 2016 22:30:46 +0000 (00:30 +0200)]
node_mb: Call node_pep instead of node_hometree
Holger Weiss [Mon, 5 Sep 2016 22:08:43 +0000 (00:08 +0200)]
node_mb: Fix configuration documentation
A node plugin used in a 'pep_mapping' must explicitly be added to the
list of 'plugins'.
Holger Weiss [Mon, 5 Sep 2016 22:05:54 +0000 (00:05 +0200)]
mod_pubsub: Remove outdated comment
Paweł Chmielowski [Mon, 5 Sep 2016 15:18:27 +0000 (17:18 +0200)]
Clean ejabberd_commands before tests
Paweł Chmielowski [Mon, 5 Sep 2016 14:42:05 +0000 (16:42 +0200)]
ejabberd_oauth requiere working cache_tab, initialize it before tests
Holger Weiss [Mon, 22 Aug 2016 20:35:17 +0000 (22:35 +0200)]
Merge remote-tracking branch 'processone/pr/1262'
* processone/pr/1262:
Fixed typo in Stream Management option name
Igor Manturov Jr [Mon, 22 Aug 2016 20:21:09 +0000 (02:21 +0600)]
Fixed typo in Stream Management option name
Holger Weiss [Mon, 22 Aug 2016 19:22:08 +0000 (21:22 +0200)]
Merge remote-tracking branch 'processone/pr/1261'
* processone/pr/1261:
Fixed #1260 Stream Management feature for the websocket connections
Igor Manturov Jr [Mon, 22 Aug 2016 18:59:39 +0000 (00:59 +0600)]
Fixed #1260 Stream Management feature for the websocket connections
Holger Weiss [Sun, 21 Aug 2016 23:17:32 +0000 (01:17 +0200)]
mod_muc_admin: Accept 'allow_subscription' option
Allow for setting the new 'allow_subscription' option using the
'change_room_option' command.
badlop [Fri, 19 Aug 2016 09:53:20 +0000 (11:53 +0200)]
Merge pull request #1254 from lemenkov/remove_p1_xmlrpc
Remove no longer necessary p1_xmlrpc
Peter Lemenkov [Wed, 17 Aug 2016 15:29:24 +0000 (18:29 +0300)]
Remove no longer necessary p1_xmlrpc
Ths module was superceded by fast_xml in commit
processone/ejabberd@
dfc29ea03ca91e1eb5387d93612e2ac4b4b496da . So let's remove it entirely to
avoid any confusion.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Badlop [Tue, 16 Aug 2016 16:32:06 +0000 (18:32 +0200)]
Erlang R17 has a Time limit in erlang:send_after (#1246)
Holger Weiss [Mon, 15 Aug 2016 21:28:36 +0000 (23:28 +0200)]
mod_mam: Add 'store_mam_message' hook
The new 'store_mam_message' hook is invoked whenever a MAM message is
stored.
Holger Weiss [Mon, 15 Aug 2016 20:30:08 +0000 (22:30 +0200)]
mod_offline: Add 'store_offline_message' hook
The new 'store_offline_message' hook is invoked whenever an offline
message is stored.
Holger Weiss [Mon, 15 Aug 2016 19:49:58 +0000 (21:49 +0200)]
ejabberd_c2s: Add XEP-0198 resumption hooks
The new 'c2s_session_pending' and 'c2s_session_resumed' hooks are
invoked when a stream management session is pending and resumed,
respectively.
Holger Weiss [Mon, 15 Aug 2016 18:24:43 +0000 (20:24 +0200)]
Add functions to get/set some c2s state elements
Badlop [Mon, 15 Aug 2016 13:53:35 +0000 (15:53 +0200)]
Support sql backend in mod_shared_roster commands (#1244)
Evgeny Khramtsov [Mon, 15 Aug 2016 11:12:20 +0000 (15:12 +0400)]
Merge pull request #1245 from hamano/clean_redis_table
fix clean redis table
HAMANO Tsukasa [Mon, 15 Aug 2016 08:51:06 +0000 (17:51 +0900)]
fix clean redis table
Badlop [Sun, 14 Aug 2016 18:35:25 +0000 (20:35 +0200)]
Don't delete ejabberd_commands table, it's problematic in cluster (#1210)
Holger Weiss [Fri, 12 Aug 2016 22:07:27 +0000 (00:07 +0200)]
Store announcements for offline users
Add a <store/> hint to announcements (unless they are explicitly sent to
online users). Without that hint, announcements weren't delivered to
offline users, since they are sent as messages of type "headline".
Holger Weiss [Fri, 12 Aug 2016 19:13:10 +0000 (21:13 +0200)]
Honor <store/> hint for any non-"error" message
XEP-0334 says: "A message containing the <store/> hint that is not of
type 'error' SHOULD be stored by the entity."
Holger Weiss [Fri, 12 Aug 2016 18:38:17 +0000 (20:38 +0200)]
mod_mam: Don't store messages of type "headline"
XEP-0313 says: "a server SHOULD include in a user archive all of the
messages a user sends or receives of type 'normal' or 'chat' that
contain a <body> element."
Evgeniy Khramtsov [Thu, 11 Aug 2016 14:13:20 +0000 (17:13 +0300)]
Add a requirement for full JID in subscribe_room command