Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity
6,701 Commits 7 Branches 106 Tags 78 MiB
Commit Graph

6701 Commits

Author SHA1 Message Date
Evgeniy Khramtsov 420e05fa0d Clean up contributed code for Redis SM 2018-07-14 17:53:00 +03:00
Evgeny Khramtsov e2fb154fe9
Merge pull request #2525 from satish-olx/master 
Use lua scripting to clear redis sessions.
 2018-07-14 16:53:45 +03:00
Evgeniy Khramtsov e9f219a0ac Improve wording 2018-07-14 16:52:09 +03:00
Evgeny Khramtsov 711c5c0d54
Merge pull request #2526 from nosnilmot/enforce-pubsub-option-attributes 
Enforce pubsub option required/rejected attributes
 2018-07-14 16:42:15 +03:00
Stu Tomlinson f9ed34db4d Enforce pubsub option required/rejected attributes 
XEP-0060 states that 'node' and 'jid' attributes to <options> element MUST NOT
be included when <options> are specified at same time as <subscribe> :

https://xmpp.org/extensions/xep-0060.html#subscriber-configure-subandconfig

mod_pubsub will require 'node' and 'jid' attributes on standalone pubsub
options requests, and reject subscribe requests that have options that include
either 'node' or 'jid'
 2018-07-14 11:55:38 +01:00
Evgeny Khramtsov 9a895058e7
Merge pull request #2522 from weiss/bump-max-user-conferences 
mod_muc: Increase default 'max_user_conferences' value
 2018-07-14 08:51:11 +03:00
Paweł Chmielowski e76a57e144 Ensure that returned priority in a number in mod_admin_extra 2018-07-13 09:51:19 +02:00
satish-olx 6fc6bdefc2
Update ejabberd_sm_redis.erl 2018-07-12 16:14:26 +05:30
satish-olx 96e35a3248
Lua script for cleaning redis sessions 
Changes:
1. Added extra keys for tracking node -> session mapping
2. Lua script for clearing the sessions in redis itself.
 2018-07-12 16:10:24 +05:30
Paweł Chmielowski 48be8e7b1e Adopt code that uses parse_listener_portip after result change 2018-07-11 14:07:24 +02:00
Badlop f40f3a9da7 Fix piefxis import of privacy lists (thanks to crosser)(#2412) 2018-07-11 12:56:57 +02:00
Badlop f81b49fe44 Fix piefxis import of vCard elements (#2514) 2018-07-11 12:56:38 +02:00
Evgeniy Khramtsov 395d2e86bc Improve listener errors formatting 2018-07-11 09:29:55 +03:00
Holger Weiss 5b3af9d4cd Fix compiler warnings regarding test cases 2018-07-11 00:07:57 +02:00
Holger Weiss 7e5d766a02 pubsub_tests: Fix race condition 2018-07-10 21:25:06 +02:00
Holger Weiss c5dd1bdd9d mod_http_upload_quota: Fix process name lookup 
Fix mod_http_upload_quota's process name lookup for the case where a
slot is requested by a JID whose domain part is not the virtual host the
mod_http_upload_quota process is running on.
 2018-07-10 21:19:15 +02:00
Evgeniy Khramtsov d03432a956 Fix regression: list SASL EXTERNAL mechanism for inbound s2s 2018-07-10 10:14:08 +03:00
Holger Weiss 4b747c2c78 mod_muc: Increase 'max_user_conferences' default 
Let up to 100 clients of a given account join MUC rooms by default.  The
old default value can be too small, e.g., when users join many (private)
rooms with multiple devices.
 2018-07-10 01:00:06 +02:00
Holger Weiss 3a566e3cdf mod_stream_mgmt: Remove dead case clauses 2018-07-10 00:52:27 +02:00
Holger Weiss b915469f5e mod_stream_mgmt: Add descriptive text to errors 
Closes #2485.
 2018-07-10 00:46:48 +02:00
Evgeniy Khramtsov 8b9166d067 Improve value formatting 2018-07-09 20:32:01 +03:00
Paweł Chmielowski dc6861eb73 Use ejabberd_config:get_version in ejabberdctl status 2018-07-09 17:11:40 +02:00
Evgeny Khramtsov 90a4aafec0
Merge pull request #2516 from licaon-kter/patch-6 
Remove vcard search default value
 2018-07-09 10:08:00 +03:00
Licaon_Kter 4c06f13d18
Remove vcard search default value 2018-07-08 23:48:08 +00:00
Evgeniy Khramtsov 8c796ed027 Better format invalid values when logging them 2018-07-08 20:42:53 +03:00
Evgeniy Khramtsov 68d12017cc Better detection of duplicated routes/hosts 2018-07-08 20:28:11 +03:00
Evgeniy Khramtsov 491993d401 Reload internal room's configuration when mod_muc is reloaded 
Fixes #2513
 2018-07-08 14:52:12 +03:00
Evgeny Khramtsov a981bf9a59
Merge pull request #2511 from licaon-kter/patch-5 
Remove stats and time from template
 2018-07-08 10:43:25 +03:00
Evgeny Khramtsov 920e4512b6
Merge pull request #2515 from ChaosKid42/fix_HMAC_in_http_upload 
fix generation of HMAC for external_secret
 2018-07-08 10:42:55 +03:00
Christoph Scholz fbdcc44fd9 fix HMAC for external_secret 2018-07-07 17:01:39 +02:00
Paweł Chmielowski b2b29269ec Remove cyrsasl elixir tests, we no longer have it 2018-07-06 09:49:30 +02:00
Evgeniy Khramtsov 11811e5f48 Only lookup FQDN at configuration (re)loading 2018-07-06 09:18:27 +03:00
Licaon_Kter b7f62a4fa7
Remove stats and time from template 
Are these important for a new admin?
 2018-07-06 01:33:41 +00:00
Evgeniy Khramtsov 0bb14d16c7 Move XMPP stream and SASL processing to xmpp repo 2018-07-06 01:07:36 +03:00
Evgeniy Khramtsov 59f5a098b5 Use p1_rand in the test suite 2018-07-05 11:53:04 +03:00
Evgeniy Khramtsov ed1ee6061e Move move randoms module to p1_utils repo 2018-07-05 11:51:49 +03:00
Evgeniy Khramtsov 50b645aa92 Move shaper to p1_utils repo 2018-07-05 09:31:55 +03:00
Evgeniy Khramtsov 52f2a7de4b Set 'from' attribute for client connections when it is absent 2018-07-04 08:59:14 +03:00
Evgeniy Khramtsov bce8922e5d Don't set from/to attributes in resource binding iq 2018-07-04 08:57:28 +03:00
Evgeniy Khramtsov 86236431b9 mod_http_upload: Treat file and network errors differently 2018-07-04 08:55:52 +03:00
badlop c0d4d31b5b
Merge pull request #2495 from rodrigues/update_ptbr 
Update pt-br translations
 2018-07-03 16:50:29 +02:00
Evgeniy Khramtsov 295bec8551 Don't ignore send() result 2018-07-03 13:44:58 +03:00
Evgeniy Khramtsov b341a3cef3 Increase default buffer size for mod_proxy65 2018-07-03 13:38:49 +03:00
Evgeniy Khramtsov fface33d54 HTTP Upload: introduce new option 'external_secret' 
The option makes it possible to offload all HTTP Upload processing
to a separate HTTP server. Both ejabberd and the HTTP server
should share this secret and behave exactly as described at
at https://modules.prosody.im/mod_http_upload_external.html
in the 'Implementation' section. Example configuration:

modules:
  ...
  mod_http_upload:
    ...
    put_url: "http://separate.http.server/upload"
    external_secret: "foo bar baz"
  ...
 2018-07-02 16:53:44 +03:00
Evgeniy Khramtsov fbf6ba2738 Merge branch 'master' of github.com:processone/ejabberd 2018-07-02 01:08:09 +03:00
Evgeniy Khramtsov 38ec3f66c7 Enable Roster Versioning in the default config file 2018-07-02 01:08:02 +03:00
Evgeny Khramtsov 56dc625f9a
Merge pull request #2502 from licaon-kter/patch-4 
Default config example fix reversed text
 2018-07-02 00:20:46 +03:00
Licaon_Kter 7c5ee93c88
Default config example fix reversed text 
...in enable OMEMO
 2018-07-01 21:18:18 +00:00
Evgeniy Khramtsov 77163c43d2 Simplify the default configuration file 
After some discussion with the community it was decided to
clean the configuration file from excessive comments and
explicitly configured default values. Also, mod_mam and
mod_http_upload have been added.

The rationale for this is to have a clean and not bloated
configuration file which doesn't scare away newcomers and
which has all features from the Compliance Suite 2018 (XEP-0387)
enabled by default.

For further configuration an admin is encouraged to read the
documentation at https://docs.ejabberd.im/admin/configuration
 2018-07-01 23:57:27 +03:00
Victor Rodrigues d1d02e2f26 Update pt-br translations 2018-07-01 15:15:41 +02:00