]> granicus.if.org Git - ejabberd/log
ejabberd
6 years agoFormat list of {{name,string}, {value, _}} as json struct name/val
Paweł Chmielowski [Mon, 3 Dec 2018 12:52:53 +0000 (13:52 +0100)]
Format list of {{name,string}, {value, _}} as json struct name/val

6 years agoMake mod_http_api assume that missing args of type list are empty list
Paweł Chmielowski [Mon, 3 Dec 2018 12:52:04 +0000 (13:52 +0100)]
Make mod_http_api assume that missing args of type list are empty list

6 years agoKeep info about carbons inside session table
Evgeny Khramtsov [Sat, 1 Dec 2018 10:33:44 +0000 (13:33 +0300)]
Keep info about carbons inside session table

Accordingly, Mnesia/SQL/Riak table 'carboncopy' is not used anymore
and can be safely removed.

As a consequence, the commit deprecates the following options of
mod_carboncopy:
- ram_db_type
- use_cache
- cache_size
- cache_missed
- cache_life_time

Fixes #2663

6 years agoejabberd_s2s_in: Check for subdomain configuration
Holger Weiss [Sat, 1 Dec 2018 09:14:04 +0000 (10:14 +0100)]
ejabberd_s2s_in: Check for subdomain configuration

If an incoming s2s connection to a subdomain such as
conference.example.com is accepted, check for host-specific
configuration settings for that subdomain rather than for example.com.
This is for consistency with ejabberd_s2s_out, and with my previous
commit.

6 years agoejabberd_s2s_in: Check for subdomain certificate
Holger Weiss [Sat, 1 Dec 2018 09:08:28 +0000 (10:08 +0100)]
ejabberd_s2s_in: Check for subdomain certificate

If an incoming s2s connection to a subdomain such as
conference.example.com is accepted and a separate certificate is
available for that subdomain, offer that certificate instead of the one
for example.com.

Thanks to Mike Kuketz for reporting the bug.

6 years agomod_register: Don't advertise IBR unconditionally
Holger Weiss [Sat, 1 Dec 2018 06:21:41 +0000 (07:21 +0100)]
mod_register: Don't advertise IBR unconditionally

Don't advertise the IBR stream feature if registration is disabled in
the configuration.

6 years agoApply new cache options on mod_stream_mgmt reload
Evgeny Khramtsov [Fri, 30 Nov 2018 15:12:27 +0000 (18:12 +0300)]
Apply new cache options on mod_stream_mgmt reload

6 years agoKeep last handled stanzas number in cache rather than session table
Evgeny Khramtsov [Fri, 30 Nov 2018 13:18:49 +0000 (16:18 +0300)]
Keep last handled stanzas number in cache rather than session table

6 years agoNew command unban_ip (#2620)
Badlop [Fri, 30 Nov 2018 12:33:39 +0000 (13:33 +0100)]
New command unban_ip (#2620)

6 years agoUpdate deps
Paweł Chmielowski [Thu, 29 Nov 2018 12:49:17 +0000 (13:49 +0100)]
Update deps

6 years agoDrop some macros related to OTP<19
Evgeny Khramtsov [Thu, 29 Nov 2018 10:01:00 +0000 (13:01 +0300)]
Drop some macros related to OTP<19

6 years agoImplement XEP-0410: MUC Self-Ping optimization
Evgeny Khramtsov [Thu, 29 Nov 2018 09:16:12 +0000 (12:16 +0300)]
Implement XEP-0410: MUC Self-Ping optimization

Fixes #2630

6 years agoAdvertise disco#info and disco#items by MUC room
Evgeny Khramtsov [Thu, 29 Nov 2018 07:35:03 +0000 (10:35 +0300)]
Advertise disco#info and disco#items by MUC room

Fixes #2661

6 years agoAdd xml compression to sql backend of mam
Paweł Chmielowski [Wed, 28 Nov 2018 10:25:04 +0000 (11:25 +0100)]
Add xml compression to sql backend of mam

6 years agoAdd specific Var names to CAPTCHA fallback form fields (#2672)
Badlop [Mon, 12 Nov 2018 16:07:35 +0000 (17:07 +0100)]
Add specific Var names to CAPTCHA fallback form fields (#2672)

6 years agoRevert "Upgrade Elixir to 1.6.6 (#2653)"
Christophe Romain [Tue, 27 Nov 2018 10:01:52 +0000 (11:01 +0100)]
Revert "Upgrade Elixir to 1.6.6 (#2653)"

This reverts commit d3a9fbf62f1e505371a55629485d6c64e973733c.
rebar2 (which is still used) is not able to cope with this change
it should check lib/elixir/src/elixir.app.src instead of src/elixir.app.src
as src/elixir.app.src moved away, currently check fails and this breaks
jenkins tests.

options: use rebar3, or drop rebar completely to rely only on mix.

6 years agoUpgrade Elixir to 1.6.6 (#2653)
Christophe Romain [Tue, 27 Nov 2018 08:57:59 +0000 (09:57 +0100)]
Upgrade Elixir to 1.6.6 (#2653)

6 years agoMerge branch 'master' of github.com:processone/ejabberd
Evgeny Khramtsov [Fri, 23 Nov 2018 13:25:02 +0000 (16:25 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

6 years agoImprove tests for mod_private
Evgeny Khramtsov [Fri, 23 Nov 2018 13:24:44 +0000 (16:24 +0300)]
Improve tests for mod_private

6 years agoFix typo in recent PR commit (#2697)
Badlop [Fri, 23 Nov 2018 12:21:17 +0000 (13:21 +0100)]
Fix typo in recent PR commit (#2697)

6 years agoBump lager version in mix as well
Christophe Romain [Fri, 23 Nov 2018 11:59:51 +0000 (12:59 +0100)]
Bump lager version in mix as well

6 years agoMerge pull request #2697 from Snowmanko/master
badlop [Fri, 23 Nov 2018 11:55:44 +0000 (12:55 +0100)]
Merge pull request #2697 from Snowmanko/master

Update - fixed ejabberdctl push_roster description

6 years agoFix test case for invalid language
Evgeny Khramtsov [Fri, 23 Nov 2018 11:11:14 +0000 (14:11 +0300)]
Fix test case for invalid language

6 years agoOnly advertise conversion feature when mod_pubsub is loaded
Evgeny Khramtsov [Fri, 23 Nov 2018 11:01:06 +0000 (14:01 +0300)]
Only advertise conversion feature when mod_pubsub is loaded

6 years agoBump lager version
Evgeny Khramtsov [Fri, 23 Nov 2018 10:34:21 +0000 (13:34 +0300)]
Bump lager version

6 years agoSupport for XEP-0411: Bookmarks Conversion
Evgeny Khramtsov [Fri, 23 Nov 2018 10:33:29 +0000 (13:33 +0300)]
Support for XEP-0411: Bookmarks Conversion

6 years agoMerge pull request #2690 from nosnilmot/stopping-hook
Evgeny Khramtsov [Thu, 22 Nov 2018 20:21:45 +0000 (23:21 +0300)]
Merge pull request #2690 from nosnilmot/stopping-hook

Add ejabberd_stopping hook

6 years agoUpdate - fixed ejabberdctl push_roster description
Snowman [Thu, 22 Nov 2018 15:32:05 +0000 (16:32 +0100)]
Update - fixed ejabberdctl push_roster description

6 years agoRelax result matching to fix pgsql keepalive (#2632)
Christophe Romain [Wed, 21 Nov 2018 17:06:32 +0000 (18:06 +0100)]
Relax result matching to fix pgsql keepalive (#2632)

6 years agoRemove unused link
Mickael Remond [Wed, 21 Nov 2018 10:54:02 +0000 (11:54 +0100)]
Remove unused link

6 years agoAdd ejabberd_stopping hook
Stu Tomlinson [Mon, 19 Nov 2018 15:11:33 +0000 (15:11 +0000)]
Add ejabberd_stopping hook

This hook allows modules to detect when ejabberd is stopping and adjust
behaviour if desired

6 years agoCONTRIBUTORS: UTF-8 encode my name
Holger Weiss [Mon, 19 Nov 2018 14:23:35 +0000 (15:23 +0100)]
CONTRIBUTORS: UTF-8 encode my name

6 years agoUse never version of meck
Paweł Chmielowski [Mon, 19 Nov 2018 13:15:29 +0000 (14:15 +0100)]
Use never version of meck

6 years agoAnother attempt for db access on travis
Paweł Chmielowski [Mon, 19 Nov 2018 12:53:06 +0000 (13:53 +0100)]
Another attempt for db access on travis

6 years agoThird time's the charm? Let load scheme before changing permissions
Paweł Chmielowski [Mon, 19 Nov 2018 12:16:51 +0000 (13:16 +0100)]
Third time's the charm? Let load scheme before changing permissions

6 years agoUpdate CONTRIBUTING.md
Mickaël Rémond [Mon, 19 Nov 2018 12:12:35 +0000 (13:12 +0100)]
Update CONTRIBUTING.md

6 years agoFix command for loading pgsql schema
Paweł Chmielowski [Mon, 19 Nov 2018 11:58:45 +0000 (12:58 +0100)]
Fix command for loading pgsql schema

6 years agoTry to load db schemas externally on travis
Paweł Chmielowski [Mon, 19 Nov 2018 11:49:29 +0000 (12:49 +0100)]
Try to load db schemas externally on travis

6 years agoThank you, contributors
Mickael Remond [Mon, 19 Nov 2018 10:38:44 +0000 (11:38 +0100)]
Thank you, contributors

6 years agoExpand contribution document
Mickaël Rémond [Mon, 19 Nov 2018 10:17:08 +0000 (11:17 +0100)]
Expand contribution document

6 years agoInitial contributing document
Mickaël Rémond [Mon, 19 Nov 2018 10:03:10 +0000 (11:03 +0100)]
Initial contributing document

6 years agoMerge branch 'master' of github.com:processone/ejabberd
Mickael Remond [Mon, 19 Nov 2018 09:40:05 +0000 (10:40 +0100)]
Merge branch 'master' of github.com:processone/ejabberd

6 years agoMarkdown version is the main README version
Mickael Remond [Mon, 19 Nov 2018 09:39:54 +0000 (10:39 +0100)]
Markdown version is the main README version

6 years agoUpdate issue templates
Mickaël Rémond [Mon, 19 Nov 2018 09:37:04 +0000 (10:37 +0100)]
Update issue templates

6 years agoUse new naming for Github issue templates
Mickael Remond [Mon, 19 Nov 2018 09:35:07 +0000 (10:35 +0100)]
Use new naming for Github issue templates

6 years agoHandle some malformed URL requests in ejabberd_http (#2687)
Badlop [Fri, 16 Nov 2018 10:43:11 +0000 (11:43 +0100)]
Handle some malformed URL requests in ejabberd_http (#2687)

6 years agoGet rid of 'catch-all' statements
Evgeny Khramtsov [Thu, 15 Nov 2018 12:07:58 +0000 (15:07 +0300)]
Get rid of 'catch-all' statements

6 years agoReplace dict with maps
Evgeny Khramtsov [Thu, 15 Nov 2018 11:13:45 +0000 (14:13 +0300)]
Replace dict with maps

This will improve performance and memory consumptions of large MUCs

6 years agoMerge pull request #2683 from paulmenzel/use-https-url-in-readme
badlop [Tue, 13 Nov 2018 09:30:09 +0000 (10:30 +0100)]
Merge pull request #2683 from paulmenzel/use-https-url-in-readme

Use HTTPS URL for docs.ejabberd.im in `README`

6 years agoREADME: Use HTTPS URL for docs.ejabberd.im
Paul Menzel [Mon, 12 Nov 2018 14:30:22 +0000 (15:30 +0100)]
README: Use HTTPS URL for docs.ejabberd.im

Directly use the HTTPS URL.

    $ curl -I http://docs.ejabberd.im
    HTTP/1.1 301 Moved Permanently
    Server: Cowboy
    Connection: keep-alive
    Location: https://docs.ejabberd.im/
    Date: Mon, 12 Nov 2018 14:31:07 GMT
    Content-Type: text/plain; charset=utf-8
    Via: 1.1 vegur

    $ curl -I https://docs.ejabberd.im
    HTTP/1.1 200 OK
    Server: Cowboy
    Connection: keep-alive
    Set-Cookie: main-session=MTU0MjAzMzA1NnxOd3dBTkZWWVNrbEVRVkUwUVZvM1JGcEtTakpKTTA1RlYxQk1TelZKTmxkUlNGRk5Sa0ZVV0VSS1dVNHpSMDh6VEUxSVJFTkRVMEU9fHnVvedfnvRp4MtnGBKYfXIDSBTPilUvIp6Kz559FNKg; Path=/; Expires=Mon, 12 Nov 2018 22:30:56 GMT; Max-Age=28800; HttpOnly
    Date: Mon, 12 Nov 2018 14:30:56 GMT
    Content-Type: text/html; charset=utf-8
    Via: 1.1 vegur

6 years agoRemove references in configs to http_poll; it was removed in ba69c469b551
Badlop [Mon, 12 Nov 2018 13:26:00 +0000 (14:26 +0100)]
Remove references in configs to http_poll; it was removed in ba69c469b551

6 years agoDon't suppress notifications on PEP node removal
Holger Weiss [Mon, 12 Nov 2018 11:54:53 +0000 (12:54 +0100)]
Don't suppress notifications on PEP node removal

Send node deletion notifications (as per XEP-0060, #8.4.2) also for PEP
nodes.

6 years agoFix mod_http_apt_test
Paweł Chmielowski [Fri, 9 Nov 2018 13:55:19 +0000 (14:55 +0100)]
Fix mod_http_apt_test

6 years agoRecover logging of user joining room, lost in 32de9a56 (thanks to elexis1)
Badlop [Fri, 9 Nov 2018 12:21:35 +0000 (13:21 +0100)]
Recover logging of user joining room, lost in 32de9a56 (thanks to elexis1)

6 years agoFix for the previous commit
Alexey Shchepin [Fri, 9 Nov 2018 11:18:48 +0000 (14:18 +0300)]
Fix for the previous commit

6 years agoTrack presences sent via a multicast service
Alexey Shchepin [Fri, 9 Nov 2018 00:27:24 +0000 (03:27 +0300)]
Track presences sent via a multicast service

6 years agoMerge remote-tracking branch 'processone/pr/2675'
Holger Weiss [Wed, 7 Nov 2018 11:51:32 +0000 (12:51 +0100)]
Merge remote-tracking branch 'processone/pr/2675'

* processone/pr/2675:
  Fix another typo in ejabberd.yml
  Fix tiny typo in configuration file

6 years agoFix another typo in ejabberd.yml
Ave [Wed, 7 Nov 2018 11:44:27 +0000 (14:44 +0300)]
Fix another typo in ejabberd.yml

6 years agoFix tiny typo in configuration file
Ave [Wed, 7 Nov 2018 11:41:16 +0000 (14:41 +0300)]
Fix tiny typo in configuration file

6 years agoFix unused variable warning
Badlop [Mon, 5 Nov 2018 23:08:45 +0000 (00:08 +0100)]
Fix unused variable warning

6 years agoLocal stanzas are routed one by one, not by multicast
Badlop [Mon, 5 Nov 2018 23:07:34 +0000 (00:07 +0100)]
Local stanzas are routed one by one, not by multicast

6 years agoMerge pull request #2655 from hamano/missing_redis_sm.lua
badlop [Wed, 31 Oct 2018 10:54:43 +0000 (11:54 +0100)]
Merge pull request #2655 from hamano/missing_redis_sm.lua

missing priv/lua/redis_sm.lua

6 years agoejabberd_logger: Disable debug logging properly
Holger Weiss [Wed, 31 Oct 2018 01:42:54 +0000 (02:42 +0100)]
ejabberd_logger: Disable debug logging properly

Don't forget to disable xmpp's debug logging when reducing the log level
from 5 to a lower value.

6 years agoDon't preprocess arguments, format_args verifies and prepares them (#2629)
Badlop [Wed, 31 Oct 2018 00:33:07 +0000 (01:33 +0100)]
Don't preprocess arguments, format_args verifies and prepares them (#2629)

6 years agoDon't hide result of mod_*:set_* calls
Badlop [Tue, 30 Oct 2018 22:07:30 +0000 (23:07 +0100)]
Don't hide result of mod_*:set_* calls

6 years agoAdd send_ws_ping to c2s
Paweł Chmielowski [Mon, 29 Oct 2018 10:57:45 +0000 (11:57 +0100)]
Add send_ws_ping to c2s

6 years agomissing priv/lua/redis_sm.lua
HAMANO Tsukasa [Mon, 29 Oct 2018 09:25:04 +0000 (18:25 +0900)]
missing priv/lua/redis_sm.lua

6 years agoMove unwrap_mucsub_message/1 into misc
Holger Weiss [Wed, 24 Oct 2018 23:22:57 +0000 (01:22 +0200)]
Move unwrap_mucsub_message/1 into misc

6 years agoMove some functions from xmpp back into ejabberd
Holger Weiss [Wed, 24 Oct 2018 23:05:45 +0000 (01:05 +0200)]
Move some functions from xmpp back into ejabberd

6 years agoDo no add 127.0.0.1 address to trusted_proxies list by default
Paweł Chmielowski [Wed, 24 Oct 2018 13:16:32 +0000 (15:16 +0200)]
Do no add 127.0.0.1 address to trusted_proxies list by default

6 years agoUse newer fast_tls that fixes some issues with tls1.3
Paweł Chmielowski [Wed, 24 Oct 2018 08:13:05 +0000 (10:13 +0200)]
Use newer fast_tls that fixes some issues with tls1.3

6 years agoUse tagged version of p1_mysql
Paweł Chmielowski [Fri, 19 Oct 2018 08:57:22 +0000 (10:57 +0200)]
Use tagged version of p1_mysql

6 years agoRecognize not_exists error in http_api
Paweł Chmielowski [Fri, 19 Oct 2018 08:30:05 +0000 (10:30 +0200)]
Recognize not_exists error in http_api

6 years agoUpdate p1_mysql
Paweł Chmielowski [Fri, 19 Oct 2018 07:33:26 +0000 (09:33 +0200)]
Update p1_mysql

6 years agoAffiliations other than admin and owner cannot invite to members_only rooms
Badlop [Wed, 17 Oct 2018 10:55:31 +0000 (12:55 +0200)]
Affiliations other than admin and owner cannot invite to members_only rooms

This is explained in the paragraph:
 If the room is members-only, the service MAY also add the invitee to the
 member list. (Note: Invitation privileges in members-only rooms SHOULD be
 restricted to room admins; if a member without privileges to edit the
 member list attempts to invite another user, the service SHOULD return
 a <forbidden/> error to the occupant; for details, see the Modifying the
 Member List section of this document.)
https://xmpp.org/extensions/xep-0045.html#invite-mediated

6 years agoMerge remote-tracking branch 'processone/pr/2636'
Holger Weiss [Tue, 16 Oct 2018 07:53:26 +0000 (09:53 +0200)]
Merge remote-tracking branch 'processone/pr/2636'

* processone/pr/2636:
  Config template recommend "open" access_model

6 years agoConfig template recommend "open" access_model
Licaon_Kter [Mon, 15 Oct 2018 23:15:51 +0000 (23:15 +0000)]
Config template recommend "open" access_model

...instead of "comment out", as many seem to misunderstand what and why should be or not be commented out

6 years agoEnable mod_proxy65 by default
Holger Weiss [Mon, 15 Oct 2018 21:09:52 +0000 (23:09 +0200)]
Enable mod_proxy65 by default

6 years agoejabberd_s2s_in: Fix indentation
Holger Weiss [Mon, 15 Oct 2018 21:03:53 +0000 (23:03 +0200)]
ejabberd_s2s_in: Fix indentation

6 years agoChange logic for archiving mucsub messages
Paweł Chmielowski [Wed, 10 Oct 2018 16:02:45 +0000 (18:02 +0200)]
Change logic for archiving mucsub messages

This change should apply usual logic for message wrapped in mucsub except
check for groupchat message, so messages without bodies for example
should be rejected

6 years agoFix version in mix.exs
Christophe Romain [Tue, 9 Oct 2018 10:23:27 +0000 (12:23 +0200)]
Fix version in mix.exs

6 years agoAdd pkix to included_applications
Paweł Chmielowski [Tue, 9 Oct 2018 09:33:39 +0000 (11:33 +0200)]
Add pkix to included_applications

6 years agoAdd pkix to mix.exs
Paweł Chmielowski [Tue, 9 Oct 2018 08:15:10 +0000 (10:15 +0200)]
Add pkix to mix.exs

6 years agoArchive messages with type=normal and pubsub payload (like mucsub messages)
Paweł Chmielowski [Mon, 8 Oct 2018 13:56:44 +0000 (15:56 +0200)]
Archive messages with type=normal and pubsub payload (like mucsub messages)

6 years agoAvoid using * in 'certfiles' option of default config
Evgeny Khramtsov [Thu, 4 Oct 2018 12:00:43 +0000 (15:00 +0300)]
Avoid using * in 'certfiles' option of default config

6 years agoBump ejabberd version in the issue template
Evgeny Khramtsov [Thu, 4 Oct 2018 11:42:11 +0000 (14:42 +0300)]
Bump ejabberd version in the issue template

6 years agoReport available options in lexical order
Evgeny Khramtsov [Thu, 4 Oct 2018 11:31:41 +0000 (14:31 +0300)]
Report available options in lexical order

6 years agoRun ejabberd_started hook earlier
Evgeny Khramtsov [Sat, 29 Sep 2018 20:06:34 +0000 (23:06 +0300)]
Run ejabberd_started hook earlier

6 years agoAdd forgotten TURN options to validator
Evgeny Khramtsov [Sat, 29 Sep 2018 20:05:41 +0000 (23:05 +0300)]
Add forgotten TURN options to validator

Fixes #2621

6 years agoFix bugs introduced by previous commit
Evgeny Khramtsov [Thu, 27 Sep 2018 21:28:34 +0000 (00:28 +0300)]
Fix bugs introduced by previous commit

6 years agoMove certificates processing code to pkix application
Evgeny Khramtsov [Thu, 27 Sep 2018 17:37:27 +0000 (20:37 +0300)]
Move certificates processing code to pkix application

==== WARNING: MUST BE ADDED TO RELEASE NOTES =====
The commit introduces the following incompatibility:
- Option 'ca_path' is deprecated and has no effect anymore:
  option 'ca_file' should be used instead if needed.
==================================================

6 years agomod_avatar: Reduce log level for too large avatars
Holger Weiss [Wed, 26 Sep 2018 19:00:52 +0000 (21:00 +0200)]
mod_avatar: Reduce log level for too large avatars

Log a warning rather than an error when publishing an avatar fails due
to its size exceeding the ?MAX_PAYLOAD_SIZE for PubSub items.

6 years agoejabberd_regexp: Support Unicode
Holger Weiss [Wed, 26 Sep 2018 17:10:32 +0000 (19:10 +0200)]
ejabberd_regexp: Support Unicode

6 years agoMySQL: Use MEDIUMTEXT for PubSub payload
Holger Weiss [Wed, 26 Sep 2018 17:01:45 +0000 (19:01 +0200)]
MySQL: Use MEDIUMTEXT for PubSub payload

Let MySQL/MariaDB accept PubSub payloads with a size of up to 16 MiB,
rather than truncating at 64 KiB.

6 years agoUpdate mix.lock 18.09
Paweł Chmielowski [Wed, 26 Sep 2018 13:01:01 +0000 (15:01 +0200)]
Update mix.lock

6 years agoAdd odbc connection robustness (#2428)
Christophe Romain [Tue, 25 Sep 2018 14:59:49 +0000 (16:59 +0200)]
Add odbc connection robustness (#2428)

6 years agoUpdate xmpp
Paweł Chmielowski [Tue, 25 Sep 2018 14:18:16 +0000 (16:18 +0200)]
Update xmpp

6 years agoUpdate deps in mix.lock
Paweł Chmielowski [Tue, 25 Sep 2018 12:31:22 +0000 (14:31 +0200)]
Update deps in mix.lock

6 years agoAllow a subscribed owner/admin to kick lower-affiliation moderator
Badlop [Tue, 25 Sep 2018 08:43:38 +0000 (10:43 +0200)]
Allow a subscribed owner/admin to kick lower-affiliation moderator

6 years agoAllow an occupant owner/admin to kick lower-affiliation moderator
Badlop [Tue, 25 Sep 2018 08:27:17 +0000 (10:27 +0200)]
Allow an occupant owner/admin to kick lower-affiliation moderator