]>
granicus.if.org Git - ejabberd/log
Paweł Chmielowski [Fri, 6 Jul 2018 07:49:30 +0000 (09:49 +0200)]
Remove cyrsasl elixir tests, we no longer have it
Evgeniy Khramtsov [Fri, 6 Jul 2018 06:18:27 +0000 (09:18 +0300)]
Only lookup FQDN at configuration (re)loading
Evgeniy Khramtsov [Thu, 5 Jul 2018 22:07:36 +0000 (01:07 +0300)]
Move XMPP stream and SASL processing to xmpp repo
Evgeniy Khramtsov [Thu, 5 Jul 2018 08:53:04 +0000 (11:53 +0300)]
Use p1_rand in the test suite
Evgeniy Khramtsov [Thu, 5 Jul 2018 08:51:49 +0000 (11:51 +0300)]
Move move randoms module to p1_utils repo
Evgeniy Khramtsov [Thu, 5 Jul 2018 06:31:55 +0000 (09:31 +0300)]
Move shaper to p1_utils repo
Evgeniy Khramtsov [Wed, 4 Jul 2018 05:59:14 +0000 (08:59 +0300)]
Set 'from' attribute for client connections when it is absent
Evgeniy Khramtsov [Wed, 4 Jul 2018 05:57:28 +0000 (08:57 +0300)]
Don't set from/to attributes in resource binding iq
Evgeniy Khramtsov [Wed, 4 Jul 2018 05:55:52 +0000 (08:55 +0300)]
mod_http_upload: Treat file and network errors differently
badlop [Tue, 3 Jul 2018 14:50:29 +0000 (16:50 +0200)]
Merge pull request #2495 from rodrigues/update_ptbr
Update pt-br translations
Evgeniy Khramtsov [Tue, 3 Jul 2018 10:44:58 +0000 (13:44 +0300)]
Don't ignore send() result
Evgeniy Khramtsov [Tue, 3 Jul 2018 10:38:49 +0000 (13:38 +0300)]
Increase default buffer size for mod_proxy65
Evgeniy Khramtsov [Mon, 2 Jul 2018 13:53:44 +0000 (16:53 +0300)]
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"
...
Evgeniy Khramtsov [Sun, 1 Jul 2018 22:08:09 +0000 (01:08 +0300)]
Merge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Sun, 1 Jul 2018 22:08:02 +0000 (01:08 +0300)]
Enable Roster Versioning in the default config file
Evgeny Khramtsov [Sun, 1 Jul 2018 21:20:46 +0000 (00:20 +0300)]
Merge pull request #2502 from licaon-kter/patch-4
Default config example fix reversed text
Licaon_Kter [Sun, 1 Jul 2018 21:18:18 +0000 (21:18 +0000)]
Default config example fix reversed text
...in enable OMEMO
Evgeniy Khramtsov [Sun, 1 Jul 2018 20:57:27 +0000 (23:57 +0300)]
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
Victor Rodrigues [Fri, 29 Jun 2018 23:33:36 +0000 (01:33 +0200)]
Update pt-br translations
Evgeniy Khramtsov [Sun, 1 Jul 2018 11:26:49 +0000 (14:26 +0300)]
Don't crash on most common gen_server:call errors
Evgeniy Khramtsov [Sat, 30 Jun 2018 07:19:58 +0000 (10:19 +0300)]
Accept IP address as a return value from resolve/2 callback
Paweł Chmielowski [Fri, 29 Jun 2018 13:41:25 +0000 (15:41 +0200)]
Update fast_xml and xmpp in mix.lock
Evgeniy Khramtsov [Fri, 29 Jun 2018 11:48:07 +0000 (14:48 +0300)]
Replace hardcoded disco features with macros
Paweł Chmielowski [Fri, 29 Jun 2018 10:51:20 +0000 (12:51 +0200)]
Add check for files missing in hex packaging
Paweł Chmielowski [Fri, 29 Jun 2018 10:50:57 +0000 (12:50 +0200)]
Update xmpp
Paweł Chmielowski [Fri, 29 Jun 2018 09:13:16 +0000 (11:13 +0200)]
Fix misc:try_url for erlang < R20
Christophe Romain [Fri, 29 Jun 2018 09:10:35 +0000 (11:10 +0200)]
Rename obsolete type in comments
Paweł Chmielowski [Fri, 29 Jun 2018 08:52:47 +0000 (10:52 +0200)]
Convert test that used moka, and drop that dependancy
Evgeniy Khramtsov [Fri, 29 Jun 2018 08:34:53 +0000 (11:34 +0300)]
Support both filenames and URLs in 'cssfile' option of mod_muc_log
If filename is provided, its content is inserted into the HTML page.
If URL is provided, it's used as a value of 'href' HTML attribute.
Evgeniy Khramtsov [Fri, 29 Jun 2018 08:06:24 +0000 (11:06 +0300)]
Improve URLs validation
Evgeniy Khramtsov [Fri, 29 Jun 2018 07:32:53 +0000 (10:32 +0300)]
HTTP Upload: increase gen_server call timeout
Evgeniy Khramtsov [Fri, 29 Jun 2018 06:58:33 +0000 (09:58 +0300)]
HTTP Upload: put more info in log messages
Evgeniy Khramtsov [Thu, 28 Jun 2018 12:04:46 +0000 (15:04 +0300)]
Don't crash when encoding {xmlcdata, _}
Fixes #2493
Paweł Chmielowski [Thu, 28 Jun 2018 10:11:44 +0000 (12:11 +0200)]
Update mix.lock
Paweł Chmielowski [Thu, 28 Jun 2018 08:57:09 +0000 (10:57 +0200)]
Bump version in mix.exs
Paweł Chmielowski [Thu, 28 Jun 2018 08:56:59 +0000 (10:56 +0200)]
Update deps
Evgeniy Khramtsov [Thu, 28 Jun 2018 07:37:20 +0000 (10:37 +0300)]
Avoid code duplication when checking presence subscription
Evgeniy Khramtsov [Wed, 27 Jun 2018 16:40:03 +0000 (19:40 +0300)]
Work-around against public_key incompatibility introduced in OTP21
The commit introduced the incompatility is
https://github.com/erlang/otp/commit/
304dd8f81e28ed04cde9f6f7ac1f79870da1c2cd
Thanks to Stu Tomlinson for spotting the issue.
Fixes #2488
Evgeniy Khramtsov [Wed, 27 Jun 2018 12:02:03 +0000 (15:02 +0300)]
Don't check packets sent to self
Evgeniy Khramtsov [Wed, 27 Jun 2018 10:36:58 +0000 (13:36 +0300)]
Use lists:foldl/3
Evgeniy Khramtsov [Wed, 27 Jun 2018 10:29:38 +0000 (13:29 +0300)]
Generate HTTP Upload form using xdata codec
Evgeniy Khramtsov [Wed, 27 Jun 2018 08:27:39 +0000 (11:27 +0300)]
Do not ignore a certificate containing no domain names
Log a warning instead and assign it to an "empty" domain
Evgeniy Khramtsov [Wed, 27 Jun 2018 07:55:37 +0000 (10:55 +0300)]
Don't replace valid certificates with invalid ones
When building the certificates chains, if several certificates
are found matching the same domain their validity is checked:
* the invalid one is ignored and the valid one is picked
* if both are valid or both are invalid, then the one with
sooner expiration is ignored.
Fixes #2454
Evgeniy Khramtsov [Tue, 26 Jun 2018 16:32:29 +0000 (19:32 +0300)]
Improve error formatting in mod_http_upload
Evgeniy Khramtsov [Mon, 25 Jun 2018 16:16:33 +0000 (19:16 +0300)]
Support SASL PLAIN by xmpp_stream_out
Also, SASL mechanisms chaining is now supported:
if several mechanisms are supported and authentication
fails, next mechanism in the list is picked, until the
list is exhausted. In the case of a failure, the latest
SASL failure reason is returned within handle_auth_failure/3
callback.
Evgeniy Khramtsov [Mon, 25 Jun 2018 12:28:02 +0000 (15:28 +0300)]
Don't pass sockmod to xmpp_stream_out
Evgeniy Khramtsov [Mon, 25 Jun 2018 12:19:49 +0000 (15:19 +0300)]
Introduce resolve/2 and connect_options/3 callbacks for xmpp_stream_out
Evgeniy Khramtsov [Mon, 25 Jun 2018 11:55:33 +0000 (14:55 +0300)]
Allow gen_server process registration
Evgeniy Khramtsov [Mon, 25 Jun 2018 11:52:33 +0000 (14:52 +0300)]
Allow reconnecting from disconnected state
Evgeniy Khramtsov [Mon, 25 Jun 2018 11:46:31 +0000 (14:46 +0300)]
Intercept EXIT signal
Evgeniy Khramtsov [Mon, 25 Jun 2018 10:50:35 +0000 (13:50 +0300)]
Add Resource Binding support to xmpp_stream_out
Evgeniy Khramtsov [Mon, 25 Jun 2018 06:56:44 +0000 (09:56 +0300)]
Don't use 'unsupported-version' inside SM <failed/> element
This error condition is defined within stream errors, however,
XEP-0198 says:
> This element SHOULD contain an error condition, which MUST
> be one of the **stanza** error conditions defined in RFC 6120.
Evgeniy Khramtsov [Mon, 25 Jun 2018 06:45:45 +0000 (09:45 +0300)]
Use error formatting functions from xmpp library
Evgeniy Khramtsov [Sat, 23 Jun 2018 17:31:01 +0000 (20:31 +0300)]
Generate SASL failures on unencrypted connections only for s2s
Evgeniy Khramtsov [Sat, 23 Jun 2018 17:01:21 +0000 (20:01 +0300)]
Fix Erlang limits in ejabberdctl.cfg.example to reflect current situation
Evgeniy Khramtsov [Thu, 21 Jun 2018 12:14:19 +0000 (15:14 +0300)]
Fix typo
Evgeniy Khramtsov [Thu, 21 Jun 2018 11:35:19 +0000 (14:35 +0300)]
Add new options for OOM watchdog
* oom_watermark: 1..100
Start OOM watchdog only when system memory usage exceeds
this value in percents. When the usage drops below the value,
OOM watchdog is stopped. The default is 80 (percents).
Note that once OOM watchdog is started, it performs full garbage
collection periodically: this can be seen as spikes in CPU
utilization and drops in RAM usage. If your system is permanently
above the watermark, it may cause significant CPU overhead.
* oom_queue: positive integer
Only trigger OOM killer when total amount of messages in all queues
of all Erlang processes is above this value. The default is 10000.
Note that this value only takes effect when `oom_killer` is set
to `true` (this is the default). Otherwise, only a warning will
be logged.
Paweł Chmielowski [Wed, 20 Jun 2018 10:16:01 +0000 (12:16 +0200)]
Guard against pres_last=undefined in mod_offline
Evgeniy Khramtsov [Wed, 20 Jun 2018 10:02:06 +0000 (13:02 +0300)]
Remove lowercased duplicates from ejabberd.pot
Evgeniy Khramtsov [Wed, 20 Jun 2018 09:50:36 +0000 (12:50 +0300)]
Restore forgotten translations from previous commit
Evgeniy Khramtsov [Wed, 20 Jun 2018 09:32:10 +0000 (12:32 +0300)]
Update ejabberd.pot
Evgeniy Khramtsov [Wed, 20 Jun 2018 09:27:44 +0000 (12:27 +0300)]
Move mod_irc to ejabberd-contrib
Holger Weiss [Tue, 19 Jun 2018 22:15:56 +0000 (00:15 +0200)]
Omit summary form for push tests
Holger Weiss [Tue, 19 Jun 2018 21:12:27 +0000 (23:12 +0200)]
mod_push: Include a static body text by default
Set the 'include_body' option to a static text by default. Some app
servers check for the presence of a 'last-message-body' field to
distinguish between notifications generated for actual chat messages and
notifications triggered by other types of traffic.
Holger Weiss [Tue, 19 Jun 2018 20:26:08 +0000 (22:26 +0200)]
mod_push_keepalive: Increase default timeout
Set the default session timeout to three days. This way, sessions will
survive a weekend without traffic, for example.
Paweł Chmielowski [Tue, 19 Jun 2018 15:50:30 +0000 (17:50 +0200)]
Fix reset_stream in websocket using pre-rfc protocol
Evgeniy Khramtsov [Tue, 19 Jun 2018 11:02:45 +0000 (14:02 +0300)]
Render roomname, allowinvites and allowpm in room disco#info
Holger Weiss [Mon, 18 Jun 2018 21:12:27 +0000 (23:12 +0200)]
mod_push_mnesia: Simplify record matching
Omit record fields that aren't used for matching.
Holger Weiss [Mon, 18 Jun 2018 21:05:08 +0000 (23:05 +0200)]
mod_push_mnesia: Fix lookup of all host sessions
Holger Weiss [Fri, 15 Jun 2018 22:43:22 +0000 (00:43 +0200)]
mod_mam: Don't replace existing stanza ID
Preserve the original stanza ID for resent messages. This avoids
storing duplicates in the MAM archive.
Paweł Chmielowski [Fri, 15 Jun 2018 09:54:56 +0000 (11:54 +0200)]
New shaper implementation
Badlop [Fri, 15 Jun 2018 09:28:44 +0000 (11:28 +0200)]
Make connected_users_info and user_sessions_info DB-agnostic (#2448)
The result returned by connected_users_info command has changed,
and is now similar to the result of user_sessions_info.
Notice that num_active_users and process_rosteritems still require Mnesia.
Evgeniy Khramtsov [Thu, 14 Jun 2018 16:51:50 +0000 (19:51 +0300)]
Improve type spec
Evgeniy Khramtsov [Thu, 14 Jun 2018 16:49:27 +0000 (19:49 +0300)]
Get rid of all calls to jlib.erl module
Evgeniy Khramtsov [Thu, 14 Jun 2018 16:19:09 +0000 (19:19 +0300)]
Update mod_muc_room.hrl
Evgeniy Khramtsov [Thu, 14 Jun 2018 16:11:43 +0000 (19:11 +0300)]
Get rid of jlib.hrl/jlib.erl
Evgeniy Khramtsov [Thu, 14 Jun 2018 15:58:35 +0000 (18:58 +0300)]
Do not check for deprecated types
Since we support only Erlang >= OTP-17.5, the check for old-style
dict/queue/etc types is no longer needed
Evgeniy Khramtsov [Thu, 14 Jun 2018 11:24:15 +0000 (14:24 +0300)]
Get rid of ejabberd.hrl reference from the test suite
Evgeniy Khramtsov [Thu, 14 Jun 2018 11:00:47 +0000 (14:00 +0300)]
Get rid of ejabberd.hrl header
The header consisted of too many unrelated stuff and macros misuse.
Some stuff is moved into scram.hrl and type_compat.hrl.
All macros have been replaced with the corresponding function calls.
TODO: probably type_compat.hrl is not even needed anymore since
we support only Erlang >= OTP 17.5
Evgeniy Khramtsov [Thu, 14 Jun 2018 07:18:10 +0000 (10:18 +0300)]
Log modules startup
Holger Weiss [Wed, 13 Jun 2018 19:43:40 +0000 (21:43 +0200)]
mod_push: Omit summary for outgoing messages
Don't include a urn:xmpp:push:summary form in push notifications that
are triggered by outgoing messages. App servers might use the form
fields to generate user-visible notifications directly (as opposed to
just waking the client app). This is usually not desired for outgoing
messages.
Evgeniy Khramtsov [Wed, 13 Jun 2018 11:55:06 +0000 (14:55 +0300)]
Advertise disco#info and disco#items features in mod_disco
Fixes #2470
Holger Weiss [Tue, 12 Jun 2018 22:25:14 +0000 (00:25 +0200)]
mod_push: Further improve handling of carbons
Also check for carbon-copied messages (with a body) in the queue of
unacknowledged stanzas.
Holger Weiss [Tue, 12 Jun 2018 20:47:23 +0000 (22:47 +0200)]
mod_push: Also include sender/body for carbons
If the 'include_sender' and/or 'include_body' options are specified,
also include a urn:xmpp:push:summary form in push notifications that are
generated for carbon-copied messages (with a body).
Christophe Romain [Mon, 11 Jun 2018 12:21:35 +0000 (14:21 +0200)]
Update mix deps
Evgeniy Khramtsov [Fri, 8 Jun 2018 06:51:26 +0000 (09:51 +0300)]
Avoid lager crash on external authentication failure
Fixes #2463
Holger Weiss [Thu, 7 Jun 2018 15:40:05 +0000 (17:40 +0200)]
Increase start-up/stop timeout in systemd unit
On slow systems, it can take quite a while for "ejabberdctl started"
and/or "ejabberdctl stopped" to return.
Paweł Chmielowski [Thu, 7 Jun 2018 13:38:11 +0000 (15:38 +0200)]
Add ability to modify version string
Evgeny Khramtsov [Wed, 6 Jun 2018 17:05:42 +0000 (20:05 +0300)]
Merge pull request #2460 from imShara/patch-1
OMEMO enable HOWTO added
imShara [Wed, 6 Jun 2018 17:03:42 +0000 (20:03 +0300)]
OMEMO enable HOWTO added
Depend on #2425
Holger Weiss [Mon, 4 Jun 2018 21:29:24 +0000 (23:29 +0200)]
upload_tests: Make size error check stricter
Holger Weiss [Mon, 4 Jun 2018 21:05:11 +0000 (23:05 +0200)]
Omit 'xmlns' field from 'feature_csi' record
The 'xmpp' library has been updated to omit the 'xmlns' field from the
'feature_csi' record.
Holger Weiss [Mon, 4 Jun 2018 20:18:56 +0000 (22:18 +0200)]
Return detailed error if HTTP upload is too large
If the file size specified in an HTTP upload slot request exceeds the
the configured maximum size, include the limit with the stanza error.
Evgeniy Khramtsov [Sun, 3 Jun 2018 15:53:30 +0000 (18:53 +0300)]
Also format gracefully errors returned during module reload
Paweł Chmielowski [Fri, 1 Jun 2018 16:36:39 +0000 (18:36 +0200)]
Paweł Chmielowski [Fri, 1 Jun 2018 12:48:14 +0000 (14:48 +0200)]
Don't crash in bosh when we receive request with RID < prev_rid
Evgeniy Khramtsov [Fri, 1 Jun 2018 06:07:16 +0000 (09:07 +0300)]
Always display room's xdata in disco#info
Evgeniy Khramtsov [Fri, 1 Jun 2018 05:56:56 +0000 (08:56 +0300)]
Display muc#roomconfig_changesubject in room's disco#info
Fixes #2449
Evgeniy Khramtsov [Fri, 1 Jun 2018 04:58:03 +0000 (07:58 +0300)]
Send trailer and close socket explicitly on stream end
Evgeniy Khramtsov [Wed, 30 May 2018 19:53:34 +0000 (22:53 +0300)]
Improve indentation