]>
granicus.if.org Git - ejabberd/log
Paweł Chmielowski [Thu, 24 Nov 2016 11:44:09 +0000 (12:44 +0100)]
Add missing -callbacks
Evgeny Khramtsov [Thu, 24 Nov 2016 11:43:38 +0000 (15:43 +0400)]
Merge pull request #1391 from weiss/mark-copies
Mark messages as copies by attaching metadata
Holger Weiss [Thu, 24 Nov 2016 09:47:26 +0000 (10:47 +0100)]
Use xmpp:put_meta/3 to update metadata
Holger Weiss [Thu, 24 Nov 2016 09:45:57 +0000 (10:45 +0100)]
Use new versions of fast_xml and xmpp
Holger Weiss [Thu, 24 Nov 2016 06:59:27 +0000 (07:59 +0100)]
Don't make ejabberd.service file executable
Holger Weiss [Thu, 24 Nov 2016 06:55:06 +0000 (07:55 +0100)]
Makefile.in: Substitute all @variables@ in a line
There are now lines with multiple occurrences of the @ctlscriptpath@
variable in the ejabberd.service template.
Christophe Romain [Wed, 23 Nov 2016 13:37:34 +0000 (14:37 +0100)]
Merge branch 'weiss-systemd-unit-improvements' (#1346)
Christophe Romain [Wed, 23 Nov 2016 13:36:50 +0000 (14:36 +0100)]
Merge branch 'systemd-unit-improvements' of https://github.com/weiss/ejabberd into weiss-systemd-unit-improvements
Christophe Romain [Wed, 23 Nov 2016 13:35:13 +0000 (14:35 +0100)]
Fix typo in copyright date
Evgeniy Khramtsov [Wed, 23 Nov 2016 12:51:48 +0000 (15:51 +0300)]
Move copyright definition to ejabberd.hrl
Evgeniy Khramtsov [Wed, 23 Nov 2016 07:41:26 +0000 (10:41 +0300)]
Don't use deprecated functions from jlib.erl
Holger Weiss [Tue, 22 Nov 2016 21:21:34 +0000 (22:21 +0100)]
Let mod_carboncopy mark copied messages
Carbon copies are now marked with a 'carbon_copy' flag. This makes it
easier to identify them.
Holger Weiss [Tue, 22 Nov 2016 18:25:20 +0000 (19:25 +0100)]
Let ejabberd_sm mark copied messages
When multiple resources have the same (highest) priority, ejabberd_sm
dispatches messages addressed to the bare JID (or to an unavailable
resource) to each of these resources. Such messages are now marked with
an 'sm_copy' flag for all but one of the resources. This makes it
easier for other modules to identify those duplicates.
Resolves #1356.
Christophe Romain [Tue, 22 Nov 2016 16:51:21 +0000 (17:51 +0100)]
Fix xref issue injected by
fbfbb96
Christophe Romain [Tue, 22 Nov 2016 15:59:02 +0000 (16:59 +0100)]
Fix get_roster issue injected by
fbfbb96
Christophe Romain [Tue, 22 Nov 2016 15:23:02 +0000 (16:23 +0100)]
Fix vcard_ldap exports
Christophe Romain [Tue, 22 Nov 2016 15:12:19 +0000 (16:12 +0100)]
Add missing export
Christophe Romain [Tue, 22 Nov 2016 15:01:08 +0000 (16:01 +0100)]
Fix issues on import improvements
Paweł Chmielowski [Tue, 22 Nov 2016 14:35:47 +0000 (15:35 +0100)]
Add missing include file
Paweł Chmielowski [Tue, 22 Nov 2016 12:17:05 +0000 (13:17 +0100)]
New bosh module
Christophe Romain [Tue, 22 Nov 2016 13:48:01 +0000 (14:48 +0100)]
Improve ODBC import
Christophe Romain [Tue, 22 Nov 2016 13:43:10 +0000 (14:43 +0100)]
Add new xmpp repo as dependency in mix.exs
Paweł Chmielowski [Tue, 22 Nov 2016 12:15:16 +0000 (13:15 +0100)]
Remove now() from mod_offline.hrl
Evgeniy Khramtsov [Tue, 22 Nov 2016 06:52:26 +0000 (09:52 +0300)]
Add OTP 19.1 to Travis' testing platforms
Evgeniy Khramtsov [Mon, 21 Nov 2016 19:04:25 +0000 (22:04 +0300)]
Fix logging in tests on R17
Evgeniy Khramtsov [Mon, 21 Nov 2016 18:34:56 +0000 (21:34 +0300)]
Set 'sql_pool_size' to 1 by default for sqlite
Evgeniy Khramtsov [Mon, 21 Nov 2016 13:55:28 +0000 (16:55 +0300)]
Merge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Mon, 21 Nov 2016 13:55:18 +0000 (16:55 +0300)]
Set 'sql_pool_size' to 1 for sqlite tests
Paweł Chmielowski [Mon, 21 Nov 2016 11:25:50 +0000 (12:25 +0100)]
Fix elixir tests
Evgeniy Khramtsov [Mon, 21 Nov 2016 11:21:34 +0000 (14:21 +0300)]
Fix non-empty disco-nodes processing
Paweł Chmielowski [Mon, 21 Nov 2016 11:06:45 +0000 (12:06 +0100)]
Fix s2s test
Badlop [Mon, 21 Nov 2016 11:06:11 +0000 (12:06 +0100)]
Fix handling mod_http_upload disco#info queries: need decoded elements
As reported in
https://www.ejabberd.im/forum/28605/ejabberd-modhttpupload-error-405-not-allowed
Evgeniy Khramtsov [Mon, 21 Nov 2016 09:14:37 +0000 (12:14 +0300)]
Merge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Mon, 21 Nov 2016 09:14:24 +0000 (12:14 +0300)]
Fix conference disco#items when running multiple virtual hosts
Evgeniy Khramtsov [Mon, 21 Nov 2016 09:13:34 +0000 (12:13 +0300)]
Do not send empty <after/> tag
Paweł Chmielowski [Mon, 21 Nov 2016 08:52:29 +0000 (09:52 +0100)]
Log more data for failed s2s connection
Evgeniy Khramtsov [Mon, 21 Nov 2016 07:23:09 +0000 (10:23 +0300)]
Don't forget to start XMPP application
Evgeniy Khramtsov [Sun, 20 Nov 2016 15:08:49 +0000 (18:08 +0300)]
Fix RSM for conference disco#items
Evgeniy Khramtsov [Sat, 19 Nov 2016 10:57:25 +0000 (13:57 +0300)]
Use xmpp_util.erl from XMPP library
Evgeniy Khramtsov [Sat, 19 Nov 2016 10:05:13 +0000 (13:05 +0300)]
Transform ejabberd_commands on the start
Evgeniy Khramtsov [Sat, 19 Nov 2016 10:03:33 +0000 (13:03 +0300)]
Switch to stand-alone XMPP library
Paweł Chmielowski [Fri, 18 Nov 2016 13:02:47 +0000 (14:02 +0100)]
Fix includes in eunit compilation flags
Paweł Chmielowski [Fri, 18 Nov 2016 11:54:06 +0000 (12:54 +0100)]
Fix elixir tests
Christophe Romain [Fri, 18 Nov 2016 11:25:01 +0000 (12:25 +0100)]
Remove useless NO_EXT_LIB flag
Paweł Chmielowski [Fri, 18 Nov 2016 10:51:57 +0000 (11:51 +0100)]
Get rid of substitute_forwarded
Evgeniy Khramtsov [Fri, 18 Nov 2016 10:39:10 +0000 (13:39 +0300)]
Merge branch 'master' of github.com:processone/ejabberd
Conflicts:
test/ejabberd_SUITE.erl
Evgeniy Khramtsov [Fri, 18 Nov 2016 10:38:08 +0000 (13:38 +0300)]
Make common tests working again
Paweł Chmielowski [Thu, 17 Nov 2016 11:59:27 +0000 (12:59 +0100)]
Add auth to mod_http_fileserver
Christophe Romain [Wed, 16 Nov 2016 17:24:12 +0000 (18:24 +0100)]
Fix typo
Christophe Romain [Wed, 16 Nov 2016 13:18:51 +0000 (14:18 +0100)]
Remove obsolete/temp file
Badlop [Wed, 16 Nov 2016 12:35:50 +0000 (13:35 +0100)]
Ensure that presence_broadcast room option is stored (#1380)
Badlop [Wed, 16 Nov 2016 12:12:57 +0000 (13:12 +0100)]
Tell git to ignore the example file ejabberd.service
Badlop [Wed, 16 Nov 2016 12:11:23 +0000 (13:11 +0100)]
Handle correctly p1_http:request result
Christophe Romain [Tue, 15 Nov 2016 17:35:20 +0000 (18:35 +0100)]
Minor cosmetic changes on pubsub code
Christophe Romain [Tue, 15 Nov 2016 17:14:21 +0000 (18:14 +0100)]
Cosmetic validator changes
Christophe Romain [Tue, 9 Aug 2016 08:53:58 +0000 (10:53 +0200)]
Add missing verbs for RESTfull operation
Christophe Romain [Mon, 16 Jun 2014 17:49:08 +0000 (19:49 +0200)]
apply string optimizations
Christophe Romain [Tue, 15 Nov 2016 13:18:34 +0000 (14:18 +0100)]
Add configurable weight for commands
Paweł Chmielowski [Tue, 15 Nov 2016 08:59:40 +0000 (09:59 +0100)]
Fix tests that use #forwarded
Paweł Chmielowski [Tue, 15 Nov 2016 08:59:04 +0000 (09:59 +0100)]
Use new version of fast_xml
Paweł Chmielowski [Thu, 10 Nov 2016 10:20:57 +0000 (11:20 +0100)]
Fix types in check_password_hash
Paweł Chmielowski [Thu, 10 Nov 2016 10:15:34 +0000 (11:15 +0100)]
Make string args in http_api be list strings
Christophe Romain [Mon, 14 Nov 2016 15:52:03 +0000 (16:52 +0100)]
Use p1_http from p1_utils 1.0.6
Evgeniy Khramtsov [Sun, 13 Nov 2016 13:56:05 +0000 (16:56 +0300)]
Fix IQ result processing
Evgeniy Khramtsov [Sun, 13 Nov 2016 13:46:04 +0000 (16:46 +0300)]
Add some copyright notices
Evgeniy Khramtsov [Sun, 13 Nov 2016 11:29:52 +0000 (14:29 +0300)]
Make xref working again if elixir is disabled
Evgeniy Khramtsov [Sun, 13 Nov 2016 11:17:21 +0000 (14:17 +0300)]
Add more control for decoding IQ payloads
Evgeniy Khramtsov [Sun, 13 Nov 2016 10:41:04 +0000 (13:41 +0300)]
Don't auto-decode forwarded payload
Evgeniy Khramtsov [Sun, 13 Nov 2016 07:57:53 +0000 (10:57 +0300)]
Remove unused header file
Evgeniy Khramtsov [Sun, 13 Nov 2016 07:56:36 +0000 (10:56 +0300)]
Don't use jlib.hrl outside of jlib.erl
Evgeniy Khramtsov [Sun, 13 Nov 2016 07:44:53 +0000 (10:44 +0300)]
Deprecate most of the functions from jlib.erl
Evgeniy Khramtsov [Sat, 12 Nov 2016 11:51:43 +0000 (14:51 +0300)]
Uncomment forgotten block of code
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 .
Evgeniy Khramtsov [Sat, 12 Nov 2016 11:41:37 +0000 (14:41 +0300)]
Merge 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
Badlop [Thu, 10 Nov 2016 19:48:43 +0000 (20:48 +0100)]
Support to provide password when subscribing to a room (#1306)
Evgeniy Khramtsov [Tue, 8 Nov 2016 12:15:19 +0000 (15:15 +0300)]
Add more tests for offline storage
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
Evgeniy Khramtsov [Mon, 7 Nov 2016 07:10:57 +0000 (10:10 +0300)]
Add roster tests
Badlop [Fri, 4 Nov 2016 17:44:15 +0000 (18:44 +0100)]
Support several groups separated by ; in add_rosteritem command
Badlop [Fri, 4 Nov 2016 16:28:28 +0000 (17:28 +0100)]
Throw error if room name or host has invalid characters (#1360)
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
Badlop [Fri, 4 Nov 2016 15:35:59 +0000 (16:35 +0100)]
Replace ctlscriptpath and produce ejabberd.service file (#434)
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
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.
Badlop [Mon, 24 Oct 2016 11:42:33 +0000 (13:42 +0200)]
Append ; to privacy_list_data exporting lines (thanks to Marcio Luciano Donada)
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
Evgeniy Khramtsov [Sat, 22 Oct 2016 10:01:45 +0000 (13:01 +0300)]
Add more tests for privacy lists and blocking command
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.
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)
Holger Weiss [Wed, 19 Oct 2016 22:27:50 +0000 (00:27 +0200)]
Let systemd stop ejabberd gracefully
Make sure the "ExecStop" command line blocks until ejabberd is actually
stopped. This prevents systemd from killing the ejabberd process(es)
immediately.
Also, let the "ExecStart" command line block until ejabberd's startup is
completed. This makes sure that services which depend on ejabberd
aren't started up too early.
Holger Weiss [Wed, 19 Oct 2016 22:12:02 +0000 (00:12 +0200)]
Increase file descriptor limit in systemd unit
16,000 file descriptors will only suffice for small setups.
Holger Weiss [Wed, 19 Oct 2016 21:37:26 +0000 (23:37 +0200)]
Don't specify "ExecReload" command in systemd unit
The "reload_config" command doesn't work the way admins would typically
expect, so it shouldn't be exposed via systemd. Those who understand
the behavior can execute the command using ejabberdctl.
Holger Weiss [Wed, 19 Oct 2016 21:35:22 +0000 (23:35 +0200)]
Let systemd restart ejabberd on failure
The "RestartSec=5" setting has no effect if "Restart" is not also
specified.
Holger Weiss [Wed, 19 Oct 2016 21:32:07 +0000 (23:32 +0200)]
Use "Type=forking" in systemd unit
ejabberd is not a "oneshot" process.
Holger Weiss [Wed, 19 Oct 2016 21:29:46 +0000 (23:29 +0200)]
Don't set "NoNewPrivileges" in systemd unit
The "NoNewPrivileges" setting breaks some PAM and extauth setups.
Fixes #1281.
Holger Weiss [Wed, 19 Oct 2016 21:11:26 +0000 (23:11 +0200)]
Don't let systemd hide /home and /tmp
Admins might expect ejabberd to be able to access data below /home or
/tmp. For example, they might use those locations to dump/restore
Mnesia backups, or as a document root for mod_http_fileserver or
mod_http_upload.
Fixes #1297.