c526b0e8ff
Update mix.lock
2018-06-28 12:11:44 +02:00
35136f47ed
Bump version in mix.exs
2018-06-28 10:57:09 +02:00
8f2233eff7
Update deps
2018-06-28 10:56:59 +02:00
8879d1d533
Avoid code duplication when checking presence subscription
2018-06-28 10:37:20 +03:00
71ae7e9fd9
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
2018-06-27 19:40:03 +03:00
644873dae9
Don't check packets sent to self
2018-06-27 15:02:03 +03:00
9a11db91f9
Use lists:foldl/3
2018-06-27 13:36:58 +03:00
af8c6d2428
Generate HTTP Upload form using xdata codec
2018-06-27 13:29:38 +03:00
87357c700f
Do not ignore a certificate containing no domain names
...
Log a warning instead and assign it to an "empty" domain
2018-06-27 11:27:39 +03:00
7881c5670c
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
2018-06-27 10:55:37 +03:00
881e02632b
Improve error formatting in mod_http_upload
2018-06-26 19:32:29 +03:00
47d117c1bf
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.
2018-06-25 19:16:33 +03:00
cf6f540d53
Don't pass sockmod to xmpp_stream_out
2018-06-25 15:28:02 +03:00
557e6ecdd0
Introduce resolve/2 and connect_options/3 callbacks for xmpp_stream_out
2018-06-25 15:19:49 +03:00
5dd3f4c22b
Allow gen_server process registration
2018-06-25 14:55:33 +03:00
e7c3b57b8b
Allow reconnecting from disconnected state
2018-06-25 14:52:33 +03:00
c907915695
Intercept EXIT signal
2018-06-25 14:46:31 +03:00
911ed4a7ca
Add Resource Binding support to xmpp_stream_out
2018-06-25 13:50:35 +03:00
499ae96254
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.
2018-06-25 09:56:44 +03:00
ac31c85866
Use error formatting functions from xmpp library
2018-06-25 09:45:45 +03:00
c4c91cc956
Generate SASL failures on unencrypted connections only for s2s
2018-06-23 20:31:01 +03:00
d809aafba0
Fix Erlang limits in ejabberdctl.cfg.example to reflect current situation
2018-06-23 20:01:21 +03:00
6ffb120fce
Fix typo
2018-06-21 15:14:19 +03:00
55f8aa1b22
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.
2018-06-21 14:35:19 +03:00
274e9fe7b5
Guard against pres_last=undefined in mod_offline
2018-06-20 12:16:10 +02:00
f465742f2c
Remove lowercased duplicates from ejabberd.pot
2018-06-20 13:02:06 +03:00
9e83c45b3c
Restore forgotten translations from previous commit
2018-06-20 12:50:36 +03:00
446e6e6f3b
Update ejabberd.pot
2018-06-20 12:32:10 +03:00
3a5d2dbed8
Move mod_irc to ejabberd-contrib
2018-06-20 12:27:44 +03:00
aea6166efe
Omit summary form for push tests
2018-06-20 00:15:56 +02:00
23cc0f8c3c
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.
2018-06-19 23:12:27 +02:00
81f4dd0e6a
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.
2018-06-19 22:26:08 +02:00
dee3081df1
Fix reset_stream in websocket using pre-rfc protocol
2018-06-19 17:51:09 +02:00
6acac7c93f
Render roomname, allowinvites and allowpm in room disco#info
2018-06-19 14:02:45 +03:00
c2f664f941
mod_push_mnesia: Simplify record matching
...
Omit record fields that aren't used for matching.
2018-06-18 23:12:27 +02:00
75127a0deb
mod_push_mnesia: Fix lookup of all host sessions
2018-06-18 23:05:08 +02:00
bb76da03ea
mod_mam: Don't replace existing stanza ID
...
Preserve the original stanza ID for resent messages. This avoids
storing duplicates in the MAM archive.
2018-06-16 00:43:22 +02:00
3099702039
New shaper implementation
2018-06-15 11:56:46 +02:00
3ec623f329
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.
2018-06-15 11:28:57 +02:00
6c323b729b
Improve type spec
2018-06-14 19:51:50 +03:00
17b05ff4b7
Get rid of all calls to jlib.erl module
2018-06-14 19:49:27 +03:00
7bd5c7fe59
Update mod_muc_room.hrl
2018-06-14 19:19:09 +03:00
7b04a625be
Get rid of jlib.hrl/jlib.erl
2018-06-14 19:11:43 +03:00
49b08949b1
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
2018-06-14 18:58:35 +03:00
141be53c21
Get rid of ejabberd.hrl reference from the test suite
2018-06-14 14:24:15 +03:00
fd8e07af47
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
2018-06-14 14:00:47 +03:00
c3c75affa9
Log modules startup
2018-06-14 10:18:10 +03:00
85f09b365f
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.
2018-06-13 21:43:40 +02:00
645f11d79d
Advertise disco#info and disco#items features in mod_disco
...
Fixes #2470
2018-06-13 14:55:06 +03:00
0a20e45690
mod_push: Further improve handling of carbons
...
Also check for carbon-copied messages (with a body) in the queue of
unacknowledged stanzas.
2018-06-13 00:25:14 +02:00
0a9f522222
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).
2018-06-12 22:47:23 +02:00
4f293751f0
Update mix deps
2018-06-11 14:21:35 +02:00
6f481e3ceb
Avoid lager crash on external authentication failure
...
Fixes #2463
2018-06-08 09:51:26 +03:00
00534d4566
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.
2018-06-07 17:40:05 +02:00
40185b6bd3
Add ability to modify version string
2018-06-07 15:38:33 +02:00
1de407c420
Merge pull request #2460 from imShara/patch-1
...
OMEMO enable HOWTO added
2018-06-06 20:05:42 +03:00
815b95c623
OMEMO enable HOWTO added
...
Depend on #2425
2018-06-06 20:03:42 +03:00
8e1a13b259
upload_tests: Make size error check stricter
2018-06-04 23:29:24 +02:00
a4049d9418
Omit 'xmlns' field from 'feature_csi' record
...
The 'xmpp' library has been updated to omit the 'xmlns' field from the
'feature_csi' record.
2018-06-04 23:05:11 +02:00
ba30ac8ce8
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.
2018-06-04 22:18:56 +02:00
43c3134f55
Also format gracefully errors returned during module reload
2018-06-03 18:53:30 +03:00
67fc2015de
Fix problem in commit 548ef7b835
2018-06-01 18:36:39 +02:00
548ef7b835
Don't crash in bosh when we receive request with RID < prev_rid
2018-06-01 16:12:22 +02:00
4337300fce
Always display room's xdata in disco#info
2018-06-01 09:07:16 +03:00
cab8005bf3
Display muc#roomconfig_changesubject in room's disco#info
...
Fixes #2449
2018-06-01 08:56:56 +03:00
4fc8d1c4a4
Send trailer and close socket explicitly on stream end
2018-06-01 07:58:03 +03:00
1261502f6a
Improve indentation
2018-05-30 22:53:34 +03:00
dacba3ec00
Merge remote-tracking branch 'processone/pr/2446'
...
* processone/pr/2446:
Fix authentication for usernames containing uppercase characters
2018-05-30 20:53:11 +02:00
4f8af723c6
Fix authentication for usernames containing uppercase characters
...
Applies to authentication methods that compare User (normalized)
and AuthzId (was not being normalized). These are external, ldap & pam.
Fixes #2280
2018-05-30 18:43:26 +01:00
5e446d50a8
Get rid of direct calls to 'session' Mnesia table
...
Fixes #2439
2018-05-30 19:21:56 +03:00
22d76659c0
Bump xmpp version in order to support language tags validation
2018-05-30 09:54:26 +03:00
0f9db50c8d
Support for roomconfig_lang/roominfo_lang
...
Now room owners are able to set a preferred language
for the discussions in the room, so other users can
discover rooms based on the language they wish to talk.
TODO: the language format should conform to RFC 5646.
This check should be implemented in 'xmpp' library.
Fixes #2436
2018-05-30 08:11:58 +03:00
52b8226671
Use 'list-multi' type for XEP-0157 xdata fields
...
Thanks to Jonas Wielicki for spotting this
2018-05-29 19:37:24 +03:00
3b9e6eaa95
Merge pull request #2438 from licaon-kter/patch-3
...
Add default_db in the example config
2018-05-28 16:22:30 +03:00
2c18f89d5b
Add default_db in the example config
...
I only found it in the docs after setting up per module db_
2018-05-28 13:19:59 +00:00
0381ce1e75
Better report errors of module startup
2018-05-28 09:19:49 +03:00
fc77051b68
Don't call Mod:function() in xmpp_stream callbacks
...
If a callback function is not defined by the `Mod` then
a call to code_server process is performed. Under heavy load
this may cause code_server to get overloaded. We now avoid this.
2018-05-26 09:06:24 +03:00
bfe2545c01
mod_muc_sql: Fix export to SQL
...
The "host" column is supposed to hold the MUC host name.
2018-05-24 01:28:29 +02:00
c6a9c30f1c
mod_push_mnesia: Apply cosmetic changes
...
Improve the readability of the 'max_user_sessions' check.
2018-05-23 21:40:54 +02:00
508f3ef88d
mod_push_sql: Check 'max_user_sessions' limit
...
Remove the oldest push session(s) of a user if the number of enabled
sessions exceeds the 'max_user_sessions' limit.
2018-05-23 20:02:52 +02:00
97f7d99007
Handle "Expect: 100-continue" request header in ejabberd_http
2018-05-23 14:52:47 +02:00
2bbfc0b79e
Merge pull request #2431 from yokomizor/fix-xmpp-commit
...
Missing #block_item{} record building with mix
2018-05-22 17:45:53 +03:00
10a5a5eb01
Merge pull request #2430 from yokomizor/ext_mod-export-add_sources_1
...
Export ext_mod:add_sources/1
2018-05-22 17:39:27 +03:00
2e529f5826
Missing #block_item{} record building with mix
...
Ref: #638f2d2
2018-05-22 16:37:39 +02:00
4a4cc32650
Export ext_mod:add_sources/1
2018-05-22 16:16:13 +02:00
d2114be6f3
Correctly calculate remaining bytes on file upload
2018-05-19 18:29:33 +03:00
db51d522e8
Add support for REST API custom headers
...
ext_api_headers can be defined as a single string. Headers are separated
by comma. Definition MUST NOT contain spaces. Example
"X-MyHead:test,X-Token:082748"
2018-05-17 14:47:21 +02:00
82c42051c3
Correctly resolve upload.localhost for the test suite
2018-05-17 13:24:23 +03:00
e4c106e0dd
Add tests for mod_http_upload
2018-05-17 12:02:00 +03:00
b64e1d95d2
Fix typo file:read() -> file:open()
2018-05-17 12:00:06 +03:00
c41bab9ca0
Clean state between requests in ejabberd_http
2018-05-15 14:25:19 +02:00
063737e4f5
Optimize HTTP requests memory usage
...
Due to historical reasons, ejabberd loads the whole file/data
into the memory when serving an HTTP request. This is now improved:
1) For GET requests ejabberd uses sendfile(2) if the underlying
connection is HTTP and falls back to read/write loop with 64kb
buffer for HTTPS connections. This type of requests are handled
by mod_http_fileserver, mod_http_upload, ejabberd_captcha, etc
2) POST requests are now limited to 20Mb and are fully downloaded
into the memory for further processing (by ejabberd_web_admin,
mod_bosh, etc)
3) PUT requests (e.g. for mod_http_upload) are handled by read/write
loop with 64kb buffer
2018-05-14 19:39:58 +03:00
cb3bb710bd
Handle muc_register_nick success correctly ( #2415 )
2018-05-14 12:24:56 +02:00
c30715e67b
Disable thumbnails creation by default
2018-05-11 18:56:31 +03:00
27594db029
Support IPv6 connections for PostgreSQL, MySQL and LDAP
...
Fixes #2411
2018-05-11 16:43:49 +03:00
6ac8f6eaee
Relax check for valid command name in access_persmissions
2018-05-11 12:24:00 +02:00
338d27b45b
Use never version of moka
2018-05-09 10:58:00 +02:00
35a076c251
Stop ejabberd initialization on invalid/unknown options
...
Since now, ejabberd doesn't ignore unknown options and doesn't
allow to have options with malformed values. The rationale for
this is to avoid unexpected behaviour during runtime, i.e. to
conform to "fail early" approach. Note that it's safe to reload
a configuration with potentialy invalid and/or unknown options:
this will not halt ejabberd, but will only prevent the configuration
from loading.
***NOTE FOR PACKAGE BUILDERS***
This new behaviour should be documented in the upgrade notes.
2018-05-09 11:44:24 +03:00
680384c342
Reduce IQ handler code copying
2018-05-09 10:30:00 +03:00
11ff2a1ccf
Fix a typo
2018-05-09 09:44:26 +03:00
3ac1675919
Option watchdog_admins has no effect anymore
2018-05-08 23:47:37 +03:00
de85c1718e
Bypass account creation error when password is empty, caused by extauth
2018-05-08 18:19:07 +02:00
46f47db512
Get rid of unused rebar instructions
2018-05-08 16:17:07 +03:00
6811b92a80
Don't use warnings_as_errors in samerlib
2018-05-08 11:37:20 +02:00
8766854870
Get rid of ?FUNCTION_NAME macro (it's OTP19+ feature)
2018-05-08 12:06:58 +03:00
61ae0ff02c
Improve logging of external authentication failures
2018-05-08 09:36:34 +03:00
5522403e8e
Don't stop on out-of-date requests
2018-05-07 22:43:01 +03:00
b23d5754e8
Improve robustness of external authentication backends
...
Now all external ports are attached to supervising processes
and requests are balanced in round-robin manner until the pool
is exhausted.
The commit also deprecates `extauth_instances` option and introduces
`extauth_pool_size` option instead, with the default value of a number
of logical processors (i.e. CPU cores).
Fixes #2403
2018-05-07 19:27:18 +03:00
b1a03cc346
Make trusted_proxied ejabberd_http option accept ip masks
2018-05-04 09:53:07 +02:00
ca94cbfd31
Teach acl ip matching about ipv4 mapped ipv6 addresses
2018-05-04 09:52:06 +02:00
410db89167
ejabberd_auth: Don't use cache if it's disabled
...
Don't let the check whether a user exists use the cache if caching was
disabled in the configuration.
2018-05-03 00:31:33 +02:00
638f2d2e67
mod_blocking: Use #block_item{} record
2018-05-02 22:17:32 +02:00
56ee6f0518
Ignore any policy when signing a certificate for the test suite
2018-05-02 10:52:46 +03:00
4e83fc41d4
Also generate CA certificates for the test suite
2018-05-02 10:28:22 +03:00
4ea481d1dd
Add validator for 'accept_interval' listening option
2018-04-30 11:52:00 +03:00
0bd4d1aade
Update mix.exs version
2018-04-25 12:30:36 +02:00
d49aa429ca
Update deps
2018-04-25 10:45:18 +02:00
316a19d600
Merge pull request #2399 from 4z3/ejabberdctl-fix-parser
...
ejabberdctl: fix parameters parsing
2018-04-25 10:39:19 +02:00
c43037887a
ejabberdctl: fix parameter parsing
2018-04-25 00:41:30 +02:00
538e0d4844
misc: Catch all Base64 decoding errors
2018-04-24 18:29:10 +02:00
f3795e9d03
mod_http_upload: Add MIME type for M4A files
2018-04-24 18:16:16 +02:00
3df919244c
PubSub purge_node must use a transaction ( #2231 )
2018-04-24 15:58:56 +02:00
67773c5174
Merge branch 'master' of github.com:processone/ejabberd
2018-04-24 14:44:58 +02:00
61dee97738
Pubsub creation/modification use varchar ( #2397 )
2018-04-24 14:44:52 +02:00
6774418a7f
Introduce new mod_muc option: access_register
...
The option is an ACL rule defining who is able to register
nicknames within the conference service. The default is `all`
(for backward compatibility).
2018-04-24 12:29:59 +03:00
ad6fcc7865
Get rid of useless memory/disk usage warnings
2018-04-24 12:12:48 +03:00
ca28faa51a
Fix get_affiliation/2
2018-04-24 12:07:10 +03:00
5b730cdbf2
Use httpc directly instead of using p1_http wrapper
2018-04-23 17:40:44 +02:00
9ed0357760
Use correct headers in rest calls
2018-04-23 12:29:56 +02:00
06ce884aa8
Add stubs for affiliation-specific backend callbacks
2018-04-23 11:35:43 +03:00
3fc0eb4f5b
Use correct db backend for remove_mam_for_user_with_peer
2018-04-20 14:06:23 +02:00
3bfa683586
Fix mnesia call in mam archive management function
2018-04-20 13:36:54 +02:00
5be49cc0fa
Add commands for cleaning up mam archive
2018-04-20 13:27:46 +02:00
42c029d5f7
Fix type of rest:url/2
2018-04-19 13:21:33 +02:00
a567abcfdf
Fix deprecated call injected by 265c7b62
2018-04-18 14:16:56 +02:00
265c7b62c7
Add flexibility on rest url config
2018-04-18 13:16:08 +02:00
332567693c
mod_push_keepalive: Reset timeout on messages only
...
Some mobile apps might only be notified on actual chat messages with
a body, so don't let mod_push_keepalive reset the stream management
timeout on other types of traffic.
2018-04-17 00:27:07 +02:00
de7dc4affa
mod_push: Optionally include message sender/body
...
Add 'include_sender' and 'include_body' options. If one or both of them
are set to 'true', a urn:xmpp:push:summary form with the enabled
field(s) is included in push notifications that are generated for
messages with a body.
The 'include_body' option can instead be set to a static text. In this
case, the specified text will be included in place of the actual message
body. This can be useful to signal the push service whether the
notification was triggered by a message with body (as opposed to other
types of traffic) without leaking actual message contents.
2018-04-16 23:18:03 +02:00
48c5ab59f1
mod_http_upload*: Remove empty lines after specs
...
Remove blank lines following function specifications in mod_http_upload
and mod_http_upload_quota for consistency with other modules.
2018-04-16 18:22:54 +02:00
b2855d63a7
mod_http_upload*: Add function specifications
2018-04-16 18:17:28 +02:00
0282cf64a0
mod_push: Add function specification
2018-04-16 18:14:07 +02:00
e5cb9dad40
mod_push: Add/adjust debug messages
2018-04-16 18:12:46 +02:00
ec819b4002
Update MUC MAM tests
2018-04-16 16:10:44 +03:00
acc162f4f4
Carefully validate options list
2018-04-16 15:48:06 +03:00
b8505f3e78
Don't crash on invalid module's sub-options
...
Fixes #2387
2018-04-16 11:06:57 +03:00
8a71e2e4f7
mod_push: Don't notify on stream errors
...
If a pending stream management session is closed with a stream error,
this is usually due to the client opening a new stream that conflicts
with the old one. Don't generate a push notification in this situation.
2018-04-16 01:08:56 +02:00
a5284229cb
Merge branch 'muc-self-presence'
2018-04-14 18:32:12 +03:00
d0f36537fb
Clear fast_tls cache on configuration reload
2018-04-13 11:10:20 +03:00
3cf4fbc7b0
mod_roster: Use 'lserver' for configuration lookup
2018-04-13 00:12:07 +02:00
fe4b1a492c
Fix notification payload generated by pubsub
2018-04-12 18:02:32 +02:00
c3b4b4ce4f
Pass access option from websocket to c2s
...
This fixes issue #2223
2018-04-12 17:42:59 +02:00
95244c3b6f
Fix csi tests
2018-04-12 17:08:27 +02:00
89d91b609a
New schema support for tests. ( #2355 )
2018-04-12 15:42:43 +02:00
d28064518b
Improve pubsub#itemreply implementation ( #2325 )
2018-04-12 15:38:12 +02:00
7627575856
Update the xmpp dependency to support 'parent' attribute
...
Fixes #2375
2018-04-11 09:34:06 +03:00
99444f2d0e
Fix illegal match on previous commit
2018-04-10 15:02:03 +02:00
4c0f87b2ff
Improve fix for #2288 , don't mask errors on get_item
2018-04-10 14:47:18 +02:00
54363f8476
gen_mod: Support global module processes
2018-04-04 18:25:19 +02:00
094f586811
gen_mod: Remove frontend process support
...
ejabberd doesn't support frontend processes anymore.
2018-04-04 18:22:59 +02:00
45a3c7e0ce
Improve mod_multicast
2018-04-04 12:06:35 +02:00
e2652ce02f
mod_http_upload: Accept characters of any script
...
Accept all alphanumeric characters of any script in user and file names
rather than replacing non-ASCII characters with underscores. However,
non-alphanumeric characters are still replaced, except for "." and "-".
Closes #2346 .
2018-04-03 21:00:15 +02:00
df651d893e
Remove old hex conversion functions
...
Depend on list_to_integer/2 and integer_to_list/2 being available.
2018-04-03 00:21:33 +02:00
a2e1f5c882
Move ejabberd_http:url_encode/1 to 'misc' module
2018-04-03 00:12:43 +02:00
7f5796fe31
Fix Code format when logging a MUC room kick/ban
2018-04-02 13:51:19 +02:00
5f1191b9f5
mod_client_state: Add 'csi_activity' hook
...
Closes #2358 .
2018-04-01 17:13:04 +02:00
0041a11c4a
Merge pull request #2357 from Pouriya-Jahanbakhsh/component-send-packet-hook
...
feat: add hook for sending packet from component
2018-03-30 21:51:03 +03:00
e17a16a300
fix: run 'component_send_packet' hook in global mode
2018-03-30 23:19:33 +04:30
7b3d26992b
feat: add hook for sending packet from component
...
New hook 'component_send_packet' added.
Callback function must accept one argument {Pkt, ComponentState} and should yield 'drop' or {NewPkt, NewComponentState}.
2018-03-30 21:31:30 +04:30
9373ad20ca
Don't produce a crash dump during intentional exit
...
Also halt faster without relying on timeouts for buffers flushing
2018-03-29 12:14:31 +03:00
b283cfa6f2
Remove unused variable
2018-03-29 10:34:09 +03:00
a84771fd14
Merge pull request #2351 from rom1dep/config-order_c2s-direct
...
config: move section about direct-tls for c2s just under regular c2s config
2018-03-29 08:32:13 +03:00
2bb6782bee
config: move section about direct-tls for c2s just under regular c2s config (to ease parameters comparison)
2018-03-28 23:17:43 +02:00
ae151927ae
Add support for PATCH http method
...
This is needed to improve out APIs.
2018-03-28 17:34:47 +02:00
dfbdffad44
Fix process_discoitems_result in mod_multicast
2018-03-28 11:23:28 +02:00
d71bc73271
Update eimp
2018-03-26 16:18:29 +02:00
ea9c3fd8f7
Fix returning value from mod_vcard_ldap's search() callback
...
Fixes #2335
2018-03-25 10:53:46 +03:00
f3b3bffec0
Get rid of 'fs' package dependency in mix
2018-03-23 14:48:17 +01:00
f39dbe6e49
Get rid of 'fs' package dependency
...
Certificates auto-reloading will be fixed later.
For now to reload certificates call `reload-config` ejabberd command.
2018-03-23 16:40:26 +03:00
75450a62b3
Clarify the statement about mod_http_upload thumbnails
2018-03-23 16:19:13 +03:00
a15039638b
Force node config for bookmarks
2018-03-23 16:16:27 +03:00
50de427570
Set empty least as a default for force_node_config
2018-03-23 16:09:18 +03:00
55604b2d97
Move force_node_config defaults into ejabberd.yml.example
2018-03-23 16:08:12 +03:00
92bc5dc85b
Update mix deps
2018-03-23 13:27:58 +01:00
baf2473688
Update mix.exs version
2018-03-23 12:56:17 +01:00
f5bab5d6c4
Fetch 'registration_watchers' option from the correct module
...
Fixes #2337
2018-03-23 09:42:55 +03:00
b23be02dfe
Update deps
2018-03-22 16:15:19 +01:00
0bda169a5a
Remove items of unregistered user ( #2129 )
2018-03-22 11:59:24 +01:00
96c183c04b
Accept atoms in api_permission command lists and commands with numbers in them
2018-03-21 12:53:46 +01:00
b293e99aee
Add option --enable-group=xxx (thanks to andreabenini)( #1429 )
2018-03-20 23:39:07 +01:00
b4b3ff50d6
If mod_last is disabled, return error instead of crashing ( #2330 )
2018-03-20 22:18:43 +01:00
8962397cf3
Report meaningful error when luerl is not available
2018-03-19 20:09:35 +03:00
b1ecd8ac01
Set -protocol() directive for mod_avatar
2018-03-19 19:23:15 +03:00
4f1d7c4b66
Avoid logging IP addresses in mod_register when it's not desired
...
Fixes #2326
2018-03-19 18:23:52 +03:00
bb20e5f3fa
Apply some dirty hacks for mod_shared_roster
...
Probably this fixes #1846
2018-03-19 12:32:43 +03:00
e1e7986918
Hardcode ACL rules used by ejabberd_web_admin
2018-03-19 12:29:07 +03:00
7ba6fae67c
Improve result of XEP-0060 §6.5.9.12 ( #2288 )
...
Moving get_item result control to keep item-not-found on transaction
error when node does not exists
2018-03-17 10:59:34 +01:00
7beb19b01e
Fix result of XEP-0060 §6.5.9.12 ( #2288 )
2018-03-16 17:48:42 +01:00
a84dd0f627
Add transient notification condition ( #2267 )
2018-03-16 17:26:51 +01:00
d8f9219b4f
Refactor publish_item conditions ( #2267 )
2018-03-16 17:17:53 +01:00
ddc29d42de
Fulfill all requirements of XEP-0398 v0.2.0
...
These include:
- Avoid rewriting vcard:x:update tags with empty <photo/> element
- Advertise "urn:xmpp:pep-vcard-conversion:0" feature
2018-03-16 12:10:57 +03:00
e15595df64
Add 'new_sql_schema' config option, --enable-new-sql-schema now sets its default value to true ( #2239 )
2018-03-15 17:55:05 +03:00
99b41146b1
Get rid of catch-all in mod_pubsub
2018-03-13 22:10:58 +03:00
6b079c0ab3
Preserve modules order
...
When modules for some virtual host are about to be started,
they are topologically sorted to preserve dependencies order.
We now keep this order for stop/reload functions to work properly.
2018-03-13 18:18:53 +03:00
c5aea779b4
Merge pull request #2314 from oxpa/mod_admin_extra_hashes
...
allow using hashes from "crypto" applications in mod_admin_extra
2018-03-12 15:20:53 +01:00
be33c93344
Return errors in admin#add-user command response stanza ( #2321 )
2018-03-12 13:33:44 +01:00
2785f1dfd2
Introduce force_node_config for mod_pubsub
...
The option can be used to override configuration options of a
particular PubSub node. Example:
mod_pubsub:
...
force_node_config:
"eu.siacs.conversations.axolotl.*":
access_model: whitelist
"*":
persist_items: true
Fixes #2276
2018-03-11 16:54:35 +03:00
b179874ec6
Add mod_fail2ban to the example config
2018-03-10 21:41:55 +03:00
c3eeb8624b
Strip duplicates from module's options
2018-03-07 17:46:16 +03:00
bc808ffcde
mod_stream_mgmt: Clean up on timed out resumption
...
During resumption, make sure the old process and the corresponding
session entry are disposed also in the case where the call that queries
the old process times out.
2018-03-06 21:03:31 +01:00
d9bf5a6865
Don't forget to remove mgmt_force_enqueue flag
2018-03-06 16:18:03 +03:00
67fe5d38a7
mod_push_keepalive: Preserve timeout on resumption
...
Don't forget to carry over the original XEP-0198 resumption timeout
value while resuming.
2018-03-05 01:10:12 +01:00
63dba3fd64
Merge branch 'master' into muc-self-presence
2018-03-03 21:09:27 +03:00
da1a5036fe
Revert "Support for default values in default_room_opts"
...
This reverts commit 5054a9933f
2018-03-03 21:08:05 +03:00
0d3637d18f
Simplify ejabberd_sup code
2018-03-03 18:05:12 +03:00
f2a3118ecc
allow using hashes from "crypto" applications in mod_admin_extra
2018-03-02 04:10:30 -09:00
dbf1cabdcd
Fix: mod_offline:store_offline_msg/1 expects a message, not list ( #2312 )
2018-03-02 11:44:10 +01:00
ad0fd1eac1
Simplify result of get_room_affiliation command ( #2301 )
2018-03-01 19:45:16 +01:00
3003307e60
Merge pull request #2301 from tsaqova/ejabberd_commands_get_room_affiliation
...
add ejabberd_command to get affiliation of a user in MUC room
2018-03-01 19:37:55 +01:00
76f827ac83
Increase log level for DIGEST-MD5 FQDN
...
SASL DIGEST-MD5 anyway deprecated anyway, so not point in
logging this. This is now logged in `debug` mode.
2018-02-28 21:43:43 +03:00
b5138a8ddb
Merge pull request #2311 from nosnilmot/validate-listen-opts
...
Validate additional listen opts
2018-02-28 19:37:57 +03:00
da81590fef
Validate additional listen opts
...
The options "inet", "inet6" and "backlog" are valid listen options, but are
currently logged as errors (even though they do work):
2018-02-28 16:08:44.141 [error] <0.338.0>@ejabberd_listener:validate_module_option:630 unknown listen option 'backlog' for 'ejabberd_c2s' will be likely ignored, available options are: access, shaper, certfile, ciphers, dhfile, cafile, client_cafile, protocol_options, tls, tls_compression, starttls, starttls_required, tls_verify, zlib, max_fsm_queue
This adds the necessary validators so they are correctly recognized.
2018-02-28 16:14:35 +00:00
8a41cfc0f5
add ejabberd_command to get affiliation of a user in MUC room
2018-02-28 20:22:27 +07:00
5054a9933f
Support for default values in default_room_opts
2018-02-26 17:22:37 +01:00
5912c573ea
Use length on fields in mysql indexes
2018-02-26 09:43:04 +01:00
b2095ebcfe
Simplify code for splitting auth string in cyrsasl
...
This may fix problem from issue #2296
2018-02-26 09:36:56 +01:00
0a67cdfb16
Merge pull request #2304 from weiss/run-auth-callbacks-earlier
...
Run SASL result callbacks earlier
2018-02-26 09:04:32 +03:00
c2235860ab
xmpp_stream_in: Run auth result callbacks earlier
...
Call Mod:handle_auth_success/4 and Mod:handle_auth_failure/4 before
sending the SASL response rather than afterwards. This way, callbacks
can send a custom response and disconnect.
2018-02-26 00:06:35 +01:00
22e43ebd8a
mod_stream_mgmt: Cope with exit during resumption
...
Don't crash if the old process exits while it is queried for the session
state.
2018-02-24 21:50:54 +01:00
35be7d2718
Merge pull request #2299 from weiss/add-username-to-indexes
...
Add username to peer indexes for MAM lookups
2018-02-24 07:41:44 +03:00
f7566bd00e
sql/*: Add username to peer indexes
...
The username is available for all MAM queries in question, and adding it
to the indexes can improve the lookup performance significantly.
2018-02-24 00:50:20 +01:00
5bf753fd2d
Merge pull request #2297 from af8a524db1/move_make_rand_string
...
Move make_rand_string() to 'randoms' module
2018-02-23 20:35:37 +03:00
c1e5ae5308
Move make_rand_string() to 'randoms' module
2018-02-23 18:32:34 +01:00
ea87bdfbe5
mod_carboncopy: Apply cosmetic change
...
The xmpp:has_subtag/2 function returns a boolen() value, so it can be
used with the 'not' operator.
2018-02-22 00:46:47 +01:00
7a1ed065fe
mod_carboncopy: Copy outgoing MUC PMs
...
Incoming MUC PMs aren't carbon-copied, as the MUC service usually forks
them. However, don't suppress copying of outgoing PMs, where no such
forking takes place.
2018-02-22 00:40:09 +01:00
ec0f0f7c72
Move some log messages to debug level
2018-02-21 17:12:50 +03:00
0acc69e303
Use nicks in disco#items or disco#info report
2018-02-21 10:25:15 +03:00
4bf4193d55
Add 'negotiation_timeout' to the known options list
2018-02-20 19:47:50 +03:00
d625e24029
Introduce 'negotiation_timeout'
...
The option can be used to specify a period (in seconds) for a stream
negotiation to complete. If the timer fires, the stream is considered
as failed and the underlying connection gets closed. This is a global
option (you cannot set it per domain) and the default is 30 seconds.
2018-02-20 11:38:00 +03:00
a875195940
mod_admin_extra: Fix srg_get_info with '@all@'
...
Don't let the srg_get_info command crash if the roster group has '@all@'
or the '@online@' users as members.
2018-02-20 00:44:47 +01:00
06c480106f
Don't emit validator's warning if the module is not found
2018-02-19 22:07:09 +03:00
e070e6bccb
Replace ?MYLANG with connection's language wherever possible
2018-02-19 21:47:20 +03:00
de49e7631f
Push blocking related IQs from bare JID
...
Fixes #2287
2018-02-18 18:00:20 +03:00
25abf8b634
Don't inject node name inside "id" attribute
...
Fixes #2284
2018-02-18 11:54:40 +03:00
ff06bdf144
Don't ask other nodes to invalidate cache when the key is not updated
2018-02-18 09:02:23 +03:00
d5afc767e6
Fix 'badmatch' crash
...
The crash was introduced in 4b012a99d2
2018-02-17 20:06:50 +03:00
5704a980c5
Introduce 'access' option for mod_block_stranger
...
The option is supposed to be used when `allow_local_users`
and `allow_transports` are not enough. It's an ACL where `deny`
means the message will be rejected (or a CAPTCHA would be
generated for a presence), and `allow` means the sender is
whitelisted and the stanza will pass through.
The default value is `none`, which means nothing is whitelisted.
2018-02-17 18:53:35 +03:00
cffdb06b66
Cache 'isuser' queries to external auth program
2018-02-16 20:50:22 +03:00
f5d208441d
Improve example extauth script
2018-02-16 20:34:09 +03:00
71a856deaa
Handle gracefully that mnesia is already loaded when starting tests
2018-02-16 16:49:48 +01:00
7e1df0752a
Export helper function
2018-02-16 09:53:38 +01:00
f0ccdebf7f
Export helper functions
2018-02-16 09:52:29 +01:00
32e5a3255d
Export aux functions from mod_muc_room
2018-02-16 08:28:33 +03:00
c102a45fac
Rename some keys and functions for clarity
2018-02-15 15:50:20 +03:00
52ded14b7f
Update incoming stanzas counter on invalid XML
2018-02-15 15:42:55 +03:00
e5ba7c3f3c
Better solution for a previous fix
2018-02-15 10:48:59 +03:00
51aa9d98a7
Don't forget to add invalid XML responses to sending queue
2018-02-15 10:18:06 +03:00
a65500b6aa
Fix external components unregistration
2018-02-14 13:09:27 +03:00
032f796292
Introduce option 'global_routes' for ejabberd_service
...
The option emulates legacy behaviour which registers all routes
defined in `hosts` on a component connected. This behaviour
is considered harmful in the case when it's desired to multiplex
different components on the same port, so, to disable it,
set `global_routes` to `false`. The default value is `true`,
e.g. legacy behaviour is emulated: the only reason for this is
to maintain backward compatibility with existing deployments.
2018-02-14 11:53:52 +03:00
516f4d03a1
Fix indentation
2018-02-14 11:42:43 +03:00
60a8623929
Change formatting of commands markdown documentation
2018-02-13 16:27:39 +01:00
9dbdeba6c1
Add case on create_room, avoid useless call
2018-02-13 11:08:13 +01:00
4632f5520f
Really run use_cache/1 and cache_nodes/1 callbacks for mod_mam
2018-02-13 11:38:41 +03:00
ffe02c46e4
Let a MUC room to route presences from its bare JID
...
The goal for this is to provide entity capabilities (XEP-0115) and
vCard-based avatar hash (XEP-0153)
2018-02-12 17:37:36 +03:00
42794ce4e4
Merge pull request #2274 from Torxen/feature/fixed-return-value-mod_muc
...
Issue: mod_muc.erl expect wrong return value
2018-02-12 17:36:47 +03:00
9188a7b838
Dialyzer checks always failed because the return value of the function 'get_subscribed_rooms' in 'mod_muc_sql' is different to the defined value in 'mod_muc'. Fix was to update the return value in 'mod_muc.erl'.
2018-02-12 15:12:46 +01:00
66fc1bf3b6
Remove 'iqdisc' option
...
Since we got rid of all bottle-neck processes and we have
a connection pool for every database, the option is no longer
needed and in fact is detrimental: in practice what you get
is just a bunch of overloaded processes in the IQ handlers pool
no matter how much you increase the `iqdisc` value.
Given that there are close to zero operators understanding
the meaning of the option and, hence, not using it all,
it's not simply deprecated but completely removed.
The commit also deprecates the following functions:
- gen_iq_handler:add_iq_handler/6
- gen_iq_handler:handle/5
- gen_iq_handler:iqdisc/1
2018-02-11 12:54:15 +03:00
11a58f8dff
Bump xmpp version
2018-02-11 09:45:54 +03:00
97f913b8d9
Merge branch 'master' of github.com:processone/ejabberd
2018-02-10 11:36:48 +03:00
6c1a1bd000
Rely on use_cache/1 callback in mod_caps
2018-02-10 11:36:39 +03:00
9fb2253aa9
mod_stream_mgmt: Abort connection on count error
...
If the client acknowledged more stanzas than the server sent, close the
connection with a stream error rather than hiding client bugs by silently
adjusting the server's count.
2018-02-10 00:06:19 +01:00
672c2f75d3
Introduce option 'validate_stream'
...
If set to `true`, all incoming XML packets are fully validated
against known schemas. If an error occurs, the packet will be bounced
with the corresponding error reason. The default value is `false`.
The option might be useful to protect client software from sofisticated
bugs related to XML validation as well as for client developers
who want to catch validation errors at early stage of development.
Note that the option might have slight performance impact, so use it
with care on loaded machines.
2018-02-09 18:12:50 +03:00
5c85106a41
Fix type spec
2018-02-07 22:20:12 +03:00
c2911222e4
Commands markdown also lack arguments when policy=user
2018-02-07 16:39:18 +01:00
232b66b0f4
Introduce 'rate_limit' option of mod_avatar
...
The option controls how many avatars a user can upload per minute.
The option takes positive integer values. The default is 10.
Note that the option only takes effect when an avatar is about
to convert to a different format, i.e. it implies that `convert`
option is configured.
2018-02-05 23:12:36 +03:00
3327da72a6
Merge branch 'master' of github.com:processone/ejabberd
2018-02-05 15:13:23 +03:00
c65dcfeda7
Export is_online/1 function
2018-02-05 15:13:13 +03:00
411d1711a0
Merge pull request #2266 from mieciu/master
...
Fix MySQL ERROR 1170 (42000) 'server_host'
2018-02-05 13:04:25 +01:00
bef7d1ba66
Fix MySQL error server_host used in key specification without a key length
2018-02-05 12:33:59 +01:00
c990abf222
Improve log message when module startup has failed
2018-02-02 13:16:14 +03:00
983aaac765
Another try to fix travis
2018-01-31 17:54:32 +01:00
0f25e59143
Properly escape string in travis config
2018-01-31 17:10:05 +01:00
2a77805072
Print something when doing tests in travis, as not doing that get us killed
2018-01-31 17:03:18 +01:00
b86402f3e7
Don't run tests in verbose mode on travis
2018-01-31 16:10:09 +01:00
f6ebbe4c78
Fix compilation ordering in mix by s/-behavior/-behaviour/
2018-01-31 14:57:43 +01:00
485f8e48e5
Fix mod_roster start invocation in elixir tests
2018-01-31 09:34:54 +01:00
51f652a1e1
Fix elixir tests
2018-01-30 19:45:12 +01:00
fc3c605945
Use correct default when getting list of modules from config
2018-01-30 19:44:27 +01:00
69de43d5ee
Remove line left from debugging
2018-01-30 18:37:17 +01:00
ad4ffce788
Start ejabberd_config earlier
2018-01-30 18:24:47 +01:00
cd82a9d534
Disable riak in travis
2018-01-30 15:31:07 +01:00
3b646cc2ec
Run tests only on backends enabled by configure
2018-01-30 15:30:37 +01:00
bb58307190
Match all possible values in mod_privilege checks, or we get crashes
2018-01-30 13:10:22 +01:00
53870c854e
Fix exception in mod_privilege:process_presence_in
...
This should fix problem reported in issue #2248
2018-01-30 12:52:38 +01:00
b69fb5aae0
Bump sqlite deps version
2018-01-30 12:51:38 +01:00
ddf6076328
Fix elixir tests
2018-01-29 18:28:02 +01:00
d2974cf48a
Fix processing of ldap_memberattr_format_re option
...
This makes sure that "" value is handled as before options processing
overhaul.
This fixed ldap shared roster testcase
2018-01-29 17:25:31 +01:00
dc601610b6
Don't return undefined from ejabberd_config:get_myhosts()
2018-01-29 11:05:59 +01:00
719dfe12f6
Use named functions instead of carrying self as argument
2018-01-29 10:02:20 +01:00
c47366ba97
Restore original return value to ejabberd_config:add_option
2018-01-29 09:46:11 +01:00
1b26c8d214
ejabberdctl: Omit redundant erl option
...
The "-detached" flag implies "-noinput".
2018-01-29 01:16:20 +01:00
f31782a252
mod_caps: Only store CAPS if contact is subscribed
...
If a user is subscribed to a contact but not vice versa, don't store the
contact's CAPS. This makes sure no PEP items are leaked to the contact.
2018-01-29 01:07:38 +01:00
d0af61f488
mod_caps: Fix indentation
2018-01-29 00:02:15 +01:00
795efb2ee1
Improve logging of idle s2s connections
2018-01-28 11:10:22 +03:00
6e5439db5c
Find and fix typos using 'codespell'
2018-01-27 19:35:38 +03:00
5d582080be
Fix a typo in call to create_captcha()
...
Thanks to Paul Schaub for spotting this
2018-01-26 22:56:49 +03:00
4b012a99d2
Introduce option 'captcha' for mod_block_strangers
...
When the option is set to `true`, the module will generate
CAPTCHA challenges for incoming subscription requests. The option
also implies that option `drop` is set to `true`. Note that
the module won't generate CAPTCHA challenges for messages: they
will still be rejected if `drop` is set to `true`.
Fixes #2246
2018-01-26 15:02:06 +03:00
7e561dd20a
Fix more tests
2018-01-25 18:43:34 +01:00
2afdde84ea
Adopt tests to changes in xmpp
2018-01-25 18:24:05 +01:00
2269d290d8
Switch to newer fast_xml and xmpp and update record fields in the code
2018-01-25 20:02:47 +03:00
56d4224e08
Handle ignore from xmpp_socket callback start
...
This should help with issue #2244
2018-01-24 17:32:24 +01:00
666da60cba
Reduce log level for unexpected XML input
...
Log a warning rather than an error when, for example, a client sends a
stanza before opening the stream.
2018-01-24 12:04:52 +01:00
e8f1de8785
mod_block_strangers: Bounce groupchat to bare JID
...
If a blocked message is of type 'groupchat', address the error message
to the bare JID (rather than sending it as MUC PM).
2018-01-24 11:49:31 +01:00
1f6c0022dd
Fix a typo in mod_caps
2018-01-23 23:20:10 +03:00
6cdb7b4468
Fix tag used in luerl dependency
2018-01-23 09:37:46 +01:00
a917f4d451
Merge branch 'mod-default-options'
2018-01-23 11:00:00 +03:00
ba2b650464
Introduce new gen_mod callback: mod_options/1
...
The callback is supposed to provide known options and their default
values, as long as the documentation. Passing default values into
get_mod functions is now deprecated: all defaults should be provided
by the Mod:mod_options/1 callback.
2018-01-23 10:54:52 +03:00
121d12f4d1
Move luerl as optional tools dependency
2018-01-22 17:42:27 +01:00
7abd13974b
Remove deps override on mix
2018-01-22 17:42:02 +01:00
ae86af9399
Merge remote-tracking branch 'processone/pr/2238'
...
* processone/pr/2238:
Fix typo /this/it/
2018-01-21 15:05:05 +01:00
a0c8cac1b6
Fix typo /this/it/
2018-01-21 13:44:30 +00:00
818ff5a263
Update 'pubsub_node' column name for DB export
...
The 'type' column has been renamed in commit
44700d91ba
2018-01-19 13:10:14 +01:00
c0ef054f6f
Do not try to start ezlib application too frequently
...
This may overload Erlang applicaton controller
2018-01-16 18:06:31 +03:00
d35a8805b0
Return debug message back
2018-01-16 17:57:21 +03:00
1daa7ef785
Sync mix and rebar for eimp dep
2018-01-16 11:45:29 +01:00
7b0fa7e6e2
Improve validation of 'convert' option
2018-01-16 01:06:20 +03:00
8bdccc25ab
Include acme deps in release, fixes f2c3fe8ac
2018-01-15 22:21:24 +01:00
59b7c89944
Use correct name of new rebar command
2018-01-15 15:21:04 +01:00
a7639fd4ad
Call configure on deps in separate rebar command that compile
...
This way we rebar.config.script can use vars detected by configure
2018-01-15 12:31:47 +01:00
99f8e58eaf
Use override syntax that rebar3 accepts
2018-01-15 11:56:20 +01:00
d3aab2ea18
Get rid of a call to misc:have_eimp()
2018-01-15 13:14:51 +03:00
b970c88941
Merge branch 'master' of github.com:processone/ejabberd
2018-01-15 13:00:19 +03:00
0f86559d83
Always build eimp dependency
...
Even if no suitable C graphics libraries are detected
at compile time, the package is still usable because it
provides `eimp:get_type/1` which is used by mod_avatar.
2018-01-15 12:54:57 +03:00
be592c9272
Don't report errors when trying to remove not existing files in make install
2018-01-15 10:38:36 +01:00
3df78d3a8f
Copy sh_to_ask function from xmerl_regexp.erl
...
This way we don't need to include xmerl application in our docker container
2018-01-15 10:31:26 +01:00
d2427c98c3
Merge pull request #2221 from licaon-kter/patch-1
...
Fix example config macro names
2018-01-14 09:54:22 +03:00
84819ba0fe
Fix example config macro names
...
These were missed in https://github.com/processone/ejabberd/commit/c26b56679e06ef8b88734030de11c6b885f9bb78#diff-19e0c10699732f76181f70cfbec95d38 I guess.
2018-01-13 21:38:01 +00:00
f66a004821
Improve logging of failed s2s EXTERNAL authentication
2018-01-13 13:01:40 +03:00
e1da673502
Fix detection of rebar3
...
Looks like sometimes rebar3 report version that can't be split to 3 fields
by '.', we need only first one so don't match the rest
2018-01-12 17:12:46 +01:00
7d58b7a100
Improve resolving of system deps
...
This version is able to search for know alternative names of deps and
helps with running tests when using system deps
2018-01-12 16:16:12 +01:00
f2c3fe8ac6
Add mix dependencies for acme support
2018-01-12 12:28:31 +01:00
1c1b12fc64
Note about direct-tls connections in example config
2018-01-12 10:27:33 +03:00
1825cfaf05
Include newly releases fast_tls/esip/stun in mix.lock
2018-01-11 14:38:54 +01:00
b8319c6617
Update mix.lock
2018-01-11 11:20:07 +01:00
9e3a000748
Update deps
2018-01-11 11:11:56 +01:00
d6e1bc242c
Remove old docker specs
2018-01-11 10:19:56 +01:00
465629d458
Prepare mix for 18.01
2018-01-10 23:06:06 +01:00
7875cac786
Update mix deps
2018-01-10 18:14:52 +01:00
d0bfcbbfd8
Handle error case from code:lib_dir in ResolveDepPath in rebar.config.script
2018-01-10 16:34:16 +01:00
88e6f1c6aa
Update mix deps
2018-01-10 12:07:19 +01:00
cea5f14e88
Update deps again
2018-01-10 11:55:34 +01:00
8641c6cb34
Update mix deps
2018-01-10 11:48:53 +01:00
e04b4c52fd
Update deps
2018-01-10 11:32:11 +01:00
1fac3e58b3
Fix indentation in commented example
2018-01-10 11:24:09 +01:00
f914c61f42
Report fs not suported on SunOS ( #2204 )
2018-01-10 10:58:47 +01:00
df8888ab38
Send privileges if at least one of them is set, don't require all to be set
2018-01-09 15:50:42 +01:00
8a05c4ee27
Create CODE_OF_CONDUCT.md
2018-01-09 14:17:55 +01:00
e822ce3554
Merge branch 'master' of github.com:processone/ejabberd
2018-01-08 13:45:21 +03:00
aa9f2e5b88
Ignore result of sending stream trailer in test suite
2018-01-08 13:45:08 +03:00
c5a4f67935
Delete old .so and executable files before installing new one
...
This fixes crash for people who have live ejabberd installed in make install
target directory, by ensuring that loaded binaries aren't replaced in memory
with new content.
2018-01-08 11:11:50 +01:00
2b0cc2ddb4
Make all install target rules as .PHONY
2018-01-08 11:11:50 +01:00
3f8eff27fa
Refactor code for installing binaries
2018-01-08 11:11:50 +01:00
9d94361466
Process 'name' option for all route-registering modules
...
The option allows to set arbitrary text for disco#info identity name.
Previously, option 'name' was supported by mod_proxy65 and mod_http_upload
only. Now, all the following modules support this option as well:
- mod_disco
- mod_irc
- mod_muc
- mod_multicast
- mod_pubsub
- mod_vcard
Example:
```
modules:
...
mod_disco:
name: "Cool XMPP Server"
...
```
2018-01-08 11:29:17 +03:00
150f33b39b
Update copyright dates in header files
2018-01-06 14:01:45 +03:00
2d23dfccfd
Don't display copyright dates in vCards of services
...
Copyright dates in vCards may paritally disclose server version,
which is not always desired
2018-01-06 13:55:24 +03:00
ee23b688a7
Use TLS defaults from fast_tls
2018-01-06 13:46:02 +03:00
cdc7c1d1ed
Update copyright dates
2018-01-05 23:18:58 +03:00
da2353d996
Refer to new fast_tls version
2018-01-05 17:56:32 +03:00
fb07c9929a
Return true or false from send() callback
...
Fixes #2209
2018-01-05 12:15:28 +03:00
946754536c
Merge pull request #2202 from weiss/bounce-to-stranger
...
mod_block_strangers: Bounce an error message
2018-01-05 11:43:18 +03:00
4c799528c7
Fix ejabberd command privacy_set
...
This fixes issue #2205
2018-01-04 14:57:36 +01:00
dbbe3a9e62
Merge remote-tracking branch 'processone/pr/2203'
...
* processone/pr/2203:
mod_proxy65: Expand @HOST@ keyword in 'hostname' option
2018-01-03 22:33:18 +01:00
264add87fa
mod_proxy65: Expand @HOST@ keyword in 'hostname' option
2018-01-03 22:31:06 +01:00
835360733b
mod_block_strangers: Bounce an error message
...
Return a stanza error when a message is rejected, in order to make
legitimate users aware of the issue.
Closes #2197 .
2018-01-03 15:41:30 +01:00
1fcb6d7f36
Make mysql and pgsql one of the default module for Mix
2017-12-29 17:22:59 +01:00
4ae688605f
Regenerated mix.lock file
2017-12-29 17:18:59 +01:00
485100f907
Merge branch 'master' of github.com:processone/ejabberd
2017-12-28 21:37:19 +03:00
240977a0da
Repair hosts check during certfiles validation
2017-12-28 21:36:57 +03:00
cdc9c93b9b
Fix stun/esip mix deps
2017-12-28 15:38:24 +01:00
529d6d8a93
Return default certificate on domain mismatch
2017-12-28 17:24:23 +03:00
dd9281da13
Let mix pass compile ejabberd as dependency
2017-12-28 15:16:29 +01:00
1b8794c991
Update mix spec
2017-12-28 14:43:13 +01:00
48c96dc1a9
Update stun and esip
2017-12-28 14:34:50 +01:00
439fe0b504
Fix check_opt_range when no boundary is configured
2017-12-28 13:51:26 +01:00
e03d41647b
Merge branch 'master' of github.com:processone/ejabberd
2017-12-28 14:01:39 +03:00
23c5fd9a4f
Return send() result to the caller
2017-12-28 14:01:34 +03:00
08e54dd621
Don't force rsm when max_items is not defined ( #2189 )
2017-12-28 11:48:54 +01:00
8918227fc3
Revert "Include os_mon application"
...
This reverts commit 56241feb58
2017-12-28 10:32:21 +01:00
5ba13df519
Revert "Start os_mon application"
...
This reverts commit 82b3bbf360
2017-12-27 17:21:17 +01:00
dd4d45fd28
Fix a regression in xmpp_socket
2017-12-27 18:49:25 +03:00
82b3bbf360
Start os_mon application
2017-12-27 16:23:04 +01:00
d59d4e27ec
Adopt tests to changes introduced by b54e1e49ba
2017-12-27 16:16:15 +01:00
e6d1ff85f1
Use bare jid when processing roster subscriptions
2017-12-27 16:14:47 +01:00
ef6af11f17
Rename mnesiadb
2017-12-27 12:42:55 +01:00
6bdf29676c
Add missing application building with mix
2017-12-27 12:33:52 +01:00
56241feb58
Include os_mon application
2017-12-27 12:28:13 +01:00
9fcc12dca7
Prepare mix for 17.12
2017-12-27 11:42:37 +01:00
bbb1f7002d
Merge pull request #2188 from weiss/fix-acl-reload
...
Forget old access/shaper rules and ACLs on reload
2017-12-27 09:34:19 +03:00
812acf0688
Update the test suite to support new XMPP socket API
2017-12-27 08:55:14 +03:00
60b6a508e0
Forget old access/shaper rules and ACLs on reload
2017-12-26 19:37:11 +01:00
34d09018a7
Add new schemas for SQLite and MySQL
2017-12-26 20:48:15 +03:00
7cdc51becd
Merge branch 'no-more-ejabberd-receivers'
...
Conflicts:
rebar.config
2017-12-26 19:02:54 +03:00
2d43c07c62
Get rid of ejabberd receiver
...
ejabberd receivers were meant to serve connections from frontends
to backends. However, this approach was not popular and frontend
related code was removed in previous releases. Now, ejabberd receiver's
code was also removed, making the code shorter and cleaner. Also, in
stress tests ejabberd now handles load more robustly, without
c2s processes overload (even with disabled shapers).
ejabberd_socket.erl is renamed to xmpp_socket.erl: it's supposed to
be finally moved into stand-alone xmpp library.
2017-12-26 18:55:57 +03:00
514df9ac18
Cleanup rebar.config
2017-12-26 11:16:48 +01:00
a8c3ed5ed4
Remove obsolete option
2017-12-26 11:13:47 +01:00
e7308b7d86
Update dependencies
2017-12-26 11:13:18 +01:00
4e49919d16
Revert "Don't set twice"
...
This reverts commit 6dca89f616
2017-12-25 08:41:51 +03:00
9ba471e210
Fix a typo in comment :)
2017-12-24 12:53:50 +03:00
6dca89f616
Don't set twice
2017-12-24 12:34:47 +03:00
1698956f34
Rely on Server Name Indication for incoming Direct-TLS connections
...
This commit also deprecates `certfile` option for ejabberd_http
listener.
2017-12-24 12:27:51 +03:00
b54e1e49ba
Don't let privacy list prevent local roster update
2017-12-23 22:45:01 +01:00
5e4c547856
mod_muc_admin: Fix last timestamp retrieval
2017-12-22 14:32:47 +01:00
50b19b47e0
Fix commands rooms_unused_list and _destroy
2017-12-21 17:00:43 +01:00
a3083b5d71
Fix race between join_cluster and ejabberd_mnesia ( #2079 )
2017-12-21 14:07:29 +01:00
32ad7d3761
Disable test for now
2017-12-21 11:49:33 +01:00
7f073fbcd8
Update expected error type in test
2017-12-21 11:43:09 +01:00
826387446a
Let mix aware of unpackaged hex.pm dependencies ( #2170 )
2017-12-21 11:10:56 +01:00
af9183cd54
Add pubsub#multi-items to features list ( #2162 )
2017-12-20 11:54:12 +01:00
242c3c1da5
Fix mix_sql features and options
2017-12-20 11:53:18 +01:00
212d44f419
Merge pull request #2164 from angelo-chan/master
...
add muc_online_rooms_by_regex to mod_muc_admin to filter list online r…
2017-12-19 23:10:20 +01:00
63a60f1cd8
ejabberd_sm: Fix get_session_sid/3
...
Let get_session_sid/3 cope with multiple session table entries for a
given resource.
2017-12-19 18:59:25 +01:00
08ce16f7ca
Change loglevel of TLS failures
2017-12-19 15:33:30 +03:00
051e1be832
send_direct_invitations accepts only user jids
2017-12-19 10:24:07 +01:00
9bccac03f5
Set disk_almost_full_threshold to 99%
2017-12-19 09:55:19 +03:00
c9333f247a
Don't crash on malformed IQ
...
Fixes #2175
2017-12-19 09:15:35 +03:00
c658f871a5
Log a warning when a disk is almost full
2017-12-18 12:30:10 +03:00
a0607f6740
Disable default alarm handler
2017-12-18 12:15:49 +03:00
47c2118fa7
Handle also process_memory_high_watermark alarm
2017-12-18 10:41:11 +03:00
59f4efe3dd
Kill and restart lager when it's overloaded
2017-12-17 21:03:40 +03:00
bd1ff0e897
Fix processing order
2017-12-17 20:19:44 +03:00
5b42fc1d0d
Avoid excessive logging of SQL failures
2017-12-17 19:46:55 +03:00
515f8b22c0
Rewrite ejabberd system monitor
...
Previous version was inefficient: it had a lot of false positives
along with a lot of false negatives, making its usage pointless.
The new verion is based on memsup(3erl) application: the OOM watchdog is
only started when total OS memory consumption is more than 80%.
A watchdog periodically inspects all running processes and collects
statistics about overloaded ones (those queueing a lot of messages).
If the OOM killer is enabled (`oom_killer: true`), all overloaded
processes would be killed. By default, OOM killer is enabled.
When memory consumption is back to normal, the OOM watchdog is stopped.
2017-12-17 18:52:37 +03:00
4352cb9fed
Merge pull request #2167 from weiss/last-pep-items-to-owner
...
Send last PEP items to owner on initial presence
2017-12-14 10:30:03 +03:00
5968bc9318
Send last PEP items to owner on initial presence
...
Closes #2112 .
2017-12-13 18:59:06 +01:00
a65a78ebfe
Merge pull request #2158 from bowlofeggs/su-with-sh
...
Use /bin/sh as the explicit shell when using su in ejabberdctl.
2017-12-13 16:04:25 +01:00
08e642b988
Only allow compression after SASL
...
See XEP-0170 for details
Thanks to Vitaly Takmazov for spotting this
2017-12-13 16:52:44 +03:00
42932fd19e
PubSub: Add missing Nidx building records from sql result
2017-12-13 11:35:36 +01:00
b204f9349f
add muc_online_room_by_regex to mod_muc_admin to filter list online rooms
2017-12-13 11:07:12 +08:00
03246f5ff4
mod_pubsub: Send last items on initial presence
...
Wait until we got initial presence from the client before sending the
last items of nodes the JID is subscribed to.
Closes #2132 .
2017-12-12 12:21:33 +01:00
57e3f49352
Merge pull request #2160 from weiss/publish-options
...
Support pubsub#publish-options PRECONDITIONs
2017-12-12 10:53:17 +01:00
b661bee4b1
Support pubsub#publish-options PRECONDITIONs
...
Support PubSub publishing options that are specified as PRECONDITIONs as
per XEP-0060 v1.14.
2017-12-12 01:04:14 +01:00
47f6fc8dd2
Revert removal of certfile option on http listener
2017-12-11 11:00:24 +01:00
42b2e6c5ab
Update example configuration
2017-12-11 10:27:48 +01:00
303eea5e4d
Fix typos in mod_legacy_auth and mod_register
2017-12-11 10:00:16 +03:00
bd064fa3fc
Use xmpp:try_subtag/2 wherever possible
2017-12-11 09:46:26 +03:00
12d9d97baa
Use /bin/sh as the explicit shell when using su in ejabberdctl.
...
Some distributions (such as Fedora) use /sbin/nologin as the login
shell for the ejabberd user. The newer version of ejabberdctl uses
su to perform the command if the INSTALLUSER invokes the script.
This commit adjusts the call to su so that it passes /bin/sh as
the shell to use so that it will work correctly when the ejabberd
user's shell is set to nologin.
Signed-off-by: Randy Barlow <randy@electronsweatshop.com >
2017-12-10 12:52:22 -05:00
ae66c17ec0
Include <x/> tag in presence errors related to nick change
...
Refer to example 52 and example 53 of XEP-0045 for details.
Thanks to Daniel Gultsch for spotting this.
2017-12-09 23:13:20 +03:00
614bd9dd72
Better process subtag decoding errors
2017-12-09 22:39:43 +03:00
e15a9a2b9e
Log warning on empty wildcard paths
2017-12-08 12:50:10 +03:00
f1ac793d56
Don't call pkix_is_self_signed/1 too frequently
2017-12-07 17:24:34 +03:00
97c9058246
Eat less memory during building certificates graph
2017-12-07 16:41:49 +03:00
a820d735c0
Replace s2s_cafile with ca_file in ejabberd.yml.example
2017-12-07 14:58:58 +03:00
a303373b0f
Speedup certificate chains creation and validation
2017-12-07 14:32:12 +03:00
d8ace67a50
Compile sql_pt early
2017-12-07 10:47:30 +01:00
344a2611f2
Avoid infinite loop between self-signed certs
2017-12-07 00:29:19 +03:00
c2b22bd6c1
mod_muc_room: Fix typo
...
Thanks to Evgeniy for spotting this.
2017-12-06 16:50:45 +01:00
abeee837fc
Bump xmpp and fast_xml revisions
2017-12-06 18:36:04 +03:00
7a9d2cabc0
Improve code using new xmpp API
2017-12-06 17:21:57 +03:00
e4a4839880
Use ejabberd_cluster:send() in SM/C2S
2017-12-06 14:15:20 +03:00
ab2a90181c
mod_offline: Always ignore groupchat messages
2017-12-02 21:35:09 +01:00
bca87e2c89
Set executable permission on mac_listener when installing ( #2138 )
2017-12-01 17:28:31 +01:00
418718de31
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.
2017-11-30 23:58:01 +01:00
0b1a6d7e79
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.
2017-11-30 22:15:33 +01:00
395b74a89f
Windows does not have /tmp, fallback to /home/chris/conf
2017-11-30 15:32:09 +01:00
a5849a0dab
Fix num_subscribers on node metadata ( #2122 )
2017-11-30 15:27:34 +01:00
8639da0e00
Fix session table cleanup
2017-11-30 13:31:23 +03:00
cf67b9ec54
Add missed server_host column in pg.new.sql
2017-11-30 13:08:38 +03:00
ddaa8c7c1d
Merge branch 'master' of github.com:processone/ejabberd
2017-11-27 13:09:53 +03:00
b072342aa9
Adapt test to changed error
2017-11-27 11:12:46 +01:00
10edbe3e09
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.
2017-11-27 13:07:10 +03:00
783ebd1080
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"
2017-11-26 18:10:25 +03:00
242b3d3968
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
2017-11-24 19:38:20 +03:00
cf8e70abc8
Fix minor typo in comment
2017-11-24 17:17:48 +01:00
5676adff30
Get rid of unused variable compile warning
2017-11-24 12:11:01 +03:00
e31f6409a6
Fix function clause on filelib:wildcard/1
2017-11-24 12:10:03 +03:00
a57c694f21
Fix SQL serialization
...
The regression is introduced in 11829906acFixes #2121
2017-11-24 09:45:22 +03:00
0e5b343f1b
Add Id attribute in stanza built by send_message command
2017-11-23 17:14:39 +01:00
25f7f974b9
Use ejabberd_pkix API in mod_sip
2017-11-23 11:09:40 +03:00
fbd6ea8a48
Move 'certfile' based options in a single place
2017-11-23 11:04:47 +03:00
3a02c4369f
Get rid of meaningless log message
2017-11-22 10:12:49 +03:00
19975962ea
Fix a bug introduced in the previous commit in ejabberd_sql_pt
2017-11-20 15:14:44 +03:00
6a0e24fb14
Update URL to IM Observatory
2017-11-20 15:07:06 +03:00
e9e56ed183
Add notes about s2s_cafile
2017-11-20 15:02:24 +03:00
6686a64d5f
Fix filtering of rebar list-deps
2017-11-20 12:51:19 +01:00
c26b56679e
Modernize the example config a bit
2017-11-20 13:34:16 +03:00
98b411523d
Update deps
2017-11-20 10:42:05 +01:00
4b9d299e90
Make update-deps-releases.pl work with older perl
2017-11-20 10:41:52 +01:00
49c4aa238f
Change file mode of ACME certficates
2017-11-19 10:10:21 +03:00
e709d6561c
Re-read ACME certificates on config reload
2017-11-19 09:56:05 +03:00
f06805534c
Fix renew_certificates ejabberdctl command
...
Thanks to Konstantinos Kallas
2017-11-17 18:37:49 +03:00
3202b7a9a1
Log a message when a user gets registered
2017-11-17 18:02:12 +03:00
4f12359b9c
Don't forget to include intermediate ACME certificate
...
Thanks to Konstantinos Kallas
2017-11-17 17:17:19 +03:00
f599c2ef82
Fix ACME options validation
2017-11-17 15:55:33 +03:00
b2680a776b
Prepare user and host arguments in get_user_rooms command ( #2064 )
2017-11-17 13:23:27 +01:00
b67a114ef5
Fix elixir tests
2017-11-17 12:19:26 +01:00
224a3e13c9
Improve ACME options validation
2017-11-17 13:06:04 +03:00
382fb62f29
Merge branch 'master' of github.com:processone/ejabberd
2017-11-17 12:50:38 +03:00
b6b70ec0d4
Switch riak backend to leveldb on travis
2017-11-17 10:54:28 +01:00
4835537776
Move ejabberdctl ACME commands to other location
2017-11-17 12:50:27 +03:00
ce98226603
Make ACME code working with ejabberd_pkix
2017-11-17 11:59:40 +03:00
c05626a1ba
Fix sed invocation that was incompatible with FreeBSD sed
2017-11-17 09:50:24 +01:00
514c25caef
PubSub: PEP services must send notifications to the account owner ( #2108 )
2017-11-16 15:31:28 +01:00
00e32ee4b6
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.
2017-11-16 14:48:47 +01:00
44700d91ba
PubSub: Cleanup tree requests, rename pubsub_node.type->pubsub_node.plugin
2017-11-16 11:38:04 +01:00
2531f37e5c
Let validator know about c2s_dhfile
2017-11-16 00:40:36 +03:00
62aab0fce4
Fix select_type race on plugin_init
2017-11-15 19:04:47 +01:00
e706e24b92
Cleanup pubsub subscriptions quering, fix pep case
2017-11-15 11:16:15 +01:00
11ee896f10
Improve ACME description
2017-11-15 12:57:53 +03:00
1f21f64d5f
Improve some error log messages
2017-11-15 11:54:38 +03:00
ebb97bec44
Fix mod_mam reloading
2017-11-15 11:23:22 +03:00
0c6ef98d01
Avoid badarg error when running get-deps before ./configure has created src/ejabberd.app ( #2103 )
2017-11-15 09:21:05 +01:00
6cd3867197
Makefile.in: Fix "make clean && make"
2017-11-15 08:50:40 +01:00
b04c6b7d75
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
2017-11-15 10:01:30 +03:00
af49472373
mod_stream_mgmt: Improve logging on timeout
...
Produce a better error message if a pending stream management session
times out.
2017-11-15 01:11:37 +01:00
75f150f7ae
mod_mam: Simplify 'message_is_archived' callback
2017-11-15 00:36:07 +01:00
98419c6662
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.
2017-11-15 00:30:38 +01:00
2b3890f1b0
Announce support for stanza IDs
...
Announce the namespace for stanza IDs as per XEP-0359 v0.5.0.
2017-11-15 00:18:25 +01:00
06d4f1ff33
mod_mam: Add a few function specifications
2017-11-14 22:58:16 +01:00
5ae23a7301
mod_mam: Apply minor cosmetic changes
2017-11-14 22:36:46 +01:00
8376370ae1
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.
2017-11-14 22:02:48 +01:00
054413d8f4
Halt ejabberd if the top supervisor fails to start
2017-11-14 18:41:28 +03:00
ce99db0595
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.
2017-11-14 14:12:33 +02:00
f953621ed2
Use xmpp:io_format_error/1 wherever possible
2017-11-14 09:02:43 +03:00
474536817e
Implement parentnodes seek for hometree ( #1921 )
2017-11-13 18:13:31 +01:00
daed6a05a6
Rewrite pubsub export to sql ( #1571 )
2017-11-13 17:34:37 +01:00
9daf2dd925
Assign failed_auth ETS table to another owner
2017-11-13 14:34:59 +03:00
1413f5dd23
Fix a record default
2017-11-13 11:29:03 +03:00
b06adf1df2
Get rid of forgotten debug message
2017-11-13 11:26:49 +03:00
11829906ac
Properly store <subject/> element
...
Fixes #2099
2017-11-13 11:25:35 +03:00
78f494dd2e
Configuration file changes
...
Explain the acme configuration options
2017-11-11 15:38:47 +02:00
76e9555d55
Improve some type specs
2017-11-11 09:33:42 +03:00
e77172a784
Improve a diagnostic text
2017-11-11 09:30:19 +03:00
675a1e0b0f
Fix a test related to mod_caps
2017-11-10 20:58:13 +03:00
54c8ae4d2b
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'.
2017-11-10 18:09:33 +01:00
5c6a37b20f
Cleanup some headers
2017-11-10 17:51:22 +01:00
50b3206f06
Add forgotten type specs
2017-11-10 18:11:04 +03:00
7a3092a859
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.
2017-11-10 18:02:22 +03:00
66c9f6458d
Merge pull request #2096 from weiss/always-add-stanza-id
...
Tag all archived messages with a stanza ID
2017-11-10 09:34:49 +04:00
d1df522fd9
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.
2017-11-10 01:11:24 +01:00
e47b016e76
Add fs as dep in mix.exs
2017-11-09 09:59:49 +01:00
28661d20bd
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."
2017-11-09 01:10:24 +01:00
9c174e30b2
mod_mam: Fix indentation
2017-11-09 01:00:15 +01:00
40d725e9c1
mod_mam: Ignore non-message stanzas earlier
...
Let mod_mam's hook callbacks ignore non-message stanzas using pattern
matching.
2017-11-09 00:48:19 +01:00
5cf4e200ba
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 .
2017-11-09 00:21:40 +01:00
902c6d476b
Prepare version 0.6.1 of XEP-0313 (MAM) support
2017-11-08 15:15:39 +03:00
74749f5dbb
ejabberdctl: Fix 'read' syntax for non-bash shells
2017-11-07 21:23:48 +01:00
fe9b191382
Erase transient certificates on exit
2017-11-07 09:04:20 +03:00
5d5b4cdfb5
ejabberdctl: Fix paths for release build
...
The ejabberdctl version generated by "make rel" relies on the SCRIPT_DIR
variable which got lost in commit cbe6553baa
2017-11-06 21:35:44 +01:00
cbbfe32d8b
Unregister commands when stopping node only if it's last one ( #2083 )
2017-11-06 16:53:49 +01:00
7121a95428
Define flags that depend on erlang version in mix.exs
2017-11-06 12:40:00 +01:00
41c393466c
mod_push: Avoid notification duplicates
...
Don't let mod_mam and mod_offline both trigger push notifications for
the same message.
Closes #2078 .
2017-11-06 00:26:20 +01:00
7d8ad17fa1
Remove code left from debugging
2017-11-03 16:11:34 +01:00
44293235e5
Simulate vars usage in ejabberd_sql_pt to avoid unused var warnings
2017-11-03 17:43:21 +03:00
ec3ea61585
Don't start hosts for disabled backends from CT_BACKENDS passed to make test
2017-11-03 14:44:13 +01:00
90e1f3f29d
Use correct table field name in sql query
2017-11-03 12:17:34 +01:00
2060022b19
Remember previous German translator
2017-11-03 10:16:21 +01:00
681d81bdcc
Merge pull request #2081 from nekoswag/master
...
updated German translation
2017-11-03 09:56:19 +01:00
c72e0a6ca6
Log warnings for c2s/s2s certfile option
2017-11-03 08:32:34 +03:00
189d02cee0
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
2017-11-02 19:05:12 +02:00
79a9a0ed29
Disable server_host warnings
2017-11-02 19:48:35 +03:00
78dfb832b8
Add SQL_INSERT macro and update SQL queries to use server_host field
2017-11-02 18:21:40 +03:00
354a710e70
Fix pkix:validate() return value
2017-11-02 11:28:23 +01:00
8eb1e5c68c
updated de.po
2017-11-01 18:22:27 +01:00
a22aad0a4b
Remove -include() directive for unused header
2017-11-01 10:59:28 +03:00
ae07fd7f10
Clarify some error/warning messages
2017-11-01 10:14:34 +03:00
86809dff06
Avoid using "bag" ETS type for certificate storage
2017-11-01 08:47:07 +03:00
35dc164233
Start even if there are problems with fs application
2017-11-01 08:34:14 +03:00
170be1fbd5
Lower log level
2017-11-01 00:55:05 +03:00
35b7203e01
Introduce 'certfiles' global option
...
The option is supposed to replace existing options 'c2s_certfile',
's2s_certfile' and 'domain_certfile'. The option accepts a list
of file paths (optionally with wildcards "*") containing either
PEM certificates or PEM private keys. At startup, ejabberd sorts
the certificates, finds matching private keys and rebuilds full
certificates chains which can be used by fast_tls. Example:
certfiles:
- "/etc/letsencrypt/live/example.org/*.pem"
- "/etc/letsencrypt/live/example.com/*.pem"
2017-11-01 00:20:27 +03:00
efc4996625
Fix sql query
2017-10-31 17:59:55 +01:00
88558453fb
Typo
2017-10-31 17:11:17 +01:00
ee2b5be7f4
Use store_room where possible
2017-10-31 16:12:35 +01:00
ce98843dd4
Fix sql syntax error in lite.sql
2017-10-31 14:43:36 +01:00
5f2e33bdd0
Don't use depraced functions
2017-10-31 14:21:34 +01:00
0452ffc1df
Optimize muc subscriptions handling
2017-10-31 14:00:41 +01:00
e24e05c6af
Enforce module_name/1
2017-10-31 12:06:40 +01:00
e697a3e262
Add missing type conversion from 675cc3e
2017-10-31 11:59:53 +01:00
8cb71255eb
Do not bind unused tail from 675cc3e
2017-10-31 11:25:01 +01:00
675cc3e0ea
Allow auth and pubsub plugin to use Elixir module
2017-10-31 11:04:32 +01:00
5f0a84a331
Show real jid in mucsub subscription change events
2017-10-30 17:54:55 +01:00
9b8ae80dab
Improve --enable-system-deps
2017-10-30 13:55:10 +01:00
0633dd5802
Fix last commit
2017-10-30 13:27:37 +01:00
2b363c7aee
Add mucsub event for subscribers list changes
2017-10-30 12:34:09 +01:00
2aeee9eab4
Merge pull request #2028 from weiss/increase-queue-sizes
...
Increase max_fsm_queue and max_ack_queue sizes
2017-10-29 12:18:23 +04:00
ed792274e3
Omit "ProtectSystem" option from systemd unit
...
With "ProtectSystem", /usr is mounted read-only, so things will fail
when e.g. /usr/local is used as the installation prefix. Whether such
options make sense depends on the environment, so they should rather be
set by package maintainers and/or admins.
2017-10-28 21:31:04 +02:00
dbdda745af
Delete cached item on node removal ( #2071 )
2017-10-27 21:16:25 +02:00
df86ecdd87
Update Greek translation (thanks to James Iakovos Mandelis)
2017-10-27 15:39:48 +02:00
e1c8e88d87
Update SQL archive index to match mysql.sql
2017-10-27 15:20:29 +03:00
b6c88fb17e
Fix typespec
2017-10-27 12:05:05 +03:00
24df1262bb
Don't store xdata() in Mnesia table
2017-10-27 11:46:37 +03:00
484e5de072
Simplify backend interface for mod_push
2017-10-27 10:55:48 +03:00
568ab526e2
Improve ejd2sql logging
2017-10-27 08:59:49 +03:00
a8238d6a54
Fix typo
2017-10-27 08:12:24 +03:00
9eb2685f90
Make it possible to export push_session table to SQL
2017-10-26 21:05:09 +03:00
db57394399
Add SQL support for mod_push
2017-10-26 20:11:43 +03:00
88928c0149
Adopt 'make install' to updated output from 'rebar list-deps'
2017-10-26 11:21:41 +02:00
2161063e5e
Don't forget to convert ljid() to jid()
2017-10-26 10:29:23 +03:00
29462f0053
Make it possible to convert to SQL for any current db_type
...
It is now possible to run `export` command even when the current `db_type` is not `sql`
2017-10-25 21:21:52 +03:00
3162ec0d66
Allow dynamic node options on sql backends
2017-10-25 15:40:42 +02:00
e4054aab79
Get next record before deleting previous on, in case it's last one ( #2069 )
2017-10-25 12:58:07 +02:00
8028a9545a
Cosmetic change, remove useless case
2017-10-25 11:48:56 +02:00
7c1b4d0fcd
Fix pubsub test, title not mandatory
2017-10-25 11:41:45 +02:00
17e3ed513b
Fix delete item from unregistered user ( #2067 )
2017-10-25 11:16:54 +02:00
65c85eab03
Fix another typo ;)
2017-10-25 11:47:02 +03:00
5151136d17
Fix typo
2017-10-25 11:44:53 +03:00
debbddb763
Mix _xmpp-server and _xmpps-server SRV records
...
XEP-0368 describes this procedure as following:
> Both 'xmpp-' and 'xmpps-' records SHOULD be treated as
> the same record with regard to connection order as specified
> by RFC 2782 [3], in that all priorities and weights are mixed.
> This enables the server operator to decide if they would
> rather clients connect with STARTTLS or direct TLS.
2017-10-25 11:39:20 +03:00
8b588d2ff3
Add basic PubSub meta-data support ( #1421 )
2017-10-25 10:34:11 +02:00
90ee405d81
Mention XEP-0368 support
2017-10-25 10:01:05 +03:00
b0fa27395f
Add missing fix from 07a193d4d, Fix purge_offline ( #2057 )
2017-10-24 15:35:01 +02:00
ce83e2261e
Merge pull request #2065 from jorjeb/mix-enable-graphics
...
Support for --enable-graphics in mix.exs
2017-10-24 14:35:47 +04:00
06cd373a18
Support for --enable-graphics in mix.exs
2017-10-24 18:02:52 +08:00
46fb2d0f56
Update Hebrew translation (thanks to Genghis Khan)
2017-10-23 16:14:01 +02:00
21f2c57920
Merge pull request #2023 from rom1dep/endings
...
Line endings consistency edits in the example config file
2017-10-16 12:59:04 +02:00
5667b4b0f9
Merge pull request #2052 from suchatorg/patch-1
...
Update gl.po
2017-10-16 10:16:54 +02:00
91e8249284
Update gl.po
2017-10-14 11:06:03 +02:00
1bb2bae62b
Reflect changes in the xmpp lib
2017-10-13 20:48:21 +03:00
152e0d77c1
Send presence-unavailable when expulsing a participant
2017-10-13 09:17:22 +03:00
9d6ec1ba12
Fix ZH translation
2017-10-12 12:09:50 +02:00
0c29f07758
Merge pull request #2047 from fotock/patch-1
...
Update zh translations
2017-10-12 11:44:12 +02:00
7f93b72a1d
Update zh.po
2017-10-12 00:17:32 -05:00
e5e64c99f3
Don't crash when Host header is missing
2017-10-11 18:53:53 +03:00
85c703a8f7
updated and extended German translation
2017-10-11 16:56:05 +02:00
2832130afc
Update Catalan translation
2017-10-11 16:21:28 +02:00
f751023bd6
Update zh.po
2017-10-11 04:33:14 -05:00
f0a68b85f0
Update zh.po
2017-10-11 01:47:43 -05:00
02fa719a87
Fix a typo: meta -> viewport
2017-10-10 13:25:38 +03:00
5a184b0433
Don't include CSS, javascript and image data directly in the code
2017-10-09 23:35:42 +03:00
d22ee24e72
Better handle mobile devices in CSS of mod_register_web
...
Thanks to Marek Foss. Fixes #2039
2017-10-09 21:46:38 +03:00
a6e5a5ca9a
Resend presences and history if presence possesses <x/> MUC element
...
Behave according to the new rule from XEP-0045, section 7.2.2:
> When a MUC service receives an <x/> tagged join stanza from an
> already-joined client (as identified by the client's full JID),
> the service should assume that the client lost its synchronization,
> and therefore it SHOULD send exactly the same stanzas to the client
> as if it actually just joined the MUC.
2017-10-09 17:59:22 +03:00
8513e31498
Update Russian translation
2017-10-06 23:44:50 +03:00
6efdd0f350
Don't crash when 'from' is undefined
...
c2s_filter_send hook may pass a stanza with undefined from/to (due to
legacy auth for example). Work around this problem.
Fixes #2036
2017-10-06 21:48:54 +03:00
0ed210877a
Update French translation
2017-10-06 17:48:56 +02:00
a06f1a0ba5
Update Czech translation (thanks to Jan Pinkas)
2017-10-06 13:23:33 +02:00
4bd5846d40
More fix in mod_http_fileserver to log URLs with/out query elements ( #2021 )
2017-10-06 13:16:13 +02:00
3c7ab13374
Update pl.po
2017-10-06 12:11:14 +02:00
df439f27ee
Update Spanish translation
2017-10-06 10:54:36 +02:00
d37d43495b
Updated all translation files
...
Simply running:
make; make translations
2017-10-06 10:02:16 +02:00
6f922275eb
Improve logging of mismatched Hosts
2017-10-05 11:33:29 +03:00
94de13981b
Log request in access.log even when Host doesn't match
2017-10-05 11:16:05 +03:00
43e729293a
Don't report Host mismatch as an error
2017-10-05 11:08:58 +03:00
f3af117108
Correctly handle mod_client_state (re)load
2017-10-05 11:03:36 +03:00
bd06bc00e2
Accept routes in Host header and map them to vhosts
2017-10-05 10:26:10 +03:00
9e95150803
Fix warning when compile with newer elixir
2017-10-04 12:03:36 +02:00
532aba993b
mod_stream_mgmt: Increase 'max_ack_queue' default
...
Users with large rosters and/or certain transports might receive a very
large number of (e.g.) presence and/or PEP stanzas after logging in.
Clients might take some time to acknowledge them, especially over slow
(mobile) connections.
2017-10-03 01:37:10 +02:00
79685da90b
Increase 'max_fsm_queue' default
...
The old default was becoming too small for some workloads.
2017-10-03 01:29:52 +02:00
280aa2f1b0
Fix crash in mod_http_fileserver when logging URL with query elements ( #2021 )
2017-10-02 15:36:38 +02:00
668d45cbc7
Install binaries with 755 permissions
2017-10-02 11:51:15 +02:00
e2f4cb5838
Remove find-outdated-deps script, we have better replacement for it
2017-10-02 11:49:34 +02:00
6658806820
Generate more readable code for run_fold hooks
2017-10-02 10:47:03 +03:00
a7341957f2
config: makes line endings consistent when followed by '-'
2017-09-30 11:12:20 +02:00
2cb0cedc6b
config: makes line endings consistent when followed by ':'
2017-09-30 11:10:34 +02:00
77a1f728cf
Install eimp binary with +x attribute
2017-09-28 18:34:27 +02:00
d576902bd4
Prepare mix for 17.09
2017-09-28 15:21:11 +02:00
a3da27e917
Fix race introduced by ffdaff374 on ejabberd_mnesia init
2017-09-28 15:14:11 +02:00
3f015c829c
Make sure Riak gets compiled on OTP20
2017-09-28 12:25:06 +03:00
2732c8f6fc
Fix function clause introduced by c17ec50e3a
2017-09-28 12:24:24 +03:00
3192687334
Don't forget to route presence-unavailable
...
When a user has several resources joined to a room using the same
nick attempts to leave the room from a single resource, route
presence-unavailable back to this (and only this) resource.
Fixes #2007
2017-09-28 11:58:36 +03:00
126653e01b
Pubsub: implment '6.5.7 Requesting the Most Recent Items'
2017-09-27 20:54:50 +02:00
ce7acafe37
Remove useless condition
2017-09-27 20:40:07 +02:00
216a0c97b9
PubSub: add RSM support for mnesia backend
2017-09-27 20:39:54 +02:00
3c8308bb8d
PubSub: enforce controls on publish and delete
2017-09-27 17:37:38 +02:00
1c6aa5e84e
mysql.sql: Use multi-column index on username/ID
2017-09-27 15:30:23 +02:00
609a1d07cf
harden ejabberdctl ( #1977 )
2017-09-27 15:04:57 +02:00
8c026582ab
Fix xref error
2017-09-27 12:34:40 +02:00
81df1ae3af
Unbind unused variable
2017-09-27 12:13:45 +02:00
22435ca562
Remove calls to deprecated functions
2017-09-27 11:43:59 +02:00
f464189819
Update dependences
2017-09-27 11:39:16 +02:00
89e504c55f
PubSub: fix get_items behaviour with mnesia
2017-09-27 11:18:12 +02:00
c1d3d1318e
Merge branch 'master' of github.com:processone/ejabberd
2017-09-27 11:12:09 +02:00
d120e0ad91
PubSub: add correct order when requesting all items
2017-09-27 11:12:01 +02:00
c17ec50e3a
Add support for XEP-0368: SRV records for XMPP over TLS
...
Currently this is only supported for outgoing s2s connections.
For such connections ejabberd is now able to resolve SRV records
of type "_xmpps-server._tcp". Also, SNI and ALPN fields are set
during TLS handshake. No additional configuration is required.
2017-09-27 12:03:05 +03:00
368ba3fc55
When running "make translations", use the new tools/prepare-tr.sh
2017-09-27 10:57:11 +02:00
cd098c5adc
Remove remaining files of old contrib/ dir
2017-09-27 10:57:07 +02:00
221e58fff0
Simplify prepare-tr.sh to work with new extract-tr.sh
2017-09-27 10:57:03 +02:00
9b043ae276
Move prepare-translations.sh from contrib to tools/prepare-tr.sh
2017-09-27 10:56:58 +02:00
abc09054e5
Remove forgotten export_all
2017-09-27 11:56:22 +03:00
07a193d4dc
PubSub: fix RSM support ( #1994 )(#2Â014)
2017-09-27 10:51:37 +02:00
cf09ed2df2
PubSub: fix node_options, default options only apply on first plugin
2017-09-27 09:29:04 +02:00
0cc1ae0a6a
mod_http_upload: Don't ignore 'custom_headers'
...
Don't ignore the 'custom_headers' option if the domain part of the
'put_url' doesn't match the XMPP domain.
Closes #1482 .
2017-09-26 21:40:56 +02:00
e1efd29156
Improve presence-error processing
...
When a presence-error is received from a participant in a MUC, kick
only this particular participant's full JID, leaving other resources
untouched. This will prevent from erroneous kicking all user's resources
in the presence of "multi-session nicks".
2017-09-26 19:01:54 +03:00
05feab35c4
Call earlier deps configure scripts durring compilation
2017-09-26 17:32:37 +02:00
2198fbce97
Fix command set_last that always returned code 1, error ( #2010 )
2017-09-25 18:43:24 +02:00
b8ab80d1f3
Sync containers from rroemhild and add instructions in README ( #1655 )
2017-09-25 17:48:57 +02:00
30e5c9bd3e
Add mod_avatar to the example configuration
2017-09-25 16:23:02 +03:00
251756de00
Catch all p1_fsm errors
...
Fixes #2012
2017-09-25 13:01:00 +03:00
3e987d3bae
Use eimp instead of ImageMagick calls for thumbnails creation
2017-09-25 12:41:12 +03:00
138cc25355
Pre-install libgd and libwebp
2017-09-25 11:19:49 +03:00
a15f186253
Remove OTP20 from Travis tests for now
2017-09-25 11:17:46 +03:00
59ec3d36f4
mod_mam: Simplify check for anon MUC JID filtering
...
Refuse filtering anon MUC MAM queries by JID even if it's the client's
own JID. Clients probably won't perform such queries in practice, so
the additional complexity is unnecessary.
2017-09-24 15:04:09 +02:00
d7250111ce
Reuse some translation strings
2017-09-24 14:32:37 +03:00
adfb924808
Replace translate:mark/1 with ?T() macro
2017-09-24 12:42:35 +03:00
48f2adde98
mod_mam: Refuse filtering anon MUC queries by JID
...
Return an empty result set if a non-moderator attempts to filter by JID
while querying the archive of an anonymous MUC room.
2017-09-24 02:05:50 +02:00
c378ea403e
Add script to extract translation strings
2017-09-24 00:08:01 +03:00
692ccd2e20
mod_push_mnesia: Fix typo in error message
2017-09-22 23:36:51 +02:00
5882c9b456
Add some recommended TLSOPTS as comments in the default config ( #2004 )
2017-09-21 16:28:17 +02:00
db41643bea
Also replace vcard-x-update in direct presences
2017-09-18 14:17:34 +03:00
cb076924cc
Merge pull request #1996 from nosnilmot/ejabberdctl-quote-peer
...
Quote $PEER in ping command to avoid hostnames containing "-" being interpreted as arithmetic
2017-09-18 13:09:16 +02:00
cce4056040
Fix iexdebug and iexlive commands ( #1981 )
2017-09-18 13:01:10 +02:00
7ad525b542
PubSub: broadcast updated configuration ( #1945 )
2017-09-18 12:48:20 +02:00
5bf64381cb
Add 'width' and 'height' to avatar info
2017-09-18 09:33:57 +03:00
f435d0a103
Add GIF support
2017-09-17 17:34:31 +03:00
e4d21c1941
Introduce mod_avatar
...
The purpose of the module is to cope with legacy and modern
XMPP clients posting avatars. It automatically converts vCard based
avatars (XEP-0153) to PEP based avatars (XEP-0084) and vice versa.
Also, the module supports convertation between avatar image formats on
the fly: this is controlled by `convert` option. For example, to
convert all avatars into PNG format, configure the module as:
mod_avatar:
convert:
default: png
In order to convert only `webp` format to `jpeg`, set the following:
mod_avatar:
convert:
webp: jpeg
Note: the module depends on mod_vcard, mod_vcard_xupdate and mod_pubsub.
Also, ejabberd should be built with --enable-graphics option.
2017-09-17 10:26:48 +03:00
5414cbe821
Add riakc dependency version
2017-09-13 09:49:43 +02:00
e6b1521b29
mod_push_keepalive: Remove unused 'db_type' option
2017-09-11 23:48:25 +02:00
2a7d9d93c8
Quote $PEER in ping command to avoid hostnames containing "-" being interpreted as arithmetic
2017-09-11 15:00:00 +01:00
dfd2045523
Introduce option 'allow_transports'
...
This is a boolean option. If set to `true` and some server's JID
is in user's roster, then messages from any user of this server are
accepted even if no subscription present.
The option is enabled by default.
2017-09-08 23:10:01 +03:00
9e35af54e0
The redis_reconnect_timeout was no longer used ( #1983 )
2017-09-07 20:25:20 +02:00
d87151aee6
Simple optimization in get_room_occupants_number command ( #1964 )
2017-09-07 18:32:26 +02:00
4ecd8a0780
Really delete cache on set_data()
...
Fixes #1991
2017-09-07 19:27:48 +03:00
803c31f760
Always accept messages from local (sub)domains
2017-09-07 13:53:42 +03:00
978c92f5e1
Fix a typo and improve logging message
2017-09-07 13:41:51 +03:00
315e330237
Fix version of jose library
2017-09-06 18:35:33 +03:00
f55a8d045d
Solve Travis build xref problem
...
Travis build failed on xref because some functions that I used did not exist in OTP versions 17.5, 18.3
Those functions are: ets:take/2, lists:join/2, erlang:timestamp/0.
2017-09-06 18:10:38 +03:00
32397aa0c3
Replace example config of drop_chat_states with queue_* in mod_client_state ( #1985 )
2017-09-06 13:48:33 +02:00
1a58a201f8
Block messages from strangers before mod_mam/mod_offline processing
...
Fixes #1713
2017-09-02 22:54:46 +03:00
2acbf4625b
Deprecate s2s_use_starttls: required_trusted
...
The functionality can be now obtained by using
`s2s_use_starttls: required` with `mod_s2s_dialback`
being unloaded.
2017-09-02 11:45:06 +03:00
7566d254e4
Introduce 'redirect_url' option for mod_register
...
The option enables registration redirection as described in
https://xmpp.org/extensions/xep-0077.html#redirect
Fixes #1976
2017-09-01 12:14:01 +03:00
68dee8cbb3
Fix deletion of multiple offline messages using WebAdmin ( #1962 )
2017-08-25 12:44:53 +02:00
f7e8d287d5
Fix a typo
2017-08-25 12:47:33 +03:00
80b44d8c15
Remove some unused variable warnings, replace lists:join with string join
2017-08-25 12:08:16 +03:00
30bca124f4
Add forgotten caching options to the validator (thanks to Jan Pinkas)
2017-08-24 21:40:54 +03:00
d7891a5562
Fix 'make install' to work with new output from rebar list-deps
2017-08-24 11:43:47 +02:00
1d396b4716
Rewrite muc_register_nick and muc_unregister_nick to be DB independent ( #1954 )
...
Notice: The arguments expected have changed, instead of
muc_register_nick Tim tim@example.org muc.example.org
muc_unregister_nick Tim
it expects now:
muc_register_nick Tim tim@example.org example.org
muc_unregister_nick tim@example.org example.org
2017-08-24 10:40:54 +02:00
7f3fceb432
Recompile rebar script with OTP17.5
2017-08-23 11:45:10 +03:00
81581f7794
Use forked repo of Riak Erlang client
2017-08-23 10:35:39 +03:00
47175adc74
Explicitly match against <domain/resource>
...
Fixes #1958
2017-08-23 09:00:13 +03:00
350827f8f4
Ignore some options from rebar.config
...
Namely, the following options are ignored in dependency packets:
require_erts_vsn, require_otp_vsn and require_min_otp_vsn
2017-08-22 15:26:35 +03:00
f1ea67817c
More whitespace changes
2017-08-22 14:58:12 +03:00
30e729a150
Whitespace change
2017-08-22 14:54:23 +03:00
8c56fbc0d8
Remove debugging script
2017-08-22 14:53:38 +03:00
a59ccc6c9c
Merge remote-tracking branch 'upstream/master' into lets_encrypt_acme_support
2017-08-22 14:51:21 +03:00
62903155fd
Show SANs in list_Certificates
2017-08-22 14:44:19 +03:00
25ca6e5582
Acquire certificates for all subdomains of a host and include them in SAN
2017-08-22 13:36:34 +03:00
37a54cd498
List the possible ca_urls in example config file
2017-08-22 10:38:33 +03:00
6f972fa3fe
Clean run_acme testcase
2017-08-22 10:29:12 +03:00
10f7b5a548
Remove partial RSA key support
2017-08-22 10:25:37 +03:00
f2876bdad7
Add certfile when acquired
2017-08-22 10:12:42 +03:00
05c2995c7a
When creating room, set option to ensure config is set in muc_room table ( #1954 )
2017-08-21 15:58:10 +02:00
2fa6e2fd90
Fix crash when destroying room without providing reason ( #1954 )
2017-08-21 15:57:48 +02:00
9b3e160e18
Remove some debugging INFO_MSGs
2017-08-19 17:47:05 +03:00
15dd88385f
Delete a development acme module
2017-08-19 16:58:06 +03:00
f581e391ac
Merge remote-tracking branch 'upstream/master'
2017-08-19 13:42:05 +03:00
dd42d52ff9
Merge remove_account_option branch
2017-08-19 13:36:42 +03:00
e45f7ddfec
Cleanup some comments:
2017-08-19 13:32:13 +03:00
7cc7b74f1e
Add acme certificates for all configured hosts in ejabberd_pkix
2017-08-19 12:50:40 +03:00
ddfe8742c7
Add behaviour ejabberd_config in ejabberd_acme in order to validate the config
2017-08-19 11:35:15 +03:00
ba9a79c89c
Apply cosmetic changes to previous commit
2017-08-18 16:50:08 +02:00
13ad754ecc
Suppress push notifications for online clients
...
When a client enabled push notifications during the current session,
notifications should be suppressed as long as the client is online.
Suppressing the notification didn't work for the case where the
notification was triggered by MAM, but this is now fixed.
2017-08-18 16:44:32 +02:00
0b02d42836
Fix mod_multicast start and reading of configured limits ( #1949 )
2017-08-18 14:09:49 +02:00
ee0a8d2966
Preserve correct order of deserialized XML elements
...
Fixes #1939
2017-08-18 10:20:27 +03:00
793ca45dda
Add OTP 20.0 to Travis testsing platforms
2017-08-17 22:14:54 +03:00
6e20e9bcf9
Get rid of deprecated crypto functions
2017-08-17 19:32:15 +03:00
b8d2a72333
mod_stream_mgmt: Delete 'c2s_init' hook
...
Delete the 'c2s_init' hook when the last 'mod_stream_mgmt' instance is
stopped.
2017-08-17 18:25:06 +02:00
0760c7273c
mod_stream_mgmt: Remove outdated TODO comment
...
The CSI queue is now flushed from mod_client_state.
2017-08-17 18:19:04 +02:00
9bd099013f
Don't attempt to access(2) a certificate file
...
Fixes #1375
2017-08-17 14:33:41 +03:00
68fb12153e
Revert "Temporary remove recent last_item refactor"
...
This reverts commit 1820b4f63b
2017-08-14 15:25:45 +02:00
e19d1e9571
Merge remote-tracking branch 'processone/pr/1938'
...
* processone/pr/1938:
Let 'domain_certfile' take higher precedence
2017-08-14 14:43:03 +02:00
1820b4f63b
Temporary remove recent last_item refactor
2017-08-14 09:43:02 +02:00
64150cc7c5
Let 'domain_certfile' take higher precedence
...
If a 'domain_certfile' is specified, use that instead of the
's2s_certfile' (or 'c2s_certfile').
2017-08-13 20:31:03 +02:00
63aabed320
Apply URL decoding wherever possible
...
Fixes #1936
2017-08-13 19:18:19 +03:00
051e2c639c
Change some specs
2017-08-12 18:00:46 +03:00
3b22efeaee
Add throws when http requests fail
...
This was done in order to show the unexpected code in the top level
2017-08-12 17:26:07 +03:00
a72a7f830a
Add support to revoke a certificate by providing the pem
...
This is important so that a user can revoke a certificate that is not acquired or logged from our acme client
2017-08-12 17:14:23 +03:00
73f0b6707a
Move the ca_url to the config file
2017-08-12 15:59:54 +03:00
fd7bf7fed3
Fix typo from 9c5427e0c
2017-08-11 17:54:53 +02:00
1aadb797b3
Remove the new account option from get certificate. There is no reason for having this
2017-08-11 14:10:55 +03:00
7140c8d844
Format expired certificates differently in list_certificates
2017-08-11 13:28:17 +03:00
7a90cda8ff
Process on_user_offline only from valid sessions
2017-08-11 12:05:14 +02:00
35eeaa5869
Fix regression introduced by b82b93f8f0
...
Fixes #1928
2017-08-11 11:43:16 +03:00
024713a441
Remove temporary debug
2017-08-11 10:53:19 +02:00
32fbfe1981
Use correct c2s process sending PEP with multi devices
2017-08-11 10:32:36 +02:00
9c5427e0c2
PubSub: refactor send_last_items remove send_loop
2017-08-11 10:20:33 +02:00
8f5a1c4a2a
Merge pull request #1926 from weiss/import-metronome-pep
...
prosody2ejabberd: Support PEP import
2017-08-11 10:19:17 +02:00
7d3609d954
prosody2ejabberd: Support PEP import
2017-08-10 19:49:20 +02:00
fc7ba53c37
prosody2ejabberd: Remove superfluous 'catch'
2017-08-10 18:54:00 +02:00
2b1fea01cd
Renew certificate now renews all saved certificates that are close to expire
...
Before this commit renew_certificate only checked the hosts in the config file and renewd the certificates for those. However the user can request certificates apart from the hosts in the config file so he should be able to also renew them.
2017-08-10 18:54:26 +03:00
c20bfb3422
Revoke Certificate: Jose Private Key
...
Instead of signing the jose object with the account private key, it now signs the object using the certificate private key. This is useful in case the user wants to revoke a old certificate whose account key doesn't exist anymore.
2017-08-10 17:23:13 +03:00
011b7ac3f2
Support getting certificates for domains not specified in the configuration file
2017-08-10 15:26:35 +03:00
a96d72330d
Rename remove_room hook back
2017-08-10 14:49:05 +03:00
7d626b4f5c
Add support of section 4.9.3.16 on rfc6120
2017-08-10 12:17:31 +02:00
e903348dd3
Fix pubsub send_loop after 3fec7824
2017-08-09 11:34:36 +02:00
bee251d928
Merge pull request #1912 from mathiasertl/master
...
fix FIREWALL_WINDOW option
2017-08-09 09:48:18 +02:00
c658907331
fix typo
2017-08-08 19:09:55 +02:00
97a4d57f2e
Remove some debugging functions
2017-08-08 18:00:37 +03:00
3fec782494
Introduce 'hosts' option
...
The option can be used as a replacement of 'host' option
when several (sub)domains are needed to be registered for the module.
Note that you cannot combine both 'host' and 'hosts' in the config
because 'host' option is of a higher priority. Example:
mod_pubsub:
...
hosts:
- "pubsub1.@HOST@"
- "pubsub2.@HOST@"
Fixes #1883
2017-08-08 17:46:26 +03:00
9756b452d6
Implement renew_certificate command
...
This command renews the certificates for all domains that already have a certificate that has expired or is close to expiring. It is meant to be run automatically more often than the renewal process because if the certificates are valid nothing happens
2017-08-08 16:38:19 +03:00
7fa9a387ae
Try catch when formatting certificates
2017-08-08 12:45:57 +03:00
48254a1e10
Change certificate notAfter to 90 days
...
As stated in Let's Encrypt FAQ: https://letsencrypt.org/docs/faq/
2017-08-08 12:23:13 +03:00
52525eb76d
Fix tests for 8679cfd2f
2017-08-07 15:38:17 +02:00
8679cfd2f3
Rename stop_all_connections to stop_s2s_connections for consistency
2017-08-07 15:06:07 +02:00
25af3fb029
Compile mod_push early as it defines behaviour
2017-08-07 09:32:58 +02:00
2bceebc39d
Get rid of export_all
2017-08-05 21:01:29 +03:00
92532a0d66
Replace gen_fsm with p1_fsm to avoid warnings in OTP20+
2017-08-05 20:58:21 +03:00
b673539a2a
Merge remote-tracking branch 'processone/pr/1914'
...
* processone/pr/1914:
ejabberd_c2s: Fix priority of 'certfile' option
2017-08-05 19:27:43 +02:00
e1aaa1c99d
ejabberd_c2s: Fix priority of 'certfile' option
...
Use the 'certfile' listener option rather than a 'domain_certfile' for
ejabberd_c2s listeners that have "tls: true" configured. A
'domain_certfile' should only be preferred for STARTTLS connections.
Closes #1911 .
2017-08-05 18:59:32 +02:00
aa9eb001d0
fix FIREWALL_WINDOW option
2017-08-04 18:49:33 +02:00
101e808124
Fix warning in previous commit
2017-08-04 13:09:17 +02:00
766b7c65a6
Merge pull request #1881 from weiss/push
...
Support XEP-0357: Push Notifications
2017-08-04 12:58:06 +02:00
0516a3dc0e
Remove unused 'managers' option, related to the deferred XEP-0321 ( #1443 )
2017-08-04 12:29:15 +02:00
3d185c0fb8
Fix missing validation from 633b68db1 ( #1900 )
2017-08-04 11:53:32 +02:00
7815164216
Add minor details ( #1353 )
2017-08-04 10:34:13 +02:00
65f4094804
Prepare packaging for 17.08
2017-08-03 16:55:56 +02:00
06450f4a82
Keep disco#info on PEP compatible with XEP-0060 ( #1717 )
2017-08-03 15:48:23 +02:00
ce0beb550c
Move pubsub sql export to pubsub_db_sql module
2017-08-03 15:34:01 +02:00
96c0483533
Fix Xref from 5dcc97c
2017-08-03 14:54:06 +02:00
1274bcdba9
Change policy of user_resources command
...
This fixes issue #1908
2017-08-03 13:49:06 +02:00
5dcc97c85a
Preliminary export PubSub data from Mnesia tables to SQL file ( #1571 )
2017-08-03 10:53:01 +02:00
e6e8e64f84
Improve return format of get_certificates command
2017-08-02 21:10:49 +03:00
ac7105d39e
Implement verbose list_certificates option
2017-08-02 19:36:11 +03:00
6deceeec2e
Merge branch 'master' of github.com:processone/ejabberd
2017-08-02 14:36:43 +02:00
9edcbadd60
Fix clustering table reg_users_counter ( #1889 )
2017-08-02 14:36:32 +02:00
f65492e27f
Merge pull request #1837 from marcphilipp/feature/set_room_affiliation_test
...
Add integration test for set_room_affiliation
2017-08-02 14:34:30 +02:00
1df61a82c8
Merge branch 'master' of github.com:processone/ejabberd
2017-08-02 12:25:50 +02:00
73509686f1
Fix getting cached last item ( #1814 )
2017-08-02 12:24:34 +02:00
93e521d65e
Merge pull request #1903 from himawri/fix_pubsub_spec
...
Fix spec for mod_pubsub:subscribe_node
2017-08-02 13:52:21 +04:00
50511fcff7
Fix spec for mod_pubsub:subscribe_node
2017-08-02 10:31:42 +02:00
5e26190b98
Fix PubSub send last published items ( #1572 )
2017-08-01 17:00:52 +02:00
f22bd6eb46
Fix PEP node removal ( #1839 )
2017-08-01 15:40:34 +02:00
0ba6c78ed0
Fix disco#items on PEP service
2017-08-01 15:15:01 +02:00
636d68e0a9
Fix PEP node identity ( #1717 )
2017-08-01 14:41:16 +02:00
7e6d1c24c2
Update spec from custom and allow modules dependencies ( #1740 )
2017-08-01 13:33:14 +02:00
67918b17d3
Fix extauth.py so support : in passwords (thanks to jmberg)( #1676 )
2017-07-31 22:51:31 +02:00
3abe3aeeec
Finish revoke_certificate and add specs
...
1. Add a try catch in the final revoke_certificate function
2. Also delete the certificate from persistent memory when it is done revoked
2017-07-29 19:10:06 +03:00
51fa438340
Request basic auth dialog from browser
2017-07-28 16:08:05 +02:00
35a11526f9
Revert "Fix get_module_opt call in mod_block_strangers"
...
This reverts commit e5f64bc24a
2017-07-27 18:23:10 +02:00
0cfec92c14
Generate log messages when websocket is closed due timeouts
2017-07-27 17:53:16 +02:00
e5f64bc24a
Fix get_module_opt call in mod_block_strangers
2017-07-27 17:48:41 +02:00
cc6f4b90fb
Support certificate revocation
2017-07-27 18:25:44 +03:00
5c48ba4609
Set high water mark in lager for all backends
2017-07-27 17:14:03 +02:00
3ca62a797a
Fix nick bug with MUC on riak
2017-07-27 17:06:34 +02:00
b66dab1313
Add muc related hooks
2017-07-27 17:02:06 +02:00
58110e4bc1
Update OTP version check by configure
2017-07-27 15:31:59 +02:00
ea96615460
Ability to filter passwords from the log in mod_http_api ( #1888 )
...
* Ability to filter passwords from the log when creating users through the mod_http_api
2017-07-27 15:30:56 +02:00
61d1411ab3
Sync fork with upstream
2017-07-26 09:54:23 +03:00
1a506da932
Add an erl_opt so that rsa can be used when the otp version is enough
2017-07-26 09:52:44 +03:00
b8c26671c4
Update oauth2 dependency
2017-07-25 17:59:32 +02:00
92e38190aa
Encode strings using a library function and not my custom made
2017-07-25 14:13:40 +03:00
09918b5912
Add a try catch arounf list certificates
2017-07-23 21:47:22 +03:00
2e88d001d6
Fix errors from 1a0db3d
2017-07-21 11:42:03 +02:00
1a0db3de3a
Describe commands arguments and results in ejabberd_sm, ext_mod, mod_mam
2017-07-21 11:26:53 +02:00
250876ea1a
Fix indentation of commands lines
2017-07-21 11:26:47 +02:00
66510c1d78
Add mod_push_keepalive
...
This module tries to keep pending stream management sessions of push
clients alive (as long as the disconnected clients are reachable via
push notifications).
2017-07-21 01:07:36 +02:00
d6f1d3df5b
Support XEP-0357: Push Notifications
...
Closes #1379 .
2017-07-20 20:22:50 +02:00
72dbb6e7c1
Fix errors when running ejabberdctl as root
2017-07-20 14:40:50 +02:00
b1082a96c9
Add ability to update changelog in update-deps-releases
2017-07-20 11:43:25 +02:00
ed17586cf0
Update cache_tab and xmpp dep
2017-07-20 11:43:06 +02:00
26b8dd75f7
Merge pull request #1869 from wahjava/master
...
Fix ERLANG_OPTS when setting INET_DIST_INTERFACE
2017-07-19 11:33:38 +02:00
c3473c2077
Update fast_tls
2017-07-19 10:58:10 +02:00
e216654c52
Don't add indentation after single item result in docs
2017-07-18 17:48:53 +02:00
cc3391cc1c
Use string:join instead of lists:join
2017-07-18 15:43:46 +02:00
b8d56a7c11
Improve formatting of documented API parameters
2017-07-18 15:01:01 +02:00
9ce1f12b66
Pretty print list-certificates
2017-07-18 13:28:44 +03:00
1bb9e83501
Merge pull request #1871 from rstgroup/master
...
Fix old route record in mnesia's route table haven't been remove when restarting in some cases (#1184 )
2017-07-17 17:56:39 +04:00
de1a66dfbe
Fix old route record in mnesia's route table haven't been remove when restarting in some cases ( #1184 )
2017-07-17 15:14:30 +02:00
2e18122cd9
Print validity in list-certificates
2017-07-17 13:40:53 +03:00
8fe551cc68
Add a stub for the list-certificates command
2017-07-17 11:39:27 +03:00
09c3496ff1
Remove httpdir from some function arguments as we now use the built in ejabberd http server for authorizations
2017-07-17 10:48:57 +03:00
fa3108e6e2
Save acquired certificates in persistent storage
2017-07-17 10:42:09 +03:00
9cf596c67b
Change the persistent data structure from a record to a proplist
...
This is done so that possible future updates to the data structure don't break existing code.
With this change it will be possible to update the data structure and keep the same old persistent data file, which will still have the expected list format but with more properties
2017-07-17 09:59:38 +03:00
478a12637d
Separate the persistent data structure functions
2017-07-17 09:40:36 +03:00
4d977535f2
Make some persistent data wrapper functions
2017-07-17 09:35:37 +03:00
95613a11ab
Fix ERLANG_OPTS when setting INET_DIST_INTERFACE
2017-07-15 16:42:47 +05:30
2cd193f97c
Expand catch block used to report errors in doc generator
2017-07-14 17:18:07 +02:00
33a9d6a3c3
Fix args_examples from last commit
2017-07-14 17:17:26 +02:00
fdb863ce70
Describe even more command arguments and results in mod_admin_extra
2017-07-14 16:43:30 +02:00
43fc29873e
Add refresh repos option in update-deps-releases
2017-07-14 15:08:13 +02:00
e216a54ead
Update fast_tls
2017-07-14 15:08:13 +02:00
77a96b0ec6
Solve acme challenges using built in http server
2017-07-12 19:23:52 +03:00
d4cdc3a246
Fix ERLANG_OPTS end lines when setting FIREWALL_WINDOW ( #1856 )
2017-07-12 14:43:28 +02:00
5199ede4a2
Changle acme file permissions
...
Also changed some specs
2017-07-11 11:11:00 +03:00
b4b4e247dd
Add the certificate directory in ejabberd.yml.ecample
2017-07-07 19:40:57 +03:00
c50f6c218f
Clean up code by adding throws instead of passing the error value
2017-07-07 18:32:07 +03:00
5866124138
Clean up get_certificate code
2017-07-07 17:37:44 +03:00
f6bdc6fdb2
mod_privacy: Don't crash while copying c2s state
...
Don't assume 'privacy_active_list' is set when c2s_copy_session/2 is
called.
2017-07-07 14:28:22 +02:00
8f25baada6
mod_privacy: Apply cosmetic change to type spec
2017-07-07 14:25:55 +02:00
aaef1a14b4
Fix set_presence command to work in recent ejabberd
2017-07-07 10:55:08 +02:00
22e8f5fd51
Add copyright and fix description for some sources
2017-07-06 21:27:04 +03:00
88ab787ba6
Start gen_mod from elixir tests
2017-07-06 17:57:46 +02:00
eb9faffadd
Improve elixir tests
2017-07-06 17:19:22 +02:00
3b0eee785f
Handle new possible result from ejabberd_config.add_option
2017-07-06 17:19:22 +02:00
5ef542a638
Remove tests for old commands interface
2017-07-06 17:19:22 +02:00
ffdaff3740
Make ejabberd_cluster modular
...
For setting the cluster backend new global option 'cluster_backend' is
introduced. The default and only available value at the moment is 'mnesia'
2017-07-06 15:47:35 +03:00
56d273477e
Remove old command calling interface
2017-07-06 14:24:25 +02:00
a35b9dd9cc
Close accepted socket if sockname/peername has failed
...
Fixes #1834
2017-07-06 14:49:21 +03:00
c69720a1ab
Add integration test for set_room_affiliation
2017-07-06 13:33:13 +02:00
56fc0efbc8
Split ACME module into two
...
1. A communications module that handles all requets/responses and other low level stuff that have to do with the ACME CA
2. A head module that will do all the useful stuff
2017-07-04 11:44:22 +03:00
d3c477646f
Add support for command get_certificates, very crude
2017-07-03 13:37:32 +03:00
a58de70f06
Fix invalid argument in get_messages_susbset
...
This should fix #1818
2017-06-30 14:24:35 +02:00
800965a957
Avoid useless calls on simples subscriptions ( #1313 )
2017-06-29 15:24:18 +02:00
fcf672c50e
Add allow_local_users to mod_block_strangers ( #1804 , #1809 )
2017-06-29 14:55:24 +03:00
b66e369a1d
Fix Salt import from prosody SCRAMmed password ( #1803 )
2017-06-29 10:28:44 +02:00
9dd03c873c
Fix clone code in update-deps-release
2017-06-28 16:47:31 +02:00
e42bb47ce3
Update deps
2017-06-28 16:46:48 +02:00
dc7fa076d7
Fix problem with updating deps in rebar.config for non-tags
2017-06-28 16:36:59 +02:00
960cf495c6
Don't use asn1rt:decode, it's not available on R20
2017-06-28 14:51:45 +02:00
0f12804a49
Quote paths to allow spaces ( #1789 )
2017-06-28 11:39:05 +02:00
3c7c71cfa6
In offline export to SQL, first write all DELETE, later all INSERT ( #1509 )
2017-06-28 11:14:59 +02:00
aac190255b
Update fast_tls
2017-06-27 15:02:23 +02:00
85a08a087b
Improve update-deps-releases deps parsing
2017-06-27 14:56:00 +02:00
637d9b054b
Support get-cert, revoke-cert. Also cleaned some typespecs
2017-06-26 19:03:21 +03:00
1bfb0ab39c
Fix username in mam export ( #1510 )(thanks to themaverik)
2017-06-26 14:38:12 +02:00
4ef1cdec12
Write validator for mod_multicast's limits option
2017-06-26 13:39:50 +02:00
0534678028
Use YAML syntax for limits option in mod_multicast
2017-06-26 11:26:53 +02:00
70606d7f1a
Catch exception that may happen when sending data over websocket
...
This fixes #1667
2017-06-23 17:19:37 +02:00
bb39ecbc08
More explicit bosh configuration handler
...
I also updated default url from to match URL suggested by XEP-0156
2017-06-23 16:47:14 +02:00
54e6e1a5fb
Merge pull request #1793 from marcphilipp/bugfix/set_room_affiliation_master
...
Fix mod_muc_admin:set_room_affiliation
2017-06-22 18:28:12 +04:00
5bb7a0b0db
Don't let a receiver to crash if a controller is unavailable
...
Fixes #1796
2017-06-22 16:58:46 +03:00
330456bcf0
Indent using Emacs
2017-06-22 14:47:56 +03:00
396bd5eb3d
Removed some ?INFO_MSG
2017-06-22 11:38:40 +03:00
dd79dea81d
Support new_cert, make certificate request
2017-06-22 11:31:50 +03:00
976a8c9cc9
Fix mod_muc_admin:set_room_affiliation
2017-06-21 17:20:58 +02:00
a095477b4c
Fix outgoing_s2s_timeout description ( #1684 )
2017-06-21 16:30:51 +02:00
950aca380c
mod_client_state: Reset state on session resume
...
Don't restore the previous CSI state when a stream management session is
resumed.
2017-06-21 01:05:46 +02:00
985b0a1933
mod_stream_mgmt: Add missing function specs
2017-06-21 01:00:29 +02:00
a7841ed486
Improve API documentation generator
2017-06-20 14:45:57 +02:00
a11e833a98
Make ext_mod api return rescode
2017-06-20 14:45:31 +02:00
62ee051c6e
Fix invalid {args,result}_examples in mod_muc_admin
2017-06-19 16:31:07 +02:00
5424ead01d
Generate better errors when not being able to generate documentation
2017-06-19 16:30:45 +02:00
96d385bf82
Another tweak to md generator
2017-06-19 15:10:34 +02:00
8e2258b16a
Update markdown api document generator
2017-06-19 15:02:02 +02:00
dc4c00a78c
Add support for solving http-01 challenge
2017-06-18 13:20:47 +03:00
1d1250b056
Cleanup acme_challenge.erl, move types and records in ejabberd_acme.hrl
2017-06-17 19:06:39 +03:00
f87b46f454
Fix srg_user_add/del for non-Mnesia database backends ( #1780 )
2017-06-15 11:05:41 +02:00
133d2ae6d5
Derive the alg field of the JWS object using a erlang-jose library function rather than hardcoding
2017-06-15 11:47:29 +03:00
5418b37314
Add pubsub import from prosody/metronome
2017-06-15 09:56:05 +02:00
6353a06a5d
Catch exception from Elixir.ExUnit.Server.cases_loaded
2017-06-14 14:56:59 +02:00
58b9077b51
Fix OTP-17.5 support
2017-06-14 14:18:35 +02:00
10fcfa860a
Show operations to perform before asking to apply them
2017-06-14 14:05:41 +02:00
4fc3d511ce
Synchronize fork
2017-06-14 12:35:01 +03:00
032ce9e53c
Refactor get requests, Implement authorization handling functions
2017-06-14 12:12:43 +03:00
5f2dcc51ce
Bump xmpp version
2017-06-14 01:05:15 +02:00
0aa64381ff
Fix IP address parsing for mod_metrics
2017-06-13 16:54:29 +03:00
6c8b037422
Fix refactor bug on wait_status
2017-06-13 12:37:27 +02:00
d63ea000c7
Prepare package for 17.06-beta
2017-06-13 11:02:30 +02:00
5e148df0a9
Update esip and stun dependencies
2017-06-13 10:35:00 +02:00
4b1c59e199
Major Refactoring, Separated Logic from Requests
2017-06-12 21:35:43 +03:00
d8f05acb67
Add script for managing updates to deps
2017-06-12 19:23:41 +02:00
d6f4c99243
Remove luerl from floating_deps
2017-06-12 19:23:41 +02:00
c25aa8378f
Add new-authz, refactor the http requests that all used the same code
2017-06-12 15:31:48 +03:00
63b6e0d381
Switch access rule delete_old_users with protect_old_users ( #1772 )
2017-06-09 19:18:47 +02:00
911b8188d2
Refactor the http response handlers.
...
Encapsulate some dangerous calls with try catch.
2017-06-09 19:47:50 +03:00
167edacb5f
Make Stylistic Changes in order to conform to guidelines:
...
1. Remove trailing whitespace
2. Remove Macros
3. Handle all erroneous response codes the same way
4. Add specs
Also don't return nonces anymore when the http response is negative.
2017-06-09 18:53:54 +03:00
53d47483c8
Implement some basic account handling functions
2017-06-09 15:49:27 +03:00
8c1568ff93
Add more ipv6 loopback addresses
2017-06-09 14:38:34 +02:00
7b5895c90d
Allow api access on both ipv4 and 6 loopback addresses
...
This should fix issue #1769
2017-06-09 13:57:26 +02:00
115cb23bd8
Fix elixir tests on elixir 1.4
2017-06-09 12:59:47 +02:00
62806607bf
Add missing ,
2017-06-09 12:10:40 +02:00
b25b5c2f98
Improve export2sql explanation; remove obsolete and duplicated command
2017-06-09 12:02:49 +02:00
444c385f23
Update dependencies
2017-06-09 10:34:35 +02:00
ee8bbccb2a
Fix and document push_roster_all command
2017-06-08 19:54:34 +02:00
66237abd35
Merge pull request #1766 from IRog/master
...
fixing exec_iex bug with proper --name arguement
2017-06-08 10:41:26 +02:00
0973a8d6c1
fixing iex bug with proper --name arguement
2017-06-07 21:15:17 -07:00
fbead19c88
Update elixir
2017-06-07 17:09:06 +02:00
baf574d6c4
Update lager p1_mysql and p1_pgsql dependencies
2017-06-07 16:56:00 +02:00
e3c801f1f5
Update dependencies
2017-06-07 16:18:41 +02:00
f773edcb98
Override version of subdeps with version from main rebar.config
2017-06-07 16:06:28 +02:00
2a73068aac
Add missing space separator on EJABBERD_OPTS
2017-06-06 15:41:48 +02:00
926de60f5d
Support for new_cert
2017-06-05 17:10:37 +03:00
5971eb3da0
Merge pull request #1758 from reneklacan/fix-mix-warnings
...
Fix mix warnings
2017-06-04 14:25:31 +04:00
04fd5567a7
Fix mix warnings
2017-06-04 12:24:35 +02:00
4f8c132b53
Merge pull request #1759 from reneklacan/fix-version-to-be-semver
...
Fix version to be SemVer compatible
2017-06-04 14:18:39 +04:00
a98685e0bb
Fix version to be SemVer compatible
2017-06-04 03:01:51 +02:00
df5d673e63
Solve http-01 challenge
2017-06-03 12:34:15 +03:00
12733bd21b
Fix EJABBERD_OPTS
2017-06-02 17:56:57 +02:00
f6767ed061
Fix rooms list in WebAdmin ( #1753 )
2017-06-01 19:27:41 +02:00
de10a7a8ce
Respect INSTALLUSER when creating spool directory
2017-06-01 17:48:44 +02:00
5081a180fa
Create spool directory at start if not exists
2017-06-01 17:44:23 +02:00
a576f3a6d1
Remove use of getopt to support simpler shells
2017-06-01 12:10:06 +02:00
3201f8e513
Improve ejabberdctl parameters parsing
2017-06-01 11:48:11 +02:00
92003fa4dc
Minor ejabberdctl improvements
2017-06-01 08:04:11 +02:00
818d9c8c42
Merge branch 'joudinet-master'
2017-05-31 18:12:26 +02:00
cbe6553baa
Refactor ejabberdctl
2017-05-31 18:11:45 +02:00
5d3870faa3
Add --enable-system-deps configure option
2017-05-31 11:30:34 +02:00
2d8ce266bd
Add license files into lib and deps directories
2017-05-30 15:03:06 +02:00
0042f18c1f
Merge branch 'master' of https://github.com/joudinet/ejabberd into joudinet-master
2017-05-30 12:37:27 +02:00
0982a9bc3c
Parse correctly presence_broadcast option in change_room_option command
2017-05-29 12:49:53 +02:00
50327a0cfc
Fix case clause
...
Fixes #1746
2017-05-25 13:46:17 +03:00
5802062746
Cosmetic change: Fix indentation errors
2017-05-24 17:16:16 +02:00
69de1780a0
Introduce --enable-stun and --enable-sip configure options
...
STUN/TURN and SIP is not compiled by default anymore.
Use --enable-stun, --enable-sip or --enable-all to enable them.
2017-05-23 13:12:48 +03:00
6e8895f9e9
Get rid of sql_queries.erl
2017-05-23 12:25:13 +03:00
e93762a720
Deprecate misc:encode_base64/1 and misc:decode_base64/1
2017-05-23 10:43:26 +03:00
268065e5c4
Validate all certfiles on startup
2017-05-23 09:27:52 +03:00
d7878ef131
Implement cache for mod_announce
2017-05-22 16:14:28 +03:00
908bedeaa6
Describe command arguments and results in mod_muc_admin
2017-05-22 12:55:32 +02:00
504860f065
Don't leak with UDP sockets
2017-05-22 11:29:53 +03:00
3a96d72a7f
Implement cache for mod_private
2017-05-22 10:34:57 +03:00
d88e4d495f
Don't store messages via a single process
2017-05-21 23:21:13 +03:00
66a4e405e0
Improve mod_metrics
...
* Do not spawn a process per event
* Avoid UDP socket creation on every event
* Get rid of calls to str.erl module
* Add options 'ip' and 'port'
2017-05-21 14:24:57 +03:00
0a77b9f43e
Get rid of a workaround against old Erlang bug
2017-05-21 13:30:46 +03:00
470669fa6b
Get rid of db_type warning for mod_vcard_xupdate
2017-05-21 11:40:24 +03:00
af29fb21df
Get rid of detection of modules' db_type detection
...
The detection sometimes leads to errorneous warnings.
We need to improve it later. For now I just remove the
detection as it doesn't fully work anyway.
2017-05-21 11:33:16 +03:00
be50d57ddd
Declare ejabberd_oauth behaviour
2017-05-21 11:31:30 +03:00
35d19b32f4
Implement cache for mod_privacy/mod_blocking
2017-05-20 22:36:32 +03:00
654d907dcf
export_all is not needed here
2017-05-19 17:03:41 +02:00
b013c29c7e
Fix values put in args_examples
2017-05-19 16:56:37 +02:00
0ed23980a6
Get rid of Mnesia transaction in get_vcard/2
2017-05-18 21:24:47 +03:00
a78862e05e
The default 'iqdisc' is now 'no_queue'
2017-05-18 19:13:18 +03:00
bcb44ccb6f
Implement cache for mod_last
2017-05-18 13:21:17 +03:00
736a182544
?SQL_UPSERT returns 'ok' on success
2017-05-18 12:10:36 +03:00
97bb1250ba
Avoid erroneous usage of ?MODULE macro
2017-05-18 12:09:28 +03:00
b0b7ac101c
Fix function_clause after authentication refactoring
...
Fixes https://github.com/processone/ejabberd-contrib/issues/213
2017-05-18 09:51:04 +03:00
3e35d44b0f
Replace 'if_version_above' directive with 'if_have_fun'
2017-05-17 19:37:06 +03:00
6691c59a7a
Clean up database code related to mod_vcard_xupdate
2017-05-17 19:29:19 +03:00
1391d5a304
Use disc_only_copies for oauth_token Mnesia table
2017-05-17 17:42:22 +03:00
8f595b58a7
Increase gen_mod's supervisor shutdown time
2017-05-17 17:33:07 +03:00
5bdc6c0822
Get rid of deprecated option 'resume_timeout' in test config
2017-05-17 17:21:59 +03:00
1925b94131
Implement cache for mod_vcard and mod_vcard_xupdate
2017-05-17 17:13:34 +03:00
ddb043aa71
More account support(Update/Info)
2017-05-17 16:55:26 +03:00
fc794b680a
Add cache options to the validator
2017-05-17 16:03:41 +03:00
a71065fcda
Ciphers should be a binary string
2017-05-17 15:42:18 +03:00
7165196211
Get rid of unused variable
2017-05-17 15:24:32 +03:00
f782955c06
Implement cache for roster
2017-05-17 14:47:35 +03:00
3f13396d73
Fix use_cache/1 callback
2017-05-15 08:58:37 +03:00
88365ed507
New account functional, very crude
2017-05-15 01:41:09 +03:00
061d5f2380
Shut up dialyzer/xref if public_key:short_name_hash/1 is not available
2017-05-13 13:11:08 +03:00
2d17a2850c
Only validate certfiles if public_key:short_name_hash/1 is available
2017-05-12 17:51:17 +03:00
cc58ce6301
Introduce Certficate Manager
...
The major goal is to simplify certificate management in ejabberd.
Currently it requires some effort from a user to configure certficates,
especially in the situation where a lot of virtual domains are hosted.
The task is splitted in several sub-tasks:
* Implement basic certificate validator. The validator should check all
configured certificates for existence, validity, duration and so on. The
validator should not perform any actions in the case of errors except
logging an error message. This is actually implemented by this commit.
* All certificates should be configured inside a single section (something
like 'certfiles') where ejabberd should parse them, check the full-chain,
find the corresponding private keys and, if needed, resort chains and
split the certficates into separate files for easy to use by fast_tls.
* Options like 'domain_certfile', 'c2s_certfile' or 's2s_certfile' should
probably be deprecated, since the process of matching certificates with the
corresponding virtual hosts should be done automatically and these options
only introduce configuration errors without any meaningful purpose.
2017-05-12 16:27:09 +03:00
d3c8fb7705
Check presence of some files during option validation
2017-05-12 09:34:57 +03:00
9fe16a29e1
Gracefully process malformed passwords during password change
2017-05-11 17:15:23 +03:00
31a3cc7b10
Gracefully process malformed passwords during registration
2017-05-11 17:09:26 +03:00
a8dc5f80d1
Add 'access_remove' ACL to mod_register
2017-05-11 16:37:01 +03:00
81d9770d4f
Update Elixir tests for using new auth API
2017-05-11 16:15:18 +03:00
cdb191bb48
Rename is_user_exists -> user_exists
2017-05-11 15:49:06 +03:00
633b68db11
Use cache for authentication backends
...
The commit introduces the following API incompatibilities:
In ejabberd_auth.erl:
* dirty_get_registered_users/0 is renamed to get_users/0
* get_vh_registered_users/1 is renamed to get_users/1
* get_vh_registered_users/2 is renamed to get_users/2
* get_vh_registered_users_number/1 is renamed to count_users/1
* get_vh_registered_users_number/2 is renamed to count_users/2
In ejabberd_auth callbacks
* plain_password_required/0 is replaced by plain_password_required/1
where the argument is a virtual host
* store_type/0 is replaced by store_type/1 where the argument is
a virtual host
* set_password/3 is now an optional callback
* remove_user/3 callback is no longer needed
* remove_user/2 now should return `ok | {error, atom()}`
* is_user_exists/2 now must only be implemented for backends
with `external` store type
* check_password/6 is no longer needed
* check_password/4 now must only be implemented for backends
with `external` store type
* try_register/3 is now an optional callback and should return
`ok | {error, atom()}`
* dirty_get_registered_users/0 is no longer needed
* get_vh_registered_users/1 is no longer needed
* get_vh_registered_users/2 is renamed to get_users/2
* get_vh_registered_users_number/1 is no longer needed
* get_vh_registered_users_number/2 is renamed to count_users/2
* get_password_s/2 is no longer needed
* get_password/2 now must only be implemented for backends with
`plain` or `scram` store type
Additionally, the commit introduces two new callbacks:
* use_cache/1 where the argument is a virtual host
* cache_nodes/1 where the argument is a virtual host
New options are also introduced: `auth_use_cache`, `auth_cache_missed`,
`auth_cache_life_time` and `auth_cache_size`.
2017-05-11 14:37:21 +03:00
e890525788
Use misc:atom_to_binary/1 instead of the deprecated jlib.erl ( #1510 )
2017-05-10 12:05:52 +02:00
6b8c61b3a2
Update comment: aux.erl was renamed to misc.erl
2017-05-10 12:03:13 +02:00
4849ac9781
Use jid:encode/1 instead of the deprecated jid:to_string/1 ( #1510 )
2017-05-10 11:22:15 +02:00
cd18d3d8a7
Fix: update sql statement, added missing delimeter for sql queries
2017-05-10 11:22:11 +02:00
a0908ba393
Added export function for mam module
2017-05-10 11:22:07 +02:00
02dbe39b06
Examining jose functionality
2017-05-09 23:27:37 +03:00
67a00939db
Small improvements to the acme module
2017-05-08 20:29:58 +03:00
5d7a704ca5
Remove forgotten 'export_all'
2017-05-08 17:23:29 +03:00
cee90a886e
Don't list 'redis_pool_size' option multiple times
2017-05-08 17:22:34 +03:00
6b6d07745d
Split some functions in smaller ones
2017-05-08 16:29:01 +03:00
05362b9a7d
Very basic acme client, only stubs
2017-05-08 15:35:11 +03:00
bf2a2f291f
State that Erlang 17.5 or higher is only supported
2017-05-08 15:10:42 +03:00
8368a0850a
Don't call gen_mod:get_opt() outside of modules
2017-05-08 14:34:35 +03:00
01a2c9fe12
Add type specs for Module:opt_type/1
2017-05-08 12:59:28 +03:00
6aefd24eb3
LOG_PATH macro should be of string type
2017-05-06 09:42:06 +03:00
3241c2506b
Introduce 'sql_connect_timeout' option ( #1698 )
2017-05-05 16:25:10 +03:00
48d6ae1def
Introduce 'sql_query_timeout' option
...
Fixes #1698
2017-05-05 13:20:28 +03:00
f2dc8c0442
Emit deprecation warning for SM related listening options
2017-05-05 12:31:17 +03:00
b174e2c9c6
Improve validation of second-level options
2017-05-05 11:11:17 +03:00
fb17c1b99f
Make it possible to validate second-level options
2017-05-04 17:34:32 +03:00
e790e66f47
Fix elixir tests
2017-05-04 12:17:41 +02:00
c64e77a08c
Catch exceptions from acl:add_list in web admin
2017-05-04 12:01:22 +02:00
cf53d834e9
Introduce 'iqdisc' global option
2017-05-04 12:24:47 +03:00
a2a4a4970e
Validate module options on start_module/2
2017-05-04 09:09:10 +03:00
31fa36003f
Parse ldap_uids in mod_vcard_ldap like in eldap_utils ( #319 )
2017-05-03 23:32:56 +02:00
cd1c41e448
Merge pull request #1697 from pipo02mix/dockerfile-17-04
...
Update Dockerfile to be able to build 17.04 ejabberd version
2017-05-03 09:29:23 +02:00
54cc49bc70
Validate new options before module reloading
2017-05-01 14:01:12 +03:00
fe662c1a0a
Don't forget to delete digraph
2017-05-01 10:14:00 +03:00
fddd6110e0
Don't validate an option in gen_mod:get*opt() functions
...
The changes are very similar to those from previous commit:
* Now there is no need to pass validating function in
gen_mod:get_opt() and gen_mod:get_module_opt() functions,
because the modules' configuration keeps already validated values.
* New functions gen_mod:get_opt/2 and gen_mod:get_module_opt/3 are
introduced.
* Functions gen_mod:get_opt/4 and get_module_opt/5 are deprecated.
If the functions are still called, the "function" argument is
simply ignored.
* Validating callback Mod:listen_opt_type/1 is introduced to validate
listening options at startup.
2017-04-30 19:01:47 +03:00
2b63d07329
Merge branch 'new-option-validation'
2017-04-29 11:48:57 +03:00
b82b93f8f0
Don't validate an option in ejabberd_config:get_option() functions
...
The commit introduces the following changes:
* Now there is no need to pass validating function in
ejabberd_config:get_option() functions, because the configuration
keeps already validated values.
* New function ejabberd_config:get_option/1 is introduced
* Function ejabberd_config:get_option/3 is deprecated. If the function
is still called, the second argument (validating function) is simply
ignored.
* The second argument for ejabberd_config:get_option/2 is now
a default value, not a validating function.
2017-04-29 11:39:40 +03:00
7129aebe76
Don't re-define validation functions in multiple places
2017-04-28 13:23:32 +03:00
2bcf822637
Fix elixir tests
2017-04-28 10:08:09 +02:00
6658c0d386
Bump cache_tab version
2017-04-27 20:07:44 +03:00
0b93cb7ece
Store options using p1_options module
2017-04-27 19:44:58 +03:00
b51e2aa213
Merge pull request #1702 from skuroki/patch-1
...
Fix typo
2017-04-27 09:58:37 +02:00
d18d99e8ec
Bug requesting non-existent data with private_get command ( #1690 )
2017-04-26 23:14:30 +02:00
9b8364b6c8
Merge remote-tracking branch 'processone/pr/1699'
...
* processone/pr/1699:
Add support for HTTP File Upload, version 0.3.0
2017-04-26 21:18:16 +02:00
959419419f
Fix typo
2017-04-26 17:35:51 +09:00
2988d84cfb
Don't check result of jid.start
2017-04-26 09:50:49 +02:00
c0eb85ce53
Allow a room admin also to subscribe another JID
2017-04-26 01:30:12 +02:00
56a4bf8f3c
mod_stream_mgmt: Fix typo in variable name
2017-04-25 22:37:27 +02:00
9cc332d6b3
mod_stream_mgmt: Fix 'if_offline' detection
2017-04-25 22:32:03 +02:00
120682ec8b
Include original 'id' and 'type' attributes in offline event
2017-04-25 17:59:26 +03:00
a67b3dc6a6
Don't check result of jid.start
2017-04-25 16:54:01 +02:00
f4c98f635b
Don't check result of jid.start
2017-04-25 16:46:00 +02:00
069bf6dec6
Make sure only jabber:x:event tag is present in offline event
2017-04-25 17:21:24 +03:00
a59bef1afe
Update Dockerfile to be able to build 17.04 ejabberd version
...
Because the default installation prefix has changed in the new release, it is needed to add in the configure line of Docker file the argument --prefix=/
2017-04-25 09:35:07 +02:00
d0f3696596
randoms: Keep compatibility with Erlang/OTP 17
2017-04-24 23:51:01 +02:00
c923bb5c10
Avoid changing configuration on listener deletion
2017-04-23 16:42:54 +03:00
9a93acc62a
Improve Mnesia tables creation and transformation
2017-04-23 16:37:58 +03:00
8770fc98e1
Use round-robin algorithm when selecting worker from DB pool
2017-04-23 11:54:56 +03:00
18433e289f
Add clear_cache admin command
2017-04-22 11:33:39 +03:00
168712ebbd
Add support for HTTP File Upload, version 0.3.0
...
Support the current XEP-0363 version in addition to the previous
revisions.
2017-04-21 18:36:53 +02:00
44ae6bcc83
Fix elixir tests
2017-04-21 12:17:23 +02:00
02790b105e
Speedup Mnesia tables initialization
2017-04-21 12:27:15 +03:00
d88c08e074
Use new cache API in mod_shared_roster_ldap
2017-04-21 10:43:14 +03:00
9937cb48fd
Use new cache API in ejabberd_oauth
2017-04-21 09:02:10 +03:00
5444475b1d
Correct option validation
2017-04-20 18:55:16 +03:00
264a40f217
Use new cache API in mod_mam
2017-04-20 18:52:16 +03:00
a26f90a346
Use new cache API in mod_caps
2017-04-20 18:18:26 +03:00
ca9d04ba6b
Fix private_get command sending a proper xmlel ( #1683 )
2017-04-20 16:50:08 +02:00
4e86a71ab2
When getting user rooms, filter by the serverhost as expected ( #1683 )
2017-04-20 16:49:32 +02:00
3682888655
mod_stream_mgmt: Preserve stanza count on timeout
...
If a pending stream management session times out, call
ejabberd_c2s:process_terminated/2 *before* storing the incoming stanza
count. Without this change, the session table entry that holds the
stanza count was purged while closing the session.
2017-04-19 23:04:20 +02:00
3adf720bc1
Use #jid{} type for #muc_unsubscribe.jid
2017-04-19 22:18:23 +02:00
d7a999eaf5
Don't use jid:from_string as it's deprecated, see jid.erl line 43
2017-04-19 21:47:59 +02:00
64333f69ea
Don't try to load already loaded applications
2017-04-19 11:40:58 +03:00
b8a7720986
ejabberd_c2s: Don't close session on stream resume
...
Don't let ejabberd_c2s close the session and unset presence if a
'c2s_terminated' callback stops hook execution, as is done in
mod_stream_mgmt:c2s_terminated/2 on resumption.
Fixes #1680 .
2017-04-19 01:20:28 +02:00
7c9415356d
Function fix_from_to/2 should not crash when 'from' is undefined
...
Fixes #1678
2017-04-18 01:38:35 +03:00
c97aade33e
Merge pull request #1677 from getong/catch_lager_crash_log_not_run
...
lager_crash_log in some cases not run, catch it
2017-04-17 09:44:00 +04:00
ab751d290a
lager_crash_log in some cases not run, catch it
2017-04-17 12:07:23 +08:00
f496d22074
Improve logging message
2017-04-16 23:56:12 +03:00
86b680a3ad
Move compile_exprs() to misc module
2017-04-16 20:05:46 +03:00
78dba217bf
Speedup configuration options lookup
...
We now avoid excessive ETS lookups; instead, we use dynamically
compiled module 'ejabberd_options' keeping the configuration options
2017-04-16 15:29:10 +03:00
3b14b35252
Default config file should be ejabberd.yml
2017-04-16 01:26:33 +03:00
878c762cdf
Log human readable description when configuration file is not found
2017-04-16 01:22:55 +03:00
920f2678ac
Report configuration file location on startup
2017-04-16 01:02:46 +03:00
b6182e6fe8
Speedup loading of translation files
...
A dump of 'translations' ETS table is now stored on disc.
The table is only re-created when new/deleted/modified translation
files are detected; otherwise, the ETS table is restored from
the dump file on startup.
2017-04-16 00:29:55 +03:00
41fe062a8d
Lower log level for some messages
2017-04-15 15:47:00 +03:00
4c5f97bb9a
Add Riak as mod_proxy65 RAM backend
2017-04-15 15:38:48 +03:00
f9c24ab16d
Add Riak as mod_carboncopy RAM backend
2017-04-15 14:41:14 +03:00
72b536b52d
Add Riak as BOSH RAM backend
2017-04-15 13:52:36 +03:00
598c79ff86
Fix cleaning of Riak route table
2017-04-15 13:36:29 +03:00
da66eb5714
Add Riak as router RAM backend
2017-04-15 13:07:56 +03:00
c290b4284f
Fix closing of outbound S2S connections
2017-04-15 11:15:50 +03:00
fcb978248f
Add Riak as session manager RAM backend
2017-04-15 10:02:32 +03:00
5774edfe79
Improve ejabberd_c2s:close()
2017-04-15 08:30:41 +03:00
5c23187d2c
Make sure stream trailer is sent in the very end
2017-04-14 20:56:01 +03:00
0a7eb33772
Better process session close
2017-04-14 20:41:25 +03:00
9de075029b
Fix a typo
2017-04-14 20:40:39 +03:00
d110cbb6e2
Fix ejabberd_router:is_my_route/1
2017-04-14 20:34:00 +03:00
5f1f126613
Don't forget to disconnect
2017-04-14 20:32:26 +03:00
e40baf0bda
Use cache in front of Redis/SQL RAM backends
2017-04-14 13:57:52 +03:00
aa7d5df6a0
Bump xmpp dependency, it's required by previous commit
2017-04-14 09:47:25 +02:00
177d5fec86
Allow a room admin to unsubscribe another JID
2017-04-13 22:37:39 +02:00
0c0d79fd93
Travis CI: Update MySQL package
...
The "mysql-server-5.6" package is no longer available.
2017-04-11 13:52:10 +02:00
87ae2d7996
mod_muc_room: Replace deprecated function call
...
Use jid:decode/1 instead of jlib:string_to_jid/1.
2017-04-11 13:38:33 +02:00
b1acd1183f
Rename aux.erl as misc.erl
...
Thanks Microsoft Windows to not support some filenames
2017-04-11 12:13:58 +02:00
265aa54bc2
Use p1_utils 1.0.8
2017-04-11 08:11:29 +02:00
1e82db5655
New muc_register_nick command (thanks to Peter Marheine)( #1407 )
2017-04-10 12:23:14 +02:00
f2ca4cb3cd
Merge pull request #1666 from weiss/fix-csi
...
Let CSI keep latest stanzas of each given full JID
2017-04-07 15:10:39 +02:00
cf784772c9
Merge pull request #1664 from weiss/fix-routing
...
Fix routing of groupchat and headline messages
2017-04-07 15:10:26 +02:00
0567d528c6
Let ext_mod be aware of p1_utils includes
2017-04-07 12:51:43 +02:00
36e3f4bc2a
Generate ejabberd lib dir when not available in code server ( #1665 )
...
This is the case if running ejabberd from development directory
when code:lib_dir(ejabberd) returns {error, nad_name}.
2017-04-07 12:09:43 +02:00
2a6c50832e
Improve S2S examples ( #1583 )
2017-04-07 11:12:27 +02:00
d759875db8
Add more examples on config template ( #1583 )
2017-04-07 11:02:11 +02:00
1510ee0b3c
Merge pull request #1660 from michal800106/master
...
Fix order of starting supervisors.
2017-04-07 10:04:38 +02:00
3729acc5b0
Improve logging of Redis errors
2017-04-07 09:10:33 +03:00
9fa5f37f74
mod_client_state: Remove some empty lines
2017-04-06 23:00:53 +02:00
0ddd2e0ebf
mod_client_state: Queue stanzas of each full JID
...
Keep the latest stanzas of each given full JID, rather than dropping
them when stanzas from a different resource are received. This change
makes sure the recipient receives the latest status of all clients of
each contact. It also ensures the recipient will see the current list
of occupants of joined MUC rooms.
2017-04-06 22:19:00 +02:00
7827faae4b
mod_client_state: Don't keep track of queue size
...
Use maps:size/1 rather than keeping track of the size ourselves.
2017-04-06 21:01:26 +02:00
245fe04289
Improve type specs and return values
2017-04-06 20:56:46 +03:00
6876a37e61
Add Redis pool support
...
Fixes #1624
2017-04-06 17:56:37 +03:00
00c613b351
Set default prefix to /usr/local
2017-04-06 15:35:02 +02:00
81fe380de2
Fix order of starting supervisors.
...
ExtMod should be loaded before GenModSupervisor because ext_mod adds proper paths to ebin from modules (ejabberd-contrib).
Without this change you have to add -pa parameter with path to module's ebin.
2017-04-06 08:50:23 +02:00
179e8934cf
ejabberd_sm: Fix routing of headline messages
...
As per RFC 6121, silently drop headline messages sent to the bare JID of
an offline user or to the full JID of an unavailable resource.
2017-04-05 21:03:13 +02:00
8bfb6fdd4e
ejabberd_sm: Fix routing of groupchat messages
...
As per RFC 6121, don't (re)route groupchat messages sent to a bare JID
or to an unavailable resource.
2017-04-05 20:41:10 +02:00
89f81c89da
ejabberd_sm: Fix typo in debug message
2017-04-05 20:23:28 +02:00
ad948d33c0
Add description to feature-not-implemented error
2017-04-05 15:19:00 +03:00
6fa55e7c38
Set 'read_concurrency' for some ETS tables
2017-04-05 15:10:18 +03:00
2febbe5ffb
Don't misuse monotonic_time/0
2017-04-05 10:42:42 +03:00
578ecad93c
Disable mix tests
2017-04-04 17:02:15 +02:00
f5b0cd1793
Don't log warning on successful ping reply
2017-04-04 17:14:24 +03:00
3a0b4ad8da
Merge branch 'master' of github.com:processone/ejabberd
2017-04-04 09:53:45 +03:00
408f9b515e
Fix c2s connection close on demand
...
Fixes #1652
2017-04-04 09:52:42 +03:00
f45dc46856
Forget prepared SQL queries on database connect ( #1325 )
2017-04-03 16:42:41 +03:00
b75780b9cd
Always init pubsub_index when using mnesia
2017-04-03 12:13:20 +02:00
19614678e9
Change mnesia dir detection
2017-04-03 12:57:47 +03:00
55ea097bce
Remove obsolete mnesia migration calls
...
Now that plugins directly use ejabberd_mnesia and can include their own
transform handler, we don't need pubsub_migrate anymore.
People upgrading from 2.1.1x version must upgrade to 17.01 first.
pubsub_migrate module remains to support any manual process requiring it
2017-04-03 11:37:07 +02:00
9d9037856c
Improve redis related code
2017-04-02 11:56:09 +03:00
5087e9c2df
Use ejabberd_sql:abort/1 instead of exit/1
2017-03-31 19:10:07 +03:00
178a0a3e1b
Merge branch 'master' of github.com:processone/ejabberd
2017-03-31 19:08:16 +03:00
05ef009552
Add Redis as mod_proxy65 RAM backend
2017-03-31 19:07:56 +03:00
316da00345
Add ejabberd_sql:abort/1 and ejabberd_sql:restart/1
2017-03-31 17:37:24 +03:00
f449df161a
Add SQL as mod_proxy65 RAM backend
2017-03-31 08:16:28 +03:00
3e4ed83cb3
Raise bad_node instead of node_down for consistency reason
2017-03-30 17:51:37 +03:00
f5f353d90a
Do not duplicate enc_pid/dec_pid functions
2017-03-30 17:44:43 +03:00
bfde473c3b
Add missing jlib->aux convertion
2017-03-30 14:28:55 +02:00
c93bf732db
Refactor pubsub's get_last_items
2017-03-30 14:26:30 +02:00
7bcbea2108
Deprecate jlib.erl in favor of aux.erl
...
Since the main goal of jlib.erl is lost, all auxiliary functions
are now moved to aux.erl, and the whole jlib.erl is now deprecated.
2017-03-30 14:17:13 +03:00
997ac58329
Merge pull request #1646 from weiss/custom-headers
...
Add custom_headers option for ejabberd_http listeners
2017-03-30 12:47:42 +02:00
085b61eea5
Add Redis as mod_carboncopy RAM backend
2017-03-30 11:45:09 +03:00
31fd83b2ae
Add SQL as mod_carboncopy RAM backend
2017-03-30 10:31:51 +03:00
4b4c039fde
oauth_list_tokens and oauth_revoke_token work only in Mnesia ( #1644 )
2017-03-29 12:41:27 +02:00
0b3cf26406
Fix a typo
2017-03-29 13:20:15 +03:00
12e01a5119
Add SQL as mod_muc RAM backend
2017-03-29 12:58:01 +03:00
ba6c88cb90
Add Redis as mod_bosh RAM backend
2017-03-28 21:12:26 +03:00
e5815553cb
Add SQL as mod_bosh RAM backend
2017-03-28 20:33:57 +03:00
cba6e1b3ab
Add Redis as router RAM backend
2017-03-28 19:34:04 +03:00
0f864d9466
Mix needs include path to p1_utils
2017-03-28 16:08:10 +02:00
117f31125d
Add SQL as router RAM backend
2017-03-28 16:31:37 +03:00
510fde58d8
mod_http_upload: Don't add "Server" header line
...
Administrators can add the "Server" header line using the new listener
option "custom_headers", if desired.
2017-03-28 00:03:17 +02:00
191fc1b4e8
ejabberd_http: Expand @VERSION@ in custom headers
...
Let ejabberd_http expand the @VERSION@ keyword to the ejabberd version
if specified in the "custom_headers" listener option.
Closes #1414 .
2017-03-27 23:52:49 +02:00
41de5e78d0
ejabberd_http: Add "custom_headers" option
...
If the new listener option "custom_headers" is specified, include those
headers with the HTTP(S) response.
Closes #517 .
2017-03-27 23:19:11 +02:00
5b6d042de2
Fix PEP issues ( #1636 )
2017-03-27 16:24:24 +02:00
e30d41e5f0
Merge branch 'new_queue'
...
Conflicts:
rebar.config
src/mod_muc_admin.erl
2017-03-24 13:27:56 +03:00
e1f01f0c8a
Avoid PID collisions
...
Fixes #1470
2017-03-24 11:03:23 +03:00
e56c6545fa
Add inets in included_application for mix
2017-03-23 12:20:02 +01:00
cb0627e6b2
Expand ejabberd.yml.example by enabling mod_http_api with couple commands
2017-03-22 14:30:12 +01:00
6c0419db2b
Update mix dependencies
2017-03-22 11:59:39 +01:00
232cb3dd45
Update dependencies
2017-03-22 10:06:21 +01:00
430fc8eb62
Update docker files from latest Rafael's changes
2017-03-21 18:59:12 +01:00
e469b6ffb4
prosody2ejabberd: Fix offline message record type
...
mod_offline now expects a #message{} rather than an #xmlel{} record.
2017-03-21 18:35:07 +01:00
a1068df602
prosody2ejabberd: Fix message attribute removal
...
Actually remove the 'stamp' and 'stamp_legacy' attributes from imported
offline messages as intended.
2017-03-21 18:23:55 +01:00
f819272b88
Fix crash in mod_muc_admin, we operate on integers here not lists
2017-03-21 15:36:42 +01:00
9fb188afbc
Don't block contacts with subscription=to in mod_block_strangers ( #1609 )
2017-03-21 15:42:38 +03:00
70050b52ad
Use item creation date in rsm order ( #1516 )
2017-03-21 12:45:41 +01:00
44484fa4ae
Merge pull request #1626 from weiss/fix-scram-import
...
prosody2ejabberd: Fix SCRAM hash conversion
2017-03-21 15:44:29 +04:00
69b52196bd
Replace mod_http_bind by mod_bosh in config example
2017-03-21 11:15:01 +01:00
f7cb7ef014
Remove misleading sentence about s2s dialback
2017-03-20 21:48:31 +03:00
b9cd5ca07f
Resolve vars.config relative to to rebar.config.script
...
This fixes problem with missing deps in make rel - issue #1615
2017-03-20 18:28:49 +01:00
6017785e10
Fix compilation with mix ( #1588 )
2017-03-20 16:58:48 +01:00
186fda098c
Update mix deps
2017-03-20 16:26:16 +01:00
b6e1858ce6
Update xmpp and fast_tls versions
2017-03-20 15:33:55 +01:00
7ab4f32c1a
Revert "Bump OTP version to 19.3 in Travis config"
...
This reverts commit 7113f2b8ba
2017-03-20 14:08:58 +03:00
7113f2b8ba
Bump OTP version to 19.3 in Travis config
2017-03-20 13:49:23 +03:00
c526c02d92
Remove webtool from erlang.plt creation
2017-03-20 13:48:17 +03:00
f3ecba0445
Use new xdata compiler API
2017-03-20 09:57:11 +03:00
06f42bc749
Better log s2s auth failures when TLS is not available
2017-03-18 13:59:24 +03:00
72da5bd062
Log startup time
2017-03-18 10:24:42 +03:00
e56a76299c
Merge pull request #1617 from edwardchow33/patch-1
...
Fix wrong parameter values in mod_muc_admin
2017-03-18 02:40:14 +04:00
c5af421cee
Fixed wrong parameter values in mod_muc_admin
...
Corrected wrong parameter values passing to register_online_room(Room, Host, Pid) of mod_muc
2017-03-18 03:07:23 +08:00
91245141e9
Set translation callback on startup
2017-03-17 21:35:02 +03:00
2d67ff2249
Teach mod_http_fileserver ability to send 304 Not Modified
2017-03-17 11:58:40 +01:00
0ef6973457
prosody2ejabberd: Fix SCRAM hash conversion
...
Closes #1549 .
2017-03-16 23:15:08 +01:00
1aeaa794e1
Encode in base64 when getting scram data with import_prosody ( #1549 )
2017-03-15 11:42:26 +01:00
b932afb0cd
Use correct pid when registering local route
...
This fixes #1600
2017-03-15 10:27:22 +03:00
9a142eb807
Update cyrsasl_oauth to internal API changes
2017-03-14 17:25:09 +03:00
069d28b1ed
Get rid of p1_sha calls
2017-03-14 02:31:51 +03:00
301b1b7a7a
Fix handling of xmlrpc request without authentication structure
...
This is problem from issue #1602
2017-03-13 16:41:52 +01:00
113ed66f49
In module_install copy also deps/ebin and priv files (ejabberd-contrib#200)
2017-03-13 11:26:58 +01:00
a90c337297
Merge pull request #1603 from strugee/patch-1
...
Note how to apply s2s Access Rights in the example
2017-03-12 18:34:14 +04:00
071c1dcb64
Return 'closed' instead of 'einval' on closed sockets
2017-03-12 08:55:54 +03:00
c4ed1c2764
Note how to apply s2s Access Rights in the example
2017-03-10 23:53:01 -05:00
4b1bdb563e
Improve overloaded S2S queue processing
2017-03-10 20:21:04 +03:00
0822108fc8
Teach web admin about ip acl rules
2017-03-10 14:39:47 +01:00
02064ae12a
Add support for file-based queues
...
It's now possible to use files as internal packet queues.
The following options are introduced:
* queue_type: the option can be set to `ram` (default) or `file`.
The option can be set per virtual host.
* queue_dir: path to the directory where queues will be allocated.
The default is 'queue' directory inside Mnesia directory.
This is a global option and cannot be set per virtual host.
2017-03-10 15:12:43 +03:00
782caaa678
Improve formatting of erlang terms shown in web admin
2017-03-10 10:33:16 +01:00
ee849338dd
Include shared groups also when contact is is personal roster ( #1585 )
2017-03-09 19:21:45 +01:00
7e2380ab0c
Remove mod_pubsub from ejd2sql export, as it isn't implemented ( #1584 )
2017-03-08 16:23:01 +01:00
b0a950b6dd
Fix handling ejabberd_sql:sql_transaction result ( #1584 )
2017-03-08 16:22:13 +01:00
dd11ed82d7
Report more TLS errors
2017-03-08 08:27:54 +03:00
bdc278399d
Fix typo and spec
2017-03-07 22:21:44 +03:00
b71c4c0e52
Remove forgotten compile_all
2017-03-07 21:40:39 +03:00
d0a185f2d9
Report some TLS errors
2017-03-07 18:46:02 +03:00
0aa22e5149
Don't call deprecated jid functions from the test suite
2017-03-07 18:11:28 +03:00
8b29af629b
Best Practices for Use of SASL EXTERNAL with Certificates (XEP-0178) support
...
It is now possible for client connections to login using PKIX certificates.
This is disabled by default, to enable it:
- either set 'tls_verify: true' and 'cafile: /path/to/CAfile'
in the corresponding listener's section
- or set equivalent per-vhost options 'c2s_tls_verify' and 'c2s_cafile'
2017-03-07 14:20:50 +03:00
e5aac80cb4
Better handle errors in ejabberd_receiver calls
2017-03-02 16:02:44 +03:00
4e014b4c5c
Fix previous commit
2017-03-02 15:34:26 +03:00
cebdb87387
Revert "Remove relict mod_service_log"
...
This reverts commit 0d4e1abbd1
2017-03-02 15:30:34 +03:00
8e41bdc25e
Improve reporting of unavailable SASL mechanisms
2017-03-01 15:23:22 +03:00
28f4131d50
Resolve all addresses from SRV lookup
2017-03-01 14:37:35 +03:00
f6e2840947
External components must always provide 'to' attribute
2017-03-01 00:17:27 +03:00
c3ef56702a
Add s2s work-around for gmail.com
2017-02-28 20:15:05 +03:00
489385d565
Make sure all hooks are called with proper host in ejabberd_c2s
2017-02-28 16:47:31 +03:00
ce3317da7a
Fix bug in api_permission parsing
2017-02-28 13:36:34 +01:00
d6a9ef5bc1
Propagate the TRANSACTION_TIMEOUT to pgsql driver (EJAB-1266)
2017-02-28 12:19:07 +01:00
ac74b7dca1
Don't crash on malformed IP addresses
2017-02-28 13:11:49 +03:00
d81b07bd5f
Improve logging of outbound s2s auth failures
2017-02-28 12:13:35 +03:00
95a8f58314
Improve logging of dialback failures
2017-02-28 10:13:09 +03:00
f3594ec881
Resend stream header before calling handle_auth_success/2 callback
2017-02-28 10:12:11 +03:00
7a186e242d
Fix compilation on R17
2017-02-27 20:38:59 +01:00
b2e16ffb12
Fix parsing of acl/access rules inside oauth sections of api_permissions
...
This should fix problem reported in #1568
2017-02-27 20:23:37 +01:00
ac025ee6f2
Clarify new modules usage in the example config
2017-02-27 17:20:04 +03:00
b1b3aba439
Fix elixir tests
2017-02-27 13:05:08 +01:00
719b4d1183
Don't perform useless resourceprep
2017-02-27 13:58:57 +03:00
a098d1ec62
Update tests to ejabberd_commands changes
2017-02-27 10:45:39 +01:00
ac548f2e95
Update tests to cyrsasl modifications
2017-02-27 10:45:15 +01:00
6808865068
Return ok from start/2
2017-02-27 10:05:35 +01:00
7a9fa52e91
Change loglevel on configuration reload
2017-02-27 11:11:29 +03:00
d523357ba8
Invalidate access permissions on configuration reload
2017-02-27 09:55:54 +03:00
933351ab4c
Fix log message format
2017-02-26 16:27:26 +03:00
fadcc85553
Put more stuff under supervision
2017-02-26 15:10:59 +03:00
7decd58aaa
Don't fail on elements decoding
2017-02-26 11:53:41 +03:00
c1439ddd5b
Get rid of jid:to_string/1 and jid:from_string/1
2017-02-26 10:07:12 +03:00
603ec9cb19
Don't pass empty resource to jid:make()
2017-02-25 10:01:01 +03:00
485aae8134
Don't pass 'from' and 'to' along with stanza in hooks' arguments
2017-02-24 21:25:25 +03:00
039ac46963
Don't polute log with known content types
2017-02-24 20:57:24 +03:00
4892b01eb4
Get rid of unused variable warning
2017-02-24 17:48:17 +03:00
03e2b0f0bf
Remove previous options when the config gets reloaded
2017-02-24 17:03:11 +03:00
0124d292b5
Add gen_mod:is_loaded_elsewhere/2
2017-02-24 16:31:39 +03:00
b8fbac72ac
Restart listeners on configuration reload
2017-02-24 15:18:10 +03:00
e8c0e21f71
We don't like now()
2017-02-24 12:08:57 +01:00
a85a953e8e
Adapt get_last tests to new output
2017-02-24 12:08:57 +01:00
c950fc05f0
Update tests for changes in acl start code
2017-02-24 12:08:57 +01:00
0db99ccb4b
Improve config reloading support by ejabberd_auth
2017-02-24 14:06:47 +03:00
6aab450c16
Make sure that addr_re is always initialized when creating http state
2017-02-24 11:30:36 +01:00
c15d230a57
Return ejabberd_sm:stop/0 back
2017-02-24 12:39:44 +03:00
f310d7bb12
Make host header parser work correctly with ipv6 literal addresses
2017-02-24 10:25:26 +01:00
67d6ca9f10
Improve startup procedure
2017-02-24 12:05:47 +03:00
5b112c86bf
Fix a case clause and run c2s_filter_send on send_error/3
2017-02-24 07:57:57 +03:00
57181c0a76
get_last now always returns tuple with UTC XEP-0082 and status ( #1565 )
2017-02-23 23:27:57 +01:00
6314a96b05
Protect users from delete_old_users command using a fixed access rule ( #1462 )
2017-02-23 19:38:17 +01:00
4294ba6b52
Separate list of strings with \n for srg_get_info in mod_http_api ( #1500 )
2017-02-23 19:23:24 +01:00
519f3db6b6
Specify "ExecReload" command in systemd unit
...
Now that "ejabberdctl reload_config" works the way most admins would
expect, expose the command via systemd.
2017-02-23 18:16:56 +01:00
e7901f9d70
Prepare mix for 17.03
2017-02-23 18:14:29 +01:00
1030f041e3
Update dependencies
2017-02-23 18:13:10 +01:00
c76253cb0a
tools/hook_deps.sh: Search for escript in PATH
2017-02-23 17:38:56 +01:00
33e82de475
Merge pull request #1499 from weiss/offline-stanza-id
...
Include stanza ID with archived offline messages
2017-02-23 20:36:05 +04:00
b475df2250
Include stanza ID with archived offline messages
...
Fixes #1480 .
2017-02-23 16:55:35 +01:00
720741b725
Avoid orphan_item leak on affiliation/subscription removal ( #1563 )
2017-02-23 16:43:22 +01:00
bc9f178b6d
Fix pubsub MySQL schema
2017-02-23 16:04:29 +01:00
6cdead166b
Start/stop auth modules when host is added/deleted
2017-02-23 16:19:22 +03:00
0542c65a07
Stop all s2s connections via supervisor calls
2017-02-23 16:18:29 +03:00
f4081a363b
Fix elixir tests
2017-02-23 09:53:20 +01:00
a3ea6e7723
Improve reload_config admin command
2017-02-23 11:14:49 +03:00
7d68112265
Start/stop virtual hosts when reloading configuration file
2017-02-23 10:12:19 +03:00
ed34b04e9b
Remove unused macro
2017-02-22 20:48:51 +03:00
96a690f607
Merge branch 'master' of github.com:processone/ejabberd
2017-02-22 19:47:00 +03:00
3c4057ff55
Reload modules when reloading configuration file
2017-02-22 19:46:47 +03:00
ff67860cdb
Make sure all hooks are called with proper host
2017-02-22 19:45:12 +03:00
87b5e2500b
Fix match of itemid on get_cached_item, fixes 14e771d8
2017-02-22 17:44:47 +01:00
56df6e7ba8
Add missing NOT NULL restrictions
2017-02-22 15:47:36 +01:00
c0b346e0b8
Move archive tables into lite.sql for better comparison with other schemas
2017-02-22 15:44:03 +01:00
635dfa2eae
Re-enable "replaced" tests
2017-02-21 12:53:08 +03:00
6ffd5ffd0c
Test stream management queue overload
2017-02-21 12:38:03 +03:00
e11bcf9c43
Improve stream management tests
2017-02-21 09:19:51 +03:00
adbd174959
Rename mod_sm -> mod_stream_mgmt
2017-02-21 09:18:58 +03:00
1c34f89c19
Merge branch 'master' of github.com:processone/ejabberd
2017-02-21 08:46:28 +03:00
bbfd089b7e
Don't count resent stanzas
...
Thanks to Holger Weiß for an advise
2017-02-21 08:44:39 +03:00
1e679e6f84
Travis CI: Update MySQL APT repository key
...
The old key expired on February 16, 2017.
2017-02-20 21:17:34 +01:00
61cdee97fc
ejabberd_c2s: Don't drop 'user_send_packet' result
...
When handling a <session/> IQ, use the stanza returned by the
'user_send_packet' hook.
Thanks to Evgeniy for spotting this.
2017-02-20 13:07:34 +01:00
7d767fac7f
Support scrammed passwords in ejabberdctl import_prosody ( #1549 )
2017-02-20 12:47:56 +01:00
9426c67302
Fix s2s_dns_timeout issues
2017-02-20 10:42:16 +03:00
a664d6389e
Merge pull request #1555 from weiss/count-session-iq
...
Let ejabberd_c2s handle <session/> IQ
2017-02-20 10:21:15 +04:00
7c159e3881
Let ejabberd_c2s handle <session/> IQ
...
This fixes the counting of incoming stanzas for stream management.
2017-02-19 22:43:10 +01:00
70bfc5b4a8
Get rid of non-breaking space
2017-02-18 12:13:48 +03:00
940ca9311d
Fix some dialyzer warnings
2017-02-18 09:36:27 +03:00
b2de1d7438
Merge pull request #1553 from lemenkov/config_functions_deprecation
...
Mark local/global config functions as deprecated
2017-02-17 20:40:04 +04:00
1a2dd3680f
Mark local/global config functions as deprecated
...
See discussion in PR #1548 .
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com >
2017-02-17 19:20:44 +03:00
68cc1e775c
Fix compilation when included as Elixir dependency ( #1526 )
2017-02-17 16:26:39 +01:00
a1e8d3c3dc
Commands documentation lack arguments when policy=user ( #1514 )
2017-02-17 12:37:42 +01:00
ae25fa994c
Merge pull request #1548 from lemenkov/use_get_option
...
Use ejabberd_config:get_option/2 instead of ejabberd_config:get_local_option/2
2017-02-16 23:34:50 +04:00
009a5007ff
Use ejabberd_config:add_option/2 instead of ejabberd_config:add_local_option/2
...
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com >
2017-02-16 20:47:47 +03:00
cb30f7733d
Use ejabberd_config:get_option/2 instead of ejabberd_config:get_local_option/2
...
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com >
2017-02-16 20:41:57 +03:00
eec63dbefe
Correct access_matches spec
2017-02-16 15:38:44 +01:00
218eeae797
Fix some dialyzer warnings
2017-02-16 14:18:36 +03:00
8b2d308498
Change routing API
...
Now 'From' and 'To' arguments must be omitted in functions
and structures related to routing.
The commit deprecates the following functions:
ejabberd_router:route/3 in favor of ejabberd_router:route/1
ejabberd_router:route_error/4 in favor of ejabberd_router:route_error/2
ejabberd_local:route_iq/4 in favor of ejabberd_local:route_iq/2
ejabberd_local:route_iq/5 in favor of ejabberd_local:route_iq/3
The format of {route, From, To, Packet} is changed in favor of {route, Packet}
2017-02-16 11:10:24 +03:00
26a5811744
Merge branch 'master' of github.com:processone/ejabberd
2017-02-16 00:23:00 +03:00
0d4e1abbd1
Remove relict mod_service_log
2017-02-16 00:22:48 +03:00
5b019ab48c
Disable undefined_function_calls xref_check
...
It looks like it will calling undefined function still will be catched
by xref_queries
2017-02-15 14:12:07 +01:00
f2b5153a8c
Report password change in the log
2017-02-14 17:10:16 +03:00
6fd89f5fe0
Attach IP metadata to every stanza received from stream
2017-02-14 17:09:25 +03:00
0b304731c5
Use newer p1_utils
2017-02-14 15:06:00 +01:00
63da351038
Fix handling of config.ctc files
2017-02-14 14:39:24 +01:00
cad02bb1b0
Add more check to make xref
2017-02-14 14:39:24 +01:00
f61c933a7a
Only use GEN_SERVER macro where appropriate
2017-02-14 15:39:57 +03:00
28f66ddd7c
Attach modules to gen_mod's supervisor
2017-02-14 12:39:26 +03:00
a1e45ab56c
Merge pull request #1539 from lemenkov/use_crypto_sha
...
RFE: Use crypto:hash/2 function
2017-02-14 11:38:05 +04:00
f664e39374
Improve modules start/stop procedures
2017-02-14 10:25:08 +03:00
e7733ce7d9
Use crypto:hash/2 function
...
Use crypto:hash/2 function instead of ones from p1_sha.
This function exists since commit
erlang/otp@208f9ad382 and also implemented
as NIF, so I believe it's safe to use it.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com >
2017-02-13 18:42:50 +03:00
e1ba499bd6
Check result of gen_mod:start/2 callback ( #1534 )
2017-02-13 11:11:41 +03:00
fd885d0818
Apply SASLprep before storing/converting passwords
...
Fixes #996 and #1295
2017-02-12 10:06:30 +03:00
67c9de6461
Use p1_server behaviour in xmpp_stream layer
2017-02-08 17:16:18 +03:00
ca0dd09944
Accept "add_commands: admin" in commands section not only "add_commands: - admin"
...
This fixes issue reported in #1518 , and restores compatibility with
what older version were accepting and what is documented.
2017-02-06 21:40:37 +01:00
b703b4f022
Don't shadow binding in match
2017-02-06 11:38:51 +01:00
f30c9d49f7
Add TLS support for external components
2017-02-06 13:30:58 +03:00
af5457ba09
Make sure that api_permissions always have "console commands" section
...
If user didn't override it in config file, default version which allows
executing all commands will be added
2017-02-03 15:22:35 +01:00
a31154c035
Set subscribers nicks when recreating room (thanks to Girdhar Sojitra)( #1495 )
2017-01-31 19:18:39 +01:00
b2a2e0f135
Support non-JID lines in command create_rooms_file
2017-01-31 17:50:04 +01:00
85eb8f022c
Depend on fast_xml-1.1.20
2017-01-31 11:02:23 +01:00
589bc73838
Don't warn if custom schema is not available
2017-01-31 09:53:52 +01:00
649d3b753b
Merge pull request #1502 from lemenkov/ignore_output_val
...
No need to explicitly return ok here
2017-01-30 18:15:25 +04:00
c377708da1
No need to explicitly return ok here
...
No need to explicitly return ok here. Return value will be ignored
anyway.
Signed-off-by: Peter Lemenkov <lemenkov@redhat.com >
2017-01-30 14:52:04 +01:00
326e8da06d
Use newer version of epam
2017-01-29 14:51:03 +01:00
44a9ceac0b
More changes that are required from p1_pam -> epam
2017-01-29 14:35:22 +01:00
5c1168c33f
Change name of pam dep from p1_pam to epam
...
We need to use same name as .app file or rebar complains
2017-01-29 14:26:46 +01:00
dd458c637e
Floating deps should always be executed
...
This fixes problem with recognizing latest_deps configure option
2017-01-29 12:14:32 +01:00
2f3f6f8b71
Improve compilation with rebar3
2017-01-26 16:45:04 +01:00
11326692f2
Merge branch 'master' of github.com:processone/ejabberd
2017-01-26 10:59:31 +03:00
9d144bd495
Do not drop default TLS options
...
Fixes #1484
2017-01-26 10:58:26 +03:00
a284722fd0
Adapt to coveralls api change
2017-01-24 19:16:50 +01:00
c0a89e328a
Change OTP version from 19.1 to 19.2 in travis config
2017-01-24 10:39:40 +03:00
99fd621aed
Speedup features list when a lot of virtual hosts configured
2017-01-24 10:38:29 +03:00
5183f7724d
Fix tests
2017-01-23 20:43:35 +01:00
0c57044c59
Make mod_disco handle features of mod_ping
2017-01-23 22:33:46 +03:00
5e2c105396
Merge branch 'master' of github.com:processone/ejabberd
2017-01-23 21:52:35 +03:00
0ce3a3665a
Make sure only {exit, normal} is not catched when executing a hook
2017-01-23 21:52:25 +03:00
b0e72ece43
Adapt to new ejabberd_sm changes
2017-01-23 19:34:29 +01:00
8b5e6e4a13
Compatibility with R17 in mod_block_strangers
2017-01-23 19:04:22 +03:00
43bfa0efbc
Check message subject in mod_block_strangers
2017-01-23 17:10:28 +03:00
ca298c7c39
Update deps in mix.lock
2017-01-23 14:42:52 +01:00
48d8498dbb
Avoid using maps:get/2 to keep compatibility with OTP 17.5
2017-01-23 16:30:16 +03:00
19bec62eb5
Fix calling to mod_offline:store_packet
2017-01-23 15:00:46 +03:00
5e5a8bbdcf
Don't use maps:take it available in R19 only
2017-01-23 12:56:08 +01:00
7c2ccb2cb7
Add tool for checking which dependences need update
2017-01-23 12:24:25 +01:00
435e5e6263
Make test suite working again
2017-01-23 13:51:05 +03:00
e564f9ae31
Make a message is not bounced if it's archived
2017-01-21 13:47:47 +03:00
68cf45a8b9
Archive message before delivering it to offline storage ( #1348 )
2017-01-21 11:47:04 +03:00
94b23482a9
Send <compressed/> in correct order
2017-01-21 10:47:55 +03:00
1e968f5487
Merge pull request #1478 from weiss/multi-host-pubsub-cache
...
mod_pubsub: Fix last item cache for multiple hosts
2017-01-21 11:17:06 +04:00
14e771d871
mod_pubsub: Fix last item cache for multiple hosts
...
Don't let the last item cache intermix PubSub items of different virtual
domains.
2017-01-21 00:14:56 +01:00
56ef607904
Add stanza-id to every archived message ( #1477 )
2017-01-20 23:21:06 +03:00
17fe272dc5
Update copyright headers in new files
2017-01-20 19:56:19 +03:00
d5d906184f
Merge branch 'new_stream'
...
Conflicts:
src/cyrsasl.erl
src/ejabberd_c2s.erl
src/ejabberd_cluster.erl
src/ejabberd_frontend_socket.erl
src/ejabberd_node_groups.erl
src/ejabberd_router.erl
src/mod_bosh.erl
src/mod_ip_blacklist.erl
src/mod_muc_mnesia.erl
src/mod_offline.erl
src/mod_proxy65_sm.erl
2017-01-20 19:35:46 +03:00
3b2c2b5c04
Prepare 17.01 for hex.pm
2017-01-20 12:19:55 +01:00
39cfee239d
Use xmpp 1.1.6
2017-01-20 11:51:56 +01:00
1f02567507
Make shim for mod_http_api admin_ip_access more robust
2017-01-20 10:19:09 +01:00
4f5d54f062
Try db migration only when mnesia is configured ( #1458 )
2017-01-20 09:26:13 +01:00
fc2b71a04e
Restore muc_invite_hook ( #1467 )
2017-01-19 18:24:29 +03:00
87b964a7f6
Make sure 'jabber:client' namespace is added to forwarded messages ( #1474 )
2017-01-19 18:03:07 +03:00
4cf83ca3a7
Restore multiple invitations support ( #1468 )
2017-01-19 17:26:08 +03:00
3d9997288d
Don't forget to convert muc#roomconfig_mam
2017-01-19 16:42:04 +03:00
527472f18c
Support legacy muc#roomconfig values ( #1469 )
2017-01-19 11:12:27 +03:00
d2b8569452
Fix typo
2017-01-18 17:11:08 +01:00
3482ee5c75
Reset table only if new def change from runtime
2017-01-18 17:02:03 +01:00
3029e84faf
Improve check of mnesia schema opearations
2017-01-18 16:53:36 +01:00
044e55b98e
Fix reporting dialback failures
2017-01-18 18:26:31 +03:00
60a09285b7
Don't attempt to resolve _jabber._tcp SRV record
2017-01-18 17:54:42 +03:00
ba47fd4649
Improve <delay/> tag insertion
2017-01-18 14:09:39 +03:00
2de2d00f14
Cope with malformed values in 'rosterusers' SQL table ( #1466 )
2017-01-18 11:59:46 +03:00
7b8c01da12
Better log bytestream termination
2017-01-17 23:06:55 +03:00
9021ba01ac
Use crypto:exor/2 instead of hand-crafted bxor
2017-01-17 22:37:44 +03:00
b8db0a8ed6
Reset XML stream before sending SASL <success/>
2017-01-17 22:06:26 +03:00
2a68591181
Remove wrong index setting
2017-01-17 16:23:45 +01:00
94ac777f93
Let ejabberd_mnesia handles copy_type
2017-01-17 15:05:14 +01:00
0ea6c1dcf6
Fix index processing ( #1461 )
2017-01-17 14:53:41 +01:00
2ce6d49a40
Speedup table setup, no io if EJABBERD_SCHEMA_PATH not set ( #1461 )
2017-01-17 14:22:12 +01:00
c7476875e6
Avoid stopping mod_offline before supervisor termination ( #1464 )
2017-01-17 14:31:00 +03:00
22ee16fd9d
Get rid of ejabberd_frontend_socket
2017-01-17 14:00:01 +03:00
c68ac1d5eb
Improve error reporting for forbidden servers
2017-01-17 13:38:05 +03:00
a23c76fb82
Drop only messages with <body/> in mod_block_strangers
2017-01-17 01:34:40 +03:00
fd4f5c0996
Stop hook on message drop in mod_block_strangers
2017-01-16 18:45:26 +03:00
b080b8f54d
Use user_receive_packet hook in mod_block_strangers
2017-01-16 18:40:30 +03:00
5a8dea1591
Remove stub in mob_block_strangers
2017-01-16 18:21:36 +03:00
a849b384f8
Merge branch 'new_stream' of github.com:processone/ejabberd into new_stream
2017-01-16 18:15:08 +03:00
fedfe5427c
Add mod_block_strangers
2017-01-16 18:14:14 +03:00
1176e1f096
Add script to check hook dependencies
2017-01-16 17:14:33 +03:00
22c25e4413
Don't allow raw elements in process_iq/3
2017-01-16 16:40:11 +03:00
557820707b
Implement database backend interface for mod_proxy65
2017-01-16 15:28:11 +03:00
0078a3b904
Correctly set gen_server's name
2017-01-16 11:43:35 +03:00
65d352d5de
Remove handle_event/1 callback
2017-01-16 11:34:49 +03:00
64997d9961
Add mod_sm and mod_s2s_dialback to example config
2017-01-16 10:12:46 +03:00
ce42b6be01
Add example api_permisions: definition to config template
...
Also expand default config to have rule for admin oauth
2017-01-13 16:53:48 +01:00
7606be93d5
Decode message before checking for expiration ( #1458 )
2017-01-13 14:20:25 +03:00
e2665c5da9
Usable size for Shared rosters members textarea (EJAB-1753)
2017-01-13 12:16:23 +01:00
32d548d99b
Fix configuration commands ( #1432 )
2017-01-13 13:36:28 +03:00
25ddb6c69d
Add forgotten -include_lib()
2017-01-13 13:28:55 +03:00
0baaad30b1
Implement database backend interface for MUC, BOSH and auth_anonyous
2017-01-13 12:03:39 +03:00
31491ebe16
Fix some corner cases while re-reading RFC6120
2017-01-13 11:35:47 +03:00
b10e10efae
Ignore unexpected events
2017-01-11 16:50:11 +03:00
02f96d0f41
Implement database backend interface for ejabberd_router
2017-01-11 16:25:43 +03:00
2129a33077
Fix attaching ejabberd_s2s_out process to a supervisor
2017-01-11 11:09:56 +03:00
5cfe57ece5
Add 'supervisor' listening option
...
If set to 'true' (this is the default), new processes spawned by
ejabberd_listener will be attached to the corresponding supervisor.
No such processes will be attached to a supervisor otherwise.
Setting this to 'false' will improve performance of high loaded
systems where new C2S/S2S processes are spawned very rapidly.
2017-01-11 10:56:04 +03:00
03667d0c73
Add SSL support for SQL connections
...
Currently only PostgreSQL is supported.
This requires p1_pgsql-1.1.2 and higher.
2017-01-10 17:40:38 +03:00
f2acf57412
update deps
2017-01-10 15:11:41 +01:00
efccee55e3
pubsub_subscription may is not used (migration is optional)
2017-01-10 13:53:23 +01:00
6ff81946cf
Fix migration of old pubsub database ( #1409 )
2017-01-10 12:10:11 +01:00
08d482b064
Allow old-stype mod_vcard_ldap in the config ( #1410 )
2017-01-10 11:29:01 +03:00
dd5389df23
Don't forget to advertise disco features
2017-01-10 11:25:12 +03:00
e01bece552
Make stream related calls module independent
2017-01-09 22:03:42 +03:00
3d0d9cb354
Fix typo in previous commit
2017-01-09 17:54:10 +01:00
afc7f5aa37
Simplify setting allow_subscription ( #1404 )
2017-01-09 15:56:25 +01:00
f14a966680
Set from/to in every routed packet
2017-01-09 17:51:08 +03:00
6c564775c4
Remove unused mod_ip_blacklist module
2017-01-09 17:22:31 +03:00
1e55e018e5
Adopt remaining code to support new hooks
2017-01-09 17:02:17 +03:00
9605e2b2a4
Fix problem with get_vcard command ( #1447 )
2017-01-06 16:13:57 +01:00
a910ab8171
Get nodes from ejabberd_cluster instead of mnesia
2017-01-03 17:21:02 +01:00
32e5781a6a
Cleanup file headers
2017-01-03 15:58:52 +01:00
f5290a8e44
Specify that process_rosteritems command works only with Mnesia storage
2017-01-03 01:38:56 +01:00
5fdd1c39fe
Update copyright date automatically ( #1442 )
2017-01-02 21:42:06 +01:00
769975f6d7
Remove mod_http_bind and migration code to mod_bosh
2017-01-02 15:53:25 +01:00
1bda40dac7
Fix cyrsasl test after recent changes
2017-01-02 13:36:21 +01:00
5ef60bf594
Correctly process errors from new cyrsasl API
2017-01-02 15:02:03 +03:00
666608544b
Improve return values in cyrsasl API
2017-01-02 14:55:06 +03:00
3dd2a614ac
Get rid of "jlib.hrl" header in some files
2017-01-02 14:45:52 +03:00
50682b98d6
Better cope with IPv6 domains
2016-12-31 17:43:40 +03:00
cf87c5664f
Reflect cyrsasl API changes in remaining code
2016-12-31 13:48:55 +03:00
247ca872f6
Improve return values in cyrsasl API
2016-12-31 13:47:35 +03:00
e7fe4dc474
More refactoring on session management
2016-12-30 00:00:36 +03:00
c6b5dd6c4f
Fix case clauses when using compression ( #1431 )(thanks to Evgeniy Khramtsov)
2016-12-29 15:18:42 +01:00
309bdfbe28
Add xmpp_stream_out behaviour and rewrite s2s/SM code
2016-12-28 09:47:11 +03:00
ed679279fd
Cleanup file headers
2016-12-27 10:57:50 +01:00
fad7612cf1
Allow subscriber to create room, then set allow_subscription=true ( #1404 )
2016-12-26 21:16:17 +01:00
df92d96d4f
Revert "Fix 'nodetree' configuration lookups for PEP"
...
This reverts commit 7ef8dfb4e0
2016-12-25 01:24:40 +01:00
7ef8dfb4e0
Fix 'nodetree' configuration lookups for PEP
2016-12-25 00:58:20 +01:00
b30b70db70
Prepare mix for 16.12
2016-12-22 20:41:01 +01:00
08f73a5aeb
Update deps
2016-12-22 15:10:57 +01:00
3811a61573
Extract correctly the text from #stanza_error ( #1425 )
2016-12-17 11:46:16 +01:00
cc14e223c6
Describe command arguments and results in ejabberd_admin
2016-12-12 13:19:17 +01:00
7f653cfe76
Rewrite ejabberd_service to use new XMPP stream API
2016-12-11 18:24:51 +03:00
5cc8e807df
Initial version of new XMPP stream behaviour (for review)
2016-12-11 15:03:37 +03:00
1a4f63f058
Copy recent make_opts function from mod_muc_room.erl
2016-12-09 13:07:48 +01:00
bcc04d93e1
Enforce pubsub node removal, revert previous commit ( #1320 )
...
This reverts commit 2976c2d921
2016-12-09 12:51:08 +01:00
2976c2d921
Enforce affiliation removal, remove corresponding items ( #1320 )
2016-12-09 11:35:51 +01:00
a50247c20d
Improve handling on acl rules in api_permissions
2016-12-08 18:08:54 +01:00
fdf69dcd0d
API call does not necessary use token, it could use basic auth
2016-12-08 16:28:47 +01:00
a3b12fd745
Recognize "- who:" not only "who:" syntax in api_permissions
2016-12-08 12:01:24 +01:00
8a7ea85a7e
Cleanup ext_mod and fix compilation path
2016-12-07 09:27:21 +01:00
a681874f67
Try to fix interminent failures in cyrsasl tests
2016-12-06 18:33:16 +01:00
1c8edd07a1
Update xmpp lib version and fix path when using deps.get and compile in same commande
2016-12-06 17:54:21 +01:00
1883a98d1c
Fix compilation of external module with new xmpp lib
2016-12-06 12:01:04 +01:00
0c2491d9ea
Remove obsolete remove_node api (use leave_cluster)
2016-12-05 14:17:57 +01:00
23f7075313
Fix reload_config
2016-12-02 16:29:46 +01:00
23786c95c9
Grab new version of xmpp dep
2016-12-02 16:28:14 +01:00
847376924e
Add password support in muc_subscribe ( #1306 )
2016-12-02 16:18:35 +01:00
d7e1f6d7b3
When unsubscribes, check if room should get closed ( #1396 )
2016-12-01 22:09:57 +01:00
34f2a8a4f2
Fix error formatting, which closed client connection ( #1389 )
2016-12-01 21:02:54 +01:00
68cf6845e1
Fix mod_http_api_mock_test on 19.1
2016-12-01 18:51:23 +01:00
294d58a393
Add more tests for digest-md5 cyrsasl
2016-12-01 18:51:23 +01:00
732eecac43
Move to latest Elixir version
2016-12-01 15:44:52 +01:00
a3c134c43b
We can now use dependencies published in hex.pm
2016-12-01 15:10:00 +01:00
309fd56fb4
Merge branch 'master' of github.com:processone/ejabberd
2016-12-01 15:05:09 +01:00
8618af4e34
Fixes pt-br translation (thanks to Rodrigues)( #1393 )
2016-11-30 16:51:42 +01:00
32f484a349
Fix typo introduced by 92db9ff changes
2016-11-30 13:50:46 +01:00
92db9ff105
Improve handling of mnesia schema
2016-11-30 11:09:17 +01:00
95a4b1b266
Cleanup admin_extra, add few functions
2016-11-30 10:31:36 +01:00
2cd70280d2
Merge branch 'docker' from Rafael Römhild
2016-11-30 10:30:19 +01:00
fc7e52df71
Adds optional post_install and pre_uninstall hooks (thanks Igor Manturov Jr.)( #1300 )
2016-11-28 17:15:57 +01:00
56b30ab598
Improve translation of some messages
2016-11-26 10:05:22 +03:00
3ac73f9607
Update dependencies
2016-11-25 13:02:31 +01:00
18609befa4
Merge branch 'master' of github.com:processone/ejabberd
2016-11-25 10:07:04 +01:00
ae297a4ae6
Merge branch 'ukutaht-enable-elixir-in-mix'
2016-11-25 10:05:28 +01:00
9432a16893
Merge branch 'enable-elixir-in-mix' of https://github.com/ukutaht/ejabberd into ukutaht-enable-elixir-in-mix
2016-11-25 10:05:01 +01:00
ca1b22bdd4
Use ejabberd_router:route_error/4 wherever possible
2016-11-25 11:41:24 +03:00
4d6eb31264
Use new version of xmpp in mix
2016-11-25 09:31:49 +01:00
e1539e5769
Get rid of compile warnings
2016-11-25 09:48:26 +03:00
993cbcb133
Use new version of xmpp
2016-11-25 09:39:09 +03:00
d554827ebc
Don't check for faked carbons
2016-11-24 20:16:07 +03:00
0f11b1be36
Don't forget to erase cache on user removal
2016-11-24 18:40:20 +03:00
28d0a1b9d2
Make compatible with rebar3
2016-11-24 14:23:20 +01:00
49f1275e20
Get rid of excessive (io)list_to_binary/1 calls
2016-11-24 15:06:06 +03:00
b14843d098
Add missing -callbacks
2016-11-24 12:44:21 +01:00
8f692f51d8
Merge pull request #1391 from weiss/mark-copies
...
Mark messages as copies by attaching metadata
2016-11-24 15:43:38 +04:00
560038c808
Use xmpp:put_meta/3 to update metadata
2016-11-24 10:47:26 +01:00
d12210f4e1
Use new versions of fast_xml and xmpp
2016-11-24 10:45:57 +01:00
9c3ebb7d22
Don't make ejabberd.service file executable
2016-11-24 07:59:27 +01:00
b6ddcf3e58
Makefile.in: Substitute all @variables@ in a line
...
There are now lines with multiple occurrences of the @ctlscriptpath@
variable in the ejabberd.service template.
2016-11-24 07:55:06 +01:00
cbda2e038e
Merge branch 'weiss-systemd-unit-improvements' ( #1346 )
2016-11-23 14:37:34 +01:00
6a4f2a78ff
Merge branch 'systemd-unit-improvements' of https://github.com/weiss/ejabberd into weiss-systemd-unit-improvements
2016-11-23 14:36:50 +01:00
12683b4aaf
Fix typo in copyright date
2016-11-23 14:36:11 +01:00
5d434c1aea
Move copyright definition to ejabberd.hrl
2016-11-23 15:51:48 +03:00
d364eab74b
Merge remote-tracking branch 'upstream/master'
2016-11-23 11:45:13 +01:00
6f2f1e87c9
Don't use deprecated functions from jlib.erl
2016-11-23 10:41:26 +03:00
3325e69ae6
Let mod_carboncopy mark copied messages
...
Carbon copies are now marked with a 'carbon_copy' flag. This makes it
easier to identify them.
2016-11-22 22:21:34 +01:00
114ca786ee
Let ejabberd_sm mark copied messages
...
When multiple resources have the same (highest) priority, ejabberd_sm
dispatches messages addressed to the bare JID (or to an unavailable
resource) to each of these resources. Such messages are now marked with
an 'sm_copy' flag for all but one of the resources. This makes it
easier for other modules to identify those duplicates.
Resolves #1356 .
2016-11-22 19:25:20 +01:00
ee8cc1dac2
Fix xref issue injected by fbfbb96
2016-11-22 17:51:21 +01:00
9ab169bc63
Fix get_roster issue injected by fbfbb96
2016-11-22 16:59:02 +01:00
24ef90c556
Fix vcard_ldap exports
2016-11-22 16:23:02 +01:00
c0e7b298db
Add missing export
2016-11-22 16:12:19 +01:00
cc63bcc997
Fix issues on import improvements
2016-11-22 16:01:08 +01:00
a2fb493f91
Add missing include file
2016-11-22 15:35:47 +01:00
ebadcf71c2
New bosh module
2016-11-22 15:26:15 +01:00
fbfbb96872
Improve ODBC import
2016-11-22 14:48:01 +01:00
577eeb642f
Add new xmpp repo as dependency in mix.exs
2016-11-22 14:43:10 +01:00
7ffab38b44
Remove now() from mod_offline.hrl
2016-11-22 13:15:43 +01:00
2786df651a
Add OTP 19.1 to Travis' testing platforms
2016-11-22 09:52:26 +03:00
c0b5c6e9d4
Fix logging in tests on R17
2016-11-21 22:04:25 +03:00
3189bb3bb9
Set 'sql_pool_size' to 1 by default for sqlite
2016-11-21 21:34:56 +03:00
404a7c3381
Remove bashismes from ejabberdctl
...
To avoid unecessary extra quoting, do not call commands with sh -c ''
and use the -- option from su to supply arguments.
Parse command line parameters is a bit tricky as the previous behavior
allows to mix options to ejabberdctl with unknown options given to
the next script (usually, the ctl). This is solved by relying on the
fact that for loop saves its argument, so we can flush its content
with set -- and re-add unknown options with set -- "$@" "$arg".
Finally, remove unecessary quotes in mnesia options and in the ping
command.
2016-11-21 15:25:58 +01:00
3908a80ac9
Merge branch 'master' of github.com:processone/ejabberd
2016-11-21 16:55:28 +03:00
1a02a2a51d
Set 'sql_pool_size' to 1 for sqlite tests
2016-11-21 16:55:18 +03:00
b8e8e4b971
Fix elixir tests
2016-11-21 12:50:51 +01:00
04fdf69737
Fix non-empty disco-nodes processing
2016-11-21 14:21:34 +03:00
e57de02e0f
Fix s2s test
2016-11-21 12:06:58 +01:00
c5e7b4738f
Fix handling mod_http_upload disco#info queries: need decoded elements
...
As reported in
https://www.ejabberd.im/forum/28605/ejabberd-modhttpupload-error-405-not-allowed
2016-11-21 12:06:11 +01:00
e6365979bd
Merge branch 'master' of github.com:processone/ejabberd
2016-11-21 12:14:37 +03:00
274303f248
Fix conference disco#items when running multiple virtual hosts
2016-11-21 12:14:24 +03:00
507e756b69
Do not send empty <after/> tag
2016-11-21 12:13:34 +03:00
3f91668c46
Log more data for failed s2s connection
2016-11-21 09:52:36 +01:00
c7ae916afc
Don't forget to start XMPP application
2016-11-21 10:23:09 +03:00
049a6d97f1
Fix RSM for conference disco#items
2016-11-20 18:08:49 +03:00
13c6039700
Use xmpp_util.erl from XMPP library
2016-11-19 13:57:25 +03:00
de7a143a2c
Transform ejabberd_commands on the start
2016-11-19 13:05:13 +03:00
9aff7e52a8
Switch to stand-alone XMPP library
2016-11-19 13:03:33 +03:00
d00a634025
Fix includes in eunit compilation flags
2016-11-18 14:02:47 +01:00
daab95e3b5
Fix elixir tests
2016-11-18 12:54:06 +01:00
45e77ea483
Remove useless NO_EXT_LIB flag
2016-11-18 12:25:01 +01:00
e69937d93a
Get rid of substitute_forwarded
2016-11-18 11:51:57 +01:00
f57f267c54
Merge branch 'master' of github.com:processone/ejabberd
...
Conflicts:
test/ejabberd_SUITE.erl
2016-11-18 13:39:10 +03:00
b8dcc911a3
Make common tests working again
2016-11-18 13:38:08 +03:00
995c97671d
Add auth to mod_http_fileserver
2016-11-17 12:59:46 +01:00
1c90b19d74
Fix typo
2016-11-16 18:24:12 +01:00
8ced3bdbe9
Remove obsolete/temp file
2016-11-16 14:18:51 +01:00
3cd174cb56
Ensure that presence_broadcast room option is stored ( #1380 )
2016-11-16 13:35:50 +01:00
e69ddd981f
Tell git to ignore the example file ejabberd.service
2016-11-16 13:12:57 +01:00
b1723c6e2d
Handle correctly p1_http:request result
2016-11-16 13:11:23 +01:00
5a01b5f1fc
add docker support
2016-11-16 11:48:50 +01:00
2929f5b5bc
Minor cosmetic changes on pubsub code
2016-11-15 18:35:20 +01:00
4d4ad922a2
Cosmetic validator changes
2016-11-15 18:14:21 +01:00
8df68266f2
Add missing verbs for RESTfull operation
2016-11-15 14:35:26 +01:00
2b93de6912
apply string optimizations
2016-11-15 14:32:22 +01:00
909e0eb5dd
Add configurable weight for commands
2016-11-15 14:18:34 +01:00
e75dd17e2c
Fix tests that use #forwarded
2016-11-15 10:02:21 +01:00
41794c57d6
Use new version of fast_xml
2016-11-15 10:02:21 +01:00
5ffc01db53
Fix types in check_password_hash
2016-11-15 10:02:21 +01:00
717159a98f
Make string args in http_api be list strings
2016-11-15 10:02:21 +01:00
309962fb8b
Use p1_http from p1_utils 1.0.6
2016-11-14 16:52:03 +01:00
3765210698
Fix IQ result processing
2016-11-13 16:56:05 +03:00
13d5da4da6
Add some copyright notices
2016-11-13 16:46:04 +03:00
75c15d3853
Make xref working again if elixir is disabled
2016-11-13 14:29:52 +03:00
ebefd0d8d6
Add more control for decoding IQ payloads
2016-11-13 14:17:21 +03:00
7e9f1a6dc1
Don't auto-decode forwarded payload
2016-11-13 13:41:04 +03:00
132033d01a
Remove unused header file
2016-11-13 10:57:53 +03:00
21d78ed7f4
Don't use jlib.hrl outside of jlib.erl
2016-11-13 10:56:36 +03:00
b8f22ff538
Deprecate most of the functions from jlib.erl
2016-11-13 10:44:53 +03:00
534e73f732
Uncomment forgotten block of code
2016-11-12 14:51:43 +03:00
de81c50199
Revert "Support to provide password when subscribing to a room ( #1306 )"
...
This reverts commit 566ac872fe
2016-11-12 14:47:29 +03:00
5d552c8463
Merge branch 'master' into xml-ng
2016-11-12 14:41:37 +03:00
78a44e0176
Merge branch 'master' into xml-ng
...
Conflicts:
src/adhoc.erl
src/cyrsasl_oauth.erl
src/ejabberd_c2s.erl
src/ejabberd_config.erl
src/ejabberd_service.erl
src/gen_mod.erl
src/mod_admin_extra.erl
src/mod_announce.erl
src/mod_carboncopy.erl
src/mod_client_state.erl
src/mod_configure.erl
src/mod_echo.erl
src/mod_mam.erl
src/mod_muc.erl
src/mod_muc_room.erl
src/mod_offline.erl
src/mod_pubsub.erl
src/mod_stats.erl
src/node_flat_sql.erl
src/randoms.erl
2016-11-12 13:27:15 +03:00
566ac872fe
Support to provide password when subscribing to a room ( #1306 )
2016-11-10 20:48:43 +01:00
42bede77a1
Merge branch 'master' of github.com:processone/ejabberd
2016-11-09 09:04:58 +01:00
35506f5470
Expose unregister API command
2016-11-09 09:04:52 +01:00
e841a6ec34
Add more tests for offline storage
2016-11-08 15:15:19 +03:00
e9dd3ffe9c
Merge branch 'xml-ng' of github.com:processone/ejabberd into xml-ng
2016-11-07 10:11:40 +03:00
56c91d3c58
Add roster tests
2016-11-07 10:10:57 +03:00
bd060bc1bb
Support several groups separated by ; in add_rosteritem command
2016-11-04 18:45:27 +01:00
49d3b7ec1d
Throw error if room name or host has invalid characters ( #1360 )
2016-11-04 17:28:28 +01:00
5e723bc90e
Fix reading room jids from file for create and destroy_rooms_file commands
2016-11-04 16:54:31 +01:00
bab71f0832
Replace ctlscriptpath and produce ejabberd.service file ( #434 )
2016-11-04 16:35:59 +01:00
62db030942
Merge mod_opt_type from db sub-modules to main module mod_opt_type
2016-11-04 12:58:08 +01:00
2a63d0e95a
mod_mam: Use user JID for stanza ID 'by' attribute
...
Use the user (or room) JID instead of the server JID for the 'by'
attribute of <stanza-id/> and <archived/> tags. That's what the
examples in XEP-0313 v0.2 and XEP-0359 v0.3.0 suggest.
2016-11-01 08:47:08 +01:00
149cc9654f
Append ; to privacy_list_data exporting lines (thanks to Marcio Luciano Donada)
2016-10-24 13:42:33 +02:00
9d977e484a
Use base64:mime_decode/1 for SASL packets
...
It will be now possible to accept SASL packets with only
single '=' character set as required by RFC6120
2016-10-22 13:09:11 +03:00
f6236d456d
Add more tests for privacy lists and blocking command
2016-10-22 13:01:45 +03:00
ed6bc9081b
Merge pull request #1349 from prasadvaidya/master
...
Fix: Replace erlang function with fail-safe jlib function.
2016-10-21 13:32:29 +02:00
cdafd3254b
Rollback minor change, to avoid redundant use of fail-safe function
2016-10-21 15:02:39 +05:30
509776a0d1
Fix: Replace erlang function with fail-safe jlib function.
2016-10-21 13:57:47 +05:30
2ab72bcd00
Nidx may be integer or binary, so use jlib:i2l instead
...
As reported in
https://www.ejabberd.im/forum/28580/erlang-function-integertobinary1-throwing-badargs-exception
2016-10-20 21:56:19 +02:00
0212559ca7
If a participant can change subject, let asubscriber too ( #1345 )
2016-10-20 20:35:00 +02:00
1bdbe54442
Let systemd stop ejabberd gracefully
...
Make sure the "ExecStop" command line blocks until ejabberd is actually
stopped. This prevents systemd from killing the ejabberd process(es)
immediately.
Also, let the "ExecStart" command line block until ejabberd's startup is
completed. This makes sure that services which depend on ejabberd
aren't started up too early.
2016-10-20 00:27:50 +02:00
a5e737157c
Increase file descriptor limit in systemd unit
...
16,000 file descriptors will only suffice for small setups.
2016-10-20 00:12:02 +02:00
0a3fcc9ade
Don't specify "ExecReload" command in systemd unit
...
The "reload_config" command doesn't work the way admins would typically
expect, so it shouldn't be exposed via systemd. Those who understand
the behavior can execute the command using ejabberdctl.
2016-10-19 23:37:26 +02:00
7621564839
Let systemd restart ejabberd on failure
...
The "RestartSec=5" setting has no effect if "Restart" is not also
specified.
2016-10-19 23:35:22 +02:00
686305bb21
Use "Type=forking" in systemd unit
...
ejabberd is not a "oneshot" process.
2016-10-19 23:32:07 +02:00
c3b62d2f75
Don't set "NoNewPrivileges" in systemd unit
...
The "NoNewPrivileges" setting breaks some PAM and extauth setups.
Fixes #1281 .
2016-10-19 23:29:46 +02:00
f56840a682
Don't let systemd hide /home and /tmp
...
Admins might expect ejabberd to be able to access data below /home or
/tmp. For example, they might use those locations to dump/restore
Mnesia backups, or as a document root for mod_http_fileserver or
mod_http_upload.
Fixes #1297 .
2016-10-19 23:11:26 +02:00
059a806bb0
Let mix be able to cope with configured deps
2016-10-19 13:57:19 +02:00
3ec68a4ecf
Merge pull request #1343 from gardenia/mod_muc_configurable_max_discoitems
...
New option max_rooms_discoitems instead of constant (#1236 )
2016-10-19 12:32:09 +02:00
3b876875e9
mod_muc: made the constant MAX_ROOMS_DISCOITEMS configurable
2016-10-18 21:59:34 +01:00
d19552f464
Fix randoms:uniform/1 return
...
Make sure randoms:uniform/1 returns values from the same interval
as deprecated random:uniform/1
2016-10-18 08:35:47 +03:00
4c5460f0bd
Get rid of compile warnings for random/crypto modules on R19
2016-10-18 08:17:21 +03:00
90acec8a2b
Merge pull request #1338 from marcphilipp/muc_invite_hook
...
Introduce muc_invite hook
2016-10-17 17:46:25 +02:00
305d4c05dc
Fix delete_old_messages command for SQL backends
2016-10-17 17:02:23 +02:00
67720c7713
Add more MUC tests
2016-10-17 13:37:23 +03:00
fd6f0f94b5
Convert ejabberd_xmlrpc to new api_permissions
2016-10-14 13:55:50 +02:00
a1faecc4c9
Introduce muc_invite hook
...
This adds a new hook that is triggered for each invite to an MUC room:
- muc_invite(RoomJID, RoomConfig, From, To, Reason) -> ok
where
- RoomJID = From = To = #jid (see jlib.h)
- RoomConfig = #config (see mod_muc_room.hrl)
- Reason = binary()
2016-10-14 12:52:59 +02:00
d97e777c9b
Always include <actions/> with ad-hoc responses
...
XEP-0050 says: "The result for each stage (other than the last) of a
command's execution SHOULD include an <actions/> element." Some clients
insist on this.
2016-10-13 22:34:29 +02:00
b693601dd1
Don't let MAM messages go into offline storage
2016-10-12 23:10:25 +02:00
4935ac8866
Merge pull request #1331 from weiss/send-message-omit-copies
...
Don't let "send_message" duplicate the message
2016-10-12 13:52:27 +02:00
ead7e21037
Ignore offline sessions in statistics
...
Offline sessions should not be counted when reporting the number of
connected resources.
Apart from that, this number is now also reported when using a
non-default session management backend.
2016-10-11 22:20:22 +02:00
0f67a8f98b
Update riakc to support r19
2016-10-10 10:57:04 +03:00
a915fd161e
Create room on configuration request as per XEP-0045, 10.1.3
2016-10-10 10:51:39 +03:00
dffcfe74d4
Don't let "send_message" duplicate the message
...
In the past, the "send_message" command sent a copy of the message to
each resource if the message was addressed to the bare JID of a local
online user. When message carbons are enabled, this creates duplicates;
and with MAM enabled, each copy is archived. Therefore, "send_message"
no longer creates copies of the message.
2016-10-10 00:17:17 +02:00
5c48263579
Enable elixir when ejabberd used as a mix dependency
2016-10-07 10:47:20 +01:00
6a3691ef7c
Add xdata generator and make some code using it
2016-10-07 10:31:03 +03:00
d701230555
Make map syntax compatible with Erlang/OTP 17
2016-10-07 00:36:47 +02:00
e54ba3db5b
XEP-0198: Cope with invalid 'from'/'to' attributes
...
Check whether the 'from' and 'to' attributes are valid before bouncing
or resending a stanza from the stream management queue. They might be
invalid in certain corner cases.
Thanks to Evgeniy for spotting this.
2016-10-06 23:20:45 +02:00
0ae84a646f
Disable one test for now, we may change how this part is handled
2016-10-06 11:17:10 +02:00
b01fbfadf3
Use correct field for oauth scope
2016-10-06 11:03:26 +02:00
438dbc8bda
Make handling of oauth clauses be more consistent with other rules
2016-10-06 10:59:43 +02:00
8accb8ee0c
Use proper default value for api_permissions
2016-10-06 10:59:43 +02:00
a78c3422cd
Fix typos in Czech translation ( #1318 )
2016-10-05 15:04:42 +02:00
695d22ef95
Initialize ejabberd_access_permissions in elixir tests
2016-10-05 13:54:29 +02:00
98e0123ca4
New api permissions framework
2016-10-05 13:21:11 +02:00
9cee3760db
ejabberd_sm: Clean up old offline session entries
...
If the number of offline sessions exceeds the 'max_user_sessions' limit,
remove the oldest entry from the table.
2016-10-02 22:01:03 +02:00
1de0bb83a0
PubSub: creation jid must be bare jid
2016-09-30 07:51:33 +03:00
7566e267a7
PubSub: fix error type on item deletion with insufficient priviledge
2016-09-30 07:51:17 +03:00
15ebb79160
PubSub: creation jid must be bare jid
2016-09-29 16:10:11 +02:00
767dba8f3b
PubSub: fix notification on subscription change
2016-09-29 12:00:59 +02:00
a42bf67957
PubSub: fix error type on item deletion with insufficient priviledge
2016-09-29 11:20:56 +02:00
6f538545b4
Fix 404 response formatting (thanks to Kaggggggga)( #1306 )
2016-09-28 11:03:46 +02:00
d4b4f35a0e
ejabberd_http: Handle missing POST data gracefully
...
Return a "bad request" error instead of crashing if receiving POST/PUT
data fails.
2016-09-27 23:22:30 +02:00
acab2270f1
Use inets instead of lhttpc in http_p1
2016-09-27 07:12:10 +03:00
ac6f701033
Add http_p1.erl, rest.erl, and oauth2 ReST backend for tokens.
2016-09-27 05:57:14 +03:00
d327119cf7
Text legacy IQ handler support
2016-09-25 10:17:03 +03:00
3112a7187f
Test anonymous auth
2016-09-25 09:57:56 +03:00
7100c67be6
Get rid of compile warnings in test suite
2016-09-25 08:38:41 +03:00
fa31e3ef23
Deprecate jlib:integer_to_binary/1 and jlib:binary_to_integer/1
2016-09-24 23:34:28 +03:00
58969fb854
Improve namespace handling
2016-09-24 14:17:21 +03:00
53209b9ab1
Add tests for s2s code
2016-09-23 12:30:33 +03:00
ceda073766
Add tests for external component
2016-09-21 10:45:11 +03:00
a4ec064455
Add more tests for C2S
2016-09-20 14:04:07 +03:00
e7787e2f33
mod_carboncopy: Don't copy MUC PMs
...
Carbon copies of private MUC message are generally not desired,
especially not when multiple clients joined the room with the same nick.
In this case, the MUC service usually sends PMs to all joined resources
anyway, so carbon-copying those PMs would create duplicates.
2016-09-19 22:46:36 +02:00
5bcfcf4c5e
When getting list of subscribed rooms, check all including temporary ones ( #1242 )
2016-09-19 13:46:01 +02:00
9fa92092bf
Revert "Fix getting of subscribed rooms: consider also temporary ones ( #1242 )"
...
This reverts commit f2cc81dfea
2016-09-19 12:54:19 +02:00
f2cc81dfea
Fix getting of subscribed rooms: consider also temporary ones ( #1242 )
2016-09-19 12:35:53 +02:00
8244c1fa8c
Store the Allow Subscription room option ( #1301 )
2016-09-19 12:35:32 +02:00
ed62d705d8
Don't worry about storage_type of the Acl mnesia table ( #1206 )
2016-09-19 11:59:40 +02:00
da291d804c
Use mnesia calls instead of ets for Acl and Access tables ( #1206 )
2016-09-19 11:56:22 +02:00
662b6f1020
Update riakc to support r19
2016-09-16 14:59:06 +02:00
27999a122f
node_mb_sql: Add missing (SQL-specific) functions
2016-09-15 23:02:04 +02:00
151668ac10
Fix dialyzer warnings for mod_mam
2016-09-13 16:56:34 +03:00
405a0a21c1
Merge pull request #1249 from weiss:push-requirements
2016-09-13 14:31:39 +02:00
c39501a48d
Merge branch 'push-requirements' of https://github.com/weiss/ejabberd into weiss-push-requirements
2016-09-13 14:29:14 +02:00
c3543e002d
Allow to create room with custom config
2016-09-13 11:52:59 +02:00
e987b88848
Make common tests working again
2016-09-13 12:30:05 +03:00
2f596b0e10
Expand parsing of json input to be able to handle update_roster command
2016-09-13 11:27:59 +02:00
054382f074
Add X-Admin and basic auth header to CORS allowed headers in http_api
2016-09-12 15:40:38 +02:00
96d05dad8f
Properly process OPTIONS header in http_api for all paths
2016-09-12 15:40:38 +02:00
1aca541639
Fix nick-to-jid mapping for MUC subscribers
2016-09-12 14:41:33 +03:00
d0761039ff
Support multiple room invitations ( #1285 )
2016-09-09 12:18:27 +02:00
fe1bf27ef3
Fix subscribed rooms list retreivement
2016-09-09 13:04:47 +03:00
d222fed228
XEP-0198: Cancel timer when waiting for resumption
...
If an ACK timer is active while going into the 'wait_for_resume' state,
cancel that timer.
2016-09-09 00:21:36 +02:00
8fd888eb2b
Revert "Don't log an [error] message if Elixir is missing"
...
This reverts commit 41386d718d4bd45bada7
2016-09-08 18:11:54 +02:00
41386d718d
Don't log an [error] message if Elixir is missing
...
The Elixir support is still optional.
Closes #1250 .
2016-09-08 17:59:40 +02:00
26a040e2d5
Fix typo on previous commit ( #1284 )
2016-09-08 16:32:16 +02:00
4bd45bada7
Start elixir config code only if elixir was enabled in configure script
2016-09-08 16:29:45 +02:00
ad39da0b0a
Full jid entity subscriptions should include bare jid records ( #1284 )
2016-09-08 16:27:16 +02:00
c29a48695d
Rename #error{} record to #stanza_error{}
2016-09-08 17:08:48 +03:00
36ab9cc2ea
Fix message routing from subscribers
2016-09-08 16:39:34 +03:00
5ec972b00f
Improve pubsub code
2016-09-08 15:49:27 +03:00
6c943aa293
Merge pull request #1287 from weiss/ack-timeout
...
New stream management option: ack_timeout
2016-09-08 12:45:16 +02:00
803270fc6b
Support for Elixir configuration file #1208
...
Contribution for Google Summer of code 2016 by Gabriel Gatu
2016-09-08 11:37:14 +02:00
e6f7233351
Support for publishing to hex.pm with latest Elixir mix
2016-09-08 10:52:43 +02:00
58a72bd395
Fix compilation with Elixir 1.3 / R19
2016-09-08 10:29:44 +02:00
d2621130a3
Typo
2016-09-08 10:27:14 +02:00
a8368278ec
Properly normalize resource_regexp acl rule
...
This fixes issue #1288 .
2016-09-08 08:45:10 +02:00
621f0e2b7c
New stream management option: ack_timeout
...
Close the connection if a stream management client fails to respond to
an acknowledgement request within 60 seconds. This number of seconds
can be changed with the new "ack_timeout" option, and the mechanism can
be disabled by specifying 'infinity'.
As a side effect of this change, a new acknowledgement is no longer
requested before the response to the previous request is received.
2016-09-07 23:16:54 +02:00
7a538bb88b
Enforce pathtype use with config path ( #1264 )
2016-09-07 17:38:35 +02:00
af0a493c66
Merge pull request #1253 from Amuhar/xep0356
2016-09-07 14:34:31 +02:00
f304149615
Create room on configuration request as per XEP-0045, 10.1.3
2016-09-07 11:15:19 +03:00
3803a8de3c
Link MUC subscription to bare JID
2016-09-07 10:33:37 +03:00
1edca899ff
Add SQL support for microblogging node plugin
2016-09-07 07:15:12 +02:00
c6afb9731b
Handle <subscriptions/> request to list MUC subscribers
2016-09-06 19:06:02 +03:00
5ec2874a96
Do not update muc_online_users table on MUC/Sub operations
2016-09-06 18:17:30 +03:00
417284a921
Add get_subscribers command to list MUC subscribers
2016-09-06 17:55:18 +03:00
af2999a783
node_mb: Call node_pep instead of node_hometree
2016-09-06 00:30:46 +02:00
48ce34987d
node_mb: Fix configuration documentation
...
A node plugin used in a 'pep_mapping' must explicitly be added to the
list of 'plugins'.
2016-09-06 00:08:43 +02:00
e29f47893f
mod_pubsub: Remove outdated comment
2016-09-06 00:05:54 +02:00
c770a54aac
Clean ejabberd_commands before tests
2016-09-05 17:18:27 +02:00
96a748d34f
ejabberd_oauth requiere working cache_tab, initialize it before tests
2016-09-05 16:42:05 +02:00
45eb49125b
Rewrite mod_pubsub to use XML codec
2016-08-30 09:48:08 +03:00
31592fe51f
Merge remote-tracking branch 'processone/pr/1262'
...
* processone/pr/1262:
Fixed typo in Stream Management option name
2016-08-22 22:35:17 +02:00
f1afea223b
Fixed typo in Stream Management option name
2016-08-23 02:21:09 +06:00
1bfa1c613b
Merge remote-tracking branch 'processone/pr/1261'
...
* processone/pr/1261:
Fixed #1260 Stream Management feature for the websocket connections
2016-08-22 21:22:08 +02:00
d5659735b3
Fixed #1260 Stream Management feature for the websocket connections
2016-08-23 00:59:39 +06:00
23d9fb0592
mod_muc_admin: Accept 'allow_subscription' option
...
Allow for setting the new 'allow_subscription' option using the
'change_room_option' command.
2016-08-22 01:17:32 +02:00
8dd2044a27
Merge pull request #1254 from lemenkov/remove_p1_xmlrpc
...
Remove no longer necessary p1_xmlrpc
2016-08-19 11:53:20 +02:00
e13edff6ae
Remove no longer necessary p1_xmlrpc
...
Ths module was superceded by fast_xml in commit
processone/ejabberd@dfc29ea03c . So let's remove it entirely to
avoid any confusion.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com >
2016-08-17 18:32:09 +03:00
8af85d913f
Erlang R17 has a Time limit in erlang:send_after ( #1246 )
2016-08-16 18:32:06 +02:00
20a510d877
mod_mam: Add 'store_mam_message' hook
...
The new 'store_mam_message' hook is invoked whenever a MAM message is
stored.
2016-08-15 23:28:36 +02:00
8821cf8b27
mod_offline: Add 'store_offline_message' hook
...
The new 'store_offline_message' hook is invoked whenever an offline
message is stored.
2016-08-15 22:30:08 +02:00
4d19fb518f
ejabberd_c2s: Add XEP-0198 resumption hooks
...
The new 'c2s_session_pending' and 'c2s_session_resumed' hooks are
invoked when a stream management session is pending and resumed,
respectively.
2016-08-15 21:49:58 +02:00
e7217e6320
Add functions to get/set some c2s state elements
2016-08-15 20:24:43 +02:00
5b4f347da8
Support sql backend in mod_shared_roster commands ( #1244 )
2016-08-15 15:53:35 +02:00
38666cfd58
Merge pull request #1245 from hamano/clean_redis_table
...
fix clean redis table
2016-08-15 15:12:20 +04:00
877d0752e2
fix clean redis table
2016-08-15 17:51:06 +09:00
0ab08f4eeb
Don't delete ejabberd_commands table, it's problematic in cluster ( #1210 )
2016-08-14 20:35:25 +02:00
4ee8af633b
Store announcements for offline users
...
Add a <store/> hint to announcements (unless they are explicitly sent to
online users). Without that hint, announcements weren't delivered to
offline users, since they are sent as messages of type "headline".
2016-08-13 00:07:27 +02:00
bf9d6b5534
Honor <store/> hint for any non-"error" message
...
XEP-0334 says: "A message containing the <store/> hint that is not of
type 'error' SHOULD be stored by the entity."
2016-08-12 21:13:10 +02:00
28dde294e5
mod_mam: Don't store messages of type "headline"
...
XEP-0313 says: "a server SHOULD include in a user archive all of the
messages a user sends or receives of type 'normal' or 'chat' that
contain a <body> element."
2016-08-12 20:38:17 +02:00
31faa4eb9a
Add more type specs
2016-08-12 13:17:42 +03:00
ffba664f2c
Add a requirement for full JID in subscribe_room command
2016-08-11 17:13:20 +03:00
50596dc4d3
Provide proper args_desc in oauth_issue_token command
2016-08-10 11:26:04 +02:00
e63fe5c216
Fix result type of subscribe_room command
2016-08-10 11:22:19 +02:00
1fc58ace2f
Add commands for MUC subscriptions management
2016-08-09 13:36:43 +03:00
522a186a38
Improve some type specs
2016-08-09 10:56:32 +03:00
c4b14d045a
Update to released version
2016-08-07 18:31:55 +02:00
9c6ee60f1a
Update moka dependency
2016-08-07 18:28:14 +02:00
efc744092b
We do not force yet access rules check on register command
2016-08-07 18:27:16 +02:00
a0c8012c66
Do not force command line to pass a credentials
2016-08-07 18:24:08 +02:00
b62aa3d2dc
mod_client_state: Let other modules filter stanzas
...
Don't stop execution of the 'csi_filter_stanza' hook if mod_client_state
won't queue the stanza.
2016-08-06 13:36:27 +02:00
91e26fbf7a
Add user's JID to CSI hook arguments
...
Add the JID of the CSI user to the arguments of the 'csi_filter_stanza'
and 'csi_flush_queue' hooks.
2016-08-05 23:47:18 +02:00
c2ef55a075
Cosmetic change: Set CSI state 'active' on resume
...
The CSI state is always set to 'active' when a stream management session
is resumed; so there's no need to apply the CSI state of the old c2s
process, first.
2016-08-05 20:09:52 +02:00
d969e917c6
Use newer samerlib/moka
2016-08-05 13:03:22 +02:00
4ff8d7918a
Change code to reflect recent changes in fxml_gen
2016-08-05 08:41:08 +03:00
9a5f0751be
mod_mam: Simplify "assume_mam_usage" option
...
The "assume_mam_usage" option now takes a boolean value. Setting it to
"true" has the same effect as "if_enabled" had before. The "on_request"
behavior is no longer offered, as it made the option (and its
documentation) overly complex.
2016-08-05 01:57:01 +02:00
b487ccfb34
Delete mod_configure2
...
The module doesn't work properly for many years and nobody reported
this, which means nobody is using it. Also, mod_configure does
the same (and more) in a standard compliant way (XEP-0133).
2016-08-04 16:45:33 +03:00
ca217dc105
Rewrite HTTP Bind and Web Admin code to use XML generator
2016-08-04 13:41:38 +03:00
8b81b9ecb1
Rewrite PIEFXIS code to use XML generator
2016-08-04 13:37:07 +03:00
cbdc106427
Rewrite jd2ejd to use XML generator
2016-08-04 12:34:12 +03:00
bc33a3873d
Rewrite multicast code to use XML generator
2016-08-04 11:49:17 +03:00
72b0fb49e8
Fix type convertion bug injected by 4ccc40b ( #1229 )
2016-08-04 09:49:23 +02:00
111aa83f5e
Add tokens cache to ejabberd_oauth
2016-08-04 01:59:28 +03:00
abb4446b51
Fix calls to undefined functions
2016-08-03 21:00:22 +03:00
a417fbf45b
Rewrite mod_irc to use XML generator
2016-08-03 20:57:05 +03:00
5d06c6acbf
Rewrite mod_configure to use XML generator
2016-08-03 10:34:54 +03:00
78fa9e08a5
XEP-0198: Handle timeouts during stream resumption
...
If session resumption failed because requesting the #state from the old
c2s process took too long, the new c2s process will usually receive the
response. Let the new process handle that case gracefully.
2016-08-03 02:28:46 +02:00
3c1e4f0dfd
XEP-0198: Increase timeout for stream resumption
...
During stream resumption, the #state is transferred from the old c2s
process to the new one. This is usually very fast, but under certain
conditions, it can take longer than five seconds.
2016-08-03 02:15:15 +02:00
4add262090
Add OAUTH SQL backend
2016-08-01 16:55:43 +03:00
76eba3647a
Implement gen_mod callback in ModPresenceDemo module
2016-08-01 15:46:14 +02:00
2ef58a33a9
Merge pull request #1223 from processone/expand_api
...
More API fixes and improvements
2016-08-01 15:36:47 +02:00
d02d7b2b6a
Remove compile warning
2016-08-01 15:35:54 +02:00
90ea3ca361
Improve error message when try to call api on api root
2016-08-01 15:29:47 +02:00
bf45c9eeee
Switch mix worker to transient
2016-08-01 14:09:16 +02:00
a9c6748ec7
Add missing comas in sql statement ( #1219 )
2016-08-01 10:55:02 +02:00
4982639d05
Fix error return expectation in command test
2016-08-01 09:28:54 +02:00
c5c394e929
Fix HTTP process return formatting
2016-08-01 08:58:49 +02:00
6ea7153e31
Improve error handling
2016-07-31 22:48:24 +02:00
c0272ae766
Rewrite mod_stats to use XML generator
2016-07-31 14:51:16 +03:00
e258462b6b
Improve vCard creation from LDAP result
2016-07-31 14:17:17 +03:00
0bcbd12776
Rewrite mod_mix to use XML generator
2016-07-31 08:51:47 +03:00
2a49f8cae7
Change name of result key for offline count to value
...
This is more user friendly and should be more consistent with other commands.
2016-07-30 20:12:04 +02:00
674a8039ef
Add support for sending back missing scope error to API ReST command calls
2016-07-30 18:51:54 +02:00
4bf8ce7681
Make s2s stats commands more robust
2016-07-30 18:50:58 +02:00
eb1d385d4e
Get rid of "jlib.hrl" dependency in mod_service_log
2016-07-30 18:42:17 +03:00
5cd1cf5096
Get rid of "jlib.hrl" dependency in some modules
2016-07-30 18:37:57 +03:00
792e6a7c1c
Rewrite mod_http_upload to use XML generator
2016-07-30 17:48:52 +03:00
19ad6e6145
Ensure ejabberdctl status result is in valid shell supported range
2016-07-30 13:18:39 +02:00
39640b67c7
Add support for rich error reporting for API
2016-07-30 13:08:30 +02:00
d2d3b961eb
Rewrite mod_sic to use XML generator
2016-07-30 13:30:29 +03:00
fb2603d3cd
Return 409 conflict error code on register if user already exists
2016-07-30 11:50:04 +02:00
4a49dfecf3
Merge pull request #1221 from processone/expand_api
...
Do not crash on check when we do not have JID
2016-07-30 10:55:39 +02:00
f19d2fdcff
Rewrite mod_shared_roster backends module to use XML generator
2016-07-30 08:39:30 +03:00
a093e9d441
Rewrite mod_shared_roster to use XML generator
2016-07-30 08:37:34 +03:00
42e6f72ee9
Do not crash on check when we do not have JID
2016-07-29 20:38:05 +02:00
9bf1bac7df
Rewrite mod_vcard_ldap to use XML generator
2016-07-29 17:39:13 +03:00
f91f2bc3d2
Rewrite several modules to use XML generator
2016-07-29 13:21:00 +03:00
3c58a93eb8
Merge pull request #1178 from candrews/patch-1
...
Harden the systemd unit
2016-07-29 11:33:32 +02:00
a080322055
Switch workers from temporary to transient
2016-07-29 11:18:42 +02:00
fd365b2893
Display data that is send to websocket connection in debug log level
...
This should help with detecting problems like in #1097
2016-07-28 16:20:28 +02:00
fad088a3c4
Merge pull request #1193 from gabrielgatu/support-elixir-module-installer
...
Fix issue #625 : Writing Elixir modules
2016-07-28 16:06:12 +02:00
91865c66c0
Start elixir application after ejabberd_app:start_apps()
2016-07-28 15:57:35 +02:00
7a74a4836a
Merge pull request #1211 from processone/expand_api
...
There is still work to do, be we reached a stable state and can merge up to this point.
2016-07-28 14:57:48 +02:00
b31ebd2ea0
Rewrite captcha to use XML generator
2016-07-28 15:10:41 +03:00
96e912b09a
Rewrite mod_register to use XML generator
2016-07-27 18:06:54 +03:00
8275e95a16
Swap variables in their correct places
2016-07-27 18:06:34 +03:00
1097d31d63
Fix type spec for set_from_to/3
2016-07-27 18:05:11 +03:00
c409ed2f2c
Rewrite S2S and ejabberd_service code to use XML generator
2016-07-27 10:45:08 +03:00
72445bb374
mod_http_upload_quota: Apply cosmetic changes
...
Use "fun f/1" syntax in place of "fun(X) -> f(X) end".
2016-07-27 00:28:47 +02:00
984c4cf6bd
Add 'allow_subscription' MUC configuration option
2016-07-26 14:37:28 +03:00
2a8005e47f
Add ability to run test with Elixir mix
2016-07-26 12:17:37 +02:00
7781f39b74
Clarify command module API
2016-07-26 12:15:03 +02:00
e5fd1ee4f6
Avoid starting several time the owner process
2016-07-26 12:12:48 +02:00
9ff7257287
Make jlib ETS table more resilient
2016-07-26 11:58:14 +02:00
12f74b4aa7
Fix list appending bug
2016-07-26 11:57:38 +02:00
fede85c9bd
Remove unused import
2016-07-26 11:53:34 +02:00
23858469b7
Get rid of "jlib.hrl" dependency in some files
2016-07-26 11:29:17 +03:00
c26d38a893
Remove jlib dependency from acl.erl
2016-07-26 10:01:59 +03:00
da310a5173
Rewrite mod_adhoc and mod_announce to use XML generator
2016-07-26 09:52:29 +03:00
839490b0d9
Add DB backend support for ejabberd_oauth
2016-07-25 20:08:30 +03:00
dbc0498279
Fix tests, command need to be properly added to list of exposed commands
2016-07-25 18:28:40 +02:00
c183092aa4
Simplify code for command policy group expansion
2016-07-25 18:28:05 +02:00
5d4f8bcf0d
Export acl:parse_ip_netmask/1 for mod_rest (ejabberd-contrib#175)
2016-07-25 16:57:05 +02:00
179fcd9521
Rewrite mod_mam and mod_muc to use XML generator
2016-07-25 13:50:30 +03:00
d7ad99f147
Initial attempt on access on commands
...
May change and will require more work / test / refactor
2016-07-25 11:43:49 +02:00
4b0d71d402
Don't return error for blocked MUC PMs
...
If a message stanza is blocked as per XEP-0016 or XEP-0191 and the
stanza is marked as a private MUC message, don't return an error. This
makes sure users won't be kicked from MUC rooms when blocking other
participants.
2016-07-24 20:55:11 +02:00
b4a430541d
Return more user friendly, human readable error description
2016-07-24 14:10:12 +02:00
bfa61eaa46
Make default OAuth token TTL values more user friendly
2016-07-23 18:57:57 +02:00
68555ff466
Add support for checking access rules conformance for commands
2016-07-23 18:21:45 +02:00
caf2c20210
Error when not authorized should be 403
2016-07-23 18:21:45 +02:00
1485b56211
Move any access rules check to ACL module
2016-07-23 18:21:45 +02:00
2c70c572c8
Clean-up of error codes and format json structure
2016-07-23 18:21:45 +02:00
d4d1941133
XEP-0198: Log debug message when dropping stanza
...
Log a debug message when an unacknowledged message is neither resent nor
bounced because it's archived.
2016-07-23 01:23:24 +02:00
814b80c644
Preserve PID for offline sessions
...
Don't set the PID to 'undefined' when a session goes offline, as this
looses the information which node created the session table entry.
Fixes #1196 .
2016-07-23 01:08:05 +02:00
4332dddbc4
Support oauth password grant type
...
As in https://tools.ietf.org/html/rfc6749#section-4.3
2016-07-22 19:17:12 -03:00
57aeef74d5
stringprep might already be started
...
Depending on the way the test us ran
(full test suite or the elixir quicktest one)
the stringprep might already be loaded.
2016-07-22 19:15:56 -03:00
12b58b9870
Fix elixir test case: stringprep was required
2016-07-22 16:25:54 -03:00
caf7b54305
oauth: single jid field instead of username/password fields
2016-07-22 15:37:48 -03:00
c5d9d35e7b
Convert password provided by web form to UTF8 before passing it ( #375 )
2016-07-22 16:52:13 +02:00
ffbe97d988
Quote postgresql database name ( #1136 )
2016-07-22 16:33:40 +02:00
bdfef09c0f
Fix handling of complex values as arguments in http_api
2016-07-22 15:26:27 +02:00
dd38bef8b1
Merge pull request #1201 from xmppjingle/master
...
External Component Connection Hooks
2016-07-22 00:35:43 +04:00
6983dfa21f
External Component Hook
...
Changed Hook Trigger Event and included a Reason upon
component_disconnected/2 Hook
2016-07-21 14:03:01 -03:00
cbfab687e8
Oauth callback must pass expires_in as ttl instead of epoch
2016-07-20 14:47:11 -03:00
c2753cd51c
Use different version of elixir depending on erlang version
2016-07-20 10:12:00 +02:00
5458d8bfcb
Add else branch to if_version_{above,below}
2016-07-20 10:11:34 +02:00
7748dd4e5d
Make processing of if_* clauses in rebar.config recursive
2016-07-20 10:11:08 +02:00
0c0c6465ba
Fix test for changes in oauth expiry
2016-07-19 20:36:02 -03:00
b5a90be3cb
Merge branch 'master' of github.com:processone/ejabberd
2016-07-19 20:19:17 -03:00
1d317e8068
Let user choose the desired oauth token TTL
2016-07-19 20:18:07 -03:00
8f8c499cfa
mod_mam: Fix handling of result set page limit
...
Restore function clause for handling a client-specified result set page
limit that doesn't exceed mod_mam's upper threshold.
2016-07-19 21:23:30 +02:00
9fcb81dea9
mod_mam: Always limit result set page size
...
Limit the number of messages returned for a given MAM request even if
the client didn't specify an RSM set (not just if the client specified
an RSM set without a limit).
This is still not done for MAM v0.2 requests though, as that version of
the XEP doesn't require clients to support RSM.
2016-07-19 21:08:13 +02:00
5d90292849
Fix hooks de-registration
2016-07-19 15:33:17 +03:00
490a758050
Upgrade Elixir version to 1.2 in rebar config
...
This matches the version used in mix.exs
2016-07-19 13:05:01 +02:00
f79ac6874e
Lock relx version as newer version does not compile fine
2016-07-19 12:35:45 +02:00
655cbf6055
Make access rules in ejabberd_web_admin configurable
2016-07-19 11:27:45 +02:00
bc802a4049
Rewrite mod_blocking to use XML generator
2016-07-19 10:07:04 +03:00
a4a9dd7f03
Rewrite mod_offline to use XML generator
2016-07-19 07:56:14 +03:00
483ef09263
Fix command argument formatting
2016-07-19 00:51:04 -03:00
33e0283f0d
Add 'ejabberd:user' and 'ejabberd:admin' oauth scopes
...
'ejabberd:user' includes all commands defined with policy "user".
'ejabberd:admin' includes commands defined with policy "admin".
2016-07-19 00:24:06 -03:00
673a654c47
Fix ce0d1704c6
...
Original request was to allow ejabberd sysadmin to generate
tokens for specific users. JIDs must not be passed as argument
when requesting the tokens.
2016-07-18 20:25:23 -03:00
48c88b61b6
Merge remote-tracking branch 'processone/master'
2016-07-18 17:55:31 -03:00
fca2f24231
External Component Connection Hooks
2016-07-18 17:55:10 -03:00
8bc3dc9c49
jlib: Don't try to keep just one <delay/> tag
...
It seems unclear whether XEP-0203 really mandates that stanzas may not
have multiple <delay/> tags. Editing/removing existing tags doesn't
seem worth the effort, especially as we'd have to take more care which
tag to keep if the stanza already has more than one.
2016-07-18 22:31:08 +02:00
9a8e197d7e
Initial version based on XML generator
2016-07-18 15:01:32 +03:00
749033598d
Omit [info] message with number of queued stanzas
...
Just log a debug message if a stream management session times out and
some stanzas weren't acknowledged.
2016-07-10 22:21:57 +02:00
f6e960d326
Fix compilation error
2016-07-10 08:45:24 +03:00
786bd4f26c
Use hooks instead of direct calls to mod_mam
2016-07-09 12:43:01 +03:00
5f48d2641b
mod_http_upload_quota: Depend on mod_http_upload
...
mod_http_upload_quota uses mod_http_upload's "docroot" option, so the
mod_http_upload configuration must be parsed, first. Fixes #1025 .
2016-07-08 20:47:02 +02:00
1a62d4e04b
Update stringprep and iconv
2016-07-08 18:28:51 +02:00
6b38d19085
Do send last items only for subscription on current plugin type
2016-07-08 15:18:39 +02:00
661b041302
Rename MUC/Sub's namespace
2016-07-08 15:07:26 +03:00
368b202144
Handle MUC/Sub subscriptions list request
2016-07-08 15:07:10 +03:00
caaf02eaa0
Advertise MUC/Sub support in MUC service disco#info
2016-07-08 15:06:08 +03:00
32de9a56a5
Experimental MUC/Sub support
2016-07-08 15:05:50 +03:00
febbc2bb5a
Update dependencies
2016-07-08 11:40:28 +02:00
71f27ee7d4
Get rid of warnings
2016-07-07 12:17:38 +03:00
c718cbbd9f
Warn on cyclic modules dependencies
2016-07-07 11:34:17 +03:00
12c0d888b1
Revert "Recover fix of 907e239 lost in 9deb294 (thanks to Alexey Shchepin)" ( #1183 )
...
This reverts commit 53f3a45803
2016-07-06 17:54:37 +02:00
4220a2b98c
Make modules loading in a dependent order ( #1191 )
2016-07-06 14:58:48 +03:00
de9f80f2ce
Add missing '/' for jid matching from commit e300f80
2016-07-06 10:06:17 +02:00
be3a4acb55
Fix missed escaping in node_flat_sql.erl
2016-07-05 17:45:37 +03:00
3820aaa421
Quote reserver 'type' keyword for pgsql to fix e300f80
2016-07-05 16:16:40 +02:00
e300f8095d
Fix use of like parameter in sql pubsub's requests
2016-07-05 15:43:59 +02:00
b31c0d9e2e
Support elixir module installer
2016-07-05 12:36:49 +02:00
8e04a7ef4d
mod_configure: Fix editing of access rules
2016-07-03 22:58:54 +02:00
16b1d8541a
Grab new p1_utils that has fix for R19
2016-07-01 21:41:12 +02:00
0737958b45
Fix compilation issues on R19
2016-07-01 21:20:10 +02:00
024124decb
Fix dependencies when using Elixir Mix
2016-06-30 11:35:42 +02:00
88ac1dc56b
Update dependencies
2016-06-30 11:33:38 +02:00
8be1d49961
mod_mam_mnesia: Force garbage collection
...
The VM fails to collect the garbage generated during MAM lookups
automatically, so mod_mam_mnesia's memory usage easily goes up to
several gigabytes if we don't force garbage collection.
2016-06-29 22:32:59 +02:00
10d4c16a97
mod_client_state: Throttle PEP stanzas by default
2016-06-29 22:22:49 +02:00
ce0d1704c6
Allow generation of oauth tokens from command line
...
Oauth tokens can be generated for commands (scopes) having admin|user|open
policy. Restricted commands are not available as those are only usable
from ejabberdctl command line.
Four new commands are available:
$ejabberdctl oauth_issue_token "stats;get_roster"
Generates a token authorized to call both stats and get_roster
commands. Note scopes must be separated by semicolon.
$ejabberdctl oauth_list_tokens
List tokens generated from the command line, with their scope
and expirity time.
$ejabberdctl oauth_list_scopes
List scopes available
$ejabberdctl oauth_revoke_token "Lbs7qdJfdKXOWzVrArgyckY055tE1xnt"
Revokes the given token
2016-06-29 00:22:28 -03:00
2e28d06744
Harden the systemd unit
...
Restrict capabilities, have a private tmp directory, private /dev, and don't accessing file system locations that really shouldn't be accessed.
2016-06-28 17:02:41 -04:00
3446aba753
Include correct version in stream:stream when reporting errors
...
This fixes issue #1174
2016-06-27 16:40:57 +02:00
75366ca2fd
Inline muc access rules
2016-06-24 15:12:58 +02:00
f56cff925c
acl: ACLName rule should match if any part of ACLName matches
2016-06-24 15:09:51 +02:00
94461948db
Update dependencies for 16.06x
2016-06-24 11:12:18 +02:00
0b438d09d1
Fix typo from d8bb5d9c
2016-06-23 17:31:32 +02:00
06bf8cb032
Prepare hex.pm release
2016-06-23 15:23:28 +02:00
1794dd19d0
mod_pubsub: Fix matching of set_node/1 result
...
nodetree_tree_sql:set_node/1 returns {result, NodeIdx} on success, not
{ok, NodeIdx}. Thanks to Christophe Romain for spotting this.
2016-06-23 14:23:24 +02:00
1b5c50a384
When convertion of xmlrpc argument to type fails, report it as error
2016-06-23 10:41:16 +02:00
a9b456ccb3
xref was broken when Elixir wasn't enabled
2016-06-23 10:23:02 +02:00
2ebdd8915e
Compile gen_mod early to help with undefined behaviour warnings
2016-06-23 10:22:01 +02:00
e54400a8e4
Merge pull request #1165 from weiss/default-blocking-list
...
mod_blocking_sql: Handle default list corner case
2016-06-23 10:44:47 +04:00
065f5272e6
mod_blocking_sql: Handle default list corner case
...
Handle the situation where a list of the name "Blocked contacts" was
created by an XEP-0016 client, but no default list exists.
2016-06-22 22:36:27 +02:00
751be3cca6
Add some tests for {shaper,access}_rules_validator
2016-06-22 16:52:45 +02:00
cd0244eb71
Merge pull request #1120 from anagromataf/feature/archive-id-in-message-carbons
...
Send unique stanza id and archived tag also in the message carbons
2016-06-22 15:47:27 +02:00
f029488260
Restore get_items conditions when not using RSM ( #1147 )
2016-06-22 13:12:40 +02:00
eeeb190680
Set HTTP/1.0 so github accepts the request ( #1157 )
2016-06-22 12:43:24 +02:00
95ff94b054
Fix PubSub RSM on get_items ( #1147 )
2016-06-22 12:25:41 +02:00
7744339347
Update supported xep version
2016-06-22 11:24:01 +02:00
2efa8677c9
Fix pgsql compatibility on delete_old_messages ( #1137 )
2016-06-22 11:21:11 +02:00
c928956d73
XEP-0198: Apply cosmetic changes
2016-06-21 23:17:17 +02:00
7ddeac38b6
XEP-0198: Also count stanzas when socket is closed
...
Don't forget to count stanzas received from the stream management client
that are processed right after the connection was lost.
2016-06-21 22:54:41 +02:00
3a8da27d86
Use {access,shaper}_rules_validator in other places where access rules are used
2016-06-21 13:18:24 +02:00
52d45604ba
Use new access_rules_validator in couple places
2016-06-21 12:28:53 +02:00
804190e4a8
Add acl:{access,shaper}_rules_validator for use in {mod_}opt_type()
2016-06-21 12:26:31 +02:00
4b9613e8fe
Allow {mod_}opt_type to transform values passed to it, and for better error reporting
2016-06-21 12:25:29 +02:00
b2f53fb962
Avoid cleanup on bag when disc_only, switch in memory ( #1161 )
2016-06-21 10:43:19 +02:00
c91c5aa352
Fix handling of queued stanzas on session timeout
...
Don't fail to resend or bounce unacknowledged stanzas if the stream
management session timed out.
Closes #1160 .
2016-06-19 23:32:15 +02:00
6f2b0179e7
Give more time to stop and kill epmd ( #882 )
2016-06-17 17:09:45 +02:00
8583958268
Use shorter jid acl in config template
2016-06-17 11:58:51 +02:00
d1425f0d78
Use new short access rules in config template
2016-06-16 11:13:07 +02:00
f1138baa80
Add test for more allowed access_rules
2016-06-16 11:12:16 +02:00
1fb1e8721b
Allow using shaper defined by name like in in s2s_shaper: fast
2016-06-16 11:04:01 +02:00
0a09f27373
Typo in option name
2016-06-16 11:00:38 +02:00
7b308e0d41
Add shorter version of some common access rules definitions
...
This add conversion of
- allow
to
- allow: all
and
- allow: acl_name
to
- allow:
- acl: acl_name
(this works also for deny, and number in shapers)
2016-06-15 19:23:55 +02:00
9004608181
Check password with jid:resourceprep when registering account ( #996 )
2016-06-14 23:35:47 +02:00
26bce5dee3
mod_mam: Fix "assume_mam_usage: if_enabled"
2016-06-14 16:40:46 +02:00
34cf693231
Recover ec6c58a which was reverted in 100827e (thanks to Alexey Shchepin)
2016-06-10 13:18:32 +02:00
0e61e57ed9
Preparing hex.pm release to fix lager bug
2016-06-10 11:02:45 +02:00
34cbed54cd
Force use of lager 3.0.2 at most.
...
Lager 3.2.0 has a bug that prevent it to work with ejabberd.
Lager 3.2.0 bug is fixed in https://github.com/basho/lager/commit/4c87abcd4f9d70a1136fff8f573dc7adcc833e43
2016-06-10 11:01:46 +02:00
4ccc40bce5
push_roster must convert read strings to binaries ( #1075 )
2016-06-08 21:16:30 +02:00
53f3a45803
Recover fix of 907e239 lost in 9deb294 (thanks to Alexey Shchepin)
2016-06-08 19:34:05 +02:00
858d880675
Allow again multiple fqdn values in configuration (EJAB-1578)
2016-06-08 19:28:17 +02:00
a4f213837e
Merge pull request #1125 from vthriller/roster-push
...
mod_roster should probably respect roster item changes introduced with roster_process_item hooks upon pushing
2016-06-08 13:57:52 +02:00
5173de503c
Produce mod_last entry on account creation ( processone/ejabberd-contrib#62 )
2016-06-08 13:02:20 +02:00
8a7b31ca63
When stopping ejabberd, stop modules after broadcasting c2s shutdown ( #1144 )
2016-06-07 18:41:38 +02:00
f8d2589ee5
Add tests for new acl functions
2016-06-06 17:12:39 +02:00
78d4200f05
mod_pubsub: Fix node configuration changes for SQL
...
nodetree_tree_sql:set_node/1 returns {ok, NodeIdx} rather than 'ok' on
success.
2016-06-06 00:18:24 +02:00
60803f5780
Simplify check for carbon-copied chat states
...
Let jlib:is_standalone_chat_state/1 unwrap carbon copies rather than
leaving this to the caller. We still export jlib:unwrap_carbon/1, as
this function might also be useful for other purposes.
2016-06-05 22:36:56 +02:00
5c3074c0fb
mod_client_state: Fix handling of chat states
...
Fix the check for chat states sent from other resources of the same
user.
2016-06-05 22:04:38 +02:00
4789ddf1ee
mod_client_state: Simplify handling of PEP stanzas
...
Let mod_client_state simply queue the most recent item of a given PEP
node (from a given contact) instead of also taking the payload namespace
into account.
2016-06-05 21:48:03 +02:00
41c3751fa1
Fix quicktest case
...
Missing initialization, required for ets table to exists
2016-06-05 16:35:51 -03:00
8305cc293b
XEP-0352: Pass chat states of other resources
...
Don't hold back (carbon copies of) chat states from other resources, as
they might be used to sync the state of conversations across clients.
E.g., if one client becomes active, another one might want to remove a
notification (immediately).
2016-06-03 21:52:11 +02:00
4d5eab6662
Unwrap carbon copies when checking for chat states
...
Detect standalone chat states that were carbon-copied.
2016-06-03 20:28:48 +02:00
3a1fc6fb66
Ignore <delay/> when checking for chat states
...
Ignore XEP-0203 elements when checking whether a message stanza is a
standalone chat state.
2016-06-03 19:02:26 +02:00
5c1db176a9
Fix "unused variable" warning
2016-06-03 12:58:20 +02:00
0503d899cf
Fix problem in dfee843 when non-occupant admin kicks an occupant ( #1135 )
2016-06-03 00:10:25 +02:00
0093326f7d
Fix ejabberd.ldif
2016-06-02 18:56:27 +03:00
9ef52b8c64
Fix a typo
2016-06-02 18:22:50 +03:00
d201f013b2
Stronger tests in the test suite, SQL updates and fixes
2016-06-02 18:09:58 +03:00
5352037680
Report in SQL when scram is enabled but the stored password isn't ( #1096 )
2016-06-01 20:48:52 +02:00
bbb90b9928
Ignore offline sessions
...
Let mod_admin_extra and mod_configure ignore offline sessions when
querying the session table.
2016-06-01 01:01:54 +02:00
9c27f31d72
Process cover information on travis only if cover support is enabled
2016-05-31 12:12:46 +02:00
e7843bf92b
Fix set_presence API
2016-05-31 11:47:08 +02:00
db240413ab
Disable cover analyzys on R17 as this causes problems with elixir tests
2016-05-31 11:29:19 +02:00
8e883a76e3
Update test after roster code reorganization
2016-05-31 00:09:26 +02:00
622bff23a4
Update test
2016-05-31 00:07:26 +02:00
be0dd51e51
Fix mod_http_api_test.exs
2016-05-30 23:06:29 +02:00
fc2b7018cc
More strict check for commands with policy user
2016-05-30 23:06:29 +02:00
17f87eb899
Fix tests
2016-05-30 23:06:29 +02:00
1ade88402c
Better code for setting up ejabberd app location
2016-05-30 23:06:29 +02:00
f252b9d489
Update acl tests to new internal access rules syntax
2016-05-30 14:36:17 +02:00
1d3959b5a2
Make tests run correctly even when ejabberd src in not in ejabberd-xxx dir
2016-05-30 14:35:53 +02:00
e81302dc79
Allow @ inside acl user{,_glob,_regexp} to pass both user and server in single string
2016-05-30 12:30:44 +02:00
9e68c4c0d9
Convert example config to use new syntax for access rules
2016-05-26 11:08:53 +02:00
1981e13326
Allow passing username and ip to ejabberd_comamnds, and use it in mod_http_api
2016-05-26 11:08:53 +02:00
fffae97940
Use acl:access_matches in c2s
2016-05-26 11:08:53 +02:00
49658e1655
New ACL infrastructure
2016-05-26 11:08:53 +02:00
c55319c81e
Do not call transform_terms multiple times on configs when merging them
2016-05-26 11:08:53 +02:00
13ead140f4
Copy lite.sql to place where tests expect it in failback mode
2016-05-26 11:08:53 +02:00
ca329826cb
Retrieve parenthesis for easy reading, lost in old commit 9deb294
2016-05-25 12:44:05 +02:00
14b53fbcb0
Merge pull request #1131 from weiss/failed-resume-h
...
XEP-0198: Indicate number of handled stanzas if resumption fails
2016-05-25 11:56:47 +04:00
b055c2a13a
Merge pull request #1126 from weiss/muc-send-affiliation
...
Notify on MUC affiliation changes of non-occupants
2016-05-25 11:55:06 +04:00
639e9fab4e
Merge pull request #1132 from weiss/publish-options
...
Add support for PubSub publishing options
2016-05-25 07:49:55 +00:00
c958fa2f06
Add support for PubSub publishing options
...
Add code necessary to support publishing options as described in
XEP-0060, #7.1.5. A node plugin that expects publishing options must
add <<"publish-options">> to the features/0 list and then handle the
publishing options handed over to the publish_item/7 call.
Signed-off-by: Christian Ulrich <christian@rechenwerk.net >
2016-05-25 08:40:12 +02:00
30e814dd4b
XEP-0198: Add 'h' attribute to <failed/> element
...
If a resume request is rejected because the session timed out, indicate
the number of handled stanzas as per version 1.5 of XEP-0198.
2016-05-24 22:20:58 +02:00
8c16fdf59f
mod_mam_mnesia: Clarify error message
2016-05-24 07:58:07 +02:00
a2f0e157bc
ejabberd_auth*: Fix indentation
2016-05-24 00:40:25 +02:00
2a9dd548b5
mod_mam_mnesia: Don't exceed table size limit
...
Don't write MAM messages into an Mnesia archive if the size of the table
comes close to the 2 GB limit for tables with disc-only copies. That
way, the table is at least not corrupted when the limit is reached.
2016-05-24 00:25:52 +02:00
3f3ecad981
mod_mam_mnesia: Use transactions when writing
...
Let mod_mam_mnesia use transactions when storing or deleting messages.
If old messages of a user are to be removed, delete the user's archive
and rewrite it from scratch, as that seems to be much faster than
removing individual records with delete_object/1.
Closes #1065 .
2016-05-24 00:08:23 +02:00
70452ba25a
mod_register: Only set timeout on success
...
Don't set the registration timeout if the password was rejected for
being too weak.
2016-05-23 23:27:42 +02:00
1b02c5fbf3
Merge remote-tracking branch 'processone/pr/1122'
...
* processone/pr/1122:
mod_client_state: Add function specifications
mod_client_state: Add "queue_pep" option
mod_client_state: Queue chat state notifications
Move CSI queue handling into mod_client_state
2016-05-20 09:57:07 +02:00
9d87a4a6d4
mod_muc_room: Notify on affiliation changes
...
Notify the current room occupants if the affiliation of a non-occupant
is changed as per example 195 of XEP-0045. In anonymous rooms, only
moderators are notified, though.
2016-05-20 01:28:16 +02:00
f6ba91ff97
mod_roster should probably respect roster item changes introduced with roster_process_item hooks upon pushing
2016-05-19 13:45:42 +03:00
420ae65590
mod_client_state: Add function specifications
...
Add function specifications and apply cosmetic changes to
mod_client_state.
2016-05-18 21:30:38 +02:00
8f72c27b88
mod_client_state: Add "queue_pep" option
...
If the new "queue_pep" option is enabled and the client is inactive, PEP
notifications are throttled in a similar way to presence stanzas and
chat states. Only the most recent notification of a given node and
payload type will be queued from a given contact.
2016-05-17 22:12:04 +02:00
4f009e64fc
mod_client_state: Queue chat state notifications
...
Queue standalone chat states instead of simply dropping them when the
client is inactive. Only the most recent chat state of a given client
is queued.
2016-05-17 20:55:45 +02:00
ba74c1c367
Move CSI queue handling into mod_client_state
...
Let mod_client_state handle the queueing of stanzas, not just their
classification. This simplifies the ejabberd_c2s code and gives
(custom) CSI modules more flexibility.
2016-05-17 19:27:18 +02:00
ba2680df61
Delete duplicated command export_sql, use export2sql instead ( #1118 )
2016-05-16 17:57:57 +02:00
2529acc36c
Send unique stanza id and archived tag also in the message carbons
...
- Change order of the hooks in mod_mam for sending and receiving packets. Messages are archived before a carbon copy is send to the other recourcces.
- Add archived tag and unique stanza id to the outgoing packet to have message carbons with the archive information.
- Add additional hook (in mod_mam) to strip the archive tag for outgoing packets after message carbons have been send.
2016-05-15 20:13:25 +02:00
ff199a323d
Fix jid:from_string/1 function specification
2016-05-15 16:19:13 +02:00
64bb371285
Fix a typo
2016-05-13 18:22:59 +03:00
9bd446e519
Less strict extauth.py
2016-05-13 17:56:52 +03:00
792f47b4bd
Update SQL escaping
2016-05-13 17:56:48 +03:00
be2a9e35ae
Fix C2S session data leak ( #1078 )
2016-05-09 14:18:47 +03:00
068db1a2d9
Handle Redis connection in a separate module
2016-05-09 08:36:30 +03:00
4717d64d7a
mod_client_state: Delete only the configured hooks
2016-05-08 16:45:31 +02:00
f7f40cf9a6
Let client retry HTTP upload on file size mismatch
...
Let the main mod_http_upload process look at the size of an HTTP upload
rather than performing this check in the ejabberd_http handler. This
way, the upload slot won't be invalidated if the size of the uploaded
file doesn't match the size requested for the slot. The PUT request is
still rejected, but the client now has a chance to retry the upload.
2016-05-08 15:36:51 +02:00
bcf07fd032
Avoid error bounces when testing stream management
...
The test suite sends messages to the server JID while checking whether
the stream management code counts outgoing stanzas correctly. We now
set type='headline' for those messages to avoid error bounces.
2016-05-06 16:37:17 +02:00
ff4a0e1808
XEP-0198: Use different error message for bounces
...
When stanzas are bounced from the stream management queue (because the
session timed out or was closed for some other reason), use a different
error message so that this situation can be distinguished from other
cases.
2016-05-06 14:12:22 +02:00
51238bff83
Bounce messages sent to server JID
...
If a message is sent to the server JID (without node part), generate an
error message rather than dropping the message silently.
2016-05-06 13:59:21 +02:00
86d5cf6d6c
Don't require ejabberd to be installed to run "make translations"
2016-05-06 13:47:02 +02:00
b2ffa1db96
Add missed jlib:term_to_expr and jlib:expr_to_term functions
2016-05-05 16:42:48 +03:00
0ea0ba3004
Update more SQL queries
2016-05-05 15:51:58 +03:00
d6700bdc5b
Merge remote-tracking branch 'processone/pr/1088'
...
* processone/pr/1088:
Process messages of unknown type consistently
2016-05-05 00:20:15 +02:00
13c6430341
Add missing odbc->sql in comment from commit 1aae8a9f
2016-05-04 09:11:18 +02:00
12a8d915cd
Merge remote-tracking branch 'processone/pr/1087'
...
* processone/pr/1087:
Return error when blocking last activity request
2016-05-04 00:16:56 +02:00
6cb60aaff5
Cosmetic change: Make variable names consistent
...
Use the same variable names in both mod_mam:select/8 clauses to avoid
confusion.
2016-05-03 19:12:57 +02:00
575ef9c619
Merge remote-tracking branch 'processone/pr/1102'
...
* processone/pr/1102:
Fix ejabberdctl.template duplication
2016-05-03 19:07:11 +02:00
5e5328da4a
Fix ejabberdctl.template duplication
2016-05-03 16:36:20 +02:00
6da07d78b5
Merge remote-tracking branch 'processone/pr/1086'
...
* processone/pr/1086:
Return error when blocking message to offline user
2016-05-02 21:08:06 +02:00
0c0ce17bc0
Add ability to configure server loglevel when running tests
2016-05-02 15:25:30 +02:00
8a6c51290a
Pass noauth when auth isn't provided
2016-05-02 15:07:00 +02:00
671bc4e573
Use MEDIUMTEXT type for muc_room.opts in MySQL schema
2016-05-02 15:06:40 +02:00
07196b6c62
Fix sender in case of explicit pep subscriptions
2016-05-02 15:04:14 +02:00
53e1100cc4
Don't halt program when include_config_file is missing/can't be read
2016-05-02 14:52:23 +02:00
47050db6b8
Don't forget to import mod_opt_type/1 in mod_metrics
2016-05-02 12:18:18 +03:00
d54f211514
Add mod_opt_type/1 callback to gen_mod behaviour
2016-05-01 22:09:40 +02:00
b46ed7044a
Cope with modules that don't export mod_opt_type/1
2016-05-01 22:06:15 +02:00
b202004862
ejabberdctl: Fix path to epmd
2016-05-01 21:29:59 +02:00
8700a3401e
Add tests for MUC MAM
2016-05-01 12:48:23 +03:00
82082f1799
Add behaviour to mod_vcard_xupdate DB modules
2016-05-01 11:03:20 +03:00
3493a87469
Fix typo in mod_mam:select() ( #1098 )
2016-04-30 21:37:18 +03:00
6a10916dda
Let shaper cope with low resolution system clock
...
We no longer rely on getting unique values from clock source, so we need
to handle cope with systems which does not have a microsecond resolution
on system clock (such as MS Windows)
2016-04-29 10:57:34 +02:00
639c2fb640
Add pubsub subscribe/unsubscribe hook
2016-04-28 15:57:55 +02:00
c585f74730
Better formatting of configuration problem log message
2016-04-28 09:03:05 +03:00
d18fe138aa
Update esip and stun to match Fast TLS version
2016-04-27 16:22:47 +02:00
d6f02a51e4
Use fast_tls 1.0.3
2016-04-27 16:18:24 +02:00
9c369b7a8c
Improve detection of databases supported by modules ( #1092 )
2016-04-27 17:10:50 +03:00
d8bb5d9c01
Force ERL_PATH for elixir
2016-04-27 12:32:01 +02:00
26d3a978cc
Update stun and esip dependencies
2016-04-27 12:19:55 +02:00
0f06ed8a9b
Prepare 16.04 release
2016-04-27 11:59:05 +02:00
d1db9f92c4
We now use fast_tls 1.0.2
2016-04-27 11:54:50 +02:00
52fde758b3
Get rid of "internal" DB type. This also fixes #1092
2016-04-27 09:44:32 +03:00
b79aef3bbc
SCRIPT_DIR needed for release
2016-04-25 15:26:23 +02:00
bae24464d3
Remove useless variable and quote EPMD and SPOOL_DIR
2016-04-25 14:26:04 +02:00
ef90a389c1
Fix use of pubsub node plugin when configured with default_node_config
2016-04-25 09:44:46 +02:00
36164d9446
Return error when blocking last activity request
...
As per XEP-0016 and XEP-0191, return a service-unavailable error when an
incoming last activity query was blocked by a privacy list (just as we
do for other IQ requests).
2016-04-25 09:33:47 +02:00
45321fa2e2
Process messages of unknown type consistently
...
If an incoming message sent to an unavailable resource has an unknown
type, handle it like messages of type "normal" (as mandated by RFC 6121,
section 5.2.2). The same is already done for messages of unknown type
sent to the bare JID of an offline user.
2016-04-25 01:13:41 +02:00
65ad70d7dc
Fix error text for message bounces
2016-04-25 00:53:48 +02:00
a37cf33358
Drop headline messages sent to offline resources
...
Don't bounce an error when a message of type "headline" is sent to an
unavailable resource. This is consistent with how headline messages
sent to the bare JID of an offline user are dropped, and it avoids a
presence leak.
2016-04-25 00:02:12 +02:00
58478e52bf
Don't omit bounces for messages of type "result"
2016-04-24 22:47:53 +02:00
cebdfb6523
Return error when blocking message to offline user
...
As per XEP-0016 and XEP-0191, return a service-unavailable error when an
incoming message sent to an offline user was blocked by a privacy list.
The same is done for a message sent to an online user, so this avoids a
presence leak.
2016-04-24 22:00:15 +02:00
b79f09d0eb
Match namespace when checking for chat states
...
When checking for standalone chat states, match the namespace rather
than the names of the elements defined in the current XEP-0085 revision.
2016-04-24 17:16:28 +02:00
beeb1c82d9
Fix check for standalone chat state notifications
...
Ignore whitespace (and other XML CDATA) when checking whether a message
stanza is a standalone chat state notification.
2016-04-24 17:09:56 +02:00
2660dcabba
Merge pull request #931 from cclam0827/dev/mod_ping
...
change mod_ping Timers using maps instead of dict
2016-04-22 13:07:03 +02:00
f0e6def3ed
Set default value for pubsub#itemreply option
2016-04-21 23:47:07 +02:00
8487b51ecd
Fix node ping command
2016-04-21 12:16:21 +02:00
f7d4aae64d
Use UUID for ctl node name ( #1021 )
2016-04-21 12:00:51 +02:00
97e3a33077
Accept commands: add_commands syntax (along commands: - add_commands)
2016-04-21 11:16:36 +02:00
1aae8a9fda
Rename odbc to sql everywhere
2016-04-20 13:25:42 +03:00
fafeeb80c2
Rename ejabberd_sm_odbc -> ejabberd_sm_sql
2016-04-20 09:11:02 +03:00
655c22021b
Fix hometree root check ( #1070 )
2016-04-19 15:18:32 +02:00
382c6ce1fb
Specify type of second terminate/2 parameter
2016-04-19 09:15:09 +02:00
0bdcafdb02
Use erlang 18.3 in travis tests
2016-04-18 14:25:41 +02:00
e5e4f39c01
Remove --auth in ejabberd_ctl.erl as it's useless, still useful for mod_rest
2016-04-15 15:35:57 +02:00
222572bd56
Clean mod_carboncopy.erl from DB specific code
2016-04-15 15:48:56 +03:00
64fdbe7866
Add mod_mam header file
2016-04-15 15:13:38 +03:00
fb0ecf3361
Merge branch 'move-db-code'
2016-04-15 15:12:12 +03:00
52571e8624
Clean mod_mam.erl from DB specific code
2016-04-15 15:11:31 +03:00
901d2e0aed
Clean mod_offline.erl from DB specific code
2016-04-15 13:44:33 +03:00
860db2ddca
Clean mod_blocking.erl from DB specific code
2016-04-14 14:17:20 +03:00
c8c4a41b66
Clean mod_privacy.erl from DB specific code
2016-04-14 14:16:32 +03:00
79d64e0d71
Clean mod_irc.erl from DB specific code
2016-04-14 12:18:04 +03:00
f8e3560ad2
Clean mod_shared_roster.erl from DB specific code
2016-04-14 11:45:43 +03:00
398f1de5ae
Clean mod_roster.erl from DB specific code
2016-04-14 10:58:32 +03:00
0b439a7d5b
Clean mod_muc.erl from DB specific code
2016-04-13 21:07:32 +03:00
ae69f09257
Clean mod_vcard.erl from DB specific code
2016-04-13 17:37:52 +03:00
ef70ce65ab
Clean mod_private.erl from DB specific code
2016-04-13 14:09:34 +03:00
b5d1ce795f
Clean mod_announce.erl from DB specific code
2016-04-13 13:04:04 +03:00
cd094bc903
Clean mod_caps.erl from DB specific code
2016-04-13 11:41:04 +03:00
2d7e03f5e1
Clean mod_vcard_xupdate.erl from DB specific code
2016-04-13 11:06:59 +03:00
b2abc1edb7
Add preliminary tests on ACL module and prepare clean-up / refactor
2016-04-13 09:45:56 +02:00
7fd4808cde
Clean mod_last.erl from DB specific code
2016-04-13 09:59:39 +03:00
5eef8a8bcf
Make it possible to get DB backend of a module
2016-04-13 09:56:10 +03:00
cd2e2b1a88
Synchronizing master changes
2016-04-12 10:34:24 +02:00
5958a91428
Fix typo in error message
2016-04-12 10:27:43 +02:00
15d184a909
Disable TLS compression for s2s by default
...
TLS compression is not recommended, and it's already disabled by default
for c2s connections and for ejabberd_http.
2016-04-11 22:50:11 +02:00
8c8a6869be
process2/2 is needed by mod_rest to provide its own AccessCommands
...
See processone/ejabberd-contrib#161
2016-04-11 17:21:44 +02:00
695592a38c
Update check_password tests are the command now is fixed
2016-04-11 13:39:35 +02:00
bd3b7cd2df
Merge pull request #1064 from sezuan/fix_check_password
...
Fix check_password
2016-04-11 13:38:22 +02:00
b67dc00db2
Fix check_password
2016-04-10 15:37:36 +02:00
127342449e
Allow testing user pattern directly in access rules
2016-04-08 19:45:25 +02:00
b4739396ec
Switch to varchar(64) in mysql user.server/salt as text can't have default values
2016-04-08 17:50:59 +02:00
1dbdd58b1b
Add TODO to improve ACL
2016-04-08 12:55:35 +02:00
c5dbdfc71a
'serverkey' and 'salt' should have empty string as default
2016-04-08 13:02:08 +03:00
86dfbe6ece
Make sure that ejabberd_sm sid are unique
2016-04-08 10:52:29 +02:00
b83ec483e9
Send stream trailer at the very end
2016-04-08 11:49:50 +03:00
afd3accf75
Generate shorted jid for anonymous connections
2016-04-07 16:47:30 +02:00
0935f493ee
Add tests for anonymous and digest-md5 auth
2016-04-07 16:47:01 +02:00
373f9fb0eb
Add tests on Access rules returning values
2016-04-07 13:04:58 +02:00
60c0c8e968
Add test when mixing ip / user rules
2016-04-07 12:35:29 +02:00
18557fa3d6
Start of tests for cyrsasl module
2016-04-07 12:28:19 +02:00
a938af4180
IP based ACL / Access rules and sequential evaluation of rules
2016-04-07 12:06:30 +02:00
d5c29360fb
Fix anonymous auth
2016-04-07 10:02:37 +02:00
48a1d818d6
Rebase master
2016-04-06 18:14:47 +02:00
eb36440c2e
Variant for user ACL test
2016-04-06 18:13:08 +02:00
47039aed15
Allow clearing all ACL and access rules
2016-04-06 18:13:08 +02:00
d45ad3e3a5
Add initial basic ACL test
2016-04-06 18:13:08 +02:00
5ad8c790c7
Export add_access/3 to allow setting ACL outside of yaml config file
2016-04-06 18:13:08 +02:00
5efcf0a175
Stringprep can already be started, do not check result
2016-04-06 18:11:46 +02:00
0916694e0e
Merge branch 'master' of github.com:processone/ejabberd
2016-04-06 17:56:01 +02:00
2900aa208f
Log Elixir test result for investigation and include this log file in travis for troubleshooting failed tests
2016-04-06 17:55:56 +02:00
27b4217a9d
Tweak srg_get_info result formatting ( #1048 )
2016-04-06 17:55:19 +02:00
a9e50468b6
Better error message in logs
2016-04-06 15:07:44 +02:00
abf768274a
Fix error message paramater formatting
2016-04-06 15:05:19 +02:00
f78b170c24
Add initial basic ACL test
2016-04-06 13:59:33 +02:00
991529a657
Export add_access/3 to allow setting ACL outside of yaml config file
2016-04-06 13:59:06 +02:00
b2279d481d
Merge branch 'master' of github.com:processone/ejabberd
2016-04-06 13:57:12 +02:00
267fdb2e95
Now we need to start stringprep before config
2016-04-06 13:51:05 +02:00
d9f1061b8a
Merge pull request #1051 from genric/patch-1
...
Fix mod_muc_admin:set_room_affiliation options persistence
2016-04-06 13:44:12 +02:00
dd654fa794
Merge pull request #1052 from genric/patch-2
...
Fix mod_muc_admin:get_room_options
2016-04-06 13:25:46 +02:00
1b9b5f8e6a
Merge branch 'master' of github.com:processone/ejabberd
2016-04-06 12:59:58 +02:00
67b9b82261
We need to set hosts in options to be able to retrieve 'MYHOSTS'
2016-04-06 12:59:27 +02:00
2eee2de6e2
Merge pull request #1054 from richp10/master
...
upgrade stringprep to 1.03
2016-04-06 12:05:26 +02:00
acc11195f8
upgrade stringprep to 1.03
2016-04-06 08:40:10 +00:00
be7f65da05
Fix mod_muc_admin:get_room_options
...
Fix mod_muc_admin:get_room_options to match the ejabberd_commands result spec.
2016-04-05 14:13:28 +02:00
232915184c
Merge branch 'add-error-reason'
2016-04-05 13:10:09 +03:00
9ac6e4edf7
Replace more ?ERR_* macros with ?ERRT_*
2016-04-05 13:09:44 +03:00
490aa2c6a6
Fix mod_muc_admin:set_room_affiliation
...
Add missing options so they are stored when set_room_affiliation is invoked, instead of being ignored and set to default values after muc restart.
2016-04-04 14:02:34 +02:00
ca9ac019eb
Merge pull request #1046 from processone/commands-update
...
Add support for versioning in ejabberd commands
2016-04-01 14:24:08 +02:00
e24da5789e
Apply fixes and remove tests for missing methods
2016-04-01 13:05:41 +02:00
47266de6d7
Do not use underscore variable
2016-04-01 12:24:49 +02:00
f243c30847
Rollback mod_admin_extra
2016-04-01 12:24:00 +02:00
2a2a47b5c6
Fix merge issues
2016-04-01 12:12:19 +02:00
b5f1479763
Fix tests, they are now running fine locally
2016-04-01 11:13:48 +02:00
a8f92ae767
Add logger macro to help troubleshooting Elixir tests
2016-04-01 11:11:42 +02:00
97d345d287
Port mod_admin_extra test to work with new API
2016-03-31 22:01:57 +02:00
ef2e2e45b3
Fix failing tests
2016-03-31 17:34:58 +02:00
3290a5ff15
Force protobuffs version to be able to use new meck release
2016-03-31 16:05:18 +02:00
7988e2e350
Merge lastest commits from master
2016-03-31 15:37:21 +02:00
dc0ca51ef1
Try keeping names of test same as master to limit merge conflicts
2016-03-31 15:06:41 +02:00
78c4a0d65f
Add test file whose name was conflicting during merge
2016-03-31 14:42:08 +02:00
91233eafaa
Use version of moka that do not depend on proper
2016-03-31 14:36:30 +02:00
da0751239c
Rename conflicting test file after merge
2016-03-31 14:33:34 +02:00
3dc55c6d47
Commands refactor, first pass.
...
- add API versionning
- changed error handling, based on exception
- commands moved/merged from mod_admin_p1 to mod_admin_extra
- command bufixes
- add some elixir unit test cases
Squashed commit of the following:
commit dd59855b3486f78a9349756e4f102e79b3accff8
Merge: 14e8ffc 506e08e
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Fri Oct 30 11:43:18 2015 +0100
Merge branch '3.2.x' into api
commit 14e8ffce78cbea6c8605371d1fc50a0c1d1e012c
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Tue Oct 27 16:35:17 2015 +0100
Added OAuth tests to ejabberd_commands
commit f81c550c14628edfe4861c228576cb767924366a
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Tue Oct 27 16:34:55 2015 +0100
Added some mod_http_api tests
commit 6a64578d5b2ba532a2feb6503ed98561e56d5d53
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Mon Oct 26 15:29:36 2015 +0100
Fix get_last command test
Previous version won't work with dst.
commit 27e0cde9e9c1f001effe68f8424a365ad947c068
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Fri Oct 23 17:59:34 2015 +0200
Add tests on admin command policy
commit 19dad8d54f54c9fabd454280483cccfb06c8e78a
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Fri Oct 23 16:49:36 2015 +0200
Added command related tests (http api & user policy)
commit e0e596ab4a3f3a70aba5f374f028939ab794de33
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Fri Oct 23 16:49:16 2015 +0200
Fix command call.
commit 128cd7d1ede3c47a34f8ec3a750c980ccad2c61d
Merge: 60c4c4c 447313c
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Thu Oct 22 14:48:39 2015 +0200
Merge branch '3.2.x' into api
commit 60c4c4c0751302524c14219c6bc8c56a6069a689
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Thu Oct 22 14:45:57 2015 +0200
Fix ejabberd_commands spec.
commit 8e145c28c5da762c2b93ee32327eff1db94ebfed
Merge: 397273a f13dc94
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Wed Oct 21 18:26:07 2015 +0200
Merge branch '3.2.x' into api
commit 397273a23ed415feac87aed33da6452229793387
Merge: c30e89b f289e27
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Wed Oct 21 15:27:45 2015 +0200
Merge branch '3.2.x' into api
commit c30e89bb8a0013bff37e61e4c6953350c9c1f313
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Wed Oct 21 12:47:02 2015 +0200
Merge mod_http_api
commit 7b0db22b4acd48ff6fabce41c1b2525e6580a3c5
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Fri Oct 16 11:55:48 2015 +0200
Fix exunit tests to run with common_test suites
commit d8b1a89800ac7379a57a7eb4a09c3c93c3e1e5eb
Merge: 2879ae8 63455b3
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Thu Oct 15 11:39:45 2015 +0200
Merge branch '3.2.x' into api
commit 2879ae87ff3eee369ef3d780136b96ecff5285d1
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Wed Oct 14 14:53:44 2015 +0200
Fix update_roster command.
commit a1d453dd7a3afda9861a8d747494a45057ad574b
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Tue Oct 13 16:14:28 2015 +0200
API commands refactor
Moving and/or merging commands from mod_admin_p1 to mod_admin_extra
commit b709ed26b0fc0ca4f3bdd5a59fa58ec7e3db97fa
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Wed Oct 7 15:10:01 2015 +0200
Add tests on commands
commit 6711687bee9c672cb3d5aed0744e13420ecf6dbd
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Tue Sep 29 15:58:16 2015 +0200
Add ejabberd_commands tests
commit df8682f419cf3877e77e36a19bca0fc55dc991f8
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Mon Sep 28 14:54:39 2015 +0200
Added API versioning for ejabberdctl and rest commands
commit cd017b0e3aac431bc3ee807ceb7f8641e1523ef5
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Fri Sep 18 11:21:45 2015 +0200
Better error handling of HTTP API commands.
commit ca5cb6acd8e4643f9d6c484d2277b0d7e88471e5
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Tue Sep 15 15:03:05 2015 +0200
add commands to mod_admin_extra:
- get_offline_count
- get_presence
- change_password
commit 7f583fa099e30ac2b0915669fd8f102ac565b833
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Tue Sep 15 15:02:16 2015 +0200
Improve REST API error handling
commit 14753b1c02cdce434a786b7f80f6c09f0d210075
Author: Jerome Sautret <jerome.sautret@process-one.net >
Date: Mon Sep 14 10:51:17 2015 +0200
Change REST API return codes for integer type.
2016-03-31 14:53:31 +03:00
d35c5ebde5
Test / Document ejabberd_commands checks
2016-03-31 13:14:06 +02:00
3cfcdbb245
Check that various type of commands are properly rejected without auth
2016-03-31 12:38:53 +02:00
7c2998a55d
Merge pull request #1044 from processone/http-api
...
Add ability to call open ejabberd commands through ReST API
2016-03-31 11:37:14 +02:00
fced8dc3d9
Replace some ?ERR_* macros with ?ERRT_*
2016-03-31 11:00:29 +03:00
c00cfca8e7
mix version updated for 16.03 release
2016-03-30 19:21:12 +02:00
3c480a5b0b
Fix Dialyzer inconsistency
2016-03-30 16:47:40 +02:00
b160bd7ac1
Provide authzid in scream response
2016-03-30 16:08:04 +02:00
809057678b
Better error report when command is not exposed through API
2016-03-30 15:59:29 +02:00
36ac1cd6c7
Returns unauthorized error when we do not have correct credentials
2016-03-30 14:49:19 +02:00
ead83b008c
HTTP ReST API now supports 'open' ejabberd commands
2016-03-30 14:23:09 +02:00
6f25122f8c
Support flagging so Elixir tests as pending
2016-03-30 13:59:01 +02:00
bf79f223df
Travis CI: Cosmetic changes to Riak setup commands
2016-03-30 01:15:12 +02:00
e58b62f737
Travis CI: Revert to checking for skipped tests
...
Now that the issues with running Riak on Travis are solved, we can check
for skipped test cases again.
2016-03-30 01:02:27 +02:00
82cf7f7ca8
Adds support for option admin_ip_access on mod_http_api
...
This allows granting access to admin commands to backend, by using IP address restrictions.
(Pawel Chmielowski)
2016-03-29 19:40:20 +02:00
6d7891ed16
Merge branch 'master' of github.com:processone/ejabberd
2016-03-29 15:45:57 +02:00
c7c70ffa0a
Add basic test for command registration
2016-03-29 15:45:48 +02:00
78a44d8099
Move start and stop_modules/0 from ejabberd_app to gen_mod ( #1039 )
2016-03-29 15:26:34 +02:00
b49a615e21
Fix commands api option
2016-03-29 13:19:16 +02:00
3b2d0fd24a
Fix commands access check.
...
Fixes ECS-20
2016-03-29 13:06:13 +02:00
aa15148898
Fix commands access check.
2016-03-29 13:05:12 +02:00
3809b898aa
Pass noauth when auth isn't provided, reverts a1129dc ( processone/ejabberd-contrib#159 )
2016-03-29 12:51:26 +02:00
e386bf6b58
In SQL files create Users table with SCRAM support by default ( #956 )
2016-03-29 12:37:49 +02:00
221d8e0e5d
Merge branch 'master' of github.com:processone/ejabberd
2016-03-29 11:21:58 +02:00
53d12caa56
Fix log printout
...
Log is not only called for admin commands. It is call for all commands call.
2016-03-29 11:21:53 +02:00
b0ef3e66a8
Update MSSQL schema
2016-03-29 11:53:13 +03:00
7a9e93839a
Fix some LIMIT related problems with MSSQL
2016-03-29 11:34:00 +03:00
54ddc990c2
Use new fast_yaml
2016-03-29 09:21:24 +02:00
4afe0b195c
Merge pull request #1036 from processone/shared-roster-ldap
...
Fix issue getting shared roster
2016-03-25 19:36:10 +01:00
494e638f03
Merge pull request #1024 from rbarlow/luerl_release
...
Use the v0.2 release of luerl instead of a commit.
2016-03-25 21:29:19 +04:00
915ccbbdfb
Merge pull request #684 from wcy123/master
...
bug fix: ejabberd:start_app need to pass Type to application:start
2016-03-25 21:00:35 +04:00
381065397f
Fix issue getting shared roster
...
I rollbacked to correct version and slightly refactored the code
2016-03-25 17:44:12 +01:00
a08ecc0f41
Proper naming for LDAP test function for shared roster
2016-03-25 17:42:58 +01:00
eace5fc463
Switch back to proper log level
2016-03-25 17:42:19 +01:00
0afcf561d6
Add test to demonstrate issue to retrieve roster with mod_shared_roster_ldap
2016-03-25 17:30:12 +01:00
46568fb959
Merge commit 'refs/pull/524/head' of github.com:processone/ejabberd into sasl-api-change
2016-03-25 18:16:50 +03:00
c7cf95ba99
Merge pull request #1035 from processone/modular-tests-run
...
Allow running test groups independently
2016-03-24 15:46:51 +01:00
914578a85e
Fix start via systemd ( #978 )
2016-03-24 11:06:42 +01:00
df4c551f06
Specify lacking nodename (thanks to hamano)( #1020 )
2016-03-24 10:21:51 +01:00
a3a33bd5fc
Allow running test groups independently
...
We need to be able to run only a few test groups, even if we do not have all
database backends installed and configured locally.
ejabberd test suite configures a specific host per backend. I changed ejabberd
to allow ignoring some hosts from config file on start, by providing the exact
list of hosts we want to start.
This is done by setting an ejabberd app Erlang environment variable 'hosts' and
passing the list of hosts we want to actually define.
When doing so, the backend specific hosts defined in ejabberd test configuration file
are simply ignored. As a result, we do not try to connect to unavailable backends.
I linked that part to CT run test by defining the hosts list based on environment variable
CT_BACKENDS. This variable is expected to be a comma separated list of available backends.
When Erlang Common Tests are run with that environment variable set, only the host matching
the name of the backend will be set, plus the default "localhost", common to many tests.
This can be combined with rebar ct groups list.
Example commands to run tests:
CT_BACKENDS=riak,mnesia rebar ct suites=ejabberd
CT_BACKENDS=mnesia rebar ct suites=ejabberd groups=mnesia
2016-03-24 10:02:13 +01:00
7066338948
Enable Riak test suite on Travis-CI
2016-03-23 16:16:50 +01:00
cb27a3540e
Fix is_connected/0 function
2016-03-22 20:01:23 +03:00
61e914a83f
Keep alive Riak connections by default
2016-03-22 19:32:30 +03:00
b90c3764c0
Fix a typo in travis.yml
2016-03-22 19:05:38 +03:00
bdce5556bd
Tell Travis not to fail if some tests are skipped
2016-03-22 19:03:06 +03:00
57f7b34b90
Do not auto append IP suffix to usernames ( #1008 )
2016-03-22 13:25:34 +03:00
f8cf1aef91
Disable Riak test on Travis as they are too unpredictable on Travis
...
For now, we are running them on local Jenkins
2016-03-21 19:43:59 +01:00
e7ef65a22d
Improve ban_account command to work with other DBs than Mnesia ( #977 )
2016-03-21 18:30:05 +01:00
107569a17d
New command delete_mnesia deletes all tables that can be exported
2016-03-21 16:19:06 +01:00
0112135096
Elixir test suite is already run with global CT run command
2016-03-21 14:12:00 +01:00
4be9cc1b6d
Merge pull request #1029 from processone/coveralls
...
Add support for test code coverage
2016-03-21 12:45:02 +01:00
95475966fd
We do not have C code to cover, they are in dependencies.
2016-03-21 12:15:07 +01:00
ef04dd75aa
Add Coveralls support
2016-03-21 12:01:20 +01:00
3441157a38
Use static key for mysql repo
2016-03-21 11:02:32 +01:00
c98df3c0da
Attempting to use other keyserver, as we see failure from Travis fetching
2016-03-21 10:06:07 +01:00
c924cd42ff
Run basic Elixir unit tests
2016-03-21 09:45:40 +01:00
31c194a682
Add simple Elixir unit test on jid:from_string
2016-03-21 09:44:23 +01:00
5b7dc0c215
Merge branch 'master' of github.com:processone/ejabberd
2016-03-21 09:43:14 +01:00
0e3026539e
Comment on error failures in logs + indenting
2016-03-21 09:42:59 +01:00
dc7b2c45c2
Fix indentation of mod_register in default configuration file
2016-03-19 17:42:12 +01:00
cf9ef456b7
Merge pull request #1022 from hamano/riak_auth
...
riak authentication support
2016-03-18 23:10:37 +04:00
7b5825a205
Use the v0.2 release of luerl instead of a commit.
...
The luerl project has made a tag for v0.2, which should be usable
by ejabberd. Discussion about the v0.2 release is here:
https://github.com/rvirding/luerl/issues/60
2016-03-18 14:22:59 -04:00
2d103b4ae1
support riak authentication
2016-03-19 01:41:14 +09:00
939bb244e1
Extend scope of ejabberdctl ping
2016-03-18 11:08:30 +01:00
f19a54e9a1
Escape quoting node name for ejabberdctl ping
2016-03-18 10:22:11 +01:00
ef02053a9d
Fix issue #1015
2016-03-17 18:41:39 +01:00
d9bb3730b7
Merge pull request #926 from lpil/fix/remove-empty-mod
...
Remove empty and unused module
2016-03-16 18:28:01 +01:00
7b72247b2c
Don't use jlib:jid_remove_resource
2016-03-16 13:32:19 +01:00
34bc698526
Merge pull request #1011 from oxoWrk/master
...
Bare JID in 'from' of Roster Push (RFC 6121 section 2.1.6) in mod_adm…
2016-03-16 11:37:25 +01:00
efbaba5d04
Make auto generated resources shorter
2016-03-16 11:30:45 +01:00
c985a2bd3d
Start ezlib only if required, as it's optional ( #1006 )
2016-03-16 11:11:43 +01:00
74053b114e
When building Elixir inside ejabberd, rely on version 1.1 for Erlang R17 compliance
2016-03-16 09:01:40 +01:00
b40154f8f4
Update OTP release to use and drop release 17.1
...
Attempt to build with Elixir
2016-03-16 08:55:25 +01:00
3c2cd91fb1
Merge branch 'master' of github.com:processone/ejabberd
2016-03-15 22:42:15 +01:00
367adc2113
Better error reporting when running Elixir test suite
2016-03-15 22:42:07 +01:00
5b5548b8ca
Produce less verbose logs for tests on travis
2016-03-15 18:14:27 +01:00
058b3d96bf
Bare JID in 'from' of Roster Push (RFC 6121 section 2.1.6) in mod_admin_extra
2016-03-15 10:57:56 +05:00
68675effac
Apply cosmetic changes to GitHub templates
2016-03-15 00:12:01 +01:00
3fef1a4435
Merge pull request #991 from suchatorg/patch-1
...
Update Galician (galego) translations
2016-03-14 17:08:30 +01:00
7f25c3b3e8
Update gl.po
2016-03-14 16:52:16 +01:00
dcefb6bbe3
Merge pull request #980 from sharewax/EJAB-1480
...
EJAB-1480: fix issue with retreiving user roster
2016-03-14 17:49:01 +03:00
5351e8236d
Fix Addresses element which lacked others local destinations
...
When sending single packet, in addresses include all other group
destinations, not only oneself
2016-03-14 12:53:14 +01:00
9440049208
Update gl.po
2016-03-14 12:47:52 +01:00
b871fbba1b
Fix result type of "connected_users_info" command
...
Closes #1002 .
2016-03-14 00:51:12 +01:00
91573a8e82
Don't store watchdog notifications in MAM archives
2016-03-14 00:05:50 +01:00
55c567ff00
Unregister route at the very end
2016-03-13 17:37:39 +03:00
5a4b7817df
Add ODBC backend for MIX
2016-03-13 15:38:50 +03:00
50e5cdc2fa
Add ODBC tests for MIX
2016-03-13 13:16:55 +03:00
5045fb584d
Define pubsub node configuration per route/host explicitly
2016-03-13 13:16:43 +03:00
357e48fb6b
Make it possible to get virtual host of a registered route
2016-03-13 11:38:40 +03:00
9ceeaf213b
Provide guidance for issue reporting and pull requests on Github
2016-03-12 17:54:23 +01:00
9297782868
Fix config fetch after host/serverhost cleanup
2016-03-11 17:25:46 +01:00
0d1edc4771
Don't enable in-band registration by default
2016-03-11 12:31:16 +01:00
1336c6c9fa
Merge pull request #997 from tnull/fix_auth_method_order
...
Minimal auth_method ordering fix during configuration merge.
2016-03-11 11:37:50 +01:00
8b03c0a385
Minimal auth_method ordering fix
2016-03-10 17:52:55 +01:00
15ee72138a
Add tests for MIX
2016-03-10 17:42:37 +03:00
92a0181932
Lager to Elixir Logger bridge is now compliant with ejabberd loglevel set / get
...
This should fix #966
2016-03-09 22:30:46 +01:00
035c63fd2a
Fix call to lager_util:is_loggable/3
2016-03-09 21:03:06 +01:00
9e6efaf9bc
Use p1_time_compat util for generating timestamp
2016-03-09 20:57:01 +01:00
f4ee8a2505
Add Elixir Logger Backend to bridge logs from lager
...
We will need to support loglevel bridging.
It should help with #966
2016-03-09 19:12:56 +01:00
842d52352a
Fix escaping of argument in iexlive and iexdebug
2016-03-09 14:26:28 +01:00
e31799a3b1
Define mod_opt_type/1 callback
2016-03-09 11:19:15 +03:00
1860801e36
Unregister hooks and iq handlers on terminate
2016-03-09 11:14:45 +03:00
ae4fa22180
mod_http_upload: Add XEP-0363 v0.2 support
...
Include the maximum file size in the service discovery information, as
specified by XEP-0363, version 0.2.
2016-03-09 00:27:06 +01:00
b5121a346d
Experimental MIX (XEP-0369) support
2016-03-08 20:04:29 +03:00
b6289d646f
Update gl.po
2016-03-08 01:21:37 +01:00
c065a2c5b9
Update gl.po
2016-03-07 22:26:46 +01:00
6e40573c13
Merge pull request #989 from galambalazs/patch-1
...
fix syntax highlighting by keeping "~s" together
2016-03-07 19:06:59 +01:00
eb0890284a
Merge pull request #988 from tnull/edoc_fix
...
Fixed type specifications for 'rebar doc'
2016-03-07 18:44:05 +01:00
16c1b9a5c2
Fix format_result also in xmlrpc, after aa5caa3 ( #982 )
2016-03-07 17:34:08 +01:00
83accedded
fix syntax highlighting by keeping "~s" together
2016-03-07 16:06:18 +01:00
8e6a301026
Fixed type specifications for 'rebar doc'
...
- Fixed type @specs and -specs to remove 'rebar doc' errors
- Removed a lot of wrong and deprecated documentation in ejabberd_piefxis.erl
2016-03-07 15:06:19 +01:00
4013629e5d
EJAB-1480: fix issue with retreiving user roster
2016-03-04 15:52:38 +03:00
6e14a47316
Define opt_type required be ejabberd_config behaviour.
2016-03-04 11:45:18 +01:00
304afd75ac
Compile ejabberd_config early to stop undefined behaviour warnings
2016-03-04 11:32:34 +01:00
9c3d57e63e
Mark get_queue_length obsolete, and use count_offline_messages ( #970 )
2016-03-04 11:09:14 +01:00
44978ce978
ext_mod: switch to fast_xml and remove old p1_logger reference
2016-03-03 15:46:15 +01:00
10d6c330a5
Fix pubsub disco after host/serverhost cleanup
2016-03-03 14:52:03 +01:00
e95cf420a2
Enable flexible offline on disco#info as well
2016-03-03 14:10:40 +03:00
3ecd7e850c
Use Elixir v1.2.3
2016-03-03 10:36:13 +01:00
fee5873310
Minor format cleanup
2016-03-03 10:34:45 +01:00
96b09c587d
Use upcoming version of ejabberd with Elixir 1.2
2016-03-02 13:35:35 +01:00
79853ad44f
Missed a few calls in previous commits
2016-03-02 02:00:02 +03:00
9a049442ff
Raise an error when there are no fields to set in ?SQL_UPSERT
2016-03-02 00:12:49 +03:00
e21f25f5b9
Update more SQL queries
2016-03-02 00:12:49 +03:00
1f9fd25ff8
Update more SQL queries
2016-03-02 00:12:49 +03:00
968576d4f2
Update p1_pgsql tag
2016-03-02 00:12:49 +03:00
d8fbe8a289
Update more SQL queries
2016-03-02 00:12:49 +03:00
6d7ce0237a
Update mod_last SQL queries to the new API
2016-03-02 00:12:49 +03:00
2d042f078e
New parse transform for ?SQL_UPSERT and ?SQL_UPSERT_T
2016-03-02 00:12:49 +03:00
3d8219d8f9
Update mod_roster and ejabberd_auth_odbc SQL queries to the new API
2016-03-02 00:12:49 +03:00
7f3bffe821
Allow balanced expressions inside @(...) in ejabberd_sql_pt
2016-03-02 00:12:49 +03:00
99255631dd
Updated some mod_offline SQL queries to the new API
2016-03-02 00:12:11 +03:00
ba35c1ed9d
Use 'any' to match any DBMS in sql_query
2016-03-01 22:50:20 +03:00
437e768e4a
Better error handling in ejabberd_sql_pt
2016-03-01 22:50:07 +03:00
c58a4be6ee
Support for run-time SQL queries selection depending on DBMS version
2016-03-01 22:49:56 +03:00
6374ef4866
New parse transform for SQL queries, use prepare/execute calls with Postgres
2016-03-01 22:48:30 +03:00
eeac7f9b02
Update ejabberd version for hex.pm release
2016-02-29 17:51:06 +01:00
8c49d1e1af
Disable back undefined_function_calls xref check
2016-02-29 14:56:28 +01:00
382c7c21ad
Do not call to deprected/undefined functions from mod_shared_roster_ldap
2016-02-29 16:35:45 +03:00
59fe967ebb
Enable undefined_function_calls xref option
2016-02-29 13:51:59 +01:00
6d8c7232d8
mod_register_web: Choose the right error messages
2016-02-29 00:39:57 +01:00
6b126171da
Improve LDAP shared roster support (EJAB-1480)
2016-02-26 17:27:12 +03:00
56523784e1
Implementation of pubsub#itemreply (EJAB-1347)( #928 )
2016-02-26 10:32:03 +01:00
1c6d20924b
Fix host/serverhost usage ( #902 )
2016-02-26 09:33:07 +01:00
ebaf750a9b
Fix for #935
2016-02-25 18:56:43 +01:00
217ba09408
Add extra items to .gitignore
2016-02-25 12:23:23 +01:00
24617b5e25
Split long lines
2016-02-25 12:23:23 +01:00
d9ec923357
Elixir want {src_dirs, ["include"]} on top of a config
2016-02-25 12:23:23 +01:00
a9de13c5d9
Don't include empty line after java example
2016-02-25 12:14:17 +01:00
2c856c71f6
Update translated files, as there wee many improvements
2016-02-24 12:34:53 +01:00
576c10ee3a
Make caps warning less confusing ( #955 )
2016-02-23 14:14:24 +01:00
44f581c3b5
mod_http_upload: Also expand @HOST@ in 'docroot'
...
In some environments, it might be desirable to use separate document
roots for each virtual host.
2016-02-20 20:13:30 +01:00
b971449f12
mod_http_upload: Expand 'docroot' before using it
...
Expand the @HOME@ keyword within the 'docroot' value before setting the
permissions of the document root directory.
2016-02-20 18:21:38 +01:00
9db9cbd814
Merge pull request #961 from weiss/compression-after-sasl
...
Accept stream compression request after SASL
2016-02-19 21:02:26 +03:00
5b4aefbacd
Accept stream compression request after SASL
...
This is an updated version of the patch submitted to EJAB-1382 by
Alexey (thanks!).
2016-02-19 18:53:28 +01:00
8f9c18edf2
Add Redis backend to the test suite
2016-02-19 17:06:41 +03:00
4b0860e7de
Make it possible to define 'sm_db_type' per virtual host
2016-02-19 16:38:43 +03:00
eece6e69cb
Fix format_result so get_room_options command works again after aa5caa3
2016-02-17 20:43:35 +01:00
d40a091eda
Another fix for \n in ejabberdctl arguments
2016-02-15 15:21:27 +01:00
c9c59f00ad
Merge pull request #953 from cdroege/fix_css
...
Fix the color of links in tables in web admin
2016-02-15 12:52:54 +01:00
47a67c7320
Allow to pass \n in argument to ejabberdctl
2016-02-12 23:38:39 +01:00
c579313821
Fix the color of links in tables in web admin
2016-02-12 18:45:45 +01:00
06f2237132
Merge pull request #951 from rodrigues/master
...
Update Portuguese (Brazil) translations
2016-02-12 13:16:46 +01:00
4f7f66fae8
Update Portuguese (Brazil) translations
2016-02-11 23:16:41 +01:00
eaaab45c14
mod_muc_room: Let members see admin/owner JIDs
...
Let members retrieve all affiliation lists in non-anonymous rooms, not
just the list of members.
2016-02-11 22:52:27 +01:00
041e886b87
mod_muc_room: Don't expose JIDs in anonymous rooms
...
Don't let room members retrieve the member list unless the room is
non-anonymous.
2016-02-11 22:24:14 +01:00
3908c9710c
Travis CI: Make sure Riak finds callback module
...
Riak calls back into ejabberd_riak during MapReduce.
2016-02-11 21:53:36 +01:00
5680d4c3e9
Get rid of calls to jlib.erl from tests
2016-02-11 12:19:23 +03:00
8e6adb4b3c
Do not forget sending initial presence in XEP-0013 test
2016-02-11 11:53:33 +03:00
17be70339c
mod_mam: Send new preferences when they are set
...
If a client updates the archiving preferences, include the new
preferences with the IQ result (as mandated by XEP-0313).
2016-02-10 23:06:31 +01:00
d6323a7b5e
Add tests for XEP-0013
2016-02-10 16:15:43 +03:00
02a519a11e
Mention new XEP support
2016-02-08 21:35:46 +01:00
1de085ec23
Prepare room JID in create_room command
2016-02-08 21:35:26 +01:00
217b6da5fd
Fix example value for rescode return type
2016-02-09 16:44:57 +01:00
d5b3e6af00
More documentation of arguments in mod_admin_extra
2016-02-09 16:33:32 +01:00
4839ba5ae4
XEP-0013: Flexible Offline Message Retrieval support
2016-02-09 17:59:54 +03:00
2bca8d5121
Remove remanants of pre-binary strings
2016-02-09 15:50:35 +01:00
583476380a
Use muc_online_room record for pattern matching
2016-02-09 15:33:00 +01:00
c0da9b43ce
Better presentation of result description in docs
2016-02-09 13:18:01 +01:00
30d171e79e
Start documenting arguments in mod_admin_extra commands
2016-02-09 13:03:40 +01:00
d36c351fc7
Typo in markdown generator
2016-02-09 13:03:40 +01:00
10ed4a1c85
Add most status codes only to initial MUC presence
2016-02-08 20:10:20 +01:00
04a315eb52
Fix section links to the Guide in the WebAdmin
2016-02-08 16:16:53 +01:00
cf2f80bd09
Merge pull request #944 from cdroege/configureable_host-mod_register_web
...
Allow to modify host when deleting account or changing password over web
2016-02-08 13:48:11 +01:00
ebd5ee36d9
Merge pull request #945 from nikolauspolak/master
...
Update German translation
2016-02-08 13:41:48 +01:00
2bfb619d19
Merge pull request #914 from weiss/mam-expose-jid
...
Expose occupant JID in MUC MAM messages whenever possible
2016-02-08 14:23:19 +03:00
6af9aa3de8
Add link to ProcessOne site
2016-02-08 11:50:04 +01:00
3af055fabe
Link to Hex.pm
2016-02-08 11:34:52 +01:00
ed30bd64cd
Preparing to release beta package on hex.pm
2016-02-08 10:54:05 +01:00
0b1620a45c
Remove compile warnings
2016-02-08 10:50:28 +01:00
bf49c292f8
Omit redundant check for overcrowded MUC room
...
The send_update_presence/4 function already checked whether the room is
overcrowded before calling send_update_presence1/4, so there's no need
to have send_new_presence/4 perform the same check.
2016-02-08 00:46:33 +01:00
8098f7d9a8
mod_mam: Don't let outcasts access MUC archive
...
XEP-0313 says: "A MUC archive MUST check that the user requesting the
archive has the right to enter it at the time of the query [...]. In
the case of open MUC rooms, the MUC archives can generally be accessed
by any users [...] who do not have an affiliation of 'outcast'".
2016-02-08 00:16:02 +01:00
a31f59ea31
XEP-0198: Fix session timeout corner case
...
If the "resend_on_timeout" option is set to 'if_offline' and a pending
stream management session is terminated because a new session is opened
by the same resource (while no other resource is online), resend
unacknowledged messages rather than bouncing error messages.
2016-02-06 22:28:55 +01:00
f44bf00e0d
Update German translation
2016-02-06 09:25:39 +01:00
7435ee464f
Rename option to regexp_room_id for consistency with other options ( #905 )
2016-02-05 12:09:27 +01:00
268f0b30ec
add room_id_regexp option
2016-02-05 12:09:18 +01:00
30388fa2bf
Allow to modify host when deleting account or changing password over web
2016-02-04 21:31:16 +01:00
942072cf9d
Make hibernate timeouts configurable
...
Two *global* options added:
c2s_hibernate and receiver_hibernate.
Default if not specified is 90000, the previous hardcoded value.
2016-02-04 15:45:29 -03:00
e207d0af56
Merge pull request #943 from processone/deps-cleanup
...
Dependencies rework
2016-02-04 15:48:56 +01:00
89dda473cf
Convert tests to Fast XML
2016-02-03 19:22:59 +01:00
dfc29ea03c
Switch to Fast XML module
2016-02-03 19:03:17 +01:00
315fc9493e
Handle spaces in vsn attribute of app file when installing deps ( #940 )
2016-02-03 17:45:27 +01:00
5539db37b6
Remove reference to p1_logger
2016-02-03 16:26:15 +01:00
71ee0d56fa
Switch to fast_tls and update app names
2016-02-03 16:13:16 +01:00
9ae1371c6e
Convert more dependencies to new repository / packages
2016-02-03 12:30:12 +01:00
e83ae9e461
Proper name for included applications
2016-02-03 11:31:23 +01:00
0de222d998
Convert code to use Fast YAML
2016-02-03 11:30:48 +01:00
b137ee3beb
Move to new dependencies for SIP and STUN
2016-02-03 11:26:14 +01:00
99b5c5712c
Move to new iconv package
2016-02-03 11:17:24 +01:00
bad50b8dd1
Move database dependencies to new repository / modules
2016-02-03 11:10:11 +01:00
ba11165fb4
Syntax highlight file + comment on rebar_elixir_plugin
2016-02-03 11:00:12 +01:00
9b837860cd
Switch a few version to hex.pm version
2016-02-03 10:55:40 +01:00
a457105831
Run ejabberd test on Erlang R18
2016-02-03 10:16:05 +01:00
e8ba7bce24
Use stringprep app name
2016-02-03 10:12:25 +01:00
59c471aad5
Merge pull request #937 from Iperity/fix-presence-based-delivery
...
Fix presence-based delivery
2016-02-02 15:41:21 +01:00
80fc34fb0c
Fix presence-based delivery
2016-02-02 14:06:07 +01:00
fa55ac5c8f
More strict checking for MUC initial presence
2016-02-01 12:09:58 +01:00
dc52ec904c
Send presence with code 170 only in initial presence from MUC
2016-02-01 11:30:49 +01:00
d3ee2a9c18
Add 'import_prosody' command
2016-01-29 14:30:50 +03:00
54dc2f56c6
Import privacy lists from Prosody
2016-01-29 14:14:08 +03:00
ae77b1300a
change mod_ping Timers using maps instead of dict
2016-01-29 00:07:38 +08:00
b20db3b736
Initial version of migration script from Prosody to ejabberd
2016-01-28 14:23:51 +03:00
aaa84dc118
Need extra line before ## in markdown
2016-01-27 11:42:13 +01:00
d89bbba181
Remove empty and unused module
2016-01-26 21:25:34 +00:00
239b1c6f74
Always use lagger
2016-01-26 14:34:58 +01:00
b2c6e397fc
Set set utf8mb4 charset on mysql connection
2016-01-26 13:47:24 +01:00
621dff7307
Add header to generated markdown file
2016-01-26 10:46:38 +01:00
bdeb4a7e32
Add a way to get all ejabberd_commands, not only those that was registered
...
This is part of (TECH-1828).
2016-01-26 10:00:28 +01:00
fc2d5da112
Merge branch 'master' of github.com:processone/ejabberd
2016-01-25 23:28:33 +01:00
28569d6209
As default, attempt to add path to Elixir
2016-01-25 23:28:27 +01:00
22696e8388
Geenarte markdown that is acceptable by docs.ejabberd.org processor
2016-01-25 16:51:54 +01:00
6c499f510b
Merge branch 'master' of github.com:processone/ejabberd
2016-01-25 10:47:29 +01:00
0b492f43fe
If lager is false, we will use p1_logger
2016-01-25 10:47:20 +01:00
60175784f0
Updated Portuguese-Brazilian translation (thanks to Otávio Fernandes)
2016-01-24 19:59:53 +01:00
14c0ff1c82
Add missing description
2016-01-24 10:19:28 +01:00
a7e3df4fec
Merge branch 'master' of github.com:processone/ejabberd
2016-01-24 10:07:25 +01:00
67b5162df9
Prepare hex.pm release
2016-01-24 10:07:12 +01:00
a2a692d081
Merge pull request #919 from hamano/rename_timestamp_function
...
rename timestamp function #917
2016-01-24 07:51:25 +01:00
dae41ec183
ejabberd will handle Mnesia start
...
Mix need to know if must not autostart Mnesia before ejabberd
2016-01-23 19:00:22 +01:00
0920511de2
lager is the default logger, we need to reverse the define flag
...
Also make sure that configure without option does not force lager to false
2016-01-23 18:57:29 +01:00
e97195b3a6
Mix requires override
2016-01-23 18:44:38 +01:00
a3931e6b73
lager is the default logger, we need to reverse the define flag
2016-01-23 18:43:06 +01:00
7cc951ab1b
Make sure all version are consistent before big repositories changes
2016-01-23 18:42:16 +01:00
dae1ec2b7b
Make sure mix does not trigger conflict on p1_utils
2016-01-23 17:36:40 +01:00
f933cae2d6
Update Elixir dependency to latest p1_utils and cache_tab
2016-01-23 17:29:18 +01:00
5a85b0fb52
rename timestamp function #917
2016-01-23 17:58:10 +09:00
a189655f31
Add missing ref key
2016-01-21 12:56:03 +01:00
42f86e7c3b
Fix order of arguments references
2016-01-20 19:43:12 +01:00
3d42be5394
Merge pull request #915 from fotock/master
...
Update translations
2016-01-20 19:38:54 +01:00
46a85d3f9b
Merge pull request #1 from fotock/fotock-patch-1
...
Update zh.po
2016-01-21 01:02:28 +08:00
e2c1368e0e
Update zh.po
...
Translated untranslated. Fixed fuzzy messages. Other fixes.
2016-01-21 01:01:14 +08:00
3d3034cd11
Update zh.po
...
to be continued
2016-01-20 23:07:45 +08:00
b62607037a
mod_mam: Expose MUC occupant JID in more cases
...
Include the occupant JID with MUC MAM messages if the room is not
anonymous, and also when the MAM user sent the MUC message himself (not
just in the case where he is a room moderator).
2016-01-20 00:02:40 +01:00
278d8a6fcd
Fix fuzzy tag in correct string
2016-01-19 22:34:58 +01:00
2ddbd032ee
Add error handling to send_stanza
2016-01-19 16:16:04 +01:00
5e4ed4266d
mod_mam: Strip existing JID tags from MUC messages
...
Strip any pre-existing <x/> tags which have an <item/> child with a
'jid' attribute from MUC MAM messages. This way, if such a tag exists,
clients can be sure it was added by mod_mam.
2016-01-19 00:39:10 +01:00
3feceb8279
Update Czech translation (thanks to Jan Pinkas)
2016-01-18 19:09:58 +01:00
6b775fb9a1
Update Walon translation (thanks to Pablo Saratxaga)
2016-01-18 18:44:55 +01:00
05bc0d4d17
Update Ukrainian translation (thanks to Oleg Deordiev)
2016-01-18 18:44:50 +01:00
a150bf8fdc
Make C2S session establishment optional (ECS-11)
2016-01-18 16:33:57 +03:00
bd383fb8c1
mod_mam: Remove unused code
...
This mod_mam version doesn't store groupchat messages in user archives,
and it also doesn't support the "store_body_only" option.
2016-01-18 13:27:29 +01:00
9741dba51f
Update polish localisation
2016-01-18 13:18:40 +01:00
ee1cf939c5
Make --disable-debug work again
2016-01-18 13:10:28 +01:00
0125870f92
Merge remote-tracking branch 'processone/pr/907'
...
* processone/pr/907:
don't escape ERL_OPTIONS
2016-01-17 00:08:30 +01:00
63777f830d
Use maps instead of dicts in HTTP upload modules
...
ejabberd currently depends on Erlang/OTP 17.1 or higher, so we can now
use maps.
2016-01-16 01:30:22 +01:00
6ac839dd76
Merge pull request #906 from hamano/stats_processes
...
add stats processes command
2016-01-15 19:26:23 +01:00
c31875cad0
Merge pull request #911 from hamano/ja
...
update japanese translation
2016-01-15 19:21:53 +01:00
7ab3b0d793
update japanese translation
2016-01-16 00:35:23 +09:00
ad448efa1d
update japanese translation
2016-01-16 00:15:24 +09:00
c8bc6cecdc
Fix records in mod_muc.hrl
2016-01-15 15:46:07 +03:00
33b67f54ba
Include mod_muc.hrl
2016-01-15 15:45:16 +03:00
a83c5a8f3a
Do not redefine records
2016-01-15 15:44:50 +03:00
1d452c98c1
Describe option type of 'domain_balancing'
2016-01-15 14:32:10 +03:00
09ab01084d
Update Spanish and Catalan translation
2016-01-15 12:27:22 +01:00
fc1237963a
Update translations files
2016-01-15 10:40:49 +01:00
ddaa409ee2
XEP-0198: Let MAM take care of pending messages
...
If a stream management session times out for a user who appears to be
using MAM, drop any unacknowledged messages rather than resending or
bouncing them. This avoids duplicates or bogus error messages.
However, this is only done if the new mod_mam option "assume_mam_usage"
is set to 'if_enabled' or 'on_request'. In the former case, a user is
assumed to be using MAM if archiving is enabled for his account. In the
latter case, MAM usage is assumed only if archiving was explicitly
requested by the client, or if archiving was enabled by means of
mod_mam's "request_activates_archiving" option.
2016-01-15 01:08:22 +01:00
b244bce49c
don't escape ERL_OPTIONS
2016-01-15 00:30:40 +09:00
6cb1905f7c
add stats processes command
2016-01-15 00:27:15 +09:00
db04cdf2ca
mod_mam: Sort messages returned by Mnesia
...
Sort the messages retrieved from an Mnesia archive before selecting the
subset limited by the <max/> value. This makes sure the desired subset
of messages is sent to the client.
2016-01-14 02:27:02 +01:00
58c8fc5770
mod_mam: Limit result set page size
...
If the client doesn't specify a maximum number of messages to retrieve
per page, set a limit of 50 messages. If the client specifies a limit
larger than 250, cap the number to 250 messages.
These limits aren't enforced for MAM v0.2 requests though, as that
version of the XEP doesn't require clients to support RSM. The newer
revisions say that "a server MAY place a reasonable limit on how many
stanzas may be pushed to a client in one request. Whether or not the
client query included a <set/> element, the server MAY simply return its
limited results, modifying the <set/> element it returns appropriately."
2016-01-14 02:12:28 +01:00
35ec0d58a4
mod_mam: Reject <index/>-based paging
...
If an <index/> is specified in the MAM request, reject the request
rather than ignoring the desired index and returning wrong results.
XEP-0059 says that the server "MAY return a <feature-not-implemented/>
error."
2016-01-14 01:39:19 +01:00
11afa45646
mod_mam: Remove unused variable
2016-01-14 01:15:11 +01:00
89f63a4fdf
mod_mam: Check whether MUC message is desired
2016-01-14 01:13:16 +01:00
85f4f90b45
mod_mam: Support XEP-0313 v0.2 MUC archive queries
2016-01-14 00:58:48 +01:00
8117092e6a
mod_mam: Respond to form requests
...
If the client requests a data form with the supported filters, return it
as per XEP-0313 v0.3 and newer.
2016-01-13 23:56:05 +01:00
89b1700279
mod_mam: Add 'from' attribute to <delay/> tag
2016-01-13 23:17:23 +01:00
9cd048c442
mod_mam: Improve binary comparison of message UIDs
...
Make sure the binary comparison performed when clients use message UIDs
to page through Mnesia archives yields correct results even if the
specified UIDs don't have the same number of digits as the UIDs of the
stored messages. This way, MAM will continue to work as expected after
migrating from mod_mam_mnesia to mod_mam.
2016-01-13 23:01:51 +01:00
3dccc20d8b
mod_mam: Add "delete_old_mam_messages" command
...
The new "delete_old_mam_messages" command allows for purging all MAM
messages of the specified type older than the specified number of days.
(Currently only implemented for Mnesia archives.)
2016-01-13 22:46:30 +01:00
a61b0c303d
mod_mam: Add "request_activates_archiving" option
...
Enabling "request_activates_archiving" tells mod_mam not to store any
messages for a user until his client issued a MAM request, regardless of
mod_mam's "default" option. Once a MAM request is issued, messages are
archived as usual.
2016-01-13 21:38:08 +01:00
0183b2487e
Advertise MUC MAM v0.4.1 in room JID's disco#info
2016-01-13 20:30:44 +01:00
f448ff608a
Update copyright to 2016 ( #901 )
2016-01-13 12:29:14 +01:00
fd3e3a99c5
Log failed SQL requests
2016-01-13 14:13:32 +03:00
776fe8b32a
Fix MAM MUC for v0.4.1
2016-01-13 11:45:08 +03:00
04b3efd14c
Merge pull request #900 from weiss/suppress-groupchat-error
...
Don't return error for blocked headlines and MUC messages
2016-01-12 14:07:58 +03:00
64d96778b4
Don't return error for blocked MUC messages
...
If a message stanza is blocked as per XEP-0016 or XEP-0191, return an
error only if the type of the blocked message is "normal" or "chat".
This makes sure users won't be kicked from MUC rooms when blocking other
participants.
Closes #897 .
2016-01-12 10:20:35 +01:00
3e1425b905
Merge remote-tracking branch 'processone/pr/899'
...
* processone/pr/899:
mod_http_upload: Use application/octet-stream instead of text/html for security reasons
2016-01-11 12:38:51 +01:00
65e6dfb9dd
Do not fail on incorrect data coming from SQL (898)
2016-01-11 14:35:11 +03:00
c7931b4a4f
CVE-2016-1232: Add Dialback Key Generation and Validation support (XEP-0185)
2016-01-11 14:22:17 +03:00
0ad0fd2187
mod_http_upload: Use application/octet-stream instead of text/html for security reasons
2016-01-11 12:13:19 +01:00
15245e9ec4
Update Hebrew translation (thanks to Genghis Khan)
2016-01-08 13:14:44 +01:00
c7b67ff00b
Clarify a little more room error string (thanks to Genghis Khan)
2016-01-08 13:14:40 +01:00
00f502f6e9
Fix 'make install' to work on osx
2016-01-08 11:22:59 +01:00
0d750ff169
Add version sufixes to application locations in 'make install'
2016-01-07 18:51:48 +01:00
6d8263df15
Extract deps from rebar.config to use in reltool.config.script
2016-01-07 14:11:16 +01:00
006e96612c
We need to checkout elixir first when elixir enabled
2016-01-06 16:03:10 +01:00
14815b9a45
Update mix deps
2016-01-06 12:27:43 +01:00
bbd428a0e1
Update deps in reltool.config.scripts
2016-01-06 12:08:20 +01:00
e1539a11be
mod_http_upload: Use full PUT URL for process name
...
Don't just use the "put_url" domain name, but also any path components
of the specified URL, to generate a mod_http_upload process name. This
way, a single domain name can be used for multiple virtual hosts by
specifying a "put_url" such as "https://example.com/@HOST@/ ".
2016-01-06 00:12:36 +01:00
3f5a20c90a
mod_http_upload: Rename variable for clarity
2016-01-05 22:06:34 +01:00
efda70e73a
Update dependencies
2016-01-05 16:00:47 +01:00
c01e3f24a5
Error converting times in mod_fail2ban ( #889 )
2016-01-05 12:29:21 +01:00
da45a064a8
Fix handling of some options in old style configs
...
This fixes issue #893 .
2016-01-04 22:06:19 +01:00
98bad73d56
Improve escaping of arguments passed to ejabberdctl
...
This fixes issue #804
2016-01-04 12:13:18 +01:00
fb8a511365
Use crypto:rand_uniform instead of random:uniform
2016-01-04 13:59:37 +03:00
94c620cc27
mod_http_upload: Fix logging of file size mismatch
2016-01-04 01:01:14 +01:00
fc013442bb
ejabberdctl: Call erl without -pa argument
...
The path to ejabberd's ebin directories is now specified by setting the
ERL_LIBS variable.
2016-01-03 23:35:41 +01:00
5deb6a91f7
mod_admin_extra: Replace deprecated function calls
2016-01-02 21:27:48 +01:00
b73678992b
mod_muc_admin: Allow for setting MAM option
...
Fixes #890 .
2016-01-02 20:57:01 +01:00
91d205715e
New send_stanza command (ejabberd_contrib#142)
2015-12-30 12:53:40 +01:00
1d2dc6cdc1
mod_muc_room: Replace deprecated function call
2015-12-29 11:11:50 +01:00
4cdb30d59e
mod_mam: Use <stanza-id/> tags for deduplication
...
Use <stanza-id/> elements instead of <delay/> tags to check for messages
resent by the stream management code. The <stanza-id/> element is
preferable, as it is added by mod_mam itself.
2015-12-29 09:54:48 +01:00
48deb47021
Update translations
2015-12-28 15:09:49 +01:00
0df6d7ae39
Improve explanation in registration page ( #876 )
2015-12-28 15:08:59 +01:00
a18a3dfbb1
Add commands for generating html or markdown documentation for commands
2015-12-28 12:20:06 +01:00
babb484cfc
Restrict access to MAM archives for members-only rooms
2015-12-24 15:04:06 +03:00
f3cb5e0d77
Support binary strings in extract_translations
2015-12-23 20:54:40 +01:00
c42e026f9c
Degenderise room error message ( #747 )
2015-12-23 19:34:23 +01:00
1f4916041e
Update set-dep-versions script to work with new rebar.config
2015-12-23 14:11:49 +01:00
8cf0d31ee9
Revert "mod_mam: Keep 'to' attribute for MUC MAM messages"
...
This reverts commit 0e330da2a6
2015-12-22 13:20:23 +01:00
cfe0aea219
Use built-in nif for integer_to_binary/binary_to_integer
2015-12-22 11:49:12 +01:00
88c9991f90
Adding WEBIRC, custom realname & ident, ISO-8859-15 (thanks to iwalkalone69)( #877 )
2015-12-21 16:20:20 +01:00
d88d5d6807
Support presence_broadcast in default_room_options mod_muc option
2015-12-21 02:25:31 +03:00
2d22507636
ejabberd_http: Cope with large POST/PUT requests
...
gen_tcp returns 'enomem' if we try to receive more than 64 MiB.
2015-12-20 23:30:11 +01:00
d039b9b72b
ejabberd_http: Log debug message on receive errors
2015-12-20 23:26:57 +01:00
48909bdbee
Add --enable-latest-deps to configure
...
This option make 'rebar get-deps' command to always fetch latest versions
of deps that are developed together with ejabberd instead of using frozen
commit/branch/tag.
2015-12-18 17:20:41 +01:00
99fdba0745
Convert rebar.config.script to more declarative format
2015-12-18 17:20:41 +01:00
bb5a8a42c3
Fix pubsub virtual nodetree plugin
2015-12-17 10:16:17 +01:00
6957e892dd
Fix last item message type as message attribute
2015-12-16 17:04:45 +01:00
c8986ffa5e
Use correct notification_type for last items ( #827 )
2015-12-16 16:19:35 +01:00
c6798fc515
Add accept_interval option in ejabberd_listener
2015-12-16 17:26:44 +03:00
5ffdfdd95d
Merge branch 'master' of github.com:processone/ejabberd
2015-12-16 13:01:12 +01:00
08b0530164
Don't read pubsub options when plugin does not use them
...
This also revert commit 6052f7b
2015-12-16 12:56:06 +01:00
b5cc4a3a7d
Remove "--enable-nif" flag
...
Specifying "--enable-nif" or "--disable-nif" when running ejabberd's
configure script has no effect anymore: NIF support is enabled by
default and can only be disabled by building the p1_xml dependency with
"--disable-nif".
2015-12-16 12:29:02 +01:00
bae333788b
Add plugin for passing extra erl_opts flags to deps, and use it for hipe
...
This fixes #425 in github issue tracker
2015-12-16 12:23:13 +01:00
5fd1aa0d04
Advertise MAM in disco info for account/room JID
...
As per XEP-0313 version 0.2 and newer, advertise the MAM feature in the
service discovery information for the bare account (or MUC room) JID.
Some clients check the server's discovery information instead, so we'll
continue to advertise the feature there as well.
2015-12-16 00:08:23 +01:00
11ad96fced
Use MUC domain for 'by' attribute of <stanza-id/>
...
Let mod_mam specify only the domain part of the room JID in the 'by'
attribute of <stanza-id/> tags.
2015-12-15 21:37:41 +01:00
0e330da2a6
mod_mam: Keep 'to' attribute for MUC MAM messages
2015-12-15 21:05:04 +01:00
5bb70e844d
Fix mod_carboncopy configuration for test suite
...
The mod_carboncopy module doesn't have the "db_type" option.
2015-12-15 21:02:12 +01:00
6efdf78ce3
PubSub plugin for online users only
2015-12-15 16:23:04 +01:00
3b69d26368
Fix pubsub headers
2015-12-15 16:12:20 +01:00
51b9dd029b
Restore header in Hebrew translation file
2015-12-14 14:08:44 +01:00
2b00c13ad8
Merge pull request #875 from GreenLunar/patch-1
...
Update hebrew translation
2015-12-14 14:04:45 +01:00
a8683d5bcf
Update hebrew translation
...
Minor corrections, enhancements, and refinements
2015-12-14 14:39:18 +02:00
6052f7bfa8
Fix pubsub test error
2015-12-14 10:21:23 +01:00
7d1c75d0e8
Use UTF8MB4 character set in MySQL tables
2015-12-11 16:13:48 +01:00
aaa718741e
Use BLOB instead of TEXT on mysql in stanza storage
...
Mysql 'utf8' do not support 4-bytes UTF8 chars.
Characters like 'KISS MARK' (U+1F48B) causes mysql
to cut the string at that point.
There is utf8mb4 encoding available on newer mysql
versions that do support 4-bytes utf8. But for storing
stanzas, that doesn't need to be indexed or searched or
inspected in any way, it was easier to use BLOB
(the bytes stored are utf8 encoded anyway, like all XMPP),
and avoids the need to redefine indexes (as allowed size
is shorter on utf8mb4) or having mixed utf8 and utf8mb4
encodings on the same table.
2015-12-11 16:07:39 +01:00
e3005f68e7
Remove undefined macro injected in 3bdd5d0d
2015-12-11 15:33:22 +01:00
8ee5f9fb6f
Remove http supervisors
2015-12-11 14:13:24 +01:00
3bdd5d0d25
Remove receiver's supervisor
2015-12-11 14:11:44 +01:00
1a32f20c07
Disable use of multi-subscribe and subscription-option on standard plugins
2015-12-11 12:46:49 +01:00
6357ea1d5d
Limit number of subscriptions per node and allow custom default node configuration
2015-12-11 12:46:44 +01:00
86a8606fd1
Virtual nodetree is not attached to any backend
2015-12-11 12:46:40 +01:00
c4943cffe8
Follow pubsub configuration when using virtual nodetree
2015-12-11 12:46:35 +01:00
10c920ef13
Don't force max_items_node to MAXITEMS if not defined
2015-12-11 12:30:16 +01:00
469e93f37b
mod_mam: Don't store resent messages
...
Make sure messages that were resent by the stream management code aren't
stored in MAM.
2015-12-09 22:44:45 +01:00
e09afe367f
Document XEP-0334 support
2015-12-09 22:28:44 +01:00
4c47ee63f2
Do not forget to include xmlns in mam prefs response ( #859 )
2015-12-09 12:53:02 +03:00
be4d687a86
Fix problem with handling of old db entries in mod_mam
2015-12-09 09:47:03 +01:00
07baf2d973
Don't let "reopen_log" rotate files (EJAB-1243)
...
Make sure the "reopen_log" command really just reopens log files without
also rotating them. For rotating log files, the new "rotate_log"
command can be used.
2015-12-08 22:48:04 +01:00
325c17f277
mod_mam: Update record field type
2015-12-08 22:21:39 +01:00
14609dbfa2
mod_mam: Remove unused code
2015-12-08 22:15:55 +01:00
59ba09826b
mod_offline: Fix outdated comments
2015-12-08 21:58:54 +01:00
90fd7f3780
mod_offline: Honor <store/> hint
...
Ignore the "store_empty_body" option for messages that have a <store/>
hint as described in XEP-0334, version 0.2.
2015-12-08 21:46:36 +01:00
c2f6bf0343
Improve muc#roomconfig_presencebroadcast support
2015-12-08 21:53:42 +03:00
67f93b0d60
Don't keep 10 sec timeout that i used for testing...
2015-12-08 11:28:03 +01:00
7a69dab596
Add ability to disable timeout for ejabberdctl command
2015-12-08 11:25:26 +01:00
5ce0b062ff
mod_mam: Honor Message Processing Hints (XEP-0334)
2015-12-08 00:10:00 +01:00
3e57850da7
If mod_register access_from is 'none', then don't advertise IBR ( #857 )
2015-12-07 18:30:52 +01:00
95a9100623
Fix more places where random:seed is used
2015-12-07 16:48:29 +01:00
d0df7be722
Fix randoms.erl on R17 that don't have random:seed(integer())
2015-12-07 16:37:40 +01:00
5ac10d6555
Remove now() in pubsub code
2015-12-07 16:16:11 +01:00
29db302808
More now() replacements
2015-12-07 16:09:48 +01:00
b9f751e099
Fix bug in last commit
2015-12-07 10:26:51 +01:00
0a846d03bf
More now() removal
2015-12-06 15:58:46 +01:00
5c329a7699
Remove now() - part 1
2015-12-04 15:08:43 +01:00
daad71bc7e
trusted_proxies option not parsed correctly ( #860 )
2015-12-04 13:14:39 +01:00
ba916c3162
XEP-0198: Fix stanza counting corner case issue
...
Don't forget to count outgoing stanzas that are processed while the
ejabberd_c2s process is already waiting for stream resumption.
2015-12-02 19:25:10 +01:00
f9e12d900c
No need for a top menu link as there's a top page link
2015-12-02 17:10:23 +01:00
c3888cb0ca
Don't forget copying files that were compiled during make install
2015-12-02 12:40:49 +01:00
e412438aba
When user joins logged room, he must be warned (EJAB-726)
2015-12-02 12:07:29 +01:00
086fbc6a50
Only filter rooms in Service Disco when more than 100 (EJAB-343)
2015-12-02 02:32:25 +01:00
ff22782752
List in Service Disco non-empty rooms and provide Node for empty (EJAB-343)
2015-12-02 01:51:39 +01:00
e5ae35c66b
Update cache_tab app name
2015-12-01 19:17:51 +01:00
3397a9be5e
Merge pull request #849 from weiss/discard-chat-states
...
mod_offline: Support discarding chat state notifications
2015-12-01 14:57:49 +03:00
f1ecbf80fb
Fix archive preference retreiving ( #848 )
2015-12-01 14:06:23 +03:00
9eeee67da7
Webadmin console visual refresh (thanks to Marek Foss) (EJAB-1142)
2015-11-30 11:35:53 +01:00
9cc5a5d467
Simplify external components configuration
2015-11-28 17:38:34 +03:00
44f5e411c5
mod_offline: Support discarding chat states
...
XEP-0160 says that standalone chat state notifications should not be
stored offline. By default, mod_offline discards them now.
Closes #842 .
2015-11-26 08:35:49 +01:00
fee2530b1c
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.
2015-11-25 00:05:24 +01:00
87fb5132be
Make JID related functions from jlib.erl deprecated
2015-11-24 20:31:26 +03:00
95265dd3ad
Move JID related functions to jid.erl ( #847 )
2015-11-24 18:44:13 +03:00
7eddfe073b
Make Riak working on R18
2015-11-24 17:53:44 +03:00
16881597c9
Remove useless export_all flag
2015-11-23 12:03:08 +01:00
f3ff660eae
Export content_type/3 needed by mod_http_upload
2015-11-23 11:53:36 +01:00
4480749a52
Merge branch 'cluster_fix'
2015-11-20 14:52:36 +01:00
b4ae1b63bc
Allow longer command execution time
2015-11-20 10:39:32 +01:00
67a70b9107
Integrate join/leave cluster as ejabberd command
2015-11-20 10:39:27 +01:00
0e29307ad5
Merge pull request #840 from cenobites/mod_ping
...
Adding ping_ack_timeout in mod_opt_type configuration
2015-11-18 16:35:49 +03:00
2659e2c4a0
Explain that reload_config only affects to ACL and Access
2015-11-18 13:25:19 +01:00
49a8de7c56
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.
2015-11-18 10:25:01 -02:00
2f9f4e6938
Fix example config about ejabberd_xmlrpc ( #771 )
2015-11-17 21:33:28 +01:00
43626f5c97
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.
2015-11-17 00:12:20 +01:00
53d72bd85a
Disable vJUD by default also in mod_vcard_ldap source code
2015-11-13 19:33:23 +01:00
f6d8f47451
Disable vJUD search in the default config and when not specified
2015-11-13 19:30:11 +01:00
aa5caa30e2
Support for muc#roomconfig_presencebroadcast option
2015-11-12 19:53:10 +03:00
3ee5195b7a
Fix problem with pipelined http requests arriving in single packet
...
This fixes github issue ejabberd#835
2015-11-12 17:23:59 +01:00
55a92c2983
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/ "
2015-11-11 22:51:40 +01:00
415a75c25a
mod_http_upload_quota: Don't track all users
...
Don't track the disk usage of accounts that have an unlimited quota.
2015-11-10 22:08:16 +01:00
20709f9880
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.
2015-11-09 19:23:52 +01:00
113c315857
mod_http_upload: Apply cosmetic changes
2015-11-09 19:12:08 +01:00
842db2ca15
mod_http_upload: Don't flatten command strings
2015-11-09 18:50:45 +01:00
9c80cb2b26
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.
2015-11-09 18:41:31 +01:00
58c1bc4276
Use xml_stream:reset() when possible
2015-11-09 16:05:09 +01:00
de7422b372
Merge pull request #821 from scrogson/update_readme_openssl
...
Update minimum required OpenSSL version
2015-11-05 12:10:38 +03:00
d252b9948c
Update minimum required OpenSSL version
2015-11-04 23:21:08 -06:00
341be9b682
Remove supervisor option, disable it for c2s and muc
2015-11-04 16:24:35 +01:00
fec7e47169
Add copyright and license to HTTP upload modules
2015-11-04 01:22:39 +01:00
46bf190fd0
mod_client_state: Add my email address to header
2015-11-04 01:19:19 +01:00
e54e543a66
Faster string_to_jid/1 implementation
...
This version is about 10-15% faster than old one
2015-11-03 14:41:01 +01:00
ff46738218
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.
2015-11-03 00:00:44 +01:00
4566325241
mod_http_upload: Don't complain during shutdown
...
Ignore the case where, for some reason, no process is found to be
stopped.
Closes #810 .
2015-11-02 23:46:58 +01:00
1b368a86b7
mod_http_upload: Use binary strings in most places
...
Switch to binary strings to fix a type issue, and for consistency.
Closes #808 .
2015-11-02 23:46:31 +01:00
9d2f1d5f0d
mod_http_upload: Check availability of ImageMagick
...
Log an error message during startup if the thumbnail option is enabled
but ImageMagick is not installed.
2015-11-02 01:12:10 +01:00
eeb705fc2f
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 .
2015-11-01 23:29:22 +01:00
8bff06bea9
Merge branch 'master' of github.com:processone/ejabberd
2015-10-30 17:20:50 +03:00
99f506135b
Fix ipv6 configuration processing ( #803 )
2015-10-30 17:20:32 +03:00
2814dd2cb8
Merge pull request #801 from nanoz/patch-1
...
feat(ejabberdctl): Foreground option for docker
2015-10-29 19:46:18 +01:00
bee767158d
feat(ejabberdctl): Foreground option for docker
...
Docker needs services to run in foreground.
2015-10-29 19:39:21 +01:00
915383e150
mod_http_upload: Add missing trailing dot
...
(Thanks to Matthias Rieber.)
2015-10-29 10:09:55 +01:00
43e7814714
mod_mam: Update supported XEP version
2015-10-28 23:53:53 +01:00
32fe74c923
mod_http_upload: Document protocol support
2015-10-28 23:52:33 +01:00
f112a91321
Copy elixir files in copy-files makefile target
2015-10-28 18:12:39 +01:00
1d5a441ce8
Revert "set dependencies versions for 15.10"
...
This reverts commit a497cdff5e
2015-10-28 16:07:00 +01:00
a497cdff5e
set dependencies versions for 15.10
2015-10-28 15:53:12 +01:00
47b17acbaf
ejabberdctl.cfg: Document CONTRIB_MODULES_CONF_DIR
2015-10-26 22:46:58 +01:00
788049be7b
ejabberdctl: export CONTRIB_MODULES_CONF_DIR
2015-10-26 22:42:07 +01:00
62ea763089
mod_http_upload: Fix string()/binary() type issue
2015-10-26 22:32:12 +01:00
3e7ee6af6d
mod_http_upload: Add/fix function specifications
2015-10-26 22:30:58 +01:00
b5a09f8b15
mod_http_upload: Strip newline from command output
...
The list_to_integer/1 function doesn't cope with trailing newline
characters.
2015-10-26 22:10:32 +01:00
5dfd95e5a7
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.
2015-10-26 13:10:10 +01:00
6f2e178de1
Rename badly entitled record field
2015-10-26 15:05:28 +03:00
137a4ee087
Add HTTP File Upload support (XEP-0363)
2015-10-26 14:10:55 +03:00
b2eb9f197a
Don't crash on certificates without extensions (EJAB-1724)
2015-10-23 18:41:35 +03:00
2a115a83d2
Let modules_update_specs report failures ( #756 )
2015-10-23 17:21:19 +02:00
1472bd398a
Merge pull request #790 from gardenia/mod_ping_configurable_ack_timeout
...
Configurable ping ack timeout for mod_ping
2015-10-22 21:00:08 +03:00
c6f48022a4
Merge pull request #781 from scrogson/master
...
Fix-up mix.exs; Include mix.lock
2015-10-22 18:50:11 +02:00
d048d1e619
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)
2015-10-22 13:48:40 +01:00
efdf5636be
Add simple metrics module for use with grapherl
2015-10-22 14:02:26 +02:00
81a7ca7b1e
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)
2015-10-22 13:50:36 +03:00
92b9fb30e0
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
2015-10-21 23:22:53 +01:00
c62bd0c911
Use homogeneous s2s connections stats ( #761 )
2015-10-21 12:51:22 +02:00
8a2fa62cac
Remove access_commands 'unrestricted' option, use [] instead. Fix unauthenticated calls to commands with policy=user.
2015-10-20 17:20:13 +03:00
2d22d6061e
Pass {C,CPP,LD}FLAGS used in main ./configure call to invocations from deps
2015-10-20 15:23:23 +02:00
7c1e7e5b5f
Improve access_commands option backward compatibility
2015-10-19 20:16:04 +03:00
1f2b7e8f20
Fix access_commands option handling
2015-10-19 18:50:44 +03:00
06701b126b
Make COPY_template compatible with gmake 3.8
2015-10-19 16:39:08 +02:00
ff4a00b1f3
Let Travis CI test "make install"
2015-10-19 14:23:37 +02:00
97a93263c1
Make install should work even without having DESTDIR set
2015-10-19 13:47:01 +02:00
28e28e926a
ejabberd_listener: Fix ETS update on port reuse
2015-10-18 01:14:48 +02:00
5e467b96a1
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.
2015-10-17 23:15:31 +02:00
53bd0ee818
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.
2015-10-17 22:07:29 +02:00
70606667c6
Use OTP directory structure for 'make install'
2015-10-15 15:08:45 +02:00
7d99484859
Make KEEPALIVE_QUERY list as this is what sql_query/3 expects
2015-10-15 10:07:24 +02:00
35c33a8a29
Improve line lengths; use spaces in between commas.
2015-10-14 22:52:27 -05:00
98c172aed6
mix.lock should be commited to ensure consistent builds.
2015-10-14 22:50:28 -05:00
25f95d6954
This dependency was removed in 83dd79a
2015-10-14 22:49:47 -05:00
4fce1a17d7
Fix cyrsasl_oauth:mech_new call
2015-10-12 20:53:52 +03:00
1578f17eff
Remove obsolete sasl init
2015-10-12 10:41:07 +02:00
87273619a6
Advertise MAM (XEP-0313) v0.4 support in room disco
2015-10-11 19:43:24 +03:00
b5ac0db895
Be able to merge old style configs with {listen,...}
2015-10-08 13:07:00 +02:00
6d25db6600
Handler module shouldn't be used for differentiating listeners when merging configs
2015-10-07 16:45:07 +02:00
880114a909
Enforce get_allowed_items_call
2015-10-07 16:40:37 +02:00
653105a44f
Fix acl issue from cleanup
2015-10-07 15:12:15 +02:00
f938c2a5e2
Revert "Avoid crypto:hmac/3 call for R15B compatibility"
...
This reverts commit 31e356c126
2015-10-07 14:18:56 +02:00
6a23cad454
Revert "Fix compilation on Erlang R15B"
...
This reverts commit a5d6044448
2015-10-07 14:18:47 +02:00
6aeb9dcb38
cosmetic cleanup
2015-10-07 14:18:38 +02:00
83dd79a6a7
Remove unused dependency
2015-10-06 11:06:04 +02:00
6378c673df
Avoid MAM dups when routing to multiple resources
2015-10-02 16:09:55 +02:00
c7750689e8
Fix force_update_presence
2015-10-02 16:06:47 +02:00
41d65f8fe2
We want oauth2 to be supported as default in Elixir environment
2015-10-02 10:40:55 +02:00
24fa95fd60
Fix problem with --auth in ejabberd_ctl:process2/2
2015-10-01 21:09:03 +02:00
67d3b50598
Switch macros resolving in config files to be global instead of per file
2015-10-01 14:34:48 +02:00
df39fec5d0
Merge pull request #753 from scrogson/add_links
...
Add License and Links for display on hex.pm
2015-09-29 22:37:15 +02:00
152d80827a
Merge pull request #755 from scrogson/fix_ejabberd_directory_name
...
Use lowecase directory name for lib/ejabberd
2015-09-29 22:36:02 +02:00
9c82f160e5
Use lowecase directory name for lib/ejabberd
2015-09-29 14:08:39 -05:00
189267c1a1
Merge pull request #754 from scrogson/gitignore
...
Ignore mnesiadb and _build
2015-09-29 21:27:49 +03:00
59b6a46f82
Ignore mnesiadb and _build
2015-09-29 13:21:35 -05:00
6b81a1ed90
clean up whitespace
2015-09-29 13:19:35 -05:00
b63c51c245
Add additional package information for hex.pm
2015-09-29 13:18:49 -05:00
704844fd2a
Temporary switch to fork of oauth2 that compiles with r18
2015-09-29 15:34:02 +02:00
3fc1d8ca9a
Set version 15.09 for mix
2015-09-29 14:21:57 +02:00
d08f73da47
Recompile translations
2015-09-29 08:19:44 +02:00
cf975da8f2
Update several commands for recent ejabberd_commands changes
2015-09-28 15:29:25 +03:00
846b520edc
oauth uses jiffy so fetch it unconditionally
2015-09-28 10:08:27 +02:00
88a206400a
Add oauth_access option
2015-09-25 19:48:53 +03:00
1781a58929
Strip Nick element in message stanzas sent to a room ( #686 )
2015-09-25 17:00:00 +02:00
e2cc45933f
Enable oauth unconditionally
2015-09-25 16:39:47 +02:00
5eab6e315e
Revert "Remove "--enable-json" flag"
...
This reverts commit 5bb137940c
2015-09-25 16:09:46 +02:00
a1129dc96b
Add OAuth support (thanks to Aleksey)
2015-09-25 15:49:07 +02:00
7cf904f4cf
Merge pull request #742 from joudinet/master
...
Allow root to run join_cluster and leave_cluster
2015-09-25 14:20:37 +02:00
deccf91280
Fix calling problem introduced when reducing bashisms ( #748 )
2015-09-25 13:35:03 +02:00
825f4fcc35
Merge pull request #748 from joudinet/bashisms
...
Remove bashisms in {join,leave}cluster scripts
2015-09-24 19:26:03 +02:00
ee456cc2af
Fix regression introduced when code was binarized (EJAB-641)
2015-09-24 17:21:14 +02:00
1f4d8fd4d7
Remove bashisms in {join,leave}cluster scripts
...
So they can run in any POSIX shell, not bash only.
2015-09-24 15:32:06 +02:00
484fd1f51f
Log TLS errors as [debug] messages only
...
Closes #652 and closes #679 .
2015-09-24 12:00:59 +02:00
89b3471742
Add <stanza-id/> (XEP-0359) to archived messages
2015-09-22 21:15:34 +03:00
c360326cdb
Allow root to run join_cluster and leave_cluster
...
Prefix the call to joincluster and leavecluster in ejabberdctl by
$EXEC_CMD. Avoid using sh -c in these scripts.
Should fix #676 .
2015-09-22 17:07:39 +02:00
3300c8d994
Set disable caching headers in http-bind responses (EJAB-1643)
2015-09-22 15:42:57 +02:00
e289344972
Nameprep host name passed to http-bind before using in (EJAB-1658)
2015-09-22 15:42:57 +02:00
23a1aceac0
Improve external module configuration management (EJAB-1746)
2015-09-22 12:49:55 +02:00
70b1dc479c
Add MAM (XEP-0313) v0.4 support
2015-09-22 12:23:36 +03:00
e57c1896f7
Avoid wrong failing cases on make install ( #468 )
2015-09-21 17:51:13 +02:00
df3862cf84
Add set_loglevel command (EJABS-2524)
2015-09-21 17:07:44 +02:00
497cbb3ec2
Merge branch 'master' of github.com:processone/ejabberd
2015-09-18 09:06:51 +02:00
ec1969ddca
Remove unused functions from old get_items api
2015-09-17 18:00:17 +02:00
a1a7beb24d
Make sure that lager is first on our deps list
2015-09-17 17:59:13 +02:00
f6b892b366
Guard against passing undefined C2SPid to xml parser before become_controller gets called
...
Our new nif xml parser don't handle this gracefully, so we better don't
call it that way.
This is only triggered on old style ssl sockets, where ssl layer must
be activated early, before association between socket and c2s is
established
2015-09-17 11:37:01 +02:00
4a4065c9c6
Let BOSH/WebSocket support "max_resume_timeout"
...
Allow for specifying the "max_resume_timeout" option in an ejabberd_http
listener for ejabberd_http_bind and/or ejabberd_http_ws.
2015-09-17 00:33:08 +02:00
5d11a19087
Merge pull request #736 from quanzhuo/master
...
Comment unused type, unused term
2015-09-16 18:22:19 +03:00
ae51277316
Comment unused type, unused term
2015-09-16 22:52:36 +08:00
5593ebbbca
Properly handle define_macros in merged config files
2015-09-16 12:20:07 +02:00
a8d6439a4b
Update French translation
2015-09-16 11:33:00 +02:00
18d3329f8f
Update French translation
2015-09-16 11:14:20 +02:00
e6279123e5
Update polish translation
2015-09-16 11:08:21 +02:00
59321ac56e
XEP-0198: Improve handling of non-message stanzas
...
When an XEP-0198 session times out, always return an error for
unacknowledged IQ stanzas, and always drop presence stanzas. That is,
the "resend_on_timeout" option no longer applies to those stanzas types,
but only to messages.
2015-09-15 22:42:22 +02:00
ab857b1a5e
Improve MSSQL schema
2015-09-14 14:05:07 +03:00
fc7d3a44b8
Simplify MSSQL configuration
2015-09-13 18:34:10 +03:00
25791cfde8
Fix MSSQL support
2015-09-13 18:31:49 +03:00
48c5e73321
ext_mod must be started before ejabberd_config
2015-09-11 15:14:12 +02:00
8c1864eca1
Update German translation (thanks to Nikolaus Polak)
2015-09-11 13:22:52 +02:00
df08253e91
Update Hebrew translation (thanks to Isratine Citizen)
2015-09-10 21:25:12 +02:00
a50f00f9e8
Include ext_mod modules when checking accepted options (ejabberd-contrib#116)
2015-09-10 20:11:02 +02:00
8fd9670da2
typo fix
2015-09-10 12:21:50 +02:00
4d19ef55b6
Update Esperanto and Dutch translations (thanks to Andreas van Cranenburgh)
2015-09-08 21:40:00 +02:00
6b79bcdc97
Merge branch 'master' of github.com:processone/ejabberd
2015-09-07 17:56:09 +02:00
73932fb507
Fix typo
2015-09-07 17:55:54 +02:00
5a9f1b9bba
Update Brazilian Portuguese translation (thanks to Otávio Fernandes)
2015-09-07 17:46:50 +02:00
7b230e7e44
Update Japanese translation (thanks to Tsukasa Hamano)( #729 )
2015-09-07 17:46:05 +02:00
420cf68ecd
Use our own includes + includes from all dependencies
2015-09-07 17:35:58 +02:00
64d1efa6f2
Update Catalan and Spanish translations
2015-09-07 15:06:57 +02:00
9195fc5573
Update Russian PO file
2015-09-07 15:21:42 +03:00
5d59a534a3
Run "make translations" and get updated PO files
2015-09-07 13:37:54 +02:00
096d56235b
Fix German translation (thanks to STPKITT)( #726 )
2015-09-07 13:16:56 +02:00
f56a9e400d
Pass stream management options defined in http listener to http-bind and websocket
2015-09-04 12:42:53 +02:00
5095fdb6b0
New XEP-0198 option: "max_resume_timeout"
...
In the past, the "resume_timeout" option defined both the default resume
timeout and the maximum resume timeout clients are permitted to request.
Admins might want to allow clients to request a timeout value that's
larger than the default, though. This can now be done by specifying the
"max_resume_timeout" option.
2015-09-03 21:20:15 +02:00
8d1ea87e02
Use hide_sensitive_log_data in eldap.erl
2015-09-03 16:28:21 +02:00
a85a8dff45
Merge branch 'master' of github.com:processone/ejabberd
2015-09-02 17:02:20 +02:00
06193d18b8
Better to keep config file in a different config directory
2015-09-02 17:02:09 +02:00
6740b1f0e1
Rename idna.erl to ejabberd_idna.erl ( #702 )
2015-09-02 16:02:46 +03:00
608661d8c0
Merge pull request #725 from processone/elixir-mix
...
Allow building an ejabberd release with mix and elixir release manager
2015-09-02 14:25:43 +02:00
1bc2c8cbb1
Add verification of hide_sensitive_log_data global option
2015-09-02 13:46:03 +02:00
eebd4bbd8f
Remove unused function now_to_iso/1
2015-09-02 14:13:23 +03:00
4ae7c81cfa
Allow building ejabberd with Elixir mix and building and ejabberd OTP release
2015-09-02 12:49:19 +02:00
e179727a0e
ignore ejabberd release result directory
2015-09-02 12:48:19 +02:00
79d3b77de1
Update mix.exs to comply with exrm release system
2015-09-02 11:38:16 +02:00
87f39c8750
Update mix.exs
...
Fix version number.
2015-09-02 10:54:24 +02:00
b6bf1eba42
Upgrade version number to ejabberd 15.07
...
We forgot before previous release
2015-09-02 09:11:06 +02:00
14ddbce3a9
Do not forget to set from/to when fetching from MUC history
2015-09-01 12:35:51 +03:00
e24bfe7b62
Fix problem with merging same port, different ip listeners in config files
...
Also switch to function used by ejabberd_listener to extract that
information instead of rolling our own code for that.
2015-09-01 10:57:48 +02:00
190f76c676
Fetch MUC MAM messages from room history directly if it's not enabled in room configuration
2015-09-01 11:52:08 +03:00
9f62426343
Update MAM tests to always expect RSM in response
2015-08-30 23:26:37 +02:00
3ed75890cb
Merge pull request #721 from oxpa/muc_admin
...
get_room_options will not crash in case of query for a non-existent room
2015-08-28 15:23:00 +03:00
3d5d1ecbe4
get_room_options will not crash in case of query for a non-existent room
2015-08-28 03:34:51 -08:00
5bb137940c
Remove "--enable-json" flag
...
The "--enable-json" flag currently has no effect.
2015-08-27 22:16:11 +02:00
832f6d39f9
Always include RSM in final message
2015-08-24 13:29:15 +03:00
94444c87e8
Remove MAM archives on MUC room destroy
2015-08-24 13:28:58 +03:00
247bd9eae5
More eye-candy mod_http_bind help page (thanks to Marek Foss)
2015-08-21 15:23:15 +02:00
6177ae3ffb
Improve S2S certificate checks
2015-08-20 01:04:56 +03:00
b570070834
Fix case clause during S2S certificate checks
2015-08-19 23:47:45 +03:00
775cf2d459
Change namespace from muc#admin to muc#user
2015-08-19 15:31:35 +03:00
6f0ee83317
Don't overwrite listeners for different transports in config merging
...
Before this having listeners on same port for both tcp and udp would after
config merging step left only one of them.
Many thanks to Holger Weiß for noticing this.
2015-08-19 10:14:39 +02:00
f89db30d77
Catch errors when calling inet:peername in ejabberd_http
2015-08-17 15:50:35 +02:00
6d16029716
Let ejabberdctl handle more shell metacharacters
...
Closes #704 .
2015-08-15 17:01:47 +02:00
3efd0ebc5a
configure.ac: Don't insist on Erlang/OTP >= 17.5
...
The current ejabberd code works on Erlang/OTP 17.1 or newer. We now
also let Travis CI test this version in addition to 17.5.
2015-08-13 13:06:05 +02:00
ac6b436dcf
Prettify copyright links (thanks to GreenLunar)( #692 )
2015-08-13 12:22:14 +02:00
994602c97d
Store and retrieve "mam" value in room configuration
2015-08-12 20:28:23 +02:00
279d4b00ac
Fix and document create_rooms_file and destroy_
2015-08-12 17:18:41 +02:00
8c9c556f1f
Changed API of some mod_muc_admin command arguments
...
With this commit, arguments change in two commands:
* destroy_room: does not require Host argument
* send_direct_invitation: instead of Room, now requires Name and Service
2015-08-12 13:26:24 +02:00
ab0f488dda
Room response to disco#info node muc#traffic should be an error (EJAB-741)
2015-08-12 12:40:51 +02:00
2392f09e99
Ejabberd now requires erlang R17+
2015-08-12 11:53:54 +02:00
40feed723d
Add support for MUC MAM
2015-08-08 22:15:36 +03:00
c71d57a05d
Handle merging of append_host_config as is done for host_config
2015-08-06 17:53:18 +02:00
5a1ac4faf1
Add ability to override main config file options with data from included files
2015-08-06 17:12:15 +02:00
45a312a0eb
Remove obsolete pubsub migration command
2015-08-06 16:57:04 +02:00
d9caa51c12
Merge branch 'typo' of https://github.com/sezuan/ejabberd
2015-08-06 08:57:10 +02:00
f5e857a5bd
typo
2015-08-06 08:44:15 +02:00
4125dfd166
mod_multicast changes:
...
- catch exceptions
- do ets:give_away for multicastp table on init
- don't send multicasts to itself
- don't check user@server for multicast support
- handle empty disco items
- ignore cdata in <addresses/>
- properly check for subdomains
2015-08-05 19:21:28 +03:00
3a5dd51b42
Use websocket pings also on old style connections
2015-08-05 16:09:23 +02:00
dc0934bff7
Update FSF address
2015-08-05 09:52:54 +02:00
c0497d46af
mod_client_state: Throttle stanzas by default
...
Enable the mod_client_state options "drop_chat_states" and
"queue_presence" by default. These features are now well-tested in
practice.
2015-08-05 00:05:11 +02:00
13f7be682d
Rename muc_filter_packet to muc_filter_message
...
The hook is just triggered on groupchat messages, not on other types of
stanzas.
2015-08-04 21:16:45 +02:00
6e61932765
Merge pull request #696 from weiss/muc-presence-hook
...
New hook: muc_filter_presence
2015-08-04 22:14:18 +03:00
3d4e8ffac6
New hook: muc_filter_presence
...
Add a hook that allows for modifying or dropping presence stanzas sent
to MUC rooms.
2015-08-04 20:13:00 +02:00
e3b7d43b76
Add split_jid/1
...
This is a convenience reverse of make_jid/1. It allows extracting the jid parts
without relying on using the jid record structure, to abstract details.
2015-08-04 09:48:59 +02:00
f377992232
Do not crash SIP authentication on SCRAMed passwords
2015-08-02 14:47:45 +03:00
dfe3082445
Update crypto calls
2015-07-30 19:17:53 +03:00
a9a235c376
Merge pull request #682 from weiss/no-mam-carbons
...
Don't carbon-copy messages of type "normal" without body
2015-07-30 17:11:56 +03:00
3e49bf0e83
bug fix: ejabberd:start_app need to pass Type to application:start
2015-07-30 18:57:59 +08:00
04094b3dcf
Don't copy messages of type "normal" without body
...
Don't carbon-copy messages of type "normal" that don't have a body
element as an immediate subtag. Those messages are usually generated by
clients or servers (as opposed to messages written by humans). This
includes MAM messages, for example.
2015-07-28 21:34:02 +02:00
8fe930c3d1
Also check for <no-storage/> hint
...
Check for the <no-storage/> and <no-permanent-storage/> hints in
addition to <no-store/> and <no-permanent-store/>. XEP-0334 (0.1)
mentions both variants, and unfortunately, both of them are in use.
2015-07-28 21:08:33 +02:00
1048e21643
XEP-0198: Don't add <delay/> tags to IQ stanzas
2015-07-28 21:00:12 +02:00
0dbedb69a6
Recompile translations
2015-07-27 11:45:04 +02:00
5788609e5c
Updated Spanish translation
2015-07-27 11:43:31 +02:00
5305b4a82c
Updated Hebrew translation (thanks to Isratine Citizen)
2015-07-27 11:41:38 +02:00
d03d08539b
Reuse some strings in WebAdmin's Listening Ports
2015-07-27 11:40:56 +02:00
76104cd117
Fix problem with merging values from multiple config files
2015-07-24 15:46:08 +02:00
e211bf7131
Ensure config snippet is loaded at module installation (EJAB-1741)
2015-07-24 15:09:57 +02:00
32fc586c08
Allow contribution to include .yml or .yaml config file
2015-07-24 14:30:31 +02:00
8fedc945bf
Allow migration of old pubsub items with xmlelement in body ( #479 )
2015-07-24 13:44:01 +02:00
d481017746
Merge pull request #642 from weiss/pep-on-caps-update
...
Also send PEP notifications when local contact updates CAPS
2015-07-24 12:07:22 +02:00
19aad464da
Provide command for ODBC's convert_to_scram
2015-07-23 13:16:15 +02:00
8df134e025
Don't crash web admin when displaying info about websocket using users
2015-07-22 11:54:11 +02:00
9091fcb1a1
Let nodetree call default flat plugin now
...
this fix mistake from previous commit 311fedaa
2015-07-22 11:20:06 +02:00
9aa2d92d90
Allow include of simple dependencies (EJAB-1737)( #391 )
...
Either contributed module include dependencies this way
deps/
dep1/
src/
include/
dep1/
src/
include/
Or includes rebar.config or rebar.config.script:
In this case, only git is supported (if git command available)
and ext_mod checkout code in deps directory.
In both case, only basic built procedure is supported. ext_mod
does not do more than bare compilation like this:
erlc -I include src/*erl
2015-07-22 10:48:44 +02:00
311fedaa12
Let flat be default plugin ( #609 )
2015-07-22 10:37:26 +02:00
9c36a9df78
Do not init nodes from mod_pubsub ( #609 )
...
Let each plugin do its own initialisation in init_plugins
init_nodes was an old function to be removed.
2015-07-22 08:03:27 +02:00
b47a27f3ac
Merge pull request #608 from weiss/bare-jid-subscription
...
PubSub: Check for node subscription of bare JID
2015-07-22 07:58:34 +02:00
531638e946
Merge pull request #632 from weiss/increase-max-ack-queue
...
XEP-0198: Increase default value of "max_ack_queue" option
2015-07-21 12:36:01 +03:00
a724893887
Merge pull request #618 from weiss/muc-message-hook
...
New hook: muc_filter_packet
2015-07-21 12:35:27 +03:00
7f4c74dec9
Print content types more gracefully
2015-07-17 14:29:11 +03:00
44cc99d616
Get rid of 'db_type' for mod_blocking in test suite
2015-07-16 13:32:46 +03:00
7395cc910e
Set direction of resource and connection ( #650 )
2015-07-15 21:39:13 +02:00
c53d764119
If local guide.html file not found, redirect to the online guide
2015-07-15 20:45:55 +02:00
3eb0b161b2
Update links to Guide in WebAdmin
2015-07-15 20:40:13 +02:00
65551afcba
Support RTL page direction in WebAdmin for Hebrew ( #650 )
2015-07-15 19:01:32 +02:00
f4376671ac
Set LTR direction to Raw links ( #650 )
2015-07-15 18:51:31 +02:00
c012d7555b
Add links in WebAdmin to ejabberd and ProcessOne ( #661 )
2015-07-15 13:10:12 +02:00
9ede414f01
Support more mod_muc_admin translation strings ( #659 )
2015-07-15 11:54:35 +02:00
062d2d696f
Update dev section to show erl command-line start command
2015-07-11 11:20:38 +02:00
a53191fed5
Add "complete" attribute to MAM final response (EJABS-2484)
2015-07-10 14:05:47 +03:00
8e27decdfd
Fix mod_mam compatibility with RSM for other backends
2015-07-10 13:59:33 +03:00
0dfc8ade68
Fix tests related to MAM
2015-07-10 13:57:27 +03:00
1db65e3614
Fix mod_mam compatibility with RSM (only with odbc backend).
2015-07-10 13:56:33 +03:00
a168340838
During halt only shutdown MUC rooms on local node
2015-07-08 15:35:26 +03:00
6604b9efbb
Fix MAM tests (EJABS-2480).
2015-07-08 15:34:34 +03:00
2598375051
Changed mam iq get to set as specified by XEP-0313 v0.3
2015-07-08 13:15:14 +03:00
0f96414279
Trigger PEP notifications on CAPS updates
...
Let mod_pubsub send last items whenever a contact updates the entity
capabilities. This was already done for remote contacts and is now also
done for local contacts.
2015-07-07 09:33:00 +02:00
edb18deb8f
mod_pubsub: Explain caps_update usage in a comment
...
The reason to use the caps_update hook for sending last items to remote
contacts is probably not obvious.
2015-07-06 23:45:25 +02:00
0770252e9b
Fix dialyzer warning
...
The function is call with binary format from ejabberd_c2s.
2015-07-05 13:33:34 +02:00
b0453ea2ce
Remove ehyperloglog dependency
2015-07-03 13:18:35 +03:00
b7d7dc5201
XEP-0198: Increase timeout during resumption
...
Give gen_fsm:sync_send_all_state_event/3 a little more time to transfer
the (possibly somewhat large) c2s #state during session resumption.
2015-07-03 11:35:22 +02:00
5856f6d06a
XEP-0198: Increase default "max_ack_queue" value
...
During login, clients might receive a relatively large number of stanzas
in one go. For some users, the default value of the "max_ack_queue"
option turned out to be too small in that situation.
2015-07-03 11:35:22 +02:00
a25051fead
New hook: muc_filter_packet
...
Add a hook that allows for modifying or dropping MUC room messages.
Closes #491 .
2015-07-03 11:34:44 +02:00
95138864f4
Let Travis grab MySQL 5.6 from repo.mysql.com
...
We need MySQL 5.6 or newer in order to get support for InnoDB FULLTEXT
Indexes.
Closes #624 .
2015-07-03 01:21:22 +02:00
4045c848c4
Send notifications on MUC configuration changes
...
Notify clients when the room configuration changes, as mandated by
XEP-0045, #10.2.1.
Closes #623 .
2015-07-02 00:36:16 +02:00
3267d4c923
Merge pull request #628 from joudinet/master
...
configure.ac: add AC_CONFIG_MACRO_DIR
2015-06-30 12:06:49 +03:00
0e7d2b73be
configure.ac: add AC_CONFIG_MACRO_DIR
...
Otherwise, autoconf fails to find extra macros defined in the m4
directory.
2015-06-30 10:53:45 +02:00
0474804d4b
Version number must be SemVersion in mix
...
Semantic version expects versioning with 3 components
2015-06-29 23:32:00 +02:00
56034e6ed5
Use https url for git dependencies for consistency
2015-06-29 23:23:31 +02:00
df57a07dd5
Keep the version hardcoded in mix.exs file
...
Generated the mix.exs file through configure is not possible when using mix, as
it does not run configure after having downloaded the dependencies.
#621
2015-06-29 23:14:18 +02:00
3c12d1a960
Do not rely on behaviour info when doing config validation
2015-06-29 22:50:34 +03:00
87d6ad395f
Merge pull request #620 from weiss/omit-non-anon-msg
...
Omit warning message regarding non-anonymous MUC room
2015-06-29 15:18:04 +02:00
7c7e51b6e8
Omit warning message regarding non-anonymous room
...
Previous versions of XEP-0045 suggested sending a warning message to new
occupants of a non-anonymous MUC room. The current revision (1.25) says
that a status code of "100" must be returned with the user's initial
presence, instead. We already do this (in addition to generating the
warning message).
Receiving the warning message each time the client joins the room can
become annoying, especially when reconnections occur frequently (e.g.,
on mobile devices). So, we omit it, now.
2015-06-28 14:05:55 +02:00
4ae1b4db03
When passwords are scrammed, report check_password_hash cannot work ( #559 )
2015-06-25 13:39:45 +02:00
72f35a6dc6
Add xep definition to mod_mam
2015-06-24 11:58:37 +02:00
83cce468a5
Add MAM (XEP-0313) support
2015-06-22 16:56:08 +03:00
6631078884
Document a few more supported protocols
2015-06-22 13:11:37 +02:00
fc0754c609
Add s2s_dhfile to list of known options
2015-06-20 00:14:54 +02:00
73a0fb418c
Update comment that explains how to set up node_mb
...
Specify settings that make sense with current ejabberd versions, and use
the YAML configuration format. Also, specify the "urn:xmpp:microblog:0"
namespace, as that's the microblogging node name currently defined by
XEP-0277.
2015-06-19 23:13:36 +02:00
04038c01f7
PubSub: Check for node subscription of bare JID
...
Don't just check whether the full JID is subscribed when a node
subscription is required to list or publish items. If the bare JID is
subscribed, these requests are now also accepted.
2015-06-19 00:50:08 +02:00
4dc23a5d81
Allow several ';' passed in commands ( #599 )
2015-06-18 14:59:00 +02:00
36a96ae3f5
change_room_option misses handling some room options #604
2015-06-18 13:13:49 +02:00
d528457ba5
Don't force persistence if cache enabled (fix previous commit)
2015-06-18 12:54:46 +02:00
e5a98b100d
Fix max_items and don't let PEP depends on item cache
2015-06-18 12:06:29 +02:00
1cf2dfe63a
New hide_sensitive_log_data option to hide client IP in log ( #452 #471 )
2015-06-17 11:32:42 +02:00
3c47a5bb75
Allow password with ';' passed in ejabberdctl ( #599 )
2015-06-17 08:59:09 +02:00
e608274243
Add s2s_dhfile option to configuration validator
2015-06-16 15:18:34 +02:00
2110b929bc
Merge pull request #581 from weiss/dh-param-file
...
New options: dhfile and s2s_dhfile
2015-06-16 11:59:06 +03:00
dcf5aefea0
Add option to set net_ticktime (EJAB-1742)
2015-06-15 14:57:07 +02:00
357ff6c8f7
Fix bug introduced in commit b88fa6f617
2015-06-04 15:47:02 +02:00
c04053cfae
Use https instead of git in rebar file for dependencies url ( #589 )
2015-06-04 13:12:49 +02:00
fe10c6f6f2
Pick first local multicast service, otherwise remote (ejabberd-contrib#105)
2015-06-04 12:13:10 +02:00
7206bff4a4
Merge pull request #592 from weiss/omit-subject-body
...
Don't add body element to MUC subject messages
2015-06-04 11:04:05 +02:00
6c712b6caa
Don't add body element to MUC subject messages
2015-06-04 09:55:38 +02:00
faa4851dbf
Merge pull request #591 from jpegger/patch-1
...
Anonymous authmodule not registering correctly anonymous users in DB
2015-06-03 20:42:00 +03:00
6f48f22c71
Authmodule using old style XML:get_attr_s()
2015-06-03 18:11:35 +02:00
9a9633dbc5
Do not ignore unknown options so far
2015-06-03 16:21:22 +03:00
c1119b1f39
Remove unused validation code
2015-06-03 16:05:17 +03:00
ab196b4b02
Move opt_type/1 function out of if-else block
2015-06-03 15:52:19 +03:00
730fd55ec9
Fix typo
2015-06-03 15:45:15 +03:00
0ae9ef2b41
Add missing options of ejabberd_logger to validator
2015-06-03 15:25:20 +03:00
83faff37e5
Add missing options of mod_muc to validator
2015-06-03 15:18:09 +03:00
4ed6a3d78f
Fix commands export2odbc, connected_users_vhost and push_alltoall ( #586 )
2015-06-02 12:52:15 +02:00
0de7864880
Merge pull request #585 from CorCornelisse/master
...
push_roster* not updated on binarification
2015-06-02 12:24:46 +02:00
157ff4d093
Merge branch 'master' of github.com:processone/ejabberd
2015-06-01 15:38:37 +03:00
fb6267f38e
Add config validation at startup
2015-06-01 15:38:27 +03:00
9a802185ad
Fix anonymous user login, it wasn't stored in anonymous mnesia table
2015-06-01 14:34:49 +02:00
a9f7d9481f
Do not try to fetch module options via eldap_utils
2015-06-01 15:22:31 +03:00
ea7de2097f
Reorganize get_opt() code in some modules
2015-06-01 15:20:49 +03:00
48213b09ce
Get rid of some fuzzy macros as it makes syntax tools getting mad
2015-06-01 15:19:56 +03:00
22d9011c0c
These arguments should be binary instead of strings, otherwise it won't work properly
2015-06-01 13:30:26 +02:00
100827ec6e
In xmlrpc use process_unicode_codepoints instead of list_to_binary
2015-05-29 15:49:12 +02:00
a291e7d4e6
Fix MUC room options vaildation
2015-05-29 12:08:36 +03:00
6cba7bf834
Add correct package version for mix ( #577 )
2015-05-29 09:30:16 +02:00
e8ffbbb0b4
Validate MUC room options from the configuration file
2015-05-28 11:42:17 +03:00
6a9c9616d0
Merge pull request #582 from badlop/master-badlop-578
...
An auth external module requires ext_mod to be started first (#578 )
2015-05-27 13:49:20 +02:00
d0443bb714
An auth external module requires ext_mod to be started first ( #578 )
2015-05-27 13:10:15 +02:00
5585fb1ecf
New options: dhfile and s2s_dhfile
...
Let admins specify a file that contains custom parameters for
Diffie-Hellman key exchange.
2015-05-26 21:06:04 +02:00
b83c07251c
Fix pubsub/odbc crash on remote user unsubscribe (EJAB-1483)
2015-05-26 19:19:57 +02:00
b2f98099bb
Merge pull request #569 from weiss/send-element-error-checking
...
Update send_element error checking (EJAB-1739)
2015-05-26 15:59:50 +03:00
9574e71e8d
Include session record from header file instead of duplicating it
2015-05-26 10:08:46 +02:00
3af507cc43
Fix merging of not yaml config files
2015-05-25 15:37:46 +02:00
e54e556e01
Fix use of publish_only affiliation with odbc backend
2015-05-22 18:47:17 +02:00
90225a4744
Minor cosmetic changes and add ping command
2015-05-22 17:28:40 +02:00
0d322d8dab
Add fold markers to config file for Vim editors
2015-05-22 12:42:24 +02:00
be6ac85f31
A few more... Fix epmd not in PATH ( #484 )(thanks to acediac)
2015-05-22 10:40:24 +02:00
b07cb1ed84
Use namespace definitions when possible
2015-05-21 17:04:14 +02:00
0c725b5fac
Document protocol support (EJABS-1620)
2015-05-21 17:04:05 +02:00
3b24923458
Fix dialyzer warning in mod_muc_admin:206
2015-05-21 12:00:41 +02:00
b04f3a4c93
Merge pull request #573 from sezuan/fix_odbc
...
Fix some string/binary issues with non-native ODBC drivers
2015-05-21 11:31:47 +02:00
3188941af2
Add minor robustness on cluster scripts
2015-05-20 14:06:03 +02:00
fcdb519770
Add missing sm table (thanks to Rasim Kalimullin)(EJAB-1740)
2015-05-20 13:50:59 +02:00
8985a47468
Merge pull request #576 from processone/revert-570-fix_added_sm_table_to_pg
...
Revert "added sm table to pg.sql"
2015-05-20 13:59:04 +03:00
05011e6918
Revert "added sm table to pg.sql"
2015-05-20 13:57:44 +03:00
da68b9a572
Merge pull request #570 from sezuan/fix_added_sm_table_to_pg
...
added sm table to pg.sql
2015-05-20 13:46:02 +03:00
889459b45c
Fix function specification
2015-05-20 12:13:15 +02:00
1854b5e411
Remove obsolete doc and win32 files (EJAB-1738)
2015-05-20 11:43:29 +02:00
3b267eaa61
Do not bounce normal messages sent to unavailable resource
2015-05-19 10:58:36 +03:00
fba13a0b93
Simplify XEP-0203 (Delayed Delivery) code a bit
...
Now that XEP-0091 support is removed, the XEP-0203 code can be
simplified a little further. This doesn't change the behavior.
2015-05-18 21:26:51 +02:00
8bb994dbca
Call integer_to_binary using jlib ( #554 )
2015-05-18 17:30:25 +02:00
dfbef8be8f
Remove XEP-0091 tags from test suite
2015-05-18 14:38:57 +02:00
2af659b737
Remove deprecated XEP-0090 Entity Time and 91 Delayed Delivery (EJAB-849)
2015-05-18 12:38:25 +02:00
16532dd643
Fixed some string()/binary() issues in ejabberd_odbc
2015-05-18 12:14:56 +02:00
555c1736b7
Revert "Fix EJABBERD_OPTS quoting for Elixir"
...
This reverts commit 2a15453d98
2015-05-18 00:48:56 +02:00
e66b45d886
Merge pull request #571 from sezuan/fix_export_term
...
fixed erl_prettypr in encode_term
2015-05-17 22:44:14 +03:00
0800a9733c
pg - added sm table
2015-05-17 21:38:33 +02:00
f5c9dfbc93
fixed erl_prettypr in encode_term
2015-05-17 19:37:49 +02:00
084d0c4efe
New command get_room_options ( #567 )
2015-05-15 17:47:10 +02:00
61afd668c2
Fix indentation
2015-05-15 15:50:43 +02:00
de7ff536b2
Load config snippets for modules installed with ext_mod (EJAB-1741)
2015-05-15 12:30:15 +02:00
5dbe7a3c6c
Export modules_dir/0
2015-05-15 12:27:59 +02:00
6efce7f706
Cosmetic change: Simplify error checking
...
Let send_stanza_and_ack_req/2 update the #state instead of propagating
the value returned by send_element/2. This doesn't change the behavior.
2015-05-14 01:04:23 +02:00
42c7205739
Don't assume send_element/2 returns ok or error
...
Let send_text/2 and (therefore) send_element/2 return {error, Reason}
instead of error for consistency, and let send_stanza_and_ack_req/2
interpret any non-ok value as an error. (EJAB-1739)
2015-05-14 00:58:36 +02:00
dbcfd38c18
Allow run joincluster as non root when ejabberd installed as root ( #497 )
2015-05-13 15:54:28 +02:00
09f5565ca0
Merge pull request #503 from weiss/fix-quoting-for-elixir
...
Fix EJABBERD_OPTS quoting for Elixir
2015-05-13 15:46:40 +02:00
d885435552
Fix setting 'description' with change_room_option command ( #567 )
2015-05-12 17:37:39 +02:00
eca3b46ee1
Merge pull request #560 from benlangfeld/feature/dev-vm
...
Point out availability of development environment
2015-05-12 09:52:12 +02:00
f817762cc4
New max_users_presence mod_muc option (thanks to anhcoi123)( #562 )
2015-05-08 13:09:25 +02:00
25beb46391
Fix check_password_hash argument parsing ( #559 )
2015-05-08 12:04:04 +02:00
7ab6c4b4fd
Try to support access_commands in YAML (ejabberd-contrib#45)
2015-05-07 18:34:05 +02:00
b0b004b26e
Revert "Add private and roster local handlers (EJAB-682)" due to #556
...
This reverts commit 2e194bd997
2015-05-07 17:07:49 +02:00
f7d9bb7ce4
Don't announce register feature once user is authenticated ( #41 )
2015-05-07 11:41:59 +02:00
917d48f30b
Use SASL PLAIN authzid as client identity if auth module permits it
...
This allows the authentication modules to perform SASL proxy authentication. It puts the onus on them to authorize the authcid to masquerade as the authzid. Doesn't currently implement such functionality in existing auth modules, since they cannot currently codify a relationship between the two identities. Does not permit the authzid to use a domain differently from the one of the connection.
Note: digest might not work, but I have no interest in it, being deprecated.
2015-05-06 14:12:15 -03:00
d9814709e2
Remove commented code
2015-05-06 12:55:35 -03:00
b0b3870b2e
Merge pull request #561 from weiss/muc-mark-private
...
Tag private MUC messages with muc#user namespace
2015-05-06 13:56:13 +03:00
7297b23508
Tag private MUC messages with muc#user namespace
...
Make it possible for clients to identify private MUC messages. One use
case would be to filter out undesired carbon copies of those.
2015-05-05 22:00:05 +02:00
6eab111d05
Point out availability of development environment
2015-05-05 09:24:41 -03:00
fa99519f8b
Simplify internal code of get_last and set_last commands
2015-05-05 12:54:20 +02:00
96c62acb1b
Improve get_last command to provide also last activity status
2015-05-05 12:46:21 +02:00
77e57afae1
Fix set_last command to work with recent ejabberd ( #555 )
2015-05-05 12:45:53 +02:00
60fe008268
Remove duplicated code
2015-04-29 14:51:45 +03:00
6987e85602
Improve module install code, allows better error checking
2015-04-29 13:30:03 +02:00
7492ecae52
New command get_user_rooms
2015-04-29 13:22:49 +02:00
4440b03b89
Fix fetching from git@github url and allow compilation from ejabberd sources
2015-04-29 10:19:15 +02:00
01718a4e42
Merge pull request #549 from joudinet/master
...
ejabberdctl: define mnesia options
2015-04-28 17:34:57 +02:00
6f99775115
Merge pull request #547 from weiss/fix-account-jid-disco
...
Fix service discovery handling for account JIDs
2015-04-27 19:39:32 +02:00
bd43385415
ejabberdctl: define mnesia options
...
In addition to factorize how the mnesia dir option is given to erl
commands, it allows one to set extra mnesia options via the
MNESIA_OPTIONS environment variable.
2015-04-27 17:25:07 +02:00
987e337c66
Rely on core routine for handling affiliation changes (thanks to Ben Langfeld)
...
This ensures that all of the usual stanzas and such go out
2015-04-27 17:00:22 +02:00
dc449687a0
mod_disco: Apply minor readability improvements
2015-04-26 16:36:17 +02:00
0edba763fb
mod_disco: Omit 'roster_get' call if possible
...
As a small optimization, avoid running the 'roster_get' hook in the
(common) case where a client requests service discovery information for
its own bare JID.
2015-04-26 16:32:03 +02:00
50f35f1b07
Fix service disco handling for bare account JIDs
...
Don't swap the sending and receiving JIDs while checking whether the
client that requested service discovery information for a bare account
JID is a subscribed contact.
2015-04-26 16:22:09 +02:00
9c85cb5f25
Fix validating function for iqdisc
2015-04-23 14:59:18 +03:00
23aa8598ab
Allow bypassing script interraction ( #516 )
2015-04-23 10:14:08 +02:00
38dd44e18f
Improve purge_offline filter and speed ( #543 )
2015-04-22 18:11:39 +02:00
df3afafb48
Add publish_only to affiliation type spec
2015-04-22 18:10:35 +02:00
2e194bd997
Add private and roster local handlers to get listed in disco#info (EJAB-682)
2015-04-22 13:27:25 +02:00
43f2064daa
Remove obsolete release notes
2015-04-22 12:21:48 +02:00
e280de8452
Allow to modify host when registering account in web ( #291 )
2015-04-22 11:01:47 +02:00
6e4d6caebf
Add support for publish-only ( #30 )
2015-04-21 17:23:59 +02:00
cf37f3977a
Fix typo, oups...
2015-04-21 16:13:23 +02:00
61f80396da
remove deferred Collection shim header
2015-04-21 16:11:00 +02:00
cbd45974e2
Owner can subscribe to its node ( #454 )
2015-04-21 15:24:31 +02:00
747d25b4ad
Fixed node type (thanks to saczawap) ( #435 )
2015-04-21 15:24:24 +02:00
e0563e3918
PubSub improvements
...
This commit contains
- code cleanup
- use of db_type instead of old mod_pubsub_odbc
- some minor optimizations
- some minor bugfixes
2015-04-21 15:24:16 +02:00
63926efd20
Improve join/leave cluster scripts
2015-04-21 13:32:14 +02:00
28090a3958
Merge pull request #540 from weiss/queue-error-stanza
...
Add privacy error stanza to XEP-0198 queue
2015-04-21 11:19:49 +02:00
ed79a61752
Fix LDAP substrings filter (EJAB-1715)
2015-04-21 11:49:41 +03:00
94936b261e
Add privacy error stanza to XEP-0198 queue
2015-04-20 22:03:18 +02:00
fd54181435
Fixed error replying on blocked messages
2015-04-20 17:19:09 +03:00
e8576c23c5
Make s2s port configurable in test runner
2015-04-20 16:16:30 +02:00
c2e6ce0f04
Remove load_config command because is superseded by reload_config ( #532 )
2015-04-20 15:57:44 +02:00
837706e9d9
Merge pull request #536 from weiss/fail2ban-whitelist
...
Add mod_fail2ban option to whitelist IP addresses
2015-04-18 12:28:36 +03:00
aa36742a40
mod_fail2ban: Add 'access' option for whitelisting
...
Closes #535 .
2015-04-18 11:08:05 +02:00
c01940f33c
cyrsasl_scram: Return user name with error message
...
Let ejabberd_c2s run the 'c2s_auth_result' hook (which needs the user
name) on SCRAM authentication failure.
2015-04-17 20:21:11 +02:00
afdc269825
ejabberd_s2s_out: Remove Erlang/OTP version check
...
The version check won't work for Erlang/OTP >= 17; and it's no longer
needed, as we don't support versions older than R16 anyway.
2015-04-16 23:51:16 +02:00
b447839592
CSI test: Simplify and improve readability
2015-04-16 23:20:14 +02:00
01b3defb86
CSI test: Fix race when slave becomes active again
...
Make sure the server processed the slave's active request after the
previous test stanzas were received by the slave and before the final
Chat State notification is sent by the master.
2015-04-16 08:45:17 +02:00
d624753410
Update get_password_s description with SCRAM return values
2015-04-15 11:51:34 +02:00
a5adaf5798
Revert "Hook on group message"
...
This reverts commit b81250d667
2015-04-15 11:51:29 +02:00
63d6d68979
Make sure that server processed our inactive request before processing further in testing
2015-04-15 11:21:37 +02:00
31c5775025
Merge pull request #426 from hairyhum/master
...
Migration of scram passwords with piefxis (riak and internal only)
2015-04-15 11:04:29 +02:00
ba69c469b5
Remove http_poll module
...
For couple years browsers did limit ability to change cookies from js
for different domains, this made http_poll connections practically not
usuable. I don't think this module is used at all so it's time to put it
to rest.
2015-04-15 10:47:10 +02:00
a1f81057ca
Enable websocket connection in default config file
2015-04-15 10:35:17 +02:00
e408276283
Don't forget gen_tcp:listen/2 options
...
Fixes #530 .
2015-04-14 20:22:34 +02:00
b67af5e036
Fix nick logging in mod_muc_log plaintext ( #522 )
2015-04-14 15:46:59 +02:00
25449a076f
Clean multicast routing code detected by xref
2015-04-10 16:02:45 +02:00
b9fdcc3985
Add ability to configure parameters used by "make test" with test/config.ctc
2015-04-09 17:14:30 +02:00
e8701802ee
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
2797fa16a6
Show received input and expected input in ?recv* macros in case of failure
...
Throwing catch clause error is not that good for finding out what happened
2015-04-09 16:05:26 +02:00
8732817c3c
Fix problem with pushing bufferend #xmlel-s to receiver in websocket code
2015-04-09 13:35:37 +02:00
f129c6530c
Fix bug when sorting the list of rooms in WebAdmin
2015-04-08 15:34:08 +02:00
32b60d4250
Remove hack with binary to integer conversion
2015-04-08 16:11:06 +03:00
7a89dda816
Merge branch 'master' of github.com:processone/ejabberd
2015-04-08 15:31:41 +03:00
9b4942890d
Add virtual host support for SQLite
2015-04-08 15:31:28 +03:00
0cf8d1fa6e
Copy multicast code from ejabberd-contrib to provide XEP-0033 ( #521 )
2015-04-08 14:01:16 +02:00
fb0e82f743
Add SQLite3 library checks at the configure script
2015-04-08 14:49:14 +03:00
675c428f21
Disable awkward trap_exit flag
2015-04-08 14:40:28 +03:00
bdedcf8d8a
Enable FOREIGN KEYS by default
2015-04-08 14:39:47 +03:00
2a3a2d9804
Make sure SQLite always returns binaries
2015-04-08 14:38:04 +03:00
5a820aca40
Merge pull request #486 from saa/sqlite_support
...
Add SQLite support
2015-04-08 14:34:56 +03:00
c3280e9dad
Add mod_muc_admin contrib.
2015-04-07 17:05:43 +02:00
0fd4984c23
ejabberd_listener: Remove Erlang/OTP version check
...
We don't support Erlang/OTP versions older than R16 anyway.
2015-04-07 09:47:05 +02:00
b81b0d0be9
Merge pull request #518 from liudanking/master
...
fix otp version check in ejabberd_listener.erl listen_tcp/5
2015-04-07 10:34:18 +03:00
c140f98276
Explicitly start crypto with start
...
This is to please Elixir / Phoenix enviroment
2015-04-07 09:03:37 +02:00
f981a53f9a
fix otp version check in listen_tcp/5
2015-04-07 09:28:35 +08:00
2a94c68724
Don't call send_element/2 if previous call failed
...
Be sure not to try sending data over a TCP socket that is no longer
usable.
2015-04-06 22:34:48 +02:00
81b0643036
Fix problem with c2s buffering on old style websocket connections
...
Old style websocket do use binaries for transferring data to C2S, so when
we buffer that data we need to handle it different than list of #xml structs
used by new style connections.
This fixes github issue #515 .
2015-04-06 17:54:45 +02:00
64978b3d9c
Merge pull request #513 from weiss/ignore-header-case
...
ejabberd_websocket: Ignore case of HTTP header values
2015-04-06 17:49:51 +02:00
34f8f6d868
Explicitely start crypto module
...
Without explicit start, it causes issue when embedding ejabberd into other apps.
2015-04-06 13:46:09 +02:00
cc247c5510
Fix compilation result for asn1 files
2015-04-06 12:39:21 +02:00
1106afb2f6
Remove unused variable
2015-04-06 12:31:32 +02:00
cf83a75ceb
Fix asn1 module compilation with mix
...
This should solve building ejabberd as an Elixir dependency.
2015-04-06 12:29:11 +02:00
69bff82301
Fix type spec
2015-04-06 12:38:54 +03:00
47537aa901
Make sure Mnesia dir environment and log file are list, not binary
...
This is useful for Elixir configuration, as binary is the more natural data type.
Closes #514
2015-04-06 11:36:16 +02:00
0cd77ab942
ejabberd_websocket: Ignore case of header values
...
RFC 6455 says that the client's opening handshake includes an Upgrade
header field "containing the value 'websocket', treated as an ASCII
case-insensitive value."
Closes #510 .
2015-04-05 14:48:08 +02:00
ea8db9967f
ejabberd can be embedded in an Elixir application
2015-04-04 17:42:12 +02:00
7d3b2cad26
Replace crypto calls that will be removed in a future release
2015-04-04 14:09:58 +02:00
cf40daf663
Replace undefined value with empty one ( processone/ejabberd-contrib#92 )
2015-04-04 13:48:17 +02:00
1fa73fd33f
Remove unused case clauses to make dialyzer happy
2015-04-03 20:37:42 +02:00
94761ff31e
Improve srg_get_info result format ( processone/ejabberd-contrib#92 )
2015-04-03 12:16:11 +02:00
088c5c4672
Fix output formatting in srg_get_info commend from mod_admin_extra
2015-04-02 16:55:51 +02:00
b580da3547
Fix problems with get_vcard* functions from mod_admin_extra
2015-04-01 16:32:34 +02:00
cf3b4dbc7b
Drop exmpp usage from mod_admin_extra
2015-04-01 15:44:49 +02:00
305b281c15
Merge pull request #493 from weiss/rfc-6121-routing
...
Update ejabberd_sm's routing rules as per RFC 6121
2015-04-01 11:41:05 +03:00
821039b7d5
Swap 'mnesia' and 'internal' types correctly
2015-03-30 12:25:25 +03:00
fb1fd50df5
The 'default_db' option should impact ejabberd_auth as well
2015-03-30 12:18:18 +03:00
4af15df546
Add new 'default_db' option
2015-03-30 12:15:29 +03:00
15af88a09a
Fix lite.sql and convert binary to integer
2015-03-27 22:14:29 +03:00
176114d28e
Try to fix more Dialyzer warnings
2015-03-27 15:55:57 +01:00
9c96d30719
Ensure set_presence changes are kept in state (thanks to Davide Colombo)(EJAB-1184)
2015-03-27 15:03:14 +01:00
a8f2cbac75
Remove tools/configure.erl as it's not used and can cause problem with make install
2015-03-27 13:22:50 +01:00
30dc82a98a
Fix even more dialyzer warnings
2015-03-27 12:28:24 +01:00
8707c0b045
Fix set_presence command (ejabberd-contrib#61)
2015-03-27 11:43:56 +01:00
10dfd182f6
Fix more mod_admin_extra commands
2015-03-26 20:41:16 +01:00
9b3dda105d
Fix problems in process_rosteritems command
2015-03-26 16:18:39 +01:00
392772977f
Add mod_admin_extra as a commented module
...
Previous commits were done with:
for i in `git log --reverse --date-order --format=%h mod_admin_extra.erl`; do git format-patch -1 $i; cat 00* >>patch; rm 00*; done
Then editing patch to remove unneeded files and fix path.
2015-03-26 14:01:01 +01:00
fbb6b65192
Detect correctly when vCard does not exist ( #21 )
2015-03-26 14:00:58 +01:00
0c30beb93d
Fix return error when requesting non-existing vcard value ( #21 )
2015-03-26 14:00:54 +01:00
c9393bc4f4
Ignore errors when retrieving status if the users just got offline
...
Fix possible race condition.
2015-03-26 14:00:50 +01:00
5103ed1c3b
mod_admin_extra: Let send_message omit subject
...
Let the send_message command omit the subject if the user either
specified an empty subject or a message type of "chat".
2015-03-26 14:00:48 +01:00
88cd8c7b12
Update FSF address (solves #73 )
2015-03-26 14:00:46 +01:00
00fe68ed06
fix connected_users_info in mod_admin_extra
2015-03-26 14:00:44 +01:00
09dd288ac0
mod_admin_extra: Fix private_get/private_set types
2015-03-26 14:00:42 +01:00
2186c03a9c
Support TEL XXX in set and get_vcard commands
2015-03-26 14:00:40 +01:00
441d48f080
Changed signature of user_sessions_info to take binaries rather than strings as it doesn't match anything in mnesia if it searches it by string
2015-03-26 14:00:38 +01:00
c3afc3c7c0
Join three send_message_* commands in one (PR #68 )
2015-03-26 14:00:36 +01:00
9a64bfe605
add send_message_normal command
2015-03-26 14:00:34 +01:00
ca25d44c8b
fix mod_admin_extra stats command
2015-03-26 14:00:32 +01:00
4e9b4cbc11
mod_admin_extra: Fix stats(_host) argument types
2015-03-26 14:00:30 +01:00
46b33b51b4
Update kick_session to work with ejabberd master
2015-03-26 14:00:28 +01:00
3eebf100f9
Binary conversions
2015-03-26 14:00:24 +01:00
5c0a1dde1c
More binary conversions
2015-03-26 14:00:21 +01:00
949705b04a
Update add_roster_item and get_roster to ejabberd 13
2015-03-26 14:00:18 +01:00
f682dfe3a6
Fix get_vcard and set_vcard when using option module_resource (issue #21 )
2015-03-26 14:00:16 +01:00
14a3662ca4
Fix add_rosteritem, delete_rosteritem, and get_roster
2015-03-26 14:00:14 +01:00
ffea2bf350
Update get_vcard and set_vcard to ejabberd 13 (fixes issue #21 )
2015-03-26 14:00:12 +01:00
f314da7b1f
mod_admin_extra: for support in ejabberd-v13.x changed args from string to binary : all changes tested with ejabberdv13.12
2015-03-26 14:00:10 +01:00
d72c739630
Fix command change_password ( fixes #16 )
2015-03-26 14:00:08 +01:00
57035b383c
Handle error when requesting information of a non-existing shared roster ( fixes #14 )
2015-03-26 14:00:06 +01:00
2746e358b3
Fixes srg_* commands ( fixes #147 )
2015-03-26 14:00:04 +01:00
d66f40d94f
Fix srg_create when calling ejabberd_regexp (fixes issue #12 )
2015-03-26 14:00:01 +01:00
e6a9c5ccee
Add get_last to ejabberdctl for last user activity (thanks to lehrblogger)
...
The logic for determining the response is borrowed from here:
https://github.com/processone/ejabberd/blob/6d811f5178e000def445e12deaa0d587004efc67/src/web/ejabberd_web_admin.erl#L1583-L1601
2015-03-26 13:59:59 +01:00
f0cf90c11e
Initial import from ejabberd-modules SVN
2015-03-26 13:59:57 +01:00
de26af3fdb
Make sure that we send each time <close> before closing websocket connection
2015-03-25 17:10:08 +01:00
d9ad26b4ec
If command crashes, return restuple with error and explanation (ejabberd-contrib #21 )
2015-03-25 13:57:08 +01:00
f40e6a0421
Don't bother with filtering out PEP error messages
...
Now that ejabberd_sm won't deliver error messages that were sent to bare
JIDs anymore, PEP error messages should no longer arrive.
2015-03-25 02:02:08 +01:00
1b1878409f
Route headlines sent to bare JIDs to all resources
...
As per RFC 6121, deliver headline messages that were sent to a bare JID
to all resources with a non-negative priority, not just to those with
the highest priority. If no such resource is available, discard them
silently.
2015-03-25 01:17:35 +01:00
8f9a2d6df8
Don't route error/groupchat messages to bare JIDs
...
As per RFC 6121, drop error messages that were sent to bare JIDs, and
return an error if a groupchat message was sent to a bare JID.
2015-03-25 00:52:49 +01:00
bc008d4041
Update routing for unavailable resources
...
As per RFC 6121, don't reroute non-chat messages sent to unavailable
resources.
2015-03-25 00:13:05 +01:00
33c9f21171
Return error when incoming message is blocked
...
As per XEP-0016 and XEP-0191, return a service-unavailable error when an
incoming message was blocked by a privacy list. This lets the user
appear offline to the contact.
2015-03-24 23:10:47 +01:00
27a4d783a5
Fix "IP address not available" error message
2015-03-24 17:32:57 +01:00
736710cc9c
Add support for ciphers and protocol_options in ejabberd_http
2015-03-24 18:14:47 +03:00
8f46ca48c1
export CONTRIB_MODULES_PATH (thanks to sezuan)( #489 )
2015-03-24 16:00:56 +01:00
b6999b126a
Make R16B03-1 the minimal reguired otp version
2015-03-23 14:54:29 +01:00
31e356c126
Avoid crypto:hmac/3 call for R15B compatibility
2015-03-21 22:56:23 +01:00
a5d6044448
Fix compilation on Erlang R15B
2015-03-21 22:06:38 +01:00
477d27a3dc
Remove duplicate CREATE INDEX in mysql.sql
2015-03-21 23:41:43 +03:00
8b23727cc6
Start ext_mod before module as it's setup contrib path
2015-03-20 15:06:02 +01:00
5135e30633
Removed deprecated calls to crypto:sha_mac in scram.erl
2015-03-20 14:09:38 +03:00
f6db84282b
Add ejabberd_auth_odbc:convert_to_scram/1
2015-03-20 13:46:17 +03:00
e575c87ea2
Add SCRAM support to ejabberd_auth_odbc
2015-03-20 13:45:24 +03:00
0eb6b942ff
Add a missed SQL index on privacy_list_data table
2015-03-20 10:40:25 +01:00
6b67a66a1b
Added MySQL support for delete_old_messages (offline) command.
2015-03-20 10:40:19 +01:00
4d2924a3ef
Fix mod_offline termination
2015-03-20 10:40:13 +01:00
b7726ee392
Explicitly set standard_conforming_strings to off with PostreSQL
2015-03-20 10:39:29 +01:00
51508a9fc3
Report TLS errors
2015-03-20 10:39:14 +01:00
5ae01e8bb4
Add SQLite support
2015-03-20 01:10:47 +03:00
7976d3eb48
Fix epmd not in PATH ( #484 )
2015-03-18 22:26:06 +01:00
1dd23ecb41
Update 'rsm_in' record element types
...
The jlib:rsm_decode/1 function sets the 'max' and/or 'index' elements of
the returned 'rsm_in' record to 'error' if the parsed strings cannot be
converted to integer values.
2015-03-18 00:28:10 +01:00
aa1250a3dd
Add missing list_to_binary call
2015-03-13 17:59:19 +01:00
5b9635cc07
Add contributed modules code path on start
2015-03-13 12:20:25 +01:00
588f98fc3a
Rename module function to keep them grouped on help
2015-03-13 11:54:32 +01:00
4a58101014
Merge pull request #473 from weiss/escape-space-in-options
...
ejabberdctl: Escape whitespace in ERL_OPTIONS
2015-03-13 11:41:26 +01:00
9bd47fde35
ejabberdctl: Escape whitespace in ERL_OPTIONS
...
If ERL_OPTIONS="-opt arg" is specified, make sure the space character
between "-opt" and "arg" is retained.
Fixes #143 .
2015-03-13 11:40:23 +01:00
f72799b3cc
Improve module structure
2015-03-13 13:05:16 +03:00
bbe5c6b74e
Do not fail on badly formed SQL results
2015-03-13 12:59:16 +03:00
c7dc56c314
Fix unblock all when Riak is used as a backend
2015-03-13 12:47:08 +03:00
6093dedb65
Extra arguments to cluster scripts are not mandatory
2015-03-13 09:56:51 +01:00
85a478f7d1
Remove trailing space to get correct arguments
...
This allows to remove any argument to joincluster/leavecluster scripts
when no parameters has been added after the ctl command.
2015-03-13 09:47:12 +01:00
0cc4cad480
ejabberdctl: Escape whitespace in ERL_OPTIONS
...
If ERL_OPTIONS="-opt arg" is specified, make sure the space character
between "-opt" and "arg" is retained.
Fixes #143 .
2015-03-13 09:27:55 +01:00
6447aeb726
Replace bashism in ejabberdctl
2015-03-12 19:29:41 +01:00
bf5c7198fc
Update sockmod() type after adding websocket support
2015-03-12 13:15:31 +01:00
7209954a5f
Remove unused clause
2015-03-12 13:15:07 +01:00
e855791f16
Update types to fix dialyzer warnings
2015-03-12 10:34:34 +01:00
b045bd806a
mod_offline: Remove a few superfluous newlines
2015-03-11 20:38:22 +01:00
0bfde19ebd
Don't crash in mod_offline:export/1
...
(Thanks to Christophe Romain.)
2015-03-11 20:35:08 +01:00
2d53f7f83e
start ext_mod in later stage at init
2015-03-11 17:39:07 +01:00
a1a46f7df5
Remove unused code
2015-03-11 17:15:42 +01:00
c9b82ff1e5
Compile contributed module with lager if enabled in ejabberd
2015-03-11 14:35:01 +01:00
f77622067b
Add packaging support for contributed modules
...
This is a preliminary version that is tested to work with the packaging
branch of ejabberd-modules repository
This version lacks automatic configuration include at runtime
2015-03-11 14:14:28 +01:00
a0fafc383a
Add Redis backend for SM
2015-03-11 14:46:57 +03:00
d991b92a49
Always specify room JID for MUC <delay/> elements
...
As per version 1.25 of XEP-0045, use the room JID as the 'from' address
for <delay/> elements also when the room is non-anonymous, and specify
the original JID of the sender as an XEP-0033-style tag instead.
Closes #465 .
2015-03-10 00:02:32 +01:00
0a88255ef6
Merge pull request #467 from hamano/mod_offline_restart
...
change mod_offline restart type
2015-03-09 19:26:19 +01:00
c0540e1377
Fix R15B compilation
2015-03-09 17:50:14 +03:00
72d9b099c6
Make it possible to use SQL as an SM backend
2015-03-09 16:41:13 +03:00
36b7da3ad8
Add forgotten header file
2015-03-09 16:39:29 +03:00
86e03f3828
Separate db backend from the SM
2015-03-09 14:57:33 +03:00
f55de94314
change mod_offline restart type
2015-03-09 20:28:55 +09:00
db9a400279
Merge pull request #466 from mremond/hooks_refactor
...
Hooks module refactor
2015-03-09 09:34:54 +01:00
8fef3d1f3f
Reorganize / clean ejabberd_hooks header
2015-03-08 19:03:02 +01:00
a339df2d6a
More ejabberd_hooks refactor
2015-03-08 18:44:43 +01:00
fd91ee5169
ejabberd_hooks refactor and better types
2015-03-08 18:23:22 +01:00
6b0bcfa5d7
Suppress warnings in Elixir test
2015-03-08 18:22:14 +01:00
750fefcd6d
Add Elixir test on ejabberd hooks
...
This is to prepare ejabberd_hooks module refactoring.
I also expanded API to help with testing.
2015-03-08 17:06:43 +01:00
5be957f23b
Merge pull request #462 from mremond/add-meck-tool-dependancy
...
Add Meck dependency when building for development
2015-03-07 12:53:47 +01:00
915012766e
Add Meck dependency when building for development
...
This allows writing tests with mock functions.
Fixes #439
2015-03-07 12:44:17 +01:00
e3336ad124
Merge pull request #461 from mremond/fix-r16-tests
...
Test file can be compiled under R16
2015-03-07 12:41:59 +01:00
d3a2fa1e9a
Test file can be compiled under R16
...
Fixes test failing under R16 due to elixir_suite build syntax error.
The test will never be run under r16 as Elixir requires r17 and map
anyway.
2015-03-07 12:31:11 +01:00
f845299eb2
Merge pull request #460 from mremond/run-elixir-test
...
Fix Elixir tests failure detection
2015-03-07 11:59:44 +01:00
da468db648
Fix Elixir tests failure detection
...
We now make sure we have no failure.
Solves #438
2015-03-07 11:49:37 +01:00
8cf4ef0aac
add mnesia cluster helper scripts
2015-03-06 15:42:41 +01:00
f18ce9564c
Fix: default_host is forgotten between consecutive HTTP requests ( #416 )
2015-03-06 12:40:48 +01:00
e0228e9b7a
Access list editing broken in web_admin ( #252 )
2015-03-05 11:34:25 +01:00
e575f401cd
Accept configuration file with .yaml extension ( #290 )
2015-03-04 17:18:57 +01:00
8a99287374
Merge branch 'master' of github.com:processone/ejabberd
2015-03-03 22:20:08 +01:00
f0f8301b5e
Fix typo on state reuse
...
It should help with the crash on #453
2015-03-03 22:19:51 +01:00
02dd3ae0af
Merge pull request #441 from mremond/test/#438/run-elixir-tests
...
Support for running Elixir ExUnit tests from Common Test
2015-03-03 22:15:24 +01:00
cffe0b0dfe
Fix IPv6 loopback address in the guide
...
Thanks to Erik Huelsmann for spotting this.
2015-03-03 21:23:11 +01:00
7c4efca361
Merge pull request #448 from hamano/ja
...
update japanese translation.
2015-03-02 11:09:06 +01:00
a265ea53f9
Merge pull request #384 from weiss/fix-last-item-type
...
Use correct message type when sending last published PEP/PubSub items
2015-02-27 11:40:12 +01:00
c1f7b30045
additional japanese translation.
2015-02-27 19:21:47 +09:00
83c2dd78a7
Update Spanish translation
2015-02-26 17:57:51 +01:00
97ae67b8d6
Run "make translations" to update PO and MSG files
2015-02-26 17:16:27 +01:00
a1f4206fbe
Merge pull request #445 from hamano/ja
...
improve japanese translation
2015-02-26 17:13:35 +01:00
e8039f3609
improve japanese translation
2015-02-26 23:42:52 +09:00
1b67ac0c20
Update remanining old RFC links (EJAB-1728)( #444 )
2015-02-26 12:18:51 +01:00
e10d5af303
Merge pull request #443 from mojolingo/feature/muc_admin/affiliation-change-propogate-xmpp
...
Permit modifying affiliations via an event
2015-02-26 11:48:17 +01:00
96025bfc6e
set-dep-versions: Cope with branches
...
Handle the case where a branch name is specified for a rebar dependency,
as we now do for Elixir.
2015-02-26 00:02:11 +01:00
a6c5a3593f
Permit modifying affiliations via an event
...
Allows us to implement mod_muc_admin:set_room_addiliation properly
2015-02-25 12:31:27 -03:00
5bd8724801
Update FSF address
2015-02-25 15:19:33 +01:00
ab3d38c9fc
Fix processing POST messages after changes from adding websocket handling
2015-02-25 14:36:48 +01:00
8e33f31f50
Try not to use c2s:send_text, it causes problem with websocket
2015-02-25 13:57:03 +01:00
b42b171613
Add support for websocket connections
2015-02-25 13:57:02 +01:00
2a15453d98
Fix EJABBERD_OPTS quoting for Elixir
2015-02-24 23:59:39 +01:00
011099ce43
Merge pull request #442 from weiss/use-stable-elixir
...
Use Elixir's 'v1.0' branch
2015-02-24 12:46:56 +01:00
3dd3044ab8
Use Elixir's 'v1.0' branch
...
The stable Elixir releases are currently built from the 'v1.0' branch,
so let's use that.
2015-02-24 12:12:22 +01:00
b81250d667
Hook on group message
2015-02-24 11:06:41 +03:00
6a094f9118
Merge branch 'master' of github.com:processone/ejabberd
2015-02-23 15:52:23 +01:00
e0ffcbe45d
Add script for systemd (Guthub #434 )
2015-02-23 15:52:18 +01:00
d4cf42dcc3
Increase common test timeout
...
This is needed to cope with long launch time on small / slow VM.
Fixes #440
2015-02-23 11:03:15 +01:00
0c0947a241
Add compatibility macros for deprecated types (thanks to Alexey)
2015-02-23 09:58:00 +01:00
17be6a303b
Improve comments for running Elixir tests
2015-02-22 17:45:25 +01:00
510a717dbb
Support for running Elixir ExUnit tests from Common Test
2015-02-22 17:41:17 +01:00
d8b048663d
Update links
2015-02-19 12:17:39 +01:00
ab5dd79ca2
Display build status
2015-02-19 12:10:25 +01:00
725af2de45
Update mod_vcard_ldap Guide documentation from Erlang to YAML format (Github #274 #394 )
2015-02-17 13:41:06 +01:00
e87d332394
mod_carboncopy: Apply small code simplification
2015-02-12 00:14:57 +01:00
bc7f93ad1e
Check availability before carbon copying
...
Before generating a carbon copy for a resource, make sure it's actually
available. This handles the case where, for some reason, the
'unset_presence_hook' wasn't called during logout of a resource. Carbon
copies sent to that resource would otherwise be re-routed to another
resource (which might've received a copy of that message already).
2015-02-11 16:12:08 +01:00
9f822dd2b8
Don't crash if 'request_path' has unexpected type
2015-02-11 15:38:55 +01:00
3cba2cb1ec
Fix incorrect Elixir name
2015-02-11 10:19:40 +01:00
834c680f97
Remove unused function clause in mod_carboncopy
2015-02-11 00:52:47 +01:00
f075e92f08
Fix "make install" without Elixir support
...
Don't bail out during "make install" when ./configure was called without
"--enable-elixir".
2015-02-11 00:23:40 +01:00
fbb512cb5a
Disable elixir support in travis tests
2015-02-10 18:22:54 +01:00
0f80523736
Merge pull request #429 from mremond/master
...
Add Elixir support to ejabberd
2015-02-10 18:10:27 +01:00
01e1f677c7
Add Elixir support to ejabberd
2015-02-10 17:56:44 +01:00
cf929e730f
Document EJABBERD_CONFIG_PATH in ejabberdctl.cfg
2015-02-10 00:15:06 +01:00
5c32ba49e2
README: Mention commands in the right order
2015-02-09 14:57:23 +01:00
2ccbff3b98
README: Mention how to create "configure" script
2015-02-09 14:31:59 +01:00
d00f0fb1f4
Don't convert configuration values to strings
2015-02-09 01:08:01 +01:00
7fd7e53e4a
Fix typo in debug message
2015-02-08 23:49:17 +01:00
eb52c118d0
Migration of scram passwords with piefxis (riak and internal only)
2015-02-05 18:44:08 +03:00
ed502673f4
List all available commands in the guide (EJAB-1735)
2015-01-28 17:54:05 +01:00
87d2eb5f9a
Support for "> ." in YAML configuration files
2015-01-28 17:16:10 +01:00
0c501b760f
Merge pull request #414 from weiss/fix-function-specs
...
Fix a few jlib function specifications
2015-01-23 16:44:48 +03:00
0a047d790f
Fix a few function specifications
2015-01-23 00:42:18 +01:00
c4d17d939d
Fix integer parameter which can be set to 0
2015-01-22 12:40:27 +01:00
561025ba32
Merge pull request #413 from weiss/fix-timestamp-overflow
...
Fix timestamp formatting
2015-01-22 11:00:41 +03:00
15e77e9c0f
New command to reload config (EJAB-1140)
2015-01-21 15:18:46 +01:00
120e581865
Fix missing copyright dates to 2015 (EJAB-1733)
2015-01-21 14:52:37 +01:00
528aabf49c
Increment number of seconds on timestamp overflow
...
Increment the number of seconds and set the fractional part to zero if
the latter is too large.
2015-01-21 11:20:26 +01:00
18d9f18642
Don't match integer() against float() value
2015-01-21 11:06:06 +01:00
a983df4848
Fix overflow in XEP-0203 delay: if microseconds exceeded 999499, *** was put in the formatted timestamp
2015-01-21 01:10:41 +01:00
0559edd1cd
Merge pull request #410 from weiss/enable-transient-supervisors
...
Enable transient supervisors by default
2015-01-20 13:16:10 +01:00
2683b340ae
Cosmetic changes for "./configure --help" output
2015-01-20 12:32:22 +01:00
cc7b68b7c5
Enable transient supervisors by default
...
Some features (e.g., "ejabberdctl incoming_s2s_number") don't work with
transient supervisors disabled.
2015-01-20 11:50:11 +01:00
104009b3a9
Merge pull request #409 from hamano/scram-stringprep-checking
...
Scram stringprep checking(correct fix)
2015-01-19 15:23:47 +03:00
e01eb734b4
correct fix for #396
2015-01-19 16:00:18 +09:00
cb57cfa1a6
correct fix for #396
2015-01-19 15:25:58 +09:00
146adce3d6
Update the Guide about using access_commands in YAML/CFG files
2015-01-15 20:00:35 +01:00
2c4647a980
Fix binaries when ejabberd_ctl passes auth details
2015-01-15 20:00:06 +01:00
7690320f0f
Fix access_commands option in ejabberd_xmlrpc, now it works
2015-01-15 17:39:12 +01:00
4575649e10
Get rid of asn1rt calls
2015-01-15 14:51:20 +03:00
d53a54d900
Ignore warnings_as_errors everywhere
2015-01-15 13:49:24 +03:00
479da33092
Merge pull request #400 from toopay/patch-clarity-cleanup
...
Fix spec comment and remove useless case block
2015-01-09 19:14:53 +03:00
f650fc83ae
Fix spec comment and remove useless case block
2015-01-09 22:19:46 +07:00
17a7844e40
Merge pull request #399 from toopay/patch-cleanup-unused-vars
...
Fix unused vars warning
2015-01-08 21:47:20 +03:00
864e113256
Fix unused vars warning
2015-01-09 01:00:26 +07:00
e7e8f2f63a
Update some RFC links (EJAB-1728)
2015-01-08 18:18:17 +01:00
3063a84fe2
Update compilation from git (github #397 )
2015-01-08 17:53:25 +01:00
5a35405cd5
Update copyright dates to 2015 (EJAB-1733)
2015-01-08 17:34:43 +01:00
4ef2d08456
Merge pull request #396 from hamano/scram-stringprep-checking
...
checking stringprep in scram authentication
2015-01-08 11:02:23 +03:00
ede5a353e8
checking stringprep in scram authentication
2015-01-08 14:12:05 +09:00
b88fa6f617
Fix missing presences when adding shared groups (Github PR#99, thanks to Bokner)
2015-01-07 13:11:53 +01:00
3882c4d514
Fix binaries in command ejabberdctl stop_kindly
2015-01-07 11:44:04 +01:00
d24dc4e9c8
Merge pull request #383 from weiss/fix-shutdown
...
Give temporary processes a little time to stop cleanly
2015-01-07 11:42:22 +01:00
afaf68159d
Merge pull request #395 from weiss/fix-turn-example
...
Fix example: turn_ip must be specified as string
2015-01-04 12:06:17 +01:00
a7f578089a
Fix example: turn_ip must be specified as string
2015-01-04 00:55:00 +01:00
173d9761ca
Merge pull request #387 from weiss/fix-captcha-without-proto
...
Fix ejabberd_captcha's listener parsing
2014-12-24 19:16:02 +03:00
9dc9d75502
Fix ejabberd_captcha's listener parsing
...
If the "captcha_host" is specified without "http://" or "https://"
prefix, ejabberd_captcha tries to figure out the protocol automatically.
Fix the code that parses the listener configuration in order to do that.
2014-12-24 00:35:22 +01:00
06db65e108
Give temporary processes time to stop cleanly
...
Allow temporary processes to perform some final actions when shutting
down. For example, moc_muc_room:terminate/3 fails to send 'unavailable'
presence to the room participants when killed immediately.
2014-12-21 21:03:22 +01:00
d734f6beca
Use correct message type for last published items
...
When sending last published PubSub/PEP items, set the message type
that was used for broadcasting those items originally.
2014-12-21 20:11:05 +01:00
e5428c5500
Improve add_message_type/2 function
...
Let add_message_type/2 accept the type as an atom, and let the function
handle the 'normal' message type. This doesn't change the behavior, but
avoids some code duplication.
2014-12-21 18:44:53 +01:00
cc958f7787
Fix upgrade of PubSub mnesia tables from older ejabberd version.
2014-12-18 11:51:28 +01:00
8781c8346b
Merge pull request #379 from weiss/polish-readme
...
Polish the README file a bit
2014-12-17 18:36:05 +03:00
ad4b41730e
Apply various cosmetic changes to README file
2014-12-16 22:14:36 +01:00
5935b4e104
improve readability of links on github page
2014-12-15 10:52:47 +01:00
d1f09a29b9
improve README adding feature list
2014-12-15 10:26:57 +01:00
df88d9f2e5
Merge pull request #377 from weiss/new-timestamps
...
Add timestamps to stanzas resent from stream management queue
2014-12-13 09:42:30 +03:00
466278fde1
Let jlib use "B" instead of "w" to format integers
...
As a small optimization, use io:format's "B" control sequence to format
integers. We don't need to let Erlang figure out the data type if we
already know it.
2014-12-12 23:50:03 +01:00
0a19dac4fd
Add fractions of seconds to <delay/> timestamps
...
Include fractions of a second with XEP-0203 <delay/> timestamps, as
specified in XEP-0082.
Old timestamp: 2014-05-19T11:55:00Z
New timestamp: 2014-05-19T11:55:00.123Z
2014-12-11 23:11:35 +01:00
7e6d310fe4
include static versions of deps in rebar.config/script (thanks to Holger Weiß)(EJAB-1730)
2014-12-11 15:21:58 +01:00
ffe3ea8917
Merge pull request #374 from weiss/fix-muc-log-config
...
mod_muc_log: Fix configuration parsing
2014-12-08 22:56:20 +03:00
455039ae69
mod_muc_log: Fix configuration parsing
...
Fix mod_muc_log's parsing of the "file_permissions" option.
Resolves #373 .
2014-12-08 15:51:06 +01:00
a78a0a65fe
Let CSI code add timestamp at later point in time
...
As a small optimization, make sure we won't add timestamps to presence
stanzas which end up being thrown away by the CSI code.
2014-12-07 16:27:51 +01:00
ba8f38e2eb
XEP-0198: Add timestamp to resent stanzas
...
When an unacknowledged stanza is resent from the Stream Management
queue, add a timestamp so that the receiving client can display the time
at which the stanza was originally sent.
2014-12-07 16:12:06 +01:00
9899935e42
Improve interface for adding timestamps
...
Provide a simpler interface for adding <delay/> and <x/> timestamps to
stanzas. This also makes sure that only one <delay/> tag and one <x/>
tag is added to a given stanza.
2014-12-07 15:55:18 +01:00
865509757c
Merge pull request #366 from weiss/remove-unused-field
...
Remove unused field from ejabberd_c2s #state
2014-11-26 02:42:00 +03:00
2cb16bc509
Remove unused field from c2s #state
2014-11-26 00:15:19 +01:00
00dfcc1e10
Merge pull request #350 from flygoast/master
...
Used current working home as base directory to config relative path.
2014-11-25 14:24:37 +03:00
4163626844
Merge pull request #365 from weiss/csi-config
...
Fix mod_client_state's configuration parsing
2014-11-25 14:21:18 +03:00
f60c721f84
Merge pull request #364 from weiss/copy-normal-messages
...
Also carbon-copy messages of type "normal"
2014-11-25 14:21:06 +03:00
e97e56d776
Merge pull request #363 from weiss/drop-pep-errors
...
Don't route PEP error messages to clients
2014-11-25 14:20:11 +03:00
6b916e7a04
Merge pull request #354 from weiss/pep-privacy
...
Respect privacy lists for incoming PEP messages
2014-11-25 14:20:01 +03:00
6279c3fd8d
Merge pull request #352 from weiss/no-last-pep-duplicates
...
Don't duplicate last published PEP items
2014-11-25 14:19:53 +03:00
6900a41e7d
Fix mod_client_state's configuration parsing
...
Don't log an "invalid value" message when "queue_presence" or
"drop_chat_states" is set to "false".
2014-11-25 12:05:09 +01:00
a456482e2f
Also carbon-copy messages of type "normal"
...
It makes no sense to restrict carbon-copying to "chat" messages.
XEP-0280 is expected to be updated accordingly.
2014-11-24 22:37:14 +01:00
30687c40ef
Don't route PEP error messages to clients
2014-11-24 21:19:32 +01:00
16311b73c8
Add new hook: c2s_filter_packet_in
...
The c2s_filter_packet_in hook can be used to modify or drop incoming
packets before they are transmitted to the client.
2014-11-24 20:55:18 +01:00
b85357d280
Merge pull request #223 from kaLaJengkinG/patch-1
...
Update id.msg
2014-11-24 11:49:26 +01:00
946b64e166
Merge pull request #361 from weiss/parse-ldap-dn-filter
...
Fix parsing of "ldap_dn_filter" option
2014-11-22 10:36:21 +03:00
46d035c142
Fix parsing of "ldap_dn_filter" option
2014-11-22 01:33:23 +01:00
982215d644
Merge pull request #360 from lbanders/master
...
Fix for ejabbed bug #359 - now strings are formatted correctly.
2014-11-20 13:45:27 +03:00
5afa1f6ade
Fix for ejabbed bug #359 - now strings are formatted correctly.
2014-11-20 14:21:51 +04:00
c566b1d01e
Respect privacy lists for incoming PEP messages
2014-11-18 01:25:12 +01:00
84c227e6ae
Don't duplicate last published PEP items
...
When a contact becomes available, usually both the 'caps_update' hook
and the 'presence_probe_hook' are called. For remote contacts, both
hooks triggered PEP notifications, so each item was sent twice. Fix
this by ignoring the 'presence_probe_hook' for remote contacts.
2014-11-18 01:13:22 +01:00
ab12270837
Merge pull request #351 from weiss/floating-muc-intervals
...
Support floating point message/presence intervals
2014-11-16 12:35:21 +03:00
3b96525550
Support floating point message/presence intervals
...
Let mod_muc support floating point values for "min_message_interval" and
"min_presence_interval", as documented in the guide.
2014-11-15 22:35:56 +01:00
62ccf1cf0e
Used current working home as base directory to config relative path.
...
When a config relative path specified, get_absolute_path would not
return an absolute path. The patch fixed it using current working
home as base directory.
Signed-off-by: Gu Feng <flygoast@126.com >
2014-11-16 00:09:52 +08:00
d5ecd32cec
Merge pull request #345 from weiss/last-pep-items
...
Fix sending of last published PEP items to newly-available resources
2014-11-14 21:27:24 +03:00
e770d3174d
Merge pull request #346 from weiss/fix-type
...
Cosmetic fix: Use correct type for initial c2s #state.user value
2014-11-14 21:22:46 +03:00
2446b66016
Use correct type for initial c2s #state.user value
2014-11-14 15:32:48 +01:00
f69d1ca282
Send last PEP items to remote subscribers
...
When a remote subscriber becomes available, send him the last published
PEP items, as we do for local subscribers.
However, the current implementation depends on a running ejabberd_c2s
process of the publisher to send items to remote subscribers. So, for
those, the behavior is always like it is for local subscribers when
"ignore_pep_from_offline" is set to "true".
2014-11-14 01:33:11 +01:00
830fdccd21
Don't broadcast last published PEP items
...
When a client becomes available, don't send the last published PEP items
of all his peers to all his other peers, but only to that client.
2014-11-14 01:03:26 +01:00
5cc30c3977
Move routing of last PEP items into new function
...
This doesn't change the behavior, but avoids some code duplication.
2014-11-14 00:16:13 +01:00
8efae1f05b
ODBC: Sync last item notifications with mod_pubsub
...
A while back, mod_pubsub was modified to address EJAB-1456. However,
the change was only partially applied to mod_pubsub_odbc. This commit
adds the remaining part.
2014-11-14 00:02:59 +01:00
de3e1c3508
Merge pull request #341 from sezuan/fix-kick-user-command
...
Fix kick_user command
2014-11-10 23:14:34 +03:00
8184326eb9
Fix kick_user command
2014-11-10 20:53:00 +01:00
f47a59de2f
Merge pull request #340 from weiss/disable-mechanisms
...
New option: disable_sasl_mechanisms
2014-11-10 11:47:10 +03:00
ee0ecd2419
New option: disable_sasl_mechanisms
...
The new "disable_sasl_mechanisms" option allows for restricting the list
of SASL mechanisms offered to the client.
Closes #339 .
2014-11-10 01:10:04 +01:00
7138cc5633
Merge pull request #337 from weiss/fix-install-without-json
...
Fix "make install" without JSON support
2014-11-06 21:11:17 +03:00
f95f22aea0
Fix "make install" without JSON support
...
Don't bail out during "make install" when ./configure was called without
"--enable-json".
2014-11-06 17:11:15 +01:00
25e5253f33
Merge pull request #335 from weiss/avoid-carbon-dups
...
Avoid duplicates of carbon copies
2014-11-05 23:17:45 +03:00
41dc1efde4
Avoid duplicates of carbon copies
...
When multiple resources have the same (highest) priority, the session
manager routes messages sent to their bare JID to each of these
resources. When another resource has a lower priority but receives
carbon copies, make sure it won't receive multiple copies of such
messages.
2014-11-05 19:04:02 +01:00
1d2efcc168
Add xref test to travis.
...
Conflicts:
.travis.yml
2014-10-31 11:24:56 +01:00
dfb21e802e
Fix race in CSI test case
2014-10-31 00:26:22 +03:00
9a0b951855
Add tests for mod_vcard_xupdate
2014-10-30 23:57:15 +03:00
7819986ec0
Merge branch 'master' of github.com:processone/ejabberd
2014-10-30 17:44:04 +01:00
295681283a
don't stop on error if jiffy.so symlink exists #309
2014-10-30 17:43:57 +01:00
5b0d8b7776
Merge branch 'master' of github.com:processone/ejabberd
2014-10-30 17:19:37 +01:00
1d2ef85b33
Clean up rebar script.
2014-10-30 16:51:01 +01:00
b550f247e7
fix invalid path of jiffy.so on install #309
2014-10-30 15:47:33 +01:00
565f064b15
Fix xref check when odbc driver is not used.
2014-10-30 15:21:42 +01:00
7db4587eeb
Ignore riak_object module call for xref check.
...
It's used in map-reduce function called from riak vm.
2014-10-30 15:21:35 +01:00
fad0d867fc
Add xref Makefile target.
...
Conflicts:
rebar.config.script
2014-10-30 15:21:25 +01:00
56dab7ddbe
Merge pull request #328 from flygoast/master
...
Return an empty <vCard/> element in an IQ-result when no vCard exists.
2014-10-29 16:43:49 +03:00
74b67fa0dc
Add new option: store_empty_body
2014-10-27 14:18:09 +03:00
067958d705
Merge branch 'master' of github.com:processone/ejabberd
2014-10-27 13:44:59 +03:00
dec1e1f67f
Revert "fix mod_offline to store only chat messages with body xml element"
...
This reverts commit 436f0832c1
2014-10-27 13:44:46 +03:00
76b9098a25
Merge pull request #330 from weiss/accept-newline
...
Accept trailing newline characters in Base64 strings
2014-10-25 21:17:56 +04:00
2399aba67d
Accept trailing whitespace in Base64 strings
2014-10-25 02:05:02 +02:00
94cdcd7b34
Return an empty <vCard/> element in an IQ-result when no vCard exists.
...
According to XEP-0054, if no vCard exists, the server MUST return a stanza
error (which SHOULD be <item-not-found/>) or an IQ-result containing an
empty <vCard/> element.
Signed-off-by: Gu Feng <flygoast@126.com >
2014-10-25 00:55:49 +08:00
bf33f74ef8
Get rid of a hyphen in VSN
2014-10-24 18:01:42 +04:00
8cf43cf750
Merge pull request #325 from weiss/auth-after-tls
...
Don't advertise authentication mechanisms too early
2014-10-23 14:56:15 +04:00
2d748115ee
Don't advertise auth mechanisms too early
...
If "starttls_required: true" is specified for c2s connections,
authentication mechanisms shouldn't be offered before negotiating the
TLS connection.
2014-10-23 10:04:14 +02:00
0b22277b11
Merge pull request #321 from weiss/fix-http-request-record
...
Use 'request' record definition from header file
2014-10-21 12:12:55 +04:00
c7d9b46b6f
Merge pull request #324 from liudanking/master
...
fix odbc_keepalive_interval configuration bug
2014-10-21 11:03:16 +04:00
d2edcf1288
fix odbc keepalive interval bug
2014-10-21 10:05:44 +08:00
160c9d7698
Remove append_host_config from ejabberd.yml.example
2014-10-20 12:59:30 +04:00
ecd35f7ba8
Merge pull request #322 from weiss/xep-0198
...
XEP-0198: Abort immediately on stanza queue overflow
2014-10-17 11:56:25 +04:00
0c24e18b5e
XEP-0198: Abort immediately on queue overflow
...
Terminate the ejabberd_c2s process immediately once stanza queue
overflow is detected. This makes sure the FSM won't process additional
stanzas before terminating if the recipient is flooded.
2014-10-17 01:35:30 +02:00
96d6aacede
Use 'request' record definition from header file
...
This fixes a 'badrecord' crash in mod_http_fileserver.
2014-10-16 13:51:13 +02:00
adaa067333
Merge pull request #317 from weiss/xep-0198
...
XEP-0198: Set #state.conn field on session resume
2014-10-13 20:38:15 +04:00
724a31fa13
Merge pull request #318 from weiss/remove-xmlrpc-dep
...
Remove "xmlrpc" dependency for "make rel"
2014-10-13 20:37:28 +04:00
1ccc0d8bcb
XEP-0198: Set #state.conn field on session resume
2014-10-12 19:44:35 +02:00
3f3f64c217
Remove "xmlrpc" dependency for "make rel"
...
The "xmlrpc" library isn't used anymore.
2014-10-12 17:23:25 +02:00
97fa57c360
Merge pull request #316 from weiss/really-require-tls
...
Make sure "starttls_required" can't be bypassed
2014-10-12 11:05:49 +04:00
7bdc1151b1
Make sure "starttls_required" can't be bypassed
...
Don't allow clients to circumvent the "starttls_required" option by
enabling XMPP stream compression.
2014-10-12 02:08:08 +02:00
4bbf16b21a
Fix list unblocking when Riak is used as a backend
2014-10-10 11:38:13 +04:00
d87ca9fb7b
Fix format of an XML-RPC response
2014-10-04 12:55:59 +04:00
7b3209cc7f
Switch to P1 implementation of XML-RPC
2014-10-04 12:49:33 +04:00
1d782db84f
Process XML-RPC requests via p1_xml and ejabberd_http
2014-10-04 12:49:12 +04:00
e109f352e3
Make directory creation more robust
2014-10-02 14:21:27 +04:00
6e63ee480e
Merge pull request #310 from weiss/ignore-rel-dir
...
Let Git ignore the "rel/ejabberd" directory
2014-09-30 13:50:32 +04:00
90fb19797d
Let Git ignore the "rel/ejabberd" directory
2014-09-30 11:35:58 +02:00
415936146b
Merge pull request #303 from weiss/no-csi-if-unconfigured
...
Offer CSI stream feature only if mod_client_state is enabled
2014-09-26 13:16:28 +04:00
277e1dc3ff
Offer CSI stream feature only if configured
...
Don't offer the CSI stream feature when mod_client_state isn't actually
configured to filter stanzas. This makes sure clients won't send CSI
tags that end up being ignored.
2014-09-25 18:28:20 +02:00
56175fef1b
Add new hook: c2s_post_auth_features
...
The c2s_post_auth_features hook can be used to extend the list of stream
features offered after authentication.
2014-09-25 18:15:33 +02:00
ef89497d3f
Merge pull request #307 from weiss/remove-invisible-presence
...
Remove invisible presence fields from c2s #state
2014-09-25 17:20:45 +04:00
7aec0337e1
Remove invisible presence fields from c2s #state
...
Invisible presence isn't supported anymore, so the corresponding
ejabberd_c2s #state fields were unused.
2014-09-25 00:08:56 +02:00
e49cf604e9
Merge pull request #302 from weiss/ldap-deref-aliases
...
Rename deref_aliases back to ldap_deref_aliases
2014-09-23 13:54:22 +04:00
61c8836740
Rename deref_aliases back to ldap_deref_aliases
...
The "ldap_deref_aliases" option has accidentally been renamed to
"deref_aliases". Revert that change (but accept both names for a
while), so that the option name now matches the documentation again.
2014-09-23 11:31:44 +02:00
57dec40007
Merge pull request #301 from Iperity/master
...
Fix init script
2014-09-18 01:17:04 +04:00
29a841d8c7
Fix init script: use getent to allow ejabberd user from external authentication sources (LDAP)
2014-09-17 21:28:50 +02:00
c18413c52b
Merge pull request #300 from weiss/resend-if-offline
...
XEP-0198: Support "resend_on_timeout: if_offline"
2014-09-17 09:31:09 +04:00
0a9212583d
XEP-0198: Support "resend_on_timeout: if_offline"
...
If "resend_on_timeout" is set to "if_offline", resend unacknowledged
stanzas only if no other resource is online when the session times out.
In other words, allow for sending them to offline storage, but nowhere
else.
2014-09-16 22:42:34 +02:00
19446967fa
Merge pull request #299 from sjmackenzie/processone
...
added p1_utils to reltool.config resolving treap:empty() undefined error
2014-09-15 09:31:27 +04:00
8d9a9228d9
added p1_utils to reltool.config resolving treap:empty() undefined error
2014-09-15 04:06:07 +00:00
72fd353988
Avoid generation of excessive records
2014-09-13 22:54:07 +04:00
c90786527e
Merge pull request #298 from weiss/csi
...
Add support for XEP-0352: Client State Indication (CSI)
2014-09-12 21:55:10 +04:00
1a320baad8
Add tests for Client State Indication support
2014-09-11 18:18:20 +02:00
b8c98232b8
Support XEP-0352: Client State Indication
2014-09-11 17:44:29 +02:00
f723c00762
Merge pull request #297 from weiss/remove-configure-flag
...
Travis CI: Remove unused configure flag
2014-09-11 19:35:50 +04:00
4d59f677a9
Travis CI: Remove unused configure flag
...
The --disable-http flag no longer exists.
2014-09-10 21:04:43 +02:00
7a48e30523
Merge pull request #296 from weiss/remove-unused-clause
...
XEP-0198: Remove unused function clause
2014-09-07 07:27:17 +04:00
f0887e45b8
Merge pull request #295 from weiss/xep-0198
...
XEP-0198: Change state immediately when gen_tcp:send/2 returns failure
2014-09-07 07:27:07 +04:00
2ca563e328
XEP-0198: Remove unused function clause
...
In the 'wait_for_resume' state, #state.mgmt_pending_since is always
initialized. fsm_next_state/2 takes care of that.
2014-09-06 20:39:38 +02:00
2e169167d4
XEP-0198: Change state on gen_tcp:send/2 failure
...
When Stream Management is enabled and a gen_tcp:send/2 call fails, go
into the 'wait_for_resume' state immediately. This makes sure that
gen_tcp:send/2 won't be called again, which might avoid an Erlang issue
where gen_tcp:send/2 apparently hangs despite 'send_timeout' (and
'send_timeout_close') being set.
2014-09-06 20:34:32 +02:00
11b2921971
XEP-0198: Let fsm_next_state/2 check timeout value
...
Don't force the fsm_next_state/2 caller to check for 'mgmt_timeout = 0'.
2014-09-06 20:29:02 +02:00
646b445515
allow guide not to be compiled for install
2014-09-05 19:16:13 +04:00
50d7046517
Test MUC nick registration
2014-09-03 21:30:44 +04:00
c3eaa29f70
Parse x:data in jabber:register
2014-09-03 21:30:27 +04:00
ac2ba399a9
Make sure x:data form possesses 'type' attribute
2014-09-03 21:28:55 +04:00
fda73c3d16
Fix privacy checks of presence probes
2014-09-01 16:39:02 +04:00
a1ce33ebf8
Automatically remove IPs from ban, add the documentation
2014-08-27 13:25:49 +04:00
9be9949dab
Remove useless -include()
2014-08-27 13:18:29 +04:00
0f1d95a074
Ban the IP if there are too many failed authentications
2014-08-27 13:18:22 +04:00
2430e6691b
Add mod_fail2ban
2014-08-27 13:17:56 +04:00
bfd028beea
Recompile the xmpp_codec using updated XML generator
2014-08-27 12:55:31 +04:00
2cb0f92fe6
Merge pull request #293 from weiss/fix-comment
...
Fix a comment in ejabberd_hooks
2014-08-27 12:48:58 +04:00
2ae7d0a122
Merge pull request #292 from weiss/fix-xep-reference
...
Fix an XEP reference in the guide
2014-08-27 12:48:34 +04:00
f1ad6f017b
Fix a comment in ejabberd_hooks
2014-08-26 01:04:15 +02:00
c658984531
Fix an XEP reference in the guide
2014-08-26 01:01:11 +02:00
191eeed7c9
Merge pull request #287 from vesvalo/master
...
Fix return value of mod_shared_roster:delete_group.
2014-08-21 16:32:31 +04:00
01a3c1c2e1
Fix return value of mod_shared_roster:delete_group. Current one is not compatible with mod_admin_extra.
2014-08-21 15:13:43 +04:00
8e3a49d369
Merge pull request #286 from vesvalo/fix_pep_odbc_publishing
...
fix 404 on pep first publishing with odbc
2014-08-21 13:29:55 +04:00
c48b7f272b
fix 404 on pep first publishing with odbc
2014-08-21 11:23:58 +04:00
4a9417c501
Merge pull request #284 from weiss/infinity-vs-unlimited
...
Guide: For consistency, use 'infinity' everywhere
2014-08-21 01:26:22 +04:00
72049e5323
Guide: For consistency, use 'infinity' everywhere
2014-08-20 20:43:38 +02:00
33e0bf1c19
Merge pull request #283 from weiss/allow-unlimited-ack-queue
...
Support "max_ack_queue: infinity"
2014-08-20 17:47:04 +04:00
5ed7f10153
Merge pull request #282 from weiss/fix-muc-option-docs
...
Fix MUC option docs: "infinity", not "infinite"
2014-08-20 17:44:06 +04:00
2802b6cee2
Allow for "max_ack_queue: infinity", as documented
2014-08-20 12:53:26 +02:00
44828c54fe
Fix MUC option docs: "infinity", not "infinite"
2014-08-20 12:26:03 +02:00
ae0d31a8c9
Merge pull request #280 from weiss/store-persistent-muc-on-init
...
Store peristent MUC room during creation
2014-08-19 13:28:15 +04:00
7274dafe10
Store persistent MUC room during creation
...
Make sure persistent rooms are stored to the database. Without this
change, a room got lost if the 'persistent' flag was handed over to
mod_muc:create_room/5 and the server was then restartet before any
activity took place in that room.
2014-08-19 11:12:51 +02:00
bc2e26fecd
Merge pull request #277 from weiss/xep-0198
...
XEP-0198: Create shorter session resume IDs
2014-08-15 19:15:32 +04:00
2d4c39cd54
XEP-0198: Create shorter resume IDs
...
Omit the user and server name from the 'previd' value.
2014-08-15 10:56:59 +02:00
9484b11383
Merge pull request #276 from weiss/xep-0198
...
XEP-0198: Don't crash if the resume ID is incorrect
2014-08-15 10:49:59 +04:00
848e1497d1
XEP-0198: Gracefully handle broken 'previd'
...
Produce a proper error message instead of crashing when the 'previd'
value of a <resume/> request has an unexpected format.
2014-08-15 01:54:41 +02:00
2daf95e93f
XEP-0198: Gracefully handle wrong credentials
...
Produce a proper error message instead of crashing when the JID encoded
in the 'previd' value of a <resume/> request is different from the
authenticated JID.
2014-08-15 01:53:47 +02:00
1b1d9b5a73
Merge pull request #269 from Iperity/master
...
Fix migration of pubsub nodes. Was deleting and re-creating all nodes on...
2014-08-15 03:20:36 +04:00
5836eb5bc2
Merge pull request #268 from benlangfeld/fix/ldap_filter_dnattributes_new_ejabberd
...
Set dnAttributes on when it's requested by a filter
2014-08-15 03:19:18 +04:00
5c88f6423a
Fix the deprecation warning to reflect YAML format
2014-08-12 14:26:15 +04:00
56d61c2784
Do not call functions from ejabberd_riak directly
2014-08-12 14:25:54 +04:00
0917209711
Merge pull request #273 from gamenet/master
...
odb_queries patch return value of functions update and update_t in case of sql insert
2014-08-08 16:03:03 +04:00
8c22b154c9
Merge pull request #2 from vesvalo/master
...
fix mod_offline to store only chat messages with body xml element
2014-08-08 14:05:35 +04:00
436f0832c1
fix mod_offline to store only chat messages with body xml element
2014-08-08 13:57:27 +04:00
5d0de39127
Merge pull request #1 from vesvalo/master
...
Fix odbc update_t and update insert case return value
2014-08-08 13:39:44 +04:00
92f89e3d45
Fix odbc update_t and update insert case return value
2014-08-08 13:26:16 +04:00
f91caf7108
Merge pull request #270 from weiss/log-s2s-in-auth
...
Log authentication method for incoming s2s connections
2014-08-05 16:51:51 +04:00
38c016a041
Log auth method for incoming s2s connections
...
Generate an [info] message that logs whether an incoming s2s connection
is authenticated using the SASL EXTERNAL mechanism or via Server
Dialback. While at it, also mention whether TLS is enabled.
2014-08-05 14:10:32 +02:00
4f63cb21c2
Fix migration of pubsub nodes. Was deleting and re-creating all nodes on each startup.
2014-08-03 21:03:16 +02:00
2e70c59471
Merge pull request #267 from weiss/replace-echo-calls
...
doc/Makefile: Replace non-portable echo(1) calls
2014-08-01 19:25:01 +04:00
f00725dffb
mod_offline now uses gen_server
2014-07-31 14:26:09 +04:00
4205108f30
typo fix on roster subscription (EJAB-1711)
2014-07-31 11:50:22 +02:00
651de2ca8e
Set dnAttributes on when it's requested by a filter
2014-07-29 15:22:54 -03:00
e79290fb56
doc/Makefile: Replace non-portable echo(1) calls
...
The echo(1) behavior is system-dependent, the printf(1) behavior is not.
2014-07-28 22:54:09 +02:00
db3c469d4d
Reorganize mod_announce test in order to avoid race
2014-07-28 13:42:50 +04:00
7d93463d31
Merge pull request #266 from weiss/remove-http
...
Remove "--enable-http" flag
2014-07-28 11:08:13 +04:00
5d79dff4f3
Merge pull request #265 from weiss/mention-starttls-required
...
Mention "starttls_required" option in sample configuration file
2014-07-28 11:06:59 +04:00
58fd56e6a2
Merge pull request #264 from weiss/su-without-p
...
ejabberdctl: Omit su(1)'s "-p" flag
2014-07-28 11:06:27 +04:00
f1e6365ee1
Remove "--enable-http" flag
...
Specifying the "--enable-http" flag on the ./configure command line had
no effect.
2014-07-27 12:51:25 +02:00
4a02df8b6d
Mention "starttls_required" option in ejabberd.yml
...
Closes #258 .
2014-07-27 12:44:34 +02:00
bee9ffd91e
Apply minor improvement to ejabberd.yml comment
2014-07-27 11:54:30 +02:00
3e232952ea
ejabberdctl: Omit su(1)'s "-p" flag
...
On Linux, su(1)'s "-p" flag makes sure the following environment
variables are preserved: $HOME, $SHELL, $USER, and $LOGNAME. The flag
isn't portable, and since we don't set HOME=$SPOOLDIR anymore, there's
no reason to preserve these variables anyway.
Without "-p", we also don't need to set HOME=$INSTALLUSER_HOME, as su(1)
now does that for us.
2014-07-27 11:21:55 +02:00
c0001184fd
Merge branch 'master' of github.com:processone/ejabberd
2014-07-27 13:06:46 +04:00
abeaac1c11
Add tests for mod_announce
2014-07-27 13:06:20 +04:00
6427d9398a
Merge pull request #263 from weiss/fix-ejabberdctl-issues
...
Fix ejabberdctl issues
2014-07-24 20:56:32 +04:00
677b358a9a
Merge pull request #262 from weiss/update-gitignore
...
Let Git ignore the "configure" script
2014-07-24 20:55:50 +04:00
b997c4325a
Let Git ignore the "configure" script
2014-07-24 17:50:43 +02:00
9c279f2e06
ejabberdctl: Remove outdated comment
...
The home directory is no longer set to $SPOOL_DIR.
2014-07-24 17:20:09 +02:00
46f01b962a
ejabberdctl: Create home directory as root
...
If the $INSTALLUSER is not root, he will usually not have the necessary
permissions to create his home directory.
2014-07-24 17:16:47 +02:00
9db39a5e4c
Merge pull request #261 from weiss/no-bash
...
doc/Makefile: Don't insist on using /bin/bash
2014-07-24 17:44:06 +04:00
43000d9ce4
ejabberdctl: Use $INSTALLUSER's home directory
...
Make sure ejabberdctl uses the $INSTALLUSER's .erlang.cookie file even
if the script was executed by root.
2014-07-24 15:25:28 +02:00
33368b7e5c
doc/Makefile: Don't insist on using /bin/bash
...
Fix "make doc" for systems that don't have /bin/bash. There's no
bash-specific code in doc/Makefile anymore.
2014-07-24 15:15:00 +02:00
a087af7060
Re-generate the XMPP codec using updated xml_gen
2014-07-24 10:35:17 +04:00
3d3a4f7543
Fix events broadcasting via C2S
2014-07-22 19:42:49 +04:00
9ff3ce8bd1
Merge pull request #257 from weiss/fix-option-name
...
Fix "s2s_access" option name in documentation
2014-07-22 17:47:04 +04:00
4efca05149
Fix "s2s_access" option name in documentation
2014-07-22 15:06:19 +02:00
f19e19e2b6
reflect correct default value un example documentation
2014-07-22 14:35:31 +02:00
25676b43ed
Add tests for session management
2014-07-22 14:00:48 +04:00
870d822f08
old release notes are not installed anymore
2014-07-21 17:58:14 +02:00
320abee110
apply pull request #250 to pubsub_odbc as well
2014-07-21 17:14:59 +02:00
0579fc80ec
Merge pull request #250 from Iperity/master
...
Fix configuraton with custom nodetree plugin
2014-07-21 17:11:29 +02:00
08ff969896
html guide is now generated when building source tarball
2014-07-21 16:36:10 +02:00
40ef406ec7
remove bash dependency, fix EJABBERD_OPTS use
2014-07-21 15:25:16 +02:00
790201afc0
avoid incorrect release version string (EJAB-1695)
...
to do so, we remove configure script from repository.
it must be generated with autotools.
for developpers not using autotools, we include the configure script in
release source tarball, which in generated with correct version string.
2014-07-21 13:50:35 +02:00
f2003943db
Add tests for mod_carboncopy
2014-07-21 09:08:54 +04:00
014d61955c
Move some namespaces definitions into header file
2014-07-21 08:32:26 +04:00
c068712373
Merge pull request #254 from weiss/replace-bashism
...
Replace bash-specific syntax in ejabberdctl
2014-07-20 19:20:00 +04:00
467ccdffbd
Replace bash-specific syntax in ejabberdctl
...
Use plain POSIX shell syntax to match ".yml" configuration file names.
This is also slightly more correct, as it matches ".yml" only at the
*end* of the file name.
2014-07-20 13:24:28 +02:00
48d7ec1a92
Merge pull request #253 from weiss/fix-config-comments
...
Apply small fixes to description of log rotation in ejabberd.yml.example
2014-07-20 12:42:20 +04:00
105b421418
Fix ejabberd.yml comment on overload protection
2014-07-20 07:36:24 +02:00
277fe5ab25
Fix ejabberd.yml comment on log rotation syntax
2014-07-20 07:29:45 +02:00
744018425b
Improve MUC test cases
2014-07-19 17:30:02 +04:00
1f4e0c8aea
Fix Record-Route signing
2014-07-17 20:30:36 +04:00
e0c9242dcf
treap.erl was moved to p1_utils
2014-07-17 11:57:23 +02:00
0456b78d87
Use p1_utils
2014-07-17 10:52:31 +02:00
568068c79f
Get rid of p1_mnesia file
2014-07-17 08:32:13 +04:00
b5c4fe6626
Change return type to reflect recent changes in p1_sip
2014-07-16 15:28:36 +04:00
64205426bf
Fix returned types
2014-07-16 10:33:49 +04:00
89025eea39
Fix blocklist get
2014-07-16 07:43:24 +04:00
4a918c5b18
Merge pull request #251 from weiss/enable-riak-tests
...
Travis CI: Enable Riak tests
2014-07-15 22:56:55 +04:00
9a7c26eaa8
Travis CI: Enable Riak tests
2014-07-15 20:42:12 +02:00
eb803832b7
Remove unnecessary defaults from the xmpp_codec spec
2014-07-15 20:42:53 +04:00
4ef0dd6997
Better Riak usage detection
2014-07-15 20:26:45 +04:00
b5f1b17926
Fix broken hooked functions
2014-07-15 19:22:33 +04:00
fd298521e2
Add mod_caps checks to the testing suite
2014-07-15 18:35:23 +04:00
99c28ab4d6
Fix configuraton with custom nodetree plugin
2014-07-15 12:04:06 +02:00
2d6a838905
Do not check for Erlang apps at configure time as it looks redundant
2014-07-14 08:29:57 +04:00
792b5a24df
Serialize records to proplists before storing then in Riak
2014-07-14 08:24:44 +04:00
19cc687928
Merge pull request #248 from mathiasertl/master
...
Move warnings inside check for $EJABBERD_BYPASS_WARNINGS, use variable for path
2014-07-11 15:45:29 +04:00
86a6667122
Move warnings inside check for , use variable for path
2014-07-11 12:34:52 +02:00
07501f8085
Re-generate the HTML documents
2014-07-10 19:07:09 +04:00
dd77236d75
Mention about Riak in yet another place
2014-07-10 15:34:09 +04:00
926c9193e7
Try to bypass Riak tests by Travis CI
2014-07-10 14:45:54 +04:00
a5987633e0
Fix compile errors introduced by previous cherry picks
2014-07-10 14:16:33 +04:00
aa8dce9804
Re-generate the configure script
2014-07-10 13:59:11 +04:00
edfb5fc2f8
Add --enable-riak configure flag
2014-07-10 13:58:43 +04:00
91fcdf9f6a
Document Riak support
2014-07-10 13:55:49 +04:00
54cfd5091f
Check Riak connection before running the corresponding suite
2014-07-10 13:55:38 +04:00
2fe8e0dea5
Make it possible to check Riak connection status
2014-07-10 13:55:24 +04:00
9d62d13492
Don't forget to shutdown rooms before starting the testing suite
2014-07-10 13:55:08 +04:00
f40d5e4a89
Improve test suite explanation
2014-07-10 13:54:51 +04:00
c559c9425a
Clear Riak data when initializing the testing suite
2014-07-10 13:54:17 +04:00
6a73b96459
Fix roster versioning support when Riak backend is enabled
2014-07-10 13:54:06 +04:00
538d4ffbd0
Fix case clause
2014-07-10 13:53:57 +04:00
c15dc01cff
Improve Riak pool management
2014-07-10 13:52:29 +04:00
f1d0b05db5
Fixate Riak client library
2014-07-10 13:44:14 +04:00
a60dd672b7
Add Riak backend to the testing suit
2014-07-10 13:42:31 +04:00
e82219185b
Add SQL to Riak converter
2014-07-10 13:29:01 +04:00
0490c2f139
Improve Riak support
2014-07-10 13:26:37 +04:00
a4b02c38db
Updated riak support
2014-07-10 13:15:15 +04:00
47763c10e3
Preliminary Riak support
2014-07-10 13:04:39 +04:00
fc692ea512
Add start_module/2
2014-07-08 20:58:03 +04:00
28479321bb
Improve documentation of mod_sip
2014-07-07 09:40:20 +04:00
2b8c4acd57
Rename options
2014-07-07 09:40:08 +04:00
ee40c0e9a7
Add new option support: always_record_route
2014-07-07 09:40:01 +04:00
9a55ffba7a
Merge pull request #243 from matwey/master
...
Use -include_lib instead of -include for esip and p1_xml
2014-07-05 18:09:28 +04:00
50a73d1188
Use -include_lib instead of -include for esip and p1_xml
...
-include_lib is used in order to find deps. Rebar include magic is not required anymore.
Rebar uses deps as library directory.
2014-07-05 17:57:35 +04:00
76ebebf2a0
Revert "Fix IQ XML generation."
...
This reverts commit 26a4d91297
2014-07-05 17:53:45 +04:00
aba7150af1
Return MySQL error messages as binary.
2014-07-04 17:39:28 +02:00
26a4d91297
Fix IQ XML generation.
2014-07-04 15:21:40 +02:00
9265720f92
add ability to rotate logs on given date condition
2014-07-02 23:46:54 +02:00
273631c242
New option support: log_rotate_count
2014-07-02 14:59:05 +02:00
bb8a0f71e6
Support new options: log_rotate_size and log_rate_limit
2014-07-02 14:58:58 +02:00
ffdb39d269
Disable SASL error logger if lager is enabled
2014-07-02 14:58:46 +02:00
8fae4748a1
mod_caps doesn't provide Mnesia export feature
2014-06-27 13:49:17 +02:00
643a31dcea
let ejabberdctl explicitely use bash
2014-06-20 14:34:14 +02:00
31440a586c
Merge pull request #238 from weiss/log-node-mismatch
...
Check for Mnesia node name mismatches on startup
2014-06-12 13:23:17 +04:00
1ef2dd45f3
Check for Mnesia node name mismatches
...
Log a proper error message if the node running ejabberd doesn't own the
Mnesia database.
2014-06-12 11:00:22 +02:00
b29615561c
Change default flow timeout as recommended per the RFC
2014-06-12 09:30:10 +04:00
7892b72bcb
Don't forget to close socket of timed out flow
2014-06-12 09:30:04 +04:00
4b82a38cf7
Merge pull request #237 from weiss/log-config-path
...
Mention configuration file path in error messages
2014-06-11 18:31:41 +04:00
c20acbf4d8
Mention configuration file path in error messages
...
If reading or parsing a YAML configuration fails, log the full path to
the configuration file (as we do for old-style ".cfg" files).
2014-06-11 15:03:33 +02:00
e66899e68e
Merge pull request #231 from hamano/case_clause_error_at_node_hometree_odbc
...
case_clause_error_at_node_hometree_odbc
2014-06-09 23:50:43 +04:00
87f8c2ecd8
Don't stop roster table conversion on broken askmessage
2014-06-09 10:55:05 +04:00
62be3bc111
Fix previous commit
2014-06-09 10:40:52 +04:00
c485aea48b
Don't stop irc table conversion on broken JIDs
2014-06-09 10:36:42 +04:00
6f4b4ad087
Ignore malformed parameters for mod_irc module
2014-06-07 07:45:36 +04:00
3e8a0af6d1
Fix data convertion
2014-06-07 07:05:24 +04:00
12ab5a749f
Clean up all timers gracefully
2014-06-06 22:29:50 +04:00
ddfbca5830
Use a different timer for flow control
2014-06-06 13:53:13 +04:00
9e72529544
SIP Outbound (RFC 5626) support
2014-06-06 09:36:45 +04:00
11aa51373a
add missing format handler
2014-06-05 16:23:17 +02:00
5992582bc5
Merge pull request #232 from weiss/dont-drop-listen-options
...
Don't "forget" listener options
2014-06-04 23:37:13 +04:00
e0e74a9d5e
Don't "forget" listener options
...
If a listener is started or stopped via ejabberd_listener:add_listener/3
or ejabberd_listener:delete_listener/3, the configuration for all
listener modules is updated using the Module:transform_listen_option/2
function for each listener module that exports such a function.
However, for listener modules that don't provide that function (such as
ejabberd_stun), all but one option was dropped. This is now fixed.
The issue could be triggered e.g. by enabling mod_proxy65 in the modules
section.
2014-06-04 20:54:26 +02:00
cc228db337
e_clause error at node_hometree_odbc:get_items/3
2014-06-04 18:53:37 +09:00
c546ce2439
Reply to pings
2014-06-03 21:18:30 +04:00
fdda4d506f
Always enable STUN at compile time
2014-06-03 20:54:39 +04:00
5de16493d1
Merge pull request #230 from weiss/fix-dependency-list
...
Fix the list of dependencies
2014-06-03 16:28:13 +04:00
2381a8d609
Remove exmpp from the list of dependencies
...
The XEP-0227 code no longer uses exmpp.
Thanks to Steve Gillespie for noting this.
2014-06-03 14:16:11 +02:00
39f1005006
Fix LibYAML version in the list of dependencies
...
Thanks to Steve Gillespie for reporting the error.
2014-06-03 13:00:17 +02:00
6441c284e0
Don't add 'rport' paramater to 'Via' header
2014-06-02 20:46:29 +04:00
0aea9c74bd
Rename option 'route' to 'record_route' and add new option 'routes'
2014-06-02 10:16:34 +04:00
9a0d77571d
Add global static shared_key option
2014-06-01 14:20:09 +04:00
f446e7fc0b
Sign 'Record-Route' in order to proxy unauthorized ACKs
2014-06-01 13:35:14 +04:00
b75b5ebeb2
Fix 'via' option lookup
2014-05-31 14:22:39 +04:00
d19903877d
Add new option: route
2014-05-31 14:22:31 +04:00
f271ea6eef
Merge pull request #229 from weiss/no-carbons-to-sender
...
XEP-0280: Don't send v1 carbon copies back to the sender
2014-05-31 12:53:18 +04:00
c76201b6b4
Don't add 'Record-Route' header for mid-dialog requests
2014-05-31 10:00:51 +04:00
86f2af6fdc
Process bindings from multiple UACs correctly
2014-05-31 09:06:53 +04:00
da22da23cd
Don't substitute URI in ACK
2014-05-31 07:50:16 +04:00
f45654a16a
Simplify mod_carboncopy:check_and_forward/4
...
Use the existing is_carbon_copy/1 function, and combine multiple case
clauses into a single one.
2014-05-30 23:44:19 +02:00
bb952f9ecc
Let is_carbon_copy/1 recognize <received/> carbons
...
The mod_carboncopy:is_carbon_copy/1 function now returns true not only
for <sent/>, but also for <received/> carbon copies.
2014-05-30 23:36:02 +02:00
ad2d3964ef
Don't send XEP-0280 v1 copies back to sender
...
An earlier version of XEP-0280 specified the <received/> and <sent/>
tags to be siblings of the <forwarded/> element, whereas the current
version mandates them to be parents of <forwarded/>. The mod_carboncopy
module supports both variants. However, the check that makes sure
clients won't receive a copy of the messages they sent didn't work for
the old-style schema. This is now fixed.
2014-05-30 23:32:18 +02:00
2cd17c7988
Fix previous commit
2014-05-30 23:49:50 +04:00
32998f7e18
Process 'Contact' headers more accurately (as per RFC3261)
2014-05-30 23:14:52 +04:00
7261cb29ac
Merge pull request #228 from weiss/turn-down-carbons-logging
...
Log just one [info] message on successful XEP-0280 negotiation
2014-05-29 19:19:05 +04:00
8fb1bb1f5f
Log just one [info] message on Carbons negotiation
...
Log one instead of three [info] messages when XEP-0280 (Message Carbons)
support is enabled or disabled successfully. On failure, log an
additional [warning].
2014-05-29 15:21:11 +02:00
5a29d56d94
Merge pull request #227 from weiss/xep-0198
...
XEP-0198: Cosmetic change: Reuse event handler
2014-05-28 13:43:29 +04:00
0cb9ea3643
XEP-0198: Cosmetic change: Reuse event handler
...
On stanza queue overflow, pass a message to self() using the exclamation
mark operator instead of send_all_state_event/2. This allows for
reusing the existing handler for 'kick' events.
2014-05-28 11:24:38 +02:00
7d54fdea51
Merge pull request #206 from weiss/xep-0198
...
XEP-0198: Terminate session if stanza queue becomes too large
2014-05-28 13:18:12 +04:00
99ca8281fa
XEP-0198: Terminate session on queue overflow
...
On queue overflow, terminate the c2s session instead of just dropping
items from the queue. This makes sure all stanzas are either delivered
or bounced.
2014-05-27 22:56:33 +02:00
3a27b1dd0c
Merge pull request #226 from weiss/simplify-state-change
...
XEP-0198: Cosmetic change: Simplify state change
2014-05-27 23:30:30 +04:00
f9c5e349fb
Merge pull request #225 from weiss/use-fsm-next-state
...
Let ejabberd_c2s always use fsm_next_state/2
2014-05-27 23:27:16 +04:00
50a4c5a6ab
XEP-0198: Cosmetic change: Simplify state change
...
When the FSM goes into the 'wait_for_resume' state, let fsm_next_state/2
take care of updating #state.mgmt_state and of writing the log line.
This doesn't change the behavior, but simplifies the code.
2014-05-27 21:14:49 +02:00
ed0c89f876
Let ejabberd_c2s always use fsm_next_state/2
...
Make sure any logic implemented in ejabberd_c2s:fsm_next_state/2 is
always applied.
2014-05-27 21:07:53 +02:00
702cddd4ff
Merge pull request #220 from weiss/handle-send-failure
...
XEP-0198: Don't exit on socket send failure
2014-05-27 15:44:04 +04:00
4d1332c30f
Merge pull request #222 from weiss/keep-session-on-failed-resume
...
XEP-0198: Don't drop session on failed resume
2014-05-27 15:38:26 +04:00
402fb9665d
Merge pull request #221 from weiss/omit-redundant-guard
...
XEP-0198: Cosmetic change: Omit redundant guard
2014-05-27 15:34:34 +04:00
b2e84405c1
Merge pull request #218 from weiss/omit-iq-xmlns
...
Omit XML namespace declaration for <iq/> stanzas
2014-05-27 15:32:02 +04:00
52221127cc
Fix odbc_port option processing
2014-05-27 15:27:42 +04:00
dceab3689d
Don't forget to include 'Contact' header field in 2xx registrar responses
2014-05-26 21:34:23 +04:00
123b01aaa0
don't stop make install if epam is not compiled
2014-05-25 13:02:25 +02:00
572938aa49
install epam binary when available
2014-05-25 02:31:28 +02:00
48600ae71d
Update id.msg
2014-05-24 17:53:39 +07:00
59f6efeaf7
XEP-0198: Don't drop session on failed resume
...
The 'previd' value provided by the client during a session resume
request includes the client's JID and ejabberd's session ID. If there
is a session for the requested JID but with a different session ID,
resumption should fail, but that session shouldn't be closed. This
commit makes sure the latter won't happen.
In practice, this will only make a difference in odd corner cases.
2014-05-23 23:38:04 +02:00
737b0ae5dc
XEP-0198: Cosmetic change: Omit redundant guard
...
The stream management state is never 'pending' when the c2s FSM is in
the 'session_established' state.
2014-05-23 20:46:17 +02:00
8925975c86
Fix proxying of ACK requests for 2xx responses
2014-05-23 20:14:53 +04:00
ab9667f917
XEP-0198: Don't exit on socket send failure
...
If stream management is enabled, don't exit the c2s process when
ejabberd_socket:send/2 fails, but close the socket instead. This gives
the client a chance to resume the session.
Thanks go to Matthias Rieber for reporting the issue, providing detailed
logs, and testing the fix.
2014-05-23 11:38:54 +02:00
6baf3a24de
Merge branch 'weiss-check-packet-type' into 3
2014-05-21 18:45:43 +02:00
735bd95659
Merge branch 'check-packet-type' of git://github.com/weiss/ejabberd into weiss-check-packet-type
...
Conflicts:
src/ejabberd_c2s.erl
2014-05-21 18:45:28 +02:00
69abb48c90
Merge pull request #217 from weiss/fix-extauth-cache-usage
...
Don't use cached passwords if "extauth_cache: 0"
2014-05-21 17:35:54 +02:00
419a98d45a
Merge pull request #216 from lavrin/p1-c2s
...
Cleanup some pieces of ejabberd_c2s
2014-05-21 17:35:24 +02:00
0dc8429d16
Merge pull request #215 from weiss/fix-url-markup
...
Fix URL markup in the guide
2014-05-21 17:33:56 +02:00
b9210d491a
Merge pull request #208 from weiss/update-travis-config
...
Travis CI: Remove unnecessary configure flag
2014-05-21 17:31:49 +02:00
5d855f3723
Merge pull request #207 from weiss/xep-0334
...
Honor XEP-0334: Message Processing Hints
2014-05-21 17:31:22 +02:00
6b996061a2
Omit XML namespace declaration for <iq/> stanzas
...
Only the child elements of <iq/> stanzas are qualified by the namespaces
in question, not the <iq/> stanzas themselves.
This change just clarifies the code. It doesn't alter the behaviour, as
those <iq/> stanzas are handed over to jlib:iq_to_xml/1, and that
function ignores the 'xmlns' attribute anyway.
2014-05-21 00:07:57 +02:00
fca640f50f
Don't use cached passwords if "extauth_cache: 0"
...
Regarding "extauth_cache", the guide says: "The integer 0 (zero) enables
caching for statistics, but doesn't use that cached information to
authenticate users." Make sure the cached password isn't used even if
the user is currently logged in with another resource.
2014-05-20 23:00:28 +02:00
5010cea1a4
If log uses file:write, no need to double escape ~ in messages (EJAB-1696)
2014-05-20 14:49:52 +02:00
5726636053
Fix check_from/2 formatting
2014-05-20 12:31:28 +01:00
b7a542e074
Sanitize copy-pasted get_statustag/1
2014-05-20 12:28:14 +01:00
9c37450fe4
Fix formatting
2014-05-20 12:26:33 +01:00
c39ce133de
Build proceed/compressed elements in a sane way
2014-05-20 11:52:02 +01:00
dd543af2f6
Fix URL markup in the guide
2014-05-20 00:24:34 +02:00
6d06f22f64
MUC messages with ~ were not logged (EJAB-1696)
2014-05-19 19:07:46 +02:00
862166511c
Merge pull request #213 from weiss/fix-xmlrcp-doc-url
...
Update ejabberd_xmlrpc documentation URL in the guide
2014-05-19 11:46:37 +02:00
4e54c53abb
Update ejabberd_xmlrpc documentation URL
2014-05-14 22:39:19 +02:00
a6ddab1e9d
Fix bug when joining empty path
2014-05-14 13:28:39 +02:00
3c045ba8aa
Merge pull request #212 from weiss/fix-presence-updates
...
Don't miss incoming presence updates
2014-05-14 08:06:40 +04:00
6e8dd5bdff
Don't miss incoming presence updates
2014-05-14 01:04:38 +02:00
f6da708b02
XEP-0198: Check whether routed packets are stanzas
...
Only stanzas are subject to stream management, so when XEP-0198 support
is enabled, we must distinguish them from non-stanza elements. This
commit adds a send_packet/2 function that can be used in place of
send_stanza/2 or send_element/2 whenever a packet is delivered that
might or might not be a stanza.
2014-05-12 19:20:25 +02:00
23fdf0e889
Merge pull request #209 from weiss/rename-disconnect-user
...
Rename disconnect_user/2 command
2014-05-12 12:55:15 +02:00
9121ca14de
Rename disconnect_user/2 command
...
The mod_admin_extra module provides a kick_session/4 command. Rename
the disconnect_user/2 command to kick_user/2 for consistency.
2014-05-12 12:44:40 +02:00
f4a3dbea70
Travis CI: Remove unnecessary configure flag
...
The test suite no longer fails without --enable-transient_supervisors.
2014-05-12 10:28:02 +02:00
47efe4e6a9
Don't log MUC messages with <no-store/> hint
...
Honor the <no-store/> and <no-permanent-store/> hints defined in
XEP-0334.
2014-05-12 00:27:20 +02:00
03fd88e4ec
Don't store messages with <no-store/> hint
...
Honor the <no-store/> hint defined in XEP-0334.
2014-05-12 00:00:34 +02:00
9b16d09261
Don't carbon copy messages with <no-copy/> hint
...
Honor the <no-copy/> hint defined in XEP-0334.
2014-05-11 23:52:20 +02:00
5d22159e9a
Merge pull request #205 from weiss/xep-0198
...
XEP-0198: Improve handling of incorrect stanza counts reported by client
2014-05-10 00:05:17 +04:00
003fd321ee
Do not try to retreive vCards via local SM for foreign JIDs
2014-05-09 21:26:55 +04:00
6d5bfcfe9b
XEP-0198: Improve handling of too large 'h' values
...
If the client says that it handled more stanzas than we sent (due to a
bug in the client's or in our code), increase our outgoing stanza count
accordingly. There's no point in sticking to the old value even if it
was correct, as the client surely won't fix its count during the current
session.
2014-05-09 18:28:14 +02:00
15369ff9d7
XEP-0198: Reject <resume/> with negative 'h' value
...
Make sure the 'h' attribute sent with a <resume/> request is
nonnegative, as mandated by XEP-0198.
We already have this check for <a/> elements.
2014-05-09 18:01:31 +02:00
a60fda7df4
XEP-0198: Don't warn on invalid ACK elements
...
Do not log a warning (but only a debug message) if the client sends an
invalid </a> packet. Some clients do that occasionally, and there's
nothing server admininistrators could do about that.
2014-05-09 17:54:12 +02:00
318b0f2208
Fix previous commit (C2S session close on server shutdown)
2014-05-08 21:47:50 +04:00
b995178e30
Merge branch 'master' of github.com:processone/ejabberd
2014-05-08 21:40:14 +04:00
181e7a823e
Fix C2S session close on server shutdown
2014-05-08 21:39:53 +04:00
0716a8cdae
Recompile the Guide
2014-05-08 17:58:25 +02:00
90a5c054d4
TURN support (EJAB-1017)
2014-05-08 16:14:21 +04:00
115da54557
Merge pull request #203 from hamano/added_get_random_pid_error_handling
...
improve error handling when sql calling with (empty|unknown) host.
2014-05-08 10:02:27 +04:00
e88a5c6b3c
Merge pull request #180 from hamano/mysql_table
...
added privacy_list_data index for mysql database.
2014-05-07 20:57:59 +04:00
79a49b1175
Webadmin with extauth requires internal to run at least once (issue #201 )
2014-05-07 17:13:51 +02:00
c511194c2e
Merge pull request #200 from hamano/mod_offline_bug
...
fix mod_offline:count_offline_messages/2
2014-05-07 16:49:31 +02:00
d3ed12d4ba
fix mod_offline:count_offline_messages/2
2014-05-07 15:38:18 +09:00
e7c94975eb
Revert "Document that ejabberd compilation requires pkg-config"
...
This reverts commit bd0060715e
2014-05-07 01:05:07 +04:00
47f627e605
Merge pull request #166 from weiss/xep-0198
...
Add support for XEP-0198: Stream Management
2014-05-06 23:50:49 +04:00
d343447cc9
Merge remote-tracking branch 'processone/master' into xep-0198
...
Conflicts:
doc/guide.tex
src/ejabberd_c2s.erl
2014-05-06 21:41:29 +02:00
cc1f93d7a0
Fix PEP broadcasting issue on ODBC (EJAB-1680)
2014-05-06 13:29:35 +02:00
58717923eb
Fix PEP broadcasting issue (EJAB-1680)
2014-05-06 12:37:44 +02:00
1aa56af541
Merge pull request #198 from weiss/add-travis-support
...
Add Travis CI configuration file
2014-05-06 13:13:56 +04:00
8b1f92575a
XEP-0198: Use "mgmt_" prefix for all #state fields
...
Prefix all ejabberd_c2s #state fields that are used for stream
management with "mgmt_".
2014-05-06 07:27:10 +02:00
66437c5e4d
Add Travis CI configuration
2014-05-05 22:42:15 +02:00
52f3acbdb1
Merge branch 'master' of github.com:processone/ejabberd
2014-05-05 18:42:49 +02:00
a6244275b7
remove compilation warnings
2014-05-05 18:16:48 +02:00
402dec8354
Recompile the ejabberd Guide html
2014-05-05 17:55:45 +02:00
4bdf1bc7a6
avoid sending duplicated events
2014-05-05 17:53:50 +02:00
faa6ad26a0
avoid sending empty events
2014-05-05 17:53:44 +02:00
bd0060715e
Document that ejabberd compilation requires pkg-config
2014-05-05 17:46:52 +02:00
530ac43758
store item when persist_item=false and cache_last_item=false but need last_item
2014-05-05 17:40:42 +02:00
2723056fae
Merge pull request #195 from Iperity/master
...
Fix small bug in presence_based_delivery implementation
2014-05-05 16:38:16 +04:00
f3aa74a043
Fix small bug in presence_based_delivery implementation
2014-05-05 14:14:03 +02:00
872cc12dd8
Temporary room not destroyed when the last participant is expulsed (EJAB-520)
2014-05-05 13:50:52 +02:00
70f00a1b1f
extauth_cache can have value 0
2014-05-05 13:13:35 +02:00
3b3f3b9131
XEP-0198: Don't log protocol issues
...
There are corner cases where certain clients acknowledge more stanzas
than they received. Nothing really bad will happen in those cases, and
server administrators can't do anything about such issues anyway.
2014-05-05 01:11:14 +02:00
32abcbca6c
XEP-0198: Accept stream elements in pending state
...
Due to timing issues, ejabberd_c2s might receive stream elements from
the client while the session is waiting for stream resumption. Those
elements are now accepted.
2014-05-05 00:02:55 +02:00
a0917a8e9b
XEP-0198: Log message when waiting for resumption
...
Log an informational message when a session goes into the pending state
(waiting for resumption) after the connection was lost. Administrators
may well be interested in this state change when looking into issues.
2014-05-04 23:08:42 +02:00
fafec77e56
Make it possible to get/set vCards for MUC rooms
2014-05-04 23:23:17 +04:00
478b4f19bd
Merge pull request #194 from weiss/mysql-user-at-localhost
...
test/README: Create MySQL test user on localhost
2014-05-04 12:00:59 +04:00
b73b139f24
test/README: Create MySQL test user on 'localhost'
...
Suggest specifying 'localhost' as host name part of the MySQL test
account name. Otherwise, the anonymous user that is usually created by
default for 'localhost' would take precedence for local connections due
to the more specific host name.
2014-05-04 01:02:22 +02:00
806c0e56e1
Do not crash on version downgrade
2014-05-03 17:55:03 +04:00
d0ffcb7fd4
Assume udp_recv/5 now returns new options
2014-05-03 17:48:26 +04:00
955487391d
Assume tcp_init/2 and udp_init/2 now return new options
2014-05-03 17:48:17 +04:00
e00215a12f
Always enable SIP at compile time
2014-05-02 17:46:24 +04:00
47a39ce738
Remove unused function
2014-05-02 17:43:23 +04:00
ebd760b7c9
Forking support
2014-05-02 17:43:17 +04:00
f8417f7c1f
Remove empty line
2014-05-02 17:43:09 +04:00
3c98de69dc
Some cleanup
2014-05-02 17:43:03 +04:00
ab6774d93d
Fix CSeq comparison
2014-05-02 17:42:57 +04:00
58aa200297
Optimize request processing
2014-05-02 17:42:51 +04:00
a1337cb73f
Do not proxy stray responses statelessly (as per RFC 6026)
2014-05-02 17:42:45 +04:00
e7e4055cbb
Don't use erlang:integer_to_binary/1
2014-05-02 17:42:37 +04:00
1d771fe646
Rewrite 'Contact' headers in REGISTER requests
2014-05-02 17:42:31 +04:00
8e2bc8d19e
Check for 'max_user_sessions' option
2014-05-02 17:42:13 +04:00
0117787317
Process gen_server timeouts correctly
2014-05-02 17:40:25 +04:00
16e5d66572
Move some code in a separate function
2014-05-02 17:38:47 +04:00
6a95422af8
Multiple REGISTER bindings support
2014-05-02 17:38:28 +04:00
35faffe7da
Locate sessions by proxy processes directly
2014-05-02 17:31:17 +04:00
a6fe7425dd
Merge pull request #192 from hamano/fix_ejabberd_system_monitor_error
...
fix ejabberd_system_monitor:s2s_out_info/1 error
2014-05-01 10:44:49 +04:00
d83368d73d
fix ejabberd_system_monitor:s2s_out_info/1 error
2014-05-01 15:12:04 +09:00
c545b3de6d
Merge pull request #178 from hamano/devel
...
undefined ejabberd_socket:get_conn_type/1
2014-04-30 21:49:54 +04:00
02e0649d18
SIP support
...
Conflicts:
configure
configure.ac
doc/guide.tex
2014-04-30 19:38:15 +04:00
0904b8b8ff
improve error handling when sql calling with (empty|unknown) host.
...
see #191
2014-05-01 00:20:58 +09:00
ec6c58a21c
Fix error reporting in previous commit
2014-04-30 16:02:20 +02:00
b3714a1b2e
Fix formatting string argument (thanks to Locojay)(github #129 )
2014-04-30 15:59:44 +02:00
81a906af01
Merge pull request #191 from hamano/added_get_random_pid_error_handling
...
fix error handling when sql calling with unknown host.
2014-04-30 17:02:39 +04:00
65519cf262
Merge pull request #190 from hamano/mod_register_web_response_404
...
mod_register_web should response 404 instead of process crash.
2014-04-30 12:42:43 +02:00
a1b8c54c16
Merge pull request #187 from weiss/fix-ejabberdctl-output
...
Let ejabberdctl accept binary string arguments
2014-04-30 12:41:12 +02:00
a6408e9281
fix error handling when sql calling with unknown host.
2014-04-30 15:32:07 +09:00
0e0bd3329d
mod_register_web should response 404 instead of process crash.
2014-04-30 13:39:17 +09:00
ce22239d85
Merge pull request #189 from weiss/markdown-readme
...
Convert README to Markdown
2014-04-30 07:55:27 +04:00
375a1dd759
Convert README to Markdown
...
Use Markdown syntax for the README file and add a README.md symlink, so
that a certain popular Git hosting site renders it nicely.
2014-04-29 23:54:14 +02:00
9563b0228f
Merge pull request #177 from weiss/log-tls-sasl-external
...
Log TLS status for outgoing s2s with SASL EXTERNAL
2014-04-30 00:38:18 +04:00
8419322884
Merge pull request #181 from weiss/check-tls-before-auth
...
Check TLS state before requesting SASL EXTERNAL for outgoing s2s connections
2014-04-30 00:36:08 +04:00
c37aa1b46d
Merge pull request #185 from weiss/verify-cert-for-s2s-out
...
Support certificate verification for outgoing s2s connections
2014-04-30 00:08:24 +04:00
599fdb9ac2
Merge pull request #186 from weiss/add-disconnect-command
...
New ejabberd command: disconnect_user/2
2014-04-29 15:41:41 +04:00
ebbceab93f
Translate disconnect_user/2 string sent to client
2014-04-29 11:56:28 +02:00
bb2c8b59f8
Avoid #state.lang type errors in corner cases
...
If #state.lang is used before being initialized to some binary string,
the translation code would crash.
2014-04-29 11:41:24 +02:00
0af3f9388f
Merge pull request #188 from weiss/update-readme
...
Update README: XEP-0227 code no longer uses exmpp
2014-04-29 13:12:08 +04:00
4073394e7a
Merge pull request #182 from hamano/register_account_acl
...
fix checking acl in mod_register_web
2014-04-29 13:06:53 +04:00
29aead19d9
Merge pull request #179 from hamano/added_get_random_pid_error_handling
...
added get_random_pid/1 error handling
2014-04-29 13:05:58 +04:00
16dd6b03c6
Update README: XEP-0227 code no longer uses exmpp
2014-04-29 10:17:00 +02:00
d09c268b20
Let ejabberdctl accept binary string arguments
...
Don't print the following message if an ejabberd command expects binary
string arguments: "This command cannot be executed using ejabberdctl.
Try ejabberd_xmlrpc."
2014-04-29 01:11:08 +02:00
6d1055abec
New ejabberd command: disconnect_user/2
2014-04-29 00:50:43 +02:00
68e62d7442
Merge pull request #184 from weiss/properly-abort-s2s-in
...
Fix handling of certificate verification errors for incoming s2s connections
2014-04-28 09:58:44 +04:00
49bdbf2895
Support certificate verification for outgoing s2s
...
Handle "s2s_use_starttls: required_trusted" the same way for outgoing
s2s connections as for incoming connections. That is, check the remote
server's certificate (including the host name) and abort the connection
if verification fails.
2014-04-28 01:42:02 +02:00
a21d2298af
XEP-0198: Turn some warnings into info messages
...
Don't log warnings on events that will happen during normal operation.
2014-04-28 01:01:30 +02:00
1aa4ed3f35
Don't mess with s2s out when aborting s2s in
...
Don't try to look up and close outgoing connections to a given server
when aborting incoming connections from that server due to certificate
verification errors. The ejabberd_s2s:find_connection/2 call actually
created one or more *new* connections if less than 'max_s2s_connections'
connections were found. Then, no more than one of those possibly new
connections were stopped by the ejabberd_s2s_out:stop_connection/1 call.
It's not really necessary to bother with outgoing connections at all,
here.
2014-04-28 00:17:05 +02:00
eabca82765
Send stream trailer before closing s2s connection
...
When aborting an incoming s2s connection due to certificate verification
errors, send a stream trailer before closing the socket.
2014-04-27 00:28:42 +02:00
71dba66330
fix checking acl in mod_register_web
2014-04-24 18:15:39 +09:00
d805d198ac
Check TLS state before requesting SASL EXTERNAL
...
Make sure a remote server can't circumvent "s2s_use_starttls: required"
by offering SASL EXTERNAL authentication over a non-TLS connection.
2014-04-24 11:04:10 +02:00
0734562ded
added privacy_list_data index for mysql database.
2014-04-24 16:04:40 +09:00
ffe9f3c192
added get_random_pid/1 error handling
2014-04-24 15:34:41 +09:00
219f9276d1
undefined ejabberd_socket:get_conn_type/1
2014-04-24 12:42:22 +09:00
f988aad940
Log TLS status for outgoing s2s with SASL EXTERNAL
2014-04-23 23:28:13 +02:00
3a3f8240c1
Merge pull request #176 from hamano/devel
...
added error handling in mod_pubsub_odbc.
2014-04-23 17:06:46 +02:00
9ec014c184
added error handling in mod_pubsub_odbc.
2014-04-23 23:35:34 +09:00
e9d104ec47
Merge pull request #174 from weiss/fix-s2s-in-auth
...
Fix certificate authentication for incoming s2s connections
2014-04-23 15:10:20 +02:00
86e17c379c
Verify host name before offering SASL EXTERNAL
...
Prior to this commit, ejabberd handled certificate authentication for
incoming s2s connections like this:
1. Verify the certificate without checking the host name. On failure,
behave according to 's2s_use_starttls'. On success:
2. Offer SASL EXTERNAL.
3. If the remote server chooses SASL EXTERNAL, compare the authorization
identity against the certificate host name(s). On failure, abort the
connection unconditionally.
ejabberd now does this instead:
1. Verify the certificate and compare the certificate host name(s)
against the 'from' attribute of the stream header. On failure,
behave according to 's2s_use_starttls'. On success:
2. Offer SASL EXTERNAL.
3. If the remote server chooses SASL EXTERNAL, ignore the authorization
identity (if any) and consider the peer authenticated.
The old behavior was suggested by previous versions of XEP-0178, the new
behavior is suggested by the current version 1.1.
2014-04-23 11:45:17 +02:00
4bc8b6bc9f
Fix extraction of host names from certificates
2014-04-22 22:12:04 +02:00
9497dbff17
Merge pull request #162 from weiss/enable-carbons
...
Enable mod_carboncopy in example configuration
2014-04-22 13:53:23 +02:00
37d4109e8a
Merge pull request #161 from weiss/fix-carbons
...
Let mod_carboncopy take care of messages sent to bare/unavailable JIDs
2014-04-22 13:52:11 +02:00
b73f28c93e
Merge pull request #173 from weiss/force-configure-regeneration
...
Always regenerate the configure script when running ./autogen.sh
2014-04-22 12:52:22 +02:00
c98d539bb3
Force regeneration of configure script
...
As the version string is auto-generated from the git-describe(1) output,
the configure script may need to be regenerated even if configure.ac
wasn't modified.
2014-04-18 12:13:17 +02:00
4b52a8e4e3
Merge pull request #172 from weiss/accept-extauth-cache-false
...
Don't log an error when "extauth_cache: false" is specified
2014-04-17 19:55:51 +02:00
d350cc6361
Accept "extauth_cache: false"
...
Don't log a "configuration problem" message if "extauth_cache: false" is
explicitly specified, as that's a valid configuration setting as per the
documentation.
2014-04-16 14:15:14 +02:00
727197613a
Merge pull request #171 from weiss/update-doc-url
...
Update a URL in the guide
2014-04-16 10:03:07 +02:00
cc6a4787af
Merge pull request #170 from weiss/fix-doc-typos
...
Fix two small typos in the guide
2014-04-16 10:02:12 +02:00
27a7b38dee
Update a URL in the guide
2014-04-16 00:31:15 +02:00
45687c52dc
Fix two small typos in the guide
2014-04-16 00:25:11 +02:00
7af7b7d3f0
Fix compilation on pre-R17
2014-04-15 17:05:25 +02:00
d97b4fd9ca
Fix loading translation files on R17
2014-04-15 17:05:22 +02:00
f93758a3cd
Merge pull request #160 from runcom/protocol_options
...
Add option to specify openssl options
2014-04-15 19:01:21 +04:00
77d6d36a9d
Merge pull request #167 from weiss/fix-modules-doc
...
Remove outdated comment from guide
2014-04-15 16:41:48 +02:00
57ba57b908
Merge pull request #168 from weiss/carbons-doc
...
Mention mod_carboncopy in documentation
2014-04-15 16:40:48 +02:00
c9d4f2146c
Mention mod_carboncopy in documentation
2014-04-15 01:29:00 +02:00
46001aafaa
Remove outdated comment from guide
2014-04-15 01:21:41 +02:00
ad680c508e
Merge pull request #165 from weiss/fix-access-doc
...
Fix the description of the access rules syntax in the Guide
2014-04-12 16:42:05 +02:00
be43aa85f4
Fix description of access rules syntax
2014-04-11 14:00:10 +02:00
285c4c17cf
Merge pull request #146 from jamielinux/master
...
Update FSF address
2014-04-11 13:35:46 +02:00
a21edc2f3a
Pretty print accepted transport address
2014-04-11 12:30:58 +02:00
515331baad
Enable mod_carboncopy in example configuration
...
XEP-0280 seems to be quite popular these days.
2014-04-08 23:38:04 +02:00
b3b12effbc
Carbons: Handle unavailable resource like bare JID
...
As the session manager handles messages sent to unavailable resources
just like messages sent to bare JIDs, mod_carboncopy must do that, too.
That is, forward them only to those carbon-copy-enabled resources that
don't have a top priority, in order to avoid duplicates.
2014-04-08 23:32:30 +02:00
fbf71f86f3
Add option to specify openssl options
2014-04-08 18:46:52 +02:00
9d5426315f
Carbons: Also forward messages sent to bare JIDs
...
Don't ignore messages sent to bare JIDs, but forward them to all
carbon-copy-enabled resources that don't have the highest priority.
2014-04-07 22:10:08 +02:00
c114eb3736
XEP-0198: Don't bounce/resend forwarded messages
...
On connection timeout, drop any messages that were forwarded by some
encapsulating protocol, such as XEP-0280 carbon copies or XEP-0313
archive messages. Bouncing or resending them could easily lead to
unexpected results.
2014-04-07 21:21:11 +02:00
66006ba017
Update Hebrew translation (thanks to Isratine Citizen)
2014-04-07 16:26:50 +02:00
f3bbfb1c66
Merge pull request #159 from weiss/update-gitignore
...
Update the gitignore(5) file
2014-04-07 13:29:37 +02:00
766ab1eb46
Merge pull request #158 from weiss/fix-lang-type
...
Fix a type error
2014-04-07 13:28:41 +02:00
76fb7d284a
Merge pull request #157 from weiss/fix-mod-update
...
Fix badarg issue on module update web site
2014-04-07 13:27:31 +02:00
2d441b3305
Merge pull request #156 from hamano/devel
...
mod_register_web: check same acl as mod_register.
2014-04-07 12:39:22 +02:00
0befeb7d93
Let Git ignore the "ebin" directory
2014-04-06 00:56:36 +02:00
a2679e9d51
Let Git ignore files generated by "make install"
2014-04-06 00:56:09 +02:00
37f409d254
Fix a type error
2014-04-06 00:39:51 +02:00
e02a4913d2
Fix badarg issue on module update web site
2014-04-05 23:23:44 +02:00
1250ee5d77
mod_register_web: check same acl as mod_register.
2014-04-04 04:07:29 +09:00
8b9c49440a
Fix user_resources command, and ejabberd_xmlrpc parsing auth details in call
2014-03-31 16:51:47 +02:00
5bf3c784da
New Bash completion script for ejabberdctl, experimental (EJAB-1042)
2014-03-26 16:43:56 +01:00
a5a065290b
Small change in ejabberd_ctl output format to support bash completion
2014-03-26 16:43:53 +01:00
ac0e199d36
Provide meaningful text to user when admin kicks session (EJAB-1455)
2014-03-26 16:01:37 +01:00
a97c716352
XEP-0198: Bounce unacked stanzas by default
...
If the new "resend_on_timeout" option is set to false (which it is by
default), bounce any unacknowledged stanzas instead of re-routing them.
2014-03-25 23:23:38 +01:00
2150b10901
Fix service_info options processing
2014-03-25 09:52:57 +04:00
5c36c44689
Remove annyoing warnings
2014-03-25 09:42:12 +04:00
d5f90965d7
Fix ACLs syntax change (thanks to jokker23)(issue #140 )
2014-03-24 19:40:55 +01:00
2da6933bb7
Remove "fun" element from c2s #state
...
Memory consumption wise, local "fun" references are quite expensive.
2014-03-22 20:25:43 +01:00
e360c56f87
Support XEP-0198 session resumption
...
Implement the optional session resumption feature described in XEP-0198.
A client that supports this feature may now resume the previous session
(within a configurable number of seconds) if the connection was lost.
During resumption, ejabberd will retransmit any stanzas that hadn't been
acknowledged by the client.
2014-03-19 00:51:33 +01:00
2b527f5e9a
Merge pull request #149 from iulianlaz/carboncopy-fix-msg-back-to-original-sender
...
#148 Carbon copy sends message back to original sender solved
2014-03-16 20:59:49 +01:00
88a200e100
Remove some commented out code
...
The code that had been commented out at some earlier point in time would
now break XEP-0198.
2014-03-16 00:12:47 +01:00
633d47f784
Update copyright dates to 2014 (EJAB-1679)
2014-03-13 12:30:57 +01:00
7d594086c3
Add initial XEP-0198 support (EJAB-532)
...
Implement partial support for XEP-0198: Stream Management. After
successful negotiation of this feature, the server requests an ACK for
each stanza transmitted to the client and responds to ACK requests
issued by the client. On session termination, the server re-routes any
unacknowledged stanzas. The length of the pending queue can be limited
by setting the "max_ack_queue" option to some integer value (default:
500). XEP-0198 support can be disabled entirely by setting the
"stream_management" option to false (default: true).
So far, stream management is implemented only for c2s connections, and
the optional stream resumption feature also described in XEP-0198 is not
(yet) supported.
This addition was originally based on a patch provided by Magnus Henoch
and updated by Grzegorz Grasza. Their code implements an early draft of
XEP-0198 for some previous version of ejabberd. It has since been
rewritten almost entirely.
2014-03-12 23:34:14 +01:00
0f0e99ccd3
Provide header with latin-1 encoding in translations to work with Erlang/OTP R17
2014-03-12 17:26:27 +01:00
9ef1ad0b6e
#148 Carbon copy sends message back to original sender solved
2014-03-06 08:40:38 +00:00
afba5bc5f5
Merge branch 'master' of github.com:processone/ejabberd
2014-02-28 15:36:46 +04:00
4a02893dac
Regenerate XMPP codec
2014-02-28 15:36:34 +04:00
e211bf522e
Support XEP-0321: Remote Roster Management (EJAB-1381)
2014-02-26 18:02:37 +01:00
46b2d91105
Convert DB details to string when calling odbc:connect/2 (EJAB-1681)
2014-02-26 17:26:46 +01:00
c29ba14dbf
Don't provide current password in webinterface (github issue #137 )
2014-02-26 17:19:07 +01:00
4c8aeefa7f
Merge pull request #145 from weiss/fix-configure-flag
...
Fix --enable-transient_supervisors flag
2014-02-24 12:46:09 +01:00
8e628fdad3
Merge pull request #144 from weiss/fix-supervisor-start
...
Add missing parenthesis
2014-02-24 12:40:10 +01:00
8538997d61
Update FSF address
2014-02-22 10:27:40 +00:00
26dee37268
Fix --{enable,disable}-transient_supervisors flag
...
Fix configure's --{enable,disable}-transient_supervisors option: Make
sure it's enabled with --enable and disabled with --disable, not the
other way round. This also makes --disable the default setting, as
documented.
2014-02-21 23:34:48 +01:00
e82a79efd5
Add missing parenthesis
2014-02-21 23:33:13 +01:00
63a7011c38
When occupant changes nick, include status 110 in stanzas sent to him
2014-02-14 16:22:14 +01:00
4c8b6fe16b
Fixing mod_carboncopy sends carbons of carbons ( fixes #107 )
2014-01-23 17:29:24 +01:00
565b8bf7e6
Merge pull request #134 from mrjameshamilton/patch-1
...
Fixed parameter order in call to restore_room/3
2014-01-23 06:56:18 -08:00
5ccc6db093
Fixed parameter order in call to restore_room/3
2014-01-23 14:39:52 +00:00
9422164dda
Clear SASL state after finishing auth
2014-01-21 13:44:29 +02:00
cbbfd921b4
Fix for the previous commit
2014-01-21 11:54:18 +02:00
d63be79df9
Use 'to' field only in the first client stream initialization
2014-01-20 16:06:05 +02:00
155c8bb29a
Add some ejabberd_xmlrpc documentation, and link to full details
2014-01-02 16:31:28 +01:00
e107e78773
Fix auth verification in ejabberd_xmlrpc (thanks to Vicis)
2014-01-02 16:10:19 +01:00
27302fb7ac
Fix example configuration option 'add' to 'append_host_config'
2014-01-02 15:03:05 +01:00
d03de1bb43
Fix some type specs and errors
2013-12-10 21:44:46 +10:00
33764bb931
Add ejabberd_xmlrpc
2013-12-10 21:25:12 +10:00
eadc899046
remove version.tex file which is auto-generated
2013-12-05 14:19:55 +01:00
5a1300bc70
Add access rule to mod_roster (EJAB-72)
2013-12-04 14:57:44 +01:00
9c17163b55
bind values for get_parentnodes_tree
2013-12-03 10:51:01 +01:00
e11c835bd3
fix use of virtual nodetree
2013-12-03 10:34:59 +01:00
5ecd832e81
Merge pull request #119 from Mikhail-D/patch-1
...
Create mssql2012.sql
2013-12-02 02:02:44 -08:00
a95aa46fe5
Create mssql2012.sql
...
replace sp_dboption with new instructions
2013-12-02 00:29:52 -08:00
1dd94ac0d0
Support for OpenSSL ciphers list in ejabberd_c2s, ejabberd_s2s_in and ejabberd_s2s_out
2013-11-28 19:39:11 +02:00
a6b0e18bde
add Pubsub data migration from mnesia to odbc (EJAB-1126)
...
By calling:
ejd2odbc:export_pubsub("localhost","/tmp/aa.txt").
it will generate SQL files like these:
/tmp/pubsub_item.txt
/tmp/pubsub_node.txt
/tmp/pubsub_state.txt
Conflicts:
src/ejabberd_admin.erl
src/ejd2odbc.erl
2013-11-14 19:29:16 +01:00
89a17ba84a
Correctly convert ACLs into YAML representation
2013-11-07 02:43:43 +10:00
a87b475361
Do not use functions from crypto module wherever possible
2013-11-05 20:07:38 +10:00
b7c7d2747b
Fix some type errors
2013-11-05 19:49:30 +10:00
c0240e7249
Do not try to start STUN application during config checks
2013-11-02 10:30:19 +10:00
6dd31299cf
Avoid case clause crash when loading permanent rooms
2013-10-23 12:23:00 +10:00
2846a2978b
Get rid of deprecated MySQL variable 'table_type'
2013-10-23 11:58:26 +10:00
6df09f5ad6
Check libyaml presence at configure time
2013-10-22 20:12:39 +10:00
d9da6b77de
Enumerate convert_to_yaml command in list of commands
2013-10-09 16:05:45 +02:00
cd0381bab5
Fix display ACLs in WebAdmin
2013-10-01 23:23:01 +02:00
f2f2f64161
update default version to 13.10
2013-09-27 11:19:22 +02:00
2c09d7c8a7
Fix handling of format_status arguments (thanks to Nbaronov)
2013-09-26 17:19:56 +02:00
389a99b2db
Fix bypass for tls-required (thanks to Zeha)
2013-09-26 16:41:57 +02:00
07c8bf5064
Fix roster version support
2013-09-24 18:59:20 +10:00
7fd91a4b12
Better web-handlers detection
2013-09-22 21:47:59 +10:00
ae4356265f
Merge branch 'master' of github.com:processone/ejabberd
2013-09-19 19:00:08 +10:00
a0396620f2
Reflect modules name changes in p1_mysql
2013-09-19 18:59:32 +10:00
7e73ed88f7
Fix problem with decoding http headers over tls connections
...
This fixed GitHub issue 96.
2013-09-16 16:32:02 +02:00
150a5392e5
Fix the template: do not use 'global' keyword
2013-08-30 20:44:12 +10:00
8cbbe4a3eb
Fix release version number.
2013-08-30 09:12:33 +02:00
4b82cb9953
update default version number
2013-08-27 17:14:58 +02:00
63b2d21b13
clean subscriptions handling and avoid function_clause
2013-08-27 14:46:54 +02:00
1b8876bf55
fix build of Parents list in #pubsub_node
2013-08-27 14:46:35 +02:00
b82eeeeec9
fix call to get_session_pid with binary arguments
2013-08-27 14:46:22 +02:00
dd26398a02
Fix the ACL rule
2013-08-27 20:12:26 +10:00
11292c809f
Remove non-existent module from the testing config
2013-08-27 20:08:22 +10:00
a62fb69e20
Remove multiple host_config sections
2013-08-27 20:05:12 +10:00
e3483ef9e1
Do not rely on p1_logger_h module when lager is enabled
2013-08-27 17:45:07 +10:00
0fe3de6b30
Fix ejabberdctl config name
2013-08-24 22:10:10 +10:00
91a74e3e27
Change configuration file format to YAML
2013-08-21 22:17:59 +10:00
f68dfacbbf
Do not try to read/write the deprecated "config" table
2013-08-21 19:37:22 +10:00
0b9754884e
Do not distribute the ACL table
2013-08-21 19:37:08 +10:00
cc6dcd161c
Get rid of global configuration options
2013-08-21 19:36:35 +10:00
7a77186fbe
Enumerate in guide.tex what processes are started for ejabberd (EJAB-1082)
2013-08-05 19:22:22 +02:00
06bb10a032
Merge pull request #85 from imtal/patch-1
...
Fix version check
2013-07-24 06:01:45 -07:00
3e2f9dc6b0
Fix version check
...
Not all Erlang versions are of equal length. Added clauses to handle this.
2013-07-24 14:47:32 +02:00
807a1fe164
Fix timestamp processing
2013-07-23 15:27:18 +10:00
8ce22b790d
Fix some type errors
2013-07-22 19:24:09 +10:00
f75d78d3f5
Make it possible to import without cursor usage
2013-07-22 10:46:47 +10:00
ca6463ed78
Typo fix
2013-07-22 00:22:05 +10:00
d58148fa8d
Add SQL to Mnesia converter
2013-07-21 23:10:38 +10:00
a2ead99c83
Make it possible to enable/disable TLS compression
2013-07-17 22:46:18 +10:00
33f09c7a78
Merge pull request #83 from tagged/makefile
...
make deps/.built depend on deps/.got
2013-07-15 20:06:35 -07:00
2d43b035d7
make deps/.built depend on deps/.got
...
fixes race condition when running make with simultaneous jobs
2013-07-15 10:52:34 -07:00
986f4d1a7f
Do not forget to re-define the crash.log path
2013-07-15 11:51:09 +10:00
8482641b4e
Increase the timetrap timeout
2013-07-15 11:51:02 +10:00
8fc5d86704
Merge pull request #82 from tuncer/rebar-debug_info
...
rebar.config.script: fix debug_info handling
2013-07-14 04:07:39 -07:00
47994806f0
rebar.config.script: fix debug_info handling
...
debug_info is enabled by default and can be disabled by passing
'no_debug_info' in erl_opts.
2013-07-13 21:33:50 +02:00
0d7a5476c0
Allow room member to get members list using XEP
2013-07-11 12:11:48 +02:00
4e72dd6751
fix badmatch in send_loop (EJAB-1650)
2013-07-10 09:47:49 +02:00
48819d163a
fix badmatch on remove_user on PEP nodes (EJAB-1649)
2013-07-09 21:50:56 +02:00
8621a8f006
fix invalid response on get_options when no options set (EJAB-1648)
2013-07-09 18:11:27 +02:00
b66e4fbdc4
Apparently configure.erl is not needed anymore
2013-07-08 15:58:38 +02:00
b5623d6bee
gen_iq_handler:check_type was missing
2013-07-08 10:40:39 +03:00
e89f0f6461
Cleanup the test suite (just a little)
2013-07-07 04:47:47 +10:00
2b24e97936
Use error_logger directly in the LDAP test server
2013-07-07 03:48:16 +10:00
a302af7770
Do not build p1_logger if lager is enabled
2013-07-07 03:10:51 +10:00
0aca3a4585
Improve the applications start-up
...
* Check if all modules present for every application loaded.
* Get rid of now obsoleted 'ejabberd_check' module.
2013-07-07 02:19:51 +10:00
c262c08513
Improve the XMPP codec, fix the test suite accordingly
2013-07-07 02:19:10 +10:00
0266207e9d
fix pubsub unsubscription without SubId on odbc
2013-07-04 15:13:21 +02:00
60600c341e
improve pubsub odbc use of i2l
2013-07-04 10:07:53 +02:00
02c59422cf
Re-generate the XMPP codec
2013-07-03 01:55:00 +10:00
97810b4cc3
Update the rebar script
2013-07-01 02:22:18 +10:00
1a9f0ab084
Update the rebar script
2013-06-30 23:41:24 +10:00
fa7fe73a0e
Improve the rebar script. Keep the build graph by default.
2013-06-30 23:41:18 +10:00
49e17922a3
Remove stupid slow code from rebar, regenerate the script
2013-06-30 23:41:09 +10:00
09c450062a
Update XMPP codec spec to reflect
...
the changes in xml_gen
2013-06-29 18:41:00 +10:00
ac3cd2ebaa
ip_adresse() does not need binary representation in config
2013-06-28 18:32:22 +02:00
2636da0d98
Fix IDNA conversion
2013-06-28 02:45:42 +10:00
91744733c1
Store only messages with body or subject (EJABS-2034)
2013-06-27 11:58:31 +02:00
295ea0633e
Re-create the configure script
2013-06-27 19:46:38 +10:00
bc2ea224eb
Fix a typo
2013-06-27 19:45:45 +10:00
9f4d12bd0a
Add --enable-tools to --enable-all
2013-06-27 19:45:28 +10:00
653e23c0e7
Re-create the configure script
2013-06-27 19:31:33 +10:00
c7e2128dab
Enable lager support by default
2013-06-27 19:31:05 +10:00
8a9743ab3b
Avoid custom loglevels processing for lager
2013-06-27 19:27:56 +10:00
597934637c
Logger improvements.
...
lager:
* It is now possible to change the loglevel.
* Log rotation is now supported as well.
p1_logger:
* When rotating a log file, add suffix ".0" to the renamed file.
This is needed in order to be consistent with lager
rotation mechanism.
2013-06-27 19:03:33 +10:00
2ea397e476
Pre-load applications before setting the environment variables
2013-06-27 19:03:25 +10:00
9094169440
Do not forget to remove testing beams on "clean"
2013-06-27 15:36:39 +10:00
3631301304
Do not check the second SASL challenge
2013-06-27 15:36:31 +10:00
42a9e4f4cf
Split the test suite into modules
2013-06-27 15:36:23 +10:00
aab70fc066
Fix external authentication
2013-06-26 12:30:32 +10:00
167f02ab72
Do not fetch disco#info multiple times
2013-06-26 03:32:38 +10:00
1b0c02cb2e
Start the LDAP server before ejabberd application
2013-06-26 03:06:19 +10:00
c05edabe58
Add more pubsub test cases
2013-06-26 03:06:11 +10:00
Paweł Chmielowski
