]> granicus.if.org Git - ejabberd/log
ejabberd
8 years agoFix typo
Christophe Romain [Wed, 16 Nov 2016 17:24:12 +0000 (18:24 +0100)]
Fix typo

8 years agoRemove obsolete/temp file
Christophe Romain [Wed, 16 Nov 2016 13:18:51 +0000 (14:18 +0100)]
Remove obsolete/temp file

8 years agoEnsure that presence_broadcast room option is stored (#1380)
Badlop [Wed, 16 Nov 2016 12:35:50 +0000 (13:35 +0100)]
Ensure that presence_broadcast room option is stored (#1380)

8 years agoTell git to ignore the example file ejabberd.service
Badlop [Wed, 16 Nov 2016 12:12:57 +0000 (13:12 +0100)]
Tell git to ignore the example file ejabberd.service

8 years agoHandle correctly p1_http:request result
Badlop [Wed, 16 Nov 2016 12:11:23 +0000 (13:11 +0100)]
Handle correctly p1_http:request result

8 years agoMinor cosmetic changes on pubsub code
Christophe Romain [Tue, 15 Nov 2016 17:35:20 +0000 (18:35 +0100)]
Minor cosmetic changes on pubsub code

8 years agoCosmetic validator changes
Christophe Romain [Tue, 15 Nov 2016 17:14:21 +0000 (18:14 +0100)]
Cosmetic validator changes

8 years agoAdd missing verbs for RESTfull operation
Christophe Romain [Tue, 9 Aug 2016 08:53:58 +0000 (10:53 +0200)]
Add missing verbs for RESTfull operation

8 years agoapply string optimizations
Christophe Romain [Mon, 16 Jun 2014 17:49:08 +0000 (19:49 +0200)]
apply string optimizations

8 years agoAdd configurable weight for commands
Christophe Romain [Tue, 15 Nov 2016 13:18:34 +0000 (14:18 +0100)]
Add configurable weight for commands

8 years agoFix tests that use #forwarded
Paweł Chmielowski [Tue, 15 Nov 2016 08:59:40 +0000 (09:59 +0100)]
Fix tests that use #forwarded

8 years agoUse new version of fast_xml
Paweł Chmielowski [Tue, 15 Nov 2016 08:59:04 +0000 (09:59 +0100)]
Use new version of fast_xml

8 years agoFix types in check_password_hash
Paweł Chmielowski [Thu, 10 Nov 2016 10:20:57 +0000 (11:20 +0100)]
Fix types in check_password_hash

8 years agoMake string args in http_api be list strings
Paweł Chmielowski [Thu, 10 Nov 2016 10:15:34 +0000 (11:15 +0100)]
Make string args in http_api be list strings

8 years agoUse p1_http from p1_utils 1.0.6
Christophe Romain [Mon, 14 Nov 2016 15:52:03 +0000 (16:52 +0100)]
Use p1_http from p1_utils 1.0.6

8 years agoFix IQ result processing
Evgeniy Khramtsov [Sun, 13 Nov 2016 13:56:05 +0000 (16:56 +0300)]
Fix IQ result processing

8 years agoAdd some copyright notices
Evgeniy Khramtsov [Sun, 13 Nov 2016 13:46:04 +0000 (16:46 +0300)]
Add some copyright notices

8 years agoMake xref working again if elixir is disabled
Evgeniy Khramtsov [Sun, 13 Nov 2016 11:29:52 +0000 (14:29 +0300)]
Make xref working again if elixir is disabled

8 years agoAdd more control for decoding IQ payloads
Evgeniy Khramtsov [Sun, 13 Nov 2016 11:17:21 +0000 (14:17 +0300)]
Add more control for decoding IQ payloads

8 years agoDon't auto-decode forwarded payload
Evgeniy Khramtsov [Sun, 13 Nov 2016 10:41:04 +0000 (13:41 +0300)]
Don't auto-decode forwarded payload

8 years agoRemove unused header file
Evgeniy Khramtsov [Sun, 13 Nov 2016 07:57:53 +0000 (10:57 +0300)]
Remove unused header file

8 years agoDon't use jlib.hrl outside of jlib.erl
Evgeniy Khramtsov [Sun, 13 Nov 2016 07:56:36 +0000 (10:56 +0300)]
Don't use jlib.hrl outside of jlib.erl

8 years agoDeprecate most of the functions from jlib.erl
Evgeniy Khramtsov [Sun, 13 Nov 2016 07:44:53 +0000 (10:44 +0300)]
Deprecate most of the functions from jlib.erl

8 years agoUncomment forgotten block of code
Evgeniy Khramtsov [Sat, 12 Nov 2016 11:51:43 +0000 (14:51 +0300)]
Uncomment forgotten block of code

8 years agoRevert "Support to provide password when subscribing to a room (#1306)"
Evgeniy Khramtsov [Sat, 12 Nov 2016 11:47:29 +0000 (14:47 +0300)]
Revert "Support to provide password when subscribing to a room (#1306)"

This reverts commit 566ac872fe396a6d41296d9cfbc6ed5859a0eeed.

8 years agoMerge branch 'master' into xml-ng
Evgeniy Khramtsov [Sat, 12 Nov 2016 11:41:37 +0000 (14:41 +0300)]
Merge branch 'master' into xml-ng

8 years agoMerge branch 'master' into xml-ng
Evgeniy Khramtsov [Sat, 12 Nov 2016 10:27:15 +0000 (13:27 +0300)]
Merge branch 'master' into xml-ng

Conflicts:
src/adhoc.erl
src/cyrsasl_oauth.erl
src/ejabberd_c2s.erl
src/ejabberd_config.erl
src/ejabberd_service.erl
src/gen_mod.erl
src/mod_admin_extra.erl
src/mod_announce.erl
src/mod_carboncopy.erl
src/mod_client_state.erl
src/mod_configure.erl
src/mod_echo.erl
src/mod_mam.erl
src/mod_muc.erl
src/mod_muc_room.erl
src/mod_offline.erl
src/mod_pubsub.erl
src/mod_stats.erl
src/node_flat_sql.erl
src/randoms.erl

8 years agoSupport to provide password when subscribing to a room (#1306)
Badlop [Thu, 10 Nov 2016 19:48:43 +0000 (20:48 +0100)]
Support to provide password when subscribing to a room (#1306)

8 years agoAdd more tests for offline storage
Evgeniy Khramtsov [Tue, 8 Nov 2016 12:15:19 +0000 (15:15 +0300)]
Add more tests for offline storage

8 years agoMerge branch 'xml-ng' of github.com:processone/ejabberd into xml-ng
Evgeniy Khramtsov [Mon, 7 Nov 2016 07:11:40 +0000 (10:11 +0300)]
Merge branch 'xml-ng' of github.com:processone/ejabberd into xml-ng

8 years agoAdd roster tests
Evgeniy Khramtsov [Mon, 7 Nov 2016 07:10:57 +0000 (10:10 +0300)]
Add roster tests

8 years agoSupport several groups separated by ; in add_rosteritem command
Badlop [Fri, 4 Nov 2016 17:44:15 +0000 (18:44 +0100)]
Support several groups separated by ; in add_rosteritem command

8 years agoThrow error if room name or host has invalid characters (#1360)
Badlop [Fri, 4 Nov 2016 16:28:28 +0000 (17:28 +0100)]
Throw error if room name or host has invalid characters (#1360)

8 years agoFix reading room jids from file for create and destroy_rooms_file commands
Badlop [Fri, 4 Nov 2016 15:54:31 +0000 (16:54 +0100)]
Fix reading room jids from file for create and destroy_rooms_file commands

8 years agoReplace ctlscriptpath and produce ejabberd.service file (#434)
Badlop [Fri, 4 Nov 2016 15:35:59 +0000 (16:35 +0100)]
Replace ctlscriptpath and produce ejabberd.service file (#434)

8 years agoMerge mod_opt_type from db sub-modules to main module mod_opt_type
Paweł Chmielowski [Fri, 4 Nov 2016 11:57:57 +0000 (12:57 +0100)]
Merge mod_opt_type from db sub-modules to main module mod_opt_type

8 years agomod_mam: Use user JID for stanza ID 'by' attribute
Holger Weiss [Tue, 1 Nov 2016 07:47:08 +0000 (08:47 +0100)]
mod_mam: Use user JID for stanza ID 'by' attribute

Use the user (or room) JID instead of the server JID for the 'by'
attribute of <stanza-id/> and <archived/> tags.  That's what the
examples in XEP-0313 v0.2 and XEP-0359 v0.3.0 suggest.

8 years agoAppend ; to privacy_list_data exporting lines (thanks to Marcio Luciano Donada)
Badlop [Mon, 24 Oct 2016 11:42:33 +0000 (13:42 +0200)]
Append ; to privacy_list_data exporting lines (thanks to Marcio Luciano Donada)

8 years agoUse base64:mime_decode/1 for SASL packets
Evgeniy Khramtsov [Sat, 22 Oct 2016 10:09:11 +0000 (13:09 +0300)]
Use base64:mime_decode/1 for SASL packets

It will be now possible to accept SASL packets with only
single '=' character set as required by RFC6120

8 years agoAdd more tests for privacy lists and blocking command
Evgeniy Khramtsov [Sat, 22 Oct 2016 10:01:45 +0000 (13:01 +0300)]
Add more tests for privacy lists and blocking command

8 years agoMerge pull request #1349 from prasadvaidya/master
badlop [Fri, 21 Oct 2016 11:32:29 +0000 (13:32 +0200)]
Merge pull request #1349 from prasadvaidya/master

Fix: Replace erlang function with fail-safe jlib function.

8 years agoRollback minor change, to avoid redundant use of fail-safe function
Prasad Vaidya [Fri, 21 Oct 2016 09:32:39 +0000 (15:02 +0530)]
Rollback minor change, to avoid redundant use of fail-safe function

8 years agoFix: Replace erlang function with fail-safe jlib function.
Prasad Vaidya [Fri, 21 Oct 2016 08:27:47 +0000 (13:57 +0530)]
Fix: Replace erlang function with fail-safe jlib function.

8 years agoNidx may be integer or binary, so use jlib:i2l instead
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

8 years agoIf a participant can change subject, let asubscriber too (#1345)
Badlop [Thu, 20 Oct 2016 18:34:48 +0000 (20:34 +0200)]
If a participant can change subject, let asubscriber too (#1345)

8 years agoLet mix be able to cope with configured deps
Christophe Romain [Wed, 19 Oct 2016 11:57:19 +0000 (13:57 +0200)]
Let mix be able to cope with configured deps

8 years agoMerge pull request #1343 from gardenia/mod_muc_configurable_max_discoitems
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)

8 years agomod_muc: made the constant MAX_ROOMS_DISCOITEMS configurable
colm [Tue, 18 Oct 2016 20:59:34 +0000 (21:59 +0100)]
mod_muc: made the constant MAX_ROOMS_DISCOITEMS configurable

8 years agoFix randoms:uniform/1 return
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

8 years agoGet rid of compile warnings for random/crypto modules on R19
Evgeniy Khramtsov [Tue, 18 Oct 2016 05:17:21 +0000 (08:17 +0300)]
Get rid of compile warnings for random/crypto modules on R19

8 years agoMerge pull request #1338 from marcphilipp/muc_invite_hook
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

8 years agoFix delete_old_messages command for SQL backends
Jerome Sautret [Mon, 10 Oct 2016 09:32:36 +0000 (11:32 +0200)]
Fix delete_old_messages command for SQL backends

8 years agoAdd more MUC tests
Evgeniy Khramtsov [Mon, 17 Oct 2016 10:37:23 +0000 (13:37 +0300)]
Add more MUC tests

8 years agoConvert ejabberd_xmlrpc to new api_permissions
Paweł Chmielowski [Fri, 14 Oct 2016 11:55:50 +0000 (13:55 +0200)]
Convert ejabberd_xmlrpc to new api_permissions

8 years agoIntroduce muc_invite hook
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()

8 years agoAlways include <actions/> with ad-hoc responses
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.

8 years agoDon't let MAM messages go into offline storage
Holger Weiss [Wed, 12 Oct 2016 21:10:25 +0000 (23:10 +0200)]
Don't let MAM messages go into offline storage

8 years agoMerge pull request #1331 from weiss/send-message-omit-copies
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

8 years agoIgnore offline sessions in statistics
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.

8 years agoUpdate riakc to support r19
Christophe Romain [Fri, 16 Sep 2016 12:59:06 +0000 (14:59 +0200)]
Update riakc to support r19

8 years agoCreate room on configuration request as per XEP-0045, 10.1.3
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

8 years agoDon't let "send_message" duplicate the message
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.

8 years agoAdd xdata generator and make some code using it
Evgeniy Khramtsov [Fri, 7 Oct 2016 07:31:03 +0000 (10:31 +0300)]
Add xdata generator and make some code using it

8 years agoMake map syntax compatible with Erlang/OTP 17
Holger Weiss [Thu, 6 Oct 2016 22:36:47 +0000 (00:36 +0200)]
Make map syntax compatible with Erlang/OTP 17

8 years agoXEP-0198: Cope with invalid 'from'/'to' attributes
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.

8 years agoDisable one test for now, we may change how this part is handled
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

8 years agoUse correct field for oauth scope
Paweł Chmielowski [Thu, 6 Oct 2016 09:03:26 +0000 (11:03 +0200)]
Use correct field for oauth scope

8 years agoMake handling of oauth clauses be more consistent with other rules
Paweł Chmielowski [Thu, 6 Oct 2016 08:59:31 +0000 (10:59 +0200)]
Make handling of oauth clauses be more consistent with other rules

8 years agoUse proper default value for api_permissions
Paweł Chmielowski [Thu, 6 Oct 2016 08:47:17 +0000 (10:47 +0200)]
Use proper default value for api_permissions

8 years agoFix typos in Czech translation (#1318)
Badlop [Wed, 5 Oct 2016 13:01:33 +0000 (15:01 +0200)]
Fix typos in Czech translation (#1318)

8 years agoInitialize ejabberd_access_permissions in elixir tests
Paweł Chmielowski [Wed, 5 Oct 2016 11:54:29 +0000 (13:54 +0200)]
Initialize ejabberd_access_permissions in elixir tests

8 years agoNew api permissions framework
Paweł Chmielowski [Wed, 5 Oct 2016 11:21:11 +0000 (13:21 +0200)]
New api permissions framework

8 years agoejabberd_sm: Clean up old offline session entries
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.

8 years agoPubSub: creation jid must be bare jid
Christophe Romain [Thu, 29 Sep 2016 14:10:11 +0000 (16:10 +0200)]
PubSub: creation jid must be bare jid

8 years agoPubSub: fix error type on item deletion with insufficient priviledge
Christophe Romain [Thu, 29 Sep 2016 09:20:56 +0000 (11:20 +0200)]
PubSub: fix error type on item deletion with insufficient priviledge

8 years agoPubSub: creation jid must be bare jid
Christophe Romain [Thu, 29 Sep 2016 14:10:11 +0000 (16:10 +0200)]
PubSub: creation jid must be bare jid

8 years agoPubSub: fix notification on subscription change
Christophe Romain [Thu, 29 Sep 2016 10:00:59 +0000 (12:00 +0200)]
PubSub: fix notification on subscription change

8 years agoPubSub: fix error type on item deletion with insufficient priviledge
Christophe Romain [Thu, 29 Sep 2016 09:20:56 +0000 (11:20 +0200)]
PubSub: fix error type on item deletion with insufficient priviledge

8 years agoFix 404 response formatting (thanks to Kaggggggga)(#1306)
Badlop [Wed, 28 Sep 2016 09:03:46 +0000 (11:03 +0200)]
Fix 404 response formatting (thanks to Kaggggggga)(#1306)

8 years agoejabberd_http: Handle missing POST data gracefully
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.

8 years agoUse inets instead of lhttpc in http_p1
Alexey Shchepin [Tue, 27 Sep 2016 04:12:10 +0000 (07:12 +0300)]
Use inets instead of lhttpc in http_p1

8 years agoAdd http_p1.erl, rest.erl, and oauth2 ReST backend for tokens.
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.

8 years agoText legacy IQ handler support
Evgeniy Khramtsov [Sun, 25 Sep 2016 07:17:03 +0000 (10:17 +0300)]
Text legacy IQ handler support

8 years agoTest anonymous auth
Evgeniy Khramtsov [Sun, 25 Sep 2016 06:57:56 +0000 (09:57 +0300)]
Test anonymous auth

8 years agoGet rid of compile warnings in test suite
Evgeniy Khramtsov [Sun, 25 Sep 2016 05:38:41 +0000 (08:38 +0300)]
Get rid of compile warnings in test suite

8 years agoDeprecate jlib:integer_to_binary/1 and jlib:binary_to_integer/1
Evgeniy Khramtsov [Sat, 24 Sep 2016 20:34:28 +0000 (23:34 +0300)]
Deprecate jlib:integer_to_binary/1 and jlib:binary_to_integer/1

8 years agoImprove namespace handling
Evgeniy Khramtsov [Sat, 24 Sep 2016 11:17:21 +0000 (14:17 +0300)]
Improve namespace handling

8 years agoAdd tests for s2s code
Evgeniy Khramtsov [Fri, 23 Sep 2016 09:30:33 +0000 (12:30 +0300)]
Add tests for s2s code

8 years agoAdd tests for external component
Evgeniy Khramtsov [Wed, 21 Sep 2016 07:45:11 +0000 (10:45 +0300)]
Add tests for external component

8 years agoAdd more tests for C2S
Evgeniy Khramtsov [Tue, 20 Sep 2016 11:04:07 +0000 (14:04 +0300)]
Add more tests for C2S

8 years agomod_carboncopy: Don't copy MUC PMs
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.

8 years agoWhen getting list of subscribed rooms, check all including temporary ones (#1242)
Badlop [Mon, 19 Sep 2016 11:46:01 +0000 (13:46 +0200)]
When getting list of subscribed rooms, check all including temporary ones (#1242)

8 years agoRevert "Fix getting of subscribed rooms: consider also 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.

8 years agoFix getting of subscribed rooms: consider also temporary ones (#1242)
Badlop [Mon, 19 Sep 2016 10:35:53 +0000 (12:35 +0200)]
Fix getting of subscribed rooms: consider also temporary ones (#1242)

8 years agoStore the Allow Subscription room option (#1301)
Badlop [Mon, 19 Sep 2016 10:35:32 +0000 (12:35 +0200)]
Store the Allow Subscription room option (#1301)

8 years agoDon't worry about storage_type of the Acl mnesia table (#1206)
Badlop [Mon, 19 Sep 2016 09:59:40 +0000 (11:59 +0200)]
Don't worry about storage_type of the Acl mnesia table (#1206)

8 years agoUse mnesia calls instead of ets for Acl and Access tables (#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)

8 years agoUpdate riakc to support r19
Christophe Romain [Fri, 16 Sep 2016 12:59:06 +0000 (14:59 +0200)]
Update riakc to support r19

8 years agonode_mb_sql: Add missing (SQL-specific) functions
Holger Weiss [Thu, 15 Sep 2016 21:02:04 +0000 (23:02 +0200)]
node_mb_sql: Add missing (SQL-specific) functions

8 years agoFix dialyzer warnings for mod_mam
Evgeniy Khramtsov [Tue, 13 Sep 2016 13:56:34 +0000 (16:56 +0300)]
Fix dialyzer warnings for mod_mam