]> granicus.if.org Git - ejabberd/log
ejabberd
7 years agotools/hook_deps.sh: Search for escript in PATH
Holger Weiss [Thu, 23 Feb 2017 16:38:56 +0000 (17:38 +0100)]
tools/hook_deps.sh: Search for escript in PATH

7 years agoMerge pull request #1499 from weiss/offline-stanza-id
Evgeny Khramtsov [Thu, 23 Feb 2017 16:36:05 +0000 (20:36 +0400)]
Merge pull request #1499 from weiss/offline-stanza-id

Include stanza ID with archived offline messages

7 years agoInclude stanza ID with archived offline messages
Holger Weiss [Thu, 23 Feb 2017 15:55:35 +0000 (16:55 +0100)]
Include stanza ID with archived offline messages

Fixes #1480.

7 years agoAvoid orphan_item leak on affiliation/subscription removal (#1563)
Christophe Romain [Thu, 23 Feb 2017 15:43:22 +0000 (16:43 +0100)]
Avoid orphan_item leak on affiliation/subscription removal (#1563)

7 years agoFix pubsub MySQL schema
Jerome Sautret [Thu, 23 Feb 2017 15:04:29 +0000 (16:04 +0100)]
Fix pubsub MySQL schema

7 years agoStart/stop auth modules when host is added/deleted
Evgeniy Khramtsov [Thu, 23 Feb 2017 13:19:22 +0000 (16:19 +0300)]
Start/stop auth modules when host is added/deleted

7 years agoStop all s2s connections via supervisor calls
Evgeniy Khramtsov [Thu, 23 Feb 2017 13:18:29 +0000 (16:18 +0300)]
Stop all s2s connections via supervisor calls

7 years agoFix elixir tests
Paweł Chmielowski [Thu, 23 Feb 2017 08:53:20 +0000 (09:53 +0100)]
Fix elixir tests

7 years agoImprove reload_config admin command
Evgeniy Khramtsov [Thu, 23 Feb 2017 08:14:49 +0000 (11:14 +0300)]
Improve reload_config admin command

7 years agoStart/stop virtual hosts when reloading configuration file
Evgeniy Khramtsov [Thu, 23 Feb 2017 07:12:19 +0000 (10:12 +0300)]
Start/stop virtual hosts when reloading configuration file

7 years agoRemove unused macro
Evgeniy Khramtsov [Wed, 22 Feb 2017 17:48:51 +0000 (20:48 +0300)]
Remove unused macro

7 years agoMerge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Wed, 22 Feb 2017 16:47:00 +0000 (19:47 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

7 years agoReload modules when reloading configuration file
Evgeniy Khramtsov [Wed, 22 Feb 2017 16:46:47 +0000 (19:46 +0300)]
Reload modules when reloading configuration file

7 years agoMake sure all hooks are called with proper host
Evgeniy Khramtsov [Wed, 22 Feb 2017 16:45:12 +0000 (19:45 +0300)]
Make sure all hooks are called with proper host

7 years agoFix match of itemid on get_cached_item, fixes 14e771d8
Christophe Romain [Wed, 22 Feb 2017 16:44:47 +0000 (17:44 +0100)]
Fix match of itemid on get_cached_item, fixes 14e771d8

7 years agoAdd missing NOT NULL restrictions
Christophe Romain [Wed, 22 Feb 2017 10:09:15 +0000 (11:09 +0100)]
Add missing NOT NULL restrictions

7 years agoMove archive tables into lite.sql for better comparison with other schemas
Christophe Romain [Wed, 22 Feb 2017 14:31:15 +0000 (15:31 +0100)]
Move archive tables into lite.sql for better comparison with other schemas

7 years agoRe-enable "replaced" tests
Evgeniy Khramtsov [Tue, 21 Feb 2017 09:53:08 +0000 (12:53 +0300)]
Re-enable "replaced" tests

7 years agoTest stream management queue overload
Evgeniy Khramtsov [Tue, 21 Feb 2017 09:38:03 +0000 (12:38 +0300)]
Test stream management queue overload

7 years agoImprove stream management tests
Evgeniy Khramtsov [Tue, 21 Feb 2017 06:19:51 +0000 (09:19 +0300)]
Improve stream management tests

7 years agoRename mod_sm -> mod_stream_mgmt
Evgeniy Khramtsov [Tue, 21 Feb 2017 06:18:58 +0000 (09:18 +0300)]
Rename mod_sm -> mod_stream_mgmt

7 years agoMerge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Tue, 21 Feb 2017 05:46:28 +0000 (08:46 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

7 years agoDon't count resent stanzas
Evgeniy Khramtsov [Tue, 21 Feb 2017 05:44:39 +0000 (08:44 +0300)]
Don't count resent stanzas

Thanks to Holger Weiß for an advise

7 years agoTravis CI: Update MySQL APT repository key
Holger Weiss [Mon, 20 Feb 2017 20:17:34 +0000 (21:17 +0100)]
Travis CI: Update MySQL APT repository key

The old key expired on February 16, 2017.

7 years agoejabberd_c2s: Don't drop 'user_send_packet' result
Holger Weiss [Mon, 20 Feb 2017 12:07:34 +0000 (13:07 +0100)]
ejabberd_c2s: Don't drop 'user_send_packet' result

When handling a <session/> IQ, use the stanza returned by the
'user_send_packet' hook.

Thanks to Evgeniy for spotting this.

7 years agoSupport scrammed passwords in ejabberdctl import_prosody (#1549)
Badlop [Mon, 20 Feb 2017 11:47:56 +0000 (12:47 +0100)]
Support scrammed passwords in ejabberdctl import_prosody (#1549)

7 years agoFix s2s_dns_timeout issues
Evgeniy Khramtsov [Mon, 20 Feb 2017 07:42:16 +0000 (10:42 +0300)]
Fix s2s_dns_timeout issues

7 years agoMerge pull request #1555 from weiss/count-session-iq
Evgeny Khramtsov [Mon, 20 Feb 2017 06:21:16 +0000 (10:21 +0400)]
Merge pull request #1555 from weiss/count-session-iq

Let ejabberd_c2s handle <session/> IQ

7 years agoLet ejabberd_c2s handle <session/> IQ
Holger Weiss [Sun, 19 Feb 2017 21:43:10 +0000 (22:43 +0100)]
Let ejabberd_c2s handle <session/> IQ

This fixes the counting of incoming stanzas for stream management.

7 years agoGet rid of non-breaking space
Evgeniy Khramtsov [Sat, 18 Feb 2017 09:13:48 +0000 (12:13 +0300)]
Get rid of non-breaking space

7 years agoFix some dialyzer warnings
Evgeniy Khramtsov [Sat, 18 Feb 2017 06:36:27 +0000 (09:36 +0300)]
Fix some dialyzer warnings

7 years agoMerge pull request #1553 from lemenkov/config_functions_deprecation
Evgeny Khramtsov [Fri, 17 Feb 2017 16:40:04 +0000 (20:40 +0400)]
Merge pull request #1553 from lemenkov/config_functions_deprecation

Mark local/global config functions as deprecated

7 years agoMark local/global config functions as deprecated
Peter Lemenkov [Fri, 17 Feb 2017 16:20:44 +0000 (19:20 +0300)]
Mark local/global config functions as deprecated

See discussion in PR #1548.

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
7 years agoFix compilation when included as Elixir dependency (#1526)
Christophe Romain [Fri, 17 Feb 2017 15:26:39 +0000 (16:26 +0100)]
Fix compilation when included as Elixir dependency (#1526)

7 years agoCommands documentation lack arguments when policy=user (#1514)
Badlop [Fri, 17 Feb 2017 11:37:42 +0000 (12:37 +0100)]
Commands documentation lack arguments when policy=user (#1514)

7 years agoMerge pull request #1548 from lemenkov/use_get_option
Evgeny Khramtsov [Thu, 16 Feb 2017 19:34:50 +0000 (23:34 +0400)]
Merge pull request #1548 from lemenkov/use_get_option

Use ejabberd_config:get_option/2 instead of ejabberd_config:get_local_option/2

7 years agoUse ejabberd_config:add_option/2 instead of ejabberd_config:add_local_option/2
Peter Lemenkov [Thu, 16 Feb 2017 17:47:47 +0000 (20:47 +0300)]
Use ejabberd_config:add_option/2 instead of ejabberd_config:add_local_option/2

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
7 years agoUse ejabberd_config:get_option/2 instead of ejabberd_config:get_local_option/2
Peter Lemenkov [Thu, 16 Feb 2017 17:41:57 +0000 (20:41 +0300)]
Use ejabberd_config:get_option/2 instead of ejabberd_config:get_local_option/2

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
7 years agoCorrect access_matches spec
Paweł Chmielowski [Thu, 16 Feb 2017 14:38:30 +0000 (15:38 +0100)]
Correct access_matches spec

7 years agoFix some dialyzer warnings
Evgeniy Khramtsov [Thu, 16 Feb 2017 11:18:36 +0000 (14:18 +0300)]
Fix some dialyzer warnings

7 years agoChange routing API
Evgeniy Khramtsov [Thu, 16 Feb 2017 08:00:26 +0000 (11:00 +0300)]
Change routing API

Now 'From' and 'To' arguments must be omitted in functions
and structures related to routing.
The commit deprecates the following functions:
     ejabberd_router:route/3 in favor of ejabberd_router:route/1
     ejabberd_router:route_error/4 in favor of ejabberd_router:route_error/2
     ejabberd_local:route_iq/4 in favor of ejabberd_local:route_iq/2
     ejabberd_local:route_iq/5 in favor of ejabberd_local:route_iq/3
The format of {route, From, To, Packet} is changed in favor of {route, Packet}

7 years agoMerge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Wed, 15 Feb 2017 21:23:00 +0000 (00:23 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

7 years agoRemove relict mod_service_log
Evgeniy Khramtsov [Wed, 15 Feb 2017 21:22:48 +0000 (00:22 +0300)]
Remove relict mod_service_log

7 years agoDisable undefined_function_calls xref_check
Paweł Chmielowski [Wed, 15 Feb 2017 13:11:12 +0000 (14:11 +0100)]
Disable undefined_function_calls xref_check

It looks like it will calling undefined function still will be catched
by xref_queries

7 years agoReport password change in the log
Evgeniy Khramtsov [Tue, 14 Feb 2017 14:10:16 +0000 (17:10 +0300)]
Report password change in the log

7 years agoAttach IP metadata to every stanza received from stream
Evgeniy Khramtsov [Tue, 14 Feb 2017 14:09:25 +0000 (17:09 +0300)]
Attach IP metadata to every stanza received from stream

7 years agoUse newer p1_utils
Paweł Chmielowski [Tue, 14 Feb 2017 14:06:00 +0000 (15:06 +0100)]
Use newer p1_utils

7 years agoFix handling of config.ctc files
Paweł Chmielowski [Tue, 14 Feb 2017 13:34:02 +0000 (14:34 +0100)]
Fix handling of config.ctc files

7 years agoAdd more check to make xref
Paweł Chmielowski [Tue, 14 Feb 2017 13:33:44 +0000 (14:33 +0100)]
Add more check to make xref

7 years agoOnly use GEN_SERVER macro where appropriate
Evgeniy Khramtsov [Tue, 14 Feb 2017 12:39:57 +0000 (15:39 +0300)]
Only use GEN_SERVER macro where appropriate

7 years agoAttach modules to gen_mod's supervisor
Evgeniy Khramtsov [Tue, 14 Feb 2017 09:39:26 +0000 (12:39 +0300)]
Attach modules to gen_mod's supervisor

7 years agoMerge pull request #1539 from lemenkov/use_crypto_sha
Evgeny Khramtsov [Tue, 14 Feb 2017 07:38:05 +0000 (11:38 +0400)]
Merge pull request #1539 from lemenkov/use_crypto_sha

RFE: Use crypto:hash/2 function

7 years agoImprove modules start/stop procedures
Evgeniy Khramtsov [Tue, 14 Feb 2017 07:25:08 +0000 (10:25 +0300)]
Improve modules start/stop procedures

7 years agoUse crypto:hash/2 function
Peter Lemenkov [Mon, 13 Feb 2017 15:35:57 +0000 (18:35 +0300)]
Use crypto:hash/2 function

Use crypto:hash/2 function instead of ones from p1_sha.

This function exists since commit
erlang/otp@208f9ad3828313f6c659a501d53f5534ec1bdf2e and also implemented
as NIF, so I believe it's safe to use it.

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
7 years agoCheck result of gen_mod:start/2 callback (#1534)
Evgeniy Khramtsov [Mon, 13 Feb 2017 08:11:41 +0000 (11:11 +0300)]
Check result of gen_mod:start/2 callback (#1534)

7 years agoApply SASLprep before storing/converting passwords
Evgeniy Khramtsov [Sun, 12 Feb 2017 07:06:30 +0000 (10:06 +0300)]
Apply SASLprep before storing/converting passwords

Fixes #996 and #1295

7 years agoUse p1_server behaviour in xmpp_stream layer
Evgeniy Khramtsov [Wed, 8 Feb 2017 14:16:18 +0000 (17:16 +0300)]
Use p1_server behaviour in xmpp_stream layer

7 years agoAccept "add_commands: admin" in commands section not only "add_commands: - admin"
Paweł Chmielowski [Mon, 6 Feb 2017 20:40:37 +0000 (21:40 +0100)]
Accept "add_commands: admin" in commands section not only "add_commands: - admin"

This fixes issue reported in #1518, and restores compatibility with
what older version were accepting and what is documented.

7 years agoDon't shadow binding in match
Paweł Chmielowski [Mon, 6 Feb 2017 10:38:51 +0000 (11:38 +0100)]
Don't shadow binding in match

7 years agoAdd TLS support for external components
Evgeniy Khramtsov [Mon, 6 Feb 2017 10:30:58 +0000 (13:30 +0300)]
Add TLS support for external components

7 years agoMake sure that api_permissions always have "console commands" section
Paweł Chmielowski [Fri, 3 Feb 2017 14:22:35 +0000 (15:22 +0100)]
Make sure that api_permissions always have "console commands" section

If user didn't override it in config file, default version which allows
executing all commands will be added

7 years agoSet subscribers nicks when recreating room (thanks to Girdhar Sojitra)(#1495)
Badlop [Tue, 31 Jan 2017 18:18:19 +0000 (19:18 +0100)]
Set subscribers nicks when recreating room (thanks to Girdhar Sojitra)(#1495)

7 years agoSupport non-JID lines in command create_rooms_file
Badlop [Tue, 31 Jan 2017 16:50:04 +0000 (17:50 +0100)]
Support non-JID lines in command create_rooms_file

7 years agoDepend on fast_xml-1.1.20
Christophe Romain [Tue, 31 Jan 2017 10:02:23 +0000 (11:02 +0100)]
Depend on fast_xml-1.1.20

7 years agoDon't warn if custom schema is not available
Christophe Romain [Tue, 31 Jan 2017 08:53:52 +0000 (09:53 +0100)]
Don't warn if custom schema is not available

7 years agoMerge pull request #1502 from lemenkov/ignore_output_val
Evgeny Khramtsov [Mon, 30 Jan 2017 14:15:25 +0000 (18:15 +0400)]
Merge pull request #1502 from lemenkov/ignore_output_val

No need to explicitly return ok here

7 years agoNo need to explicitly return ok here
Peter Lemenkov [Mon, 30 Jan 2017 13:29:53 +0000 (14:29 +0100)]
No need to explicitly return ok here

No need to explicitly return ok here. Return value will be ignored
anyway.

Signed-off-by: Peter Lemenkov <lemenkov@redhat.com>
7 years agoUse newer version of epam
Paweł Chmielowski [Sun, 29 Jan 2017 13:51:03 +0000 (14:51 +0100)]
Use newer version of epam

7 years agoMore changes that are required from p1_pam -> epam
Paweł Chmielowski [Sun, 29 Jan 2017 13:35:22 +0000 (14:35 +0100)]
More changes that are required from p1_pam -> epam

7 years agoChange name of pam dep from p1_pam to epam
Paweł Chmielowski [Sun, 29 Jan 2017 13:16:35 +0000 (14:16 +0100)]
Change name of pam dep from p1_pam to epam

We need to use same name as .app file or rebar complains

7 years agoFloating deps should always be executed
Paweł Chmielowski [Sun, 29 Jan 2017 11:14:32 +0000 (12:14 +0100)]
Floating deps should always be executed

This fixes problem with recognizing latest_deps configure option

7 years agoImprove compilation with rebar3
Paweł Chmielowski [Thu, 26 Jan 2017 15:43:47 +0000 (16:43 +0100)]
Improve compilation with rebar3

7 years agoMerge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Thu, 26 Jan 2017 07:59:31 +0000 (10:59 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

7 years agoDo not drop default TLS options
Evgeniy Khramtsov [Thu, 26 Jan 2017 07:58:26 +0000 (10:58 +0300)]
Do not drop default TLS options

Fixes #1484

7 years agoAdapt to coveralls api change
Paweł Chmielowski [Tue, 24 Jan 2017 18:16:50 +0000 (19:16 +0100)]
Adapt to coveralls api change

7 years agoChange OTP version from 19.1 to 19.2 in travis config
Evgeniy Khramtsov [Tue, 24 Jan 2017 07:39:40 +0000 (10:39 +0300)]
Change OTP version from 19.1 to 19.2 in travis config

7 years agoSpeedup features list when a lot of virtual hosts configured
Evgeniy Khramtsov [Tue, 24 Jan 2017 07:38:29 +0000 (10:38 +0300)]
Speedup features list when a lot of virtual hosts configured

7 years agoFix tests
Paweł Chmielowski [Mon, 23 Jan 2017 19:43:35 +0000 (20:43 +0100)]
Fix tests

7 years agoMake mod_disco handle features of mod_ping
Evgeniy Khramtsov [Mon, 23 Jan 2017 19:33:46 +0000 (22:33 +0300)]
Make mod_disco handle features of mod_ping

7 years agoMerge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Mon, 23 Jan 2017 18:52:35 +0000 (21:52 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

7 years agoMake sure only {exit, normal} is not catched when executing a hook
Evgeniy Khramtsov [Mon, 23 Jan 2017 18:52:25 +0000 (21:52 +0300)]
Make sure only {exit, normal} is not catched when executing a hook

7 years agoAdapt to new ejabberd_sm changes
PaweÅ\82 Chmielowski [Mon, 23 Jan 2017 18:34:22 +0000 (19:34 +0100)]
Adapt to new ejabberd_sm changes

7 years agoCompatibility with R17 in mod_block_strangers
Alexey Shchepin [Mon, 23 Jan 2017 16:04:22 +0000 (19:04 +0300)]
Compatibility with R17 in mod_block_strangers

7 years agoCheck message subject in mod_block_strangers
Alexey Shchepin [Mon, 23 Jan 2017 14:10:28 +0000 (17:10 +0300)]
Check message subject in mod_block_strangers

7 years agoUpdate deps in mix.lock
Christophe Romain [Mon, 23 Jan 2017 13:42:52 +0000 (14:42 +0100)]
Update deps in mix.lock

7 years agoAvoid using maps:get/2 to keep compatibility with OTP 17.5
Evgeniy Khramtsov [Mon, 23 Jan 2017 13:30:16 +0000 (16:30 +0300)]
Avoid using maps:get/2 to keep compatibility with OTP 17.5

7 years agoFix calling to mod_offline:store_packet
Evgeniy Khramtsov [Mon, 23 Jan 2017 12:00:46 +0000 (15:00 +0300)]
Fix calling to mod_offline:store_packet

7 years agoDon't use maps:take it available in R19 only
Paweł Chmielowski [Mon, 23 Jan 2017 11:56:08 +0000 (12:56 +0100)]
Don't use maps:take it available in R19 only

7 years agoAdd tool for checking which dependences need update
Paweł Chmielowski [Mon, 23 Jan 2017 11:24:15 +0000 (12:24 +0100)]
Add tool for checking which dependences need update

7 years agoMake test suite working again
Evgeniy Khramtsov [Mon, 23 Jan 2017 10:51:05 +0000 (13:51 +0300)]
Make test suite working again

7 years agoMake a message is not bounced if it's archived
Evgeniy Khramtsov [Sat, 21 Jan 2017 10:47:47 +0000 (13:47 +0300)]
Make a message is not bounced if it's archived

7 years agoArchive message before delivering it to offline storage (#1348)
Evgeniy Khramtsov [Sat, 21 Jan 2017 08:47:04 +0000 (11:47 +0300)]
Archive message before delivering it to offline storage (#1348)

7 years agoSend <compressed/> in correct order
Evgeniy Khramtsov [Sat, 21 Jan 2017 07:47:55 +0000 (10:47 +0300)]
Send <compressed/> in correct order

7 years agoMerge pull request #1478 from weiss/multi-host-pubsub-cache
Evgeny Khramtsov [Sat, 21 Jan 2017 07:17:06 +0000 (11:17 +0400)]
Merge pull request #1478 from weiss/multi-host-pubsub-cache

mod_pubsub: Fix last item cache for multiple hosts

7 years agomod_pubsub: Fix last item cache for multiple hosts
Holger Weiss [Fri, 20 Jan 2017 23:14:56 +0000 (00:14 +0100)]
mod_pubsub: Fix last item cache for multiple hosts

Don't let the last item cache intermix PubSub items of different virtual
domains.

7 years agoAdd stanza-id to every archived message (#1477)
Evgeniy Khramtsov [Fri, 20 Jan 2017 20:21:06 +0000 (23:21 +0300)]
Add stanza-id to every archived message (#1477)

7 years agoUpdate copyright headers in new files
Evgeniy Khramtsov [Fri, 20 Jan 2017 16:56:19 +0000 (19:56 +0300)]
Update copyright headers in new files

7 years agoMerge branch 'new_stream'
Evgeniy Khramtsov [Fri, 20 Jan 2017 16:35:46 +0000 (19:35 +0300)]
Merge branch 'new_stream'

Conflicts:
src/cyrsasl.erl
src/ejabberd_c2s.erl
src/ejabberd_cluster.erl
src/ejabberd_frontend_socket.erl
src/ejabberd_node_groups.erl
src/ejabberd_router.erl
src/mod_bosh.erl
src/mod_ip_blacklist.erl
src/mod_muc_mnesia.erl
src/mod_offline.erl
src/mod_proxy65_sm.erl

7 years agoPrepare 17.01 for hex.pm 17.01
Christophe Romain [Fri, 20 Jan 2017 11:19:55 +0000 (12:19 +0100)]
Prepare 17.01 for hex.pm

7 years agoUse xmpp 1.1.6
Christophe Romain [Fri, 20 Jan 2017 10:51:56 +0000 (11:51 +0100)]
Use xmpp 1.1.6