]> granicus.if.org Git - ejabberd/log
ejabberd
7 years agomod_offline: Always ignore groupchat messages
Holger Weiss [Sat, 2 Dec 2017 20:35:09 +0000 (21:35 +0100)]
mod_offline: Always ignore groupchat messages

7 years agoSet executable permission on mac_listener when installing (#2138)
nosnilmot [Fri, 1 Dec 2017 16:28:31 +0000 (16:28 +0000)]
Set executable permission on mac_listener when installing (#2138)

7 years agomod_muc_room: Include 110 status on shutdown
Holger Weiss [Thu, 30 Nov 2017 22:58:01 +0000 (23:58 +0100)]
mod_muc_room: Include 110 status on shutdown

Add the 110 status code to the presence unavailable stanzas sent to room
occupants on system shutdown.

7 years agomod_mam: Never store MUC messages in user archives
Holger Weiss [Thu, 30 Nov 2017 21:15:33 +0000 (22:15 +0100)]
mod_mam: Never store MUC messages in user archives

Even if a groupchat message is tagged with a <store/> hint, don't store
it in a user archive.  The hint should only be honored by the MUC
archive.

7 years agoWindows does not have /tmp, fallback to /home/chris/conf
Christophe Romain [Thu, 30 Nov 2017 14:32:09 +0000 (15:32 +0100)]
Windows does not have /tmp, fallback to /home/chris/conf

7 years agoFix num_subscribers on node metadata (#2122)
Christophe Romain [Thu, 30 Nov 2017 14:27:34 +0000 (15:27 +0100)]
Fix num_subscribers on node metadata (#2122)

7 years agoFix session table cleanup
Alexey Shchepin [Thu, 30 Nov 2017 10:31:23 +0000 (13:31 +0300)]
Fix session table cleanup

7 years agoAdd missed server_host column in pg.new.sql
Alexey Shchepin [Thu, 30 Nov 2017 10:08:04 +0000 (13:08 +0300)]
Add missed server_host column in pg.new.sql

7 years agoMerge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Mon, 27 Nov 2017 10:09:53 +0000 (13:09 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

7 years agoAdapt test to changed error
Paweł Chmielowski [Mon, 27 Nov 2017 10:12:46 +0000 (11:12 +0100)]
Adapt test to changed error

7 years agoImprove muc#roominfo and muc#roomconfig forms
Evgeniy Khramtsov [Mon, 27 Nov 2017 10:07:10 +0000 (13:07 +0300)]
Improve muc#roominfo and muc#roomconfig forms

Now 'muc#roominfo_contactjid' and 'muc#roominfo_pubsub' fields
are returned within muc#roominfo form. Also, both 'muc#roominfo_pubsub'
and 'muc#roomconfig_pubsub' are now validated.

7 years agoIntroduce option 'ca_file'
Evgeniy Khramtsov [Sun, 26 Nov 2017 15:10:25 +0000 (18:10 +0300)]
Introduce option 'ca_file'

The option is supposed to be used as a fallback for certificates
validation. For instance, the option will be used if 's2s_cafile'
option is not set. The value should be a path to a file containing
CA certificate(s) in PEM format, e.g.:

ca_file: "/etc/ssl/certs/ca-bundle.pem"

7 years agoDon't crash on unexpected XML events
Evgeniy Khramtsov [Fri, 24 Nov 2017 16:38:20 +0000 (19:38 +0300)]
Don't crash on unexpected XML events

In fact, seems like this is a problem in the receiver code
(or fast_xml?) and should be fixed there

7 years agoFix minor typo in comment
Christophe Romain [Fri, 24 Nov 2017 16:17:48 +0000 (17:17 +0100)]
Fix minor typo in comment

7 years agoGet rid of unused variable compile warning
Evgeniy Khramtsov [Fri, 24 Nov 2017 09:11:01 +0000 (12:11 +0300)]
Get rid of unused variable compile warning

7 years agoFix function clause on filelib:wildcard/1
Evgeniy Khramtsov [Fri, 24 Nov 2017 09:10:03 +0000 (12:10 +0300)]
Fix function clause on filelib:wildcard/1

7 years agoFix SQL serialization
Evgeniy Khramtsov [Fri, 24 Nov 2017 06:45:22 +0000 (09:45 +0300)]
Fix SQL serialization

The regression is introduced in 11829906ac5a3145b862bd1bc55a088c1ad4fafb
Fixes #2121

7 years agoAdd Id attribute in stanza built by send_message command
Badlop [Thu, 23 Nov 2017 16:14:39 +0000 (17:14 +0100)]
Add Id attribute in stanza built by send_message command

7 years agoUse ejabberd_pkix API in mod_sip
Evgeniy Khramtsov [Thu, 23 Nov 2017 08:09:40 +0000 (11:09 +0300)]
Use ejabberd_pkix API in mod_sip

7 years agoMove 'certfile' based options in a single place
Evgeniy Khramtsov [Thu, 23 Nov 2017 08:04:47 +0000 (11:04 +0300)]
Move 'certfile' based options in a single place

7 years agoGet rid of meaningless log message
Evgeniy Khramtsov [Wed, 22 Nov 2017 07:12:49 +0000 (10:12 +0300)]
Get rid of meaningless log message

7 years agoFix a bug introduced in the previous commit in ejabberd_sql_pt 17.11
Alexey Shchepin [Mon, 20 Nov 2017 12:13:26 +0000 (15:13 +0300)]
Fix a bug introduced in the previous commit in ejabberd_sql_pt

7 years agoUpdate URL to IM Observatory
Evgeniy Khramtsov [Mon, 20 Nov 2017 12:07:06 +0000 (15:07 +0300)]
Update URL to IM Observatory

7 years agoAdd notes about s2s_cafile
Evgeniy Khramtsov [Mon, 20 Nov 2017 12:02:24 +0000 (15:02 +0300)]
Add notes about s2s_cafile

7 years agoFix filtering of rebar list-deps
Paweł Chmielowski [Mon, 20 Nov 2017 11:51:19 +0000 (12:51 +0100)]
Fix filtering of rebar list-deps

7 years agoModernize the example config a bit
Evgeniy Khramtsov [Mon, 20 Nov 2017 10:34:16 +0000 (13:34 +0300)]
Modernize the example config a bit

7 years agoUpdate deps
Paweł Chmielowski [Mon, 20 Nov 2017 09:42:05 +0000 (10:42 +0100)]
Update deps

7 years agoMake update-deps-releases.pl work with older perl
Paweł Chmielowski [Mon, 20 Nov 2017 09:41:52 +0000 (10:41 +0100)]
Make update-deps-releases.pl work with older perl

7 years agoChange file mode of ACME certficates
Evgeniy Khramtsov [Sun, 19 Nov 2017 07:10:21 +0000 (10:10 +0300)]
Change file mode of ACME certficates

7 years agoRe-read ACME certificates on config reload
Evgeniy Khramtsov [Sun, 19 Nov 2017 06:56:05 +0000 (09:56 +0300)]
Re-read ACME certificates on config reload

7 years agoFix renew_certificates ejabberdctl command
Evgeniy Khramtsov [Fri, 17 Nov 2017 15:37:49 +0000 (18:37 +0300)]
Fix renew_certificates ejabberdctl command

Thanks to Konstantinos Kallas

7 years agoLog a message when a user gets registered
Evgeniy Khramtsov [Fri, 17 Nov 2017 15:02:12 +0000 (18:02 +0300)]
Log a message when a user gets registered

7 years agoDon't forget to include intermediate ACME certificate
Evgeniy Khramtsov [Fri, 17 Nov 2017 14:17:19 +0000 (17:17 +0300)]
Don't forget to include intermediate ACME certificate

Thanks to Konstantinos Kallas

7 years agoFix ACME options validation
Evgeniy Khramtsov [Fri, 17 Nov 2017 12:55:33 +0000 (15:55 +0300)]
Fix ACME options validation

7 years agoPrepare user and host arguments in get_user_rooms command (#2064)
Badlop [Fri, 17 Nov 2017 12:23:27 +0000 (13:23 +0100)]
Prepare user and host arguments in get_user_rooms command (#2064)

7 years agoFix elixir tests
Paweł Chmielowski [Fri, 17 Nov 2017 11:18:23 +0000 (12:18 +0100)]
Fix elixir tests

7 years agoImprove ACME options validation
Evgeniy Khramtsov [Fri, 17 Nov 2017 10:06:04 +0000 (13:06 +0300)]
Improve ACME options validation

7 years agoMerge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Fri, 17 Nov 2017 09:50:38 +0000 (12:50 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

7 years agoSwitch riak backend to leveldb on travis
Paweł Chmielowski [Fri, 17 Nov 2017 09:54:28 +0000 (10:54 +0100)]
Switch riak backend to leveldb on travis

7 years agoMove ejabberdctl ACME commands to other location
Evgeniy Khramtsov [Fri, 17 Nov 2017 09:50:27 +0000 (12:50 +0300)]
Move ejabberdctl ACME commands to other location

7 years agoMake ACME code working with ejabberd_pkix
Evgeniy Khramtsov [Fri, 17 Nov 2017 08:59:40 +0000 (11:59 +0300)]
Make ACME code working with ejabberd_pkix

7 years agoFix sed invocation that was incompatible with FreeBSD sed
Paweł Chmielowski [Fri, 17 Nov 2017 08:50:10 +0000 (09:50 +0100)]
Fix sed invocation that was incompatible with FreeBSD sed

7 years agoPubSub: PEP services must send notifications to the account owner (#2108)
Christophe Romain [Thu, 16 Nov 2017 14:31:28 +0000 (15:31 +0100)]
PubSub: PEP services must send notifications to the account owner (#2108)

7 years agoAllow writing custom modules in own path (#1327)
Christophe Romain [Thu, 16 Nov 2017 13:48:47 +0000 (14:48 +0100)]
Allow writing custom modules in own path (#1327)

in ejabberdctl, just add this to EJABBERD_OPTS
external_beams /path/to/my/beams

then all beams file /path/to/my/beams/*.beam will be known
by ejabberd_config, and allowed to be loaded.

7 years agoPubSub: Cleanup tree requests, rename pubsub_node.type->pubsub_node.plugin
Christophe Romain [Thu, 16 Nov 2017 10:38:04 +0000 (11:38 +0100)]
PubSub: Cleanup tree requests, rename pubsub_node.type->pubsub_node.plugin

7 years agoLet validator know about c2s_dhfile
Evgeniy Khramtsov [Wed, 15 Nov 2017 21:40:36 +0000 (00:40 +0300)]
Let validator know about c2s_dhfile

7 years agoFix select_type race on plugin_init
Christophe Romain [Wed, 15 Nov 2017 18:04:47 +0000 (19:04 +0100)]
Fix select_type race on plugin_init

7 years agoCleanup pubsub subscriptions quering, fix pep case
Christophe Romain [Wed, 15 Nov 2017 10:16:15 +0000 (11:16 +0100)]
Cleanup pubsub subscriptions quering, fix pep case

7 years agoImprove ACME description
Evgeniy Khramtsov [Wed, 15 Nov 2017 09:57:53 +0000 (12:57 +0300)]
Improve ACME description

7 years agoImprove some error log messages
Evgeniy Khramtsov [Wed, 15 Nov 2017 08:54:38 +0000 (11:54 +0300)]
Improve some error log messages

7 years agoFix mod_mam reloading
Evgeniy Khramtsov [Wed, 15 Nov 2017 08:23:22 +0000 (11:23 +0300)]
Fix mod_mam reloading

7 years agoAvoid badarg error when running get-deps before ./configure has created src/ejabberd...
nosnilmot [Wed, 15 Nov 2017 08:21:05 +0000 (08:21 +0000)]
Avoid badarg error when running get-deps before ./configure has created src/ejabberd.app (#2103)

7 years agoMakefile.in: Fix "make clean && make"
Holger Weiss [Wed, 15 Nov 2017 07:50:40 +0000 (08:50 +0100)]
Makefile.in: Fix "make clean && make"

7 years agoMerge branch 'lets_encrypt_acme_support' of git://github.com/angelhof/ejabberd into...
Evgeniy Khramtsov [Wed, 15 Nov 2017 07:01:30 +0000 (10:01 +0300)]
Merge branch 'lets_encrypt_acme_support' of git://github.com/angelhof/ejabberd into angelhof-lets_encrypt_acme_support

Conflicts:
rebar.config
src/ejabberd_pkix.erl

7 years agomod_stream_mgmt: Improve logging on timeout
Holger Weiss [Wed, 15 Nov 2017 00:11:37 +0000 (01:11 +0100)]
mod_stream_mgmt: Improve logging on timeout

Produce a better error message if a pending stream management session
times out.

7 years agomod_mam: Simplify 'message_is_archived' callback
Holger Weiss [Tue, 14 Nov 2017 23:36:07 +0000 (00:36 +0100)]
mod_mam: Simplify 'message_is_archived' callback

7 years agomod_mam: Improve handling of forked messages
Holger Weiss [Tue, 14 Nov 2017 23:30:38 +0000 (00:30 +0100)]
mod_mam: Improve handling of forked messages

Make sure a message that was forked in ejabberd_sm will really only be
tagged with a stanza ID if (another copy of) it was stored in MAM.

7 years agoAnnounce support for stanza IDs
Holger Weiss [Tue, 14 Nov 2017 23:18:25 +0000 (00:18 +0100)]
Announce support for stanza IDs

Announce the namespace for stanza IDs as per XEP-0359 v0.5.0.

7 years agomod_mam: Add a few function specifications
Holger Weiss [Tue, 14 Nov 2017 21:58:16 +0000 (22:58 +0100)]
mod_mam: Add a few function specifications

7 years agomod_mam: Apply minor cosmetic changes
Holger Weiss [Tue, 14 Nov 2017 21:36:46 +0000 (22:36 +0100)]
mod_mam: Apply minor cosmetic changes

7 years agomod_mam: Don't store from 'sm_receive_packet' hook
Holger Weiss [Tue, 14 Nov 2017 21:02:48 +0000 (22:02 +0100)]
mod_mam: Don't store from 'sm_receive_packet' hook

Let mod_mam use the 'sm_receive_packet' hook to generate stanza IDs for
incoming messages, but not to actually store them.  The latter would
require additional changes to make sure modules such as mod_privacy and
mod_block_strangers continue to affect MAM.

7 years agoHalt ejabberd if the top supervisor fails to start
Evgeniy Khramtsov [Tue, 14 Nov 2017 15:41:28 +0000 (18:41 +0300)]
Halt ejabberd if the top supervisor fails to start

7 years agoExplain what is needed for the acme configuration and other small changes
Konstantinos Kallas [Tue, 14 Nov 2017 12:12:33 +0000 (14:12 +0200)]
Explain what is needed for the acme configuration and other small changes
1. Add a request handler in ejabberd_http and explain how to configure the http listener so that the challenges can be solved.
2. Make acme configuration optional by providing defaults in ejabberd_acme.
3. Save the CA that the account has been created in so that it creates a new account when connecting to a new CA.
4. Small spec change in acme configuration.

7 years agoUse xmpp:io_format_error/1 wherever possible
Evgeniy Khramtsov [Tue, 14 Nov 2017 06:02:43 +0000 (09:02 +0300)]
Use xmpp:io_format_error/1 wherever possible

7 years agoImplement parentnodes seek for hometree (#1921)
Christophe Romain [Mon, 13 Nov 2017 17:13:31 +0000 (18:13 +0100)]
Implement parentnodes seek for hometree (#1921)

7 years agoRewrite pubsub export to sql (#1571)
Christophe Romain [Mon, 13 Nov 2017 16:34:37 +0000 (17:34 +0100)]
Rewrite pubsub export to sql (#1571)

7 years agoAssign failed_auth ETS table to another owner
Evgeniy Khramtsov [Mon, 13 Nov 2017 11:34:59 +0000 (14:34 +0300)]
Assign failed_auth ETS table to another owner

7 years agoFix a record default
Evgeniy Khramtsov [Mon, 13 Nov 2017 08:29:03 +0000 (11:29 +0300)]
Fix a record default

7 years agoGet rid of forgotten debug message
Evgeniy Khramtsov [Mon, 13 Nov 2017 08:26:49 +0000 (11:26 +0300)]
Get rid of forgotten debug message

7 years agoProperly store <subject/> element
Evgeniy Khramtsov [Mon, 13 Nov 2017 08:25:35 +0000 (11:25 +0300)]
Properly store <subject/> element

Fixes #2099

7 years agoConfiguration file changes
Konstantinos Kallas [Sat, 11 Nov 2017 13:38:47 +0000 (15:38 +0200)]
Configuration file changes
Explain the acme configuration options

7 years agoImprove some type specs
Evgeniy Khramtsov [Sat, 11 Nov 2017 06:33:42 +0000 (09:33 +0300)]
Improve some type specs

7 years agoImprove a diagnostic text
Evgeniy Khramtsov [Sat, 11 Nov 2017 06:30:19 +0000 (09:30 +0300)]
Improve a diagnostic text

7 years agoFix a test related to mod_caps
Evgeniy Khramtsov [Fri, 10 Nov 2017 17:58:13 +0000 (20:58 +0300)]
Fix a test related to mod_caps

7 years agomod_mam: Make sure archived message isn't bounced
Holger Weiss [Fri, 10 Nov 2017 17:09:33 +0000 (18:09 +0100)]
mod_mam: Make sure archived message isn't bounced

If mod_offline is disabled but a message is archived by mod_mam, no
error bounce should be generated.  This functionality got lost when
mod_mam stopped using the 'offline_message_hook'.

7 years agoCleanup some headers
Christophe Romain [Fri, 10 Nov 2017 16:51:22 +0000 (17:51 +0100)]
Cleanup some headers

7 years agoAdd forgotten type specs
Evgeniy Khramtsov [Fri, 10 Nov 2017 15:11:04 +0000 (18:11 +0300)]
Add forgotten type specs

7 years agoUse new API for IQ routing
Evgeniy Khramtsov [Fri, 10 Nov 2017 15:02:22 +0000 (18:02 +0300)]
Use new API for IQ routing

Functions ejabberd_local:route_iq/2,3 are now depecated:
ejabberd_router:route_iq/2,3,4 should be used instead.

7 years agoMerge pull request #2096 from weiss/always-add-stanza-id
Evgeny Khramtsov [Fri, 10 Nov 2017 05:34:49 +0000 (09:34 +0400)]
Merge pull request #2096 from weiss/always-add-stanza-id

Tag all archived messages with a stanza ID

7 years agomod_push: Avoid notification duplicates (again)
Holger Weiss [Fri, 10 Nov 2017 00:11:24 +0000 (01:11 +0100)]
mod_push: Avoid notification duplicates (again)

Now that mod_mam no longer uses the 'offline_message_hook', avoid
duplicating notifications for messages written to both MAM and offline
storage in another way.

7 years agoAdd fs as dep in mix.exs
Paweł Chmielowski [Thu, 9 Nov 2017 08:59:40 +0000 (09:59 +0100)]
Add fs as dep in mix.exs

7 years agomod_mam: Always strip stanza IDs
Holger Weiss [Thu, 9 Nov 2017 00:10:24 +0000 (01:10 +0100)]
mod_mam: Always strip stanza IDs

XEP-0359 v0.5.0 says: "Stanza ID generating entities, which encounter a
<stanza-id/> element where the 'by' attribute matches the 'by' attribute
they would otherwise set, MUST delete that element even if they are not
adding their own stanza ID."

7 years agomod_mam: Fix indentation
Holger Weiss [Thu, 9 Nov 2017 00:00:15 +0000 (01:00 +0100)]
mod_mam: Fix indentation

7 years agomod_mam: Ignore non-message stanzas earlier
Holger Weiss [Wed, 8 Nov 2017 23:48:19 +0000 (00:48 +0100)]
mod_mam: Ignore non-message stanzas earlier

Let mod_mam's hook callbacks ignore non-message stanzas using pattern
matching.

7 years agomod_mam: Make sure a stanza ID is always added
Holger Weiss [Wed, 8 Nov 2017 23:21:40 +0000 (00:21 +0100)]
mod_mam: Make sure a stanza ID is always added

Let mod_mam store incoming messages from a new hook in ejabberd_sm.
This makes sure all messages are tagged with a stanza ID, including
those that are forked to multiple resources in ejabberd_sm.

Closes #1344.

7 years agoPrepare version 0.6.1 of XEP-0313 (MAM) support
Evgeniy Khramtsov [Wed, 8 Nov 2017 12:15:39 +0000 (15:15 +0300)]
Prepare version 0.6.1 of XEP-0313 (MAM) support

7 years agoejabberdctl: Fix 'read' syntax for non-bash shells
Holger Weiss [Tue, 7 Nov 2017 20:23:48 +0000 (21:23 +0100)]
ejabberdctl: Fix 'read' syntax for non-bash shells

7 years agoErase transient certificates on exit
Evgeniy Khramtsov [Tue, 7 Nov 2017 06:04:20 +0000 (09:04 +0300)]
Erase transient certificates on exit

7 years agoejabberdctl: Fix paths for release build
Holger Weiss [Mon, 6 Nov 2017 20:35:44 +0000 (21:35 +0100)]
ejabberdctl: Fix paths for release build

The ejabberdctl version generated by "make rel" relies on the SCRIPT_DIR
variable which got lost in commit cbe6553baa6f.

7 years agoUnregister commands when stopping node only if it's last one (#2083)
Badlop [Mon, 6 Nov 2017 15:53:49 +0000 (16:53 +0100)]
Unregister commands when stopping node only if it's last one (#2083)

7 years agoDefine flags that depend on erlang version in mix.exs
Paweł Chmielowski [Mon, 6 Nov 2017 10:29:42 +0000 (11:29 +0100)]
Define flags that depend on erlang version in mix.exs

7 years agomod_push: Avoid notification duplicates
Holger Weiss [Sun, 5 Nov 2017 23:26:20 +0000 (00:26 +0100)]
mod_push: Avoid notification duplicates

Don't let mod_mam and mod_offline both trigger push notifications for
the same message.

Closes #2078.

7 years agoRemove code left from debugging
Paweł Chmielowski [Fri, 3 Nov 2017 15:04:19 +0000 (16:04 +0100)]
Remove code left from debugging

7 years agoSimulate vars usage in ejabberd_sql_pt to avoid unused var warnings
Alexey Shchepin [Fri, 3 Nov 2017 14:42:53 +0000 (17:42 +0300)]
Simulate vars usage in ejabberd_sql_pt to avoid unused var warnings

7 years agoDon't start hosts for disabled backends from CT_BACKENDS passed to make test
Paweł Chmielowski [Fri, 3 Nov 2017 13:44:13 +0000 (14:44 +0100)]
Don't start hosts for disabled backends from CT_BACKENDS passed to make test

7 years agoUse correct table field name in sql query
Paweł Chmielowski [Fri, 3 Nov 2017 11:17:34 +0000 (12:17 +0100)]
Use correct table field name in sql query

7 years agoRemember previous German translator
Badlop [Fri, 3 Nov 2017 09:16:21 +0000 (10:16 +0100)]
Remember previous German translator

7 years agoMerge pull request #2081 from nekoswag/master
badlop [Fri, 3 Nov 2017 08:56:19 +0000 (09:56 +0100)]
Merge pull request #2081 from nekoswag/master

updated German translation

7 years agoLog warnings for c2s/s2s certfile option
Evgeniy Khramtsov [Fri, 3 Nov 2017 05:32:34 +0000 (08:32 +0300)]
Log warnings for c2s/s2s certfile option

7 years agoBug Fix
Konstantinos Kallas [Thu, 2 Nov 2017 17:05:12 +0000 (19:05 +0200)]
Bug Fix
The dictionary returned after the directory call contains a meta key
whose value is a JSON dictionary. This is now taken care so that only
bitstring values are kept as resource URIs