]>
granicus.if.org Git - ejabberd/log
Holger Weiss [Tue, 24 Nov 2015 23:05:24 +0000 (00:05 +0100)]
Always use occupant JID as 'from' for room subject
When sending the room subject to a new participant, always use the
occupant JID that corresponds to the subject author as the 'from'
address. It was already done this way when the subject was sent as part
of the room history.
Evgeniy Khramtsov [Tue, 24 Nov 2015 17:24:43 +0000 (20:24 +0300)]
Make JID related functions from jlib.erl deprecated
Evgeniy Khramtsov [Tue, 24 Nov 2015 15:44:13 +0000 (18:44 +0300)]
Move JID related functions to jid.erl (#847)
Evgeniy Khramtsov [Mon, 23 Nov 2015 09:50:08 +0000 (12:50 +0300)]
Make Riak working on R18
Christophe Romain [Mon, 23 Nov 2015 11:03:08 +0000 (12:03 +0100)]
Remove useless export_all flag
Christophe Romain [Mon, 23 Nov 2015 10:53:36 +0000 (11:53 +0100)]
Export content_type/3 needed by mod_http_upload
Christophe Romain [Fri, 20 Nov 2015 13:52:36 +0000 (14:52 +0100)]
Merge branch 'cluster_fix'
Christophe Romain [Fri, 20 Nov 2015 08:57:55 +0000 (09:57 +0100)]
Allow longer command execution time
Christophe Romain [Fri, 20 Nov 2015 08:53:53 +0000 (09:53 +0100)]
Integrate join/leave cluster as ejabberd command
Evgeny Khramtsov [Wed, 18 Nov 2015 13:35:49 +0000 (16:35 +0300)]
Merge pull request #840 from cenobites/mod_ping
Adding ping_ack_timeout in mod_opt_type configuration
Badlop [Wed, 18 Nov 2015 12:25:19 +0000 (13:25 +0100)]
Explain that reload_config only affects to ACL and Access
Nycholas de Oliveira e Oliveira [Wed, 18 Nov 2015 12:25:01 +0000 (10:25 -0200)]
Adding ping_ack_timeout in mod_opt_type configuration
Avoid the error output
```
2015-11-18 12:02:40.297 [error] <0.37.0>@gen_mod:validate_opts:250 unknown option 'ping_ack_timeout' for module 'mod_ping' will be likely ignored, available options are: 'iqdisc', 'ping_interval', 'send_pings', 'timeout_action'
2015-11-18 12:02:40.334 [error] <0.37.0>@gen_mod:validate_opts:250 unknown option 'ping_ack_timeout' for module 'mod_ping' will be likely ignored, available options are: 'iqdisc', 'ping_interval', 'send_pings', 'timeout_action'
```
In setting mod_opt_type default, ping_ack_timeout parameter was added.
Badlop [Tue, 17 Nov 2015 20:33:28 +0000 (21:33 +0100)]
Fix example config about ejabberd_xmlrpc (#771)
Holger Weiss [Mon, 16 Nov 2015 23:12:20 +0000 (00:12 +0100)]
mod_http_upload: Return error atoms, not strings
Don't convert error atoms to strings before actually logging them. This
avoids a bogus error message when a user who has no uploaded files is
removed.
Badlop [Fri, 13 Nov 2015 18:33:23 +0000 (19:33 +0100)]
Disable vJUD by default also in mod_vcard_ldap source code
Badlop [Fri, 13 Nov 2015 18:30:11 +0000 (19:30 +0100)]
Disable vJUD search in the default config and when not specified
Alexey Shchepin [Thu, 12 Nov 2015 16:51:20 +0000 (19:51 +0300)]
Support for muc#roomconfig_presencebroadcast option
Paweł Chmielowski [Thu, 12 Nov 2015 16:23:39 +0000 (17:23 +0100)]
Fix problem with pipelined http requests arriving in single packet
This fixes github issue ejabberd#835
Holger Weiss [Wed, 11 Nov 2015 21:51:40 +0000 (22:51 +0100)]
mod_http_upload: Log message if URL looks wrong
Log an [info] message if a PUT request looks like the specified
"put_url" contains a path component that doesn't match the
"request_handlers" path, as in the following configuration:
listen:
-
module: ejabberd_http
port: 5444
request_handlers:
"/": mod_http_upload
modules:
mod_http_upload:
put_url: "http://example.com/path/"
Holger Weiss [Tue, 10 Nov 2015 21:08:16 +0000 (22:08 +0100)]
mod_http_upload_quota: Don't track all users
Don't track the disk usage of accounts that have an unlimited quota.
Holger Weiss [Mon, 9 Nov 2015 18:23:52 +0000 (19:23 +0100)]
mod_http_upload: Make case indentation consistent
Use four spaces (or the corresponding amount of tab characters) for case
indentation everywhere in mod_http_upload and mod_http_upload_quota.
Holger Weiss [Mon, 9 Nov 2015 18:12:08 +0000 (19:12 +0100)]
mod_http_upload: Apply cosmetic changes
Holger Weiss [Mon, 9 Nov 2015 17:50:45 +0000 (18:50 +0100)]
mod_http_upload: Don't flatten command strings
Holger Weiss [Mon, 9 Nov 2015 17:41:31 +0000 (18:41 +0100)]
mod_http_upload: Don't let identify/1 return error
Let identify/1 return 'pass' when it failed to identify the file type,
as this doesn't (necessarily) indicate an error condition. This also
makes it consistent with the return value of convert/2.
Paweł Chmielowski [Mon, 9 Nov 2015 15:05:02 +0000 (16:05 +0100)]
Use xml_stream:reset() when possible
Evgeny Khramtsov [Thu, 5 Nov 2015 09:10:38 +0000 (12:10 +0300)]
Merge pull request #821 from scrogson/update_readme_openssl
Update minimum required OpenSSL version
Sonny Scroggin [Thu, 5 Nov 2015 05:21:08 +0000 (23:21 -0600)]
Update minimum required OpenSSL version
Christophe Romain [Wed, 4 Nov 2015 15:24:35 +0000 (16:24 +0100)]
Remove supervisor option, disable it for c2s and muc
Holger Weiss [Wed, 4 Nov 2015 00:22:39 +0000 (01:22 +0100)]
Add copyright and license to HTTP upload modules
Holger Weiss [Wed, 4 Nov 2015 00:19:19 +0000 (01:19 +0100)]
mod_client_state: Add my email address to header
Paweł Chmielowski [Tue, 3 Nov 2015 13:40:52 +0000 (14:40 +0100)]
Faster string_to_jid/1 implementation
This version is about 10-15% faster than old one
Holger Weiss [Mon, 2 Nov 2015 23:00:44 +0000 (00:00 +0100)]
mod_http_upload_quota: Omit info message
The mod_http_upload_quota module attempts to delete a directory whenever
it removes a file from that directory. However, if thumbnail creation
is enabled, directories will often contain two files. Therefore, don't
log an info (but only a debug) message if directory removal fails.
Holger Weiss [Mon, 2 Nov 2015 22:46:58 +0000 (23:46 +0100)]
mod_http_upload: Don't complain during shutdown
Ignore the case where, for some reason, no process is found to be
stopped.
Closes #810.
Holger Weiss [Mon, 2 Nov 2015 22:46:31 +0000 (23:46 +0100)]
mod_http_upload: Use binary strings in most places
Switch to binary strings to fix a type issue, and for consistency.
Closes #808.
Holger Weiss [Mon, 2 Nov 2015 00:12:10 +0000 (01:12 +0100)]
mod_http_upload: Check availability of ImageMagick
Log an error message during startup if the thumbnail option is enabled
but ImageMagick is not installed.
Holger Weiss [Sun, 1 Nov 2015 22:29:22 +0000 (23:29 +0100)]
mod_http_upload: Suppress error on non-image files
Don't log an error (but only a debug) message if ImageMagick fails to
indentify the file type for thumbnail creation. The image might be
encrypted, or it could be a non-image file.
Closes #809.
Evgeniy Khramtsov [Fri, 30 Oct 2015 14:20:50 +0000 (17:20 +0300)]
Merge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Fri, 30 Oct 2015 14:20:15 +0000 (17:20 +0300)]
Fix ipv6 configuration processing (#803)
Paweł Chmielowski [Thu, 29 Oct 2015 18:46:18 +0000 (19:46 +0100)]
Merge pull request #801 from nanoz/patch-1
feat(ejabberdctl): Foreground option for docker
Arno B [Thu, 29 Oct 2015 18:39:21 +0000 (19:39 +0100)]
feat(ejabberdctl): Foreground option for docker
Docker needs services to run in foreground.
Holger Weiss [Thu, 29 Oct 2015 09:09:55 +0000 (10:09 +0100)]
mod_http_upload: Add missing trailing dot
(Thanks to Matthias Rieber.)
Holger Weiss [Wed, 28 Oct 2015 22:53:53 +0000 (23:53 +0100)]
mod_mam: Update supported XEP version
Holger Weiss [Wed, 28 Oct 2015 22:52:33 +0000 (23:52 +0100)]
mod_http_upload: Document protocol support
Paweł Chmielowski [Wed, 28 Oct 2015 17:12:39 +0000 (18:12 +0100)]
Copy elixir files in copy-files makefile target
Christophe Romain [Wed, 28 Oct 2015 15:07:00 +0000 (16:07 +0100)]
Revert "set dependencies versions for 15.10"
This reverts commit
a497cdff5ee0bf41749d076a445ba7371ddbd69e .
Christophe Romain [Wed, 28 Oct 2015 14:53:12 +0000 (15:53 +0100)]
set dependencies versions for 15.10
Holger Weiss [Mon, 26 Oct 2015 21:46:58 +0000 (22:46 +0100)]
ejabberdctl.cfg: Document CONTRIB_MODULES_CONF_DIR
Holger Weiss [Mon, 26 Oct 2015 21:42:07 +0000 (22:42 +0100)]
ejabberdctl: export CONTRIB_MODULES_CONF_DIR
Holger Weiss [Mon, 26 Oct 2015 21:32:12 +0000 (22:32 +0100)]
mod_http_upload: Fix string()/binary() type issue
Holger Weiss [Mon, 26 Oct 2015 21:30:58 +0000 (22:30 +0100)]
mod_http_upload: Add/fix function specifications
Holger Weiss [Mon, 26 Oct 2015 21:10:32 +0000 (22:10 +0100)]
mod_http_upload: Strip newline from command output
The list_to_integer/1 function doesn't cope with trailing newline
characters.
Holger Weiss [Mon, 26 Oct 2015 12:10:10 +0000 (13:10 +0100)]
Support user quotas for HTTP File Upload
mod_http_upload_quota implements two features:
- When a "hard quota" is exceeded during a file upload, old files are
removed until the disk usage equals or falls below the "soft quota".
- Once a day, all uploaded files (and directories) older than a
configurable number of days are deleted.
Evgeniy Khramtsov [Mon, 26 Oct 2015 12:05:28 +0000 (15:05 +0300)]
Rename badly entitled record field
Evgeniy Khramtsov [Mon, 26 Oct 2015 11:10:55 +0000 (14:10 +0300)]
Add HTTP File Upload support (XEP-0363)
Evgeniy Khramtsov [Fri, 23 Oct 2015 15:41:35 +0000 (18:41 +0300)]
Don't crash on certificates without extensions (EJAB-1724)
Christophe Romain [Fri, 23 Oct 2015 15:21:19 +0000 (17:21 +0200)]
Let modules_update_specs report failures (#756)
Evgeny Khramtsov [Thu, 22 Oct 2015 18:00:08 +0000 (21:00 +0300)]
Merge pull request #790 from gardenia/mod_ping_configurable_ack_timeout
Configurable ping ack timeout for mod_ping
Mickaël Rémond [Thu, 22 Oct 2015 16:50:11 +0000 (18:50 +0200)]
Merge pull request #781 from scrogson/master
Fix-up mix.exs; Include mix.lock
colm [Thu, 22 Oct 2015 12:48:40 +0000 (13:48 +0100)]
mod_ping: allowed the ping ack timeout (the length of time taken to deem that a ping has not being responded to) configurable. it still defaults to 32 seconds as per the constant IQ_TIMEOUT (in ejabberd_local.erl) this just makes it optionally configurable (in my case I needed to be more trigger happy than 32 seconds)
Christophe Romain [Thu, 22 Oct 2015 12:00:17 +0000 (14:00 +0200)]
Add simple metrics module for use with grapherl
Evgeny Khramtsov [Thu, 22 Oct 2015 10:50:36 +0000 (13:50 +0300)]
Merge pull request #789 from gardenia/mod_shared_roster_remove_resource_in_push_from
Don't send full JID in 'from' of Roster Push (RFC 6121 section 2.1.6)
colm [Wed, 21 Oct 2015 22:22:53 +0000 (23:22 +0100)]
Don't send full JID in 'from' of Roster Push (RFC 6121 section 2.1.6). This is a patch by @badlop in the comments of github issue #367
Badlop [Wed, 21 Oct 2015 10:51:22 +0000 (12:51 +0200)]
Use homogeneous s2s connections stats (#761)
Alexey Shchepin [Tue, 20 Oct 2015 14:19:31 +0000 (17:19 +0300)]
Remove access_commands 'unrestricted' option, use [] instead. Fix unauthenticated calls to commands with policy=user.
Paweł Chmielowski [Tue, 20 Oct 2015 13:22:39 +0000 (15:22 +0200)]
Pass {C,CPP,LD}FLAGS used in main ./configure call to invocations from deps
Alexey Shchepin [Mon, 19 Oct 2015 17:16:04 +0000 (20:16 +0300)]
Improve access_commands option backward compatibility
Alexey Shchepin [Mon, 19 Oct 2015 15:50:26 +0000 (18:50 +0300)]
Fix access_commands option handling
Paweł Chmielowski [Mon, 19 Oct 2015 14:38:31 +0000 (16:38 +0200)]
Make COPY_template compatible with gmake 3.8
Holger Weiss [Mon, 19 Oct 2015 12:23:37 +0000 (14:23 +0200)]
Let Travis CI test "make install"
Paweł Chmielowski [Mon, 19 Oct 2015 11:46:51 +0000 (13:46 +0200)]
Make install should work even without having DESTDIR set
Holger Weiss [Sat, 17 Oct 2015 23:14:48 +0000 (01:14 +0200)]
ejabberd_listener: Fix ETS update on port reuse
Holger Weiss [Sat, 17 Oct 2015 21:15:31 +0000 (23:15 +0200)]
ejabberd_c2s: Let stop/1 close XEP-0198 sessions
The stop/1 function now terminates stream management sessions
immediately, just as it does for other sessions. The new
ejabberd_c2s:close/1 function can be used to close the socket without
terminating the stream management session, like stop/1 did before.
Holger Weiss [Sat, 17 Oct 2015 20:07:29 +0000 (22:07 +0200)]
ejabberd_c2s: Close socket when waiting for resume
Make sure the socket is closed when mod_ping calls ejabberd_c2s:stop/1
for an XEP-0198 session.
Paweł Chmielowski [Thu, 15 Oct 2015 13:08:45 +0000 (15:08 +0200)]
Use OTP directory structure for 'make install'
Paweł Chmielowski [Thu, 15 Oct 2015 08:07:06 +0000 (10:07 +0200)]
Make KEEPALIVE_QUERY list as this is what sql_query/3 expects
Sonny Scroggin [Thu, 15 Oct 2015 03:52:27 +0000 (22:52 -0500)]
Improve line lengths; use spaces in between commas.
Sonny Scroggin [Thu, 15 Oct 2015 03:50:28 +0000 (22:50 -0500)]
mix.lock should be commited to ensure consistent builds.
Sonny Scroggin [Thu, 15 Oct 2015 03:49:47 +0000 (22:49 -0500)]
This dependency was removed in
83dd79a
Alexey Shchepin [Mon, 12 Oct 2015 17:53:52 +0000 (20:53 +0300)]
Fix cyrsasl_oauth:mech_new call
Christophe Romain [Mon, 12 Oct 2015 08:41:07 +0000 (10:41 +0200)]
Remove obsolete sasl init
Evgeniy Khramtsov [Sun, 11 Oct 2015 16:42:53 +0000 (19:42 +0300)]
Advertise MAM (XEP-0313) v0.4 support in room disco
Paweł Chmielowski [Thu, 8 Oct 2015 11:07:00 +0000 (13:07 +0200)]
Be able to merge old style configs with {listen,...}
Paweł Chmielowski [Wed, 7 Oct 2015 14:44:49 +0000 (16:44 +0200)]
Handler module shouldn't be used for differentiating listeners when merging configs
Christophe Romain [Wed, 7 Oct 2015 14:14:45 +0000 (16:14 +0200)]
Enforce get_allowed_items_call
Christophe Romain [Wed, 7 Oct 2015 13:12:15 +0000 (15:12 +0200)]
Fix acl issue from cleanup
Christophe Romain [Tue, 6 Oct 2015 22:19:42 +0000 (00:19 +0200)]
Revert "Avoid crypto:hmac/3 call for R15B compatibility"
This reverts commit
31e356c126cd5b967df9e7b560ce63f2b3b1529b .
Christophe Romain [Tue, 6 Oct 2015 22:19:32 +0000 (00:19 +0200)]
Revert "Fix compilation on Erlang R15B"
This reverts commit
a5d6044448ad651581db47b33c6991e8ef32eb61 .
Christophe Romain [Tue, 6 Oct 2015 22:06:58 +0000 (00:06 +0200)]
cosmetic cleanup
Christophe Romain [Tue, 6 Oct 2015 09:06:04 +0000 (11:06 +0200)]
Remove unused dependency
Evgeniy Khramtsov [Wed, 12 Aug 2015 13:58:56 +0000 (16:58 +0300)]
Avoid MAM dups when routing to multiple resources
Evgeniy Khramtsov [Thu, 20 Aug 2015 16:15:16 +0000 (19:15 +0300)]
Fix force_update_presence
Mickael Remond [Fri, 2 Oct 2015 08:40:55 +0000 (10:40 +0200)]
We want oauth2 to be supported as default in Elixir environment
Paweł Chmielowski [Thu, 1 Oct 2015 19:09:03 +0000 (21:09 +0200)]
Fix problem with --auth in ejabberd_ctl:process2/2
Paweł Chmielowski [Thu, 1 Oct 2015 12:33:39 +0000 (14:33 +0200)]
Switch macros resolving in config files to be global instead of per file
Mickaël Rémond [Tue, 29 Sep 2015 20:37:15 +0000 (22:37 +0200)]
Merge pull request #753 from scrogson/add_links
Add License and Links for display on hex.pm
Mickaël Rémond [Tue, 29 Sep 2015 20:36:02 +0000 (22:36 +0200)]
Merge pull request #755 from scrogson/fix_ejabberd_directory_name
Use lowecase directory name for lib/ejabberd
Sonny Scroggin [Tue, 29 Sep 2015 19:08:39 +0000 (14:08 -0500)]
Use lowecase directory name for lib/ejabberd
Evgeny Khramtsov [Tue, 29 Sep 2015 18:27:49 +0000 (21:27 +0300)]
Merge pull request #754 from scrogson/gitignore
Ignore mnesiadb and _build
Sonny Scroggin [Tue, 29 Sep 2015 18:21:35 +0000 (13:21 -0500)]
Ignore mnesiadb and _build
Sonny Scroggin [Tue, 29 Sep 2015 18:19:35 +0000 (13:19 -0500)]
clean up whitespace