Badlop
38fd9a3ed2
Update URLs of module documentations
2024-05-10 16:04:28 +02:00
dependabot[bot]
4ec236966a
Bump exsync from 0.4.0 to 0.4.1
...
Bumps [exsync](https://github.com/falood/exsync ) from 0.4.0 to 0.4.1.
- [Changelog](https://github.com/falood/exsync/blob/main/CHANGELOG.md )
- [Commits](https://github.com/falood/exsync/compare/v0.4.0...v0.4.1 )
---
updated-dependencies:
- dependency-name: exsync
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-05-07 11:28:19 +02:00
Badlop
696e42b5b4
Use json module when Erlang/OTP 27, jiffy with older ones
2024-05-07 11:28:17 +02:00
Badlop
0ad1d315e8
Use maps instead of tuple+list+tuple as arguments in jiffy functions
2024-05-07 11:28:16 +02:00
Badlop
4697a9295a
Update p1_acme that uses Erlang's json library instead of jiffy when OTP 27
2024-05-07 11:28:14 +02:00
Badlop
9fbc7b96e4
Update pkix dependency with minor fixes for compilation warnings
2024-05-07 11:28:11 +02:00
Badlop
392d7ee30b
CI and Runtime: Now ejabberd and dependencies can compile with OTP 27.0-rc3
2024-05-02 17:30:21 +02:00
Badlop
025e2a5760
CI and Runtime: Don't get explicitly dependencies ( #4213 )
2024-05-02 17:30:04 +02:00
Badlop
f7dc4fa2ac
configure.ac: When using rebar3 with old Erlang, unlock some dependencies ( #4213 )
2024-05-02 17:29:57 +02:00
Badlop
13ebe89fdc
Remove unused format_status/2 callback that is deprecated in OTP 27
2024-04-30 18:00:32 +02:00
Badlop
c7c3cc10c5
mix.exs: Dirty workaround to get port_compiler with OTP 27 support
2024-04-30 18:00:29 +02:00
Badlop
e9b9159d23
rebar.config.script: Use port_compiler branch that supports OTP 27.0-rc2
...
If we provide this plugin in ejabberd, then dependencies will not download
the old pc 1.14.0 which doesn't support OTP 27.0-rc2, and will use this one.
2024-04-30 18:00:27 +02:00
Badlop
f15d5d073e
configure.ac: When using rebar3, unlock dependencies that are disabled ( #4212 )
2024-04-30 18:00:25 +02:00
Badlop
b461657407
Bump idna from 6.0.0 to 6.1.1
...
Bumps [idna](https://github.com/benoitc/erlang-idna ) from 6.0.0 to 6.1.1.
- [Changelog](https://github.com/benoitc/erlang-idna/blob/master/CHANGELOG )
- [Commits](https://github.com/benoitc/erlang-idna/compare/6.0.0...6.1.1 )
---
updated-dependencies:
- dependency-name: idna
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-04-30 18:00:23 +02:00
Badlop
0da767f568
ban_account/unban: When mod_private is disabled, return meaningful error ( #4201 )
2024-04-30 18:00:21 +02:00
Badlop
395a73bbe0
Handle case when mod_private is not enabled ( #4201 )
2024-04-30 18:00:18 +02:00
Badlop
5870e2e378
Use updated xmpp library with minor improvement in auth ( #4201 )
2024-04-30 18:00:16 +02:00
Badlop
94a0aa6967
Add support to provide ban detail when account logins ( #4201 )
2024-04-30 18:00:14 +02:00
Badlop
2bfc4b0f5d
Use "jabber:" namespace that clients cannot use ( #4201 )
...
As mentioned in:
Certain namespaces are reserved in Jabber (namespaces beginning with
'jabber:' or 'http://jabber.org/ ', as well as 'vcard-temp').
If a user attempts to get or set jabber:iq:private data in a reserved
namespace, historically some server implementations have chosen to
return an error (commonly "Not Acceptable") to the sender.
https://xmpp.org/extensions/xep-0049.html#example-5
2024-04-30 18:00:12 +02:00
Badlop
374f6b8e7d
Improve recent commit so users cannot prevent banning, fixes 44bafa4
( #4201 )
2024-04-30 18:00:11 +02:00
Badlop
33c6b3700e
Ammend ejabberd_admin:update/0 from adbccbe
to be used by Rebar3 Sync
2024-04-30 18:00:08 +02:00
Badlop
eb975268f4
Add ExSync tool to "make relive" with Mix
...
How to use:
- Compile ejabberd with Mix
- Start ejabberd with "make relive"
- Edit some ejabberd source code file
- Save the file, and ExSync will compile and reload it automatically
ExSync depends on FileSystem library, which requires inotify-tools, see
https://github.com/falood/file_system#system-support
References:
https://hex.pm/packages/exsync
https://github.com/falood/exsync
2024-04-30 18:00:06 +02:00
Badlop
b0afe4946d
Add Sync tool to "make relive" with Rebar3
...
How to use:
- Compile ejabberd with Rebar3
- Start ejabberd with "make relive"
- Edit some ejabberd source code file
- Save the file, and Sync will compile and reload it automatically
I've added src_dirs option so Sync doesn't act on dependencies,
which would produce many garbage log lines.
However, now it only works if the parent directory is named "ejabberd"
Sync requires at least Erlang/OTP 21, which introduced the
new try-catch syntax to retrieve the stacktrace
https://www.erlang.org/patches/otp-21.0
References:
https://hex.pm/packages/sync
https://github.com/rustyio/sync
2024-04-30 17:59:59 +02:00
Badlop
5c6a399f5b
Update links to some moved content in docs.ejabberd.im
2024-04-25 02:55:02 +02:00
Badlop
e744665171
Fix links in mix.exs
2024-04-24 13:20:48 +02:00
Badlop
0b16cbddde
Remove vcard example config in mod_proxy65, it breaks PDF Docs generation
2024-04-24 13:20:47 +02:00
Badlop
7ea2c6eabf
Improve markdown of md files
2024-04-24 13:20:46 +02:00
Badlop
45ca11ecd0
Improve markdown of generated documentation
2024-04-24 13:20:44 +02:00
Badlop
d8cdd82bf8
Rewrite vcard example configuration to not require extended format
2024-04-24 13:20:43 +02:00
Badlop
345af5a535
Remove ... in example configuration: it is assumed and reduces verbosity
2024-04-24 13:20:42 +02:00
Badlop
6e5895ce45
Update some modules doc to use the note field
2024-04-24 13:20:41 +02:00
Badlop
b70a2fe4cf
Support for version note in modules too
2024-04-24 13:20:40 +02:00
Badlop
da01d932ea
Add some text to examples, so docs Makefile can find and update its syntax
2024-04-24 13:20:39 +02:00
Badlop
7cd5808766
Mark toplevel options, commands and modules that changed in latest version
2024-04-24 13:20:37 +02:00
Badlop
c98302b3c0
Now modules themselves can have version annotations in 'note'
...
This was already supported in module options, toplevel options
and ejabberd_commands.
2024-04-24 13:20:36 +02:00
Badlop
cd7eedf589
Update API to mkdocs
2024-04-24 13:20:35 +02:00
Badlop
27bd8852a1
Update name of API section
2024-04-24 13:20:34 +02:00
Badlop
effcf0b7cf
Update markdown text for version notes, to work with mkdocs
2024-04-24 13:20:33 +02:00
Badlop
71b9db688a
Fix markdown indentation of JSON examples
2024-04-24 13:20:32 +02:00
Badlop
8be6dc7758
Use new shorthand to provide URLs relative to ejabberd Docs
2024-04-24 13:20:30 +02:00
Badlop
569f0b303b
Use same module shorthand in API documentation than in module docs
2024-04-24 13:20:29 +02:00
Badlop
15e3add909
CHANGELOG.md: Fix markdown syntax to work with MkDocs
2024-04-24 13:20:28 +02:00
Badlop
68c0c4d94f
Update doc headers to MkDocs and mention ejabberd version used
2024-04-24 13:20:27 +02:00
Badlop
a550a1c55c
Fix documentation links to new URLs generated by MkDocs
2024-04-24 13:20:26 +02:00
Badlop
832588f861
mix.lock: Update to get p1_acme fix in ACME IPv6
2024-04-24 13:20:24 +02:00
Paweł Chmielowski
73bcabd2fa
Replace muc.example.com with conference.example.com in commands docs
...
Second form matches what we use by default, and we seen some confusion
between those two when people try to adopt commands from docs to real
usage.
2024-04-23 14:33:34 +02:00
Badlop
da8c9f3357
rebar.lock: Track it, now that rebar3 uses loose dependency versioning
...
This is recommended in Rebar3 documentation:
[Lock files] should always be checked into source control.
https://rebar3.org/docs/configuration/dependencies/#lock-files
2024-04-23 13:46:21 +02:00
Badlop
6cfef4f476
mix.lock: Update to latest versions
2024-04-22 18:28:34 +02:00
Badlop
e9fbfaf536
Update Luerl to 1.2.0 when OTP>=20, simplifies commit a09f222
2024-04-22 18:28:34 +02:00
Badlop
0407c56605
rebar.config: Update deps version to rebar3's relaxed versioning
2024-04-22 18:28:34 +02:00
Badlop
1a63443e02
rebar.config.script: Support relaxed dependency version ( #4192 )
...
Instead of adding another element to the tuple, let's reuse the second
element, which was used only by rebar2, and always has ".*" as value.
2024-04-22 18:28:34 +02:00
Badlop
0345f798bd
Update p1_acme to git, to support Jose 1.11.10 and Ipv6 support ( #4170 )
2024-04-22 18:28:34 +02:00
Badlop
ee9d4d56a9
Update Jose to the new 1.11.10 for Erlang/OTP > 23
2024-04-22 18:28:34 +02:00
Badlop
44bafa478e
New ban commands use private storage to keep ban information ( #4201 )
2024-04-22 18:28:15 +02:00
badlop
ce57e02769
Merge pull request #4205 from LeszekBlazewski/fix-command-on-start-docs
...
fix: invalid CTL_ON_CREATE usage in docker-compose example
2024-04-19 18:24:46 +02:00
LeszekBlazewski
64cd794c02
fix: invalid CTL_ON_CREATE usage in docker-compose example
2024-04-19 16:14:05 +02:00
Badlop
9c8ae96f25
Define base64url dependency only when using rebar2 and Erlang<24
...
base64url is not called directly in ejabberd code since e227940
,
it is only required by p1_acme and erlang-jose 1.11.1
erlang-jose 1.11.1 defines base64url dependency as an hex package,
and rebar2 is not able to download it.
For that reason, when compiling ejabberd with rebar2,
we provide a rebar2-friendly base64url dependency definition.
That way when jose is downloaded, that dependency is already available.
2024-04-19 01:50:42 +02:00
Badlop
e973360aa7
Test: Fix some minor compilation warnings
...
- This QueryID is unnecessary since d3aeed8
, due to d6e9e03
- DB variable was added in d32a0ce
to detect riak and disable some tests,
but support for Riak was removed later in 3f7d9e3
.
- MyJID was added in 5b863c2
but was never actually used
- recv2 return should be checked
2024-04-19 01:50:42 +02:00
dependabot[bot]
697e5b8b6c
Bump peaceiris/actions-gh-pages from 3 to 4
...
Bumps [peaceiris/actions-gh-pages](https://github.com/peaceiris/actions-gh-pages ) from 3 to 4.
- [Release notes](https://github.com/peaceiris/actions-gh-pages/releases )
- [Changelog](https://github.com/peaceiris/actions-gh-pages/blob/main/CHANGELOG.md )
- [Commits](https://github.com/peaceiris/actions-gh-pages/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: peaceiris/actions-gh-pages
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-04-19 01:50:42 +02:00
Badlop
017f609a51
make-binaries: Bump OpenSSL to 3.3.0
2024-04-19 01:50:42 +02:00
Badlop
22f0d44fed
make-binaries: Bump Linux-PAM to 1.6.1
2024-04-19 01:50:42 +02:00
Paweł Chmielowski
0fdf58b1ec
Add ability to use additional custom errors when parsing options
2024-04-17 14:01:21 +02:00
Badlop
051bf2968a
Runtime: Test 27.0-rc1 instead of 27, as port_compiler still fails in rc2
2024-04-12 17:56:02 +02:00
Badlop
4fd83631ec
Mention in what ejabberd version was added update_sql_schema option
2024-04-12 16:41:25 +02:00
Badlop
a29d54c497
Comment ERTS_VSN variable in ejabberdctl when not used ( #4194 )
...
That variable is not used in "make relive" and "make install",
so let's comment the variable in ejabberdctl when preparing
that file for those targets.
2024-04-12 16:41:21 +02:00
Badlop
ed6762b8ee
Don't name integer and string results in API examples ( #4198 )
...
Since ejabberd 24.02, mod_http_api does not name any results,
previously integer and strings were named, but other results were not.
And ejabberdctl obviously does not name results either.
Only ejabberd_xmlrpc does.
Consequently, the documentation should not name results in the examples.
2024-04-12 12:08:03 +02:00
Badlop
b6a0c7e57f
mod_configure: Retract 'Get User Password' command to update XEP-0133 1.3.0
...
https://github.com/xsf/xeps/pull/1314
2024-04-12 12:07:50 +02:00
Badlop
ba0be28d45
CONTAINER.md: live in podman doesn't strictly require EJABBERD_BYPASS_WARNINGS
2024-04-12 12:07:46 +02:00
Badlop
ef5a435480
sql_server option: Mention in what version it was last updated
2024-04-12 12:07:40 +02:00
Paweł Chmielowski
61ad808d26
Fix validation of user field in get_user_subscriptions command
...
I made it test for valid muc room, instead of just valid username.
This should fix issue #4197
2024-04-11 12:17:02 +02:00
Badlop
426e33d3a6
Fix previous commit: shellcheck reported a warning
2024-04-04 15:58:48 +02:00
Badlop
d6d8bce0e4
If INET_DIST_INTERFACE is IPv6, set required option (thanks to Stu Tomlinson)( #4189 )
2024-04-04 13:42:09 +02:00
Badlop
7c76f2b764
Handle the "approved" attribute. As feature isn't implemented, discard it ( #4188 )
...
Reference:
https://xmpp.org/rfcs/rfc6121.html#roster-syntax-items-approved
Additionally, when roster contains unknown attribute, discard it and
show a warning
2024-04-04 13:42:09 +02:00
Paweł Chmielowski
735516ed37
Don't start sql connection pools for unknown hosts
...
It's possible to trigger that by passing wrong domain to some ctl commands,
and if you don't have default credentials for sql connections, you get
repeating errors when this pools tries to reconnect from error.
2024-04-04 11:05:34 +02:00
Badlop
dbf0fb8e86
Runtime: Run Dialyzer in Mix jobs
2024-04-01 14:26:55 +02:00
Badlop
f50b5e1a58
Fix typo in elixir code that breaks 537aac2
when using mix
2024-04-01 14:26:55 +02:00
Badlop
50c74ab821
Fix code:lib_dir call to work with Erlang/OTP 27.0-rc2
2024-04-01 14:26:55 +02:00
Badlop
a1b76ac0a9
Container: Update to Elixir 1.16.2
2024-04-01 14:26:55 +02:00
Badlop
49ca325845
make-binaries: Bump to OTP 26.2.3, Elixir 1.16.2, Expat 2.6.2
2024-04-01 14:26:55 +02:00
dependabot[bot]
703e98ec45
Bump ex_doc from 0.31.1 to 0.31.2
...
Bumps [ex_doc](https://github.com/elixir-lang/ex_doc ) from 0.31.1 to 0.31.2.
- [Release notes](https://github.com/elixir-lang/ex_doc/releases )
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/main/CHANGELOG.md )
- [Commits](https://github.com/elixir-lang/ex_doc/compare/v0.31.1...v0.31.2 )
---
updated-dependencies:
- dependency-name: ex_doc
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-04-01 14:26:55 +02:00
dependabot[bot]
208f798b07
Bump softprops/action-gh-release from 1 to 2
...
Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release ) from 1 to 2.
- [Release notes](https://github.com/softprops/action-gh-release/releases )
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md )
- [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2 )
---
updated-dependencies:
- dependency-name: softprops/action-gh-release
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-04-01 14:26:55 +02:00
Badlop
059a028c0c
CONTRIBUTING.md: Fix markdown
2024-04-01 14:26:55 +02:00
Badlop
7269d171a7
README.md: Fix markdown syntax and add docs badge
2024-04-01 14:26:55 +02:00
Badlop
3ca2d99a47
COPYING: Move the markdown-formatted file to Docs git, keep plaintext file here
2024-04-01 14:26:55 +02:00
Paweł Chmielowski
9ab60935a4
Add update_primary_key command to sql schema updater
2024-03-21 10:58:06 +01:00
Paweł Chmielowski
c5437235f3
Make mod_vcard_xupdate send hash after avatar get set for first time
...
We need to remove info about empty photo in session stored presence after
avatar get set, otherwise as we don't modify presences like that in
mod_vcard_xupdate, we will send presence with updated hash.
This fixes issue #4182
2024-03-20 10:57:12 +01:00
Paweł Chmielowski
537aac24f7
Improve detection of types in odbc
...
This should fix issue with dialyzer on erlang 26.2.3+
2024-03-18 14:54:32 +01:00
Paweł Chmielowski
8f20dd8425
Test retractons in mam_tests
2024-03-18 12:42:03 +01:00
Badlop
1639471250
Fix crash running export2sql when MAM enabled but MUC disabled
...
Problem introduced in cfc393a
2024-03-07 18:38:32 +01:00
Badlop
fcc5f00e75
Copy from COPYING the sentence about OpenSSL additional permission
2024-03-07 18:38:32 +01:00
Badlop
80b06da56b
Download GPL 2 in markdown format
...
Downloaded file https://www.gnu.org/licenses/old-licenses/gpl-2.0.md
from https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
2024-03-07 18:38:32 +01:00
Badlop
2c1b0bb77b
Use shorthands provided by docs.ejabberd.im Makefile, fix markdown syntax
2024-03-07 18:38:32 +01:00
Badlop
f5c8406353
Dialyzer: Add support to run Dialyzer with Mix
2024-03-06 15:25:38 +01:00
Badlop
c7f76944f3
Dialyzer: Update Elixir code to satisfy dialyzer warnings
2024-03-06 15:25:38 +01:00
Badlop
6542a70c05
Dialyzer: First set alias definitions and then use them in @type
2024-03-06 15:25:38 +01:00
Badlop
5bb94f1d9e
Result of running "make options"
2024-03-06 15:25:38 +01:00
Badlop
2378ea9c07
Dialyzer: Replace re:mp dirty workaround from 0bbc255
with other less dirty
2024-03-06 15:25:38 +01:00
Badlop
cd30538130
Fix "ejabberdctl iexlive" after "make prod" when using Elixir
...
The version number in ejabberd is 24.02,
but Elixir requires semver, that is, 24.2.
Use the version() function, which does the conversion.
2024-03-06 15:25:38 +01:00
Badlop
356ee22cc5
Change method from 1bf80e8
to determine if Elixir supports default_formatter function
...
Dialyzer when using Elixir complains about undefined function module_info.
2024-03-06 15:25:38 +01:00
Badlop
281515cd9f
mod_muc_log: Hide join/leave lines, add method to show them
2024-03-06 15:25:32 +01:00
Badlop
c0055b7a7f
mod_muc_log: Support allowpm introduced in 2bd61ab
2024-03-06 15:23:16 +01:00
Holger Weiss
6bdbafcd5c
Merge remote-tracking branch 'processone/pr/4169'
...
* processone/pr/4169:
mod_mam: Document that XEP-0441 is implemented as well
2024-03-04 11:30:53 +01:00
Melvin Keskin
a29955ff96
mod_mam: Document that XEP-0441 is implemented as well
2024-03-03 21:05:57 +01:00
Badlop
91cca3cff3
mod_conversejs: Simplify support for @HOST@ in default_domain option ( #4167 )
2024-02-28 13:06:49 +01:00
Badlop
716f5de517
mod_matrix_gw: Fix support for @HOST@ in matrix_domain option ( #4167 )
2024-02-28 13:06:47 +01:00
Paweł Chmielowski
aac0e782d0
Don't use ejabberd_config:get_myhosts()
2024-02-28 12:24:50 +01:00
Paweł Chmielowski
c69884fa3f
Config reload should update loger settings part 2
2024-02-28 12:03:42 +01:00
Paweł Chmielowski
06675e4fb2
Improve validation of arguments in mod_muc_admin commands
...
This adds validation to couple command where they were missing and catch
passing unknown hostnames.
2024-02-28 12:01:14 +01:00
Paweł Chmielowski
ad67710f7e
Make config reload update new logger settings
2024-02-28 11:46:30 +01:00
Badlop
654601ff23
Set version to 24.02
2024-02-27 10:32:55 +01:00
Badlop
d29ef59514
Update links to SQL files in the man page
2024-02-27 10:06:40 +01:00
Badlop
e3e8b9afb4
COMPILE.md: Update text about OTP release to match current behaviour
...
Also keep this document direct, short and introductory, there's a
already a section in the ejabberd Docs site with all the details.
2024-02-27 10:06:39 +01:00
Badlop
a8e3af3586
Update Japanese translation (thanks to Mako N)
2024-02-27 10:06:37 +01:00
Badlop
11ff7d1ff9
Update Italian translation (thanks to Ermete Melchiorre)
2024-02-27 10:06:36 +01:00
Badlop
b04b16825f
Revert "CI: Don't run CT with OTP 27 until "Peer certificate rejected" gets solved"
...
This recent fix in fast_tls solves the problem:
528d9759d6
This reverts commit 95e9a63dcb
.
2024-02-27 10:06:34 +01:00
Paweł Chmielowski
0f43a7f36b
Update deps
2024-02-26 17:26:30 +01:00
Badlop
95e9a63dcb
CI: Don't run CT with OTP 27 until "Peer certificate rejected" gets solved
2024-02-26 16:16:19 +01:00
Badlop
146d958fc0
CHANGELOG.md: Update to match the newest commits
2024-02-26 16:16:17 +01:00
Badlop
bb349d6085
Update "make edoc" to use ExDoc
2024-02-26 16:16:14 +01:00
Badlop
cb9053cd79
Makefile.in: Inform what build tools support some tasks
2024-02-26 16:16:13 +01:00
Badlop
4146f19814
Update man page
2024-02-26 16:16:11 +01:00
Badlop
79eca7c098
Update version number from the unreleased 24.01 to 24.02
2024-02-26 16:16:09 +01:00
Badlop
723c53e1df
Revert "Container: Update make-binaries to support setup-beam v1.17.2"
...
We can now revert commit c81a47a692
because erlef/setup-beam v1.17.3 has recovered its original behavior in
951dd857ae
2024-02-26 16:16:08 +01:00
Badlop
daca3b558b
Use another example, because "archive" is replaced when generating EDoc
2024-02-26 16:16:06 +01:00
Badlop
2075480b14
Improve some documentation: URLs are parsed later when preparing Docs
2024-02-26 16:16:05 +01:00
Badlop
e43194d59b
README.md: Fix typo in link to COPYING file: its name is plain-text, not markdown
2024-02-26 16:16:03 +01:00
Badlop
8bbc27fd39
CHANGELOG.md: Fix warnings reported by "make edoc"
2024-02-26 16:16:01 +01:00
Badlop
9a9a466bd4
CHANGELOG.md: Lower markdown headers level so they get better rendered
2024-02-26 16:16:00 +01:00
Badlop
92c533f42a
CONTRIBUTING.md: Remove anchor with name attribute
2024-02-26 16:15:58 +01:00
Badlop
863b7eee8b
CONTAINER.md: Update documentation about sofware version numbers
2024-02-26 16:15:56 +01:00
Badlop
417294339d
Matrix: Minor documentation improvements
2024-02-26 16:15:51 +01:00
Holger Weiss
6aaefc663b
Fix XEP-0425: Message Moderation with SQL storage
...
Use the correct server name and room JID when removing moderated
messages from SQL.
2024-02-24 22:06:36 +01:00
Jérôme Sautret
a6b10ac4c0
Merge branch 'master' of github.com:processone/ejabberd
2024-02-23 12:09:51 +01:00
Jérôme Sautret
2b7b92edee
Add mod_matrix_gw doc
2024-02-23 12:09:10 +01:00
Paweł Chmielowski
f4de0cef26
Add alternative types that should fix dialyzer on r26
2024-02-22 17:25:56 +01:00
Paweł Chmielowski
1b5a9c1a1f
Fix dialyzer warnings in ejabberd_sql in R27
2024-02-22 16:12:04 +01:00
Badlop
a09f222b4c
Use Luerl 1.0 for Erlang 20, 1.1.1 for 21-26, and temporary fork for 27
...
The Luerl 1.1.0 and 1.1.1 hex packages contain garbage files that
break compilation with Erlang 20.
2024-02-21 16:46:37 +01:00
Badlop
5fb76b4918
Use http_uri only when matrix requires it, ammend commit 59ff77e
2024-02-21 16:46:37 +01:00
Badlop
27d5a1d5bb
configure.ac: Update enable-tools description to its current usage
2024-02-21 16:46:37 +01:00
Badlop
ba1917d23c
vars.config.in: Remove comment that nowadays is obsolete
2024-02-21 16:46:37 +01:00
Badlop
0b37d50dac
rebar.config.script: Don't check REBAR_PROFILE here
...
To get release with development tools,
don't check rebar profile here.
Instead, use "./configure --enable-tools" and it will be
checked in ejabberd.app.src.script
2024-02-21 16:46:37 +01:00
Badlop
9275bf40b2
Rebar3/Mix: If dev profile/environment, enable tools automatically
2024-02-21 16:46:37 +01:00
Badlop
4431fbbe5a
Include only observer; runtime_tools is automatically added
2024-02-21 16:46:37 +01:00
Badlop
8c64ce67fc
CI/Runtime: Test also with the new Erlang/OTP 27.0-rc1
2024-02-21 16:46:26 +01:00
Badlop
1ddc4a5c5d
CI/Runtime: For OTP < 24 use rebar binaries from ejabberd 21.12
2024-02-21 16:45:28 +01:00
Badlop
081cab821b
Rebar/Rebar3: Update binaries to work with Erlang/OTP 24-27
...
They are compiled from their git repositories, main branches,
using erlang:24-slim docker image.
To compile ejabberd using rebar/rebar3 and Erlang 20.0 up to 23.3,
you can download the old binaries from ejabberd 21.12, available at:
https://github.com/processone/ejabberd/raw/21.12/rebar
https://github.com/processone/ejabberd/raw/21.12/rebar3
2024-02-21 16:45:24 +01:00
Badlop
efe5c76469
Runtime: Test compilation with the included rebar/rebar3 binaries
2024-02-19 15:33:09 +01:00
Badlop
16c9b169f2
Runtime: Properly purge nginx in Rebars job, as done in commit 853f35c
2024-02-19 15:33:09 +01:00
Badlop
73f20a8f1e
Makefile: Now --with-rebar detects if it's system-installed, otherwise use local one
2024-02-19 15:33:09 +01:00
Badlop
70e430cff1
Makefile: No need to use escript to run rebar|rebar3|mix
...
Usage of escript to run rebar was added to Makefile.in
when support for rebar2 was added in 4d8f770
for ejabberd 13.10.
Nowadays this seems unnecessary, and configure.ac right now can
determine what binary to use: the sysmte installed or local one.
2024-02-19 15:33:09 +01:00
Badlop
aa21aee14b
configure: If --with-rebar=rebar3 but rebar3 not system-installed, use local one
2024-02-19 15:33:09 +01:00
Badlop
59ff77e171
Matrix: Fix commit 816900a
for OTP below 25.0
...
uri_string:quote was added in OTP 25.0
2024-02-19 15:33:09 +01:00
Paweł Chmielowski
045170a67e
Fix dialyzer warning on R26 in mod_matrix*
2024-02-19 12:08:56 +01:00
Alexey Shchepin
c9deea1f6f
Bugfix in mod_matrix_gw_room:get_sender_power_level
2024-02-19 14:05:25 +03:00
Alexey Shchepin
c10f2a22b6
Fix dialyzer errors
2024-02-16 06:00:57 +03:00
Alexey Shchepin
45f24c63cb
Update mod_matrix_gw copyright dates
2024-02-15 09:38:14 +03:00
Badlop
18cb0bca19
Fix compilation with Erlang/OTP 27: don't use the reserved word 'maybe'
2024-02-15 01:57:44 +01:00
Badlop
071dc08405
Container: Support OTP versions with "-rc" string
2024-02-15 01:57:42 +01:00
Badlop
b8181974ec
Replace 'if' preprocessor directive with 'ifndef', add OTP_BELOW_24
...
The 'if' preprocessor directive was added in Erlang/OTP 21.0,
but ejabberd currently supports Erlang 20.0 and higher...
Let's use 'ifndef' instead.
https://www.erlang.org/doc/reference_manual/macros.html#flow-control-in-macros
https://www.erlang.org/doc/apps/compiler/notes#compiler-7.2
https://www.erlang.org/patches/otp-21.0#compiler-7.2
2024-02-15 01:57:41 +01:00
Badlop
816900a6cf
Use uri_string module instead of the deprecated http_uri
...
http_uri is marked for deprecation since OTP 23
Use uri_string which is available since OTP 21
No need to provide alternative, because it's used only by mod_matrix,
and this runs only with Erlang/OTP 24 or higher.
https://www.erlang.org/patches/otp-23.0#inets-7.2
https://www.erlang.org/docs/23/man/http_uri
2024-02-15 01:57:39 +01:00
Badlop
2438fc8b31
Add OTP_BELOW_25 to mix.exs that was added to rebar.config in 4ae06f0
2024-02-15 01:57:38 +01:00
Badlop
8b84f991e1
make-binaries: Bump many dependency versions
...
Unfortunately, newer versions of linux-pam throw compilation problems:
linux-pam 1.5.3:
tty_conv.c:9:10: fatal error: termio.h: No such file or directory
linux-pam 1.6.0:
pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function)
2024-02-15 01:57:36 +01:00
Badlop
3c98ec5b48
Update "make translations" to reduce build requirements
...
Previously, preparing translations required rebar3 and:
./configure --enable-tools
make
make translations
With this change it works with rebar3 and mix, just running:
./configure
make translations
2024-02-15 01:57:34 +01:00
Badlop
e1f863afa4
Makefile: Group all variable definitions, and later just use them
2024-02-15 01:57:32 +01:00
Badlop
f40a036d97
Makefile: Express rebar3 profile using "as profile"
...
This allows to use REBAR_PROFILE to add another profile.
Right now it doesn't seem specially useful, but it's possible:
REBAR_PROFILE=dev make prod
REBAR_PROFILE=translations make dev
https://rebar3.org/docs/configuration/profiles/
2024-02-15 01:57:30 +01:00
dependabot[bot]
3f07e232aa
Bump actions/upload-artifact from 3 to 4
...
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact ) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases )
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: actions/upload-artifact
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-02-15 01:57:28 +01:00
Alexey Shchepin
f44e23b8cc
Add mod_matrix_gw
2024-02-14 06:59:23 +03:00
Paweł Chmielowski
67a6776fba
Add ability to ignore failures in execution of container CTL_ON_* commands
...
This will allow to use register in CTL_ON_CREATE and not abort if used with
existing data that have account already registered.
2024-02-13 11:55:23 +01:00
Badlop
cdaf45f91c
Test: Check that the message we get is the welcome message, not other
2024-02-09 14:12:22 +01:00
Badlop
e1b94487ef
Container: Apply commit 35b727a
...
ejabberdctl: Detect problem running iex and show explanation
2024-02-09 14:12:21 +01:00
Badlop
2531ebf685
Container: Apply commit abf0796
...
ejabberdctl: Detect problem running etop and show some help
2024-02-09 14:12:20 +01:00
Badlop
01909b07ce
Container: Apply commit e1f14ac
...
Rebar3: Provide proper path to iex
2024-02-09 14:12:18 +01:00
Badlop
39ea08b7cb
Container: Apply commit 841d5c0
and 81ceefe
...
Fix startup problem when having set EJABBERD_OPTS and logger options
Remove spurious line
2024-02-09 14:12:17 +01:00
Badlop
413ffd7470
Container: Apply commit 19e2e16
...
Let "ejabberdctl etop" work in a release (if observer is available)
2024-02-09 14:12:15 +01:00
Badlop
66645baa75
Container: Apply commit 122af79
...
move spool dir to make it fully configurable per ejabberdctl.cfg (#3863 )
2024-02-09 14:12:13 +01:00
Badlop
021f0be119
Container: Update to Erlang/OTP 26.2, Elixir 1.16.1 and Alpine 3.19
2024-02-09 14:12:12 +01:00
Badlop
1962fc88d6
make-binaries: Bump OpenSSL 3.2.1, Erlang/OTP 26.2.2, Elixir 1.16.1
...
The update of OpenSSL follows:
eae4ab473d
39823a8009
92e9a41888
2024-02-09 14:12:10 +01:00
Badlop
fa12301e08
ejabberdctl: Fix problem when running ejabberdctl in container
2024-02-09 14:12:08 +01:00
Badlop
9f934abd48
ejabberdctl: Fix crash running defined commands in container and installers
2024-02-09 14:12:06 +01:00
Badlop
4680954112
README.md: Add links to nightly builds
2024-02-09 14:12:03 +01:00
Paweł Chmielowski
7e6ffc34fb
Update mix.lock
2024-02-07 19:32:49 +01:00
Paweł Chmielowski
95135af6b3
Rework temporary node name generation in ejabberdctl
...
This should limit number of possible node names generated by and with that
prevent atom space exhaustion in ejabberd process.
On R23+ we switch to using native dynamic node features and on older
versions we iterate over small number of possible names and skip those
already in use.
2024-02-07 12:17:16 +01:00
Badlop
c81a47a692
Container: Update make-binaries to support setup-beam v1.17.2
...
With setup-beam v1.17.2, make-binaries failed in the Container action with:
* ERROR: No usable Erlang/OTP system for the build machine found! Cannot
* cross compile without such a system.
*
* Either build a bootstrap system for the build machine, or provide
* an Erlang/OTP-26 system in the $PATH, and try again. For more
* information on cross compiling Erlang/OTP-26, see the
* $ERL_TOP/xcomp/README file.
The problematic commit is:
cf854bf149
more concretely this change:
- core.exportVariable(installDirForVarName, cachePath)
+ core.exportVariable(installDirForVarName, catchPathBin)
Up until setup-beam@v1.17.1, the INSTALL_DIR_FOR_OTP was something like
/opt/hostedtoolcache/otp/ubuntu-22.04/OTP-26.1.1/x64
but starting in v1.17.2, the path contains /bin, for example:
/opt/hostedtoolcache/otp/ubuntu-22.04/OTP-26.1.1/x64/bin
2024-02-06 17:57:27 +01:00
Badlop
3bd9fc9f43
Container: Fix typo in cache key name 1.25->1.26
2024-02-06 17:57:27 +01:00
Badlop
c664d6dc32
Workflows: Update actions to use Node.js 20 as recommended by Github Actions
2024-02-06 17:57:27 +01:00
Badlop
a182ec12cf
Workflows: Use explicit ubuntu-22.04 instead of a varying ubuntu-latest
...
Also notice that ubuntu-22.04 doesn't include Erlang/OTP.
2024-02-06 17:57:27 +01:00
Badlop
70bf316f9d
Explain that reopen_log and rotate_log only affect some modules ( #4156 )
2024-02-06 17:52:31 +01:00
Badlop
2979fb4a9b
ext_mod: Support in WebAdmin when a module spec lacks some information
2024-02-06 17:52:29 +01:00
Badlop
a33be2d67a
ejabberdctl.bc: Improve caching of commands list
...
Improvements:
- Keep command cache for one hour
- Fix parsing command list with ECMA-48 SGR escape sequence for font attributes
2024-02-06 17:52:27 +01:00
Badlop
c6878f9c9d
ejabberdctl: Print argument description, examples and note in help
2024-02-06 17:52:25 +01:00
Badlop
1d65f4471b
ejabberdctl: Document exclusive ejabberdctl commands like all the others
2024-02-06 17:52:24 +01:00
Badlop
e9de3748bd
ejabberdctl: Reorganize commands related to mnesia info
...
- ejabberdctl mnesia: already implemented in ejabberd_admin.erl
- ejabberdctl mnesia info: renamed to mnesia_info_ctl
- ejabberdctl mnesia Arg: command removed, use mnesia_info_ctl instead
2024-02-06 17:52:22 +01:00
Badlop
ea40afbe03
update_sql_schema: Fix typo, add example MySQL version number
2024-02-06 17:52:19 +01:00
Holger Weiss
01c70868ef
Ignore hints when checking for chat states
...
Ignore XEP-0334 elements when checking whether a stanza is a stand-alone
XEP-0085 chat state notification. This allows for CSI-filtering chat
states with (e.g.) a no-store hint.
Thanks to Thilo Molitor for reporting the issue.
2024-02-03 13:20:34 +01:00
Alexey Shchepin
66d701e788
Add print_sql_schema ejabberdctl command
2024-01-24 22:52:20 +03:00
Badlop
6eff14a71d
Update changelog
2024-01-23 14:41:23 +01:00
Paweł Chmielowski
506152d4e7
Use tagged version of dependencies
2024-01-23 13:39:21 +01:00
Badlop
6e9c96a0e5
Run: make doap
2024-01-22 17:29:24 +01:00
Badlop
e58be4d57e
Update man page
2024-01-22 17:29:23 +01:00
Badlop
e94edbdb8f
Update Chinese translation (thanks to Sketch6580)
2024-01-22 17:29:21 +01:00
Badlop
0c8d2ea557
Update Ukrainian translation (thanks to Олександр Кревський)
2024-01-22 17:29:20 +01:00
Badlop
07e3456631
Update Portuguese translation (thanks to Silvério Santos)
2024-01-22 17:29:19 +01:00
Badlop
e65d554309
Update Dutch translation (thanks to Ranforingus)
2024-01-22 17:29:17 +01:00
Badlop
f5652cf946
Update Czech translation (thanks to Jan Aschenbrenner)
2024-01-22 17:29:16 +01:00
Badlop
399d0a5bf0
Update Bulgarian translation (thanks to Mr. EddX)
2024-01-22 17:29:14 +01:00
Badlop
589521bfd8
Update copyright year to 2024 ( #4139 )
2024-01-22 17:29:13 +01:00
Badlop
d802b6ab44
Fix version number in ejabberd_xmlrpc.erl
2024-01-22 17:29:12 +01:00
Badlop
45863b4651
Grant execution permission to install-sh
...
The file `src/install-sh` was added in c311ea1
.
Most files from that commit were removed in 4d8f770
and install-sh was moved.
Since recent commit 7cae092
, `./configure` checks for a race-free `mkdir -p`,
the `install-sh` script may be used, and it needs execution permission.
2024-01-22 17:29:10 +01:00
Badlop
f34c2b1714
Document new XEPs supported thanks to its implementation in the xmpp library
2024-01-22 17:29:09 +01:00
Badlop
78750bf753
Annotate version when the commands v1 are available
2024-01-22 17:29:07 +01:00
Badlop
65d585496c
Document sql_flags option introduced in 00c7600
2024-01-22 17:29:06 +01:00
badlop
194d3b9e17
Merge pull request #4143 from badlop/elixir-all-in
...
Improve support for Elixir, Mix and Rebar3
2024-01-22 12:44:21 +01:00
Badlop
b4b85e569e
Runtime: Clean Rebar tests and add Rebar2 to them
2024-01-17 14:44:09 +01:00
Badlop
daabfeb0e2
Makefile: Add install-rel and uninstall-rel
2024-01-17 14:44:09 +01:00
Badlop
c61b57f7ab
Makefile: Uninstall also the man file
2024-01-17 14:44:09 +01:00
Badlop
7cae0920b8
Makefile: Use AWK and MKDIR_P
2024-01-17 14:44:09 +01:00
Badlop
920e4ba6b1
Makefile: Fix TAGS target
2024-01-17 14:44:09 +01:00
Badlop
16e58a1911
Makefile: Update PHONY targets
2024-01-17 14:44:09 +01:00
Badlop
ec7570f93e
Makefile: Add sections, headers and Vim folding
2024-01-17 14:44:09 +01:00
Badlop
ae2993ecae
Rebar: Use excl_archive_filters only when Erlang < 26
...
That option is required when Erlang < 26 to disable the archive feature.
The feature and the option were removed in Erlang 26, and the release
building process fails if the option is used.
https://www.erlang.org/patches/otp-26.0
2024-01-17 14:43:24 +01:00
Badlop
ee778ca8f9
COMPILE.md: For Elixir, recommend at least 1.13.4 with Erlang/OTP 23.0
2024-01-17 10:24:34 +01:00
Badlop
a2ff5fbfdb
Add observer and runtime_tools in releases when --enable-tools
...
When --enable-tools, include observer and runtime_tools
in the OTP releases, as they are required by "ejabberdctl etop".
With this fix, "ejabberdctl etop" works correctly when:
* rebar3 + make rel
* mix + make dev
* mix + make rel
2024-01-17 10:24:34 +01:00
Badlop
eeb4be6e4b
Makefile: Rename "make rel" to "make prod"
...
Rebar2 could create a release, so it made sense to call it "make rel".
Nowadays, Rebar3 and Mix support creating different types of releases:
production, development, ...
In this sense, our "make rel" target is more properly named "make prod"
For backwards compatibility, "make rel" redirects to "make prod"
2024-01-17 10:24:34 +01:00
Badlop
aad3306bdf
Makefile: Support using --with-rebar=/path/to/mix
2024-01-17 10:24:34 +01:00
Badlop
35b727ac39
ejabberdctl: Detect problem running iex and show explanation
2024-01-17 10:24:34 +01:00
Badlop
abf07966be
ejabberdctl: Detect problem running etop and show some help
2024-01-17 10:24:34 +01:00
Badlop
a1c81955d3
ejabberdctl: Document to stop live shell with control+g, following cd421f9
2024-01-17 10:24:34 +01:00
Badlop
ad7538f394
Runtime: Rebar3+Elixir: Add new job to test Rebar3 compiling Elixir
2024-01-17 10:24:34 +01:00
Badlop
c0a909296e
Runtime: Mix: Enable ModPresenceDemo and Elixir dep
2024-01-17 10:24:34 +01:00
Badlop
7186cd09bf
Runtime: Test also "make install"
2024-01-17 10:24:34 +01:00
Badlop
db8583b1c6
Runtime: Mix: Add step to view logs
2024-01-17 10:24:34 +01:00
Badlop
07be61585c
Runtime: Mix: No need to specify --disable-elixir
2024-01-17 10:24:34 +01:00
Badlop
8bdd811a16
Runtime: Mix: Update Erlang and Elixir versions to test
2024-01-17 10:24:34 +01:00
Badlop
c69d88c45a
Runtime: Rebars: Add log tests similar to the Mix job
2024-01-17 10:24:34 +01:00
Badlop
b18fa2ebc2
Runtime: Rebars: Use the rebar binaries included in the repository
2024-01-17 10:24:34 +01:00
Badlop
f838319455
Runtime: Rebars: Get old rebar binaries when testing old erlang versions
2024-01-17 10:24:34 +01:00
Badlop
0d852474be
Use Mix or Rebar3 by default instead of Rebar2 to compile ejabberd
...
Use the program specified in option: --with-rebar=/path/to/bin
When none is specified, use the system mix
When Elixir not found, use the system rebar3
When Rebar3 not found, use the rebar3 binary included with ejabberd
2024-01-17 10:24:34 +01:00
Badlop
dd5a198222
Rebar3: Include Elixir files when making a release
2024-01-17 10:24:34 +01:00
Badlop
2d067f7498
Rebar3: Workaround to fix protocol consolidation
2024-01-17 10:24:34 +01:00
Badlop
a6c1e42c0a
Rebar3: Add support to compile Elixir dependencies
...
As described in
https://rebar3.org/docs/configuration/plugins/#elixir-dependencies
2024-01-17 10:24:34 +01:00
Badlop
ff783d15e8
Rebar3: Compile explicitly our Elixir files when --enable-elixir
2024-01-17 10:24:34 +01:00
Badlop
e1f14aca9b
Rebar3: Provide proper path to iex
...
We can't use iex variable, because rebar3/relx_overlay.erl already uses
all existing app names as variables.
2024-01-17 10:24:34 +01:00
Badlop
65ff45e202
Rebar/Rebar3: Remove elixir as a gitonly_deps, and add ejabberd_po
...
Adding ejabberd_po to gitonly_deps isn't strictly needed,
because we request a branch in the ejabberd-po git repository,
and rebar.config.script understands that this means ejabberd_po
should be downloaded from git, not hex.pm.
2024-01-17 10:24:34 +01:00
Badlop
f330267361
Rebar/Rebar3: Remove Elixir as a rebar dependency
...
Elixir is standalone since years ago. When Elixir support is required,
better simply install Elixir and use Mix as build tool.
Or install Elixir and use the experimental Rebar3 support to compile
Elixir files and dependencies.
2024-01-17 10:24:34 +01:00
Badlop
1de28fa566
Rebar/Rebar3: Update binaries to work with Erlang/OTP 23-26
...
They are compiled from their git repositories, main branches,
using erlang:23-slim docker image.
To compile ejabberd using rebar/rebar3 and Erlang 22.3 or older,
you can download the old binaries from ejabberd 21.12, available at:
https://github.com/processone/ejabberd/raw/21.12/rebar
https://github.com/processone/ejabberd/raw/21.12/rebar3
2024-01-17 10:24:34 +01:00
Badlop
b08001183e
ext_mod: Support Elixir modules with several defimpl, like Decimal
2024-01-17 10:24:34 +01:00
Badlop
0121adec03
ext_mod: Compile *.ex files also in source subfolders
2024-01-17 10:24:34 +01:00
Badlop
4daeb41f0e
Elixir: Fix compiling ejabberd as a dependency (4128)
2024-01-17 10:24:34 +01:00
Badlop
b2df22469b
Elixir: Fix ejabberdctl start/live when installed
...
The problem appeared when:
./configure --with-rebar=mix
make install
ejabberdctl live
=INFO REPORT==== 19-Dec-2023::21:28:36.006306 ===
application: ssl
exited: stopped
type: temporary
...
2024-01-17 10:24:34 +01:00
Badlop
1bf80e861d
Elixir: Fix: FORMATTER ERROR: bad return value (4087)
...
This is required since Elixir 1.15 when starting ejabberd with:
./configure --with-rebar=mix
make relive
make relive && ejabberdctl iexlive
make install && ejabberdctl iexlive
Reference:
https://elixir-lang.org/blog/2023/06/19/elixir-v1-15-0-released/
https://hexdocs.pm/logger/Logger.Formatter.html#module-formatting
2024-01-17 10:24:34 +01:00
Badlop
5bb2beb179
Elixir: Fix: Couldn't find file Elixir.Hex.API
...
Fix for error when starting ejabberd with Elixir 1.15:
[critical] Couldn't find file Elixir.Hex.API needed for Erlang application 'hex'.
2024-01-17 10:24:34 +01:00
Badlop
852a540cb0
Elixir: Fix Elixir 1.17-dev warnings about single-quoted charlists
2024-01-17 10:24:34 +01:00
Badlop
8b38aebbc7
Mix: Enable stun by default when vars.config not found
...
configure.ac by default enables stun and zlib, in fact ejabberd.yml
has ejabberd_stun enabled by default, so for coherence mix.exs should
enable stun too when vars.config is not found.
2024-01-17 10:24:34 +01:00
Badlop
fa3c25ab66
Mix: New option vars_config_path to set path to vars.config (4128)
...
Useful when setting ejabberd as dependency in another Elixir project,
and you want to enable or disable some ejabberd dependencies, see
https://www.process-one.net/blog/how-to-use-ejabberd-as-an-elixir-application-dependency/
2024-01-17 10:24:34 +01:00
Badlop
30df1dbe3f
Mix: Set the nodename when using the ejabberd script generated by Elixir
...
Also use start instead of console in Elixir script
2024-01-17 10:24:34 +01:00
Badlop
6d61e3590d
Mix: Print shell commands output to the console when "make dev"
2024-01-17 10:24:34 +01:00
Badlop
e71650e6ab
Mix: Fix ejabberdctl iexlive problem locating iex in an OTP release
...
The problem appeared when:
./configure --with-rebar=mix
make dev
_build/dev/rel/ejabberd/bin/ejabberdctl iexlive
2024-01-17 10:24:34 +01:00
Badlop
d81b3805e3
Mix: Elixir 1.14 requires mix, and Elixir 1.16 warns about duplicate
2024-01-17 10:24:34 +01:00
Badlop
416253496d
Mix: Add yecc compiler as suggested by Elixir 1.16 warning over p1_pgsql
2024-01-17 10:24:34 +01:00
Paweł Chmielowski
29ec5bff60
Add option to disable XEP-0474: SASL SCRAM Downgrade Protection support
...
Looks like clients using strophejs aren't able to authenticate when we
add data required by that spec to scram packets, so at least give a way
to disable this until clients will be fixed.
2024-01-16 12:03:35 +01:00
Holger Weiss
6c691a73bd
Support XEP-0198 pings
...
If stream management is enabled, let mod_ping trigger XEP-0198
<r/>equests rather than sending XEP-0199 pings. This avoids the
overhead of the ping IQ stanzas, which, if stream management is enabled,
are accompanied by XEP-0198 elements anyway.
Thanks to MoyaApp (<https://moya.app >) for sponsoring this work.
2024-01-15 21:38:54 +01:00
Badlop
74cb2e054f
Rephrase sentences to avoid using "allow to + verb"
2024-01-11 13:42:06 +01:00
Badlop
5b6329a12e
Fix a few spelling errors
2024-01-11 13:41:40 +01:00
Badlop
973ba58744
mod_avatar implements XEP-0398 0.2.0 since ddc29d4
2024-01-08 18:21:15 +01:00
Badlop
1f60bcb2d0
Fix syntax of enable-user and enable-group options help
2024-01-08 18:21:13 +01:00
Badlop
8e8354caec
Fix explanation of --enable-group option ( #4135 )
2024-01-08 18:21:10 +01:00
badlop
e26c547afc
Merge pull request #4118 from badlop/api-version-1
...
Commands API version 1
2024-01-05 13:10:06 +01:00
Badlop
fc13fdceca
Docs: Separate tags with commas in markdown docs
2024-01-04 22:01:21 +01:00
Badlop
d585b1fcb6
Docs: When definer is unknown, don't show Module section
2024-01-04 22:01:21 +01:00
Badlop
57bd0ef4f5
Docs: Optional support to get commands from runtime instead of BEAM files, based in bdeb4a7
2024-01-04 22:01:21 +01:00
Badlop
d140f99b68
ejabberd_xmlrpc: Fix support for restuple error response
2024-01-04 22:01:21 +01:00
Badlop
90766685ae
ejabberd_ctl: When API version>0, update syntax of list results
2024-01-04 21:53:14 +01:00
Badlop
d65638efe1
ejabberd_ctl: Pass API version to format_result
2024-01-04 21:53:14 +01:00
Badlop
b34572e7ce
ejabberd_ctl: Show proper command help when version is explicitly set
2024-01-04 21:53:14 +01:00
Badlop
c4c0cd1b77
ejabberd_ctl: Add support for list and tuple arguments
...
Tuple elements are separated with :
List elements are separated with ,
For example:
ejabberdctl add_rosteritem user1 localhost testuser7 localhost NickUser77l gr1,gr2,gr3 both
ejabberdctl create_room_with_opts room1 conference.localhost localhost public:false,persistent:true
ejabberdctl subscribe_room_many user1@localhost:User1,admin@localhost:Admin room1@conference.localhost urn:xmpp:mucsub:nodes:messages,urn:xmpp:mucsub:nodes:affiliations
Affected commands:
- add_rosteritem
- create_room_with_opts
- oauth_issue_token
- send_direct_invitation
- set_vcard2_multi
- srg_create
- subscribe_room
- subscribe_room_many
2024-01-04 21:53:14 +01:00
Badlop
9f42f17088
mod_http_api: Fix to allow the client override the API version
...
When configured like:
listen:
-
request_handlers:
/api: mod_http_api
/apizero/v0: mod_http_api
What API version will be used depending on the URL:
- api/commandname use the latest available version
- api/commandname/v0 use version 0
- apizero/v0/commandname use version 0
- apizero/v0/commandname/v2 use version 2
2024-01-04 21:53:14 +01:00
Badlop
d570870be5
mod_http_api: When using API version>0, avoid result names for integers and strings
2024-01-04 21:53:14 +01:00
Badlop
8671bf70ab
mod_http_api: When no specific API version is requested, use the latest
2024-01-04 21:53:14 +01:00
Badlop
e26729b483
Commands: Use list arguments in many commands that used separators
...
Commands that has some argument change:
- add_rosteritem
- oauth_issue_token
- send_direct_invitation
- srg_create
- subscribe_room
- subscribe_room_many
2024-01-04 21:53:14 +01:00
Badlop
d4113d9569
Commands: set_presence: switch priority argument from string to integer
2024-01-04 21:53:14 +01:00
Badlop
c5a5dd859e
Commands: Improve syntax of many commands documentation
2024-01-04 21:53:14 +01:00
Badlop
0961fa1830
Commands: When result is rescode, result_desc is automatically added
2024-01-04 21:53:14 +01:00
Badlop
f18b8d464d
Commands: Add a new muc_sub tag to all the relevant commands
2024-01-04 21:53:14 +01:00
Badlop
98d7519274
ejabberd_commands: Add the command version as a tag "vX"
2024-01-04 21:53:14 +01:00
Badlop
1326a7764a
ejabberd_commands: Update -type and remove obsolete @type
2024-01-04 21:53:14 +01:00
Alexey Shchepin
97568195d6
Update SQL schema files
2023-12-27 17:01:57 +03:00
Alexey Shchepin
8d2d3a6540
Support XEP-0424 in mod_mam_mnesia
2023-12-27 09:42:22 +03:00
Alexey Shchepin
4f6730621a
Add default value to #archive_msg.origin_id
2023-12-27 09:28:02 +03:00
Alexey Shchepin
a4bb695fc3
Support for XEP-0424 "Message Retraction"
2023-12-27 08:59:20 +03:00
Badlop
a57bdfffb7
Document recent change from 7d4330b57
2023-12-22 13:19:53 +01:00
Paweł Chmielowski
bdb513a660
Update xmpp
2023-12-19 10:43:37 +01:00
Paweł Chmielowski
b5ce53c907
Update xmpp to fix issue with scram with missing channel bindings
...
This makes scram downgrade protection hash calculation work properly when
using non -plus sasl mechanism or when stream is not encrypted
This should fix issue #4123 .
2023-12-18 12:10:28 +01:00
Paweł Chmielowski
b556fae08f
Update xmpp to bring support for XEP-0474: SASL SCRAM Downgrade Protection
2023-12-13 10:08:31 +01:00
Paweł Chmielowski
f87ab9a99f
Update xmpp
2023-12-12 14:37:01 +01:00
Paweł Chmielowski
a5c973f86b
Mention in docs for sql_prepared_statements that it works with MySQL
2023-12-12 11:29:12 +01:00
Holger Weiss
6b2b89da78
mod_push: Fix disabling of notifications
...
Remove the correct field from the c2s state when the client explicitly
disables push notifications. This fixes a regression introduced by
commit c148ab4430
.
2023-12-08 18:52:53 +01:00
Paweł Chmielowski
7d4330b57a
Increase default value of negotiation_timeout from 30s to 2m
...
This timeout also covers in-band registration, and if user don't fill
registration form in that time leads to disconnect and aborting
registration. This will allow for more time to finish that.
2023-12-04 13:24:32 +01:00
Badlop
225d14cbbe
Minor improvements in auth_password_format documentation
2023-12-01 00:07:21 +01:00
Paweł Chmielowski
d2a84c96a4
Update xmpp to fix incompatibility with < R21
2023-11-22 18:40:10 +01:00
Paweł Chmielowski
48f0d9c15e
Update xmpp to make us present both sasl1 and sasl2 with from in initial stanza
2023-11-22 18:34:18 +01:00
Paweł Chmielowski
9c7e91a1e9
Update xmpp and make opening bind2 session close other sessions with same tag
2023-11-21 13:55:40 +01:00
Paweł Chmielowski
91e74204b2
Teach mod_carboncopy how to interact with bind2 inline requests
2023-11-20 18:55:07 +01:00
Paweł Chmielowski
fdee4efe98
Fix presenting features and returning results of inline bind2 elements
2023-11-20 18:54:23 +01:00
Paweł Chmielowski
59bb6dae14
Make apps passed to check in dialyzer consult configure optons
2023-11-20 18:47:42 +01:00
Paweł Chmielowski
3300f8bafb
Update fast_tls in mix
2023-11-20 15:39:07 +01:00
Paweł Chmielowski
c61e56d8a6
Fix for one more dialyzer warning
2023-11-16 20:49:28 +01:00
Paweł Chmielowski
ad15659fb2
Fix warnings
2023-11-16 18:45:33 +01:00
Paweł Chmielowski
efffc3142a
Add implementation for SASL2 and Bind2
2023-11-16 16:52:55 +01:00
Alexey Shchepin
b0a9b58958
Use the first unique index as a primary key in ejabberd_sql_schema
2023-11-16 16:00:35 +03:00
Paweł Chmielowski
4ea46c5765
Set EJABBERD_OPTS back to "", and use previous flags as example
...
Also try to clarify distinction between EJABBERD_OPTS and ERLANG_OPTS
2023-11-15 14:16:53 +01:00
Paweł Chmielowski
7de0ba95d0
Update mysql to bring sha256_password auth plugin support
2023-11-09 15:43:47 +01:00
Paweł Chmielowski
3ad30c3ff5
Use correct commit hash for xmpp
2023-10-31 10:15:35 +01:00
Paweł Chmielowski
3ed2b41a5a
Update xmpp to bring tls-server-end-point channel binding and sasl2 codec
2023-10-31 09:41:25 +01:00
Paweł Chmielowski
3bf4cf5c3f
Fix reversed logic in node fixup function
2023-10-26 15:44:45 +02:00
Paweł Chmielowski
52e7c166fc
Normalize pubsub `max_items` node options on read
...
Older version used infinity value, for what never version use max, let's
always return max in that case.
2023-10-26 14:31:40 +02:00
Paweł Chmielowski
08a78a1654
Change logic for eldap tls_verify=soft and false
...
Looks like originally both soft and hard worked the same way, so lets make
them do that, and we also need to add {verify, verify_none} for false case
otherwise it fails on R26.
2023-10-26 11:17:17 +02:00
Paweł Chmielowski
81ceefe2f1
Remove spurious line
2023-10-25 20:35:25 +02:00
Paweł Chmielowski
c2d04bc478
Don't set fail_if_no_peer_cert for eldap ssl client connections
...
Looks like R26 generates error when this option is used for client
connection, let's just use verify_peer/verify_none for
ldap_tls_verify hard/soft options.
This should fix issue #4110 .
2023-10-25 20:31:50 +02:00
Paweł Chmielowski
36fffa5b23
Revert dialyzer changes commited by mistake
2023-10-25 20:07:02 +02:00
Paweł Chmielowski
841d5c0299
Fix startup problem when having set EJABBERD_OPTS and logger options
...
Make sure that logger options that we extract from config file are put in
correct places when starting erl, directly after -ejabberd, custom
EJABBERD_OPTS should be places after them.
This fixes issue #4109
2023-10-25 20:05:27 +02:00
Paweł Chmielowski
0bdca8fd9e
Updated deps to bring support for tls-exporter channel binding
2023-10-25 16:46:03 +02:00
Paweł Chmielowski
f48275bc11
Only care about pep bookmarks options when creating node from scratch
2023-10-19 19:26:25 +02:00
Paweł Chmielowski
aa369de280
Fix xmpp dep in mix
2023-10-18 16:17:11 +02:00
Badlop
543404bcb8
Fixing minor typos in CHANGELOG
2023-10-17 15:57:50 +02:00
Badlop
b7166d7da0
Set version to 23.10
2023-10-17 15:31:32 +02:00
Badlop
cf54608c71
Update changelog
2023-10-17 15:29:20 +02:00
Alexey Shchepin
ec20691188
Disable update_sql_schema by default
2023-10-16 19:31:32 +03:00
Alexey Shchepin
c1af36ac20
Automatically create and update SQL schema
2023-10-16 18:21:08 +03:00
Alexey Shchepin
f6e8eb52f0
Fix ejabberd_sql:sql_query* types
2023-10-16 18:21:08 +03:00
Paweł Chmielowski
ad7db90c80
Use tagged deps
2023-10-16 15:14:31 +02:00
Holger Weiss
cbfb8eb805
Example configuration: Specify s2s shaper
...
Specify a shaper for incoming s2s connections (got lost in commit
91a74e3e27
).
Thanks to Paul Menzel for noting that it was missing.
2023-10-16 14:44:01 +02:00
Holger Weiss
df60818883
Example configuration: Clarify direct TLS listener
...
The ejabberd_c2s listener for port 5223 is meant to support direct TLS
access rather than STARTTLS. Therefore, remove the 'starttls_required'
option, which had no effect.
2023-10-16 14:32:38 +02:00
Badlop
d5de93b8fa
Update other translations
2023-10-16 11:28:51 +02:00
Badlop
ab6da9530d
Update Ukrainian translation (thanks to Олександр Кревський)
2023-10-16 11:28:29 +02:00
Badlop
ca82376657
Update man page
2023-10-16 11:18:59 +02:00
Badlop
87f18aa8d7
Result of running: make doap options
2023-10-16 11:09:13 +02:00
Badlop
6340d61397
Dcoument ejabberd version number in the new options
2023-10-16 10:58:59 +02:00
Badlop
80d1e36542
mod_private: Document that it supports XEP-0402 now
2023-10-16 10:56:15 +02:00
Paweł Chmielowski
f75909db4c
Allow pubsub node owner to overwrite items published by other persons
...
Owner is already permitted to delete those items, so it could do that by
deleting old item, and publishing it again, so i don't see reason to not
allow that overwrite.
2023-10-12 13:16:32 +02:00
Paweł Chmielowski
12d47455ba
Add `auth_external_user_exists_check` option
...
This makes `user_check` hook work better with authentication methods
that don't have a way to determine if user exists (like is the case for
jwt and cert based authentication), and as result will improve mod_offline
and mod_mam handling of offline messages to those users. This reuses
information stored by `mod_last` for this purpose.
Should fix issue #3377 .
2023-10-11 14:17:18 +02:00
Badlop
9acf591242
Run 'make translations'
2023-10-11 01:17:27 +02:00
Badlop
bab8673055
Update Portuguese (Brazil) translation (thanks to Wellington Uemura)
2023-10-11 01:17:24 +02:00
Badlop
3851a77134
Update German translation (thanks to nautilusx)
2023-10-11 01:17:21 +02:00
Badlop
8e324e67a4
New Bulgarian translation (thanks to Mr. EddX)
2023-10-11 01:13:49 +02:00
Badlop
10245b40ee
Add support to register nick in a room ( #3455 )
...
Registering a nick in the MUC service or in a room is mutually exclusive:
- A nick that is registered in the service cannot be registered in any
room, not even the original owner can register it.
- Similarly, a nick registered in any room cannot be registered in the
service.
2023-10-10 13:08:56 +02:00
Badlop
9534ca2da1
ext_mod: Support when git repository name is not identical to the module name
...
For example, ejabberd-contrib has an extra module, mod_prometheus,
that is hosted in a git repository named ejabberd-prometheus-exporter
2023-10-04 20:57:02 +02:00
Badlop
f9d11265d0
ext_mod: Don't crash when github page response is 403
2023-10-04 20:55:01 +02:00
Badlop
d85c125bef
ext_mod: Use the same URL that ejabberd-contrib spec files
2023-10-04 20:54:49 +02:00
Paweł Chmielowski
62d3d7a32d
Relay pubsub iq queries to muc members without using bare jid
...
We do something similar for vcard queries, this allows target server
to respond to those queries by target server, which is what we want to
do in both of those cases.
2023-10-04 17:20:20 +02:00
Holger Weiss
a3f4a05b0c
make-binaries: Don't use non-prefixed cross tools
...
Omit the directory that contains cross compilation tools without
"$target-" prefix from the PATH. Having it in the path might lead to
problems when native tools are needed during cross compilation. For
actual cross compilation, the prefixed tools should always be used
anyway.
2023-10-03 17:56:27 +02:00
Paweł Chmielowski
86465c418d
Try to fill xep-0402 bookmarks from private storage on first access
2023-10-02 14:39:30 +02:00
Paweł Chmielowski
a63d3bf0d6
Fix crash in mod_private bookmarks converter
...
This should fix issue reported in #4092
2023-10-02 08:32:24 +02:00
Holger Weiss
762e4951f2
make-binaries: Bump Erlang/OTP version to 26.1.1
2023-09-29 19:01:50 +02:00
Holger Weiss
d4fc54be18
make-binaries: Let curl fail on HTTP errors
2023-09-29 17:33:09 +02:00
Holger Weiss
f327f4cc67
make-binaries: Suppress curl's info messages
2023-09-29 17:32:17 +02:00
Paweł Chmielowski
9ba645503b
Fix dialyzer warning
2023-09-27 23:02:32 +02:00
badlop
5406693a1e
Merge pull request #4079 from sando38/fix/Dockerfile-odbc
...
Dockerfile: add missing dependency for mssql databases
2023-09-27 21:10:16 +02:00
Paweł Chmielowski
d55955f7d8
Clean also urn:xmpp:bookmarks:1 after mod_private tests
2023-09-27 19:38:14 +02:00
Paweł Chmielowski
765770aaa5
Add support for xep-0402 - PEP Native Bookmarks
2023-09-27 18:36:30 +02:00
Paweł Chmielowski
c3e0b746d7
Add pubsub_delete_item hook
2023-09-27 18:30:17 +02:00
Paweł Chmielowski
accb0bc35a
Report support of config-node-max in pep
2023-09-27 18:29:56 +02:00
Holger Weiss
b16530bb6a
make-binaries: Bump dependency versions
2023-09-27 00:28:46 +02:00
Holger Weiss
ad00553bf8
make-binaries: Bump Erlang/OTP version to 26.1
2023-09-27 00:17:30 +02:00
Holger Weiss
b70bef77cb
make-binaries: Bump crosstool-NG version to 1.26.0
2023-09-26 23:55:01 +02:00
Holger Weiss
ac47b7b8cb
ejabberd_web_admin: Make text translatable
...
This also fixes a type issue.
2023-09-26 23:21:45 +02:00
Badlop
abe0817553
Mention what software versions are used to build the container image
2023-09-26 18:51:57 +02:00
Badlop
ab431b378a
WebAdmin: Show a warning when visiting webadmin with non-privileged account (4089)
2023-09-26 18:51:56 +02:00
Badlop
a534196315
Fix unused variable, forgotten in the recent commit 739a231
2023-09-26 18:51:51 +02:00
Badlop
cd421f98d7
ejabberdctl: Document how to stop a debug shell: control+g
...
control+g is the correct way to enter shell break mode, as documented in
https://www.erlang.org/doc/apps/erts/tty
The ejabberdctl script included in installers use the included VT100,
and that may break when hitting control+c.
In that scenario let's explicitly recommend to not use control+c.
Thanks to Holger Weiß for the report.
2023-09-26 18:51:47 +02:00
badlop
b33d660f88
Merge pull request #4088 from badlop/get-roster-command
...
Improve get_roster command result: show groups as a list
2023-09-25 13:15:26 +02:00
Badlop
245c9ae446
ejabberd_ctl: Support policy=user in the help and return proper arguments
2023-09-21 13:47:07 +02:00
Badlop
8d39431d68
ejabberd_ctl: Improve printing lists in results
...
When formatting the results of a command:
- If the top of the result is a list, split elements with newline as usual
- If it's a list in one of the resulting lines, split elements with ;
2023-09-21 13:47:05 +02:00
Badlop
739a231259
Improve get_roster command to return groups in a list instead of newlines
2023-09-21 13:47:00 +02:00
Paweł Chmielowski
426fd14b11
Make sure that policy=user commands have host instead of server arg in docs
...
We renamed them in ejabberd_command, but forgot to update doc geenerator.
2023-09-20 14:06:23 +02:00
dependabot[bot]
4735372682
Bump docker/build-push-action from 4 to 5
...
Bumps [docker/build-push-action](https://github.com/docker/build-push-action ) from 4 to 5.
- [Release notes](https://github.com/docker/build-push-action/releases )
- [Commits](https://github.com/docker/build-push-action/compare/v4...v5 )
---
updated-dependencies:
- dependency-name: docker/build-push-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-18 11:05:15 +02:00
dependabot[bot]
4b3fa13163
Bump docker/setup-buildx-action from 2 to 3
...
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action ) from 2 to 3.
- [Release notes](https://github.com/docker/setup-buildx-action/releases )
- [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3 )
---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-18 11:05:15 +02:00
dependabot[bot]
d40250c3d6
Bump docker/setup-qemu-action from 2 to 3
...
Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action ) from 2 to 3.
- [Release notes](https://github.com/docker/setup-qemu-action/releases )
- [Commits](https://github.com/docker/setup-qemu-action/compare/v2...v3 )
---
updated-dependencies:
- dependency-name: docker/setup-qemu-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-18 11:05:15 +02:00
dependabot[bot]
7d2cfd2aaa
Bump docker/metadata-action from 4 to 5
...
Bumps [docker/metadata-action](https://github.com/docker/metadata-action ) from 4 to 5.
- [Release notes](https://github.com/docker/metadata-action/releases )
- [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md )
- [Commits](https://github.com/docker/metadata-action/compare/v4...v5 )
---
updated-dependencies:
- dependency-name: docker/metadata-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-18 11:05:14 +02:00
dependabot[bot]
11fdd417dd
Bump docker/login-action from 2 to 3
...
Bumps [docker/login-action](https://github.com/docker/login-action ) from 2 to 3.
- [Release notes](https://github.com/docker/login-action/releases )
- [Commits](https://github.com/docker/login-action/compare/v2...v3 )
---
updated-dependencies:
- dependency-name: docker/login-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-18 11:05:14 +02:00
dependabot[bot]
1b7b23fab6
Bump actions/checkout from 3 to 4
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-18 11:05:14 +02:00
dependabot[bot]
10882af7c8
Bump ex_doc from 0.30.5 to 0.30.6
...
Bumps [ex_doc](https://github.com/elixir-lang/ex_doc ) from 0.30.5 to 0.30.6.
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/main/CHANGELOG.md )
- [Commits](https://github.com/elixir-lang/ex_doc/compare/v0.30.5...v0.30.6 )
---
updated-dependencies:
- dependency-name: ex_doc
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-18 11:05:14 +02:00
Holger Weiss
6c573cc9fd
mod_push: Set 'last-message-sender' to bare JID
...
If the mod_push option 'include_sender' is set to 'true', use the bare
JID rather than the full JID for the 'last-message-sender' field.
2023-09-09 17:33:16 +02:00
Holger Weiss
2782430887
mod_push: Add 'notify_on' option
...
If the new 'notify_on' option is set to 'messages', notifications are
only triggered by actual chat messages with a body (or encrypted
payload). The default behavior remains to generate a notification on
any kind of stanzas.
Thanks to EISST International Ltd for sponsoring this work.
2023-09-08 19:49:17 +02:00
Badlop
7522c29f25
Update xmpp version to send roomconfig_changesubject in disco info ( #4085 )
2023-09-08 18:37:38 +02:00
Badlop
706424f0d2
Fix crash when loading room from DB older than ffa07c6
, 23.04
...
Before commit ffa07c6
, the subject_author was just the author nick,
since that commit, subject_author contains {author nick, JID}.
2023-09-04 11:32:28 +02:00
Badlop
57d404a99b
Remove mailing list link, it had no activity and was removed long ago
2023-09-04 11:32:07 +02:00
Badlop
19e2e169b1
Let "ejabberdctl etop" work in a release (if observer is available)
2023-08-28 18:27:30 +02:00
Badlop
2a6ea79260
When building OTP release with mix, keep ERLANG_NODE=ejabberd@localhost
...
This updates the mix.exs code from commit 8ca12d4
(ejabberd 21.07)
Consequently, no need in make-binaries to update ERLANG_NODE.
The ecs docker image 23.04 got a similar change in
f81905d5e3
2023-08-28 18:27:23 +02:00
Badlop
40333066d6
Update syntax of function calls as recommended by Elixir compiler
2023-08-28 18:26:55 +02:00
Badlop
6d596063de
Elixir 1.15 removed support for --app
...
Removing that argument does not affect iexlive at all
For reference:
e1eecb8ca6
2023-08-28 18:26:55 +02:00
Badlop
a7c3c9b77d
Pass ERLANG_OPTS when calling erl to parse the INET_DIST_INTERFACE ( #4066 )
...
This is required when running ejabberdctl in binary installers
and INET_DIST_INTERFACE was configured, because some boot files were removed
2023-08-28 18:26:48 +02:00
Badlop
a01de8d944
Fix small bug introduced in 5d549dc
...
When providing a client-id as explained in
https://www.process-one.net/blog/understanding-ejabberd-oauth-support-roadmap/
ejabberd crashed with an error
exception error: no function clause matching
ejabberd_oauth:get_client_identity(
as reported in
https://stackoverflow.com/questions/76922951/ejabberd-oauth-api-http-1-1-502-bad-gateway
2023-08-28 18:26:03 +02:00
Paweł Chmielowski
c0e7774937
Don't always store messages passed through muc_filter_message
...
Recently we added new places where we call muc_filter_message to add
occupandid info to messages, but this also made them be stored in archive
as mod_mam uses that hook for getting sent messages - in case of those
messages we shouldn't be doing this.
This should fix issue #4083
2023-08-25 14:20:51 +02:00
Paweł Chmielowski
00c76003cb
Add ability to force alternative upsert implementation in mysql
2023-08-18 11:46:37 +02:00
Badlop
b29f87a978
Result of running: make doap options
2023-08-16 13:14:02 +02:00
Holger Weiss
2dc843cddd
mod_privilege: Don't fail to edit roster ( #3942 )
2023-08-16 13:08:21 +02:00
dependabot[bot]
9f08b4aa15
Bump ex_doc from 0.30.1 to 0.30.5
...
Bumps [ex_doc](https://github.com/elixir-lang/ex_doc ) from 0.30.1 to 0.30.5.
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/main/CHANGELOG.md )
- [Commits](https://github.com/elixir-lang/ex_doc/compare/v0.30.1...v0.30.5 )
---
updated-dependencies:
- dependency-name: ex_doc
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-08-16 12:27:23 +02:00
Badlop
a84fbd6a74
Improve syntax of many command descriptions for the Docs site
2023-08-16 12:27:23 +02:00
Badlop
f8af3a0005
create_room_with_opts: fix typo and move examples to args_example ( #4080 )
2023-08-16 12:27:23 +02:00
Badlop
83e51c815d
Pass also MUC room retract messages over the muc_filter_message ( #3397 )
2023-08-16 12:27:23 +02:00
Badlop
ff24700156
Fix support to retract a MUC room message
...
Now this works as expected
https://xmpp.org/extensions/xep-0425.html#example-4
2023-08-16 12:27:22 +02:00
Badlop
7683691f5a
mod_muc_occupantid: New mnesia table to store rooms salts ( #3397 )
2023-08-16 12:27:22 +02:00
Badlop
3479f88dab
Pass MUC room private messages over the muc_filter_message too ( #3397 )
2023-08-16 12:27:22 +02:00
Badlop
86fc2f157e
Always add the occupant id, even in non-anonymous rooms ( #3397 )
2023-08-16 12:27:22 +02:00
Badlop
ffa07c649b
Store the subject author JID, and run muc_filter_message when sending subject ( #3397 )
...
When changing the room subject, store the original author JID,
so later it can be provided in the hook and mod_room_occupantid
can use it to calculate and provide the occupant id
This is noticeable when a new occupant joins an existing room,
and receives the room subject.
2023-08-16 12:27:22 +02:00
Badlop
2bd61abd71
Convert allow_private_message MUC room option to allowpm ( #3736 )
2023-08-16 12:25:46 +02:00
Badlop
66df953da1
Fix usage of plugins option, which produced default_node_config ignore ( #4070 )
2023-08-16 12:25:42 +02:00
Badlop
550a586d2a
New listener option unix_socket, useful when setting unix socket files ( #4059 )
...
listen:
-
port: "unix://tmp/asd/socket"
unix_socket:
mode: '0775'
owner: 117
group: 135
2023-08-16 12:25:36 +02:00
Badlop
16473ab691
When sending message on behalf of user, trigger user_send_packet ( #3990 )
...
This way, MAM and CarbonCopy get triggered.
This is useful for transports like Slidge.
2023-08-16 12:25:29 +02:00
Paweł Chmielowski
c5afd0322e
Properly parse mysql version even if it doesn't have type tag
2023-08-14 17:12:16 +02:00
sando38
c4563c429c
Dockerfile: add missing dependency for mssql databases
2023-08-12 14:46:30 +02:00
Alexey Shchepin
eeacace02a
Update some modules to the new gen_mod API
2023-08-09 17:08:45 +03:00
Holger Weiss
caf3807bcc
ejabberd_systemd: Add a few debug messages
2023-08-09 01:58:48 +02:00
Holger Weiss
6c7e85d3d8
ejabberd_systemd: Avoid using gen_server timeout
...
Don't (ab)use the gen_server timeout mechanism for pinging the systemd
watchdog. Under certain conditions (e.g., the process receiving sys
messages), the gen_server timeout might not be triggered as expected.
Fixes #4054 , fixes #4058 ,
2023-08-09 01:54:12 +02:00
Holger Weiss
f0db7623d1
mod_push_keepalive: Don't let hook crash
...
Check whether mod_push_keepalive is loaded for a given host before
querying the module configuration for that host. This avoids a hook
crash in the case where the module is enabled for some but not all
hosts.
2023-08-09 00:11:43 +02:00
Holger Weiss
26ed6539ba
mod_push_keepalive: Delay 'wake_on_start'
...
Delay the 'wake_on_start' notifications until ejabberd is fully
initialized. This makes sure no s2s connections are initiated before
certificates are loaded.
Many thanks to Friedrich Altheide for reporting the issue.
2023-08-08 20:17:10 +02:00
Alexey Shchepin
a9347cd248
Fix unused variable warnings in mod_stats
2023-08-04 20:54:02 +03:00
Alexey Shchepin
60002fc145
Update some modules to the new gen_mod API
2023-08-04 18:53:50 +03:00
Paweł Chmielowski
20a8654be2
Reset scram fields when setting plain password in ejabberd_auth_sql
...
Setting scram password, then disabling scram and setting plain password
again, will make us think we are still using scramed password and crash
when trying to process it as such. This makes sure that when set plain
password we don't leave parts from old scram password.
2023-08-03 13:07:13 +02:00
Badlop
25411333da
Add support for XEP-0421 Occupant Id in anonymous MUC rooms ( #3397 )
2023-08-02 17:54:54 +02:00
Badlop
07d4282603
Update XMPP library which supports XEP-0421 (3397)
2023-08-02 17:54:07 +02:00
Alexey Shchepin
4bd77797fc
Add shorter forms for gen_mod hook/iq_handler API
2023-08-01 18:14:08 +03:00
Alexey Shchepin
03ffbe00c1
Update mod_disco to the new gen_mod API
2023-07-31 16:52:00 +03:00
Alexey Shchepin
5a9099f49c
Extend gen_mod API to simplify hooks and IQ handlers registration
2023-07-31 16:52:00 +03:00
Badlop
b501ee2b8d
Remove obsolete example files, and add link in Docs to the archived copies
2023-07-27 14:03:40 +02:00
Badlop
a7c3368635
Move example Perl extauth script from ejabberd git to Docs site
2023-07-27 14:03:37 +02:00
Paweł Chmielowski
84ee724aa3
Fix dialyzer warning
2023-07-25 18:49:45 +02:00
Paweł Chmielowski
da7fe59834
Commit changes to ejabberd_sql.hrl as well
2023-07-25 18:24:24 +02:00
Paweł Chmielowski
3710dc1e3b
Use prepared statement with mysql
2023-07-25 18:11:24 +02:00
Badlop
db03c7428c
Web Admin roster page: move the AddJID textbox to top ( #4067 )
2023-07-24 20:27:01 +02:00
Badlop
9c6fe98f76
Partially revert "Improve ejabberdctl script: Copy recent commit 6272c0e90
to the container"
...
This reverts commit e66ba2e424
following the revert in commit 8288774787
2023-07-24 20:26:37 +02:00
Holger Weiss
c03af0afb3
make-binaries: Remove outdated workaround
...
Remove a workaround for an issue that has been fixed in Erlang/OTP 25:
https://github.com/erlang/otp/pull/5558
2023-07-24 00:11:32 +02:00
Holger Weiss
d109d7f0c5
make-binaries: Revert to Linux-PAM 1.5.2
...
Linux-PAM's --disable-examples flag doesn't seem to have the expected
effect.
2023-07-23 16:34:21 +02:00
Holger Weiss
bf9b257eab
make-binaries: Don't build Linux-PAM examples
...
Building the examples shipped with Linux-PAM 1.5.3 fails with musl libc:
5374f677e4
2023-07-23 16:08:25 +02:00
Holger Weiss
11dc0c1774
make-binaries: Bump dependency versions
2023-07-23 15:52:32 +02:00
Holger Weiss
0a5eda0777
make-binaries: Fix check for current Expat version
2023-07-23 15:51:27 +02:00
Holger Weiss
a657a6d2f6
make-binaries: Apply another minor simplification
2023-07-23 15:35:09 +02:00
Holger Weiss
121acd1da7
make-binaries: Apply minor simplifications
2023-07-23 15:06:40 +02:00
Holger Weiss
ec86079747
make-binaries: Don't duplicate config entries
2023-07-23 14:56:01 +02:00
Holger Weiss
f1b0a9cb32
make-binaries: Don't hard-code musl version
...
The default is to link against the most-recent musl version available
within the crosstool-ng toolchain, which is currently 1.2.2. Unlike
with glibc, there's no point in sticking to some older version.
2023-07-23 14:54:04 +02:00
Holger Weiss
0b6cb77b3c
make-binaries: Omit unnecessary glibc setting
...
The CT_GLIBC_KERNEL_VERSION_NONE option is about the minimum kernel
version supported by the toolchain's glibc. The default is to stick to
the version of the kernel headers, which should be just fine.
2023-07-23 14:52:18 +02:00
Holger Weiss
8a740d5087
make-binaries: Set kernel version for all builds
...
Specify the same min. supported kernel version for builds against musl
libc and glibc.
2023-07-23 14:49:07 +02:00
Jérôme Sautret
8288774787
Add EJABBERD_OPTS in ejabberdctl.cfg & revert "Improve ejabberdctl script"
...
EJABBERD_OPTS is used to pass options to erl only when starting
ejabberd, to enable -heart for example.
This partially reverts commit 6272c0e901
.
2023-07-18 15:31:10 +02:00
Paweł Chmielowski
d349e3a88e
Revert "Add stun app to cond_apps in mix.exs"
...
Looks like this is required only when using older mix versions.
This reverts commit 2ef9fbc111
.
2023-07-18 11:14:57 +02:00
Paweł Chmielowski
2ef9fbc111
Add stun app to cond_apps in mix.exs
2023-07-17 18:40:39 +02:00
Badlop
78f81de252
Improve support to stop external modules written in Elixir
2023-07-13 13:41:18 +02:00
dependabot[bot]
8d9ee8e35b
Bump ex_doc from 0.29.4 to 0.30.1
...
Bumps [ex_doc](https://github.com/elixir-lang/ex_doc ) from 0.29.4 to 0.30.1.
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/main/CHANGELOG.md )
- [Commits](https://github.com/elixir-lang/ex_doc/compare/v0.29.4...v0.30.1 )
---
updated-dependencies:
- dependency-name: ex_doc
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-07-13 13:41:14 +02:00
Badlop
e66ba2e424
Improve ejabberdctl script: Copy recent commit 6272c0e90
to the container
2023-07-13 13:41:06 +02:00
Paweł Chmielowski
fafb48e88f
Merge pull request #4025 from jpds/increase-default-backlog
...
ejabberd_listener.erl: Increase default listen queue backlog value
2023-07-11 12:19:33 +02:00
Jérôme Sautret
6272c0e901
Improve ejabberdctl script
...
Improved handling of ERLANG_OPTS and fixed hanging process when running some ejabberdctl commands as root, such as debug or foreground.
2023-07-10 16:18:06 +02:00
Paweł Chmielowski
54314e5bb9
Better error handling in mod_muc_rtbl
...
Should fix issue #4050
2023-07-04 18:18:49 +02:00
Badlop
ffbcf19156
Halt ejabberd if a command in CTL_ON_ fails during ejabberd startup
...
See processone/ejabberd-contrib#97
2023-06-20 17:54:10 +02:00
Badlop
dcc8149f58
New command to halt ejabberd abruptly with an error status code
...
Used for processone/ejabberd-contrib#97
2023-06-20 17:54:10 +02:00
Badlop
d2c54fd5fe
Fix calling ejabberdctl command with wrong number of arguments with Erlang 26
...
In Erlang up to 25.3, the lists:zip arguments were [A1, A2]
Since Erlang 26.0, the arguments are: [A1, A2, fail]
93748a8d84
2023-06-13 12:25:27 +02:00
Badlop
f40a7b1c77
OAuth: Handle badpass error message
2023-06-13 12:25:22 +02:00
Badlop
16f758e13f
Support to provide only the dependency name
...
This is used in ejabberd-contrib repository's ci.yml,
and useful for a custom development that doesn't require rebar2 support.
2023-06-12 20:48:47 +02:00
Badlop
c333cc0776
New option install_contrib_modules
...
This option is read during ejabberd start or config reload.
It installs the listed modules which aren't yet installed,
as long as allow_contrib_modules is not disabled.
Edit ejabberd.yml and configure the desired ejabberd-contrib modules,
add them in the install_contrib_modules option,
finally start ejabberd (or reload config).
2023-06-09 10:27:13 +02:00
Badlop
3263e81972
Move Xref and Dialyzer options from workflows to rebar.config
...
And also include some more applications in Dialyzer plt_extra_apps,
which apparently is required since Erlang 26.
2023-06-09 00:02:20 +02:00
Badlop
397a08afca
Move configure options from the Test to the Compile section
2023-06-09 00:02:18 +02:00
Badlop
19070e4b04
Add sections to rebar.config to organize its content
2023-06-09 00:02:17 +02:00
Badlop
0bbc255814
Dialyzer dirty workarounds because re:mp() is not an exported type
...
Since Erlang/OTP 26, Dialyzer by default reports unknown types.
ejabberd's type specs refer to the re:mp() type,
but that isn't exported in the OTP source code,
and cannot be used in any other modules.
This commit provides very dirty workarounds, and any cleaner
alternative is very welcomed.
2023-06-09 00:02:15 +02:00
Badlop
1b06f4ca4f
The warnings_as_errors compiler option is already disabled by default
2023-06-09 00:02:13 +02:00
Badlop
b3eeac637f
Update tests to Erlang/OTP 26 and recent Elixir
2023-06-09 00:02:10 +02:00
Badlop
480b42b36d
Run Dialyzer again with Erlang/OTP 26, and let's solve its problems
2023-06-09 00:02:06 +02:00
Badlop
436074c67a
When installing module already configured, keep config as example
...
When installing a module using ext_mod, if it has already configuration
in the modules section, copy its specific config file as an example
(copy file and rename it).
This may happen when using the new install_contrib_modules option.
2023-06-09 00:02:02 +02:00
Badlop
c9a2117570
Ignore .tool-versions in git, this file is used by asdf
2023-06-09 00:01:56 +02:00
sando38
6155b001b4
Dockerfile: Reorder stages and steps for consistency
...
Also avoid duplicated lines.
2023-06-09 00:01:54 +02:00
sando38
8f05af7810
Dockerfile: Use Alpine as base for METHOD=package
...
No need to use the "large" docker.io/erlang image as we do not need any erlang/otp for the binary installers.
2023-06-09 00:01:51 +02:00
sando38
33ac7916d3
Dockerfile: Cosmetic changes
...
Ommit the path to ejabberdctl as it is already located at the $PATH
Also, do not copy Dockerfile into the container as this may unnecessarily trigger re-compiling of ejabberd.
2023-06-09 00:01:49 +02:00
sando38
461c1ddf3d
Dockerfile: Rename packages to improve compatibility
...
Rename libcap packages to improve compatibility between Alpine versions. This may be beneficial if one specifies an OTP_VSN which was built using an older Alpine base version.
The alpine package libcap has been splitted into libcap2 and libcap-utils in Alpine 3.17. 'libcap' is now an alias for libcap2 and libcap-utils. We define 'so:libcap.so.2' for the runtime stage, as we only need the libraries, not the binaries.
2023-06-09 00:01:46 +02:00
sando38
2428f74fbd
Dockerfile: Provide specific OTP and elixir vsn for direct compilation
...
Ejabberd images can now be built with specific erlang/OTP and elixir vsn with the new build arguments OTP_VSN and ELIXIR_VSN.
2023-06-09 00:01:36 +02:00
Paweł Chmielowski
bb8e892323
Add alternate version of mysql upsert
...
This one works by issuing select and then insert or update or skip depending
on what select returns. We use this on mysql 5.7.26 and 8.0.20 where
previous implementation using 'replace' or 'on conflict update' can cause
excessive deadlocks.
2023-06-07 16:38:07 +02:00
Paweł Chmielowski
3eecf4ae8a
Remove existing role information for users that are kicked from room
...
This should fix issue reported in #4035
2023-05-24 12:15:20 +02:00
Paweł Chmielowski
4a53d4cb56
Expand rule "mucsub subscribers are members in members only rooms" to more places
2023-05-24 11:26:48 +02:00
Paweł Chmielowski
1818a29c29
Don't crash in mod_shared_roster_ldap:get_member_jid on empty output
...
This based on crash from issue #3614
2023-05-22 12:48:29 +02:00
Paweł Chmielowski
dd2efc360b
Fix return values from calculate_diff inside mod_privacy_sql
2023-05-02 15:59:40 +02:00
Paweł Chmielowski
8e64992f47
Use more efficient way to calculate changes in set_privacy_list
2023-05-02 11:43:29 +02:00
Jonathan Davies
040c72f1c8
ejabberd_listener.erl: Increase default listen queue backlog value to 128, which
...
is the default value on both Linux and FreeBSD.
2023-04-25 20:11:04 +01:00
Badlop
d95a1bac3e
Use container names to differentiate them; don't force logo height
2023-04-25 09:50:19 +02:00
Badlop
c6b295b5a0
Fix typo in the previous commit
2023-04-25 09:48:02 +02:00
Badlop
2a4a6bec18
Add trailing backslash to URLs shown in mod_muc_log disco#info
2023-04-24 13:43:09 +02:00
Badlop
0d3f8c7b9f
Make mod_register_web redirect to page that end with / ( #3177 )
...
Code copied from ejabberd_web_admin.erl, commit 5ec21438
2023-04-24 13:43:07 +02:00
Badlop
d299b97261
Raise Erlang/OTP requirement to 20.0
2023-04-24 13:43:00 +02:00
Paweł Chmielowski
5b8ebed81b
Optimize mod_privacy_sql:set_list
...
Previously we always did delete everything and set all entries back, now
we check if we need to delete anything and if not insert only missing data.
2023-04-20 10:55:30 +02:00
Badlop
bb28265261
Set version to 23.04
2023-04-18 11:39:33 +02:00
Paweł Chmielowski
46f33e5051
Update dependencies
2023-04-18 11:22:33 +02:00
Badlop
06669b12e8
Update changelog
2023-04-18 11:12:18 +02:00
Badlop
1ca126381b
Update man
2023-04-18 10:37:22 +02:00
dependabot[bot]
bf5de81b24
Bump ex_doc from 0.29.3 to 0.29.4
...
Bumps [ex_doc](https://github.com/elixir-lang/ex_doc ) from 0.29.3 to 0.29.4.
- [Release notes](https://github.com/elixir-lang/ex_doc/releases )
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/main/CHANGELOG.md )
- [Commits](https://github.com/elixir-lang/ex_doc/compare/v0.29.3...v0.29.4 )
---
updated-dependencies:
- dependency-name: ex_doc
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-04-18 10:37:16 +02:00
Badlop
d717ffd1a0
Update version notes of options and commands
2023-04-18 10:37:14 +02:00
Badlop
c271d73dbd
CI: Update Erlang/OTP to 26.0-rc3
2023-04-18 10:37:11 +02:00
Badlop
e1a8980d6c
Container: no need to specify captcha_url, auto may be enough in most cases
2023-04-18 10:37:08 +02:00
Badlop
ec7ff88dda
Update Portuguese translation (thanks to Silvério Santos)
2023-04-18 10:37:06 +02:00
Badlop
5b695766ae
Mention what ejabberd version first supports rtbl
2023-04-18 10:37:04 +02:00
Paweł Chmielowski
f5b6909cca
Unregister hooks on stop in mod_muc_rbtl
2023-04-17 18:03:21 +02:00
Paweł Chmielowski
98d348893b
Make mod_muc_rtbl notify only local node rooms
2023-04-17 17:07:59 +02:00
Paweł Chmielowski
c942c31e38
Add mod_muc_rtbl
...
This implements Real-time blocklists for XMPP (xmppbl.org).
Closes #4017
2023-04-17 16:59:42 +02:00
Paweł Chmielowski
70cbdd1117
Allow to update state from muc_process_iq hook
2023-04-17 16:57:54 +02:00
Paweł Chmielowski
1114a35e0a
Recognize message retractions in mod_muc
2023-04-14 12:32:35 +02:00
Paweł Chmielowski
d12e5a44b8
Add by attribute to generated muc moderation messages
2023-04-14 12:31:34 +02:00
Badlop
34420444db
Container: Revert change in entrypoint that was added in d15cf994a
2023-04-11 15:29:28 +02:00
Badlop
38eb50bf5c
Container: Reorganize how to build container image
2023-04-11 15:29:26 +02:00
Badlop
6705679cf3
Container: Update instructions to build image following d15cf994a
( #3983 )
2023-04-11 15:29:24 +02:00
Badlop
10635bccc9
Container: Reword sentences about docker.io and ghcr.io
2023-04-11 15:29:23 +02:00
Badlop
dee0ec50b9
Remove ci-19.3, as Github Actions no longer supports ubuntu-18.04
2023-04-11 15:29:21 +02:00
sando38
401bdedae8
Dockerfile: Detect runtime dependencies automatically
...
Only libcap2 and tini can't be auto-detected. libcap2 has been renamed in Alpine version 3.17, hence the Dockerfile is not compatible with Alpine versions <3.17
2023-04-11 15:27:49 +02:00
Badlop
99e51a2123
Mention in mod_mam.erl its support for XEP-0425: Message Moderation
...
Then run "make doap" to regenerate ejabberd.doap
2023-03-30 17:02:54 +02:00
Badlop
d43ce53f9a
Update xmpp version in mix following commit 6da1bb5b2
2023-03-30 16:54:35 +02:00
Paweł Chmielowski
f6385fae50
Fix dialyzer warning
2023-03-30 14:53:51 +02:00
Paweł Chmielowski
6da1bb5b22
Add support for "xep-0424 Message Moderation"
...
This fixes issue #3730
2023-03-30 14:38:08 +02:00
Badlop
64e1cfcbba
Test only with oldest OTP supported, newest stable and bleeding edge
2023-03-28 11:41:57 +02:00
Badlop
fbfcebf417
Container: Remove Elixir Matchers to prevent useless warnings in github actions page
2023-03-28 11:41:56 +02:00
Saarko
d15cf994a2
Container: Add METHOD to build container using packages ( #3983 )
...
make-*: include musl build in make-binaries
Ctr actions: use github runners to provide bootstrap erlang
- adjust make-binaries script to use github runners' installed erlang
for bootstrapping
- this reduces the need to build an unnecessary toolchain for glibc
based binaries
2023-03-28 11:41:54 +02:00
Saarko
c71887db43
Container: Add tini as runtime init
2023-03-28 11:41:52 +02:00
Badlop
7c634f3615
Container: No need of openssl package at runtime
2023-03-28 11:41:51 +02:00
Badlop
874b961680
Container: Remove unused Mix stuff: ejabberd script and static COOKIE
...
Instead of including this file in the container with static content:
/opt/ejabberd-master/releases/COOKIE
the cookie file will be generated by erlang in
/opt/ejabberd/.erlang.cookie
or by ejabberdctl if ERLANG_COOKIE environment variable was provided.
2023-03-28 11:41:49 +02:00
Badlop
2c1ee698cc
Container: Copy captcha scripts to /opt/ejabberd-*/lib like the installers
...
Instead of a path like
/opt/ejabberd-master/lib/ejabberd-23.1.0/priv/bin
they are now in
/opt/ejabberd-master/lib
2023-03-28 11:41:47 +02:00
Badlop
b0f0dd3227
Container: Expose only HOME volume, it contains all the required subdirs
2023-03-28 11:41:46 +02:00
Badlop
de477f7b6c
Container: Update Alpine to 3.17 to get Erlang/OTP 25 and Elixir 1.14
2023-03-28 11:41:44 +02:00
Saarko
440ede313b
make-binaries: fix building with erlang/otp v25.x
...
Signed-off-by: sando38 <sandomir@tutanota.com>
2023-03-28 11:41:43 +02:00
Saarko
976c6c5e41
make-binaries: bump versions, e.g. erlang/otp to 25.3
2023-03-28 11:41:41 +02:00
Badlop
7e6d25314d
make-packages: Fix for installers workflow, which didn't find lynx...
2023-03-28 11:41:39 +02:00
Badlop
cc5c3f7b2c
ejabberdctl: Don't use .../releases/COOKIE, it's no longer included
...
And slightly clean the .erlang.cookie line
This partially reverts 9c23a7dc3f
2023-03-28 11:41:33 +02:00
Badlop
1d62dc4621
Set roster name from XEP-0172, or the stored one ( #1611 )
2023-03-28 11:41:27 +02:00
Badlop
e2496562f9
Preliminary support to store extra elements in subscription request ( #840 )
2023-03-28 11:41:24 +02:00
Badlop
c4a2f8d64f
captcha_url option now accepts 'auto' value, and it's the default
2023-03-22 16:23:41 +01:00
Badlop
6c620f6f43
Remove wrong get_room_history command fields specification
2023-03-22 16:23:37 +01:00
dependabot[bot]
af29adb558
Bump ex_doc from 0.29.2 to 0.29.3
...
Bumps [ex_doc](https://github.com/elixir-lang/ex_doc ) from 0.29.2 to 0.29.3.
- [Release notes](https://github.com/elixir-lang/ex_doc/releases )
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/v0.29.3/CHANGELOG.md )
- [Commits](https://github.com/elixir-lang/ex_doc/compare/v0.29.2...v0.29.3 )
---
updated-dependencies:
- dependency-name: ex_doc
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-03-22 16:23:33 +01:00
Paweł Chmielowski
3c97775573
Pubsub xdata fields max_item/item_expira/children_max use 'max' not 'infinity'
...
Codec in xmpp crashes when we use infinity (see issue #4011 ), so lets
convert those values before passing them to xmpp:encode(0
2023-03-21 15:30:44 +01:00
Blake Miller
f953dc3f5e
Persist `none` role for outcasts
...
`none` roles *should* be persisted for banned users. I totally forgot about this, my bad. I'm shocked nobody else noticed it.
2023-03-20 17:07:10 +01:00
dependabot[bot]
04b431f191
Bump ex_doc from 0.29.1 to 0.29.2
...
Bumps [ex_doc](https://github.com/elixir-lang/ex_doc ) from 0.29.1 to 0.29.2.
- [Release notes](https://github.com/elixir-lang/ex_doc/releases )
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/main/CHANGELOG.md )
- [Commits](https://github.com/elixir-lang/ex_doc/compare/v0.29.1...v0.29.2 )
---
updated-dependencies:
- dependency-name: ex_doc
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-03-07 13:11:26 +01:00
Badlop
5cd6c524ea
Allow XML to be visible in web browser in Common Test page
2023-03-07 13:11:24 +01:00
Badlop
37676757e3
CI: Add OTP 26.0-rc1 to the test matrix
...
But disable dialyzer in 26, as it complains verbosely without reason
2023-03-07 13:11:22 +01:00
Badlop
1c82daacb2
CI: Upload Common Test logs as artifact in case of failure
2023-03-07 13:11:21 +01:00
Badlop
9f0a5c5ef0
CI: Produce less verbose logs for tests
...
This gets a line first introduced in 5b5548b8c
that was lost later
2023-03-07 13:11:19 +01:00
Badlop
9bb86132c6
CI: Use default verbosity to let log files contain XMPP stanzas
...
This partially reverts 2a7780507
2023-03-07 13:11:17 +01:00
Badlop
2137a4f663
Fix Shellcheck warnings in shell scripts
2023-02-21 18:17:26 +01:00
Badlop
c9143dd3d8
Fix TSQLlint warnings in MSSQL test script
2023-02-21 18:17:25 +01:00
Badlop
66d58504d0
Fix TSQLlint warning about typo in mssql.new.sql
2023-02-21 18:16:59 +01:00
Badlop
0def333550
Fix Remark-lint warnings
2023-02-21 18:14:02 +01:00
Badlop
dea452bdfd
Fix Prospector and Pylint warnings in test extauth.py
2023-02-21 18:14:02 +01:00
dependabot[bot]
d504ed8a9b
Container: Bump docker/build-push-action from 3 to 4
...
Bumps [docker/build-push-action](https://github.com/docker/build-push-action ) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases )
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: docker/build-push-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-21 18:13:15 +01:00
Paweł Chmielowski
9503beca6c
Make mod_muc_room:set_opts process persistent flag first
...
As processing some other options depends on this setting flag in room
state.
2023-02-20 13:42:52 +01:00
Paweł Chmielowski
dfe4884d16
Allow passing affiliations and subscribers to create_room_with_opts command
2023-02-20 13:03:46 +01:00
Paweł Chmielowski
f10f6d176f
Store state in db in mod_muc:create_room()
2023-02-20 12:56:41 +01:00
Paweł Chmielowski
4e7aa41e3f
Make subscribers members by default
2023-02-20 12:55:31 +01:00
Paweł Chmielowski
d91812730b
Stop ejabberd_system_monitor before stopping node
...
Sometimes monitor module is performing checks when node is stopping and
this causes crash in monitoring process.
2023-02-08 19:53:19 +01:00
Paweł Chmielowski
54cf37e917
Invalidate vcard_xupdate cache on all nodes when vcard is updated
2023-02-08 19:06:44 +01:00
Paweł Chmielowski
3de803be2f
Add get_room_history command in mod_muc_admin
2023-02-08 11:04:26 +01:00
Paweł Chmielowski
5ca59807d9
Fix problem with results of mam queries using rsm with max and before
...
Plus add test case for it.
2023-02-03 11:37:54 +01:00
Paweł Chmielowski
5c3b43cd63
Update spec
2023-02-01 17:32:22 +01:00
Paweł Chmielowski
1a6baf223c
Re-allow anonymous connection for connection without client certificates
...
This fixes issue #3985 . Initial issue was introduced in
5506b838c8
adding tls client cert
authentication.
2023-02-01 16:58:25 +01:00
Paweł Chmielowski
74c9aa8ac0
Merge pull request #3982 from nosnilmot/sql-update-tests
...
SQL schema migration fixes and testing
2023-02-01 12:03:48 +01:00
Badlop
fb16727180
Ammend previous commit with another fix
2023-01-27 15:40:34 +01:00
Badlop
9842b035e3
Fix compilation problem with Erlang/OTP older than 21 introduced recently
...
Those macros were first introduced in c88a2d0
2023-01-27 15:29:41 +01:00
Alexey Shchepin
f6b5a52104
Add s2s_out_bounce_packet hook
2023-01-27 03:54:31 +03:00
Alexey Shchepin
f650b1e83c
Log HTTP handler exceptions
2023-01-27 03:54:31 +03:00
Badlop
03cbc9b004
Revert previous commit, stick with Alpine 3.16 and Erlang/OTP 24 ( #3983 )
...
Alpine 3.17 includes Erlang/OTP 25, and it segfaults when
used in QEMU for arm64.
Revert "Update Alpine to 3.17 to get Elixir 1.14 required by recent libraries"
This reverts commit 43cae922f3
.
2023-01-26 14:53:14 +01:00
Badlop
43cae922f3
Update Alpine to 3.17 to get Elixir 1.14 required by recent libraries
2023-01-25 17:58:27 +01:00
Badlop
c5c7e7fc4d
ext_mod: Improve support for loading *.so files from ext_mod dependencies
...
Copying files from deps/*/priv/*.so to the ejabberd priv/
is not possible when running ejabberd as OTP release or in a container.
Instead, let's copy the deps/*/priv/*.so maintaining the file structure,
and then using code:add_pathz for those dirs.
This partially reverts 5c1b72853f
2023-01-25 17:58:12 +01:00
Stu Tomlinson
0c1cf43519
Fix a long standing bug in new schema migration
...
... and make the test that uncovered it explicitly fail (there was already a
TODO) instead of passing but with errors logged
2023-01-21 15:42:43 +00:00
Stu Tomlinson
cbbf85c555
Add support for running tests on MS SQL
2023-01-21 15:42:43 +00:00
Stu Tomlinson
56e974ab80
Add ability to run tests on upgraded DB
...
To test update_sql operation and functionality of resulting DB:
1. Load original schema to DB
2. Set {update_sql, true} in suite.erl
3. Run tests
2023-01-21 15:42:43 +00:00
Stu Tomlinson
9398052b65
New schema migration 'update_sql' improvements
...
- check that server_host column does not already exist before addding it
and making other changes to table (update_sql becomes idempotent,
yay!)
- check that indexes exist before dropping them (some are historical and
are not created in more recent deployments), elminating spurious
errors from logs
- update new_sql_schema config after migration, to allow near
zero-downtime migrations (and help with automated testing)
2023-01-21 14:54:36 +00:00
Stu Tomlinson
6a8899677d
Un-deprecate ejabberd_config:set_option/2
...
There does not appear to be an alternative way to set individual config
options, and this is already used by test/ejabberd_SUITE.erl
2023-01-21 14:54:36 +00:00
Paweł Chmielowski
3b34538038
Remove debug line from last commit
2023-01-20 17:12:50 +01:00
Paweł Chmielowski
6cf1e05993
Try to populate room history from mam when unhibernating
2023-01-20 16:27:08 +01:00
Paweł Chmielowski
baf1336761
Merge pull request #3980 from nosnilmot/sql-maintenance
...
SQL related fixes and updates
2023-01-20 14:18:55 +01:00
Stu Tomlinson
4f0e426a12
Change PostgreSQL SERIAL to BIGSERIAL columns
...
This is consistent with other schemas, internally consistent with
foreign keys, and allows for > 2B records in these tables.
2023-01-19 23:36:42 +00:00
Stu Tomlinson
d5bf051e79
Fix minor SQL schema inconsistencies
2023-01-19 23:36:42 +00:00
Stu Tomlinson
c7c982b67b
Add MS SQL support for new schema migration
2023-01-19 23:36:42 +00:00
Stu Tomlinson
f7f0d3b1fb
Enable MySQL support for new schema migration
2023-01-19 23:36:42 +00:00
Stu Tomlinson
d4ab4d16e8
Use python3 to run extauth.py for tests
2023-01-19 23:36:42 +00:00
Stu Tomlinson
aeed1679d8
Add 'new' schema for MS SQL
2023-01-19 23:36:42 +00:00
Stu Tomlinson
6fc67d83f4
Minor MS SQL improvements
...
Support 'sql_ssl' option for MS SQL - set Encryption=required and
Encrypt=yes in ODBC connection string to require SSL using default
FreeTDS driver and Microsoft ODBC Driver for SQL Server repectively.
Allow setting full ODBC connection string in 'sql_server' for MS SQL,
allowing custom connection configuration beyond what is possible with
just 'sql_odbc_driver' option.
2023-01-19 23:36:42 +00:00
Stu Tomlinson
06ffe995e1
Remove unnecessary indexes
...
For columns are already included in a compound index there is no
benefit to having a separate index with a subset of the same columns in
the same order, it just wastes space.
2023-01-19 23:36:42 +00:00
Stu Tomlinson
93bf4d5411
New SQL schema migrate fix
...
'server_host' column on 'route' table already exists in old schema and
does not need adding for new schema migration.
2023-01-19 23:36:42 +00:00
Stu Tomlinson
19f2f1fa86
Fix MS SQL error caused by ORDER BY in subquery
...
'The ORDER BY clause is invalid in views, inline functions, derived
tables, subqueries, and common table expressions, unless TOP, OFFSET
or FOR XML is also specified.'
Omit the ORDER BY clause from subquery if the SELECT is not constrained
by TOP.
2023-01-19 23:36:42 +00:00
Stu Tomlinson
5e94fdcfd5
MS SQL schema fixes
...
* Add missing 'mix' tables and indexes
* Fix text vs varchar issues
Various tests triggered this error:
The data types text and varchar are incompatible in the equal to operator.
Caused by incompatible 'text' columns in muc_online_room,
muc_online_users, pubsub_node_option, and pubsub_node tables.
* Fix definition of mqtt_pub table
This table incorrectly included 'server_host' column in old schema, and
had other inconsistencies.
2023-01-19 23:35:05 +00:00
Stu Tomlinson
ec6f5c17c8
Correct README for creating test docker MS SQL DB
2023-01-19 14:06:11 +00:00
Paweł Chmielowski
758c87f564
Revert notes placement when generating markdown api commands documentation
2023-01-19 13:24:51 +01:00
Paweł Chmielowski
b6dde41000
Improve output in gen_html_doc_for_commands command
2023-01-19 11:45:33 +01:00
Stu Tomlinson
648c83ea03
Fix ejabberdctl output formatting ( #3979 )
...
ECMA-48 SGR sequence ESC [21m is actually 'set double underline' but was
incorrectly implemented as 'set normal intensity' in Linux prior to
4.17.
The correct sequence for 'set normal intensity' is ESC [22m, which fixes
output formatting of 'ejabberdctl' and 'ejabberdctl help' on macos.
2023-01-19 11:18:59 +01:00
Paweł Chmielowski
cc4cacdb5e
Set version to 23.01
2023-01-17 11:35:52 +01:00
Paweł Chmielowski
c84cdb6bfb
Update mix dependences
2023-01-17 11:24:28 +01:00
Paweł Chmielowski
a7ea8ecc29
Use tagged versions of dependences
2023-01-17 11:24:28 +01:00
Badlop
24839ad4be
Fix typos in documentation and changelog
2023-01-16 18:34:09 +01:00
Badlop
e11b89efd2
Get back mod_sip documentation and version number in the man page
2023-01-16 16:30:50 +01:00
Paweł Chmielowski
4566c82a85
Update man file
2023-01-16 16:24:44 +01:00
Paweł Chmielowski
024f3be13a
Update mod_mqtt_bridge documentation
2023-01-16 15:33:37 +01:00
Badlop
af2dae2ff3
Update changelog
2023-01-16 15:20:16 +01:00
Badlop
d92372af70
Update man page
2023-01-16 15:10:31 +01:00
Badlop
a70381e7c1
Annotate options that change in ejabberd 23.01
2023-01-16 15:10:29 +01:00
Badlop
21c0aaf417
Container: Replace set-output command with environment file
...
Announced in:
https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
2023-01-16 15:10:28 +01:00
Badlop
ce10bed5d8
Container: Update Alpine to 3.16, the latest one cached in Github Actions
2023-01-16 15:10:27 +01:00
Badlop
eb12c1db1b
Update check_xep_versions.sh to support extended -protocol attribute ( #3915 )
2023-01-16 15:10:25 +01:00
Badlop
276c11b04a
Fix doc of log_modules_fully allowed value
2023-01-16 15:10:24 +01:00
Badlop
0255562d93
Fix doc of outgoing_s2s_families default value, it changed in 25ddd7b
2023-01-16 15:10:22 +01:00
Paweł Chmielowski
26a7107cd5
Fix dialyzer warning
2023-01-16 12:14:21 +01:00
Paweł Chmielowski
89918865b0
Implement reload in mqtt_bridge
2023-01-16 11:22:17 +01:00
Paweł Chmielowski
f2cbe7f3c2
Recognize ws5/wss5 urls in mqtt_bridge
2023-01-16 11:01:24 +01:00
Paweł Chmielowski
83418c3195
Fix warning in mqtt_bridge
2023-01-16 11:01:04 +01:00
Paweł Chmielowski
5592f8df1a
Make dialyzer happy
2023-01-13 20:34:49 +01:00
Paweł Chmielowski
4311a5646f
Add support for websockets to mqtt bridge
2023-01-13 20:09:10 +01:00
Badlop
c103182bc7
Update German translation (thanks to Johannes Keyser)
2023-01-10 13:52:06 +01:00
Badlop
243697e25a
Update copyright year to 2023 ( #3967 )
2023-01-10 13:52:04 +01:00
dependabot[bot]
dfc6e7833c
Bump ex_doc from 0.28.4 to 0.29.1
...
Bumps [ex_doc](https://github.com/elixir-lang/ex_doc ) from 0.28.4 to 0.29.1.
- [Release notes](https://github.com/elixir-lang/ex_doc/releases )
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/main/CHANGELOG.md )
- [Commits](https://github.com/elixir-lang/ex_doc/compare/v0.28.4...v0.29.1 )
---
updated-dependencies:
- dependency-name: ex_doc
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-01-10 13:52:02 +01:00
Badlop
e0b4ea6652
Update jose to 1.11.5 when Erlang/OTP is 21 or higher
...
But use old jose 1.11.1 on Erlang/OTP older than 21
Erlang older than 21 does not support
try catch _Class:_Reason:_Stacktrace ->
that is used in jose_server.erl
2023-01-10 13:51:56 +01:00
Badlop
503ad8e905
Fix bash completion when using Relive or other install methods
2023-01-10 13:51:53 +01:00
Frédéric Fauberteau
d26a9d583f
Fix portability issue with some shells ( #3970 )
2023-01-09 16:26:36 +01:00
Jérôme Sautret
0b1800fc10
Add hooks for mqtt subscribe & unsubscribe events
2023-01-05 14:58:18 +01:00
Badlop
92d7be4338
Use alternative split/2 function that works with Erlang/OTP as old as 19.3
2023-01-03 20:32:52 +01:00
Badlop
ce89ff07e7
Fix "make hooks"
2023-01-03 19:13:43 +01:00
Badlop
5c1b72853f
External modules: compile C files and install them in ejabberd's priv
2023-01-03 18:48:44 +01:00
Badlop
5d38143c3f
Initialize captcha system after loading modules and external modules
...
Since recently, ejabberd_captcha instead of a script may use a module,
for example the external module mod_ecaptcha, which must be loaded first.
2023-01-03 18:48:42 +01:00
Badlop
353c68cfa6
Add support to define module instead of path to script
2023-01-03 18:48:40 +01:00
Badlop
9087e72f0e
Update image key, some scripts generate their own random key
2023-01-03 18:48:38 +01:00
Badlop
4ad4a3bf24
Support to get module status from Elixir modules
2022-12-22 14:00:38 +01:00
Badlop
17160e9379
Container: Update Actions versions as requested by GitHub Actions
2022-12-22 14:00:36 +01:00
Jonathan Davies
ed84fee2bf
ejabberd_options_doc.erl: Added outgoing_s2s_families deprecation
...
notice.
Signed-off-by: Jonathan Davies <jpds@protonmail.com>
2022-12-22 14:00:22 +01:00
Jonathan Davies
25ddd7b152
Changed default outgoing_s2s_families to IPv6 as servers are within datacenters
...
where IPv6 is more commonly enabled (contrary to clients), and if it's not
present - it'll just fall back to IPv4.
2022-12-22 14:00:22 +01:00
Paweł Chmielowski
5ad709a2e2
Fix typo in last commit
2022-12-21 11:13:49 +01:00
Paweł Chmielowski
32ace140df
Don't store mucsub presence events in offline storage
...
This is expanded version of pull request #3959
2022-12-21 11:12:08 +01:00
Paweł Chmielowski
bc063b8f97
Fix crash when api_permisions don't have who: section
...
Default value of that field was wrong, so lets correct this.
This fixes issue #3957
2022-12-15 11:27:20 +01:00
Badlop
03681cd68d
Expose the pubsub#type field in disco#info query to the node ( #3914 )
2022-12-13 23:57:34 +01:00
Badlop
fe8b98a1f3
When using erlef, Erlang/OTP 21 is only available in ubuntu 20.04
...
See
https://github.com/erlef/setup-beam#compatibility-between-operating-system-and-erlangotp
2022-12-13 23:57:31 +01:00
Badlop
a193128543
Fix path where gem is installed and fpm can be found
2022-12-13 23:24:01 +01:00
Badlop
6a10048339
Document the new log_modules_fully option
2022-12-13 23:24:01 +01:00
Badlop
9087dd9210
Improve .devcontainer to use use devcontainer image and .vscode
2022-12-13 23:24:01 +01:00
Badlop
a08c038c9c
Add .vscode files to instruct VSCode how to run ejabberd
2022-12-13 23:24:01 +01:00
Badlop
e191bc253d
Add Erlang LS default configuration
2022-12-13 23:24:01 +01:00
Badlop
c8d866d01a
Add Elvis default configuration
2022-12-13 23:24:01 +01:00
Badlop
01d25c5c37
Let setup-relive.sh normally end with no error status
2022-12-13 23:24:01 +01:00
Paweł Chmielowski
25d6b3d1c8
Fix dialyzer warnings
2022-12-07 14:08:23 +01:00
Paweł Chmielowski
639183a783
Add support for certificate authentication in mqtt bridge
2022-12-07 13:38:05 +01:00
Paweł Chmielowski
80477f71b3
Add misc:uri_parse/2 to allow declaring default ports for protocols
2022-12-07 13:34:29 +01:00
Paweł Chmielowski
d49b50a055
Add log_modules_fully option to make some modules log everything independed from global loglevel
2022-12-01 13:24:46 +01:00
Paweł Chmielowski
54592202ef
Allow admin command to subscribe new users to members_only rooms
2022-12-01 11:52:39 +01:00
Paweł Chmielowski
be60263d47
Fix dialyzer warnings in mod_mqtt_bridge
2022-11-24 16:23:37 +01:00
Badlop
441eca75b2
hibernation_time is not an option worth storing in room state ( #3946 )
2022-11-23 18:40:28 +01:00
Badlop
266dd98521
OAuth: Accept jid as a HTTP URL query argument
2022-11-23 18:40:26 +01:00
Badlop
b0e74464b1
OAuth: Handle when client is not identified
2022-11-23 18:40:23 +01:00
Badlop
daaaf221cb
Don't set i18n option because Converse enforces it instead of browser lang ( #3951 )
2022-11-23 18:39:49 +01:00
Paweł Chmielowski
e2779e1155
Try to redirect access to files mod_conversejs to cdn when there is no local copies
2022-11-23 16:28:42 +01:00
Paweł Chmielowski
514bab47a2
Add hook for mqtt publish event
2022-11-23 15:16:43 +01:00
Paweł Chmielowski
fbea49dbab
Add mqtt bridge module
2022-11-23 14:50:18 +01:00
chengshq
5cf9b052dd
Jid format when `multicastc` was cached ( #3950 )
...
The error log:
```2022-11-22 04:10:25.436648+00:00 [error] <0.515.0>@ejabberd_router:route/1:95 Failed to route packet:
#message{
id = <<>>,type = normal,lang = <<>>,
from =
#jid{
user = <<"a123">>,server = <<"conference.example.com">>,
resource = <<>>,luser = <<"a123">>,
lserver = <<"conference.example.com">>,lresource = <<>>},
to = <<"multicast.app.example.com">>,subject = [],body = [],
thread = undefined,
sub_els =
[#ps_event{
items =
#ps_items{
xmlns = <<>>,
node = <<"urn:xmpp:mucsub:nodes:subscribers">>,
items =
[#ps_item{
xmlns = <<>>,id = <<"5803948964051348597">>,
sub_els =
[#muc_subscribe{
nick = <<"bb">>,password = <<>>,
jid = undefined,events = []}],
node = <<>>,publisher = <<>>}],
max_items = undefined,subid = <<>>,retract = undefined},
purge = undefined,subscription = undefined,delete = undefined,
create = undefined,configuration = undefined},
#addresses{
list =
[#address{
type = bcc,
jid =
#jid{
user = <<"aaa">>,server = <<"app.example.com">>,
resource = <<>>,luser = <<"aaa">>,
lserver = <<"app.example.com">>,lresource = <<>>},
desc = <<>>,node = <<>>,delivered = undefined,
sub_els = []},
#address{
type = bcc,
jid =
#jid{
user = <<"bb">>,server = <<"app.example.com">>,
resource = <<>>,luser = <<"bb">>,
lserver = <<"app.example.com">>,lresource = <<>>},
desc = <<>>,node = <<>>,delivered = undefined,
sub_els = []}]}],
meta = #{}}
** exception error: {badrecord,jid}
in function ejabberd_router:do_route/1 (src/ejabberd_router.erl, line 394)
in call from ejabberd_router:route/1 (src/ejabberd_router.erl, line 92)
in call from maps:fold_1/3 (maps.erl, line 232)
in call from mod_multicast:handle_info/2 (src/mod_multicast.erl, line 206)
in call from gen_server:try_dispatch/4 (gen_server.erl, line 637)
in call from gen_server:handle_msg/6 (gen_server.erl, line 711)
in call from proc_lib:init_p_do_apply/3 (proc_lib.erl, line 249)```
Then command debug select the multicastc:
```
(ejabberd@localhost)2> mnesia:dirty_read(multicastc, <<"app.example.com">>).
[{multicastc,<<"app.example.com">>,
{{multicast_supported,<<"multicast.app.example.com">>,
{limits,{default,20},{default,20}}},
cached},
63836303692}]```
The type of `Service` was binary.
2022-11-22 12:11:31 +01:00
Holger Weiss
3b50cd36ba
Merge remote-tracking branch 'processone/pr/3945'
...
* processone/pr/3945:
make-binaries: reduce log output
make-binaries: Bump zlib version to 1.2.13
2022-11-16 16:20:10 +01:00
Stu Tomlinson
ed678f58d3
make-binaries: reduce log output
...
Reduce log output from make-binaries:
- quieter curl downloads
- quiet build of crosstool-ng
- disable crosstool-ng progress bar
2022-11-16 13:41:57 +00:00
Stu Tomlinson
aa8d800577
make-binaries: Bump zlib version to 1.2.13
...
Update zlib to 1.2.13 to address CVE-2022-37434
Also change zlib download to use archive URL so builds do not fail
when specified version is no longer the current version
2022-11-16 13:41:42 +00:00
Stu Tomlinson
a1cfae8c98
pgsql: do not set standard_conforming_strings to 'off' ( #3944 )
...
Since f9120f75b0
string literals use escape string syntax (E'...') on
pgsql, so it is no longer necessary to set standard_conforming_strings
to 'off'
Fixes #3932
2022-11-16 13:58:30 +01:00
Badlop
c6513fcfc6
Handle mnesia_system_event mnesia_up when other node joins this ( #3842 )
2022-11-14 18:45:20 +01:00
Badlop
d3d50b456e
Fix compilation warnings with Elixir 1.14
...
warning: missing parentheses for expression following "do:" keyword.
Parentheses are required to solve ambiguity inside keywords.
2022-11-14 18:45:20 +01:00
Badlop
196eca2dc4
Runtime: Add Elixir 1.14 to the test matrix
2022-11-14 18:45:17 +01:00
Paweł Chmielowski
6fcfe80a65
Pass ssl options to mysql driver
2022-11-14 11:19:51 +01:00
Paweł Chmielowski
992d998695
Silent warning in OTP24 about not specified cacerts in sql connections
2022-11-14 11:18:26 +01:00
Badlop
e58920b2c6
Container: Update link to the local example of CTL_ON_CREATE usage
2022-11-07 22:38:55 +01:00
Badlop
0804f46095
Container: Add Composer Examples section
2022-11-07 22:19:40 +01:00
Badlop
662d9a0ed0
Container: Raise sections levels to improve legibility in GitHub web TOC
2022-11-07 22:19:22 +01:00
Badlop
d957404adc
Add link in README to the ProcessOne Downloads page
2022-11-07 18:56:53 +01:00
Badlop
779c98e314
Add link to ejabberd page at xmpp.org, which displays protocols from DOAP
2022-11-07 18:56:51 +01:00
Badlop
8de270cdaf
Run "make doap"
2022-11-07 18:56:46 +01:00
Badlop
b71a481e63
Add details about XEP implementations to some protocol attributes
2022-11-07 18:56:46 +01:00
Badlop
5a5e5bbdc6
Support extended protocol attribute ( #3915 )
2022-11-07 18:56:46 +01:00
Badlop
3b3d3eaa04
Run "make doap" to update ejabberd's DOAP file
2022-11-07 11:13:31 +01:00
Daniel Brötzmann
811fea14d8
Fix DOAP file logo namespace
2022-11-07 11:12:10 +01:00
Badlop
9794b4f778
Commit the generated DOAP file
2022-11-04 16:17:40 +01:00
Badlop
b73a9234d9
Add some missing RFCs and remove problematic leading 0 in xep versions
2022-11-04 16:17:39 +01:00
Badlop
c9b3d32031
Add DOAP script to Makefile
2022-11-04 16:17:37 +01:00
Badlop
4542bcb57f
New script to generate DOAP file
2022-11-04 16:17:35 +01:00
Badlop
1072f593f1
Ignore /doc, generated by tools/check_xep_versions.sh
2022-11-04 16:17:33 +01:00
duritong
122af79207
move spool dir to make it fully configurable per ejabberdctl.cfg ( #3863 )
...
In the packaged rpm the spool dir is set to:
```
: "${SPOOL_DIR:="/opt/ejabberd/database/$ERLANG_NODE"}"
```
However, `$ERLANG_NODE` is effectively set later (now in line 67), which effectively makes spool dir always in `...../ejabberd@localhost`
2022-10-26 14:02:42 +02:00
Badlop
2ef71a6684
Annotate captcha_cmd option, run make options, update man
2022-10-25 12:11:24 +02:00
Paweł Chmielowski
bb22f574fe
Bump version
2022-10-25 10:35:00 +02:00
Badlop
2e623a7f20
Update German translation (thanks to nautilusx)"
2022-10-24 13:09:23 +02:00
Badlop
8ea7690fc5
Support @VERSION@ and @SEMVER@ in captcha_cmd option
2022-10-24 12:35:30 +02:00
Paweł Chmielowski
a80717ed0e
Update changelog
2022-10-18 18:59:28 +02:00
Holger Weiß
13d4787ea9
Bump default 's2s_timeout' value ( #3653 )
...
Wait for an hour before closing an idle s2s connection.
It's not uncommon for a connection to be idle for longer than ten
minutes but less than an hour. For example, XEP-0410 suggests a ping
interval of fifteen minutes. A longer idle timeout avoids the latency
and log entries associated with constantly re-establishing such
connections.
Co-authored-by: Paweł Chmielowski <pawel@process-one.net>
2022-10-18 16:08:16 +02:00
Frank
28b3134098
fix table creation on a running cluster ( #3913 )
2022-10-18 15:38:55 +02:00
Badlop
d2f79e268e
Update Portuguese (Brazil) translation (thanks to Wellington Terumi Uemura)
2022-10-12 17:09:49 +02:00
Badlop
b529f72d8f
Update Chinese (Simplified) translation (thanks to Eric)
2022-10-12 14:11:39 +02:00
Paweł Chmielowski
c4d834b879
Update deps
2022-10-12 12:44:36 +02:00
Badlop
67094ca065
Update Catalan and Spanish translations
2022-10-12 12:06:30 +02:00
Badlop
d29fdc4d2e
Remove unnecessary text string
2022-10-12 12:06:28 +02:00
Badlop
7be52065dd
Update Chinese (Simplified) translation (thanks to Eric)
2022-10-12 12:06:26 +02:00
Badlop
582a245cc7
Update Ukrainian translation (thanks to Artem)
2022-10-12 12:06:24 +02:00
Badlop
4e4c696730
Update Russian translation (thanks to AHOHNMYC)
2022-10-12 12:06:22 +02:00
Badlop
1942f1b370
Update Portuguese (Brazil) translation (thanks to Wellington Terumi Uemura)
2022-10-12 12:06:21 +02:00
Badlop
b14b84744a
Update French translation (thanks to Maxime Leroy)
2022-10-12 12:06:20 +02:00
Badlop
d34274549c
Update Spanish translation (thanks to Eduardo Malaspina)
2022-10-12 12:06:18 +02:00
Badlop
28fb992947
Update German translation (thanks to nautilusx)
2022-10-12 12:06:16 +02:00
Badlop
83150e0b76
Update Catalan translation (thanks to Maite Guix)
2022-10-12 12:06:15 +02:00
Badlop
1e24ad817c
Update man page
2022-10-12 12:06:13 +02:00
Badlop
77f9254f45
Handle case that module exports mod_doc, but nothing in it
2022-10-12 12:06:11 +02:00
Badlop
77dacf92d2
Annotate new options
2022-10-12 12:06:09 +02:00
Paweł Chmielowski
c99ff6059f
Fix cache invalidation in shared roster
...
Doing srg_get_info for not existing group, then srg_create, will make
srg_add_user fail because it will get info that group doesn't exist from
cache.
2022-09-28 18:28:24 +02:00
Holger Weiss
e4c20aa674
make-binaries: Bump Expat and libpng versions
2022-09-23 13:46:19 +02:00
Holger Weiss
403dc41b5f
make-binaries: Fix GitHub release version checks
...
Adapt to changes to GitHub release pages.
2022-09-23 13:45:09 +02:00
Paweł Chmielowski
4a22604701
Export mod_muc_admin:get_room_pid/2
2022-09-22 11:11:02 +02:00
Paweł Chmielowski
09b33e17a6
Update mysql
2022-09-22 11:09:12 +02:00
Badlop
796f567db1
The archive_msg export fun requires MUC Service for room archives
2022-09-16 16:35:00 +02:00
Badlop
2229e4c6db
Allow MUC service admins to bypass max_user_conferences limitation
2022-09-16 16:34:58 +02:00
Badlop
fac74f623e
Remove unused macro definitions detected by rebar3_hank
...
?OFFLINE_TABLE_LOCK_THRESHOLD is unused:
definition and usage added in 4103f30812
definition copied, and usage moved to mod_offline_mnesia, in 901d2e0aed
definition and usage removed in mod_offline_mnesia in d88e4d495f
this definition looks useless
?VERSION_MULTICAST is unused:
added in 0cf8d1fa6e
it was never used
?DISCO_QUERY_TIMEOUT is unused:
added in 0cf8d1fa6e
it was never used
?FEATURE/1 is unused:
added in 0cf8d1fa6e
usage removed in bc33a3873d
?DEFAULT_MAX_USERS_PRESENCE is unused:
added in f817762cc4
usage removed in ba2b650464
?CT_XML is unused:
added in 46568fb959
removed in 3dc55c6d47
2022-09-16 16:34:56 +02:00
Badlop
cde8c8ce7d
Remove unused header files which content is already in xmpp library
2022-09-16 16:34:53 +02:00
Holger Weiss
9e9904c79d
Merge remote-tracking branch 'processone/pr/3905'
...
* processone/pr/3905:
Adapt to change of mix_annotate type to boolean in roster_query
Adapt to renaming of 'participant-id' from mix_roster_channel record
Update xmpp module
2022-09-16 12:39:13 +02:00
Linus Jahn
14882342be
Adapt to change of mix_annotate type to boolean in roster_query
2022-09-16 12:29:51 +02:00
Linus Jahn
eeed1ca87f
Adapt to renaming of 'participant-id' from mix_roster_channel record
2022-09-16 12:29:50 +02:00
Linus Jahn
e22d496610
Update xmpp module
2022-09-16 12:29:29 +02:00
Badlop
5ee1dc9e8d
Container: Support ERL_DIST_PORT
2022-09-13 17:55:17 +02:00
Badlop
30f1e28468
Support ERL_DIST_PORT option to work without epmd
...
Please note:
- Erlang/OTP 23.1 or higher is required to use ERL_DIST_PORT
- "make relive" doesn't support ERL_DIST_PORT, neither rebar3 nor elixir
- "make install" doesn't work with Elixir since at least ejabberd 21.07
Reference:
https://www.erlang.org/blog/otp-23-highlights/
https://blog.erlware.org/epmdlessless/
2022-09-13 17:55:15 +02:00
Badlop
4664358176
Ignore .ejabberd-modules/ , may be used when building container
2022-09-13 17:55:14 +02:00
Badlop
a564707da4
Container: Get ejabberd-contrib sources to include them
2022-09-13 17:55:12 +02:00
Badlop
d0bc83147a
Container: Copy .ejabberd-modules directory if available
2022-09-13 17:55:11 +02:00
Badlop
a8121cd7e5
Don't persist 'none' role (thanks to Blake Miller)( #3330 )
2022-09-13 17:55:09 +02:00
Badlop
4d3875f4ff
Store role, and use it when joining a moderated room ( #3330 )
2022-09-13 17:55:03 +02:00
Holger Weiss
add55e1947
make-binaries: Bump Erlang/OTP version to 24.3.4.5
2022-09-13 14:25:13 +02:00
Holger Weiss
95ce3888f6
Merge remote-tracking branch 'processone/pr/3904'
...
* processone/pr/3904:
make-binaries: Bump dependency versions
2022-09-13 11:53:04 +02:00
Stu Tomlinson
5bb4731bc1
make-binaries: Bump dependency versions
2022-09-13 08:37:46 +01:00
Holger Weiss
b017207ac1
mod_admin_extra: Handle empty roster group names
...
Don't let 'add_rosteritem' create a roster group with an empty name.
Thanks to Licaon_Kter for reporting the issue.
2022-09-09 18:27:49 +02:00
Badlop
3312eaa51d
Add more examples of podman usage
2022-09-07 14:00:42 +02:00
Badlop
fe2fd776ef
Update CONTAINER example calls to recent changes
2022-09-07 13:59:31 +02:00
Badlop
c496baaf87
Container: Don't complain if the bin/ directory already exists
2022-09-07 13:59:20 +02:00
Badlop
14cced0bad
Container: No need to search for the ejabberdctl binary
2022-09-07 13:58:56 +02:00
Badlop
17a5835143
Simplify recent commit (thanks to Simon Lipp)( #3894 )
2022-09-07 13:57:12 +02:00
Roman Hargrave
f542a82309
feat: do not clone repo inside container build
2022-09-07 10:57:55 +02:00
Badlop
42e384beb7
Fix unix socket support for ejabberd_http (thanks to Simon Lipp)( #3894 )
2022-09-06 13:34:01 +02:00
Badlop
9a3ba9d76f
Update Github Action workflows: Ubuntu 18 is deprecated and 22 is added
...
CI:
- Update Ubuntu to 20.04, the lowest available starting in April 2023 [1]
- Don't test 19.3, as it isn't available in Ubuntu 20.04
- Use OTP 25 for Shellcheck, Coveralls, ECIL page
- Use erlef instead of ErlGang, supports better old erlangs in new ubuntus
- Remove support for rebar2 testing, as that's done in Runtime
CI-19.3:
- Add a temporary workflow for testing ejabberd with OTP 19.3
Container and Runtime:
- Update Ubuntu to latest (22.04)
[1] https://github.com/actions/runner-images/issues/6002
https://github.com/ErlGang/setup-erlang
https://github.com/erlef/setup-beam
2022-09-06 13:33:58 +02:00
Paweł Chmielowski
f624b14636
Add function for getting room diagnostics
2022-09-01 13:37:48 +02:00
Badlop
aaf391b284
Catch all errors from jose_jwt:verify and log debugging details ( #3890 )
2022-09-01 13:02:56 +02:00
Badlop
808def7d32
The #roster_item.ask allowed values are subscribe|undefined
2022-09-01 13:02:54 +02:00
Badlop
4ae06f039d
Add definition to detect OTP older than 25, used by ejabberd_auth_http
2022-09-01 13:02:52 +02:00
Badlop
7a1ca4b203
mod_host_meta: Complain at start if listener is not encrypted
2022-09-01 13:02:49 +02:00
Holger Weiss
63caa369be
mod_pubsub: Don't crash on command failures
...
Handle 'delete_old_items' and 'delete_expired_items' errors gracefully.
2022-08-31 18:10:22 +02:00
Paweł Chmielowski
fba651822d
Handle invalid values in X-Forwarded-For header more gracefuly
2022-08-29 11:26:31 +02:00
Paweł Chmielowski
cfc8746d29
Update roster_get hook in mod_shared_roster_ldap to use #roster_item{}
2022-08-24 11:14:32 +02:00
Paweł Chmielowski
a9e85674b8
Fix mucsub unsubscribe notification payload to have muc_unsubcribe in it
...
...instead of muc_subscribe
2022-08-24 10:30:02 +02:00
Holger Weiss
bce429dc44
make-packages: Fix permissions on RPM systems
...
RPM resets ownership/permissions of /opt/ejabberd and its subdirectories
on installation. Therefore, fix those in the "after-install" script.
2022-08-21 15:48:28 +02:00
Jonah Brüchert
9a8a843724
Fix filter_nodes
...
The previous implementation always returned an empty list while testing
it. However I don't really understand why that happened. The list
comprehension based one works, although it looks equivalent to me.
2022-08-17 16:37:20 +02:00
Jonah Brüchert
0faf34b26d
Parse sub elements of the mix join remote result
2022-08-17 16:37:20 +02:00
Jonah Brüchert
b1e6e408f8
mod_mix: Return user jid on join
2022-08-17 16:37:20 +02:00
Linus Jahn
4a52b73a17
mod_shared_roster: Fix wrong hook type #roster{} (now #roster_item{})
...
The hook type was changed from #roster{} to #roster_item{} by me in the
recent MIX changes. Unfortunately I've overseen this one (and unit tests
+ dialyzer passed).
2022-08-12 17:07:28 +02:00
Linus Jahn
b0526cd903
mod_mix, mod_mix_pam: Add new MIX namespaces to disco features
2022-08-12 10:53:53 +02:00
Jonah Brüchert
648245e974
mod_mix, mod_mix_pam: Add handling of IQs with newer MIX namespaces
...
Supported are mix:core:{0,1} and mix:pam:{0,2}
2022-08-12 10:53:53 +02:00
Linus Jahn
d6b72f1c5d
mod_roster: Change hook type from #roster{} to #roster_item{}
...
The problem with #roster{} is that every new record entry is also stored
in the mnesia roster table. Adding the mix_participant_id there makes
no sense because the normal roster items are no MIX channels. Using
\#roster_item{} for the hook and #roster{} for storing the normal items
seems to be a better idea.
2022-08-11 12:45:20 +02:00
Linus Jahn
d450d40178
mod_roster: Respect MIX <annotate/> setting
...
MIX extensions are not sent to clients if they haven't been enabled by
the client with <annotate/> in the roster get request.
2022-08-11 12:45:20 +02:00
Linus Jahn
3bf0892c74
mod_mix_pam: Do roster pushes on join/leave
...
Before the channels were added/removed from the database but the
clients were not notified of it.
2022-08-11 12:45:20 +02:00
Linus Jahn
7564a4e953
mod_mix_pam: Provide MIX channels as roster entries via hook
2022-08-11 12:45:20 +02:00
Holger Weiss
e858738736
ejabberd_listener: Let module take over socket
...
For some use cases, it may be necessary to allow a module to take over
socket ownership during initialization.
2022-08-10 18:28:35 +02:00
Badlop
c2cd592eff
Update documentation to reflect the GHCR image usage
2022-08-08 12:31:18 +02:00
Badlop
f080aa5fd9
Apply the minimal changes required to use the GHCR image
2022-08-08 12:31:16 +02:00
Badlop
682c258760
Copy ejabberd-docker-install.bat from docker-ejabberd git and rename it
2022-08-08 12:31:14 +02:00
Badlop
7d8fa3c880
ext_mod: Support managing remote nodes in the cluster
2022-08-05 16:15:05 +02:00
Badlop
72944d895b
ext_mod: Handle correctly when COMMIT.json not found
2022-08-05 16:15:03 +02:00
Badlop
00e6b0c97c
Show allow_query_users room option in disco info ( #3830 )
2022-08-04 12:28:15 +02:00
Badlop
a798a21386
CI: Remove syntax_tools from applications, as fast_xml fails Dialyzer
2022-08-04 12:05:46 +02:00
Mark Zealey
555ff2db4c
Add log_burst_limit_* options ( #3865 )
...
* Add log_burst_limit_* options
On our ejabberd deployment we were sometimes seeing more than 500
msgs/sec of legitimate traffic, however this was getting silently
dropped. Provide config options to enable this limit to be configured
from the config file.
* Pass new logging vars in via ejabberdctl
2022-08-01 12:07:54 +02:00
Paweł Chmielowski
9b647a7afe
Skip connection exit message when we triggered reconnection
2022-07-28 19:25:17 +02:00
Paweł Chmielowski
2b3644c8ac
Handle errors reported from begin/commit inside transaction
2022-07-28 19:24:28 +02:00
Paweł Chmielowski
3d329c7e8f
Make connection close errors bubble up from inside sql transaction
2022-07-28 13:17:35 +02:00
Badlop
1ea53bf940
Add syntax_tools to applications, required when using ejabberd_sql_pt ( #3869 )
2022-07-27 15:16:52 +02:00
Badlop
bc8050eb03
Don't bother with COMMIT.json user-friendly feature in automated user case
2022-07-27 15:16:51 +02:00
Badlop
a38ed7fb2c
Handle not found COMMIT.json, for example in GH Actions
2022-07-27 15:16:49 +02:00
Badlop
033656d70e
Add WebAdmin page for managing external modules
2022-07-26 15:42:13 +02:00
Badlop
853f35c706
Remove nginx and libgd3, so the proper versions can be installed
2022-07-26 15:42:13 +02:00
Paweł Chmielowski
7b944444ce
Catch mysql connection being close earlier
2022-07-19 14:35:35 +02:00
Paweł Chmielowski
73167ef1bd
Make first sql reconnect wait shorter time
2022-07-19 14:32:47 +02:00
Paweł Chmielowski
43f36205bd
React to sql driver process exit earlier
...
If there are queued request when connection closes we may try to process
those requests (by trying to send them to already terminated db process,
and waiting until we hit timeout) before we see that driver is not longer
alive. This change adds check for driver exit before we process next
queued sql request, and immediately switch to connection state if we have
one.
2022-07-15 13:51:30 +02:00
Alexey Shchepin
99d9e315a3
Don't set affiliation to 'none' if it's already 'none' in mod_muc_room:process_item_change/3
2022-07-01 09:39:37 +03:00
Linus Jahn
e10c67a74a
mod_mix_pam: Display joined channels on webadmin page
2022-06-28 22:15:04 +02:00
Paweł Chmielowski
991d52f019
Fix error reporting in 'make options' on OTP24+
2022-06-24 11:36:54 +02:00
Paweł Chmielowski
06147deccd
Don't register listeners that failed to start in config reload
...
This should alleviate some issues in #3850
2022-06-21 11:09:37 +02:00
Paweł Chmielowski
46c947bc76
Define batch delete function types in coresponding behaviours
2022-06-17 10:35:02 +02:00
Paweł Chmielowski
a2efde185a
Fix mam delete_old_messages_batch for sql backend
...
Too much copy/paste from spool equivalent...
2022-06-17 10:22:57 +02:00
Badlop
382c3836af
Runtime: Add Xref options to be as strict as CI
2022-06-12 13:08:29 +02:00
Badlop
6d39af7dd6
Runtime: No need for a specific mix erlang 25 job
2022-06-12 13:08:27 +02:00
Badlop
a30d8c718f
Update workflows to Erlang 25
2022-06-12 13:08:24 +02:00
Paweł Chmielowski
a89b1f332d
Use INSERT ... ON DUPLICATE KEY UPDATE for upsert on mysql
...
This can be used for all upsert expressions (where REPLACE INTO used
previously were only possible to use for subset of queries), and may
potentially help with deadlocks reported by mysql when we issues multiple
querier for same key in quick succession.
2022-06-10 16:25:50 +02:00
Badlop
a6101cc26d
Container: Set a less frequent healthcheck to reduce CPU usage ( #3826 )
2022-06-09 12:34:44 +02:00
Badlop
06a2b1c671
Container: Support to pass a fork repository as argument
2022-06-09 11:57:49 +02:00
Badlop
8d94ae4cb0
Container: Fix build instructions
2022-06-09 11:41:34 +02:00
Holger Weiss
fbf43f2a31
make-binaries: Include CAPTCHA script with release
2022-05-28 15:00:25 +02:00
Holger Weiss
b4c78336a6
make-binaries: Edit rebar.config more carefully
...
Don't break the (currently nonexistent) case where a dependency's
rebar.config file specifies LDFLAGS before and after "-lstdc++", such as
"-lfoo -lstdc++ -lbar".
2022-05-28 10:21:43 +02:00
Holger Weiss
c1ee86e85c
make-binaries: Fix linking of EIMP dependencies
...
Avoid linker errors such as the following when using GCC 10 or newer:
| multiple definition of `gdImageCreateFromJpegPtr'
See: https://gcc.gnu.org/gcc-10/porting_to.html
Fixes #3514 .
2022-05-25 20:37:37 +02:00
Badlop
5a2e58e066
Fix regression on stop_ping in clustering context (thanks to fdie)( #3817 )
2022-05-23 16:52:27 +02:00
Badlop
0e25f8d43e
Fix mod_conversejs crash when mod_register not enabled ( #3824 )
2022-05-23 16:49:35 +02:00
Badlop
75ffce0417
configure also when running "make update", which is similar to "make deps"
2022-05-23 16:49:19 +02:00
Badlop
34e1ddb66f
Update "make help" with recent changes
2022-05-23 13:58:50 +02:00
Badlop
26e6bb4a17
Use "make deps", which performs additional steps ( #3823 )
2022-05-23 13:58:41 +02:00
Badlop
7850ce0ec8
Ensure deps configuration is ran when getting deps ( #3823 )
2022-05-23 13:58:33 +02:00
Badlop
7d16907296
Configure eimp with mix to detect image convert properly ( #3823 )
2022-05-23 13:58:08 +02:00
Badlop
ddc457060b
Improve "make clean" and "distclean"
2022-05-23 13:57:17 +02:00
Badlop
93f994d50a
Generate start scripts in "make all", not in "make install" ( #3821 )
2022-05-23 13:57:06 +02:00
Paweł Chmielowski
75a771bfec
Don't leak DESTDIR in files copied by 'make install'
...
This fixes issue #3819
2022-05-19 12:20:58 +02:00
Holger Weiss
e6c1bf9c9a
make-binaries: Adjust Mnesia spool directory path
...
Adjust the default Mnesia directory for compatibility with older binary
packages.
Closes #3818 .
2022-05-18 17:08:05 +02:00
Holger Weiss
cac31f9325
make-packages: Include systemd unit with RPM
...
Don't forget to include the /etc/systemd/system/ejabberd.service unit
with the RPM package.
Closes #3816 .
2022-05-18 10:20:34 +02:00
Paweł Chmielowski
99064548e8
Fix parsing of scram password from prosody
...
Looks like parsed integer no longer are convered to floats on erlang side,
so let's make check for them less restrictive.
2022-05-17 13:21:30 +02:00
Holger Weiss
553a1ccadf
Merge remote-tracking branch 'processone/pr/3813'
...
* processone/pr/3813:
make-installers: Support non-root installation
make-installers: Override code on upgrade
make-installers: Apply cosmetic changes
2022-05-17 12:44:34 +02:00
Holger Weiss
621445e096
make-installers: Support non-root installation
...
If the installer is invoked without superuser privileges, warn the user,
ask for the installation prefix, and perform a local installation on
confirmation.
2022-05-17 12:40:12 +02:00
Licaon_Kter
432e97296c
Fix typos in changelog
2022-05-17 11:45:57 +02:00
Badlop
4f8e6fe844
Fix errors and warnings for "rebar3 edoc"
2022-05-17 10:42:02 +02:00
Badlop
01b791c0fa
Define license for hex.pm using SPDX identifier
...
Until now, when publishing package to hex.pm, it complained:
> The following licenses are not recognized by SPDX:
> * GPLv2
> Consider using licenses from https://spdx.org/licenses
2022-05-17 10:42:00 +02:00
Badlop
dde096515d
Update mix.lock with ex_doc
2022-05-17 10:41:59 +02:00
Badlop
78e97f3605
ex_doc is required to publish docs to hex.pm
...
Revert "Let's assume ex_doc is no longer needed"
This reverts commit 2f92dc40df
.
2022-05-17 10:41:57 +02:00
Badlop
6c9f97d7cc
Update README.md, the installers are now in GitHub Releases
2022-05-17 10:41:56 +02:00
Badlop
861347e911
CHANGELOG: Update to 22.05 version
2022-05-17 10:41:53 +02:00
Holger Weiss
c54fe5b29e
make-installers: Override code on upgrade
...
Use tar's --skip-old-files option for the data directory (/opt/ejabberd)
only. Files in the code directory (/opt/ejabberd-$version) should be
overridden on upgrade.
2022-05-16 00:45:01 +02:00
Holger Weiss
6d93d49c6c
make-installers: Apply cosmetic changes
2022-05-16 00:13:43 +02:00
Holger Weiss
8addf96f9e
make-binaries: Bump dependency versions
2022-05-12 01:02:33 +02:00
Paweł Chmielowski
a916d94000
Pass room state to muc_{un}subscribed hook
2022-05-09 17:32:34 +02:00
Paweł Chmielowski
ed7fc956d5
Allow muc_{un}subscribe hooks to modify sent packets
2022-05-09 16:34:27 +02:00
Badlop
024ad02169
Revert "Temporary workaround to provide a 22.05 tagged container"
...
This reverts commit 3449621ccc
.
2022-05-06 17:58:58 +02:00
Badlop
3449621ccc
Temporary workaround to provide a 22.05 tagged container
2022-05-06 17:30:26 +02:00
Badlop
e5782a519a
Use alternate method to get priv/ path when copying captcha scripts
2022-05-06 17:30:24 +02:00
Badlop
fbeaa2e03a
Remove dependabot because it gets fired in forks too
2022-05-06 17:30:21 +02:00
Jérôme Sautret
d0452e3bef
Update version to 22.05
2022-05-06 15:12:22 +02:00
Holger Weiss
ec36dd7ba1
make-binaries: Bump SQLite and ODBC versions
2022-05-06 14:03:11 +02:00
Paweł Chmielowski
84d8c156a0
Fix spec
2022-05-06 10:15:23 +02:00
Paweł Chmielowski
c7ab3274c5
Return userinfo from misc:uri_parse
2022-05-06 10:14:50 +02:00
Paweł Chmielowski
3d4f2d365f
Have consistent schema type in misc:uri_parse
2022-05-06 10:06:13 +02:00
Paweł Chmielowski
bc9e5c5363
Fix one more place where misc:uri_parse is used
2022-05-05 13:46:02 +02:00
Paweł Chmielowski
54a1fcc5e8
Improve misc:uri_parse
2022-05-05 13:07:03 +02:00
Badlop
c3d8c3d9c5
README: Improve badges, header, commercial links
2022-05-04 18:01:46 +02:00
Badlop
bdfa1b3403
Update man page
2022-05-04 18:01:46 +02:00
Badlop
aa190ca896
Run 'make options'
2022-05-04 18:01:46 +02:00
Badlop
49ecddc646
Dependabot: Detect updates in docker, actions and mix
2022-05-04 18:01:26 +02:00
Badlop
fad5406348
Container: Build containers also for linux/arm64
2022-05-04 18:00:58 +02:00
Badlop
30b3c6c908
Annotate options and commands recently added
2022-05-04 18:00:58 +02:00
Badlop
32dee33070
Run 'make translations' for all other languages
2022-05-04 16:26:32 +02:00
Badlop
59e1c5643f
Update Spanish and Catalan translations
2022-05-04 16:26:32 +02:00
Badlop
b253cc46d4
Update Chinese (simplified) (thanks to Erix and Yzqzss)
2022-05-04 16:26:27 +02:00
Badlop
09bdb055fb
Update Portuguese translation (thanks to Ssantos)
2022-05-04 16:26:27 +02:00
Badlop
449ac8f3e3
Update Portuguese (Brazil) (thanks to Wellington Terumi Uemura)
2022-05-04 16:26:22 +02:00
Badlop
28be716c5f
Update French translation (thanks to ButterflyOfFire)
2022-05-04 16:21:21 +02:00
Badlop
f250594738
Update German translation (thanks to Nautilusx)
2022-05-04 16:20:49 +02:00
Badlop
0fb7213e1a
New Arabic translation (thanks to Black)
2022-05-04 16:19:56 +02:00
Badlop
bb2cb19a5c
Move some content from README to new COMPILE and CONTAINER files
2022-05-04 02:39:30 +02:00
Badlop
6e4079586a
Installers: Add job to create draft release
2022-05-04 02:39:23 +02:00
Badlop
d0bca94638
Installers: update workflow name
2022-05-04 02:39:19 +02:00
Badlop
0302d1615b
Packages: Rename workflow file to Installers
2022-05-04 02:39:17 +02:00
Badlop
985fa24130
Apparently the --tags option is required to properly describe a brand new tag
2022-05-04 02:39:15 +02:00
Badlop
ba5b6133cd
Create uninstall.txt with instructions
2022-05-04 02:39:13 +02:00
Badlop
0964f9cbcd
Add help header to the installer help
2022-05-04 02:39:12 +02:00
Badlop
06e448b4d0
Once installed, show next steps
2022-05-04 02:39:10 +02:00
Badlop
b773bb4cd4
Add some blank lines to output
2022-05-04 02:39:07 +02:00
Holger Weiss
65437d08ef
make-binaries: Update to Crosstool-NG 1.25.0-RC2
...
Update Crosstool-NG to the current release candidate, and use much
shorter "defconfig" files for specifying the configuration.
2022-05-04 00:30:36 +02:00
Holger Weiss
87995a57de
Add GitHub Action to build binary packages
...
Publish DEB and RPM packages as well as binary installers for each
commit that modifies source code. This allows for testing development
code, and makes sure that problems with building binary packages are
noticed early on.
2022-05-04 00:30:36 +02:00
Holger Weiss
a7dc1de980
make-binaries: Try to avoid rebuilding deps
...
Don't rebuild external dependencies if all of them are up to date.
2022-05-04 00:30:36 +02:00
Holger Weiss
ce6f32906a
Import script for building command line installers
...
The tools/make-installers script creates command line installers for
Linux/x64 and Linux/arm64 systems using the archives built by the
tools/make-binaries script.
2022-05-04 00:30:36 +02:00
Holger Weiss
ef7470b503
Import script for building DEB and RPM packages
...
The tools/make-packages script creates DEB and RPM packages for
Linux/x64 and Linux/arm64 systems using the archives built by the
tools/make-binaries script.
2022-05-04 00:30:36 +02:00
Holger Weiss
853be230a8
Import script for building Linux binaries
...
The tools/make-binaries script creates self-contained OTP releases for
Linux/x64 and Linux/arm64 systems. All optional ejabberd features are
supported. Erlang/OTP, Elixir, and all dependencies are downloaded and
built from source (using crosstool-NG). The generated binaries depend
on glibc 2.17 or later, all other external libraries are linked
statically.
The script should work on any non-ancient Linux/x64 system and requires
just a few common development tools (to bootstrap crosstool-NG).
The release is installed by creating an "ejabberd" user, extracting the
archive into /opt, and moving the systemd unit (or init script) into
place.
2022-05-04 00:30:36 +02:00
Badlop
2739a52e0f
Update options configurable in default_room_options
2022-05-02 20:20:21 +02:00
Badlop
f1c422db8e
Runtime: Fix path of own workflow file
2022-05-02 20:20:21 +02:00
Badlop
011630f8b9
CI: The Binaries job will soon be unnecessary
2022-05-02 20:20:13 +02:00
Paweł Chmielowski
6f11210edd
Implement batch operations in mnesia backend
2022-05-02 15:05:55 +02:00
Paweł Chmielowski
ce18c93419
Simplify rules for choosing jiffy version
2022-05-02 13:56:16 +02:00
Paweł Chmielowski
f3f80f2f55
Update p1_pgsql in mix.lock
2022-05-02 13:41:44 +02:00
Paweł Chmielowski
cae86f62e6
Update esip in mix.lock
2022-05-02 13:37:40 +02:00
Badlop
ea4a365bf5
Container: New GitHub workflow to build and publish containers
2022-05-02 13:25:18 +02:00
Badlop
9c23a7dc3f
Container: When ERLANG_COOKIE is set, create cookie file; otherwise use -setcookie
2022-05-02 13:25:18 +02:00
Badlop
b0db87c683
Container: Experimental support CTL_ON_CREATE and CTL_ON_START environment variables
2022-05-02 13:25:18 +02:00
Badlop
200cea25c8
Container: Start BEAM with exec to maintain the PID and catch SIGTERM in Docker Stop
...
Until now, when stopping the ejabberd container, Erlang is not gracefully
closed, Mnesia is not properly closed... exit code is 137.
With this change, when the container is stopped, Erlang receives the
SIGTERM signal, shutsdown, Mnesia database is properly closed, ...
and exit code is 0.
2022-05-02 13:25:18 +02:00
Badlop
8d15e973e2
Container: Copy ejabberdctl.template, it requires some customizations
2022-05-02 13:25:01 +02:00
Badlop
493ee7f534
Container: New Dockerfile, more simple than the one in ejabberd/ecs
2022-05-02 13:23:57 +02:00
Badlop
d6de831381
Runtime: New workflow to test compilation, rel, starting and ejabberdctl
2022-05-02 13:20:52 +02:00
Badlop
5ece51f8da
CI: Update actions versions
2022-05-02 13:20:52 +02:00
Badlop
ca786e8102
CI: Update to the new "make rel" paths
2022-05-02 13:20:52 +02:00
Badlop
bde513d088
CI: For older erlang versions, get old rebars
2022-05-02 13:20:52 +02:00
Badlop
c5f9652019
CI: Update to test latest OTP 25.0-rc3
2022-05-02 13:20:52 +02:00
Badlop
5e2aca8138
Update rebar3 binary, works from Erlang/OTP 22 to 25
...
The old version was:
rebar 3.15.2
and it couldn't work with Erlang/OTP 25
This new version is
rebar 3.18.0
compiled from tag 3.18.0 from
https://github.com/erlang/rebar3
using erlang:22-slim docker image
To compile ejabberd using rebar3 and ancient Erlang 19.3-21.3,
you need a rebar3 binary compiled with an old Erlang.
If your operating system doesn't provide one, you can download
the old one included in ejabberd 21.12, available at:
https://github.com/processone/ejabberd/raw/21.12/rebar3
2022-05-02 13:20:52 +02:00
Badlop
12331768bc
Update rebar2 binary, works from Erlang/OTP 22 to 25
...
The old version was:
rebar 2.6.4 17 20170823_084242 git 2.6.4-27-g8076675-dirty
and it couldn't work with Erlang/OTP 25
This new version is
rebar 2.6.4 22 20220426_202500 git 2.6.4-39-gb6d3094
compiled from master branch from
https://github.com/rebar/rebar
using erlang:22-slim docker image
To compile ejabberd using rebar and ancient Erlang 19.3-21.3,
you need a rebar binary compiled with an old Erlang.
If your operating system doesn't provide one, you can download
the old one included in ejabberd 21.12, available at:
https://github.com/processone/ejabberd/raw/21.12/rebar
2022-05-02 13:20:52 +02:00
Badlop
7a1e0d4720
Fix 'make xref' when using Mix; notice it only checks Elixir files
2022-05-02 13:20:52 +02:00
Badlop
45c7fbb5ae
Switch "make rel" and "make dev" to paths: conf, database, logs
2022-05-02 13:17:53 +02:00
Badlop
a852c31c6c
Set default ejabberd version number when not using git
...
This is useful when the source code was downloaded from
https://github.com/processone/ejabberd/tags
2022-05-02 13:17:50 +02:00
Paweł Chmielowski
c8c4827626
Update hex deps
2022-05-02 13:06:40 +02:00
Paweł Chmielowski
4f33524842
Update deps
2022-05-02 12:50:08 +02:00
Holger Weiss
b5a76fb4de
mod_push: Keep push session ID on session resume
...
Don't forget the push session ID if the client resumes a stream
management session. This makes sure no push notifications are generated
for a connected client with a resumed stream management session.
Thanks to Thilo Molitor for spotting the issue.
2022-05-02 01:54:42 +02:00
Holger Weiss
c148ab4430
Adapt mod_push_keepalive to mod_push changes
...
Adjust mod_push_keepalive to work with the mod_push changes applied by
commit 11574f0a43
.
2022-05-01 17:51:07 +02:00
Holger Weiss
a30d5875ed
mod_push: Rename "timestamp" to "push session ID"
...
The fact that mod_push uses a timestamp as a push session ID is just an
implementation detail. Rename things accordingly to avoid confusion.
However, stick to "timestamp" in the storage modules, as it corresponds
to the database column names/types, there.
2022-05-01 15:49:22 +02:00
Holger Weiss
11574f0a43
mod_push: Fix notifications for pending sessions
...
Fix the problem that no push notifications were triggered in the case
where all of the following conditions applied:
- The XEP-0198 session has been resumed at least once.
- The XEP-0198 session is pending (i.e., the client is disconnected).
- The message wasn't stored in the user's MAM archive (e.g., because it
was of type "groupchat").
The problem was introduced in cd336369a5
.
Many thanks to Friedrich Altheide for reporting the issue and to Thilo
Molitor for his help with tracking it down.
2022-05-01 15:26:21 +02:00
Paweł Chmielowski
d65d04cc9a
Compile elixir_logger_backend only when lager is used
2022-04-29 12:35:16 +02:00
Paweł Chmielowski
881cc42168
Attach meta field with real jid to mucsub subscription events
2022-04-29 11:58:38 +02:00
Jérôme Sautret
69a5a22810
Delete ping timer if resource is gone after the ping has been sent
2022-04-28 14:54:41 +02:00
Paweł Chmielowski
b34291762a
Remove dialyzer warning
2022-04-28 10:18:29 +02:00
Paweł Chmielowski
6fd4315a0c
Guard agains erlang:system_info(logical_processors) not always returning number
2022-04-28 09:51:51 +02:00
Jérôme Sautret
f4959c8b28
Don't send ping if resource is gone
2022-04-26 18:56:38 +02:00
Badlop
f61f5beb5b
Copy include/ files for ejabberd, deps and otp, as "mix release" lacks that
2022-04-21 16:01:47 +02:00
Alexey Shchepin
74e86611ab
Stop empty MUC rooms 30 seconds after creation
2022-04-21 14:38:50 +03:00
Paweł Chmielowski
155261f78a
Fix dialyzer warning
2022-04-20 19:20:16 +02:00
Paweł Chmielowski
e59043db2c
Make oauth_revoke_token work with all backends
2022-04-20 19:07:52 +02:00
Badlop
87445bc74b
Clarify mod_offline's use_mam_for_storage option
2022-04-13 17:33:08 +02:00
Badlop
d8642fc7c2
Fix syntax of some commands' result_example
2022-04-13 17:33:04 +02:00
Badlop
19019bbe32
Add support for MUC room vCard in get_vcard commands
2022-04-12 13:35:55 +02:00
Badlop
10481ed895
mod_cron from ejabberd-contrib is another possible frontend to run commands
2022-04-11 17:04:53 +02:00
Paweł Chmielowski
feb2ad0664
Don't use floor - doesn't exist in R19
2022-04-08 18:27:58 +02:00
Paweł Chmielowski
5744d44e68
Fix compatibility with older mix versions
2022-04-08 18:26:07 +02:00
Paweł Chmielowski
0870f32c59
Add rate limited delete_old_messages
2022-04-08 17:48:53 +02:00
Paweł Chmielowski
b86fe14ef0
Add rate limited delete_old_mam_messages command
2022-04-08 17:23:42 +02:00
Licaon_Kter
6dbd1118a2
mod_conversejs example, use newer dark theme
...
ref: https://github.com/conversejs/converse.js/releases/tag/v9.1.0
2022-04-06 18:21:43 +02:00
Badlop
170ea134d6
Set Converse auth and register options based on ejabberd configuration
2022-04-06 11:11:21 +02:00
Badlop
b405a3b61e
Fix compilation with Erlang 19
2022-04-06 11:11:18 +02:00
badlop
e3ff868fcd
Merge pull request #3756 from pouriya/Add-Process-Hook-Tracing
...
Add process hook tracing
2022-04-06 11:10:57 +02:00
Holger Weiss
121fc716b0
domain_balancing: Allow for specifying 'type' only
...
Allow for specifying the 'type' of 'domain_balancing' without specifying
the 'component_number' (as per the example in the documentation). The
balancing 'type' is then applied to the dynamic number of component
instances.
2022-04-04 00:14:32 +02:00
Badlop
152956c194
Add more configuration examples
2022-04-01 12:04:08 +02:00
Badlop
6cdb517454
New conversejs_options to setup additional options for Converse
2022-04-01 12:04:07 +02:00
Badlop
94186a36d0
The *_url options now support 'auto'
2022-04-01 12:04:05 +02:00
Badlop
f461bcb597
Improved mod_conversejs to support @HOST@, auto and conversejs_resources
...
Changes:
- The options can use the @HOST@ keyword
- default_domain option is @HOST@ by default, not the first defined vhost
- New conversejs_resources option to serve converse.js files (no need for web server)
- conversejs_* now support 'auto', which uses local or remote Converse files
2022-04-01 12:04:03 +02:00
Badlop
8065ec831e
New mod_host_meta to serve host-meta files, see XEP-0156
2022-04-01 12:04:01 +02:00
Badlop
4c51f6e1fe
Check results when test with any OTP is not skipped
2022-04-01 12:03:51 +02:00
Badlop
f19219f5a0
Terminate ejabberd_sm before everything else to ensure sessions closing ( #3641 )
2022-03-25 12:53:25 +01:00
Badlop
0f73d3f4d1
Don't define restart and stop in ejabberd_ctl, use the corresponding commands
2022-03-25 12:51:27 +01:00
Badlop
91c9b0446c
Don't export password attribute when it's empty (it's invalid)( #3705 )
2022-03-25 12:51:24 +01:00
Simon Paitrault
68762146d7
Checking users is active in SM for JWT authenticated user ( #3795 )
...
Signed-off-by: Freyskeyd <simon.paitrault@gmail.com>
2022-03-24 17:03:50 +01:00
Alexey Shchepin
5506b838c8
Add TLS certificate authentication for MQTT connections
2022-03-14 15:41:01 +03:00
Holger Weiss
871e26a01e
mix.exs: Don't allow admins to override boot flags
...
Add the -boot and -boot_var options via ERLANG_OPTS rather than
ERL_OPTIONS. The difference is that administrators might override the
latter in the ejabberdctl.cfg file, which isn't desired as the boot
flags must be specified exactly that way in a Mix-generated release
(otherwise, ejabberd would fail to start up).
2022-03-10 16:29:32 +01:00
Badlop
ce8c2ca0fd
Add fine-grained Elixir version requirement
...
1.4 is accepted in general
1.10 is required to build OTP releases
1.11 is required to run 'make relive'
lower than 1.11.4 requires Erlang lower than 24 to build releases
2022-03-10 13:09:35 +01:00
Badlop
1e1b72572f
Add -boot and -boot_var in ejabberdctl instead of adding vm.args
2022-03-10 13:09:33 +01:00
Badlop
6afdf88e09
Update mix.lock, there are many unnecesary dependencies there
2022-03-10 13:09:30 +01:00
Badlop
2f92dc40df
Let's assume ex_doc is no longer needed
...
It was added in e6f72333
2022-03-10 13:09:28 +01:00
Badlop
a846260d6e
Update ejabberd to not use Distillery ( #3788 )
2022-03-10 13:09:24 +01:00
Stu Tomlinson
dca49f508f
Sync old-to-new schema script with reality ( #3790 )
...
Update the update_sql function to match current "new" sql schema
2022-03-08 13:56:27 +01:00
Paweł Chmielowski
3520869e36
Use correct timestamp when hibernation_time is not set at all
2022-03-07 17:38:04 +01:00
Alexey Shchepin
d5841785e1
Don't request the whole MUC room state in get_room_occupants_number command ( #3684 ) ( #1964 )
2022-03-07 08:42:42 +03:00
Badlop
f721374321
Determine compile definitions based on Erlang version
...
This gives a clear definition of what erlang versions require each
workaround, instead of depending on the actual workaround details.
The lib module was removed in OTP 21.0,
and the formatting options were moved to erl_error.
The uri_string module was introduced in OTP 21.0.
2022-02-24 21:39:20 +01:00
Badlop
7381b9db85
Fix bug introduced in 8d8a3177
( #3782 )
2022-02-24 21:39:14 +01:00
Badlop
305792f409
Test also with recent Erlang/OTP 25.0-rc1
2022-02-24 01:03:01 +01:00
Badlop
35b8a042b8
Update jiffy and p1_acme in mix.lock
2022-02-24 01:02:58 +01:00
Badlop
de8abc15a8
Use jiffy 1.1.0 when erlang < 20 because it doesn't have string:split/2
2022-02-24 01:02:55 +01:00
Badlop
265e0610a3
Update to jiffy 1.1.1 and p1_acme 1.0.18 to support Erlang/OTP 25.0-rc1
2022-02-24 01:02:53 +01:00
Badlop
231dfd776f
Support Erlang 25 in "make options": returns attribute with simpler syntax
...
This was introduced in Erlang/OTP 25.0-rc1
https://erlang.org/download/otp_src_25.0-rc1.readme
https://github.com/erlang/otp/pull/5509
OTP-17894 Application(s): syntax_tools
Related Id(s): PR-5509
The erl_syntax_lib:analyze_attribute/1 function would
return {Name, {Name, Value}} instead of {Name, Value}
(which is the documented return value).
2022-02-24 01:02:51 +01:00
Badlop
d4f288d3c6
Add link in mod_http_api documentation to the docs API section
2022-02-24 01:02:48 +01:00
Badlop
c407b73803
Fix WebSocket uppercase
2022-02-24 01:02:46 +01:00
Badlop
be0175fb70
Only care about CT results when CT are ran, and check fails
2022-02-24 01:02:44 +01:00
Badlop
22b469f55d
The lager dependency is used only with old Erlang versions
2022-02-24 01:02:41 +01:00
Holger Weiss
aad04bba91
mix.exs: Don't forget to include epam/luerl
...
If --enable-lua and/or --enable-pam was specified, include the
corresponding applications with Mix releases.
2022-02-21 00:34:02 +01:00
Holger Weiss
da516d64d4
mix.exs: Be more careful while editing the version
...
Make sure only leading zeroes are removed while turning the ejabberd
version into SemVer format for Mix. For example, remove the zero in
"21.04", but keep the zero in "21.12.102".
2022-02-21 00:02:31 +01:00
Holger Weiss
a6f0feb23b
ejabberdctl: Remove unused environment variable
...
The EJABBERD_DOC_PATH variable is no longer used (cf. commit
949e71efb6
).
2022-02-19 23:58:36 +01:00
Holger Weiss
7d7d08f980
mix.lock: Add missing dependencies
2022-02-19 23:53:16 +01:00
Paweł Chmielowski
2dc153751d
Put esip in mix included_applications only when it's enabled
2022-02-18 21:48:26 +01:00
Paweł Chmielowski
d4bf29e3ff
Improve compatibility with various db engine versions
2022-02-18 20:43:56 +01:00
Paweł Chmielowski
4247501dc6
Fix compilation on OTP < 21 and remove dialyzer warning
2022-02-18 17:21:22 +01:00
Paweł Chmielowski
b88fda9494
Fix sqlite schema
2022-02-18 16:24:34 +01:00
Paweł Chmielowski
f86055378d
Optimize room_unused_* commands
...
Previously to check if hibernated room was old enough we had to fetch info
about all rooms from database. Now we repurpose created_at field in sql
to store that info, that allow us to have more efficient query just for it.
2022-02-18 14:02:04 +01:00
Badlop
f20e9e9b66
Check producing and starting releases
2022-02-11 09:39:29 +01:00
Badlop
0ef2624b57
Provide proper path to the compiled libraries in relive's ejabberdctl
2022-02-11 09:39:28 +01:00
Badlop
b3211b1f71
Update copyright year to 2022
2022-02-11 09:39:25 +01:00
Badlop
f7c7d784c4
Detect debug option, and maybe disable debug_info
...
As explained in https://hexdocs.pm/mix/1.13.2/Mix.Tasks.Compile.Erlang.html
> The option :debug_info is always added to the end of it. You can disable that using:
> erlc_options: [debug_info: false]
2022-02-11 09:39:16 +01:00
Badlop
0b9263bc15
Add forgotten option NO_CUSTOMIZE_HOSTNAME_CHECK to mix.exs
2022-02-11 09:39:15 +01:00
Badlop
ba0d5e4dcf
Nowadays NEW_SQL_SCHEMA is only used to determine the default sql schema
2022-02-11 09:39:13 +01:00
Badlop
4d093ac03e
ejabberd_sql_pt got USE_NEW_SCHEMA in 78dfb83
and removed in e15595d
2022-02-11 09:39:11 +01:00
Badlop
e63e8a6d38
Fix typo introduced in 99fdba0
, present since 16.01
2022-02-11 09:39:09 +01:00
Badlop
37d2bdd90d
Some dependencies are optional, check them in mix.exs
2022-02-11 09:39:07 +01:00
Badlop
dda60fcf0d
Implement Get List of Registered/Online Users from XEP-0133
2022-02-11 09:39:05 +01:00
Badlop
9661d06334
Remove obsolete db_type defined environment
...
db_type as a compilation define was first introduced in 2006 in d0e2ac9
,
but was removed in 2015 in 25791cf
.
Nowadays: ./configure --enable-mssql will set {mssql, true} in vars.config;
That is read by ejabberd.app.src.script to set enabled_backends;
which is consulted by test/suite.erl to test only available backends.
2022-02-11 09:39:02 +01:00
Badlop
bdd1a129c0
Disable mssql in Actions: it's known mssql doesn't pass the tests
2022-02-03 20:10:01 +01:00
Badlop
965196a2e8
Ensure db_type default value is set when no mssql was defined. Fix typo
2022-02-03 19:17:16 +01:00
Badlop
a7912f5344
Fix configure when mssql option not set, and add it to --enable-all
2022-02-03 18:57:53 +01:00
Badlop
6279cac932
Reorganize and complete documentation of node start/debug commands
2022-02-03 18:21:55 +01:00
Badlop
25e0326f87
Improve explanation of s2s_access option. Add link to access_rules option
2022-02-03 18:21:53 +01:00
Badlop
c92478f7c2
Use the same wording in all the identical options db_type and ram_db_type
2022-02-03 18:21:51 +01:00
Badlop
3b30d5b0ed
Fix support for MSSQL testing
2022-02-03 18:21:49 +01:00
Badlop
adbccbe852
New "make relive" similar to "ejabberdctl live" without installing
...
Prepare with:
./autogen.sh && ./configure --with-rebar=./rebar3 && make
Or use this if you installed Elixir:
./autogen.sh && ./configure --with-rebar=mix && make
Start without installing (it recompiles when necessary):
make relive
It stores config, database and logs in _build/relive/
There's available the well-known script:
_build/relive/ejabberdctl
Please note this fails immediately:
r3:do(compile).
This crashes a few seconds later:
rebar3:run(["compile"]).
Workaround that works correctly:
ejabberd_admin:update().
2022-02-03 18:21:47 +01:00
Holger Weiss
67b5de05c7
mod_pubsub: Unsubscribe JID on whitelist removal
...
If a JID is removed from the affiliation lists of a node with access
model 'whitelist', remove it from the list of subscribers as well.
2022-02-02 22:35:28 +01:00
Paweł Chmielowski
11c725018b
Make dialyzer happy
2022-02-02 18:33:45 +01:00
Paweł Chmielowski
9542cca0db
One more place where we need to handle socket field not being available
2022-02-02 16:26:39 +01:00
Paweł Chmielowski
8824a912ef
Don't expect that socket will be available in c2s_terminated hook
...
For detached connection we free socket, so let's make code account for this
(and we really need it for printing debug informations).
This makes sure we call ejabberd_sm:close_session
2022-02-02 16:19:13 +01:00
Paweł Chmielowski
cae4fbb40b
Store all mucsub notifications not only message notifications
...
Previously we stored only message/subject change notifications, but if user
request also change notificaitons for affiliation/config/subscribers then
i don't see reason why we shouldn't store it as well.
2022-02-01 15:18:50 +01:00
Holger Weiss
52ac941034
mod_shared_roster: Adjust special group cache size
...
Let the size of the cache used for 'special' groups (such as @all@ or
@online@) depend on the number of virtual hosts, as the cache will
contain seperate entries per domain.
Thanks to Ingo Jrgensmann for reporting the issue.
2022-01-25 16:57:27 +01:00
Badlop
4579fd6ac7
Remove reference to the obsolete Vagrant environment
2022-01-25 13:46:27 +01:00
Badlop
7714046511
Run autoupdate to replace obsolete AC_HELP_STRING with AS_HELP_STRING
...
This change is required to work with autoconf 2.71 or higher,
and it works with autoconf 2.59 or higher.
2022-01-25 13:20:36 +01:00
Badlop
1b192987d2
Support MQTT subscriptions spread over the cluster ( #3750 )
2022-01-25 13:20:31 +01:00
Badlop
585afcbc77
Pass property name as expected in mqtt_codec (fixes login using MQTT 5)
2022-01-25 13:16:07 +01:00
badlop
78aa187067
Merge pull request #3757 from kianmeng/fix-typos
...
Fix typos
2022-01-25 13:13:10 +01:00
Kian-Meng Ang
adf0f87e99
Fix typos
2022-01-24 08:02:04 +08:00
Pouriya Jahanbakhsh
259876cb74
feat: event handling
...
run multiple event handlers
generate new events in timing event handlers
print human-readable times
output each callback time info is optional and by default is disabled
2022-01-22 18:17:11 +03:30
Pouriya Jahanbakhsh
20326e8908
feat: process hook tracing
2022-01-21 03:18:55 +03:30
Pouriya
03485f5e94
Merge branch 'processone:master' into master
2022-01-21 03:14:28 +03:30
Holger Weiss
0f2d36dc53
mod_pubsub: Allow for limiting item_expire value
...
If mod_pubsub's 'max_item_expire_node' option is specified, reject node
configurations with an 'item_expire' value that exceeds the specified
limit.
2022-01-17 19:08:36 +01:00
Holger Weiss
8e88fa3884
mod_shared_roster: Normalize JID on unset_presence
...
Don't forget to normalize the JID handed over from ejabberd_sm on
presence-unavailable. Without normalization, mod_shared_roster might
fail to look up the storage backend for the given host name, for
example.
Fixes #3752 .
2022-01-15 18:18:24 +01:00
Badlop
a9ac10e876
Document that 'unregister' command deletes data associated with the account
2022-01-13 19:34:37 +01:00
Badlop
1fb908b70f
Document option subscrube_room_many_max_users introduced in fc34661b6
2022-01-13 19:34:10 +01:00
Badlop
1ce3bd256b
Update section URLs in ldap documentation
2022-01-13 19:34:07 +01:00
Badlop
ce14c28faf
Fix version when this command was really updated
2022-01-11 17:28:36 +01:00
Badlop
03a11c63bd
Fix login when generating client id, keep connection record ( #3593 )
2022-01-11 17:19:12 +01:00
Paweł Chmielowski
9ba20d26cb
Add better descripion of subscribe_room_many command
2022-01-05 16:44:05 +01:00
Badlop
cc7ebb86b4
Fix Dialyzer, related to Luerl API update from 0.3 to 1.0
2022-01-04 23:06:30 +01:00
Badlop
79ddde3040
Workaround to support rebar2 git tag "1.0" and rebar3 hex version "1.0.0"
2022-01-04 21:56:31 +01:00
Badlop
61dc89a068
Update Luerl to 1.0.0, now available in Hex.pm ( rvirding/luerl#142 )
2022-01-04 21:32:23 +01:00
Badlop
7c9b47fb78
Fix "make rel" when using mix, broken after 94a733c66
2022-01-04 17:31:30 +01:00
Paweł Chmielowski
dc81966938
Fix 'make update' when used with rebar 3.18
2022-01-03 13:51:58 +01:00
Holger Weiss
59c9500944
mod_muc_room: Fix function name typo
2021-12-30 21:17:11 +01:00
Badlop
8ccad7fada
Publish CT logs and Cover on failure to an external GH Pages repo
2021-12-23 16:39:36 +01:00
Badlop
8a5d90797a
Check dialyzer results in its step when using rebar 2
2021-12-23 16:39:34 +01:00
Badlop
aa580b3f6e
Only care about new-schema results when new-schema tests were ran
2021-12-23 16:39:31 +01:00
Badlop
3841097428
Clean actions steps, remove redundant ones
2021-12-23 16:39:28 +01:00
Holger Weiss
5ff45e0f00
ejabberdctl: Let shellcheck ignore unused ERTS_VSN
...
The ERTS_VSN variable is only used for releases built with Rebar 3.
2021-12-23 14:46:53 +01:00
Holger Weiss
94a733c666
Fix ERTS path in ejabberdctl with `rebar3 release`
...
Rebar 2 expands {{erts-vsn}} to "erts-$vsn", Rebar 3 expands it to just
"$vsn". Make sure `make rel` doesn't end up with a "$vsn" directory
next to "erts-$vsn" (which happened when using Rebar 3), and make sure
that ejabberdctl expects both "erl" and "epmd" to be installed below
"erts-$vsn" (which it didn't when using Rebar 3).
2021-12-23 14:24:27 +01:00
Badlop
e2b7717dd9
Workaround to support ShellCheck older than 0.8.0
2021-12-23 13:57:16 +01:00
Badlop
694d80b7fa
Test shell scripts in CI ( #3738 )
2021-12-23 13:57:14 +01:00
Badlop
84d23e60d1
In POSIX sh, RANDOM is undefined: use always the other method
2021-12-23 13:57:12 +01:00
Badlop
f4e2d278ba
Dollar is unnecessary on arithmetic variables
2021-12-23 13:57:10 +01:00
Badlop
d8be168cff
Use dollar notation instead of legacy backticked
2021-12-23 13:57:08 +01:00
Badlop
cde089ce9c
Disable some shellcheck warnings
2021-12-23 13:57:06 +01:00
Badlop
fdc664a318
The read value is useless, so use throwaway variable name
2021-12-23 13:57:04 +01:00
Badlop
4deff0513c
Harmless warning, but let's prevent it anyway
2021-12-23 13:57:02 +01:00
Badlop
46324385f2
SCRIPT_DIR is used by relx releases
2021-12-23 13:57:00 +01:00
Badlop
b5d8b22486
In POSIX sh, RANDOM is undefined, use alternative
2021-12-23 13:56:58 +01:00
Badlop
1b22368f6b
In POSIX sh, OSTYPE is undefined. ejabberd doesn't work natively in win anyway
2021-12-23 13:56:56 +01:00
Badlop
f88aa49913
Give hint about what ejabberd.cfg.example sourcing
2021-12-23 13:56:53 +01:00
Badlop
200a842cb0
Configure shellcheck to test with sh POSIX script
2021-12-23 13:56:51 +01:00
Badlop
66bb4cbfa9
Only provide Relx start script in dev profile
...
That script serves a similar purpose to ejabberdctl to start ejabberd,
but we can't guarantee it is completely equivalent to ejabberdctl.
The prod profile must provide only the well-known script.
The test profile provides the Relx script so we can experiment with it.
2021-12-23 13:54:08 +01:00
Holger Weiss
aaa053829f
Revert "rebar.config: Don't create extended start script"
...
This reverts commit 0881c5941a
.
The extended start had been enabled intentionally, as some commands
(such as 'ping', 'status', or 'pid') actually do work.
2021-12-23 07:12:02 +01:00
Holger Weiss
0881c5941a
rebar.config: Don't create extended start script
...
We currently don't use the start script(s) generated by Relx.
2021-12-21 00:01:17 +01:00
Holger Weiss
3c46e6aba5
Merge remote-tracking branch 'processone/pr/3735'
...
* processone/pr/3735:
node_pep: Add config-node and multi-items features
2021-12-20 09:37:37 +01:00
Alexey Shchepin
fc34661b6f
Add subscribe_room_many command
2021-12-20 09:42:02 +03:00
Alexey Shchepin
a26c9d2475
Optimize user removal handling in mod_muc
2021-12-20 09:42:02 +03:00
Alexey Shchepin
536beedeb6
Accept more types of ejabberdctl commands arguments as JSON-encoded
2021-12-20 09:42:02 +03:00
Linus Jahn
7196f46730
node_pep: Add config-node and multi-items features
...
Fixes #3714 .
2021-12-19 21:06:33 +01:00
Holger Weiss
42bdb501ca
mod_stun_disco: Fix parsing of IPv6 listeners
...
Don't crash if `mod_stun_disco` is used with `offer_local_services`
and an IPv6 listener has an explicit `ip:` address configured.
Thanks to Daniel Kenzelmann for reporting the issue.
2021-12-18 17:50:26 +01:00
Badlop
24742031e9
Revert "Github Actions: use MD5 pass encryption to support PostgreSQL 14 ( #3691 )"
...
This workaround is not needed anymore, thanks to p1_pgsql 3bf645b,
included in p1_pgsql 1.1.13, and used in ejabberd 21.12.
This reverts commit 964cb3aaca
.
2021-12-15 00:50:52 +01:00
Badlop
7e07cba406
Let get_all_rooms handle "global" argument, fixes rooms_unsued_... ( #3726 )
2021-12-15 00:50:17 +01:00
Alexey Shchepin
8b7da70b57
Handle user removal in mod_muc
2021-12-14 09:55:55 +03:00
Paweł Chmielowski
a94209a0e0
Update stun and esip dependencies
2021-12-09 12:13:48 +01:00
Badlop
ed5ba1f645
Update CHANGELOG.md to 21.12
2021-12-09 11:07:43 +01:00
Badlop
1915f29d4b
Update Chinese translation (thanks to Eric and 52871299hzy)
2021-12-09 10:55:26 +01:00
Badlop
333eaef6dc
Update French translation (thanks to Éfrit and ButterflyOfFire)
2021-12-09 10:55:23 +01:00
Badlop
d1bfd6c90d
Annotate modules, options and command major changes in 21.12
2021-12-09 10:55:21 +01:00
Badlop
ca143c1873
Update man page
2021-12-09 10:55:19 +01:00
Badlop
e10f2a9e47
OTP 24 means whatever version provided by Actions... nowadays it's 24.1
2021-12-09 10:55:16 +01:00
Badlop
0f9a0156c6
Handle mix version when running docker-ejabberd/ecs/build.sh latest
2021-12-08 16:31:36 +01:00
Badlop
68ea5834c8
Relax strictness in mix dependency versions
2021-12-08 16:31:34 +01:00
Holger Weiss
4a52042435
Merge remote-tracking branch 'processone/pr/3724'
...
* processone/pr/3724:
Remove CTLLOCKDIR (/var/lock/ejabberdctl) from Makefile.in
2021-12-07 10:19:59 +01:00
Florian Schmaus
6b1f78e87a
Remove CTLLOCKDIR (/var/lock/ejabberdctl) from Makefile.in
...
Flock'ing /var/lock/ejabberdctl by ejabberdctl was removed with
f7d4aae64d
("Use UUID for ctl node name (#1021 )"), however the
according recipies in the Makefile where never removed. This commit
does that.
2021-12-07 10:15:47 +01:00
Badlop
3f4423e996
Use P1's coveralls-erl fork to handle unicode in git commit author
2021-12-07 01:33:16 +01:00
Paweł Chmielowski
8d8a3177e1
Eliminate xref warning from last commit
2021-12-06 15:46:52 +01:00
Paweł Chmielowski
7897c3d0e1
Add workaround for bug in older erlang version in rest module
2021-12-06 15:08:10 +01:00
badlop
b173ec0a78
Merge pull request #3652 from weiss/bump-max-items
...
PubSub: Bump default value for 'max_items' limit
2021-12-03 16:11:18 +01:00
Badlop
7fd0eefa30
Run make options
2021-12-03 16:09:58 +01:00
Badlop
dab4c0cc10
New allow_modules option to restrict registration modules
2021-12-03 16:09:55 +01:00
Badlop
0372878ba5
Minor improvements in conversejs documentation
2021-12-03 16:09:10 +01:00
Paweł Chmielowski
ad3c91b86e
Update mix deps
2021-11-29 15:36:57 +01:00
Paweł Chmielowski
75b133d968
Update deps
2021-11-29 15:20:10 +01:00
Alexey Shchepin
89ad8a5502
Add mod_conversejs
2021-11-23 08:43:54 +03:00
Badlop
15d3ebb842
Fix Dialyzer warning, old passwd tuple don't match current tuple definition
2021-11-17 17:26:44 +01:00
Badlop
689749a563
Update Jose to 1.11.1 (the last in hex.pm correctly versioned)
2021-11-17 13:22:34 +01:00
Badlop
a590e81922
Add DIAGNOSTIC to rebar3 coveralls, this fails since some days ago
2021-11-17 13:20:33 +01:00
Paweł Chmielowski
405a5172d5
Improve mod_multicast
2021-11-17 11:32:42 +01:00
Paweł Chmielowski
97b8373fd2
Better version of dialyzer fix
2021-11-16 10:59:53 +01:00
Paweł Chmielowski
bdd4e52699
Make dialyzer happy
2021-11-16 10:57:15 +01:00
Paweł Chmielowski
03817de827
Make s2s connection table cleanup more robust
...
Using monitors instead of doint that from terminate() makes us immune to
s2s handler processes being forcefully killed.
2021-11-16 10:25:03 +01:00
Paweł Chmielowski
132ebb8f2d
Fix exception in mucsub {un}subscription events multicast handler
...
While those event are wrapped in mucsub envelope they doesn't
contain regular messages that require updating 'to' attribute,
so don't process in that same way as events with wrapped
message in them.
2021-11-10 17:04:50 +01:00
Holger Weiss
2cdda4cf49
mod_caps: Don't forget caps on XEP-0198 resumption
...
Many thanks to Thilo Molitor for spotting the issue and testing the fix.
2021-11-06 23:48:49 +01:00
Badlop
4e014d23bd
Improve documentation of some commands
2021-11-05 15:58:00 +01:00
Badlop
b6a2eeebeb
Mention "help" as an available ejabberdctl command
2021-11-05 15:57:57 +01:00
Badlop
684ef60ec3
Annotate support for XEP-0317: Hats, since commit 5d0e599f1
2021-11-05 15:57:53 +01:00
Holger Weiss
6e3df8e80b
Update 'stun' dependency
...
The new 'stun' release should improve UDP performance quite a bit.
2021-11-02 12:34:19 +01:00
Holger Weiss
c4f6c9dfe7
mod_muc_room.hrl: Work around old Dialyzer bug
...
On Erlang/OTP versions older than 21, Dialyzer stumbles over non-empty
map type specifications for record fields (OTP-15098).
2021-10-31 21:59:00 +01:00
Holger Weiss
13cbd7c35d
mod_pubsub: Remove unused check_opt_range/3 clause
2021-10-31 21:38:49 +01:00
Holger Weiss
65a900668c
node_pep: Fix remove_expired_items/2 argument name
2021-10-31 21:32:45 +01:00
Holger Weiss
2f1611f918
mod_pubsub: Fix get_max_items_node/1 specification
...
Make it explicit that the get_max_items_node/1 function returns
?MAXITEMS if the 'max_items_node' option isn't specified. The function
didn't actually fall back to 'undefined' (but to the 'max_items_node'
default; i.e., ?MAXITEMS) anyway. This change just clarifies the
behavior and adjusts the function specification accordingly.
2021-10-30 13:45:10 +02:00
Holger Weiss
29dcc9b94c
PubSub: Add delete_expired_pubsub_items command
...
Support XEP-0060's pubsub#item_expire feature by adding a command for
deleting expired PubSub items.
Thanks to Ammonit Measurement GmbH for sponsoring this work.
2021-10-30 13:19:30 +02:00
Alexey Shchepin
5d48329a3f
Update 'xmpp' dependency
2021-10-29 05:48:03 +03:00
Alexey Shchepin
5d0e599f17
Support MUC hats (XEP-0317, conversejs/prosody compatible)
2021-10-29 05:35:16 +03:00
Badlop
5462a26a0a
Remove obsolete cookie preparation in spool dir, it's now stored in HOME
2021-10-21 16:12:41 +02:00
Badlop
5f3c8dcca4
Use the configured user in systemd's ejabberd.service
2021-10-21 16:12:38 +02:00
Badlop
54c23a65db
Fix create_room_with_opts when using SQL storage ( #3700 )
2021-10-21 12:44:51 +02:00
Badlop
4d384b6bf5
If tests succeed, test also new SQL schema
2021-10-15 16:59:32 +02:00
Badlop
c2db003431
When tests fail, show also error.log as it may have meaningful content
2021-10-15 16:59:28 +02:00
Badlop
d3aa329769
Fix vcard_search definition in pgsql new schema (thanks to Stu Tomlinson)( #3695 )
...
How to update an existing database:
ALTER TABLE vcard_search DROP CONSTRAINT vcard_search_pkey;
ALTER TABLE vcard_search ADD PRIMARY KEY (server_host, lusername);
2021-10-14 15:28:00 +02:00
Badlop
db920b7d7b
Only install some files when option enabled in configure ( #3633 )
2021-10-14 15:26:41 +02:00
Holger Weiss
6b0fa44386
Update 'xmpp' dependency
...
Fixes #3529 .
2021-10-09 10:56:30 +02:00
Badlop
964cb3aaca
Github Actions: use MD5 pass encryption to support PostgreSQL 14 ( #3691 )
2021-10-07 16:54:27 +02:00
Holger Weiss
1377dcf6d2
mod_mam: Declare XEP-0441 support
2021-10-06 01:13:11 +02:00
Badlop
595b016019
Use mod_register in web register form, so its restrictions are used ( #3688 )
2021-10-04 12:08:59 +02:00
Badlop
85408662ff
Use mod_register to format some common error messages
2021-10-04 12:08:56 +02:00
Badlop
d205e6ff1f
Support old scram records before xmpp's 651050f9 and ejabberd's e5cad9be6
( #3680 )
2021-09-27 17:12:17 +02:00
Badlop
dd359a7328
Add indexes from 95fa43aa
to the old-to-new MySQL schema update script
2021-09-27 16:33:23 +02:00
Badlop
f74a715713
Add indexes from 95fa43aa
to the old-to-new schema update function
2021-09-27 13:05:18 +02:00
Badlop
af4b49f720
Update export/import of scram password to XEP-0227 1.1 ( #3676 )
2021-09-22 16:15:22 +02:00
Badlop
ceeba3eea1
Don't crash when exporting a module that is not enabled
2021-09-22 15:30:11 +02:00
Badlop
cfc393a12e
When exporting mod_mam, MUC entries are assigned to the MUC service ( #3680 )
2021-09-22 11:12:28 +02:00
Alexey Shchepin
c9c5839da4
Fix roster_tests:get_items
2021-09-21 13:30:52 +03:00
Alexey Shchepin
bf068f5659
Small optimization in mod_roster_sql:get_roster
2021-09-21 12:10:00 +03:00
Alexey Shchepin
32cf44827d
Use INSERT ... ON CONFLICT in SQL_UPSERT for PostgreSQL >= 9.5
2021-09-19 06:20:20 +03:00
Alexey Shchepin
0c403c0f0e
Fix SQL_UPSERT in mod_push_sql:store_session
2021-09-19 06:20:20 +03:00
Pouriya
3eb795357f
Merge branch 'processone:master' into master
2021-09-18 16:09:11 +04:30
Badlop
2f5b15129a
Fix previous commit: add forgotten endline blankspaces
2021-09-14 15:13:37 +02:00
Badlop
f8167fc5d0
Update documentation to match the implemented options values ( #3675 )
2021-09-14 13:47:41 +02:00
Alexey Shchepin
5abc03ff8f
Optimize MucSub processing
2021-09-13 08:20:47 +03:00
Holger Weiss
3114ce4ed2
ejabberd_admin: Fix ejabberd_piefxis commands
...
These days, the ejabberd_piefxis commands expect their arguments to be
handed over as binary strings.
2021-09-08 18:34:20 +02:00
Holger Weiss
868387a405
mod_http_upload_quota: Avoid 'max_days' race
...
Try to spread clean-up runs for multiple hosts, rather than scheduling
them in parallel. This should reduce I/O spikes, and avoid race
conditions where multiple processes detect and then try to delete the
same old files (if multiple hosts have the same 'docroot').
Fixes #3497 .
2021-09-05 20:00:05 +02:00
Holger Weiss
caf07692db
mod_register_web: Handle unknown host gracefully
...
Return a proper error message on registration attempts against unknown
hosts, rather than crashing.
Thanks to Ingo Jrgensmann for reporting the bug.
2021-09-05 13:24:51 +02:00
Badlop
91350ad472
Fix WebAdmin recent change
2021-08-27 13:39:06 +02:00
badlop
d967103d89
Merge pull request #3668 from longlene/master
...
rebar version get minor fix
2021-08-27 13:23:56 +02:00
Badlop
f77686481a
Add internal links in WebAdmin Vhosts page
2021-08-27 13:23:24 +02:00
Badlop
b0da69f050
Send ping from server, not bare user JID ( #3658 )
2021-08-27 13:23:15 +02:00
loong0
9643e18be7
minor fix
2021-08-26 20:33:37 +08:00
Holger Weiss
ebf03a3745
node_flat: Avoid catch-all clauses for RSM
...
Apply the change made in the previous commit to Mnesia storage as well.
2021-08-23 22:04:03 +02:00
Holger Weiss
c952cc420b
node_flat_sql: Avoid catch-all clauses for RSM
...
Explicitly catch invalid <before/> and <after/> timestamps specified by
clients in RSM queries, but crash on other errors, rather than silently
ignoring those.
2021-08-23 21:28:15 +02:00
Badlop
4d0503b6b3
Fix syntax in mod_disco example configuration
2021-08-23 15:49:52 +02:00
Badlop
8b6c90c2d9
Tell dialyzer that gen_tags only cares about markdown output, not html
2021-08-23 15:39:01 +02:00
Badlop
655dcbcb74
New command to produce markdown with tags and their associated commands
2021-08-23 14:04:54 +02:00
Badlop
ac4f240261
Produce module names with specific syntax, docs Makefile will convert to links
2021-08-23 14:04:52 +02:00
Badlop
506e2f3b97
Use specific syntax so modules and top-level will be links
...
If we use _`whatever`_ here in ejabberd man pages,
it is converted to *`whatever`* in markdown,
and docs.ejabberd.im/Makefile converts to the proper links
2021-08-23 14:04:49 +02:00
Badlop
30ae66e99e
Improve formatting and add sections links
2021-08-23 14:04:46 +02:00
Badlop
f5038b86f8
Copy log_rotate_count explanation from docs site
2021-08-23 14:04:44 +02:00
Badlop
9446b251fd
Export function, so ACME API commands are listed in the documentation
2021-08-23 14:04:42 +02:00
Badlop
94fb0a65b0
Change set_master command tag from mnesia to cluster
2021-08-23 14:04:40 +02:00
Badlop
69d362595e
Remove obsolete mod_register_web ideas and improve documentation
2021-08-23 14:04:37 +02:00
Badlop
b7f7713fae
Add example config to mod_http_api documentation
2021-08-23 14:04:35 +02:00
Badlop
8af66b0831
Update API Reference page menu name and order
2021-08-23 14:04:31 +02:00
Holger Weiss
7e9c9703dd
Merge remote-tracking branch 'processone/pr/3666'
...
* processone/pr/3666:
PubSub: Add delete_old_pubsub_items command
PubSub: Optimize publishing on large nodes (SQL)
PubSub: Support unlimited number of items
PubSub: Support 'max_items=max' node configuration
2021-08-22 15:17:02 +02:00
Holger Weiss
8d5025076f
PubSub: Add delete_old_pubsub_items command
...
Add a command for keeping only the specified number of items on each
node and removing all older items. This might be especially useful if
nodes may be configured to have no 'max_items' limit.
Thanks to Ammonit Measurement GmbH for sponsoring this work.
2021-08-22 12:44:50 +02:00
Holger Weiss
29751a6174
PubSub: Optimize publishing on large nodes (SQL)
...
Avoid an unnecessary SQL query while publishing an item on a PubSub node
without 'max_items' limit. The query in question can be expensive if
the node has a large number of items.
Thanks to Ammonit Measurement GmbH for sponsoring this work.
2021-08-21 20:02:58 +02:00
Holger Weiss
1b0e59bb13
PubSub: Support unlimited number of items
...
Allow for setting the mod_pubsub option 'max_items_node' to 'unlimited'.
If clients then request a 'max_items' limit of 'max', old items aren't
deleted when publishing new ones.
Thanks to Ammonit Measurement GmbH for sponsoring this work.
2021-08-21 12:29:37 +02:00
Holger Weiss
8f8de0403b
PubSub: Support 'max_items=max' node configuration
...
Let clients request the maximum limit for the node configuration option
'max_items' by specifying the special value 'max' instead of an integer.
This was added to XEP-0060, revision 1.17.0 (and clarified in revision
1.20.0).
Thanks to Ammonit Measurement GmbH for sponsoring this work.
2021-08-20 20:30:11 +02:00
badlop
8afc320aba
Merge pull request #3660 from ballerburg9005/patch-1
...
"sort -R" command in captcha-ng.sh is not POSIX - added "shuf" and "cat" as fallback
2021-08-16 13:16:43 +02:00
badlop
545a2f0097
Merge pull request #3656 from pitchum/master
...
Add missing pgsql migration for table push_session
2021-08-16 12:47:45 +02:00
ballerburg9005
14bf197be1
"sort -R" command not POSIX, added "shuf" and "cat" as fallback
2021-08-12 15:14:31 +02:00
Holger Weiss
3e942bf4ac
mod_mam_sql: Remove duplicated functions
2021-08-07 12:57:57 +02:00
Badlop
fdfd202a30
Determine the default handlerid at runtime
...
Apparently Elixir's default is not called 'default'
2021-08-05 13:53:12 +02:00
Badlop
5b0a28bbc9
Fix CHANGELOG: rebar2's elixir workaround was problematic and was reverted
...
Problems:
- That workaround required running "make" twice
- CEAN (used to build installers) doesn't support that make && make
- Support for Elixir in rebar3 doesn't yet exist
- Preferable path for Elixir usage: install Elixir and use --with-rebar=mix
2021-08-05 13:52:52 +02:00
Badlop
aefc374317
Fix typo when creating index (thanks to Millesimus)
...
Reference: 95fa43aa96 (r54157330)
2021-08-05 13:52:38 +02:00
Paweł Chmielowski
4c61ea9091
Update tests after last commit
2021-08-04 17:52:23 +02:00
Paweł Chmielowski
d7e330c8ef
Allow storing non-composing x:events in offline
2021-08-04 15:30:29 +02:00
Holger Weiss
99ffd9bb95
mod_pubsub: Fix check_opt_range/3 spec
2021-08-02 21:09:55 +02:00
pitchum
76c49f314f
Add missing SQL migration for table push_session
2021-08-01 09:53:07 +02:00
Badlop
ab5e726176
Use the most specific tag for ejabberd commands with several ones
2021-07-30 01:14:36 +02:00
Badlop
b22779f018
Show tags and definer module in generated API document when it's a gen_mod
2021-07-30 01:14:34 +02:00
Badlop
41808a63a0
Show definer module in "ejabberdctl help" when it's a gen_mod
2021-07-30 01:14:31 +02:00
Badlop
ccb4328d06
Store who defines a command, specially when defined by ejabberd modules
2021-07-30 01:14:27 +02:00
Holger Weiss
2050cdffb4
PubSub: Use configured 'max_items' by default
...
If clients don't ask for a specific 'max_items' limit, use the value of
mod_pubsub's 'max_items_node' option as default, rather than the
hard-coded ?MAXITEMS value. This makes sure clients cannot circumvent a
smaller, configured limit.
2021-07-28 18:53:15 +02:00
Holger Weiss
fce7fe8558
PubSub: Bump default value for 'max_items' limit
...
Bump the default value for mod_pubsub's 'max_items_node' option, which
hard-limits the 'max_items' value requested by clients.
These days, use cases such as microblogging or XEP-0402 may need a large
number of items per node. Bumping the limit makes sure such
functionality is properly supported with the default configuration.
2021-07-28 18:29:19 +02:00
Holger Weiss
103e98b8da
mod_push: Fix handling of MUC/Sub messages
...
Don't fail to include the sender/body of MUC/Sub messages if the
recipient is offline.
Closes #3651 .
2021-07-28 18:22:39 +02:00
Badlop
8e553decb0
When vsn is an exact tag, append .0 to satisfy SemVer
2021-07-26 16:36:21 +02:00
Paweł Chmielowski
e3875482ba
Remove stringprep override from mix.exs
2021-07-26 16:06:43 +02:00
Paweł Chmielowski
6e4e5a0190
Add missing fields from config inside mod_muc_admin:change_options
2021-07-23 10:14:45 +02:00
Paweł Chmielowski
c96de092fe
Revert "Add workaround so rebar2 can use Elixir 1.12.0"
...
This reverts commit 937e1c2e37
.
2021-07-22 15:51:43 +02:00
Badlop
cf72c5ee18
Remove leading zeros in ejabberd version number to satisfy Elixir SemVer
2021-07-21 21:29:04 +02:00
Badlop
69fa79b154
Add 21.07 changes to CHANGELOG
2021-07-21 17:58:35 +02:00
Badlop
ea795e4bd7
Update man page
2021-07-21 17:58:32 +02:00
Badlop
537c8b966e
In "make dev" don't create link ejabberdctl, seems buggy
2021-07-21 17:58:27 +02:00
Paweł Chmielowski
142e494d52
Update mix.lock
2021-07-21 14:50:18 +02:00
Badlop
50242cec78
Annotate the srg_create command as changed in 21.07
2021-07-21 13:11:09 +02:00
Badlop
33f821d4f7
Simplify the --with-rebar example in README
2021-07-21 13:11:06 +02:00
Badlop
9a823e5a16
Update Portuguese translation from Weblate (thanks to Ssantos)
2021-07-21 13:07:31 +02:00
Badlop
686ce01534
Update Italian translation from Weblate (thanks to Alessandro Mandelli)
2021-07-21 13:07:29 +02:00
Badlop
4225f14e8b
Update Indonesian translation from Weblate (thanks to Reza Almanda)
2021-07-21 13:07:26 +02:00
Paweł Chmielowski
a3478b7f0f
Update pam
2021-07-21 11:37:32 +02:00
Paweł Chmielowski
bab9543c1f
Update dependences
2021-07-21 11:12:54 +02:00
Paweł Chmielowski
c3169e9eea
Typo
2021-07-20 17:07:40 +02:00
Badlop
c04b6b2908
Update CHANGELOG.md with 21.04 and 21.01 ( #3646 )
2021-07-19 17:23:50 +02:00
Badlop
937e1c2e37
Add workaround so rebar2 can use Elixir 1.12.0
...
Notice that Elixir 1.12.0 requires Erlang/OTP 21 or higher
BTW, this workaround works only with rebar2... unfortunately
rebar3 doesn't compile the elixir files from lib/
2021-07-16 16:43:08 +02:00
Badlop
91763bbc61
As Mix config now must be evaluated at runtime, rename to runtime.exs
2021-07-16 13:57:25 +02:00
Badlop
e0c9a6308d
erlang:phash is deprecated in OTP 24, let's use phash2
2021-07-16 13:57:08 +02:00
Badlop
e14cd5dd17
Mention in README.md the updated --with-rebar and "make dev"
2021-07-16 13:36:28 +02:00
Badlop
e31919914b
Add support to build release with back to old Elixir 1.10.3
...
However, to build a release with OTP 24 requires Elixir 1.11.4 or higher
2021-07-16 13:36:27 +02:00
Badlop
fcbd72f2d7
Add rebar3 3.15.2
...
Reference: https://ferd.ca/you-ve-got-to-upgrade-rebar3.html
2021-07-16 13:36:25 +02:00
Badlop
4c5641a648
Add support for mix to: ./configure --enable-rebar=mix
2021-07-16 13:36:23 +02:00
Badlop
1fd452dca9
Update setup-dev.sh to work perfectly both with rebar3 and mix
2021-07-16 13:36:22 +02:00
Badlop
f35d304582
Minor mix.exs definitions copied from the template file
2021-07-16 13:36:20 +02:00
Badlop
8ca12d4d23
Add support to build release with mix
2021-07-16 13:36:19 +02:00
Badlop
72e069d9ec
Get ejabberd version from vars.config
2021-07-16 13:36:17 +02:00
Badlop
df8b0cb1a5
Add sql to package files ( #3251 )
2021-07-16 13:36:15 +02:00
Badlop
a00a11e38a
Add vars.config to package files: version and cond_deps use it
2021-07-16 13:36:13 +02:00
Badlop
94949c9617
Sort package files
2021-07-16 13:36:10 +02:00
Badlop
e2aaca7cdd
Update mix applications list to fix error "p1_utils is listed as both..."
2021-07-16 13:36:04 +02:00
Badlop
3afaacab76
With the recent changes it seems mod_mix supports 0.14.1 ( #3634 )
2021-07-15 17:19:32 +02:00
badlop
57be0e38d8
Merge pull request #3634 from lnjX/mix-identity-conf-mix
...
mod_mix: Use disco identity conference/mix
2021-07-15 17:15:48 +02:00
Paweł Chmielowski
27c69f263c
Allow multicast hook registering by host
2021-07-14 13:58:53 +02:00
Badlop
e22ed8081a
Provide proper error message when create_room fails with invalid_service
2021-07-13 20:43:52 +02:00
Badlop
5beaf50c67
Fix spec: xmpp:set_from_to/3 allows undefined as second argument
2021-07-13 20:43:44 +02:00
Paweł Chmielowski
a07029dcad
Fix previous commit to pass all tests
2021-07-13 17:56:16 +02:00
Paweł Chmielowski
0de6f1c538
Use multicast routing for more packets generated by muc
2021-07-13 16:01:25 +02:00
Badlop
2e2667bbd7
Update documentation: mod_muc ram_db_type supports SQL since 17.04 ( #3632 )
2021-07-08 12:29:16 +02:00
Badlop
271a9f097d
After create_room, store in DB if it's persistent ( #3632 )
2021-07-08 12:29:13 +02:00
Badlop
7e3276f3a8
Ignore captcha scripts copied by relx after "make dev"
2021-07-08 12:29:03 +02:00
badlop
42fdac0b41
Merge pull request #3639 from McPo/xep0033-bcc-strip-fix
...
Correctly strip only third-party bcc addresses
2021-07-07 19:07:21 +02:00
Emmet McPoland
509331a563
Correctly strip only other bcc addresses i.e. bcc receiver should still be able to see their bcc address element and no other bcc address element
2021-07-07 16:44:58 +01:00
Badlop
08c2d0a83e
Tell relx to include src, so that the tar will contain include/ ( #3633 )
...
That's the only way to ensure that tar.gz will contain include/
of ejabberd and its dependencies, which is required to compile
ejabberd-contrib modules with "ejabberdctl module_install ..."
2021-07-06 13:37:14 +02:00
Badlop
bb0c6e1e02
Show messages with next configuration steps when installing a module
2021-07-06 13:37:04 +02:00
badlop
331a67f5f8
Merge pull request #3566 from Robbilie/feature/mqtt-shared-roster-groups-placeholder
...
allow shared roster group placeholder in mqtt topic
2021-07-06 13:36:41 +02:00
Paweł Chmielowski
e3e4dae583
Yet another dialyzer warning fix
2021-06-28 12:53:30 +02:00
Paweł Chmielowski
b669e4499c
Fix dialyzer warning
2021-06-28 12:18:19 +02:00
Paweł Chmielowski
6e900d6a8f
Add send_timeout option to listener
2021-06-28 11:31:45 +02:00
Paweł Chmielowski
795addca7d
Try to limit serial access when checking api permissions
2021-06-28 11:31:43 +02:00
Badlop
774de2bdc5
Include odbc app in release only when required ( #3633 )
2021-06-27 17:32:09 +02:00
Badlop
b5b2ad560a
Copy captcha scripts in release ( #3633 )
2021-06-27 17:32:06 +02:00
Badlop
b93fc4333c
Let "make dev" always update SCRIPT_DIR in ejabberdctl, even if link exists
2021-06-27 17:32:04 +02:00
Linus Jahn
d7c9809c59
mod_mix: Use disco identity conference/mix
...
Probably someone has forgotten to update it here.
https://xmpp.org/extensions/xep-0369.html#example-5
Fixes #2901 .
2021-06-27 01:20:45 +02:00
Badlop
ac06161f30
There are so many targets... add "make help"
2021-06-25 12:53:47 +02:00
Badlop
0fe2aea709
New "make dev" and "./ejabberdctl" (requires using rebar3)
2021-06-25 12:53:43 +02:00
Badlop
21b021d912
Set SCRIPT_DIR as done by the ejabberd script generated by "rebar3 release"
2021-06-25 12:53:30 +02:00
Badlop
d5adcaea61
Add support for rebar3 to "make rel"
2021-06-25 12:53:22 +02:00
Holger Weiss
9d4c01d425
mod_push_keepalive: Fix 'resume_timeout' docs
...
The default 'resume_timeout' value is 72 hours, not 72 minutes.
2021-06-25 01:30:10 +02:00
Badlop
ea97be9124
Don't cache rebar3 binaries... compiling is less than 2 minutes anyway
2021-06-21 11:46:10 +02:00
Paweł Chmielowski
2458f55837
Update stringprep in mix
2021-06-18 11:45:18 +02:00
Pouriya
5f8114974f
ref: fix WS typos
2021-06-15 15:13:03 +04:30
badlop
1ef9f28f2d
Merge pull request #3622 from pouriya/fix-ws-typos
...
ref: fix WS typos
2021-06-14 17:21:33 +02:00
Badlop
3ed41e39f6
CI: don't cache dialyzer output file: when there are several, ln fails
2021-06-14 17:20:57 +02:00
Badlop
4ee10c155d
Fix reverse order of items when using <before/> in Pubsub with RSM ( #3621 )
2021-06-14 12:22:37 +02:00
Badlop
c2d8bc7b2f
Add mqtt_pub table definition for MSSQL ( #3097 )
2021-06-14 12:22:21 +02:00
Pouriya Jahanbakhsh
b5bafca640
ref: fix WS typos
2021-06-12 20:27:30 +04:30
Badlop
9a93562b94
Revert luerl from v0.4 which has a compilation warning; v0.3 is enough
...
Revert "Update luerl dependency from v0.3 to v0.4"
This reverts commit 64f3f3287a
.
2021-06-08 19:00:46 +02:00
Badlop
bf8b4acf01
Return proper index when using after of before in PubSub with RSM ( #3618 )
...
This fixes Index attribute in examples from:
https://xmpp.org/extensions/xep-0059.html#forwards
https://xmpp.org/extensions/xep-0059.html#backwards
2021-06-08 19:00:44 +02:00
Badlop
41fd2afeb3
Fix index attribute when getting last page from PubSub with RSM ( #3618 )
...
This fixes Example 11 from "2.5 Requesting the Last Page in a Result Set":
https://xmpp.org/extensions/xep-0059.html#last
2021-06-08 19:00:41 +02:00
Badlop
4520d5f3c1
Support for simple limiting the number of items in PubSub with RSM ( #3618 )
...
This fixes crash in Example 1 from "2.1 Limiting the Number of Items":
https://xmpp.org/extensions/xep-0059.html#limit
2021-06-08 19:00:39 +02:00
Badlop
ccadbf45a2
Get explicitely rebar3 3.15 binary that works with Erlang 21.3
2021-06-07 12:13:22 +02:00
Badlop
2b0d724aef
Workaround so coveralls website shows git commit information
...
References:
https://github.com/markusn/coveralls-erl/pull/36
https://github.com/deadtrickster/prometheus.erl/pull/123
2021-06-06 16:56:29 +02:00
Badlop
9010c35193
CI: Get rebar3 compatible with previous OTP, the one in Ubuntu 20.04 is not
2021-05-28 16:56:05 +02:00
Badlop
2c20414453
Update eredis dependency from v1.0.8 to v1.2.0
2021-05-28 16:54:58 +02:00
Badlop
64f3f3287a
Update luerl dependency from v0.3 to v0.4
2021-05-28 16:53:09 +02:00
Badlop
1befa8d8b7
Update lager dependency from 3.6.10 to 3.9.1 to make Dialyzer happy
2021-05-28 16:51:59 +02:00
Holger Weiß
3b5ddf0254
mod_muc_room: Don't leak owner JIDs ( #3615 )
...
Avoid publishing room owner JIDs (via the muc#roominfo form) without
their explicit consent.
Closes #3609 .
2021-05-28 16:43:49 +02:00
Badlop
33fd45a960
Remove .travis.yml as it's superseded by ci.yml ( #3613 )
2021-05-25 19:16:06 +02:00
Badlop
77ef03e104
New ci.yml with all static and dynamic testing suites ( #3613 )
...
It supports all that was already in .travis.yml and tests.yml, plus:
- exclude paths that don't affect source code
- two very distinct scenarios, ancient a recent (OTP, Rebar, Ubuntu)
- cache binaries and dialyzer for small speedup and network usage
- separated results, to view comfortably where and what failed
- use coveralls example rebar3 code, instead of custom rebar2
- upload binaries.zip that can be used with Binary Installers
2021-05-25 18:45:31 +02:00
Badlop
70640e71f1
Remove tests.yml github workflow, a new reworked one is coming ( #3613 )
2021-05-25 18:40:28 +02:00
Badlop
1ee64091b3
Fix extauth.py failure in test suite with Python 3 ( #3612 )
2021-05-25 18:39:18 +02:00
Nikat
7b33499811
MySQL Backend Patch for scram-sha512 ( #3582 )
...
* Update mysql.new.sql
scram-sha512 does not work, because serverkey is longer, then that array. All passwords was unhashed.
* Update mysql.sql
2021-05-20 13:32:50 +02:00
Badlop
d94bae241c
Align numbers in WebAdmin tables to the right
2021-05-19 15:00:22 +02:00
Badlop
58a623778f
Show uptime date in WebAdmin, it's easier to understand that uptime seconds
2021-05-19 15:00:19 +02:00
Badlop
494ba9a635
Show mnesia table memory in bytes, not in words
2021-05-19 15:00:16 +02:00
Paweł Chmielowski
95fa43aa96
Add missing indexes to sql sr_group tables
2021-05-18 18:29:32 +02:00
Badlop
16af8a4739
New simple webadmin pages to view mnesia tables information and content
2021-05-17 16:16:26 +02:00
Badlop
57202d958a
Use G macro name for tag, as T overlapped T from translation
2021-05-17 16:14:39 +02:00
Badlop
d741f6f5f2
Update documentation references for import_prosody and export2sql
2021-05-14 16:07:03 +02:00
Badlop
20b4deffe3
Apply improvement from 29462f005
to delete/2, and fix delete/3 ( #3564 )
2021-05-14 16:06:59 +02:00
Badlop
ee3796b925
When exporting for SQLite, use its specific escape options ( #2576 )
2021-05-14 16:06:43 +02:00
Badlop
8e08703833
Tell io_lib:print to not care about line length, to avoid newlines in SQL export
2021-05-14 16:06:39 +02:00
Paweł Chmielowski
3b716d2cb0
Update econf:vcard() to generate correct vcard_temp record
2021-05-12 21:46:36 +02:00
Paweł Chmielowski
0f51a03d08
Update xmpp to bring updated vcard
2021-05-12 18:05:11 +02:00
Mickaël Rémond
20247af6f6
Use the new Github container registry
2021-05-12 11:51:40 +02:00
Mickaël Rémond
2698024b82
Use latest version of the container
...
This is the only image available for now
2021-05-12 11:22:45 +02:00
Mickaël Rémond
a142dc4b11
Remove set up already set in prebuilt image
2021-05-12 11:17:26 +02:00
Mickaël Rémond
2844a2d73e
Use a prebuilt image
2021-05-12 11:16:46 +02:00
Badlop
160cd11c83
Minor fixes for new_sql_schema support in SQLite ( #3303 )
2021-05-11 18:36:16 +02:00
Badlop
4fdebd296a
Document that update_sql command only supports postgresql ( #3439 )
2021-05-11 18:36:14 +02:00
Badlop
b18f622984
Use the deps versions defined in rebar.config, not the latest available
2021-05-11 18:36:11 +02:00
Badlop
f61607df65
Don't add ejabberd version in API page either, following 3e4ebfae7
2021-05-11 18:36:08 +02:00
Mickaël Rémond
5d0c0eb03d
Expose port label
2021-05-11 09:00:44 +00:00
Mickaël Rémond
ef1d9a0723
Ignore basic Mnesia directory
2021-05-11 08:32:44 +00:00
Mickaël Rémond
5465e7ed2f
Forward XMPP legacy SSL and MQTT ports
2021-05-11 08:29:38 +00:00
Mickaël Rémond
7edd9e3766
Install Erlang and Elixir VSCode extensions as default
2021-05-11 08:06:44 +00:00
Mickaël Rémond
7a6425544c
Remove file syntax deprecation
2021-05-11 08:06:16 +00:00
Mickaël Rémond
97e7f25e6e
Merge pull request #3595 from processone/codespaces
...
Codespaces
2021-05-11 09:50:46 +02:00
Badlop
916653e234
Cast as boolean when exporting privacy_list_data to PostgreSQL ( #1773 )
2021-05-10 12:04:52 +02:00
Badlop
6db228fcb3
Document that sql_ssl can be used with MySQL too
2021-05-05 11:57:08 +02:00
Badlop
c2821be94c
Use the new 'note' field to annotate changes in 20.01..21.03
2021-05-05 11:57:05 +02:00
Badlop
999d0af502
New 'note' field in commands and options documentation
2021-05-05 11:57:02 +02:00
Paweł Chmielowski
78c09789f7
Fix invalid_encoding error when using extended plane characters in vcard.
2021-04-29 14:21:37 +02:00
Paweł Chmielowski
5a8f1ca528
Display extender error message in ejabberdctl
...
This for example makes error from register explain what account
can't be registered
For reference https://github.com/processone/ejabberd/discussions/3584
2021-04-22 11:56:58 +02:00
badlop
2d38d48a55
Merge pull request #3578 from tappytaps/srg-cache-fix
...
Fixed srg_create params and shared roster groups cache issues
2021-04-20 21:22:25 +02:00
Jindrich Sarson
dcc5d8704f
delete cache after performing change to be sure that in cache will be up to date data
2021-04-17 19:07:21 +02:00
Jindrich Sarson
c10e4fa275
update srg_create API to use label parameter instead of name
2021-04-17 18:49:26 +02:00
Paweł Chmielowski
e462f0a584
Fix dialyzer warnings
2021-04-16 11:55:48 +02:00
Paweł Chmielowski
45bbbd0284
Fix syntax not recognized by older erlang
2021-04-16 10:46:28 +02:00
Paweł Chmielowski
5b0f0d8352
Improve database and caching in mod_shared_roster
...
This makes us keep cache of groups that use wildcards no matter
of cache settings, and tries to not same fetch data multiple times
in roster get operations.
2021-04-16 10:34:32 +02:00
Paweł Chmielowski
54916caf65
Use proper source for cache options in mod_shared_roster
2021-04-16 10:20:13 +02:00
Paweł Chmielowski
c8afb5ceb6
Reconfigure cache in mod_shared_roster when options change
2021-04-16 10:19:09 +02:00
Badlop
b3374e1f99
Remove SMP option from ejabberdctl.cfg, -smp was removed in OTP 21 ( #3560 )
2021-04-15 20:28:43 +02:00
Badlop
4914b33f8c
Support the recent changes in the "ejabberdctl help" command ( #3569 )
2021-04-15 20:25:54 +02:00
Badlop
0ec69f0279
Major changes in ejabberdctl help output ( #3569 )
...
ejabberdctl: show list of commands
ejabberdctl some-command: if wrong number of arguments, shows command help
ejabberdctl help: show explanation of how to use "help"
ejabberdctl help tags: list tags with list of commands
ejabberdctl help commands: list tags with commands details
ejabberdctl help whatever*: filters commands and tags
2021-04-15 20:25:52 +02:00
Badlop
6f565147cb
Change tag name because there's already a command called "stats"
2021-04-15 20:25:49 +02:00
Badlop
f8a02f5d9d
Get the arguments definition from the record ( #3569 )
...
This fixes "ejabberdctl help help"
2021-04-15 20:25:47 +02:00
Badlop
327dc31e62
Copy a change from include file available since OTP 17.0
...
See:
5e575f6562
2021-04-15 20:25:44 +02:00
Mickaël Rémond
f77a163341
Update bug_report.md
2021-04-15 15:30:23 +02:00
Mickaël Rémond
c280d172b1
Update feature_request.md
2021-04-15 15:30:06 +02:00
Badlop
b860a25c82
When using OTP 24.0, use the new 'application' record definition ( #3568 )
...
This fixes "ejabberdctl update_list", "update", and the equivalent feature
on ejabberd's WebAdmin that got broken when using Erlang/OTP 24
2021-04-14 17:12:08 +02:00
Mickaël Rémond
ab2b499869
Update devcontainer.json
2021-04-13 10:25:05 +02:00
Mickaël Rémond
0a55e07326
Use Dockerfile
2021-04-13 08:24:01 +00:00
Mickaël Rémond
22cc7cedff
Use Dockerfile
2021-04-12 09:54:06 +00:00
Mickaël Rémond
cdbfd91ec4
Update devcontainer.json
...
Disable docker compose for now
2021-04-12 11:45:59 +02:00
Mickaël Rémond
9359bab677
Create docker-compose.yml
2021-04-12 11:44:10 +02:00
Robert Schuh
0e93f70e38
allow shared roster group placeholder in mqtt topic
2021-04-08 23:21:15 +02:00
Holger Weiss
10905b0447
mod_push: Handle MUC/Sub events correctly
...
Unwrap MUC/Sub messages so that our check for a message body yields the
correct result.
Many thanks to Robert Schuh for pointing out the issue and suggesting a
fix.
Closes #3565 .
2021-04-08 19:36:16 +02:00
Jérôme Sautret
4468c87115
Set version to 21.04
2021-04-07 17:23:30 +02:00
Badlop
4b83ec1204
New Albanian translation (thanks to Besnik Bleta)
2021-04-07 16:01:28 +02:00
Paweł Chmielowski
03e62308e2
Update deps in mix
2021-04-07 12:14:58 +02:00
badlop
c0dafc074d
Merge pull request #3558 from fdie/fix_node_get_state_return_value
...
fix gen_pubsub_node:get_state return value
2021-03-29 15:52:04 +02:00
Badlop
3bb89010fe
Recompile man page with "ejabberdctl man"
2021-03-26 11:05:49 +01:00
Badlop
3e4ebfae7e
Revert "Add ejabberd version number to man pages"
...
That versioning just added noise to the git log in each release.
This reverts commit aa0ed37034
.
2021-03-26 11:01:45 +01:00
Badlop
c64df48978
Run "make translations", and *.msg get a warning to not edit them manually
2021-03-26 10:50:06 +01:00
Badlop
1c74bb7131
Update Japanese translation (thanks to Mako N)
2021-03-26 10:48:00 +01:00
Badlop
f577715468
Update Greek translation (thanks to Michalis and Stratos Kostidis)
2021-03-26 10:47:13 +01:00
Badlop
1cd4f730b9
Update Esperanto translation (thanks to phlostically)
2021-03-26 10:46:48 +01:00
fdie
edae3c9cc5
fix gen_pubsub_node:get_state return value
2021-03-25 14:32:24 +01:00
Badlop
815030a4f0
I think no need to be so strict in mix dependencies versions
2021-03-24 23:03:53 +01:00
Badlop
82bd7e5d5b
Update rebar dependencies
2021-03-24 23:03:46 +01:00
Badlop
453d504fb7
No need to ignore ejabberd.app.src, it was recently removed, see 3c16f214
2021-03-19 15:13:20 +01:00
Badlop
627564983b
No need to ignore XmppAddr*, it was removed in 2018, see 0bb14d16
2021-03-19 15:13:18 +01:00
Badlop
7e8b59a0aa
No need to ignore extract_translations, it was removed in 2017, see cd098c5a
2021-03-19 15:13:15 +01:00
Badlop
9bf37d7fdf
No need to ignore doc/, it was removed in 2015! See 1854b5e4
2021-03-19 15:13:04 +01:00
Badlop
02830a8b76
Tell git to ignore .deps-update/ used by tools/update-deps-releases.pl
2021-03-19 15:12:52 +01:00
Badlop
d8f01080ce
Cache rebar2 deps/ dir in Travis for a 10% speedup approx.
2021-03-19 15:12:50 +01:00
Badlop
1f88a26f60
When unregistering XMPP account close its MQTT sessions ( #3426 )
2021-03-19 15:12:48 +01:00
Badlop
c6f2d0c3eb
Improve wording of sql_pool_size option documentation ( #2541 )
2021-03-19 15:12:43 +01:00
Badlop
13e1307ab1
When occupant is banned, remove his subscriptions too ( #2451 )
2021-03-18 16:15:17 +01:00
Badlop
f6c6ff561a
Document that send_stanza_c2s requires an existing sender C2S session
2021-03-18 16:15:07 +01:00
Badlop
c4d45ec08c
Revert "Close pgsql ports on ejabberd_sql process termination ( #2541 )"
...
This reverts commit 404ae56e07
.
2021-03-18 16:14:49 +01:00
Holger Weiss
7008ae231c
Don't fail on PEP unsubscribe
...
Don't crash if a PEP node is explicitly unsubscribed. This fixes a
regression introduced by 45eb49125b
.
Thanks to Melvin Keskin for reporting the bug.
2021-03-16 17:26:47 +01:00
Badlop
14c8e1226f
Generate enabled_backends in ejabberd.app instead of configure ( #3549 )
...
Passing a list of atoms in vars.config.in (introduced in 3c16f214
)
breaks rebar2 in "make rel"
2021-03-15 10:11:05 +01:00
Badlop
8b78d27f30
Update Elixir logger, so logging should work now
2021-03-12 20:50:54 +01:00
Badlop
2fbd447f64
Update gitignore for Elixir, mnesiadb/ was renamed to database/ in ef6af11f1
2021-03-12 20:50:51 +01:00
Badlop
14d82fa600
Add mod_doc/0 to mod_presence_demo.ex so compiler stops complaining
2021-03-12 20:50:49 +01:00
Badlop
33fc320f1d
Update jiffy and epam to fix compilation ( #3413 )
2021-03-12 20:50:46 +01:00
Badlop
9fbea40721
Sort dependencies alphabetically, it makes manual checking easier
2021-03-12 20:50:44 +01:00
Badlop
9525978f26
Fix INTRUDER and add padding to second text line
...
b41ce8828c (r47461104)
2021-03-12 20:50:41 +01:00
badlop
75a4e23996
Merge pull request #3458 from nosnilmot/sqlite3-macos
...
Remove external dependency on sqlite3 for macos
2021-03-09 01:18:00 +01:00
Badlop
404ae56e07
Close pgsql ports on ejabberd_sql process termination ( #2541 )
2021-03-09 00:58:36 +01:00
Badlop
2946df357c
Update FORM_TYPE from captcha to register ( #3045 )
2021-03-09 00:58:31 +01:00
Badlop
5318bf3743
If stanza is type error, allow it passing ( #3290 )
2021-03-09 00:58:22 +01:00
Badlop
0f43c2c528
New command get_user_subscriptions ( #3403 )
2021-03-09 00:57:41 +01:00
Badlop
b5da0ffd7e
Show in WebAdmin the erlang node where the room resides
...
https://www.ejabberd.im/forum/29687/muc-mangement#comment-67685
2021-03-09 00:57:35 +01:00
Badlop
7ee018ad23
Obtain and provide photo type in vCard LDAP ( #3541 )
2021-03-08 16:33:30 +01:00
Badlop
31884f6c9d
Fix remove_mam_for_user_with_peer when removing room archive ( #3536 )
2021-03-08 16:33:23 +01:00
Badlop
c46bf7d56b
Remove support for HiPE, it was experimental and Erlang/OTP 24 removes it
2021-03-08 16:33:16 +01:00
Badlop
1b155ed6e7
Add --enable-lua, and use that for luerl instead of --enable-tools ( #3508 )
...
--enable-tools is for development tools, but prosody2ejabberd is used at
runtime, so better move luerl to --enable-lua
2021-03-08 16:33:06 +01:00
Badlop
e648cd7397
Sort libraries alphabetically, so they're easier to check manually
2021-03-08 16:33:03 +01:00
Badlop
3c248745e5
crypto:hmac is removed in Erlang/OTP 24, use our wrapper
2021-03-04 16:41:27 +01:00
Badlop
c45b526ec3
Update sql_query record to handle the Erlang/OTP 24 compiler reports
...
As mentioned in the Erlang/OTP 24 announcement:
"Compiler warnings and errors now include column numbers
in addition to line numbers."
2021-03-04 16:41:24 +01:00
Badlop
bf1600891b
Get back description and simplify processing ( #3507 )
2021-03-04 16:41:22 +01:00
Badlop
b139eb2fb3
Tell git to ignore rebar.lock used by rebar3
2021-03-04 16:41:19 +01:00
Badlop
9bd4f60c8a
Added badges for github actions, coveralls.io and weblate
2021-03-04 16:41:15 +01:00
Paweł Chmielowski
ca5d5f3b4c
Use monitors to track muc rooms
...
This should prevent keeping rooms that were hard killed from in
online table.
2021-03-03 11:32:05 +01:00
badlop
7209486386
Merge pull request #3507 from slezakattack/master
...
Allow ejabberd to be compatible as a dependency for an Erlang project…
2021-03-02 19:01:33 +01:00
Badlop
bb8bdf57b3
New Github Actions workflow to test Dialyzer, Xref, Options and Hooks
2021-02-23 19:45:53 +01:00
Badlop
c8bec07c45
Clone to the dir specified in rebar.config... useful for erlang-sqlite3
2021-02-23 19:45:41 +01:00
Holger Weiß
b41ce8828c
Add question/answer-based CAPTCHA script ( #3533 )
...
* New captcha.sh question/answer based
* Keep original CAPTCHA script
Rather than replacing the original CAPTCHA script, keep it next to the
new one, for the moment.
* CAPTCHA-ng script cleanup
* remove various bashisms
* replace all echos with printf
+ add quotations to many variables
Co-authored-by: Adrien Bourmault <neox@os-k.eu>
Co-authored-by: nico wellpott <nico@magicbroccoli.de>
2021-02-22 09:34:02 +01:00
Badlop
3720b42b0f
When using rebar3, "make dialyzer" needs just a single call
2021-02-19 17:00:39 +01:00
Badlop
69be0abdba
Fix Dialyzer warning about function contract that changed in fad14ff31
2021-02-19 17:00:35 +01:00
Badlop
09f5e2aa03
Improve support for rebar3 in "make translations"
2021-02-19 17:00:32 +01:00
Paweł Chmielowski
7da033f733
Fix muc tests
2021-02-17 13:09:29 +01:00
Paweł Chmielowski
14871c54ac
Take in account subscriber's affiliation when checking access to moderated room
...
This should fix issue #3525
2021-02-17 10:45:30 +01:00
Michael Slezak
3c16f21413
Allow ejabberd to be compatible as a dependency for an Erlang project using rebar3
2021-02-16 10:28:30 -07:00
Paweł Chmielowski
14d87cb5e9
Skip reading roster in one more case in mod_caps
2021-02-16 13:39:34 +01:00
Badlop
72ecf91f08
Return modules errors in set_vcard callback ( #3502 )
2021-02-16 13:09:33 +01:00
Badlop
4bc57f76eb
make hooks and options work with rebar3 too
2021-02-16 13:09:30 +01:00
Badlop
18c9f5eedf
Create annotated tags, meant for releases, instead of lightweight ( #3512 )
2021-02-16 13:09:27 +01:00
Badlop
4495f0f0b9
For OTP<22 define LAGER macro in ext_mod like in rebar.config ( #3493 )
2021-02-16 13:09:21 +01:00
Paweł Chmielowski
fad14ff319
Make fetching roster in mod_privacy lazy
2021-02-16 10:57:55 +01:00
Paweł Chmielowski
8cb7ff7a88
Add fallback branch to last commit
2021-02-16 10:40:35 +01:00
Paweł Chmielowski
96929a5084
Don't request roster in mod_caps when not needed
2021-02-16 10:13:29 +01:00
Stu Tomlinson
1f194e417d
fix eldap certificate verification ( #3528 )
...
Reported in #3527 . Add hostname matching function, and specify SNI
Also, OTP 23 dropped backwards compatibility for 0, 1, 2 values for verify, so
replace with combination of verify_none/verify_peer and fail_if_no_peer_cert
as appropriate
2021-02-15 14:29:58 +01:00
Badlop
e3fd120fd4
According to fast_tls, only atom and binary may accompany error tuple
2021-02-11 20:38:51 +01:00
Badlop
7b8bd960c6
Fix URL of CAPTCHA section
2021-02-11 20:38:45 +01:00
Paweł Chmielowski
d147c733bb
Update xmpp
2021-02-10 10:10:24 +01:00
Paweł Chmielowski
3d7fa15be7
Add argument guards to roster commands
2021-02-09 13:46:23 +01:00
Stu Tomlinson
6a0b01fe7f
Move sql directory from extra_src_dirs to src_dirs ( #3520 )
...
rebar3 needs sql directory as a src dir so that tests can reference sql
files, so sql dir was added to extra_src_dirs in d9c1befb
. It turns out
extra_src_dirs does unexpected unwanted extra things like copy all beam
files there too, so move sql dir to regular src_dirs
2021-02-08 13:02:50 +01:00
Frank
2d79a69719
Fix PONG responses ( #3515 )
...
Co-authored-by: Frank Diebolt <frank.diebolt@al-enterprise.com>
2021-02-04 19:57:20 +01:00
Badlop
a51e777c56
Try to fix coveralls report in Travis, related to commit 2f3f6f8b7
2021-02-04 11:27:47 +01:00
Badlop
1c3a7b7c96
Use the mysql service available in Travis
...
Xenial in Travis nowadays includes mysql 5.7
Reverted "Let Travis grab MySQL 5.6 from repo.mysql.com"
Reverted "Use static key for mysql repo" and related ones
2021-02-02 19:03:14 +01:00
Badlop
26ee3141a9
Improve prepare-tr so *.msg files inform to not edit them ( #3484 )
2021-02-02 18:58:36 +01:00
Badlop
75c0443df2
Test against newest 23.1.2, and remove useless intermediate 22.3
2021-02-02 18:58:32 +01:00
Marek
5eab8450e7
New listener for encrypted ejabberd_c2s
...
Add a new listener on port 5223 for the TLS-enabled ejabberd_c2s, which combined with proper SRV records allows passing the XEP-0368 compliance test.
2021-02-02 15:25:19 +01:00
Divine
22d76bd1a4
Fix specified key was too long ( #3513 )
...
* Fix specified key was too long
This adds the correct engine and sets it to utf8mb4 collate. Prevents "Specified key was too long; max key length is 1000 bytes" from happening.
* Make two import SQL files consistent
As suggested by @prefiks
2021-02-01 22:50:33 +01:00
Badlop
bb397bb424
Fix bug handling jid:decode/1 return, introduced in cdb286d1d
( #3461 )
2021-02-01 00:10:33 +01:00
Badlop
b3d9c0d1f7
Fix bug in send_message introduced in 7fc500dae
( #3485 )
2021-02-01 00:09:18 +01:00
Badlop
d3aeed839d
Fix MAM tests that now fail due to commit d6e9e0342
( #3506 )
2021-02-01 00:09:10 +01:00
Badlop
c0b364839c
Fix typo in Weblate URL
2021-02-01 00:08:22 +01:00
Holger Weiss
6a6b771e0b
mod_mam: Add missing semicolon
2021-01-29 20:27:07 +01:00
Holger Weiss
58e28e82bb
Merge remote-tracking branch 'processone/pr/3506'
...
* processone/pr/3506:
Remove queryid from MAM fin element
2021-01-29 19:25:40 +01:00
Paul Fariello
d6e9e03422
Remove queryid from MAM fin element
...
According to xep, fin element is not supposed to have a queryid attribute.
2021-01-29 19:21:45 +01:00
Jerome Sautret
fca41796c0
Fix version number
2021-01-29 16:00:35 +01:00
Jerome Sautret
b1fec7dc29
Bump version in mix.exs
2021-01-29 10:01:29 +01:00
Paweł Chmielowski
8c5b312601
Add cache for displayed groups in ldap_shared_cache
...
This is based on pull request by Ivan Agarkov:
https://github.com/processone/ejabberd/pull/952
2021-01-28 12:57:47 +01:00
Paweł Chmielowski
ee3ecc6cc0
Update mix deps
2021-01-28 11:04:53 +01:00
Paweł Chmielowski
f708bbe2e8
Update deps
2021-01-28 10:42:16 +01:00
Paweł Chmielowski
f7004f793d
Fix delete_old_message when using sqlite spool table
...
This fixes issue #3503
2021-01-27 19:41:21 +01:00
Badlop
5c3b3d22db
Other minor translation updates
2021-01-27 18:18:18 +01:00
Badlop
cfd1c710f2
Update Chinese translation (thanks to Shelley Shian)
2021-01-27 18:18:15 +01:00
Badlop
601a61249e
Update Portuguese (Brazil) translation (thanks to Wellington Terumi Uemura)
2021-01-27 18:17:56 +01:00
Badlop
8180b6b54e
Update Norwegian Bokmål translation (thanks to Allan Nordhøy)
2021-01-27 18:13:58 +01:00
Badlop
a260270483
Update Indonesian translation (thanks to Uira)
2021-01-27 18:12:26 +01:00
Badlop
9b9a2d380b
Update German translation (thanks to Maximilian Trummer)
2021-01-27 18:10:08 +01:00
Badlop
5ec8cf9e09
Document the recent oauth_cache_rest_failure_life_time option
2021-01-27 17:44:17 +01:00
Badlop
248d8b8aff
Update ejabberd man file ( #3490 )
2021-01-27 17:25:46 +01:00
Badlop
f1fe3ce5dc
Remove old and obsolete win32/ ( #3487 )
2021-01-27 17:11:00 +01:00
Badlop
5eb766e2d2
Remove old and obsolete examples/transport-configs/ ( #3487 )
2021-01-27 17:10:56 +01:00
Badlop
6e0161470e
Update newest copyright year to 2021 ( #3464 )
2021-01-27 17:02:06 +01:00
Paweł Chmielowski
e4225174d5
Update deps to tagged versions
2021-01-27 11:43:33 +01:00
Paweł Chmielowski
faaee94060
Add oauth_cache_rest_failure_life_time option
...
This allows to use shorted life time for failures in rest oauth
backend than specified in oauth_cache_life_time.
2021-01-27 11:23:39 +01:00
Paweł Chmielowski
3516d2053c
Add 'ejabberdctl foreground-quiet'
...
This starts ejabberd without detaching process but setups
console logging to display only critical messages.
2021-01-27 09:24:05 +01:00
Paweł Chmielowski
b977320091
Don't fetch subscribers list in room_unused_*
2021-01-26 11:13:23 +01:00
Paweł Chmielowski
bb87b6f948
Rename function arguments
2021-01-25 20:00:07 +01:00
Paweł Chmielowski
07d28c3898
Skip reading pep nodes that we know won't be requested due to caps
2021-01-25 19:58:38 +01:00
Holger Weiss
6c2bd91f01
ejabberd_stun: Block loopback addresses by default
...
Don't accept loopback addresses as TURN peers by default. This makes
sure the TURN service won't allow remote clients to access local UDP
services.
However, this will break the case where the 'turn_ipv4_address' was set
to 127.0.0.1 as fallback and TURN worked "by accident" if both clients
were using the same TURN service. The service then talked to itself on
the loopback interface.
2021-01-22 16:20:24 +01:00
Holger Weiss
b6f86187f3
Update 'stun' dependency
...
The 'stun' application now rejects Teredo and 6to4 TURN peers
unconditionally. Therefore, remove those networks from the default
'turn_blacklist'.
2021-01-22 16:12:48 +01:00
Badlop
8098b83114
Revert "mod_register language reworked"
...
This reverts commit 3906b5300c
.
# Conflicts:
# src/mod_register_web.erl
2021-01-22 14:23:05 +01:00
Badlop
e4155b6f16
Revert "ejabberd_oauth language reworked"
...
This reverts commit 3d1efd14dc
.
2021-01-22 14:23:02 +01:00
Badlop
50ebe2e415
Revert "mod_roster language reworked"
...
This reverts commit 72cf63c0a8
.
2021-01-22 14:22:59 +01:00
Badlop
adfcbfdcba
Fix URL of ejabberd_po, use the final one
2021-01-22 13:39:02 +01:00
Badlop
cfdd3aa4f8
Those gettext PO files are now available in the new ejabberd_po repository
2021-01-22 13:32:07 +01:00
Badlop
0b55ded612
When running "make translations" use the external ejabberd_po repository
2021-01-22 13:16:42 +01:00
Jing Sun
5af7532504
mod_muc/mod_muc_room: add option limits for password and captcha_whitelist ( #2255 )
2021-01-21 16:58:05 +01:00
Paweł Chmielowski
e0101338af
Let's update xmpp once more
2021-01-21 16:27:24 +01:00
Paweł Chmielowski
6efdbb17e4
Revert "Update xmpp"
...
This reverts commit a4b06df604
.
Needs more work, breaks some tests.
2021-01-21 15:25:10 +01:00
Paweł Chmielowski
5212b0aaa6
Validate affiliations in set_room_affiliation command
2021-01-21 14:20:30 +01:00
Paweł Chmielowski
a4b06df604
Update xmpp
...
This brings memory usage optimization for detached sessions
2021-01-21 13:44:07 +01:00
badlop
c5f0dc6e5b
Merge pull request #3488 from comradekingu/patch-3
...
mod_roster language reworked
2021-01-18 13:32:21 +01:00
Allan Nordhøy
72cf63c0a8
mod_roster language reworked
2021-01-16 09:17:44 +01:00
Badlop
bc08e75f75
Update Greek translation (thanks to rafaila42)( #3484 )
2021-01-15 19:02:40 +01:00
badlop
9b1da6f5f5
Merge pull request #3486 from comradekingu/patch-2
...
ejabberd_oauth language reworked
2021-01-15 17:52:33 +01:00
Badlop
2c06f48b6b
Update Greek translation (thanks to rafaila42)( #3484 )
2021-01-14 13:25:47 +01:00
Allan Nordhøy
3d1efd14dc
ejabberd_oauth language reworked
2021-01-14 10:21:07 +01:00
Paweł Chmielowski
7fc500dae6
Don't include empty <subject/> in messages sent by send_message
...
Please refer issue #3485
2021-01-13 20:58:13 +01:00
Badlop
b6d90cc55c
Allow non-occupant non-subscribed service admin send private MUC message ( #3474 )
2021-01-13 16:49:45 +01:00
Badlop
e1a79ba1b0
Run "make translations"
2021-01-13 16:20:58 +01:00
badlop
d01cd2976b
Merge pull request #3483 from weblate/weblate-ejabberd-ejabberd
...
Translations update from Weblate
2021-01-13 16:19:31 +01:00
Allan Nordhøy
f98453fd28
Update Norwegian Bokmål translation
...
Currently Norwegian Bokmål translated at 49.5% (326 of 658 strings)
141 fuzzy + 191 not translated = 332 remaining
https://hosted.weblate.org/projects/ejabberd/ejabberd/nb_NO/
2021-01-13 16:18:21 +01:00
uira
1b559daef2
Update Indonesian translation
...
Currently Indonesian translated at 57.1% (376 of 658 strings)
80 fuzzy + 202 not translated = 282 remaining
https://hosted.weblate.org/projects/ejabberd/ejabberd/id/
2021-01-13 16:18:21 +01:00
Allan Nordhøy
db7197925c
Update Norwegian Bokmål translation
...
Currently Norwegian Bokmål translated at 45.4% (299 of 658 strings)
129 fuzzy + 230 not translated = 359 remaining
https://hosted.weblate.org/projects/ejabberd/ejabberd/nb_NO/
2021-01-13 16:18:21 +01:00
Licaon Kter
8232fb767c
New Romanian translation
...
https://hosted.weblate.org/projects/ejabberd/ejabberd/ro/
2021-01-13 16:18:21 +01:00
Badlop
59d5cf4d47
Uniformize terms create->register, delete->unregister ( #3482 )
2021-01-13 16:12:00 +01:00
badlop
aff1a62607
Merge pull request #3482 from comradekingu/patch-1
...
mod_register language reworked
2021-01-13 15:57:29 +01:00
badlop
ea253ba914
Merge pull request #3480 from Neustradamus/git
...
Remove .git ending from links
2021-01-13 15:53:32 +01:00
Paweł Chmielowski
95c157409b
Fix handling of log_rotate_size: infinity
...
This should fix issue reported in #3462
2021-01-13 11:48:46 +01:00
Allan Nordhøy
3906b5300c
mod_register language reworked
2021-01-13 09:35:36 +01:00
Neustradamus
34f9eaa8e9
Remove .git ending from links
...
Remove .git ending from links
2021-01-13 03:22:41 +01:00
Badlop
83cea3c23e
Mention gettext and weblate to update translations
2021-01-12 18:33:27 +01:00
J. Lavoie
f96502607d
Update French translation
...
Currently French translated at 70.0% (461 of 658 strings)
72 fuzzy + 125 not translated = 197 remaining
https://hosted.weblate.org/projects/ejabberd/test-ejabberd/fr/
2021-01-12 13:15:14 +01:00
Badlop
1f492a4c8a
Update Catalan translation
2021-01-12 13:01:03 +01:00
Badlop
557b9858c6
Update translatable, and translated strings
2021-01-11 21:15:13 +01:00
Badlop
50f74c932b
Replace Jabber->XMPP and Ejabberd (thanks to Neustradamus)( #3469 )
2021-01-11 21:11:20 +01:00
Paweł Chmielowski
446cb485ac
Don't use REPLACE for upsert when there are "-" fields.
...
This should fix problem reported in #3476
2021-01-11 14:20:17 +01:00
Badlop
402b301eb5
Update Spanish translation
2021-01-11 13:14:41 +01:00
Badlop
3a371bfbe5
Run "make translations"
2021-01-11 13:11:14 +01:00
Badlop
a670451447
Apply cosmetic changes from documentation
2021-01-08 18:34:38 +01:00
Paweł Chmielowski
9be3d948b2
Make ext_mod compile module with debug_info flags
...
This should fix issue #3472
2021-01-07 15:10:39 +01:00
Paweł Chmielowski
d9588feae5
Add sql script to migrate mysql from old schema to new
2021-01-07 13:54:53 +01:00
Holger Weiss
7844d86ea3
Allow for listening on privileged ports
...
Let systemd give ejabberd the capability to bind to ports below 1024.
2021-01-06 18:56:08 +01:00
Holger Weiss
e919171393
ejabberd_systemd: Fix comment
2021-01-06 18:52:22 +01:00
Holger Weiss
d7087c3952
Merge remote-tracking branch 'processone/pr/3471'
...
* processone/pr/3471:
Integrate nicely with systemd
2021-01-06 18:47:25 +01:00
Neustradamus
3bf51a0994
+ ejabberd mucroom logs ( #3468 )
...
+ ejabberd mucroom logs
2021-01-06 17:33:29 +01:00
Holger Weiss
6f026ca26d
Integrate nicely with systemd
...
Support systemd's watchdog feature and enable it by default in the unit
file, so that ejabberd is auto-restarted if the VM becomes unresponsive.
Also, set the systemd startup type to 'notify', so that startup of
followup units is delayed until ejabberd signals readiness. While at
it, also notify systemd of configuration reload and shutdown states.
Note: "NotifyAccess=all" is required as long as "ejabberdctl foreground"
runs the VM as a new child process, rather than "exec"ing it. This way,
systemd views the ejabberdctl process itself as the main service
process, and would discard notifications from other processes by
default.
2021-01-06 00:20:12 +01:00
Neustradamus
4132aedb9c
XEP-0033 ( #3467 )
...
XEP-0033
2021-01-05 10:05:42 +01:00
Badlop
b8178c79a7
Clarify documentation of log_rotate_size option ( #3462 )
2021-01-04 13:05:28 +01:00
Paweł Chmielowski
aefe3f8585
Document ldap_userjidattr option
2020-12-31 10:30:12 +01:00
ethoms
cdb286d1d1
Add multi-domain support (and flexibility) to LDAP shared roster (rev2). ( #3461 )
2020-12-31 10:19:43 +01:00
Pouriya
c056002f7c
JWT enhancement ( #3460 )
...
* ref: run the default JWT verifier as hook callback
* ref: add system timestamp to JWT debug log
2020-12-28 10:06:45 +01:00
Stu Tomlinson
1f60f5d8af
Remove external dependency on sqlite3 for macos
...
On macos, erlang-sqlite3 is built using amalgamated sqlite3 library, there is
no external sqlite3 dependency required
2020-12-23 12:41:13 +00:00
Paweł Chmielowski
bd08f408ca
Fix invalid timezone in mod_time (issue #3454 )
2020-12-22 11:37:25 +01:00
Badlop
3cf5ceb106
Document that the workaround is only needed for OTP lower than 23.2
2020-12-18 21:21:27 +01:00
Badlop
705f401961
Fix a pair of pubsub specs to please Dialyzer
2020-12-18 20:40:26 +01:00
Badlop
ac24d6ee9f
Fix typo in case clause detected by Dialyzer
2020-12-18 20:40:17 +01:00
Paweł Chmielowski
cb6322a3a7
Add option to check for missing hex releases to update script
2020-12-18 16:43:20 +01:00
Paweł Chmielowski
9c221848d7
Correctly sort mixed versions vX.Y and X.Y in update-deps script
2020-12-18 16:42:41 +01:00
Stu Tomlinson
2f3063def6
Fix sqlite3 dependency version ( #3452 )
...
erlang-sqlite3 versions got messed up, causing ejabberd build to regress
to 1.1.6 from Jan 2018 when using rebar3 which fails to build with OTP23.
Update to correctly tagged version 1.1.9, which also has matching hex.pm
package, fixes this.
2020-12-18 12:42:18 +01:00
Paweł Chmielowski
9f851008f6
Update spec for get_room_pid
2020-12-18 12:36:31 +01:00
Badlop
1b7502acbc
Old passwd scram tuples do not conform to current records definitions
2020-12-18 10:54:59 +01:00
Paweł Chmielowski
2ab7da1e8f
Use better fallback value for room activity time when skipping room in decide_room
2020-12-17 09:55:12 +01:00
Mickaël Rémond
371c0777bb
Update Dockerfile
2020-12-16 08:40:30 +01:00
Mickaël Rémond
538eeb3d6f
Create Dockerfile
2020-12-16 08:40:05 +01:00
Mickaël Rémond
8d052fe339
Create devcontainer.json
2020-12-16 08:32:15 +01:00
Licaon_Kter
65c5208905
Reword auth_scram_hash info ( #3448 )
2020-12-15 17:47:56 +01:00
Paweł Chmielowski
778c84dac9
Update xmpp dep in mix
2020-12-15 17:07:06 +01:00
Paweł Chmielowski
28186ddf19
Document auth_scram_hash option
2020-12-15 15:40:16 +01:00
Paweł Chmielowski
8dfe7e977a
Bump version in mix.exs
2020-12-15 15:27:16 +01:00
Paweł Chmielowski
b345632a9a
Update changelog
2020-12-15 15:26:23 +01:00
Paweł Chmielowski
34e615d854
Update deps in mix
2020-12-15 15:24:57 +01:00
Paweł Chmielowski
d8d9ef32ad
Make anonymous auth not override sasl mechaninsm offered by other modules
...
This stop overriding store_type when anonymous is enabled with other
auth modules, we don't really need that since anonymous is not taking
passwords anyway, and this was disabling scram mechanisms.
This fixes issue #2803 .
2020-12-14 16:42:14 +01:00
Paweł Chmielowski
a9ed26e484
Fix getting age of newly created rooms in rooms_unused_*
2020-12-14 09:47:25 +01:00
Pouriya
a76531b90b
feat: add hook to check decoded JWT after success authentication ( #3446 )
2020-12-14 08:14:58 +01:00
Paweł Chmielowski
d64e453364
Update deps
2020-12-10 15:00:46 +01:00
Paweł Chmielowski
af9d642a71
Improve auth_mnesia:transform
2020-12-10 14:02:28 +01:00
Paweł Chmielowski
6a659d7475
Improve handling of old scram data in auth_mnesia
2020-12-10 14:00:13 +01:00
Paweł Chmielowski
7da81249f8
Update xmpp once more
2020-12-10 13:22:32 +01:00
Paweł Chmielowski
8214a4fa79
Update xmpp
2020-12-10 12:41:26 +01:00
Paweł Chmielowski
e048bc6712
Update deps to point to tags
2020-12-08 15:11:09 +01:00
Paweł Chmielowski
e5cad9be65
Add hash to scramed password stored in mnesia by earlier version
2020-12-08 12:18:03 +01:00
Paweł Chmielowski
1dc0ecd1e9
Allow to use different hash for storing scram passwords
2020-12-08 12:06:52 +01:00
Paweł Chmielowski
0c09599d7b
Normalize names passed to destroy_room
2020-12-08 09:19:29 +01:00
badlop
e95ae66d3c
Merge pull request #3435 from fdie/fix_odbc_binary_errors
...
also convert embedded errors to binary
2020-12-04 13:48:13 +01:00
Paweł Chmielowski
5f9d480f6a
Simplify updating disk room options in set_room_affiliation
2020-12-04 13:06:53 +01:00
Paweł Chmielowski
d34227cae1
Use specialized upsert with mysql
2020-12-04 13:03:55 +01:00
Paweł Chmielowski
72867f8d1e
Fix more places that needed changes after scram.erl api modifications
2020-12-04 09:20:59 +01:00
Frank Diebolt
8f04491a4d
also convert embedded errors to binary
2020-12-03 19:56:58 +01:00
Paweł Chmielowski
0371b0f664
Add support for SCRAM-SHA-{256,512}-{PLUS} authentication
2020-12-03 15:07:09 +01:00
Paweł Chmielowski
02cc212f16
Fix typo in last commit
2020-12-01 15:39:17 +01:00
Paweł Chmielowski
0fe64674ee
Make decide room better handle rooms that were just hibernated
2020-12-01 15:30:23 +01:00
Paweł Chmielowski
e937ff62fe
Handle unix sockets in misc:ip_to_list
2020-12-01 15:29:58 +01:00
Badlop
d75d69d5d5
Trigger user_send_packet when send_stanza API is called ( #3431 )
2020-12-01 13:14:24 +01:00
badlop
f48f9fee2e
Merge pull request #3429 from mtdcr/systemd-foreground
...
Let systemd start ejabberd in foreground
2020-11-25 13:05:14 +01:00
Andreas Oberritter
5c6ffaafd6
Let systemd start ejabberd in foreground
...
Daemons started by systemd shouldn't fork into the background if
possible, because if multiple forked processes exist, systemd has
a hard time determining the main process ID.
In a memory constrained environment, the OOM killer may cause
ejabberd to exit without any trace. Because epmd keeps running,
systemd wouldn't notice the error condition, and as a result it
won't restart the server.
With ejabberd running in foreground, systemd is able to obtain the
correct exit code (137 in this case, instead of 0) and schedules a
restart. The administrator can then see what happend by looking at
systemctl status ejabberd.
2020-11-19 20:43:51 +01:00
Badlop
3581d90d9d
Provide name when pushing new roster item in shared roster group ( #3427 )
2020-11-19 17:07:23 +01:00
Paweł Chmielowski
9e1f3862cb
Fix room_unused_destroy on hibernated rooms
2020-11-19 09:31:14 +01:00
Paweł Chmielowski
c2a3f037bb
Update muc_room just_created timestamp when message is received
...
This together with last history message is used by room_unused_* command
to determine for how long room was not used, this change allow us to skip
checking history, and works even when history is disabled.
2020-11-18 17:14:28 +01:00
Paweł Chmielowski
bf1aacefcb
We don't use persistent field in decide_room
2020-11-18 16:49:43 +01:00
Paweł Chmielowski
e306cb0797
Fix logic that determines room age when history_size=0
2020-11-18 16:49:43 +01:00
badlop
1c6221d8a0
Merge pull request #3402 from nosnilmot/docker-fixes
...
Fix docker DB initialization
2020-11-17 16:48:13 +01:00
Paweł Chmielowski
2e8023158d
Allow room_unused_list/destroy work on hibernated rooms
...
This required adding hibernation time to data stored for room to be able
determine how old was a room, rooms that aren't stored with that
information will use node start time as timestamp for that.
2020-11-16 16:05:16 +01:00
badlop
ff98cb4e15
Merge pull request #3399 from nosnilmot/redis3-configure_deps
...
Improve rebar3 configure-deps plugin output
2020-11-13 17:04:22 +01:00
badlop
0f01019e06
Merge pull request #3395 from nosnilmot/rebar3
...
rebar3 support for main build process
2020-11-13 12:13:14 +01:00
Badlop
f9b8dfd400
Update dependencies
2020-11-11 15:53:16 +01:00
Paweł Chmielowski
81e872c110
Don't do double utf-8 conversion on translated strings in str:format
...
This caused garbled text in some places in webadmin when using language
that used characters > 128.
Thanks to chengshq for noticing this and providing preliminary patch.
2020-11-09 12:20:35 +01:00
Badlop
9ed2ca5079
Document sql_odbc_driver option (copied from docs site)
2020-11-06 16:39:02 +01:00
Badlop
e7e9ca54df
Document outgoing_s2s_ipv4_address and ipv6 options ( #3396 )
2020-11-06 15:52:33 +01:00
Holger Weiss
23a18b1a60
Apply cosmetic changes to outgoing s2s IP options
2020-11-04 13:12:06 +01:00
Holger Weiss
0a88f9c8a9
Merge remote-tracking branch 'processone/pr/3396'
...
* processone/pr/3396:
Add outbound s2s out interface (ipv4/ipv6)
2020-11-04 12:19:49 +01:00
Paweł Chmielowski
de51ba331e
Make sure that jid used as base in mam xml_compress is bare
2020-11-04 10:56:49 +01:00
Holger Weiss
d37b2f851d
mod_push: Fix log message argument
2020-11-04 10:10:20 +01:00
Holger Weiss
f40c5c304d
mod_push: Fix API call return type on error
...
A call that yields a 'rescode' isn't supposed to return an error tuple.
2020-11-04 09:07:30 +01:00
Holger Weiss
37c75f556d
mod_push: Support cache config changes on reload
2020-11-04 09:04:30 +01:00
Paweł Chmielowski
ec61c2f3dc
Change split character in PROXY_USER from \x04 to :
...
This is clearly typo
2020-10-29 16:36:18 +01:00
Paweł Chmielowski
d02c7d3b3b
Update eimp
...
This makes eimp compile correctly agains headers from png12
2020-10-26 16:12:58 +01:00
Paweł Chmielowski
a2dfd2e0b9
Update eimp
2020-10-26 10:53:52 +01:00
Paweł Chmielowski
b4ea1625e4
Don't use same value in cache for user don't exist and wrong password
...
By doing this check_password that returned info about mismatched password
caused user_exists checks performed after that to return wrongly that
account doesn't exist.
2020-10-22 11:10:22 +02:00
Paweł Chmielowski
7655e10ba4
Add better error reporting to mod_muc_admin commands
2020-10-20 17:57:19 +02:00
Badlop
b64fff1faa
Document that send_direct_invitation is asynchronous
2020-10-16 15:24:58 +02:00
Badlop
f1e04639bb
Support for MAM Flipped Pages ( #3398 )
2020-10-15 21:42:43 +02:00
Paweł Chmielowski
73dbd34f95
Store room options in create_room_with_opts only if we will start room
...
Previously we could overwrite existing room options and then later return
error because room was already started.
2020-10-15 16:24:50 +02:00
Jerome Sautret
6bbae4cea2
send_direct_invitation command is now asynchronous
...
EJABS-3593
2020-10-15 11:40:22 +02:00
Paweł Chmielowski
b95d67aefb
Make websocket send put back pressure on c2s process
...
Previously c2s was free to generate data to send in unlimited manner, and
just generate queue of messages that are waiting to be send. This could lead to
hitting timouts in stream management ack handling (if c2s generate lot of
packages, after which <r> request was sent, client could even not receive it
before timeout was triggered on server waiting for corresponding <a>).
This changes makes c2s process wait for data being sent to tcp socket
associated with websocket connection, which should help with this problem.
2020-10-13 14:57:33 +02:00
Paweł Chmielowski
73f8aded17
Make mod_muc_admin command work correctly with hibernated rooms
...
This should first try to unhibernate rooms before trying to send messages
to processes handling them.
2020-10-13 13:00:57 +02:00
Jerome Sautret
fdda572c9a
Added sql_odbc_driver option for mssql db
...
Add an option to choose the ODBC driver when sql_type is set to mssql
2020-10-08 16:23:34 +02:00
Holger Weiss
e4d6007293
ejabberd_stun: Rename Logger filter
...
Don't overwrite the Logger filter added by the 'stun' application (which
appends metadata to STUN/TURN log messages).
Closes processone/stun#31 .
2020-10-01 16:37:36 +02:00
Holger Weiss
df58ee924f
mod_register: Allow for account-removal-only setup
...
Since commit de91618070
, it was no longer
possible to configure mod_register so that only account removal (i.e.,
no registration) is permitted. Revert to the previous behavior which
allows admins to freely configure account registration and removal via
separate access rules.
2020-09-29 06:11:30 +02:00
Stu Tomlinson
d9c1befbfc
Add sql dir to extra_src_dirs
...
When running ct under rebar3, add sql dir to extra_src_dirs so sql
scripts are available to run clear_sql_tables
2020-09-25 18:45:41 +01:00
Stu Tomlinson
b173ca2fd0
Fix docker DB initialization
...
The docker local copies of DB initialization scripts were out of sync
with the master copies. Instead of updating local copies, adjust docker
compose to reference master copies directly.
Also change docker config to use docker volumes instead of mounted
directories for all DB data.
2020-09-25 18:13:35 +01:00
Stu Tomlinson
27ed8f5647
Improve rebar3 configure-deps plugin output
...
Switch to using rebar_utils:sh/2 instead of os:cmd/1 to spawn ./configure
so that output can be monitored and errors detected
2020-09-23 17:56:49 +01:00
Stu Tomlinson
714bc2d329
Miscellaneous rebar3 fixes
...
Correct Makefile clean targets
Fix a few more include() -> include_lib() for depedency includes
Use project_app_dirs to reference elixir app from rebar3 (lib_dirs is
no longer supported)
2020-09-23 15:52:21 +01:00
Badlop
d9cb6d1af7
log_rotate_date and log_rate_limit are deprecated since e4a8afb
( #3382 )
2020-09-22 13:58:56 +02:00
Paweł Chmielowski
583dd15beb
Make roster subscriptions work better with invalid roster state in db
...
Sometimes we can observer combinations of subscription/ask that shouldn't
happen normally, but can be generated with api calls, let's try to handle
that gracefully instead of crashing.
2020-09-22 13:48:49 +02:00
Daniel Kenzelmann
604cc9bb3a
Add outbound s2s out interface (ipv4/ipv6)
...
Adding options taking IPs as string:
outgoing_s2s_ipv4_address: "1.2.3.4"
outgoing_s2s_ipv6_address: "2000:1:1:1::1"
2020-09-21 22:18:46 +02:00
Stu Tomlinson
0fc1aea379
rebar3 support for main build process
...
This adds support for building, and installing, ejabberd using rebar3
A --with-rebar=/path/to/rebar3 option is added to configure to specify
which rebar to use
rebar2 compatibility is maintained, and the bundled rebar2 is still
used by default
2020-09-21 15:14:12 +01:00
Stu Tomlinson
385af01587
rebar3 plugin to support configure-deps command ( #3392 )
...
* rebar3 plugin to support configure-deps command
To allow running configure on dependencies prior to compilation, add a
rebar3 plugin to support the 'configure-deps' command introduced for
rebar2 in a7639fd4
* Fix compatibility with OTP < 23
binary_to_atom/1 is new to OTP 23
2020-09-21 13:51:31 +02:00
Stu Tomlinson
d9feed54a9
Add 'gitonly_deps' list to rebar config/script ( #3391 )
...
Add list of dependencies that should only be built from git, to support
building with rebar3 where deps do not have hex packages (or where the
package versions do not directly map to git tags).
This is required for elixir and luerl deps.
2020-09-21 13:49:58 +02:00
Paweł Chmielowski
b89f3c442c
Use os time instead of system time in values returned by mod_time
...
This timer should correctly work with time warps, and should fix
issue #3390
2020-09-15 12:11:15 +02:00
Badlop
9629601d0b
Refer to the XEP for standard names ( processone/docs.ejabberd.im#97 )
2020-09-11 12:27:05 +02:00
Holger Weiß
e9a053f7ac
Allow for filtering outgoing s2s stanzas ( #3381 )
...
Let 's2s_send_packet' hook callbacks filter stanzas, analogous to the
's2s_receive_packet' hook.
2020-09-07 10:12:19 +02:00
Badlop
a75966f1a2
Revert "Run user_receive_packet in send_message so MAM stores also incoming ( #3377 )"
...
This reverts commit 43f813d6f8
.
2020-09-04 11:37:18 +02:00
Badlop
43f813d6f8
Run user_receive_packet in send_message so MAM stores also incoming ( #3377 )
2020-09-03 17:47:11 +02:00
Stu Tomlinson
eada3b6e93
Fix syntax for lager dependency version ( #3379 )
...
Add 'tag' to lager dependency so that build with rebar3 will pull from
hex package instead of git checkout matching other dependencies
2020-09-03 15:35:34 +02:00
Paweł Chmielowski
90e0293df3
Update one more place where we had -include("xmpp.hrl")
2020-09-03 14:30:04 +02:00
Stu Tomlinson
bd11a00f8f
Use include_lib() to include headers from dependencies ( #3369 )
2020-09-03 13:45:57 +02:00
Paweł Chmielowski
54af08799d
Update xmpp dep
2020-09-03 13:43:49 +02:00
Stu Tomlinson
b71708aab9
Update base64url dep for rebar3 ( #3368 )
...
Update base64url version to match available hex package to support
compilation with rebar3
2020-09-03 13:40:04 +02:00
Badlop
a3be28b5c4
Provide room disco info identity name only when title was set ( #3370 )
2020-08-28 14:56:25 +02:00
Badlop
743b25448a
New hook to run when a room process is started ( #3353 )
2020-08-28 14:54:06 +02:00
Badlop
66c2f45bff
Show nick also in oneself list of subscriptions ( #3206 )
2020-08-26 19:32:29 +02:00
Badlop
8d969a4a9f
Always show MucSub subscribers nicks ( #3206 )(thanks to Snoopcatt)
2020-08-26 19:32:26 +02:00
Badlop
bf62cf3db6
Add link to docs about default and new database schemas
2020-08-26 11:46:23 +02:00
Holger Weiss
8daea451e3
mod_pubsub: Fix typo in 'hosts' documentation
...
Thanks to Melvin Keskin for spotting this.
2020-08-25 08:21:43 +02:00
Badlop
864188ad65
Mark dangerous buttons with CSS ( #3363 )
2020-08-24 16:44:07 +02:00
Holger Weiss
65260e2449
ejabberdctl: Avoid bashisms
...
Don't let the ejabberdctl script depend on non-POSIX syntax. (Also, fix
a typo and avoid tabs.)
2020-08-24 06:42:45 +02:00
Badlop
b9926c6796
Update opt files with "make options"
2020-08-21 18:09:03 +02:00
Badlop
e7575ab63f
For mod_vcard_* modules, redirect options to mod_vcard
2020-08-21 18:08:59 +02:00
Badlop
92913389a5
Fix vCard search by User when using Mnesia
...
Reported in
https://stackoverflow.com/questions/63499864/how-to-search-registered-user-on-ejabberd-server-from-client-side-using-smack-li
2020-08-20 16:46:06 +02:00
Holger Weiss
65be619907
mod_pubsub: Remove 'dag' node plugin documentation
...
Commit c9d3beb9eb
removed the 'dag'
node/nodetree plugins.
2020-08-18 06:50:33 +02:00
Paweł Chmielowski
ee76581b49
Add rebar.config* files when publishing to hex from mix
...
This should help with issue #3354
2020-08-11 10:09:23 +02:00
Badlop
842ec1494c
Fix to allow vhost admins to view WebAdmin menus ( #3355 )
2020-08-10 21:17:59 +02:00
Badlop
8aa0f7073f
Copy Erlang compilation definitions from rebar.config to Docker ( #3350 )
2020-08-10 12:29:40 +02:00
Paweł Chmielowski
8a645a2d3d
Don't forget not-persistent rooms in load_permanent_rooms
...
Only non-persistent rooms that we are storing are those that were hibernated
but also have mucsub subscribers in them. I don't think it makes sense to
destroy those rooms on restart/reload if we didn't destroy them in first
place when last member did leave room, let just handle those rooms like
they are persistent, and kill them only when all user unsubscribe from them
or they are destroyed from api.
2020-08-06 11:44:44 +02:00
Badlop
4a54395561
Improve explanations of cafile options
2020-08-03 15:18:50 +02:00
Mickael Remond
b109c5927e
Update mix.exs ejabberd version
2020-07-30 18:32:31 +02:00
Paweł Chmielowski
23beaa9fad
Update mix dependencies
2020-07-30 17:57:52 +02:00
Jerome Sautret
839229b5f0
Check if TERM is set before running a remote debug shell
2020-07-30 10:33:38 +02:00
Jérôme Sautret
b89b0f140a
Merge pull request #3346 from processone/ejabberd-3343
...
Allow passing Erlang VM args through vm.args config file
2020-07-30 10:31:12 +02:00
Mickael Remond
09454e1658
Allow passing Erlang VM args through vm.args config file
...
This can be used to define the Erlang cookie in a place that feels less foreign to
non Erlang users.
Fixes #3343
2020-07-29 17:35:59 +02:00
Paweł Chmielowski
828c0ad1e0
Update deps
2020-07-28 14:38:34 +02:00
Paweł Chmielowski
87bbd9cb02
Update stun
2020-07-28 14:04:00 +02:00
Paweł Chmielowski
70507a694c
Update changelog
2020-07-28 13:25:27 +02:00
Paweł Chmielowski
1b168e7d5c
Add support for unix socket in listeners
...
To use it you just need to set port value to "unix:/path/to/socket"
2020-07-28 12:19:30 +02:00
Paweł Chmielowski
d5935fd1ad
Don't log http errors when socket get closed after processing one request
2020-07-28 12:19:30 +02:00
Badlop
2bcd2c38a9
No need to check for Erlang 17, as 19 is the lowest supported anyway
...
This rollsback the conditional introduced years ago in c2753cd51c
2020-07-28 11:28:04 +02:00
Badlop
042cddb768
Elixir was required for quicktest, that was removed in 2018 51cbbf313
2020-07-28 11:26:41 +02:00
Badlop
e0b7fd72af
Update Stun to 1.0.36, and Esip too
2020-07-28 11:25:43 +02:00
Badlop
9c5e4454e4
Sort dependencies and improve some indentation
2020-07-22 18:03:28 +02:00
Badlop
7fe0b8d274
Revert "Modify ERL_LDFLAGS of deps when compiling on R23 on rebar2"
...
This reverts commit 21312c79aa
.
2020-07-22 10:08:14 +02:00
Badlop
90ca689123
Update dependencies, they now compile with Erlang/OTP 23.0 natively
2020-07-22 10:06:06 +02:00
Badlop
db2825342c
Revert "Dirty workarounds to compile jiffy with Erlang/OTP 23 ( #3282 )"
...
This reverts commit 2ca5712507
.
2020-07-15 12:12:42 +02:00
Badlop
bc1de531cc
Update jiffy to 1.0.5 which supports Erlang/OTP 23
2020-07-15 12:12:39 +02:00
Badlop
2ea5f7856c
In fact misc:try_url/1 is not used anymore
2020-07-15 11:41:51 +02:00
Badlop
e5b66aadaf
Fix try_url/1 parsing of uri_parse result format, reported by Dialyzer
2020-07-14 12:21:37 +02:00
Holger Weiss
cff7c4c100
Update 'stun' dependency to tagged version
2020-07-11 17:53:33 +02:00
Holger Weiss
e30592c050
mod_stun_disco: Fix function specification
2020-07-11 17:51:20 +02:00
Badlop
ff92dab49e
Parse also ServerHost in create_room* commands ( #3326 )
2020-07-10 13:06:05 +02:00
Badlop
f652f8c8d6
Fix crash when creating new MUC log file in non-ASCII lang ( #3324 )
2020-07-10 12:03:12 +02:00
Badlop
80a502782b
Use the same leading sentence than other sections
2020-07-06 16:39:15 +02:00
Holger Weiss
3bf7fbc117
ejabberd_stun: Filter info/debug messages
...
Update 'stun' dependency, and drop the info/debug messages now logged by
the 'stun' application if OTP's new logging API is used.
2020-07-01 21:53:22 +02:00
Badlop
0ff5b44d15
Fix YAML syntax in example configuration ( #3301 )
2020-06-25 12:39:44 +02:00
Badlop
61926a44be
Subscriber should not send message to moderated room ( #3222 )
2020-06-24 13:17:04 +02:00
Holger Weiss
ec5f369d9d
ejabberd_logger: Avoid excessive stat calls
...
By default, the logger_std_h module shipped with OTP 21.0 and newer
reads the log file information prior to each and every write operation.
This is done to play well with external log rotation tools.
In order to minimize the performance penalty in situations where the log
file is flooded, configure logger_std_h to skip reading the file
information as long as no more than one second has passed since it was
last read.
2020-06-23 21:27:12 +02:00
Holger Weiss
dbebcd08c7
README.md: Add line breaks after feature titles
2020-06-23 00:31:22 +02:00
Paweł Chmielowski
768460b518
Correctly handle user_regexp acl rules with not matching host
...
This should fix issue reported in issue 3304
2020-06-22 10:24:10 +02:00
Holger Weiss
515dfc002b
mod_stun_disco: Fix wording of log message
2020-06-19 18:04:26 +02:00
Badlop
16645a3c0a
Document that only ejabberdctl can join and leave a local node ( #3049 )
2020-06-09 13:23:17 +02:00
Badlop
38949bdeea
Update example config to include mod_http_upload custom headers ( #3288 )
2020-06-09 13:08:05 +02:00
Badlop
5f3457dbd6
Add default values so Travis config validation stops warning
2020-06-08 15:27:37 +02:00
Badlop
b9108c4650
Travis renamed redis-server to redis apparently
2020-06-08 15:27:28 +02:00
Badlop
a54c667c80
Remove old Regexp, the new Re is available since Erlang/OTP R12B-4
2020-06-08 15:27:27 +02:00
Badlop
bcd2cd7e93
Remove comment about Erlang/OTP older than R14, as we require 19.3 nowadays
2020-06-08 15:27:25 +02:00
Badlop
337ba42953
Get back some commented specs that required Erlang R12
2020-06-08 15:27:23 +02:00
Badlop
4f5c00a83d
Option route_subdomains was deprecated and useless a year ago in ffe1c722
2020-06-08 15:27:18 +02:00
Holger Weiss
c6bbdafe92
Update 'yconf' dependency to fix Erlang/OTP 19.x
2020-06-05 20:24:17 +02:00
Badlop
f2e81ed2a0
When updating group in cache, first delete so insert succeeds ( #3296 )
2020-06-05 19:34:00 +02:00
Badlop
7efc208b9e
Handle ets_cache return value in shared roster get_group_opts ( #3296 )
2020-06-05 19:33:52 +02:00
Holger Weiss
266691f929
Update 'yconf' dependency
...
Fixes #3295 .
2020-06-05 17:02:06 +02:00
Paweł Chmielowski
482917348b
Update deps
2020-06-03 13:43:10 +02:00
Holger Weiss
945a5cd09c
misc: Don't crash on URLs without port number
...
Let misc:uri_parse/1 return default HTTP(S) port number if the URL
doesn't specify a port number, analogous to the behavior when
USE_OLD_HTTP_URI is defined.
2020-06-03 12:22:14 +02:00
Holger Weiss
9ea51d3295
misc: Make sure uri_parse/1 returns strings
...
The uri_string:parse/1 function returns the URI elements as strings or
as binaries depending on the input. Make sure misc:uri_parse/1 returns
strings in both cases, analogous to the behavior when USE_OLD_HTTP_URI
is defined.
2020-06-03 12:02:29 +02:00
Holger Weiss
77308e6aff
Merge remote-tracking branch 'processone/pr/3294'
...
* processone/pr/3294:
Update example config
2020-06-03 09:41:24 +02:00
Licaon_Kter
b0c6caa60e
Update example config
2020-06-03 07:19:02 +00:00
Holger Weiss
3cfc5c9633
Update 'turn_ip' option name in test configuration
...
Thanks to Badlop for spotting this.
2020-06-03 06:13:43 +02:00
Holger Weiss
cd336369a5
mod_stream_mgmt: Don't kill new PID on resumption
...
During XEP-0198 resumption, the ejabberd_c2s process that handles the
new connection reopens the ejabberd_sm session of the old one. Since
commit b4770815c0
, the new process adds
the new session table entry before the old process removes the old one.
While adding the new one, ejabberd_sm checks for old sessions to
replace. This check assumes old SIDs compare lower than new ones. This
assumption didn't necessarily hold for the session resumption case,
where the old SID's timestamp was copied over to the new SID and only
the PID was updated. Therefore, the new process was killed if the new
PID happened to be smaller than the old one.
Fix this by having mod_stream_mgmt use its own SM-ID rather than copying
over the old SID's timestamp to the new SID.
Thanks to Thilo Molitor and Friedrich Altheide for reporting the issue,
and to Thomas Leister for his help with debugging it.
2020-06-01 21:33:55 +02:00
Badlop
c62956ab7b
Test 23.0 version
2020-06-01 10:35:41 +02:00
Badlop
1d7e29765e
Update eimp, sqlite3 and epam to support Erlang/OTP 23 ( #3282 )
2020-06-01 10:35:37 +02:00
Badlop
c0f7008e96
Use old http_uri, crypto and pg2 only with old Erlang/OTP ( #3284 )
2020-06-01 10:35:28 +02:00
Badlop
2ca5712507
Dirty workarounds to compile jiffy with Erlang/OTP 23 ( #3282 )
...
Works for me with:
./configure --disable-pam
./rebar get-deps
./rebar configure-deps
./rebar compile
make install
changes in erlang-native-compiler used by jiffy:
src/rebar_port_compiler.erl
- {"ERL_LDFLAGS" , " -L$ERL_EI_LIBDIR -lerl_interface -lei"},
+ {"ERL_LDFLAGS" , " -L$ERL_EI_LIBDIR -lei"},
src/rebar_utils.erl
--dialyzer({no_missing_calls, escript_foldl/3}).
2020-06-01 10:33:06 +02:00
Holger Weiss
7a37483307
Rename 'turn_v4_ip' and 'turn_v6_ip' options
...
The 'turn_ipv4_address' and 'turn_ipv6_address' option names are
probably more intuitive.
2020-05-29 18:40:19 +02:00
Paweł Chmielowski
21312c79aa
Modify ERL_LDFLAGS of deps when compiling on R23 on rebar2
...
Newer version removed erl_interface, and default rebar2 ERL_LDFLAGS will
try to link it, this change should pass correct flags to compiler.
2020-05-26 11:01:22 +02:00
Holger Weiss
56d00e427d
ejabberd_stun: Add 'turn_blacklist' option
...
The new 'turn_blacklist' listener option allows for specifying one or
more IP addresses and/or subnet addresses/masks. The TURN server will
refuse to relay traffic from/to blacklisted IP addresses. By default,
Teredo and 6to4 addresses are blacklisted, as mandated by RFC 6156
(section 9.1).
2020-05-21 21:46:02 +02:00
Holger Weiss
7bb4da2fee
mod_stun_disco: Make 'services' example shorter
...
Omit the 'tcp' and 'stuns' services from the list of example 'services'
in the documentation. For typical use cases, those are less interesting
than 'udp' and 'turns' services.
2020-05-19 23:23:24 +02:00
Holger Weiss
f19b975e8d
mod_stun_disco: Offer local IPv6 services
...
Also announce local STUN/TURN services listening on IPv6 sockets (unless
the 'offer_local_services' option is set to 'false').
2020-05-19 22:55:12 +02:00
Holger Weiss
83fa637569
ejabberd_stun: Support IPv6 for TURN
...
The stun application now supports RFC 6156: TURN Extension for IPv6, and
therefore needs separate IPv4 and IPv6 relay addresses.
2020-05-19 21:42:41 +02:00
Holger Weiss
858bfb4b80
Let ejabberd_stun listen on IPv6 sockets
...
The stun application now allows IPv6 clients to perform STUN requests
and to allocate TURN relays.
2020-05-19 20:22:58 +02:00
Badlop
42c82c9e72
Fix hardcoded URL to register.css and URLS to sections ( #3281 )
2020-05-19 19:32:06 +02:00
Badlop
8efdd439f1
Update man page to ejabberd 20.04
2020-05-19 16:38:11 +02:00
Badlop
70977cbb13
Sort databases alphabetically in options doc (thanks to Neustradamus)( #3246 )
2020-05-19 16:38:08 +02:00
Badlop
ad31fbee1e
Sort alphabetically configure options (thanks to Neustradamus)( #3246 )
2020-05-19 16:38:05 +02:00
Paweł Chmielowski
6f54b6ae3b
Don't crash in mod_muc_log:get_url when mod_muc_log is not enabled
...
Disco on room can call this function even when logger is not enabled,
but this room option was enabled previously when logger was active.
2020-05-15 13:44:09 +02:00
Badlop
e94b89a57d
Display installed ejabberd version in webadmin footer ( #3272 )
2020-05-15 11:20:53 +02:00
yuriyz-w
44528d3fef
Make SQL query more generic for MSSQL compatibility ( #3271 )
2020-05-15 09:19:55 +02:00
Paweł Chmielowski
4580feaa3c
Increase default shaper limits, to help with jingle initiation delay
...
More discussion about this can be found in pull request 3255
2020-05-15 09:10:57 +02:00
Badlop
f3b8dc9c0b
Update *_vcard commands help, so they are better displayed in Docs
2020-05-14 20:02:47 +02:00
Badlop
9d923e8e6d
Update syntax of some options so they are better displayed in Docs
2020-05-12 21:33:00 +02:00
Badlop
c861fa6a6a
Revert service_subscription_subscribers test that is iconsistent ( #2696 )
2020-05-11 22:25:56 +02:00
Badlop
d7d8085d3b
Fix most EDoc errors, even if that's not used nowadays apparently
2020-05-11 19:53:13 +02:00
Badlop
5e70a47f20
If new session Pid exists when sm_remove is called, then keep Ping ( #3260 )
2020-05-11 18:22:35 +02:00
Holger Weiss
e286bb23db
mod_stun_disco: Bump credentials_lifetime default
...
Increase the default lifetime of temporary credentials to 12 hours.
ejabberd's built-in TURN server re-queries the temporary password from
mod_stun_disco whenever a TURN client attempts to refresh an allocation,
and mod_stun_disco will only return the password as long as the
credentials didn't expire. Therefore, the credentials lifetime
effectively limits the maximum lifetime of a TURN allocation when
ejabberd's TURN service is used, so the default value shouldn't be too
short.
2020-05-11 17:32:28 +02:00
Badlop
2c42bd07c8
Fix link in mod_sip to SIP Docs section
2020-05-09 16:10:26 +02:00
Badlop
2001540143
Provide minimal mod_bosh configuration example
2020-05-09 15:04:10 +02:00
Badlop
d88a32992a
Add link in acme option to ACME section in ejabberd Docs
2020-05-09 11:45:39 +02:00
Badlop
64c09c20eb
Hide false-positive warnings about mod_delegation Type atom and NS binary
2020-05-07 22:29:54 +02:00
Badlop
c990704418
Remove ancient and rather useless incode ejabberd_commands documentation
2020-05-07 19:38:12 +02:00
Badlop
edf5b3c7f0
Don't use string:take, as it isn't available in Erlang/OTP 19.3 ( #3256 )
2020-05-07 16:09:51 +02:00
Badlop
e5a2d42484
Fix webadmin muc room sorting broken due to trailing slash patch ( #3256 )
2020-05-07 11:22:43 +02:00
Paweł Chmielowski
51e45516a4
Unconditionally send presence unavailable to all pres_a recipient
...
Previously we only send that presence to direct presence recipients if
client also sent general self presence (without to attribute).
This should help with issue #3245
2020-05-07 10:40:18 +02:00
Badlop
41b06cb79e
Show deprecation warning if ejabberd_xmlrpc is configured as listen module ( #2915 )
2020-05-06 14:08:43 +02:00
Badlop
d8509aec12
Remove access_commands useless lines, api_permission replaced it years ago
2020-05-06 14:08:40 +02:00
Holger Weiss
5649e35a64
ejabberd_listener: Let supervisor terminate child
...
If a TCP connection was closed before the socket was handed over to a
supervised child process, let the supervisor terminate the process
rather than killing it directly. This avoids crash log entries
generated by the supervisor.
2020-05-05 17:22:52 +02:00
Holger Weiss
865074603c
Set 'max_fsm_queue' default value (back) to 10000
...
The default value for the 'max_fsm_queue' option was set to 10000 in
commit 79685da90b
, and that value is still
documented to be the default. It was (probably unintentionally) changed
to 5000 in commit 03de853e4f
.
It makes sense to keep it larger than the value of mod_stream_mgmt's
'max_ack_queue' option.
2020-05-05 01:34:12 +02:00
Holger Weiss
6d13120e69
mod_stun_disco: Log discovered services on startup
...
If the 'offer_local_services' option isn't set to 'false', log an [info]
message for each auto-discovered ejabberd_stun listener on startup (and
on configuration reload).
2020-05-05 01:02:50 +02:00
Badlop
e6a3b1fa68
Extract translatable strings also from the xmpp library
2020-05-04 16:25:42 +02:00
Badlop
df66fa6a48
Fix the new service_subscription_subscribers test ( #2696 )
2020-05-04 11:31:52 +02:00
Marc Tonnes
5d499c7173
Fix @from attribute on MucSub 'subscribers' node messages
2020-05-04 11:31:24 +02:00
Holger Weiss
b1e967eaf3
mod_stun_disco: Remove unnecessary inclusion
2020-05-03 17:27:41 +02:00
Holger Weiss
151fa2ec50
mod_stun_disco: Apply minor documentation cleanups
2020-05-03 17:20:15 +02:00
Holger Weiss
e4de03f3df
mod_stun_disco: Try to resolve listener address
...
In some IPv6-only networks, hostnames that have no AAAA record are
resolved to an IPv6 address that's mapped to the host's IPv4 address.
This allows the IPv6-only clients to communicate with IPv4-only services
such as ejabberd's built-in STUN/TURN server. If STUN/TURN clients try
to contact the IPv4 address directly rather than using the mapped IPv6
address, the connection will fail.
Therefore, try to resolve the IP address of local ejabberd_stun services
to the hostname and announce that hostname rather than the IP address if
(and only if) the hostname resolves back to the original IP address, and
not to any additional IPv4 or IPv6 address(es).
This can (and should) be reverted once IPv6 support is added to
ejabberd's built-in STUN/TURN server.
2020-04-30 22:40:01 +02:00
Jerome Sautret
724d09a510
Set ejabberd version to 20.04
2020-04-29 16:29:59 +02:00
Badlop
fba6a64648
Fix English typos in configure.ac
2020-04-29 12:07:35 +02:00
Jérôme Sautret
0539637d30
Merge pull request #3232 from weiss/enable-stun
...
Enable STUN/TURN support by default
2020-04-29 10:29:05 +02:00
Badlop
4a7d42647f
Rewrite sentences in modules options examples, to not break Docs indentation
2020-04-28 21:31:35 +02:00
Paweł Chmielowski
b56663ef07
Update dependences in mix
2020-04-28 17:23:36 +02:00
Paweł Chmielowski
25597a4326
Run tests for mssql only if configured with --enable-mssql
2020-04-28 16:52:08 +02:00
Paweł Chmielowski
56c8f6b280
Update deps
2020-04-28 16:24:40 +02:00
ChaosKid42
abc3260e75
enable tests with mssql-backend ( #3136 )
2020-04-28 16:22:42 +02:00
Jérôme Sautret
24a11fc8e8
Merge pull request #3235 from weiss/xep-0215
...
Support STUN/TURN service discovery
2020-04-28 16:03:21 +02:00
Holger Weiss
6eb2f07274
ejabberd_stun: Tone down 'auth_realm' warning
...
These days, STUN/TURN authentication can be performed with ephemeral
credentials, where the REALM is irrelevant. Therefore, just log an
[info] message rather than a [warning] in the case where no
authentication REALM is configured but multiple virtual domains exist.
2020-04-28 10:34:43 +02:00
Holger Weiss
9cd47d7085
Add tests for mod_stun_disco
2020-04-28 10:34:43 +02:00
Holger Weiss
69d1d62add
Support XEP-0215: External Service Discovery
...
Add the 'mod_stun_disco' module, which allows XMPP clients to discover
STUN/TURN services and to obtain temporary credentials for using them as
per XEP-0215: External Service Discovery. The temporary credentials
handed out to clients have the format described in:
https://tools.ietf.org/html/draft-uberti-behave-turn-rest-00
Also add the new module to the example configuration file.
Closes #2947 .
2020-04-28 10:34:43 +02:00
Badlop
3db9459591
Don't offer X-OAUTH2 if the only auth method enabled is Anonymous ( #3209 )
2020-04-27 20:03:21 +02:00
Paweł Chmielowski
6320dfd34e
Don't store caps information for direct presences of muc room
...
We really don't need those, and thanks to each individual room having
different hash (as one of hashed data is room description) we end with
lot of data that we really don't need.
2020-04-27 13:17:51 +02:00
Badlop
055fe744d3
Clean some unused functions in ejabberd_ctl, this makes "make hooks" happy
2020-04-24 20:36:24 +02:00
Christoph Scholz
d7c696f97c
mix.exs: Update 'xmpp' and 'stun'
2020-04-23 20:05:40 +02:00
Holger Weiss
fc444ce503
rebar.config: Update 'xmpp' and 'stun'
...
Use the current versions of 'xmpp' (to get XEP-0215 support) and 'stun'
(to fix TURN issues).
2020-04-23 20:05:40 +02:00
Holger Weiss
88f392721b
gen_mod: Reload modules after reloading listeners
...
Make sure modules won't be reloaded before listeners. This is necessary
to allow the (not yet committed) 'mod_stun_disco' module to parse the
listener configuration after configuration reloads.
2020-04-23 20:05:40 +02:00
Holger Weiss
c55e7b8499
ejabberd_stun: Fix 'turn_ip' fallback
...
The 'turn_ip' option validator doesn't accept an inet:ip4_address()
tuple.
While at it, change the logic to only perform the fallback address
lookup if no 'turn_ip' is configured (analogous to the fallback
mechanism for the case where the 'auth_realm' is undefined).
2020-04-23 18:32:40 +02:00
ChaosKid42
1f7ca91670
use dsn-less config for mssql ( #3131 )
2020-04-23 13:56:41 +02:00
Licaon_Kter
d9131c854d
Bump jiffy so it compiles on older GCC ( #3218 )
...
* Update jiffy
* And here
2020-04-23 13:29:33 +02:00
Holger Weiss
09a87f5a0c
ejabberd_stun: Handle hashed passwords gracefully
...
Don't crash when STUN/TURN authentication is performed against a
SCRAM-hashed password.
2020-04-22 00:16:03 +02:00
Holger Weiss
1db70edcf8
ejabberd_stun: Add 'stun_get_password' hook
...
Add a hook that allows modules to offer a password for STUN/TURN
authentication.
2020-04-22 00:09:42 +02:00
Badlop
1a3533e4a2
Fix some English typos
2020-04-21 20:58:01 +02:00
Badlop
3db9de26e9
Rephrase mod_admin_extra doc, a2x screwed the format when building Docs
2020-04-21 20:11:39 +02:00
Badlop
78f0439e78
Make a few more strings translatable in MUC and Shared Roster WebAdmin
2020-04-20 20:24:56 +02:00
Badlop
b124e911d3
Update some translated strings where only print chars had changed
2020-04-20 20:24:50 +02:00
Holger Weiss
c836dc66a8
ejabberd_stun: Set a default 'turn_ip'
...
Try to resolve the local hostname, use the result as the default
'turn_ip', and only log a warning if that fails. Using the local
hostname's address by default is analogous to mod_proxy65's behavior.
2020-04-20 08:42:32 +02:00
Holger Weiss
b1b3c4cdcf
Enable STUN/TURN by default
...
Build ejabberd with STUN/TURN support by default, and add a STUN/TURN
listener to the example configuration file.
2020-04-20 00:37:41 +02:00
Holger Weiss
b0f95975c2
Travis CI: Test against Erlang/OTP 22.3
2020-04-19 15:39:34 +02:00
Badlop
2e48c24638
Updated Spanish translation
2020-04-17 19:29:17 +02:00
Badlop
7359eb6246
Updated Catalan translation
2020-04-17 19:23:21 +02:00
Badlop
99d21bca49
Don't extract for translation strings from man pages, at least for now
2020-04-17 19:23:18 +02:00
Badlop
1b98084918
Fix previous commit
2020-04-17 19:23:13 +02:00
Badlop
d311eaf8f3
Log messages generated by msgmerge and display unexpected ones
2020-04-17 17:28:43 +02:00
Badlop
0355e15a42
Fix doc content in mod_admin_extra so it can be extracted by make translations
2020-04-17 17:28:39 +02:00
Badlop
101f7a6d63
Check if mod_muc_log is enabled before setting logging option ( #3215 )
2020-04-17 16:19:58 +02:00
Badlop
4aa85c538c
When rescode is some unexpected, probably error message, print it
2020-04-17 16:19:55 +02:00
Paweł Chmielowski
22980ed8a5
Restart offline pop_messages when there is mismatch between select and delete
...
When another connection is inserting something to spool at this same time
as we do pop_messages, it's possible that insert will happen between we
fetch messages and delete them, so we effectively will delete it without
delivering it to client. This change catch this situation and restart
transaction, so we should always have consistent results.
2020-04-17 15:30:28 +02:00
Paweł Chmielowski
cb1c0a3188
Update mysql driver to get rid of warning
2020-04-16 18:26:13 +02:00
Badlop
0705695e02
Update documentation of mod_shared_roster ( #3214 )
2020-04-16 13:12:32 +02:00
Paweł Chmielowski
c11922e2a2
Make session iq response have from be set to server jid
...
It looks like old version of Smack don't accept request that are have
from sent to sender jid, but are only working when jid is set to server
address. This is also how it looks in old xmpp rfc examples.
2020-04-16 13:05:42 +02:00
Paweł Chmielowski
37226dd41f
Resending unacked stanzas should send even archived msgs if mod_offline is enabled
...
Messages that are received when no c2s is active will be stored in offline,
even when mam archived them, so i don't think we should be doing something
different in this case.
2020-04-16 13:04:12 +02:00
Badlop
cd0b65f4d5
Fix unused variables from previous commit
2020-04-14 15:00:45 +02:00
Badlop
b7c088d4b0
Update links to the ejabberd Docs page in WebAdmin
2020-04-14 13:59:11 +02:00
Badlop
e197b25e82
Rename opts->name to label, to avoid confusion with the group name ( #3214 )
...
Also updated WebAdmin to show more meaningful explanations
Also fixed a bug that break support for group@host in Displayed
2020-04-14 13:58:53 +02:00
Jérôme Sautret
b02506eaaf
Merge pull request #3132 from area-42/publisher_mssql_text_to_varchar
...
change PubSub publisher from text to varchar for mssql
2020-04-10 16:20:43 +02:00
Badlop
8694517c34
Minor fixes in doc
2020-04-09 16:30:21 +02:00
Badlop
2febd1c220
Copy more option explanations from ejabberd Docs site
2020-04-08 18:49:41 +02:00
Badlop
aa0ed37034
Add ejabberd version number to man pages
2020-04-08 18:48:09 +02:00
Badlop
da18245d9a
Indicate which ejabberd version is used to produce the page
2020-04-08 18:47:50 +02:00
Badlop
5cc9a1fe44
Don't make commands subsections, so Docs TOC plage is cleaner
2020-04-08 18:45:29 +02:00
Badlop
de0aead1cd
Fix set_loglevel example argument documentation
2020-04-08 18:44:09 +02:00
Badlop
624ba7e94f
Improve formatting of mod_announce doc
2020-04-08 18:42:45 +02:00
Paweł Chmielowski
9bb3aee0e2
Make resumed sessions try to deliver possibly queued messages to new session
...
Between receiving resume request and being closed by new session, it's
possible (even if not very likely) that new messages would arrive to
process that is resumed. In that case try to reroute messages that were
received after we sent resume reply to new process.
2020-04-07 14:51:49 +02:00
Paweł Chmielowski
16585713f8
Log errors that happen when retrieving http headers in ejabberd_http
...
It seems that ssl errors can be generated here, so lets have abily to show
them instead of swallowing them silently.
2020-04-07 13:50:01 +02:00
Holger Weiss
e01e528235
mod_carboncopy: Bump supported XEP revision
...
Since mod_carboncopy supports "urn:xmpp:carbons:rules:0", it implements
version 0.13.x of XEP-0280.
2020-04-05 22:52:55 +02:00
Paweł Chmielowski
eac7e3488c
Remove bash-izm from ejabberdctl.template introduced recently
2020-04-03 17:28:27 +02:00
Jerome Sautret
762486d199
Limit number of atoms used by ejabberdctl ( #2977 )
2020-04-02 15:51:16 +02:00
Badlop
23493ce239
Document mod_shared_roster_ldap options
2020-04-02 12:56:43 +02:00
Badlop
510ab53341
Add ejabberd_auth_http auth_opts brief description
2020-04-02 12:56:40 +02:00
Badlop
220cf73318
Document sql_prepared_statements
2020-04-02 12:56:38 +02:00
Badlop
f6d102f5e2
Quick document with forward link api_permissions
2020-04-02 12:56:36 +02:00
Badlop
05b68764cc
Document some global options
2020-04-02 12:56:33 +02:00
Badlop
4e51e82ccf
Add three missing mod_bosh options
2020-04-02 12:56:31 +02:00
Badlop
116fa8e9ca
add missing mod_mam options
2020-04-02 12:56:28 +02:00
Badlop
ce6fd654a0
Fix mod_pubsub indentation
2020-04-02 12:56:26 +02:00
Badlop
5ee2f48aea
Add mod_pubsub configuration documentation
2020-04-02 12:56:23 +02:00
Paweł Chmielowski
ccb47a67c4
Don't replace %25 in webadmin test on older erlangs
...
It seems that is a bug in R21+ httpc, so let's try to keep that test
working with older versions
2020-04-01 17:11:19 +02:00
Paweł Chmielowski
a2e6d8bb6b
Make stop_ejabberd test also work without receiving </stream:stream>
2020-04-01 15:34:06 +02:00
Paweł Chmielowski
1bd560f3f2
Fix potential message loss in terminating c2s sessions
...
Calling sync version of xmpp_stream_in/out:stop could lead to messages
never being processed by c2s process if they were queued in p1_server.
This could be reproduced by when having messages in offline storage,
starting sessions, enabling stream_mgmt, sending initial presence, and then immediately
</stream:stream>, messages that mod_offline would send process would not
be bounced back by stream_mgmt.
2020-04-01 14:36:01 +02:00
Badlop
222bb1d55d
Use different username than other tests, but still include the test chars
2020-04-01 12:50:52 +02:00
Paweł Chmielowski
a5ea3fa282
Better error reporting in pubsub tests
2020-04-01 11:45:01 +02:00
Paweł Chmielowski
6c52438128
Make webadmin tests use different user for changepassword/unregister
...
Using username that is shared with other tests causes login problems in
other places.
2020-04-01 11:44:38 +02:00
Badlop
0508dce2ed
Add more webadmin tests
2020-03-31 19:28:36 +02:00
Boris Chernov
87dda1b638
sql_type should be taken for LServer, not LHost ( #3202 )
...
sql_type option should be retrieved for the main domain, not the MUC subdomain
2020-03-30 09:47:36 +02:00
Paweł Chmielowski
5ec214386e
Make webadmin redirect to page that end with /
2020-03-26 14:17:48 +01:00
Paweł Chmielowski
73ba38ae35
Revert "Pass base path instead of level to support URL missing slash ( #3177 )"
...
This reverts commit e9d1201ea8
.
2020-03-26 13:43:24 +01:00
Paweł Chmielowski
1ffa9a0cf5
Do not change to attribute of sent messages from bare to full jid
...
This is not correct per xmpp spec
2020-03-25 16:00:16 +01:00
Jerome Sautret
633b362577
Increase version to 20.3.0
2020-03-25 11:35:38 +01:00
Badlop
150b7e7219
Fix unsubscribe command result, handle_sync_event result, and dialyzer
...
How to reproduce the problems fixed by this commit:
Create temporary room, other account subscribes, and owner leaves
Unsubscribe that account with the command: ejabberdctl unsubscribe_room ...
2020-03-24 11:44:22 +01:00
Paweł Chmielowski
e6065bf08f
Update changelog
2020-03-23 17:55:11 +01:00
Paweł Chmielowski
c2aa5f77bf
Update mix.lock
2020-03-23 17:42:57 +01:00
Paweł Chmielowski
7caec56e96
Make bounce_message_queue wait for 100ms for incoming messages
...
There is possibilty that between c2s process unregistering itself from sm
and terminating, some other process could try to send something to c2s,
which could result in messages to triggering mam/offline hooks, and causing
them not to be stored in any way.
2020-03-23 15:16:33 +01:00
Paweł Chmielowski
97354426cf
Make mod_muc_room:unsubscirbe handle that unsubscribe may stop room
2020-03-23 13:16:48 +01:00
Paweł Chmielowski
63e3fb92d1
Better handling of xml parse errors in send_stanza
2020-03-23 12:59:30 +01:00
Paweł Chmielowski
a2d1ffffe6
Add baisc tests for webadmin
2020-03-23 10:52:07 +01:00
Paweł Chmielowski
f17d4c0adc
Update deps
2020-03-19 12:11:46 +01:00
Paweł Chmielowski
92a09fdb71
Also add "escape '\'" to prepared statements in pgsqllike_escape
2020-03-18 14:36:17 +01:00
Paweł Chmielowski
039d786e1f
Add escape '\' to like expression in pgsql to fix problem cockroachdb
...
Cockroachdb doesn't properly handle escaping of _ in like expressions,
having "like ... escape '\'" makes it work, by disabling optimization that
causes this broken behaviour
2020-03-18 14:31:13 +01:00
Paweł Chmielowski
2d707cc0d2
Fix type of computed field in node_flat sql query
2020-03-18 14:05:05 +01:00
Paweł Chmielowski
0a88d03dc9
Use correct type for seconds field in mod_last sql queries
2020-03-18 14:05:05 +01:00
Paweł Chmielowski
f12ee28660
Change conversion of boolean values for cockroachdb
2020-03-18 14:05:05 +01:00
Badlop
260c289d34
Fix Dialyzer warning that jid can't be 'undefined'
2020-03-18 12:02:16 +01:00
Paweł Chmielowski
d8899ca9ac
Add cache to mod_shared_roster
...
This should help with excessive queries that sql backend generates
Should fix issue #3158 .
2020-03-17 14:35:43 +01:00
Paweł Chmielowski
1e456065f6
Fix issue with family field on cockroachdb
2020-03-17 11:35:54 +01:00
Paweł Chmielowski
82074190fb
Replace mod_shared_roster:X call with just X inside that module
2020-03-16 14:57:55 +01:00
Paweł Chmielowski
6fe7c5cac5
Try to limit calls to groups_with_opts in mod_shared_roster
2020-03-16 13:29:05 +01:00
Badlop
e9d1201ea8
Pass base path instead of level to support URL missing slash ( #3177 )
2020-03-11 16:26:33 +01:00
Paweł Chmielowski
9a89b360c0
fix command rooms_empty_destroy ( #3183 )
2020-03-05 11:41:51 +01:00
Paweł Chmielowski
b39a1e2d74
Add reload handler to ejabberd_auth_ldap
...
This will restart ldap process with new options, and should made it
recognize new values.
This fixes issue #3181
2020-03-04 13:19:41 +01:00
Paweł Chmielowski
151b818af4
Use compilation flags used during build to compile modules in ext_mod
...
This fixes issue #3178
2020-03-03 11:25:17 +01:00
Paweł Chmielowski
df47e2a93f
Fix list parameters in sql queries on pgsql
2020-02-27 11:10:30 +01:00
Mickaël Rémond
d0e93f9219
Merge pull request #3125 from area-42/enable_odbc_in_mix
...
enable odbc in mix build
2020-02-26 14:45:01 +01:00
Badlop
47c5aba1e5
Allow mod_register_web to be accessed from now-served vhosts ( #3173 )
2020-02-26 13:57:19 +01:00
Badlop
00abf5d42c
Fix handle of 'http' atom in Headers, problem introduced in 357e7e11
2020-02-26 13:56:38 +01:00
Paweł Chmielowski
9c25d1024a
Support ssl connection on mysql
2020-02-26 10:54:04 +01:00
Paweł Chmielowski
ee736b1ab7
Update mix deps
2020-02-25 16:07:22 +01:00
Jerome Sautret
065e96d24b
Bump version in mix.exs
2020-02-25 14:46:44 +01:00
Paweł Chmielowski
5f075f316f
Update changelog
2020-02-25 14:30:06 +01:00
Paweł Chmielowski
a5987800c7
Update dependences
2020-02-25 14:15:50 +01:00
Paweł Chmielowski
357e7e117d
Make http heades passed in custom_headers override builtin headers
...
Previously we just appended them, so sometimes we just had duplicates
This fixes issue #3056
2020-02-21 12:19:37 +01:00
Mickaël Rémond
3947e64524
Merge pull request #3127 from area-42/allow_emojis_with_mssql
...
allow storage of emojis in archive on mssql
2020-02-20 16:28:24 +01:00
Badlop
e234ced107
Support ejabberd_auth_http's auth_opts ( processone/ejabberd-contrib#284 )
2020-02-19 13:18:39 +01:00
Badlop
f0ba506fde
Update Jiffy to 1.0.1, just for coherence with p1_acme requirement ( #3102 )
2020-02-19 12:19:33 +01:00
Paweł Chmielowski
a19fdb717b
Do read piefxis file fully before starting processing included file
...
Previous method of processing files, could lead to mixing events generated
by parsers for multiple files, where we could get in inconsistant state.
After this change we gather all events generated by parser for single file,
before we start parsing any included file.
This fixes issue #3166
2020-02-18 15:02:23 +01:00
Mickaël Rémond
9e1973a238
Update README.md
2020-02-18 08:53:56 +01:00
Holger Weiss
e7c84b81b2
ejabberd_admin: Fix *_config command result format
...
The 'reload_config' and 'dump_config' calls are expected to yield a
'rescode' result, which means they must return 'ok' (rather than a
tuple) on success.
Fixes #3170 .
2020-02-14 18:52:54 +01:00
Paweł Chmielowski
66a84b8d2b
Make piefxis import properly decode scram passwords
...
We encoded scramed password with base64 when exporting, but didn't apply
reverse operation on import, this adds base64 decoding on import.
This fixes issue #3167 .
2020-02-11 12:48:19 +01:00
Badlop
5574b21dd6
Remove tweak introduced in 05c2995c
for #1954 as it isn't needed anymore
2020-02-07 13:32:49 +01:00
Alexey Shchepin
b2f536ec8b
Use SQL ESCAPE statement only with MSSQL and SQLite, improve compatibility with CockroachDB ( #3074 )
2020-02-04 04:53:54 +03:00
Paweł Chmielowski
87ea71c3c9
Add missing oauth_client table declaration in lite.new.sql
2020-01-31 16:06:27 +01:00
Paweł Chmielowski
fdb7e3e3fa
Optimize sql queries in pubsub select_affiliation_subscriptions
2020-01-31 11:43:41 +01:00
Badlop
2d32c66fd7
Update copyright to 2020 ( #3149 )
2020-01-28 15:49:23 +01:00
Holger Weiss
20c0fed457
mod_http_upload: Document correct put_url default
...
Closes #3152 .
2020-01-27 00:04:21 +01:00
Paweł Chmielowski
75094df25e
Do not use ~ts format in string that are put in xmpp payload
...
We are expecting utf8 data here, and using that flag will convert those
to unicode codepoints, which aren't handled properly later.
2020-01-22 12:55:27 +01:00
Jerome Sautret
299360c8ed
Fix 20.01 changelog
2020-01-21 12:31:04 +01:00
Paweł Chmielowski
ac8363095c
Update changelog
2020-01-17 12:05:36 +01:00
Paweł Chmielowski
fb797fe071
Bump version in mix.exs
2020-01-17 11:42:11 +01:00
Paweł Chmielowski
eb6449506f
Use tagged version of coveralls
2020-01-17 08:59:10 +01:00
Paweł Chmielowski
0ad2d2120c
Update xmpp in mix
2020-01-16 15:26:20 +01:00
Paweł Chmielowski
640f4bed82
Use tagged xmpp
2020-01-16 15:08:57 +01:00
Holger Weiss
453f6b0189
Update xmpp dependency in mix.exs and mix.lock
...
Closes #3146 .
2020-01-15 14:49:37 +01:00
Holger Weiss
243dc06733
mod_stream_mgmt: Don't crash on disabled ACK timer
...
Don't attempt to start an ACK timer if 'ack_timeout' is set to
'infinity'.
Thanks to Ingo Jrgensmann for reporting the bug.
2020-01-14 01:17:01 +01:00
Holger Weiss
ec035e3c41
mod_carboncopy: Omit check for undefined 'from'
...
These days, the 'from' of an outgoing #message is guaranteed to be set
to the sender's JID by xmpp_stream_in:process_authenticated_packet/2.
2020-01-13 00:45:33 +01:00
Holger Weiss
430b9bef38
mod_carboncopy: Don't process non-message stanzas
...
Avoid examining presence and IQ stanzas, as they're not eligible for
carbon-copying.
This is just an optimization and should not change the behavior.
2020-01-13 00:31:01 +01:00
Holger Weiss
ff193a1a6f
mod_carboncopy: Also copy mediated MUC invitations
2020-01-13 00:13:54 +01:00
Holger Weiss
74c01caf08
mod_carboncopy: Improve is_carbon_copy() check
...
Make sure the hook chain is stopped early whenever a carbon copy is
processed, not just in some cases.
2020-01-12 14:04:31 +01:00
Holger Weiss
a8f6c1db1d
mod_carboncopy: Support new copying rules
...
Support the copying rules added to XEP-0280 with version 0.13.0 under
the "urn:xmpp:carbons:rules:0" namespace.
Closes #3011 .
2020-01-12 13:42:00 +01:00
Holger Weiss
919c9d6fb1
mod_sip: Omit documentation when SIP is disabled
...
Don't generate the actual mod_sip documentation if ejabberd is built
without SIP support.
2020-01-11 20:34:11 +01:00
Holger Weiss
6531fbb0f3
mod_sip: Fix compilation without SIP support
...
Make sure the T() macro is also defined when ejabberd is compiled
without SIP support.
Fixes #3143 .
2020-01-11 20:27:16 +01:00
badlop
f341699250
Merge pull request #3142 from kenanilgun/master
...
Update Turkish Language
2020-01-10 12:46:35 +01:00
Kenan İLGÜN
9f7daad46f
Update Turkish Language
2020-01-10 14:26:02 +03:00
Paweł Chmielowski
06fe5c8cfe
Update deps is mix
2020-01-09 12:31:23 +01:00
Evgeny Khramtsov
51745f696f
Add the man page
2020-01-08 12:47:54 +03:00
Evgeny Khramtsov
a9383597af
Add install target for ejabberd.yml.5
2020-01-08 12:45:58 +03:00
Paweł Chmielowski
4c61e465ca
Rename plugin to not clash with plugin from dep
2020-01-08 10:41:48 +01:00
Evgeny Khramtsov
97da380acd
Generate ejabberd.yml.5 man page from source code directly
...
Several documentation callbacks (doc/0 and mod_doc/0) are implemented
and `ejabberdctl man` command is added to generate a man page. Note
that the command requires a2x to be installed (which is a part of
asciidoc package).
2020-01-08 12:24:51 +03:00
Paweł Chmielowski
c40d8fe11b
Update deps
2020-01-08 10:18:52 +01:00
Holger Weiss
0e96d64e60
Omit push notifications if offline storage failed
...
This commit removes the 'store_offline_message' hook which didn't allow
mod_push to suppress notifications when storing an offline message
failed (due to the offline spool size limit being exceeded or due to
database issues).
Fixes #3120 .
2020-01-05 20:08:54 +01:00
Holger Weiss
19e47375df
Travis CI: Test against Erlang/OTP 22.2
2020-01-05 15:02:01 +01:00
Christoph Scholz
248cc2d013
change publisher from text to varchar for mssql
2019-12-28 15:49:37 +01:00
Christoph Scholz
00ccb119ea
allow storage of emojis in archive on mssql
2019-12-27 13:06:06 +01:00
Christoph Scholz
8eccbade56
enable odbc in mix build
2019-12-25 00:38:48 +01:00
Badlop
bbe404abcc
Updated Catalan translation
2019-12-24 14:05:44 +01:00
Badlop
c396271c00
Fix case clause error regarding admin_generated password ( #3122 )
2019-12-24 11:10:36 +01:00
Paweł Chmielowski
4b3a1ec614
Add ability to hookup config transformer
2019-12-16 12:39:56 +01:00
Badlop
869826c818
Fix mod_muc_log skipping non-Latin messages (thanks to Yandrey)( #3115 )
2019-12-16 11:35:10 +01:00
Alexey Shchepin
24ac62eabd
Improve compatibility with CockroachDB ( #3074 )
2019-12-16 06:52:06 +03:00
Alexey Shchepin
f9120f75b0
Improve compatibility with CockroachDB ( #3074 )
2019-12-11 17:49:02 +03:00
Badlop
fbab446c24
Update the Spanish translation
2019-12-09 16:40:49 +01:00
Badlop
142c2a2cf2
Add Hungarian translation (thanks to Balázs Úr)( #3108 )
2019-12-09 16:34:44 +01:00
Badlop
86742ee528
Update translation files
2019-12-09 16:30:51 +01:00
Evgeny Khramtsov
6e68ca2211
Improve send_message command
2019-11-29 11:27:57 +03:00
Paweł Chmielowski
71c44bff8b
Make convert_to_scram work with all backends
2019-11-27 10:35:52 +01:00
Alexey Shchepin
a9f3fd2179
Merge branch 'sabudaye-pg_prepared_statements'
2019-11-26 19:45:47 +03:00
Alexey Shchepin
2a35cadf80
Merge branch 'pg_prepared_statements' of https://github.com/sabudaye/ejabberd into sabudaye-pg_prepared_statements
...
Conflicts:
ejabberd.yml.example
src/ejabberd_sql.erl
2019-11-26 19:45:01 +03:00
Evgeny Khramtsov
910f6aa290
Fix previous commit
2019-11-24 16:26:03 +03:00
Evgeny Khramtsov
de91618070
Check also 'access' rule on account removal
...
According to the documentation we should not allow
account removal when it's forbidden by the rule
from 'access' option.
2019-11-24 16:21:01 +03:00
Evgeny Khramtsov
650bdae5d9
Make sure IQ result is correctly routed on account removal
...
Thanks to Philipp Hörist for spotting this
2019-11-24 15:43:38 +03:00
Evgeny Khramtsov
33a16090d3
Fix acl reloading
2019-11-15 18:21:30 +03:00
Evgeny Khramtsov
b47a2e9626
Bump yconf version
2019-11-08 11:17:45 +03:00
Evgeny Khramtsov
925998c360
Preserve order of grouped duplicates
2019-11-08 10:20:18 +03:00
Evgeny Khramtsov
f6d7af1a2b
Check if error.log is empty after running test suite
2019-11-08 09:35:12 +03:00
Evgeny Khramtsov
3826a9ed58
Also group duplicated list-like options inside host_config/append_host_config
2019-11-07 12:14:08 +03:00
Evgeny Khramtsov
b7b76cc38b
Group all duplicated list-like options into a single option
2019-11-07 11:33:24 +03:00
Evgeny Khramtsov
94b74c0cbe
Fix loading of third-party modules at startup
...
Fixes #3019
2019-11-07 10:47:11 +03:00
Evgeny Khramtsov
c48e972573
Allow multiple `modules` section
...
Fixes processone/ejabberd-contrib#282
2019-11-06 13:43:30 +03:00
Evgeny Khramtsov
bb26d7c379
Accept a list in c2s_ciphers/s2s_ciphers options
2019-11-05 17:54:56 +03:00
Evgeny Khramtsov
3a46612d88
Fix unicode string formatting
...
Fixes #3066
2019-11-05 17:51:12 +03:00
Evgeny Khramtsov
a420eb1f72
Don't overflow 32-bit signed integer in offline tests
2019-10-31 11:46:31 +03:00
Evgeny Khramtsov
a81324fc43
Add missing quote
2019-10-31 11:18:59 +03:00
Evgeny Khramtsov
116c33f7e1
Grant all privileges on all sequences for PostgreSQL in tests
2019-10-31 11:00:02 +03:00
Evgeny Khramtsov
3e5ab8082b
Revert "Escape 'family' field in SQL requests"
...
This reverts commit f51ba687e2
.
Fixes #3072
2019-10-30 09:11:13 +03:00
Evgeny Khramtsov
72f6835feb
Fix race condition in Redis/SQL supervisors startup
2019-10-29 13:36:40 +03:00
Evgeny Khramtsov
86c4f76c51
Avoid using 64-bit unsigned integers
2019-10-29 13:27:59 +03:00
Evgeny Khramtsov
f51ba687e2
Escape 'family' field in SQL requests
...
This is needed for compatibility with CockroachDB, because
'FAMILY' is a reserved keyword in this database.
2019-10-28 12:19:24 +03:00
Evgeny Khramtsov
e2b79ea0b6
Don't attempt to create SQL tables when running tests
...
Instead, only clear existing tables.
The commit assumes that the SQL schemas will be loaded
manually before running the test suite, see test/README
for the examples.
2019-10-28 12:09:14 +03:00
Evgeny Khramtsov
a202818037
Merge pull request #3069 from nosnilmot/jwt-custom-jid-field
...
Add option for JWT field name containing JID
2019-10-26 11:03:19 +03:00
Stu Tomlinson
b2651dae0f
Add option for JWT field name containing JID
2019-10-25 16:56:18 +01:00
Evgeny Khramtsov
f981a2ef17
Improve jwt_key validator
2019-10-25 18:30:50 +03:00
Evgeny Khramtsov
02cb3d93fd
Don't lowercase first letter in reason string
2019-10-25 18:18:04 +03:00
Alexey Shchepin
c7470f5107
Handle the case when JWT key file contains JWK set
2019-10-25 16:33:22 +03:00
Evgeny Khramtsov
7eda35b945
Introduce 'gc' ejabberdctl command
...
The command forces garbage collection of all running Erlang processes.
The return is always success.
2019-10-25 16:02:24 +03:00
Evgeny Khramtsov
e8fe68543e
Stop SASL application in ejabberd_logger:flush()
2019-10-25 15:52:05 +03:00
Evgeny Khramtsov
f1a35cc9ac
Avoid calling to logger module on OTP<22
2019-10-25 15:27:47 +03:00
Evgeny Khramtsov
516950fb1e
TravisCI: test against Erlang/OTP 19.3
2019-10-25 14:56:19 +03:00
Evgeny Khramtsov
e3962aea6e
Use lager on OTP<22.0
...
This also lowers Erlang/OTP minimum version requirement back to 19.3
2019-10-25 11:44:04 +03:00
Evgeny Khramtsov
c604bdb897
Limit result set of disco#items for mod_pubsub
...
The size of a list of nodes returned for disco#items request
is now controlled by option 'max_nodes_discoitems'. The default
value is 100. The name and the default value of the option is
chosen to be consistent with mod_muc's 'max_rooms_discoitems' option.
2019-10-24 14:59:47 +03:00
Evgeny Khramtsov
d300a87059
Fix logger initialization on OTP<21.3
2019-10-23 16:41:27 +03:00
Evgeny Khramtsov
1e30b85861
Report errors in logger initialization
2019-10-23 16:03:48 +03:00
Evgeny Khramtsov
86bb77bfc2
Make PostgreSQL schema compatible with CockroachDB
2019-10-23 14:40:32 +03:00
badlop
b5d4b86724
Merge pull request #3063 from lnjX/fix/de-comma-setting
...
msgs: de: Fix comma setting
2019-10-21 10:14:52 +02:00
Evgeny Khramtsov
e388805049
Log path to third-party configuration file
...
This should prevent confusions like the one described at
https://stackoverflow.com/q/58353491/2610053
2019-10-20 18:14:33 +03:00
Evgeny Khramtsov
7a85e51237
Fix error reporting in configuration related admin commands
2019-10-19 19:58:42 +03:00
Evgeny Khramtsov
a23b6fb7ec
Don't parse obsoleted options
2019-10-19 12:14:02 +03:00
Evgeny Khramtsov
9ff6cc25dc
Log supervisor reports in debug loglevel
2019-10-18 22:00:37 +03:00
Evgeny Khramtsov
e4a8afb15d
Replace lager with built-in new logging API
...
This change requires Erlang/OTP-21.0 or higher.
The commit also deprecates the following options:
- log_rotate_date
- log_rate_limit
Furthermore, these options have no effect. The logger now fully
relies on log_rotate_size, that cannot be 0 anymore.
The loglevel option now accepts levels in literal formats.
Those are: none, emergency, alert, critical, error, warning, notice, info, debug.
Old integer values (0-5) are still supported and automatically converted
into literal format.
2019-10-18 19:12:32 +03:00
Badlop
b1d458999a
Flatten strings in ejabberd_xmlrpc error results
2019-10-18 13:16:37 +02:00
Linus Jahn
a98e443501
msgs: de: Fix comma setting
2019-10-18 01:55:25 +02:00
Paweł Chmielowski
9822535e70
Convert oauth_expire option to accept timeout values
2019-10-15 11:28:47 +02:00
Evgeny Khramtsov
3821208bb1
Improve type spec of properties()
2019-10-11 17:57:45 +03:00
Alexey Shchepin
e7a20d9fc5
Fix dialyzer warning in #oauth_ctx
2019-10-11 17:39:11 +03:00
Evgeny Khramtsov
211cc80fd4
Implement X-OAUTH2 authentication for mod_mqtt
...
This will only work for MQTT 5.0 connections.
A client MUST set "Authentication Method" property of CONNECT
packet to "X-OAUTH2" and MUST set the token in "Authentication Data"
property of the same CONNECT packet.
The server responses as usual with CONNACK.
2019-10-11 16:46:16 +03:00
Paweł Chmielowski
8d571adca8
Verify http host in web admin only if authentication is missing host
...
This should allow access to web admin through ip address or just served
from domain not defined in ejabberd hosts
2019-10-09 10:31:02 +02:00
Mickaël Rémond
584a4b0a2b
Try removing label as bug
...
Many tickets submitted by users are not bugs.
2019-10-04 09:02:45 +02:00
Badlop
9df26a5740
Update ejabberd_xmlrpc to handle binaries in restuple result ( #3048 )
2019-10-03 16:48:22 +02:00
Alexey Shchepin
5d549dca96
Check redirect_uri for OAUTH implicit grant
2019-10-03 06:18:48 +03:00
Badlop
949e71efb6
Update Guide links in WebAdmin to website, as local file isn't included
2019-10-02 12:42:59 +02:00
Badlop
20205c66c1
Support custom base path in WebAdmin by using relative URLs ( #3043 )
2019-10-02 12:42:54 +02:00
Evgeny Khramtsov
7fc272918a
Fix startup of supervisors for listening modules
2019-10-01 23:28:00 +03:00
Paweł Chmielowski
6ca5691792
Allow configuring proxy65 port in tests
2019-10-01 17:00:50 +02:00
Paweł Chmielowski
0673b068e0
Bump version of jose to 1.9.0
...
This version theoretically require rebar3 but we have plugin that can
override it by using version declared in main config file
2019-10-01 16:34:25 +02:00
Mickael Remond
00c77dadd3
Update description for Hex.pm
2019-09-30 10:10:44 +02:00
Evgeny Khramtsov
c49edaca19
Improve best match
2019-09-28 11:27:20 +03:00
Alexey Shchepin
8f7fa38949
Support OAUTH client authentication
2019-09-27 20:36:58 +03:00
Evgeny Khramtsov
47d0eed3f1
Advertise muc#roominfo_logs in disco#info of the room
...
The commit adds new `url` option for mod_muc_log.
Fixes #3040
2019-09-26 16:53:36 +03:00
Evgeny Khramtsov
d2f92eecd4
Re-tag xmpp dep
2019-09-26 10:22:36 +03:00
Paweł Chmielowski
8918bfb55b
Update deps in mix.exs/lock
2019-09-25 14:55:32 +02:00
Jerome Sautret
ce8bd343de
Bump version in mix.exs
2019-09-25 14:54:12 +02:00
Evgeny Khramtsov
2eaad21863
Don't log warning when an option is consulted for uknown vhost
...
Such warnings may be unappropriate in some situation, e.g.
when a virtual host is disabled in runtime but some packets
for this host are still in transit.
Fixes #3037
2019-09-25 13:58:05 +03:00
Paweł Chmielowski
9b2a44e750
Tag p1_acme and use that in deps
2019-09-25 12:46:22 +02:00
Evgeny Khramtsov
aefe2fd640
Rename to p1_acme
2019-09-25 13:10:47 +03:00
Jerome Sautret
a8f336421e
Add 19.09 Changelog
2019-09-24 18:30:10 +02:00
Paweł Chmielowski
f2e8754586
Update deps
2019-09-24 11:01:43 +02:00
Evgeny Khramtsov
5770946f03
Correctly handle unicode in log messages
2019-09-23 15:17:20 +03:00
Evgeny Khramtsov
2e1e128833
Fix unicode formatting in ACME module
2019-09-22 20:11:54 +03:00
Evgeny Khramtsov
faefad746e
Fix unicode processing in ejabberd.yml
2019-09-22 19:42:29 +03:00
Evgeny Khramtsov
b7e296857c
Don't call to xmpp_idna
2019-09-22 13:28:14 +03:00
Evgeny Khramtsov
75fe6f44d2
Fix IDNA support in ACME requests
2019-09-22 12:44:31 +03:00
Evgeny Khramtsov
30346a56de
Don't forget to log an error message on IDNA failure
2019-09-22 11:30:20 +03:00
Evgeny Khramtsov
a616cc04cb
Support IDN hostnames in ACME requests
2019-09-22 11:04:38 +03:00
Evgeny Khramtsov
d5e0ccb04a
Don't attempt to create acme directory on ejabberd startup
2019-09-22 01:14:29 +03:00
Evgeny Khramtsov
ea09497038
Slightly improve arg example
2019-09-22 01:03:08 +03:00
Evgeny Khramtsov
f5156390bb
Don't allow requesting certificates for localhost or IP-like domains
2019-09-22 00:53:03 +03:00
Evgeny Khramtsov
12691e738b
Improve warning message
2019-09-22 00:21:12 +03:00
Evgeny Khramtsov
6d9be82e1b
Avoid excessive quoting in request_handlers of example config
2019-09-21 22:20:20 +03:00
Evgeny Khramtsov
fa00caced4
Bump acme version
2019-09-21 22:18:49 +03:00
Evgeny Khramtsov
bacaae7873
Comment `certfiles` section in example config
...
Rely on ACME configuration instead
2019-09-20 16:12:15 +03:00
Evgeny Khramtsov
81ae691738
Use round/0 instead of ceil/0
...
Because ceil/0 was introduced in OTP20.0 only
2019-09-20 15:33:08 +03:00
Evgeny Khramtsov
9805b1a73a
Fix typo
2019-09-20 14:04:00 +03:00
Evgeny Khramtsov
68ba109889
Remove unused file
2019-09-20 13:08:03 +03:00
Evgeny Khramtsov
4cdb4c2090
Don't auto request certificate for localhost and IP-like domains
2019-09-20 13:03:25 +03:00
Evgeny Khramtsov
1162137d5d
Add listener for ACME challenge in example config
2019-09-20 12:52:28 +03:00
Evgeny Khramtsov
e227940b85
Improve ACME implementation
...
Fixes #2487 , fixes #2590 , fixes #2638
2019-09-20 12:36:31 +03:00
Alexey Shchepin
0fe1e40a9d
JWT-only authentication for some users ( #3012 )
2019-09-18 18:46:24 +03:00
Holger Weiss
f48b4124b1
mod_jidprep: Don't call gen_mod functions directly
2019-09-18 17:39:40 +02:00
Badlop
fd4c5edc23
Apply default role after revoking admin affiliation ( #3023 )
2019-09-17 12:31:14 +02:00
Holger Weiss
d8433d1644
README.md: Clean up wording
...
The `gsfonts` package name is specific to some Linux distributions, so
just mention the dependency on "Ghostscript fonts".
2019-09-12 12:22:30 +02:00
Holger Weiss
0f864d97f6
Merge remote-tracking branch 'processone/pr/2995'
...
* processone/pr/2995:
Added gsfonts for captcha
2019-09-12 12:20:59 +02:00
Holger Weiss
b1c10d2a03
Add support for XEP-0328: JID Prep
...
The mod_jidprep module implements XEP-0328: JID Prep, version 0.1.
2019-09-12 09:26:45 +02:00
Evgeny Khramtsov
56b4d3902a
Log Mnesia table type on creation
2019-09-10 21:57:51 +03:00
Evgeny Khramtsov
533a4eec96
Replicate Mnesia 'bosh' table when nodes are joined
2019-09-10 16:02:51 +03:00
Mickael Remond
bd83bb0790
Merge branch 'master' of github.com:processone/ejabberd
2019-09-09 12:13:27 +02:00
Mickael Remond
7b79921734
Use email field type to avoid jid capitalization on iOS
2019-09-09 12:12:54 +02:00
Holger Weiss
017f60d33c
Fix typos in issue template
2019-09-09 10:46:54 +02:00
Mickaël Rémond
bf6fc75ada
Update issue templates
2019-09-09 09:49:54 +02:00
Alexey Shchepin
6d83cbd1a8
Add missing ejabberd_auth_jwt:user_exists/2 function ( #3012 )
2019-09-09 00:57:55 +03:00
Alexey Shchepin
21aa344ed5
Fix BEGIN/COMMIT/ROLLBACK syntax for MSSQL ( #2978 )
2019-09-09 00:16:44 +03:00
Evgeny Khramtsov
a8c6eec28c
Fix certificate selection for s2s
...
The bug was introduced in c2cbb4d879
Fixes #3015
2019-09-06 22:20:07 +03:00
Paweł Chmielowski
6d08ecc41f
Add ejabberd_oauth:verify_resowner_scope callback back
...
This fixes issue #2982
2019-09-06 16:47:22 +02:00
Evgeny Khramtsov
9a8245b8e6
Fix the regression introduced in dd57950
...
Fixes #3010
2019-09-04 10:31:09 +03:00
Badlop
e50ecf9e96
Fix some links to Guide in WebAdmin and add new ones ( #3003 )
2019-08-27 15:41:37 +02:00
badlop
e14f206615
Merge pull request #3004 from Slawutich/master
...
Custom exit message is not broadcast
2019-08-26 13:53:42 +02:00
Vyache
c0f8e5d7c0
Custom exit message is not broadcast
2019-08-23 09:32:58 +03:00
Badlop
1fd75265d6
Use select fields to input host in WebAdmin Backup ( #3000 )
2019-08-22 18:35:43 +02:00
Badlop
94d50a447d
Fix call to deprecated ejabberd_config:get_myhosts() ( #3000 )
2019-08-22 18:35:41 +02:00
Badlop
12c4dfd955
Provide meaningful error when adding non-local users to shared roster ( #3000 )
2019-08-22 17:13:18 +02:00
Badlop
a51aa2bc44
Check account auth provided in WebAdmin is a local host ( #3000 )
2019-08-22 17:13:13 +02:00
ThUnD3r|Gr33n
4a9b1e94f3
Added gsfonts for captcha
...
This is needed to show Captcha .if not Captcha would be empty
2019-08-18 11:19:09 +02:00
Paweł Chmielowski
07ef1775cd
Add another variant of transformation of offline_msg in mod_offline_mnesia
2019-08-16 18:34:42 +02:00
Evgeny Khramtsov
9ec69b8d62
Don't treat 'Host' header as a virtual XMPP host
...
Fixes #2989
2019-08-13 18:30:28 +03:00
Badlop
0bb14bdc0b
Revert "Affiliations other than admin and owner cannot invite to members_only rooms"
...
This reverts commit b010a1a0a0
.
More details in #2987
2019-08-13 14:55:37 +02:00
Badlop
a157e22c2f
When join new room with password, set pass and password_protected ( #2668 )
2019-08-13 11:37:32 +02:00
Badlop
a1dfb7fbe6
Improve rooms_* commands to accept 'global' as MUC service argument ( #2976 )
2019-08-12 17:03:32 +02:00
Evgeny Khramtsov
8f8f53a595
Fix typo in type spec
2019-08-12 12:28:17 +03:00
Evgeny Khramtsov
d796dcace5
Spawn SQL connections on demand only
2019-08-12 12:21:31 +03:00
Badlop
dd8c468de3
Rename MUC command arguments from Host to Service ( #2976 )
2019-08-08 12:32:59 +02:00
Evgeny Khramtsov
ced62e0df8
Don't use close/2: set stop_reason explicitly
...
Fixes #2984
2019-08-08 11:21:28 +03:00
Mickael Remond
28feb90175
Remove fast_yaml override
2019-08-06 15:47:58 +02:00
Evgeny Khramtsov
950c209310
Report connection error before waiting for resumption
...
In other words don't hide the reason why c2s connection has failed
2019-08-06 16:18:04 +03:00
Evgeny Khramtsov
77acbab965
Add tests for 'vcard' option
2019-08-06 14:03:23 +03:00
Evgeny Khramtsov
934392fd7e
Implement reload/3 for mod_http_upload
2019-08-06 12:31:33 +03:00
Jerome Sautret
11d519677e
Add 19.08 Changelog
2019-08-05 14:36:45 +02:00
Paweł Chmielowski
e520a4c78d
Adopt mix task to changes in ejabberd_config
2019-08-05 10:55:30 +02:00
Paweł Chmielowski
c2d97854e3
Bump version in mix.exs
2019-08-05 10:15:06 +02:00
Paweł Chmielowski
1d2fba856e
Update mix deps
2019-08-05 10:14:30 +02:00
Evgeny Khramtsov
2168489ddf
Don't retain module option on gen_mod supervisor
...
When module's options were updated (e.g. by reloading ejabberd.yml)
and, later, the module's process crashed, gen_mod supervisor
restarts the process with outdated options. This is now fixed.
2019-08-04 21:46:18 +03:00
Paweł Chmielowski
e8fb9ab303
Use tagged version for yconf as well
2019-08-02 16:06:19 +02:00
Paweł Chmielowski
b50e7161ee
Update deps to tagged versions
2019-08-02 15:12:38 +02:00
Evgeny Khramtsov
4dac9f1e6d
Validate BINVAL values of vcard elements as Base64
2019-08-02 14:20:10 +03:00
Evgeny Khramtsov
5a976719fb
Introduce 'vcard' option for the modules supporting vCards
...
The mapping between vCard's XML elements and YAML elements
of 'vcard' option is straightforward. For example, if you
want mod_muc to return the following vCard:
```
<vCard xmlns='vcard-temp'>
<FN>Conferences</FN>
<ADR>
<WORK/>
<STREET>Elm Street</STREET>
</ADR>
</vCard>
```
you need to set the configuration as:
```
modules:
...
mod_muc:
vcard:
fn: Conferences
adr:
-
work: true
street: Elm Street
...
```
2019-08-02 13:59:42 +03:00
Evgeny Khramtsov
2f51aae818
Bump pkix version
2019-08-01 12:56:23 +03:00
Badlop
66d2e6ca27
Explain requirements of the FROM argument of send_message command ( #2959 )
2019-08-01 11:29:42 +02:00
Evgeny Khramtsov
059cf8fed1
Don't call ejabberd_cluster from its submodules
...
Fixes #2971
2019-07-31 19:25:47 +03:00
Evgeny Khramtsov
465e1f5ee1
Fix db_type validation
2019-07-31 18:55:43 +03:00
Paweł Chmielowski
aa0f110afe
Add test that trigger get_only_item in pubsub
2019-07-31 13:11:27 +02:00
Paweł Chmielowski
51bf552c3f
For pubsub items with max_item = 1 use order by in sql queries
2019-07-31 13:06:44 +02:00
Evgeny Khramtsov
48bed43902
Don't render CAPTCHA whitelist when CAPTCHA is not configured
...
Fixes #2970
2019-07-31 12:35:06 +03:00
Paweł Chmielowski
a2fa52a192
Change type of server_host column in mysql.new.sql
...
Indexes are done only on 191 byte slice of that (to fit in index limits),
and since server_host could theoretically be bigger this causes mysql
engine don't use indexes in full potential.
2019-07-31 10:46:15 +02:00
Evgeny Khramtsov
bbee13f970
Improve SQL timeouts handling
...
Also improve some formatting
2019-07-31 10:39:53 +03:00
Evgeny Khramtsov
651d69fb98
Also catch 'shutdown' exit reason
2019-07-30 23:17:10 +03:00
Evgeny Khramtsov
15f50f5331
Improve pattern matching
2019-07-30 20:57:32 +03:00
Evgeny Khramtsov
3e4d7a98af
Implement read-repair for session pids
2019-07-30 20:57:09 +03:00
Evgeny Khramtsov
46cc6c66ec
Remove dead code
2019-07-30 15:31:44 +03:00
Evgeny Khramtsov
b4770815c0
Fix race condition when deleting c2s session record
2019-07-30 15:21:58 +03:00
Evgeny Khramtsov
209f5d32e1
Fix SQL connections leakage
2019-07-30 14:26:11 +03:00
Evgeny Khramtsov
81996b153a
Fix previous commit
2019-07-30 13:40:40 +03:00
Evgeny Khramtsov
59adfcb8e0
Correctly report resume timeout
2019-07-30 12:50:31 +03:00
Evgeny Khramtsov
8a2b2668cf
Expose access_model and publish_model in pubsub#metadata
...
Fixes #2931
2019-07-30 10:45:32 +03:00
Evgeny Khramtsov
949e4c1c59
Generate 'remote-server-not-found' stanza error for non-IDN domains
...
Fixes #2969
2019-07-29 22:45:38 +03:00
Evgeny Khramtsov
d64951c2b2
Improve handling of errors in tree_action/3
2019-07-29 22:24:26 +03:00
Evgeny Khramtsov
2cd930b7d5
Appropriately abort pubsub transaction
2019-07-29 21:44:30 +03:00
Badlop
630cfe26b7
mod_multicast service discovery bugfix (thanks to McPo)( #2968 )
2019-07-29 19:32:26 +02:00
Evgeny Khramtsov
2da168cf05
Improve handling of errors in pubsub code
2019-07-29 17:13:16 +03:00
Frank Diebolt
cd88d342b9
Apply shaping to websocket connections
2019-07-29 14:54:25 +02:00
Evgeny Khramtsov
35576b4608
Improve hooks validator and fix bugs related to hooks registration
2019-07-29 10:46:20 +03:00
Evgeny Khramtsov
0aa004bafc
Improve ejabberd halting procedure
2019-07-26 11:40:19 +03:00
Evgeny Khramtsov
a54694684d
Fix default value of resume_timeout
2019-07-25 13:57:43 +03:00
Evgeny Khramtsov
3b18e7cc00
Don't attempt to restart killed lager
...
This is not very robust and the call may hang forever
2019-07-24 19:47:14 +03:00
Evgeny Khramtsov
ca0e53b3c5
Fix typo in log message
2019-07-24 18:56:44 +03:00
Evgeny Khramtsov
ae135e57d9
Improve SQL pool logic
...
Avoid using ETS table for SQL workers: rely on processes names instead
2019-07-24 14:28:43 +03:00
Holger Weiss
c3c8dffeab
Revert "mod_privacy: Don't try to look up 'undefined' list"
...
This reverts commit 4218aecd1c
. The issue
was fixed in a0d3fb3b23
already.
2019-07-24 11:29:57 +02:00
Holger Weiss
4218aecd1c
mod_privacy: Don't try to look up 'undefined' list
...
Don't crash if the <query/> element of an IQ of type 'set' contains
neither a <default/> nor an <active/> child.
This fixes a regression introduced in commit
8410a203ec
.
2019-07-24 10:45:30 +02:00
Evgeny Khramtsov
9ef52f2b0f
Fix UTF-8 support in translation files
2019-07-24 11:34:40 +03:00
Evgeny Khramtsov
052917961a
Add 'certauth' command to extauth port
2019-07-24 10:13:51 +03:00
Holger Weiss
8ac4a5f792
mod_stream_mgmt: Allow flexible timeout format
...
Adjust mod_stream_mgmt and the related code in mod_push_keepalive to
support the flexible timeout format.
2019-07-23 00:15:40 +02:00
Christophe Romain
c0dc95d529
Fix wrong virtual host in mod_pubsub:send_stanza ( #2930 )
2019-07-22 10:13:27 +02:00
Evgeny Khramtsov
4be98b5aef
Log an error when JWT authentication is configured without jwt_key
2019-07-19 12:01:57 +03:00
Evgeny Khramtsov
55d42b9000
Fix typo
2019-07-18 22:35:16 +03:00
Evgeny Khramtsov
6d6e3e348d
Improve robustness of reading jwt_key option
2019-07-18 22:31:08 +03:00
Evgeny Khramtsov
50ef982eff
Get rid of useless code
2019-07-18 21:53:22 +03:00
Evgeny Khramtsov
ad902c2e16
Don't forget to unregister route when the owning process is dead
2019-07-18 21:48:53 +03:00
Evgeny Khramtsov
3f7d9e3ad6
Remove Riak support
...
Reasons:
- Riak DB development is almost halted after Basho
- riak-erlang-client is abandoned and doesn't work
correctly with OTP22
- Riak is slow in comparison to other databases
- Missing key ordering makes it impossible to implement range
queries efficiently (e.g. MAM queries)
2019-07-18 19:31:12 +03:00
Mickaël Rémond
11e4b9d882
Mention about a few Riak tests being broken
2019-07-18 17:56:11 +02:00
Mickaël Rémond
179a9f4ca8
Explain how to kill stuck common test run
2019-07-18 17:24:13 +02:00
Mickaël Rémond
f2fd087673
Update docker test README
2019-07-18 17:14:20 +02:00
Mickaël Rémond
a351dfe0f8
Fix example on test data set deletion
2019-07-18 17:05:50 +02:00
Evgeny Khramtsov
478f69317b
Report failures of changing net_ticktime
2019-07-18 13:02:13 +03:00
Evgeny Khramtsov
6397dc5d4c
Reset net ticktime on config reload
2019-07-18 12:47:29 +03:00
Evgeny Khramtsov
dd301306d3
Allow flexible timeout format in session_expiry option of mod_mqtt
2019-07-17 22:58:14 +03:00
Evgeny Khramtsov
d718b35d46
Use econf:timeout() instead of econf:pos_int() wherever appropriate
2019-07-17 22:15:56 +03:00
Evgeny Khramtsov
c5305c5f9a
Improve RPC calls in mod_configure
2019-07-17 20:51:33 +03:00
Evgeny Khramtsov
38b2e099d5
Fix pending nodes retrieval for SQL backend
...
Thanks to Christophe Romain
2019-07-17 12:34:09 +03:00
Evgeny Khramtsov
2171abf5ae
Allow more flexible timeout values in the configuration
...
Now all timeout values can be expanded with suffixes, e.g.
```
negotiation_timeout: 30s
s2s_timeout: 10 minutes
cache_life_time: 1 hour
```
If the suffix is not given, the timeout is assumed in *seconds*
2019-07-16 23:45:44 +03:00
Evgeny Khramtsov
554f4fc851
Change time unit of hibernation_timeout option to 'second'
...
This is done for the sake of consistency with other options
2019-07-16 23:42:38 +03:00
Evgeny Khramtsov
15b4b3fa1b
Fix typos using codespell
2019-07-16 22:07:39 +03:00
Evgeny Khramtsov
cc2f674805
Avoid record duplication
2019-07-16 18:34:05 +03:00
Evgeny Khramtsov
a7a53f601e
Add econf:string/2 validator
2019-07-16 18:10:45 +03:00
Evgeny Khramtsov
0e48adb1ed
Fix opt_type.sh script and re-generate options
2019-07-16 18:06:51 +03:00
Evgeny Khramtsov
76d4c178a7
Use econf:timeout/2
2019-07-16 18:02:32 +03:00
Evgeny Khramtsov
f85488583c
Handle CAPTCHA forms using captcha_form codec
2019-07-16 17:51:51 +03:00
Paweł Chmielowski
6b3d0d154e
Add code for hibernating inactive muc_room processes
2019-07-16 15:09:58 +02:00
Evgeny Khramtsov
4d877289fb
Bump xmpp version and fix revealed bugs
2019-07-16 15:59:33 +03:00
Evgeny Khramtsov
f10de6439b
Fix 'get-pending' command form generation
2019-07-16 15:09:51 +03:00
Badlop
5ecbed5eae
Remove very old useless comments in ejabberd_xmlrpc.erl
2019-07-16 12:56:41 +02:00
Badlop
7079634f18
Documentation of mod_http_api moved from source code to Docs page
2019-07-16 12:53:06 +02:00
Evgeny Khramtsov
5eeb95c74f
Remove modules management from mod_configure
2019-07-15 17:08:41 +03:00
Evgeny Khramtsov
e1f3526466
Don't hide errors using catch
2019-07-15 17:03:29 +03:00
Evgeny Khramtsov
a00496a38f
Compile some regexps as unicode
2019-07-15 15:26:47 +03:00
Evgeny Khramtsov
2419e00a26
Bump yconf version
2019-07-15 15:22:51 +03:00
Evgeny Khramtsov
061c754c68
Fix regexp matching
2019-07-15 15:07:56 +03:00
Evgeny Khramtsov
104c4093dc
Only respond with occupants list to disco#items with empty node
...
Fixes #2942
2019-07-15 14:10:45 +03:00
Evgeny Khramtsov
4ec78736b9
Improve handling of unexpected iq in mod_muc_room
...
Don't crash on an iq-set/get containing unexpected tag within
expected namespace
This further improves PR #2900
2019-07-15 13:59:41 +03:00
Evgeny Khramtsov
04dab48794
ejabberd_s2s should start after its supervisors
2019-07-15 12:59:47 +03:00
Evgeny Khramtsov
295015a8cb
Fix startup order of ejabberd_sup children
2019-07-15 12:53:26 +03:00
Evgeny Khramtsov
e1eedd587d
Remove processing of {wait, _} result in gen_mod
...
This is no longer needed
2019-07-15 12:43:55 +03:00
Evgeny Khramtsov
a4e19b7108
Increase shutdown time to 5 seconds
2019-07-15 12:43:32 +03:00
Evgeny Khramtsov
87b8344ede
Attach mod_muc_room processes to a supervisor
2019-07-15 12:43:05 +03:00
Evgeny Khramtsov
1fe1322bc1
Improve some validators
2019-07-15 09:59:07 +03:00
Holger Weiss
cd36bb6eda
mod_http_fileserver: Unregister 'reopen_log_hook'
...
Unregister the global 'reopen_log_hook' on termination if the module isn't
loaded for another host.
2019-07-14 15:16:13 +02:00
Evgeny Khramtsov
15dcff92e8
Use correct virtual host when consulting trusted_proxies
2019-07-13 12:20:06 +03:00
Evgeny Khramtsov
9c2392f6e9
Merge branch 'master' of github.com:processone/ejabberd
2019-07-13 10:35:06 +03:00
Evgeny Khramtsov
6013b4a3a6
Fix broken ejabberd_cluster:call/5
2019-07-13 10:34:59 +03:00
Paweł Chmielowski
f0bbc05b7a
Make sure that configure is run before pc:compile on rebar3
2019-07-12 15:00:12 +02:00
Paweł Chmielowski
948578b55b
Downgrade jose to version that works with rebar2 and del warning_as_error from it's config
2019-07-12 14:55:01 +02:00
Paweł Chmielowski
5a927049ef
Bump jose version
2019-07-12 13:02:10 +02:00
Evgeny Khramtsov
f0c0e4a6fc
Don't crash when attempt to get an option for unknown virtual host
...
Log a warning instead and retry with a global scope
2019-07-12 13:59:33 +03:00
Evgeny Khramtsov
696c64064b
Add call/5 and multicall/5 to ejabberd_cluster
2019-07-12 13:58:46 +03:00
Evgeny Khramtsov
53dacb3825
Use ejabberd_cluster:call() instead of rpc:call()
2019-07-12 12:30:38 +03:00
Evgeny Khramtsov
6f5d99275b
Process unexpected messages uniformly
2019-07-12 11:55:36 +03:00
Evgeny Khramtsov
19cbbf69b2
Improve previous commit
2019-07-11 00:13:39 +03:00
Evgeny Khramtsov
6fd736d496
Gracefully report invalid encoding of a translation file
2019-07-11 00:04:32 +03:00
Evgeny Khramtsov
b0379db5a1
Fix formatting
2019-07-10 23:46:42 +03:00
Evgeny Khramtsov
d1b5844d64
Merge pull request #2900 from aquarhead/protect-muc-owner
...
Protect against bad muc#owner requests
2019-07-10 23:46:08 +03:00
Evgeny Khramtsov
9dedbe30ba
Make sure configuration file path always represented as binary()
...
Fixes #2936
2019-07-10 23:35:53 +03:00
Evgeny Khramtsov
bfa3125a81
Fix Elixir modules detection in the configuration file
...
Fixes #2937
2019-07-10 23:17:53 +03:00
Evgeny Khramtsov
5700089187
Gracefully close inbound s2s connections
2019-07-10 12:15:58 +03:00
Evgeny Khramtsov
722864666d
Add/improve type specs
2019-07-10 10:31:51 +03:00
Evgeny Khramtsov
691f9e0bf7
Improve error handling/reporting when loading language translations
...
Also speed up loading on multi-core machines
2019-07-10 10:30:11 +03:00
Evgeny Khramtsov
04ccba0347
Fall back to map/2 and foreach/2 on single-core machines
2019-07-10 10:28:37 +03:00
Evgeny Khramtsov
01f531b3d6
Add type specs for mod_adhoc
2019-07-09 17:02:54 +03:00
Evgeny Khramtsov
f19b41fd19
Improve type specs for ejabberd_s2s
...
Also minor code cleanup
2019-07-09 16:42:24 +03:00
Evgeny Khramtsov
43da45cf67
Improve type specs of mod_muc_room
2019-07-09 15:21:17 +03:00
Evgeny Khramtsov
11fa02cd6c
Improve type specs of mod_roster
2019-07-09 14:30:59 +03:00
Evgeny Khramtsov
590849e2c3
Avoid returning 'stopped' from ejabberd_hooks:run_fold()
2019-07-09 14:30:25 +03:00
Evgeny Khramtsov
f7ad25108c
Get rid of unused API functions in ejabberd_hooks
...
Also improve code formatting and type specs
2019-07-09 01:26:48 +03:00
Evgeny Khramtsov
3e88a0b0b4
Don't expose internal FSM API of ejabberd_c2s
2019-07-09 01:01:56 +03:00
Evgeny Khramtsov
9cbc0685db
Don't expose internal FSM API of mod_muc_room
2019-07-09 00:47:54 +03:00
Evgeny Khramtsov
cbe84eb50c
Check virtual host before running the command
2019-07-08 23:14:31 +03:00
Evgeny Khramtsov
0545e0a797
Ignore late arrival of an already cancelled timer
2019-07-08 19:32:37 +03:00
Evgeny Khramtsov
e8eb6bc2b4
Avoid crashing of ejabberd_iq process on invalid callback
2019-07-08 10:45:13 +03:00
Evgeny Khramtsov
d4d352492c
Debug hooks
2019-07-08 09:57:33 +03:00
Evgeny Khramtsov
83e6741117
Use maps instead of dict
2019-07-08 09:55:32 +03:00
Evgeny Khramtsov
92ab59a581
Use ets and maps instead of dict
2019-07-08 09:46:50 +03:00
Evgeny Khramtsov
80beb6d6f6
Improve formatting of exceptions
2019-07-07 22:12:14 +03:00
Evgeny Khramtsov
368858a744
Fix return type in try_set_password()
...
Fixes #2932
2019-07-07 12:16:04 +03:00
Evgeny Khramtsov
fd8e5ffce7
Avoid routing packets through a single process
2019-07-06 12:30:57 +03:00
Evgeny Khramtsov
1663e78cf7
Fix validator of option ejabberd_service->hosts
...
Fixes #2929
2019-07-06 10:38:25 +03:00
Evgeny Khramtsov
61a58f6e67
Do not call the same function twice
2019-07-06 10:21:01 +03:00
Paweł Chmielowski
756adaba55
Restore room when receiving message or generic iq for not started room
2019-07-05 13:46:48 +02:00
Paweł Chmielowski
d7e86d1d32
Limit number of rooms that we return for disco_items from muc
...
We will limit it to max_room_discoitems and return rsm that would allow
fetching more
2019-07-05 11:08:32 +02:00
Evgeny Khramtsov
f82de80c66
Add forgotten file
2019-07-05 10:49:27 +03:00
Evgeny Khramtsov
b3caade0a0
Distribute routing of MUC messages accross all CPU cores
...
Also relay as less stanzas as possible through mod_muc workers
2019-07-05 10:35:31 +03:00
Evgeny Khramtsov
05461d1686
Propagate max_fsm_queue to all modules started as gen_server
2019-07-04 10:26:59 +03:00
Evgeny Khramtsov
d411e68a2e
Make return type of sql_transaction() consistent
2019-07-04 09:27:51 +03:00
Evgeny Khramtsov
4658d478b4
Don't call ejabberd_option from ejabberd_options
2019-07-03 19:23:05 +03:00
Evgeny Khramtsov
b7f6620166
Fix jwt_key option processing
2019-07-03 19:16:54 +03:00
Evgeny Khramtsov
0d0ad9d1d9
Use correct virtual host
2019-07-03 19:08:38 +03:00
Evgeny Khramtsov
8180bc22ee
Fix formatting
2019-07-03 12:58:59 +03:00
Evgeny Khramtsov
6e2502ea7d
Monitor routes
...
Clean route table from the process that died unexpectedly.
This usually may happen when the corresponding process
gets killed by OOM killer during overload.
2019-07-03 10:39:03 +03:00
Evgeny Khramtsov
0fc190e2ef
Fix 'request_handlers' transformation
...
Fixes #2925
2019-07-03 09:54:56 +03:00
Evgeny Khramtsov
9f9e308241
Avoid using ! in ejabberd_router and mod_offline
2019-07-03 09:42:18 +03:00
Alexey Shchepin
ff6884f313
Read jwt_key from file
2019-07-03 05:33:35 +03:00
Evgeny Khramtsov
f68da70f3e
Avoid last handled stanzas cache to grow indefinitely
2019-07-01 20:43:57 +03:00
Badlop
052894d608
Update Spanish and Catalan translations
2019-07-01 17:51:42 +02:00
Paweł Chmielowski
40c360c607
Invalidate proper cache when using mam for offline in pop_messages
2019-07-01 14:30:39 +02:00
Alexey Shchepin
8956b7d60d
Fix a condition in ejabberd_auth_jwt
2019-07-01 14:44:28 +03:00
Paweł Chmielowski
3e8f3573a3
Make count_offline_messages cache work when offline uses mam for storage
...
This also replace existing cache for checking if spool is empty with this
cache.
2019-07-01 13:36:41 +02:00
Evgeny Khramtsov
c5fde9d5af
Get rid of useless dialyzer instructions
2019-07-01 10:36:20 +03:00
Evgeny Khramtsov
9912f981c0
Bump cache_tab version
2019-07-01 09:26:56 +03:00
Evgeny Khramtsov
3d82a5eee6
Fix ejabberd_auth_jwt return types and regenerate ejabberd_option.erl
2019-07-01 09:05:33 +03:00
Alexey Shchepin
3e5c0a1df8
Authentication using JWT tokens
2019-07-01 05:01:55 +03:00
Evgeny Khramtsov
4aebd2fd8e
Cache number of offline messages
2019-06-30 21:14:37 +03:00
Evgeny Khramtsov
253ec13971
Use new ets_cache API in ejabberd_auth
2019-06-30 17:15:43 +03:00
Evgeny Khramtsov
a2a061c1c8
Avoid using broad p1_queue:queue() type wherever possible
2019-06-28 22:16:29 +03:00
Evgeny Khramtsov
6011135d24
Use yconf validator for custom Mnesia schemas
2019-06-27 15:23:21 +03:00
Evgeny Khramtsov
39cf8d86d6
Avoid using broad map() type wherever possible
2019-06-27 15:22:27 +03:00
Evgeny Khramtsov
6b684c866b
Use correct rr_type()
2019-06-27 11:35:56 +03:00
Evgeny Khramtsov
2abca350e0
Fix type specs
2019-06-27 11:32:54 +03:00
Evgeny Khramtsov
4e5daf4d72
Make sure queue bouncing doesn't yield into infinite recursion
2019-06-26 11:56:25 +03:00
Evgeny Khramtsov
ffe1c722e0
Deprecate 'route_subdomains' option
...
This option was introduced to fulfill requirement of RFC3920 10.3,
but in practice it was very inconvenient and many admins were
forced to change its value to 's2s' (i.e. to behaviour that
violates the RFC). Also, it seems like in RFC6120 this requirement
no longer presents.
Those admins who used this option to block s2s with their subdomains
can use 's2s_access' option for the same purpose.
2019-06-26 10:45:58 +03:00
Evgeny Khramtsov
b479fe5315
Use correct stacktrace in logging macros
...
By calling erlang:get_stacktrace() inside a lager function
we obtain actually a stacktrace of the lager function, not
the one we got during exception. This is not a problem for
newest Erlang versions though.
2019-06-26 00:05:41 +03:00
Evgeny Khramtsov
6697a3e3f1
Use proper loglevel to log resumption failures
2019-06-25 20:42:54 +03:00
Paweł Chmielowski
7b35690bc9
Store muc_subscribers in process dict if get_subscribed_rooms not available
2019-06-25 16:41:47 +02:00
Evgeny Khramtsov
8b300d734b
Don't propagate downstream already handled message
2019-06-25 14:36:17 +03:00
Evgeny Khramtsov
28b1d88772
Call ejabberd_s2s:allow_host/2 with correct virtual host
2019-06-24 21:18:57 +03:00
Evgeny Khramtsov
49214d9cc5
Report invalid translation strings
2019-06-24 21:09:29 +03:00
Evgeny Khramtsov
a3e0cbbdd8
Make logging messages more consistent
2019-06-24 20:32:34 +03:00
Evgeny Khramtsov
370226417a
Check if mod_last is loaded before calling its functions
2019-06-24 18:47:51 +03:00
Evgeny Khramtsov
2e35252aed
Use "begin ... end" in logging macros
2019-06-24 18:47:19 +03:00
Evgeny Khramtsov
db9e8220ec
Deprecated access_commands option
2019-06-24 17:20:29 +03:00
Evgeny Khramtsov
1d239ec6fb
Make ejabberd_xmlrpc working as a listening module again
...
Fixes #2915
2019-06-24 17:13:34 +03:00
Evgeny Khramtsov
d0b65a3c95
Don't crash on empty avatar data
2019-06-24 17:00:51 +03:00
Evgeny Khramtsov
c2cbb4d879
Use correct virtual host for s2s options
2019-06-23 19:37:54 +03:00
Evgeny Khramtsov
4b65fcab62
Avoid code duplication in gen_mod
2019-06-23 17:06:53 +03:00
Evgeny Khramtsov
deee194522
Let it crash on unspecified option
2019-06-23 16:54:01 +03:00
Evgeny Khramtsov
abbf8dad6b
Update Russian msg file
2019-06-23 14:19:57 +03:00
Evgeny Khramtsov
523a65b711
Update Russian PO file
2019-06-23 14:19:15 +03:00
Evgeny Khramtsov
83c291c064
Respond with 'Bad Request' to unexpected 'Host' header
...
Where "unexpected" means the host in 'Host' header is not
a registered route. The rationale is to avoid propagation
of uknown "Host" further in the code, which may lead to
nasty errors related to reading configuration values, calling
functions from ejabberd_router.erl, etc.
2019-06-23 13:12:00 +03:00
Evgeny Khramtsov
e477a8c220
Validate and set 'version' option at an earlier stage
2019-06-23 12:23:22 +03:00
Evgeny Khramtsov
e31373a86c
Run "make translations"
2019-06-22 18:15:35 +03:00
Evgeny Khramtsov
e788592a88
Generate paths for poedit
2019-06-22 18:07:36 +03:00
Evgeny Khramtsov
1ca61821c6
Update extract-tr.sh script
2019-06-22 17:24:15 +03:00
Evgeny Khramtsov
00f2a736eb
Improve extraction of translated strings
...
Now every such string MUST be encapsulated into ?T() macro.
The macro itself is defined in include/translate.hrl.
Example:
-module(foo).
-export([bar/1]).
-include("translate.hrl").
bar(Lang) ->
translate:translate(Lang, ?T("baz")).
2019-06-22 17:08:45 +03:00
Evgeny Khramtsov
2d158671c8
Change Travis OTP platform from 19.1 to 19.3
...
Seems like Travis has problems with OTPs below 19.3
2019-06-22 13:15:11 +03:00
Evgeny Khramtsov
9d64e706f8
Disable Elixir in Travis tests
2019-06-22 11:03:29 +03:00
Evgeny Khramtsov
4f69325e3c
Fix shaper selection in ejabberd_c2s
2019-06-22 10:19:17 +03:00
Evgeny Khramtsov
e9a78d0de7
Make option 'validate_stream' global
2019-06-21 21:06:32 +03:00
Evgeny Khramtsov
a0d3fb3b23
Don't attempt to query 'undefined' active list
...
Also code formatting was improved
2019-06-21 19:37:47 +03:00
Evgeny Khramtsov
72572d990a
Allow multiple definitions of host_config and append_host_config
2019-06-21 15:37:51 +03:00
Evgeny Khramtsov
f3d5916236
Correct mod_mix_pam protocol version
...
Fixes #2913
2019-06-21 14:47:10 +03:00
Evgeny Khramtsov
be35350b9c
Fix usage of TLS in mod_mqtt
...
Fixes #2919
2019-06-21 14:39:46 +03:00
Holger Weiss
026540f7e6
mod_pubsub: Check access_model when publishing PEP
...
Don't just adhere to the node's access_model when delivering the last
PEP item but also when a new item is published.
Many thanks to Philipp Hrist for spotting this.
2019-06-20 18:18:14 +02:00
Evgeny Khramtsov
27a1771deb
Fix creation of type spec for map() options
2019-06-20 19:09:36 +03:00
Badlop
c318b5f8a2
Rename remaining command arguments from Server to Host ( #2908 )
2019-06-19 09:31:12 +02:00
Badlop
fb77e2e8c0
Add support for backwards compatibility in command argument names ( #2908 )
2019-06-19 09:30:53 +02:00
Badlop
ad98d4a515
Fix support for nonexistent or empty access_commands in ejabberd_xmlrpc
2019-06-19 09:19:32 +02:00
Evgeny Khramtsov
5a5f188767
Require opt_type/1 callback
2019-06-17 20:51:04 +03:00
Evgeny Khramtsov
ef3753aa86
Generate more readable exception
2019-06-17 20:49:43 +03:00
Evgeny Khramtsov
794e19aaf1
Set yconf version in mix.exs explicitly
2019-06-17 19:50:44 +03:00
Evgeny Khramtsov
91d9d076f9
Synchronize macros from rebar.config with mix.exs
2019-06-17 19:30:25 +03:00
Evgeny Khramtsov
b6f037ced6
Add yconf application to mix.exs
2019-06-17 19:19:27 +03:00
Evgeny Khramtsov
0c4818daca
Reflect recent pubsub changes in configuration transformer
2019-06-17 13:42:58 +03:00
Christophe Romain
4fe995c272
Add helper to check xep implementations and versions
2019-06-17 12:02:23 +02:00
Evgeny Khramtsov
21d9bd8325
Bump supported version of XEP-0355
2019-06-17 12:53:15 +03:00
Christophe Romain
e2c954b2e0
Remote obsolete pubsub config from tests
2019-06-17 11:39:46 +02:00
Evgeny Khramtsov
50af436fad
Fix component routes unregistration
...
Fixes #2910
2019-06-17 12:29:04 +03:00
Christophe Romain
c9d3beb9eb
Remove deprecated pubsub plugins
2019-06-17 11:19:28 +02:00
Evgeny Khramtsov
e84391a6a9
Use list_to_existing_atom/1 wherever possible
2019-06-15 15:14:45 +03:00
Evgeny Khramtsov
31050f5b09
Add PostgreSQL to Travis services
2019-06-15 13:41:13 +03:00
Evgeny Khramtsov
a205ebad2b
Get rid of "well-known" type
2019-06-15 12:53:16 +03:00
Evgeny Khramtsov
67fbbe7a0b
Remove default_db/1 and add default_db/3
...
Same for default_ram_db/1 and default_ram_db/3
2019-06-15 12:10:35 +03:00
Evgeny Khramtsov
ea76b87461
Ignore beams compiled by Elixir
2019-06-14 23:35:51 +03:00
Evgeny Khramtsov
56a0e736c7
Accept output argument in tools/opt_types.sh
2019-06-14 23:19:08 +03:00
Evgeny Khramtsov
cfaed70fe3
Warn about 'service_url' option during config transformation
2019-06-14 17:38:55 +03:00
Evgeny Khramtsov
9e2e590061
Fix exception formatting on old Erlang
2019-06-14 16:58:39 +03:00
Evgeny Khramtsov
377748b688
Fix validator of mod_avatar
2019-06-14 16:42:22 +03:00
Evgeny Khramtsov
d85cf7780c
Introduce option 'captcha_url'
...
Option 'captcha_host' is now deprecated in favor of 'captcha_url'.
However, it's not replaced automatically at startup, i.e. both options
are supported with 'captcha_url' being the preferred one.
2019-06-14 16:06:04 +03:00
Evgeny Khramtsov
a589843abd
Remove mod_echo module
2019-06-14 14:47:46 +03:00
Holger Weiss
6fb8ae4d2f
Travis CI: Ensure MySQL is started
...
It seems MySQL isn't always fully started before 'mysql_upgrade' is
called.
2019-06-14 13:08:46 +02:00
Evgeny Khramtsov
9e158a3835
Add forgotten header file
2019-06-14 13:36:28 +03:00
Paweł Chmielowski
b952c4f294
Use commit id instead of branch name to specify deps in rebar.config
2019-06-14 12:16:13 +02:00
Evgeny Khramtsov
a02cff0e78
Use new configuration validator
2019-06-14 12:33:26 +03:00
Paweł Chmielowski
d48c067681
Return jid_malformed error when sending presence without nick to conference
2019-06-13 18:42:02 +02:00
badlop
b48b6dbda5
Merge pull request #2651 from Iperity/fix-privacy-race-condition
...
Fix mod_privacy race condition
2019-06-13 09:34:58 +02:00
Mickaël Rémond
267ce0dde0
Debug log to help troubleshoot delegation ACLs
2019-06-11 18:52:44 +02:00
Christophe Romain
88a3e1b510
Revert "Fix pubsub compliance XEP-0060 § 7.1.3.6 ( #2864 )"
...
This reverts commit 2fff4d1ea6
.
This commit broke the XEP compliance. more details here
https://xmpp.org/extensions/xep-0060.html#events
2019-06-11 10:18:36 +02:00
Nathan Bruning
8410a203ec
Refactor mod_privacy patch; move logic user_receive_packet to
...
user_send_packet.
2019-06-10 14:10:37 +02:00
Nathan Bruning
aa489c5a8b
Fix user_send_packet in mod_privacy; was failing on newly created users
2019-06-10 12:49:39 +02:00
Nathan Bruning
570800a540
Fix mod_privacy race condition
...
mod_privacy updates the c2s state in user_receive_packet, which
tracks the *result* of the IQ set for active privacy lists.
When a second stanza is sent directly after a privacy list request,
the second stanza will be processed using the old privacy list,
because the IQ result has not yet been routed.
2019-06-10 12:49:39 +02:00
Mickaël Rémond
34794b3c68
lock.yml defines locking policy for old issues
2019-06-09 11:47:18 +02:00
Evgeny Khramtsov
80b7d50628
Use system_time/1 instead of monotonic_time/1
...
The value of monotonic_time/1 may differ significantly between
nodes in a cluster due to different erlang:time_offset/0 values.
Thanks to Christoph Scholz for spotting this
2019-06-06 21:26:50 +03:00
LOU Xun
8d6455460d
Protect against bad muc#owner requests
2019-06-06 15:40:13 +00:00
Holger Weiss
6c0d6f0774
mod_register_web: Don't crash if user exists
...
Since commit 633b68db11
,
ejabberd_auth:try_register/3 returns {error, exists} rather than
{atomic, exists}.
Thanks to Thomas Leister for reporting the issue.
2019-06-05 18:28:35 +02:00
Paweł Chmielowski
cd10d87a9c
Change indentation in ejabberd.yml.example to more consistant
2019-06-04 14:51:39 +02:00
Badlop
ed1cbc2c31
Fix example argument in private_set, don't include Query element
2019-05-29 19:41:36 +02:00
Holger Weiss
274a507590
mod_stream_mgmt: Drop unused code
...
Revert the changes applied to mod_stream_mgmt in commit
b76f90fe39
, as the new implementation of
mod_offline's 'use_mam_for_storage' feature doesn't need them.
2019-05-29 00:30:59 +02:00
Paweł Chmielowski
571a786b9b
Change implementation of mod_offline use_mam_for_storage
...
Previous version was trying to determine range of messages that should
be fetched from mam by storing time when last user resource disconnected.
But that had couple edge cases that could cause problems, for example in
case of node crash we could not store information about user disconnect
and with that we didn't have data to initiate mam query.
New version don't track user disconnects, but simply ensure that we have
timestamp of first message that is gonna be put in storage, after some
measurements cost of that check with caching on top is not that costly,
and as much more robust i decided to introduce that change.
2019-05-28 14:32:17 +02:00
Evgeny Khramtsov
4eaba13189
Don't check mod_register restrictions in 'register' command
...
The commit reverts behaviour introduced in
1f2b8adc28
2019-05-28 15:14:45 +03:00
Holger Weiss
8b301fc93e
mod_http_upload: Avoid catch-all error handling
2019-05-27 21:56:37 +02:00
Mickaël Rémond
a06bdb1721
Improve captcha blocking alert wording
2019-05-25 11:30:04 +02:00
Mickaël Rémond
b90fe4c5c9
Improve captcha.sh script documentation
2019-05-25 11:21:30 +02:00
Paweł Chmielowski
50f93023f5
Fix last commit
2019-05-24 15:18:15 +02:00
Paweł Chmielowski
226c09f031
Make mod_admin_extra add/delete_rosteritem reuse code from mod_roster
2019-05-24 14:02:17 +02:00
Mickaël Rémond
dc126b86bb
Add data clean up suggested command
2019-05-24 10:31:51 +02:00
Christophe Romain
44e1af25e5
Prepare 19.05
2019-05-23 13:42:50 +02:00
Christophe Romain
5b62a05205
Update deps in mix.lock
2019-05-23 13:40:05 +02:00
Paweł Chmielowski
5642338a73
Update deps
2019-05-23 12:13:28 +02:00
Evgeny Khramtsov
3f7a850ae8
Use different cache tables per auth module
...
Fixes #2322
2019-05-23 11:32:55 +03:00
Holger Weiss
729c8b0d24
Remove 'register' access rule from example config
...
The 'register' access rule isn't referenced from the 'mod_register'
options, so modifying it would have no effect.
2019-05-20 20:05:20 +02:00
Evgeny Khramtsov
4424f40186
Use lager 3.6.10
2019-05-20 12:10:23 +03:00
Evgeny Khramtsov
17f9ffb7e7
Merge branch 'master' of github.com:processone/ejabberd
2019-05-19 11:23:29 +03:00
Evgeny Khramtsov
2b523030cf
Report better errors on SQL terms decode failure
2019-05-19 11:22:41 +03:00
Alexey Shchepin
63e9b82a46
Fix PostgreSQL compatibility in mod_offline_sql:remove_old_messages ( #2695 )
2019-05-18 21:16:45 +03:00
Badlop
937f07a4cc
Fix typo in Change User Password adhoc command (thanks to lovetox)( #2884 )
2019-05-17 15:48:03 +02:00
Badlop
2db547b557
Vcard search doesn't support * in mnesia, fix search form ( #633 )
2019-05-17 15:26:44 +02:00
Evgeny Khramtsov
0ed638c7fb
Check hooks correctness in Travis CI
2019-05-15 21:47:39 +03:00
Evgeny Khramtsov
7c16e29984
Write hooks_type_test.erl to correct location
2019-05-15 21:45:30 +03:00
Evgeny Khramtsov
7a03a125aa
Make static hooks analyzer working again
2019-05-15 21:40:36 +03:00
Evgeny Khramtsov
2aa181658a
Fix mod_legacy_auth to reflect recent changes
2019-05-15 20:55:17 +03:00
Evgeny Khramtsov
a4c3ea0dfb
Don't process failed EXTERNAL authentication by mod_fail2ban
...
This will only lead to confusion because it's not considered
possible to brute force client certificates.
2019-05-15 18:13:31 +03:00
Evgeny Khramtsov
3c95764d1a
Modify arguments of c2s_auth_result hook
...
The hook now accepts `true | {false, Reason :: binary()}` arguments
instead of just `true | false`
2019-05-15 17:21:09 +03:00
Badlop
e996579dd1
Preliminary support for SQL in process_rosteritems, and move code ( #2448 )
2019-05-15 10:57:55 +02:00
Paweł Chmielowski
122cb4b959
Don't put duplicate polling attribute in bosh payload
...
This fixes issue #2790
2019-05-14 17:32:19 +02:00
Holger Weiss
1452023c93
mod_http_upload: Case-insensitive host comparison
...
Perform a case-insensitive lookup of the host name specified by the HTTP
client.
Fixes #2827 .
2019-05-12 11:57:17 +02:00
Evgeny Khramtsov
3d8711f708
Avoid late arrival of get_disco_item response
2019-05-11 19:27:56 +03:00
Evgeny Khramtsov
4b6f1195c6
Handle TCP errors in websockets
2019-05-09 22:06:23 +03:00
Mickael Remond
e427358e08
Initial Docker environment to run ejabberd test suite
2019-05-07 17:59:05 +02:00
Christophe Romain
2fff4d1ea6
Fix pubsub compliance XEP-0060 § 7.1.3.6 ( #2864 )
2019-05-07 16:23:36 +02:00
Mickael Remond
945c58d3db
Merge branch 'master' of github.com:processone/ejabberd
2019-05-07 14:09:22 +02:00
Mickael Remond
a04ea19f03
Put back the presence and s2s tests in the no_db section.
...
Tests are skipped anyway. This reverts ecce318304
2019-05-07 14:09:11 +02:00
Christophe Romain
a6f7d7ce23
Raise api hook right before performing the call
2019-05-07 11:46:04 +02:00
Paweł Chmielowski
4dc8549738
Make anonymous auth don't {de}register user when there are other resources
...
This should fix issue reported in #2878
2019-05-07 11:02:53 +02:00
Paweł Chmielowski
7d23cd2899
When applying limit of max msgs in spool check only spool size
2019-05-07 09:58:14 +02:00
Paweł Chmielowski
8207ea18bf
Remove compiler warnings
2019-05-06 20:03:10 +02:00
Paweł Chmielowski
5b863c25ae
Test offline:use_mam_for_storage, mam:user_mucsub_from_muc_archive used together
2019-05-06 19:22:18 +02:00
Paweł Chmielowski
83b790c7c9
Do not store mucsub wrapped messages with no-store hint in offline storage
...
We already don't store those messages in mam and we don't store messages
that aren't wrapped with that hint in offline, so it make sense to extend
it also to mucsub messages.
2019-05-06 19:22:18 +02:00
Paweł Chmielowski
3d434cfcef
Handle get_subscribed_rooms call from mod_muc_room pid
...
Previously sometimes we tried to post message to all online rooms, and
if that was called from muc room pid, we were not able to process that
message for that room and send response, and this did lead to timeout.
2019-05-06 19:15:48 +02:00
Paweł Chmielowski
4e7bf9207e
Do not declare mod_muc as dependency of mod_mam to prevent loop in deps
2019-05-06 12:22:19 +02:00
Mickael Remond
ecce318304
s2s test depend on Mnesia configuration
2019-05-06 12:00:36 +02:00
Mickael Remond
b18f53c5ce
Elixir mix build need to use xmpp 1.3.3
2019-05-06 11:59:52 +02:00
Mickael Remond
09d67a20d3
Remove deprecated calls
2019-05-03 15:58:24 +02:00
Mickael Remond
94f7bbc239
ct_formatter is not needed anymore as Elixir tests have been removed
2019-05-03 15:54:22 +02:00
Mickael Remond
be14caddf4
Use stable xmpp version
2019-05-03 15:48:12 +02:00
Mickael Remond
7a8de9cfcf
Make some standard admin command to get Mnesia info
2019-05-03 14:59:24 +02:00
Badlop
6b0f7f2a24
Fix bug that appears when importing privacy from Prosody ( #2872 )
2019-05-02 21:10:21 +02:00
Badlop
7a107c02a5
Store imported room in the correct ServerHost ( #2874 )
2019-05-02 20:32:10 +02:00
Paweł Chmielowski
cd2d62bffd
Set from/to in activity marker messages
2019-05-02 13:19:54 +02:00
Christophe Romain
f7bc969729
Fix typo and remove forgotten log from 492da2ba
2019-05-02 12:05:20 +02:00
Mickaël Rémond
1ec3525ed6
Merge pull request #2869 from rstgroup/fix-elixir-umbrella-compilation
...
Fix #2540 Ejabberd doesnt compile as mix umbrella project dependency
2019-05-02 11:53:35 +02:00
Christophe Romain
492da2baac
Remove logging from REST lib
2019-05-02 11:40:53 +02:00
Paweł Chmielowski
25f7ce0cb6
Always store ActivityMarker messages
2019-05-02 11:12:47 +02:00
Paweł Chmielowski
0d2720d7ab
Don't issue count/message fetch queries for offline from mam when not needed
2019-05-02 11:12:22 +02:00
Mickael Remond
ef1a75a628
Remove Elixir tests entry points as they were removed in december:
...
51cbbf313f (diff-098f6bcd4621d373cade4e832627b4f6)
2019-05-01 11:51:17 +02:00
Paweł Chmielowski
7eb5a0877b
Sqlite doesn't recognize concat() so use || on it instead
2019-04-30 18:33:12 +02:00
Paweł Chmielowski
2562f89005
Cleaner test cleanup
2019-04-30 17:35:25 +02:00
Paweł Chmielowski
eac7a77b6a
Fix room state cleanup from db on change of persistent option change
2019-04-30 17:34:49 +02:00
Paweł Chmielowski
63c12d18cc
Add tests for user mucsub mam from muc mam
2019-04-30 15:01:25 +02:00
Paweł Chmielowski
b83d30fd07
Make get_subscribed_rooms work even for non-persistant rooms
...
This will store info about non-persistant rooms in db, but rooms with that
that option enabled will not be restored on server restart.
This will save info about room only on subscribers change.
2019-04-30 13:41:03 +02:00
Paweł Chmielowski
b071c4906f
Fix escaping for sql part of mamsub from muc mam
2019-04-30 13:36:31 +02:00
Evgeny Khramtsov
c7d04a82a2
Deprecate some listening options
...
Those are: captcha, register, web_admin, http_bind and xmlrpc
The option `request_handlers` should be used instead, e.g.:
listen:
...
-
module: ejabberd_http
request_handlers:
"/admin": ejabberd_web_admin
"/bosh": mod_bosh
"/captcha": ejabberd_captcha
"/register": mod_register_web
"/": ejabberd_xmlrpc
2019-04-30 11:14:14 +03:00
Evgeny Khramtsov
268750e3b7
Provide a suggestion when unknown request handler is detected
2019-04-30 10:31:03 +03:00
Evgeny Khramtsov
11e963aa78
Provide a suggestion when unknown command is detected
2019-04-30 10:05:06 +03:00
Evgeny Khramtsov
4af99f7b03
Rename ejabberd_config:similar_option/2 -> misc:best_match/2
2019-04-30 09:36:38 +03:00
Evgeny Khramtsov
c56209a27d
Provide a suggestion when unknown module is detected
2019-04-29 21:15:52 +03:00
Evgeny Khramtsov
39bbc7cad8
Provide a suggestion when unknown option is detected
2019-04-29 20:57:59 +03:00
Paweł Chmielowski
d32a0ce566
Disable offline_from_mam tests on riak since it doesn't support mam
2019-04-29 18:34:21 +02:00
Evgeny Khramtsov
1db22c9656
Improve code for directory deletion
2019-04-29 18:50:54 +03:00
Paweł Chmielowski
a0f48cf52f
Fix offline from mam on mnesia
2019-04-29 17:25:06 +02:00
Paweł Chmielowski
eff70951c5
Add tests for offline with mam storage
2019-04-29 16:40:47 +02:00
Paweł Chmielowski
c550d36581
Properly handle infinity as max number of message in mam offline storage
2019-04-29 16:37:21 +02:00
Paweł Chmielowski
aaf674160b
Sort messages by stanza_id when using mam storage in mod_offline
2019-04-29 16:32:19 +02:00
Paweł Chmielowski
faf9b20ac0
Return correct value from count_offline_messages with mam storage option
2019-04-29 16:31:37 +02:00
Paweł Chmielowski
17ff62d4af
Make mod_offline put msg ignored by mam in spool when mam storage is on
2019-04-29 16:30:45 +02:00
Paweł Chmielowski
b716b835c4
Add tests for offline use_mam_for_storage
2019-04-29 11:35:18 +02:00
Evgeny Khramtsov
830a2f209a
Remove TLS options from the example config
...
The purpose is two-fold:
- To simplify the example config.
- To avoid old TLS configuration to be persistent across
server updates: this might bring security problems, because
what's considered "modern" now might be insecure in the future.
2019-04-28 17:50:52 +03:00
Evgeny Khramtsov
05d088b104
Remove OMEMO related configuration from force_node_config section
...
This doesn't work reliably and takes a lot of effort to change it back
2019-04-28 17:45:41 +03:00
Paweł Chmielowski
b76f90fe39
Add mod_offline option for fetching data from mam instead of from spool table
...
This commit introduces `use_mam_for_storage` option that take boolean
argument. Enabling it will make mod_offline not use spool table for storing
offline message, but instead will use mam archive to retrieve messages
stored when offline.
Enabling this option have couple drawback currently, only messages that
were stored in mam will be available, most of flexible message retrieval
queries don't work (those that allow retrieval/deletion of messages by id).
2019-04-26 19:59:06 +02:00
Paweł Chmielowski
bcfe50f817
Return "Bad request" error when origin in websocket connection doesn't match
...
This also allow websocket_origin option to accept multiple values instead
of just single one.
2019-04-26 15:29:43 +02:00
Paweł Chmielowski
17444ba84e
Allow non-moderator subscribers to get list of room subscribers
2019-04-25 14:52:47 +02:00
Paweł Dorofiejczyk
7ab7390b9c
Fix #2540 Ejabberd doesnt compile as mix umbrella project dependency
2019-04-25 13:31:08 +02:00
Evgeny Khramtsov
a0c8c70c9c
Use binary framing in MQTT WebSockets
2019-04-25 14:30:42 +03:00
Evgeny Khramtsov
5819733de6
Merge pull request #2868 from rstgroup/fix-rfc-6455-violation
...
Fix #2821 RFC6454 violation on websocket connection when validating Origin
2019-04-24 18:21:58 +03:00
Paweł Dorofiejczyk
cc5829bc33
Fix RFC6454 violation on websocket connection when validating Origin header
2019-04-24 16:59:54 +02:00
Paweł Chmielowski
8b501f5fe6
Catch potential exceptions in gen_mod:wait_for_process
...
Seems that at ejabberd shutdown, process may terminate before that function
is called, and in that case erlang:monitor throws exception.
2019-04-24 13:46:16 +02:00
Evgeny Khramtsov
fc043dd8cf
Reformat try_set_password/4 function
2019-04-23 21:25:10 +03:00
Evgeny Khramtsov
cbf3fec2c8
Don't call to mod_register when it's not loaded
...
Fixes #2828
2019-04-23 21:05:21 +03:00
Evgeny Khramtsov
edba1aebb5
Add WebSockets support to mod_mqtt
...
Example configuration:
listen:
...
-
port: 5280
module: ejabberd_http
request_handlers:
"/mqtt": mod_mqtt
modules:
...
mod_mqtt: {}
2019-04-23 19:18:22 +03:00
Paweł Chmielowski
d2ea905926
Fix handling of list arguments on pgsql
2019-04-23 17:46:42 +02:00
Evgeny Khramtsov
feb4c7f5e9
Support other socket modules for MQTT
2019-04-23 16:22:27 +03:00
Evgeny Khramtsov
5faae61bef
Move websocket options
2019-04-23 16:21:06 +03:00
Evgeny Khramtsov
cc892ddc01
Improve request_handlers validator
2019-04-23 16:19:26 +03:00
Evgeny Khramtsov
e623678747
Bump pkix version
2019-04-19 16:26:58 +03:00
Evgeny Khramtsov
7c45b52c86
Correctly support cache tags in ejabberd_auth
2019-04-19 15:42:24 +03:00
Evgeny Khramtsov
0789a145fc
Allow returning HTTP headers in REST responses
2019-04-19 15:16:47 +03:00
Evgeny Khramtsov
7f14826564
Use new ets_cache api in ejabberd_auth
2019-04-19 15:08:41 +03:00
Paweł Chmielowski
875b2daff1
Add hook room_destroyed called when room gets destroyed
2019-04-17 18:56:25 +02:00
Paweł Chmielowski
4e2c95fe58
Change implementation of misc:unique_timestamp()
2019-04-16 11:20:55 +02:00
Paweł Chmielowski
83653c0338
Handle cdata in initial data probe of ws module
2019-04-16 10:56:11 +02:00
Paweł Chmielowski
3706e35b86
Make misc:unique_timestamp not overflow microsecond part.
...
This should fix issue #2860
2019-04-16 10:24:28 +02:00
Paweł Chmielowski
c96a925fde
Add hooks for tracking mucsub subscriptions changes
2019-04-15 12:03:30 +02:00
Evgeny Khramtsov
009b9a1fd0
Feed whole image to eimp:identify/1
...
Fixes #2859
2019-04-14 17:05:16 +03:00
Mickael Remond
6dac0a602e
Fix syntax in Elixir config file
2019-04-12 10:40:46 +02:00
Paweł Chmielowski
8761e6e0e0
Handle correctly case where ExtraUsername is empty
2019-04-11 12:00:13 +02:00
Paweł Chmielowski
c5a06e9d06
When making mucsub message from mam archive check for subject
2019-04-09 11:17:14 +02:00
Evgeny Khramtsov
2e007f1607
Use xml:lang from stanza when it's missing in <command/> element
...
Thanks to Philipp Hörist for spotting this
2019-04-06 18:27:28 +03:00
Evgeny Khramtsov
9f3ccd604e
Add 'sessionid' attribute when required
...
Fixes #2852
2019-04-06 16:52:22 +03:00
Evgeny Khramtsov
909a505d65
Update mod_muc_riak
2019-04-03 16:04:58 +03:00
Evgeny Khramtsov
3013f1b9bc
Update mod_mam dependencies
2019-04-03 15:01:20 +03:00
Evgeny Khramtsov
17b9dc6035
Decrease ugliness of the ugly code
2019-04-03 14:50:56 +03:00
Evgeny Khramtsov
e66f594901
Change mucsub API for database backends
2019-04-03 14:20:37 +03:00
Badlop
4e591a73c5
Add ext_mod paths before checking config ( processone/ejabberd-contrib#263 )
2019-04-03 13:10:11 +02:00
Paweł Chmielowski
623a9ec3ba
Return proper error message for duplicate or missing args in http_api call
2019-04-03 12:05:39 +02:00
Paweł Chmielowski
65a6532cd9
Log message when trying to execute http_api command with extra arguments
2019-04-03 11:50:15 +02:00
Paweł Chmielowski
33c10867e3
Formating fix
2019-04-03 11:48:59 +02:00
Paweł Chmielowski
d085fff14b
Make http_api command execution exception catcher log also command and args
2019-04-03 11:33:07 +02:00
Badlop
cbac8a604a
cache_size not applied to mod_roster on reload_config ( #2769 )
2019-04-02 19:52:07 +02:00
Evgeny Khramtsov
d96ab48c6b
Fix previous commit
...
Fixes #2847
2019-04-02 09:58:12 +03:00
Evgeny Khramtsov
ed2abe471a
Rename listening callback from start/2 to start/3
...
This will prevent conflicts in callback names in mod_mqtt
Old callback function is still supported.
2019-04-01 16:53:28 +03:00
Paweł Chmielowski
7eef966a04
Fix issue with creating HostMatch in mod_mam_sql
...
This fixes issue #2844
2019-04-01 10:56:03 +02:00
Evgeny Khramtsov
5c69122bbe
Use xmpp:get_subtags/2
2019-04-01 10:47:29 +03:00
Paweł Chmielowski
9b040f65a3
Don't use deprecated gen_mod:db_type
2019-03-29 18:41:51 +01:00
Paweł Chmielowski
24b9b69783
Fix issue with mam tests
...
Too much copy/paste...
2019-03-29 17:18:30 +01:00
Paweł Chmielowski
0c78e01088
Implement mod_muc_sql:select_with_mucsub
...
This allows us to limit number of issued queries required by
user_mucsub_from_muc_archive option
2019-03-29 16:11:50 +01:00
Paweł Chmielowski
a7310ffea1
Make misc:add_delay_info properly handle multiple delay tags in element
2019-03-29 11:25:35 +01:00
Paweł Chmielowski
8e05fd1d24
Add option user_mucsub_from_muc_archive to mod_muc
...
This option disable storing separate mucsub message for each individual
subscriber but instead when user fetches archive virtual mucsub messages
are generated from muc archives.
2019-03-28 17:42:25 +01:00
Paweł Chmielowski
063869603a
Include id in mucsub notification message
2019-03-28 14:43:28 +01:00
Badlop
ee2b441b0f
Add 'config' tag to the reload_config command
2019-03-27 11:51:43 +01:00
Badlop
1f2b8adc28
Fix Register command to respect mod_register's Access option ( #2837 )
2019-03-22 15:02:51 +01:00
Christophe Romain
51e7ccc16d
Update mysql driver in mix.lock also
2019-03-20 13:46:43 +01:00
Paweł Chmielowski
cf733b0913
Update mysql driver
2019-03-20 13:28:13 +01:00
Badlop
6545d55473
Fix crash in mod_muc_admin:web_page_main/2 caused by just_created ( #2830 )
2019-03-18 17:11:00 +01:00
Paweł Dorofiejczyk
6129720838
Origin header validation on websocket connection ( #2821 )
2019-03-15 12:19:14 +01:00
Paweł Chmielowski
291c05715b
Update mysql dependency
2019-03-15 11:59:18 +01:00
Christophe Romain
4a920dca5a
Add newline to error_logger log format
2019-03-15 11:51:48 +01:00
Paweł Chmielowski
5077d39600
Add check for ljid when setting up subscribers
2019-03-14 15:54:51 +01:00
Paweł Chmielowski
3b16afeda7
Flip default bounce_groupchat flag value, muc will drop bounces anyway
2019-03-14 15:40:34 +01:00
Paweł Chmielowski
89db022da4
Add option to mod_offline to make it not bounce mucsub/groupchat messages
2019-03-14 15:17:25 +01:00
Evgeny Khramtsov
0715e62a41
Use jid() instead of ljid()
2019-03-14 14:34:15 +03:00
Evgeny Khramtsov
7a622c3392
Improve formatting of hook crashes
2019-03-14 12:28:37 +03:00
Badlop
629e568294
Delete the ping timer only when timeout_action=kill ( #2820 )
2019-03-13 11:28:31 +01:00
Holger Weiss
333b010d54
mod_muc: Simplify room creation checks
2019-03-12 00:05:59 +01:00
Holger Weiss
1af2b2cfc7
Merge remote-tracking branch 'processone/pr/2811'
...
* processone/pr/2811:
allow room recreate for admins even if nonempty
2019-03-11 23:30:22 +01:00
Holger Weiss
328553ea3f
mod_push: Check for payload in encrypted messages
...
While distinguishing actual chat messages from other message types,
don't classify all <encrypted/> messages as chat messages, but only
those that have a <payload/> element.
2019-03-11 22:58:53 +01:00
Christophe Romain
946baa972d
Fix cond_options with new options
2019-03-11 16:58:26 +01:00
Alexey Shchepin
e921b43754
Fix transaction aborting and restarting in ejabberd_sql
2019-03-07 22:14:13 +03:00
Christoph Scholz
b5fa3b0e2b
allow room recreate for admins even if nonempty
2019-03-05 16:51:57 +01:00
Badlop
a4222fe9b3
Handle info log level when using MySQL ( #2541 )
2019-03-04 18:02:02 +01:00
Holger Weiss
652858c7fe
Fix incorrect capitalization in German translation
2019-03-01 00:17:29 +01:00
Holger Weiss
93cebbf4a3
Document required Erlang/OTP version bump
2019-02-28 01:08:52 +01:00
Holger Weiss
598e00e80f
Bump required Erlang/OTP version to 19.1
...
Since 538f35d05a
, Erlang/OTP 19.1 is
required.
2019-02-28 01:00:05 +01:00
Holger Weiss
2f46aebca2
mod_http_upload: Log nicer warning on unknown host
...
If an HTTP client issues a request against an unknown host, log a
readable warning (rather than an unreadable error) and respond with a
404 (rather than a 500) status.
2019-02-28 00:28:46 +01:00
Christophe Romain
9bfe5bb618
Add mqtree in included_applications
2019-02-27 14:35:07 +01:00
Evgeny Khramtsov
7511da0f26
Add SQL schemas for MQTT tables
2019-02-27 13:06:17 +03:00
Paweł Chmielowski
456e87e8b2
Copy p1_time_compat:unique_timestamp() to misc and make use of it
2019-02-27 11:00:02 +01:00
Paweł Chmielowski
538f35d05a
Replace code using p1_time_compat wrapper with native functions
...
Since we now require R19, we shouldn't need that anymore.
There are still couple places where p1_time_compat:unique_timestamp() is
used as there is no direct equivalent.
2019-02-27 09:56:31 +01:00
Paweł Chmielowski
77ac0584ed
Remove now() calls that sneaked in in pull requests
2019-02-27 09:56:31 +01:00
Christophe Romain
0c0862475f
Add MQTT listener and module in example config
2019-02-26 14:53:05 +01:00
Christophe Romain
683ca31375
Prepare 19.02
2019-02-26 14:40:21 +01:00
Holger Weiss
90dc8ea1e5
MySQL: Increase index prefix length for PEP nodes
...
For PEP nodes, the "host" column holds the user JID, where the first 20
characters may well not be unique.
2019-02-26 13:13:04 +01:00
Paweł Chmielowski
ab2197c455
Update mqtree
2019-02-26 12:16:48 +01:00
Paweł Chmielowski
a40eb79cd0
Commit back, change reverted by mistake
2019-02-26 12:16:48 +01:00
Paweł Chmielowski
b887133566
Update deps in mix.lock
2019-02-26 12:16:48 +01:00
Evgeny Khramtsov
0250826cf9
Update mod_mqtt_mnesia.erl
2019-02-26 13:45:53 +03:00
Paweł Chmielowski
daf9c99728
Update deps
2019-02-26 10:32:02 +01:00
Paweł Chmielowski
65b94ae9c8
Improve update-deps-releases
2019-02-26 10:32:02 +01:00
Holger Weiss
fb068557b2
Merge branch 'pr/2764'
...
* pr/2764:
acl for mam_preferences
2019-02-25 22:22:02 +01:00
Christoph Scholz
e257bc3d32
acl for mam_preferences
2019-02-25 22:21:30 +01:00
Paweł Chmielowski
bc38afa8b8
Updated fast_tls
2019-02-25 16:42:38 +01:00
Paweł Chmielowski
d04a2454cc
Add Accept header to requests issued by rest.erl
2019-02-25 16:18:13 +01:00
Paweł Chmielowski
db9435942f
Pull never fast_tls version
2019-02-25 16:10:48 +01:00
Badlop
de20395cf8
Run "make translations"
2019-02-25 15:22:56 +01:00
Badlop
2f4fff2441
Update the Catalan translation
2019-02-25 15:19:55 +01:00
Badlop
fd82f1440a
Update the Spanish translation
2019-02-25 15:19:30 +01:00
Evgeny Khramtsov
a3df791373
Add MQTT support
2019-02-25 11:42:09 +03:00
Holger Weiss
3491fa3fea
mod_muc_admin: Fix indentation
2019-02-23 23:50:14 +01:00
Holger Weiss
1aeb507114
Merge remote-tracking branch 'processone/pr/2805'
...
* processone/pr/2805:
only destroy rooms if mam is enabled
2019-02-23 23:46:08 +01:00
Christoph Scholz
dd7754bc59
only destroy rooms if mam is enabled
...
when using ejabberdctl rooms_empty_list or rooms_empty_destroy only
select rooms that are have mam enabled. Otherwise you may accidently
destroy rooms which seem to be unsused due to archive being empty
2019-02-23 22:48:15 +01:00
Badlop
4947e97ccd
Provide source code filename in *.po, so editors can show the source code
2019-02-22 12:31:02 +01:00
Badlop
17a59b795f
Fix "make translations", got broken in 446e6e6f3
2019-02-22 12:30:05 +01:00
Holger Weiss
f63dcdb790
mod_mam_sql: Improve check for empty archive
...
Avoid counting the messages of an archive to check whether it's empty.
2019-02-21 23:50:16 +01:00
Holger Weiss
9a3a7369cb
mod_mam_mnesia: Fix check for empty archive
...
Don't return 'true' if the key exists but points to an empty archive.
Also, avoid looking up all keys.
2019-02-21 22:19:29 +01:00
Evgeny Khramtsov
1684436bfe
Merge branch 'mix'
2019-02-21 12:36:33 +03:00
Holger Weiss
68614f25f8
Travis CI: Update MySQL APT repository key
...
The old key expired on February 17, 2019.
2019-02-20 17:09:56 +01:00
Holger Weiss
9c66cc5885
Merge remote-tracking branch 'processone/pr/2763'
...
* processone/pr/2763:
disallow room creation if archive not empty and clear_archive_on_room_destroy is false
check if mod_mam is loaded before calling mod_mam:is_empty_for_room
added cmds to list and destroy empty rooms by ejabberdctl
allow check if archive is empty for or user or room
option to prevent archive removal on room destroy
2019-02-20 17:01:34 +01:00
Evgeny Khramtsov
8def827f9c
Don't crash on malformed 'modules' section
2019-02-19 12:31:18 +03:00
Christoph Scholz
5e7f234ac8
disallow room creation if archive not empty and
...
clear_archive_on_room_destroy is false
2019-02-18 13:42:45 +01:00
Christoph Scholz
f987db5a39
check if mod_mam is loaded before calling mod_mam:is_empty_for_room
2019-02-18 13:42:45 +01:00
Christoph Scholz
a47c566b39
added cmds to list and destroy empty rooms by ejabberdctl
2019-02-18 13:42:45 +01:00
Christoph Scholz
2e586000d7
allow check if archive is empty for or user or room
2019-02-18 13:42:45 +01:00
Christoph Scholz
89b9e25588
option to prevent archive removal on room destroy
2019-02-18 13:42:45 +01:00
Paweł Chmielowski
b30775a357
Don't perform roster push for non-local contacts in mod_shared_roster
...
If group have member with jid from external server we tried to make
mod_roster sent roster push to it, and it sometimes didn't like to get
bogus data like that, so let's check if it's local user before doing this.
2019-02-18 12:37:42 +01:00
Holger Weiss
abdbc5df13
mod_push: Improve notification error handling
...
Don't disable push notifications if the app server returned a temporary
error, and log the app server's notification response.
2019-02-11 22:29:49 +01:00
Badlop
e18522f74c
Once just_created isn't true, use it to keep room process creation ( #2787 )
2019-02-11 16:56:33 +01:00
Paweł Chmielowski
ea32d3f02c
Send mucsub subscriber notification events with from set to room jid
2019-02-11 13:04:06 +01:00
Badlop
2819e26c8f
Add notice about rooms_unused_destroy using the room history ( #2787 )
2019-02-06 16:34:02 +01:00
Badlop
6cd458d205
Don't consider room's lack of history when history_size is zero ( #2787 )
2019-02-06 16:33:59 +01:00
Badlop
c41c5b2185
Fix support to restart module with live options in WebAdmin
2019-02-06 13:30:30 +01:00
Badlop
7074a39ff3
Handle versioning result when shared roster group has remote account ( #2692 )
2019-02-06 12:36:01 +01:00
Badlop
8baced0d8b
Merge branch 'mod_ping_no_kill' of https://github.com/fdie/ejabberd into 3
2019-02-01 16:21:58 +01:00
Frank Diebolt
4ff4711d4f
catch badarg exceptions on invalid callback procs
2019-01-31 18:14:36 +01:00
Christophe Romain
9577fe3ba8
Fix argument name consistency
2019-01-31 18:05:39 +01:00
Frank Diebolt
9b66894dda
! may raise exceptions on invalid proc
2019-01-31 17:44:11 +01:00
Christophe Romain
ae7b391657
Do not overwrite odbc config file ( #2295 )
2019-01-31 13:25:56 +01:00
Paweł Chmielowski
bbffd396f6
Produce better error for http_api request with extra parameters
2019-01-30 16:35:06 +01:00
Paweł Chmielowski
56baa07d48
Reject request http_api request that have malformed Authentication header
2019-01-30 16:34:29 +01:00
Paweł Chmielowski
096b4a50e5
Require that both tag and module matched in from of api_permission
2019-01-30 13:09:06 +01:00
Paweł Chmielowski
62ad1e5e4f
Allow specifying tag for listener for api_permission purposes
...
This commit will allow adding tag to http listeners:
listener:
- port: 4000
- module: ejabberd_http
- tag: "magic_listener"
that later can be used to have special api_permission just for it:
api_permissions:
"magic_access":
from:
- tag: "magic_listener"
who: all
what: "*"
2019-01-30 12:57:03 +01:00
Frank Diebolt
7df03ef56f
Revert "Apply shaping to websocket connections"
...
This reverts commit dda89aeda0
.
2019-01-30 10:37:26 +01:00
Frank Diebolt
dda89aeda0
Apply shaping to websocket connections
2019-01-30 09:57:17 +01:00
Frank Diebolt
dd57950103
Fix ping IQ reply/timeout processing ("mod_ping" regression since 17.x that may cause resources leakage)
2019-01-29 18:13:28 +01:00
Evgeny Khramtsov
23e5b3756c
Merge pull request #2622 from aquarhead/rename-functions
...
Rename two presence functions
2019-01-27 23:06:21 +03:00
AquarHEAD Lou
3f3e04812b
Rename two presence functions
...
send_self_presence is actually implementing XEP-0115, while
send_initial_presence is implementing the "self-presence" step as
described in XEP-0045
2019-01-27 16:48:05 +00:00
Paweł Chmielowski
9e0baef233
Make last commit compile on R19
2019-01-22 14:40:01 +01:00
Paweł Chmielowski
74731a5816
Make sure that room_destroyed is called even when some code throws in terminate
...
We observed that some code was throwing exception in muc_room:terminate()
and that make this room not properly unregister itself from muc_online
table.
2019-01-22 14:22:23 +01:00
Badlop
0c794c105f
Fix crash when running reload_config and sql_pool_size option is used
...
Fixes #2541
2019-01-21 13:35:21 +01:00
Evgeny Khramtsov
5e9945f060
Improve validation of configured language options
2019-01-19 11:29:45 +03:00
Paweł Chmielowski
a8b1a58cc8
Add os_mon to included_application, but start it in ej_system_monitor
2019-01-16 15:40:10 +01:00
Paweł Chmielowski
a30bfefb98
Move some apps back to included_applications
2019-01-16 15:01:32 +01:00
Paweł Chmielowski
3f2265d457
Update xmpp in mix
2019-01-16 09:58:24 +01:00
Paweł Chmielowski
0d952abe7d
Start ejabberd_mnesia before starting mnesia
2019-01-15 18:34:19 +01:00
Paweł Chmielowski
8b76fdd035
And another typo...
2019-01-15 16:25:23 +01:00
Paweł Chmielowski
182786948f
Typo
2019-01-15 16:23:38 +01:00
Paweł Chmielowski
893f656df2
Reintroduce change removed in last commit by mistake
2019-01-15 16:22:58 +01:00
Paweł Chmielowski
9bd38eff1e
Use tag for xmpp dependency
2019-01-15 16:18:10 +01:00
Paweł Chmielowski
604856eeb9
Update list of applications in mix.exs
...
We now use normal application for starting dependencies, so we no longer
should put them in included_applications
2019-01-15 16:17:45 +01:00
Paweł Chmielowski
2a24011b3b
Update xmpp dep
2019-01-15 15:15:56 +01:00
Paweł Chmielowski
7183fe6b80
Guard agains sm:get_user_info returning offline
...
This fixes issue #2765
2019-01-15 10:04:15 +01:00
Evgeny Khramtsov
63259f5cc9
Improve private and MAM tests in order to reflect
...
database backends with limited capabilities
2019-01-14 19:33:23 +03:00
Evgeny Khramtsov
1b0d481f41
Don't produce a crash on config reload when SQL is not configured
2019-01-12 23:40:33 +03:00
Paweł Chmielowski
7e8bd484d5
Update muc room state after adding extra access field to it
2019-01-10 15:07:10 +01:00
Christophe Romain
e4067df85e
Merge pull request #2748 from area-42/add_acl_for_mam_in_mod_muc
...
add acl for mam in mod_muc
2019-01-10 14:29:02 +01:00
Christophe Romain
67cfdf1d20
Fix typo in comment
2019-01-10 11:07:24 +01:00
Paweł Chmielowski
5bbb4da397
Start ejabberd_logger also when ejabberd:start() is not called
2019-01-09 19:03:36 +01:00
Paweł Chmielowski
aee53332bf
Change a way that tests start ejabberd
2019-01-09 18:33:39 +01:00
Paweł Chmielowski
d47bc1efdb
Use OTP application startup infrastructure for starting dependencies
2019-01-09 18:14:50 +01:00
badlop
325877446a
Merge pull request #2680 from Iperity/fix-privacy-check-on-presence-probe
...
Privacy lists: set from/to on packet *before* calling privacy_check_p…
2019-01-09 16:31:14 +01:00
Christophe Romain
3fa68b17d9
Remove slash producing url /admin//additions.js
2019-01-09 11:55:42 +01:00
Badlop
55417dfb37
Update copyright to 2019 ( #2756 )
2019-01-08 22:53:27 +01:00
Badlop
f0cf63de15
Manually update 2017 copyright dates ( #2756 )
2019-01-08 22:52:26 +01:00
Holger Weiss
c3a807832d
mod_private: Hardcode item ID for PEP bookmarks
...
Set the item ID to "current" when publishing bookmarks via PEP.
XEP-0060 says: For singleton nodes, "it is RECOMMENDED for the publisher
to specify an ItemID of 'current' to ensure that the publication of a
new item will overwrite the existing item."
2019-01-08 21:23:21 +01:00
Evgeny Khramtsov
edf03b0f3d
mod_offline: make some database callbacks optional
2019-01-08 13:41:16 +03:00
Paweł Chmielowski
06d69c5277
Fix decompressing of custom elements with custom namespace
2019-01-07 16:08:58 +01:00
Christoph Scholz
7e4287ff83
add acl for mam in mod_muc
2019-01-04 15:56:41 +01:00
badlop
9631baaa63
Merge pull request #2599 from gardenia/master
...
Eliminate some repeated SQL queries [Issue #1656 ]
2019-01-04 12:20:50 +01:00
Evgeny Khramtsov
9af70913b5
mod_mam: more checks for database failure
2019-01-02 21:11:22 +03:00
Paweł Chmielowski
b318c70401
Try to remove syntax error on old elixir
2019-01-02 13:22:35 +01:00
Paweł Chmielowski
fb681828d6
Remove iconv from vars.config.in
2019-01-02 13:11:34 +01:00
Paweł Chmielowski
768d37a29c
Remove no longer used deps
2019-01-02 13:02:20 +01:00
Christophe Romain
126e4d70f7
Update distillery
2019-01-02 10:30:29 +01:00
Mickael Remond
749fa95011
Remove most Elixir warnings
2018-12-26 17:32:39 +01:00
Mickael Remond
b8d4da9792
Update ejabberd version for mix
2018-12-26 16:49:01 +01:00
Badlop
1246a7a50f
Add no-store hint to CAPTCHA challenge stanzas ( #2730 )
2018-12-26 14:04:36 +01:00
Holger Weiss
34eed5064b
Travis CI: Bump Erlang/OTP 21.x version
2018-12-22 19:45:28 +01:00
Evgeny Khramtsov
d5fab856f4
mod_mam: Additional checks for database failures
2018-12-21 22:29:20 +03:00
Paweł Chmielowski
51cbbf313f
Remove elixir tests
...
Our regular suite cover most of those cases, and it get trickier and
tricker to keep those working after changes in ejabberd.
2018-12-21 15:58:02 +01:00
Badlop
740ea3a047
Handle Prosody storage attributes key, when, with ( #2724 )
2018-12-21 15:15:02 +01:00
Badlop
011cf55eb5
Handle persist=false in roster items ( #2722 )
2018-12-21 15:15:00 +01:00
Paweł Chmielowski
e9d537527c
We are handling groupchat in other branch now
2018-12-20 13:51:05 +01:00
Paweł Chmielowski
69a986a09e
Add option to mod_offline that would allow storing group chat messages
2018-12-20 13:28:18 +01:00
Badlop
788d829823
Fix PIEFXIS export of user when password is scrammed ( #2721 )
2018-12-19 13:17:28 +01:00
Badlop
590bb0e64a
Search also for _jid when importing room from prosody ( #2723 )
2018-12-19 12:11:59 +01:00
Badlop
0b151f5902
Parse persistent and archiving room options importing from prosody ( #2720 )
2018-12-19 12:11:56 +01:00
Paweł Chmielowski
52e77e3d75
Remove workaround for old erlang versions
2018-12-13 11:46:53 +01:00
Paweł Chmielowski
c88a2d0569
Add code for handling deprecations of get_stacktrace()
2018-12-13 11:46:53 +01:00
Evgeny Khramtsov
34ac21e66b
Add HTTP listener on port 5280 for admin web interface
2018-12-13 12:06:29 +03:00
Badlop
b43b8edb67
Fix a pair of small typos
2018-12-12 16:23:07 +01:00
Evgeny Khramtsov
48f3d5858f
Merge pull request #2718 from paulmenzel/strip-trailing-space-in-readme
...
README: Strip trailing space
2018-12-12 17:32:41 +03:00
Paul Menzel
b3dfe35846
README: Strip trailing space
2018-12-12 14:10:53 +01:00
Evgeny Khramtsov
000621114d
Remove outdated MIX tests
2018-12-11 17:14:51 +03:00
Christophe Romain
f6a557ec86
Add hook on api call
2018-12-11 11:07:07 +01:00
Holger Weiss
38726a5510
Increase MAX_PAYLOAD_SIZE for PubSub items
...
Some PubSub payloads (such as PEP avatars) can easily exceed the old
MAX_PAYLOAD_SIZE. Use a higher limit, but stay below the default
max_stanza_size value.
2018-12-10 22:54:18 +01:00
Holger Weiss
114cc8c093
Bump xmpp version
2018-12-10 22:38:50 +01:00
Holger Weiss
1c1694c6bf
mod_roster: Don't set version to "not_found"
...
Don't include a "ver" attribute with roster pushes if no roster version
is available.
2018-12-10 21:38:14 +01:00
Badlop
446ff9257c
Don't require a full JID as argument, instead set a dummy resource ( #2710 )
2018-12-10 21:06:26 +01:00
Badlop
f2bd2f6e37
When unknown roster version, return an acceptable version ID binary ( #2709 )
2018-12-10 20:30:42 +01:00
Evgeny Khramtsov
33202d59c0
Merge branch 'master' into mix
2018-12-10 17:07:28 +03:00
Evgeny Khramtsov
8295bcebec
Fix (un)setting of priority
2018-12-10 17:06:21 +03:00
Evgeny Khramtsov
e568dc3866
Get rid of outdated mod_mix module
2018-12-10 16:50:13 +03:00
Evgeny Khramtsov
74e8c0376f
Merge branch 'master' into mix
2018-12-10 11:57:04 +03:00
Evgeny Khramtsov
6cd8d1025c
Don't lose carbons on presence change or session resumption
2018-12-10 11:53:27 +03:00
Evgeny Khramtsov
a5ac1d15e7
Avoid badfun in multicast/6
2018-12-07 21:34:49 +03:00
Evgeny Khramtsov
0e954da3fa
Fix wording
2018-12-07 20:48:13 +03:00
Evgeny Khramtsov
4f5552128b
Fix mod_mix_mnesia get_participants/3 callback
2018-12-07 20:41:37 +03:00
Paweł Chmielowski
f02f44ad3f
Change default ciphers to intermediate
2018-12-07 14:38:54 +01:00
Paweł Chmielowski
7713edc6bb
Define default ciphers/protocol_option in example config
2018-12-07 12:54:18 +01:00
Paweł Chmielowski
0ef1c215b7
Add CHANGELOG.md file
2018-12-07 10:28:56 +01:00
Evgeny Khramtsov
6afefd7bbf
Fix submission-id and channel resource
2018-12-07 11:06:26 +03:00
Evgeny Khramtsov
c4858a7020
Bump xmpp version
2018-12-06 18:28:18 +03:00
Paweł Chmielowski
3b1c0dc27f
Normalize hostname when processing host_config
2018-12-06 15:12:23 +01:00
Paweł Chmielowski
157e9c04f6
Bump version of xmpp in mix.lock
2018-12-06 14:09:37 +01:00
Paweł Chmielowski
755f34d3ef
Start fast_tls before pkix
2018-12-06 13:42:08 +01:00
Paweł Chmielowski
d6fa657624
Bump xmpp dep
2018-12-06 13:40:08 +01:00
Holger Weiss
d1402fc48d
configure.ac: Bump required Erlang/OTP version
2018-12-06 12:43:20 +01:00
Paweł Chmielowski
ea47790807
Update mix packaging
2018-12-06 10:21:51 +01:00
Holger Weiss
160ffce090
mod_private: Add "bookmarks_to_pep" command
...
The "bookmarks_to_pep" command exports the bookmarks of the specified
user from private XML storage to PEP.
2018-12-05 22:04:40 +01:00
Holger Weiss
074ebd80f6
mod_pubsub: Improve PEP behavior for 'whitelist'
...
If a PEP node's access_model is set to 'whitelist' (or 'authorize'),
send last PEP notifications to the node owner.
2018-12-05 18:25:40 +01:00
Christophe Romain
1ed788d00c
Remove useless config file ( #2665 )
...
Config file should be generated at packaging/installation stage
/ejabberd.yml.example is the default template which can be used
as default configuration
2018-12-05 17:17:52 +01:00
Paweł Chmielowski
45eb08d05c
Add auth:which_user_exist to bulk checking existence of list of users
2018-12-05 14:22:09 +01:00
Paweł Chmielowski
a6c06964e1
Add list types to sql_pt
2018-12-05 13:11:52 +01:00
Badlop
0ae3f624ca
Revert "Let deliver unsubscribe stanza when no roster push is required ( #2598 )"
...
This reverts commit 86048f8a25
.
2018-12-05 12:17:16 +01:00
Badlop
86048f8a25
Let deliver unsubscribe stanza when no roster push is required ( #2598 )
2018-12-05 11:45:54 +01:00
Evgeny Khramtsov
d5e4da54cf
Update MIX code to reflect newest specification
...
Note that support for older specification is completely dropped,
i.e. no backward compatibility is provided since the XEPs are
still very experimental and being changed drastically
2018-12-05 13:14:29 +03:00
Paweł Chmielowski
2b9c7ed407
Use tagged version of pkix dependency
2018-12-05 10:11:37 +01:00
Alexey Shchepin
8ebcba4d08
Fix PostgreSQL compatibility in mod_offline_sql:remove_old_messages ( #2695 )
2018-12-05 01:56:39 +03:00
Paweł Chmielowski
e85fa96cf7
Proxy protocol may send additional data after addresses
2018-12-04 15:23:28 +01:00
Paweł Chmielowski
0e081ba73e
Update deps
2018-12-04 14:40:37 +01:00
Paweł Chmielowski
6845896d12
Add support for proxy protocol
...
This add support for version 1 and 2 of protocol specified in
http://www.haproxy.org/download/1.8/doc/proxy-protocol.txt
To enable it you need add option use_proxy_protocol: true to listener.
2018-12-04 14:22:45 +01:00
Paweł Chmielowski
9139ea86fb
Format list of {{name,string}, {value, _}} as json struct name/val
2018-12-03 13:53:07 +01:00
Paweł Chmielowski
59a148d80b
Make mod_http_api assume that missing args of type list are empty list
2018-12-03 13:53:07 +01:00
Evgeny Khramtsov
109ed8f2f6
Keep info about carbons inside session table
...
Accordingly, Mnesia/SQL/Riak table 'carboncopy' is not used anymore
and can be safely removed.
As a consequence, the commit deprecates the following options of
mod_carboncopy:
- ram_db_type
- use_cache
- cache_size
- cache_missed
- cache_life_time
Fixes #2663
2018-12-01 13:33:44 +03:00
Holger Weiss
a9539fef22
ejabberd_s2s_in: Check for subdomain configuration
...
If an incoming s2s connection to a subdomain such as
conference.example.com is accepted, check for host-specific
configuration settings for that subdomain rather than for example.com.
This is for consistency with ejabberd_s2s_out, and with my previous
commit.
2018-12-01 10:14:04 +01:00
Holger Weiss
122dfec03d
ejabberd_s2s_in: Check for subdomain certificate
...
If an incoming s2s connection to a subdomain such as
conference.example.com is accepted and a separate certificate is
available for that subdomain, offer that certificate instead of the one
for example.com.
Thanks to Mike Kuketz for reporting the bug.
2018-12-01 10:08:28 +01:00
Holger Weiss
2eb907dc7f
mod_register: Don't advertise IBR unconditionally
...
Don't advertise the IBR stream feature if registration is disabled in
the configuration.
2018-12-01 07:21:41 +01:00
Evgeny Khramtsov
59ce0ba6c8
Apply new cache options on mod_stream_mgmt reload
2018-11-30 18:12:27 +03:00
Evgeny Khramtsov
5d27c975dc
Keep last handled stanzas number in cache rather than session table
2018-11-30 16:19:00 +03:00
Badlop
b8883b5a61
New command unban_ip ( #2620 )
2018-11-30 13:36:10 +01:00
Paweł Chmielowski
53ae25ad8f
Update deps
2018-11-29 14:45:13 +01:00
Evgeny Khramtsov
b07b10bdaa
Drop some macros related to OTP<19
2018-11-29 13:01:00 +03:00
Evgeny Khramtsov
624485fe26
Implement XEP-0410: MUC Self-Ping optimization
...
Fixes #2630
2018-11-29 12:16:12 +03:00
Evgeny Khramtsov
3f901b3793
Advertise disco#info and disco#items by MUC room
...
Fixes #2661
2018-11-29 10:35:03 +03:00
Paweł Chmielowski
0b31aa490b
Add xml compression to sql backend of mam
2018-11-28 11:25:16 +01:00
Badlop
e37a1a73f1
Add specific Var names to CAPTCHA fallback form fields ( #2672 )
2018-11-27 19:10:42 +01:00
Christophe Romain
932d995a1d
Revert "Upgrade Elixir to 1.6.6 ( #2653 )"
...
This reverts commit d3a9fbf62f
.
rebar2 (which is still used) is not able to cope with this change
it should check lib/elixir/src/elixir.app.src instead of src/elixir.app.src
as src/elixir.app.src moved away, currently check fails and this breaks
jenkins tests.
options: use rebar3, or drop rebar completely to rely only on mix.
2018-11-27 11:01:52 +01:00
Christophe Romain
d3a9fbf62f
Upgrade Elixir to 1.6.6 ( #2653 )
2018-11-27 09:57:59 +01:00
Evgeny Khramtsov
94ef57721b
Merge branch 'master' of github.com:processone/ejabberd
2018-11-23 16:25:02 +03:00
Evgeny Khramtsov
207c0eebe4
Improve tests for mod_private
2018-11-23 16:24:44 +03:00
Badlop
133bc764cd
Fix typo in recent PR commit ( #2697 )
2018-11-23 13:23:00 +01:00
Christophe Romain
8ebf31d949
Bump lager version in mix as well
2018-11-23 13:00:19 +01:00
badlop
cc9a1a0917
Merge pull request #2697 from Snowmanko/master
...
Update - fixed ejabberdctl push_roster description
2018-11-23 12:55:44 +01:00
Evgeny Khramtsov
a84be928ef
Fix test case for invalid language
2018-11-23 14:11:14 +03:00
Evgeny Khramtsov
fcff3c60b1
Only advertise conversion feature when mod_pubsub is loaded
2018-11-23 14:01:06 +03:00
Evgeny Khramtsov
d79ddd7b5c
Bump lager version
2018-11-23 13:34:21 +03:00
Evgeny Khramtsov
1cdca1ab99
Support for XEP-0411: Bookmarks Conversion
2018-11-23 13:33:29 +03:00
Evgeny Khramtsov
87f8355908
Merge pull request #2690 from nosnilmot/stopping-hook
...
Add ejabberd_stopping hook
2018-11-22 23:21:45 +03:00
Snowman
9ed5ba01b2
Update - fixed ejabberdctl push_roster description
2018-11-22 16:32:05 +01:00
Christophe Romain
4b3db3a9cb
Relax result matching to fix pgsql keepalive ( #2632 )
2018-11-21 18:06:32 +01:00
Mickael Remond
8a960f77d4
Remove unused link
2018-11-21 11:54:02 +01:00
Stu Tomlinson
d4cd3ddc32
Add ejabberd_stopping hook
...
This hook allows modules to detect when ejabberd is stopping and adjust
behaviour if desired
2018-11-19 15:11:33 +00:00
Holger Weiss
88749e2cdb
CONTRIBUTORS: UTF-8 encode my name
2018-11-19 15:23:35 +01:00
Paweł Chmielowski
1214a83cca
Use never version of meck
2018-11-19 14:15:29 +01:00
Paweł Chmielowski
8e3bbcac9f
Another attempt for db access on travis
2018-11-19 13:53:06 +01:00
Paweł Chmielowski
0ad319e288
Third time's the charm? Let load scheme before changing permissions
2018-11-19 13:17:46 +01:00
Mickaël Rémond
9a351c0aff
Update CONTRIBUTING.md
2018-11-19 13:12:35 +01:00
Paweł Chmielowski
d642a9db88
Fix command for loading pgsql schema
2018-11-19 12:58:45 +01:00
Paweł Chmielowski
0c4f5dbb7e
Try to load db schemas externally on travis
2018-11-19 12:49:29 +01:00
Mickael Remond
181019198c
Thank you, contributors
2018-11-19 11:38:44 +01:00
Mickaël Rémond
61dcab13a4
Expand contribution document
2018-11-19 11:17:08 +01:00
Mickaël Rémond
9c1c854138
Initial contributing document
2018-11-19 11:03:10 +01:00
Mickael Remond
912d4e2165
Merge branch 'master' of github.com:processone/ejabberd
2018-11-19 10:40:05 +01:00
Mickael Remond
41a24a8f8e
Markdown version is the main README version
2018-11-19 10:39:54 +01:00
Mickaël Rémond
3c3dd80ea9
Update issue templates
2018-11-19 10:37:04 +01:00
Mickael Remond
68f8194886
Use new naming for Github issue templates
2018-11-19 10:35:07 +01:00
Badlop
06e9d34018
Handle some malformed URL requests in ejabberd_http ( #2687 )
2018-11-16 12:13:17 +01:00
Evgeny Khramtsov
1d80addb7d
Get rid of 'catch-all' statements
2018-11-15 15:07:58 +03:00
Evgeny Khramtsov
43498b39c1
Replace dict with maps
...
This will improve performance and memory consumptions of large MUCs
2018-11-15 14:13:45 +03:00
badlop
2b09d6a761
Merge pull request #2683 from paulmenzel/use-https-url-in-readme
...
Use HTTPS URL for docs.ejabberd.im in `README`
2018-11-13 10:30:09 +01:00
Paul Menzel
a5eabcea35
README: Use HTTPS URL for docs.ejabberd.im
...
Directly use the HTTPS URL.
$ curl -I http://docs.ejabberd.im
HTTP/1.1 301 Moved Permanently
Server: Cowboy
Connection: keep-alive
Location: https://docs.ejabberd.im/
Date: Mon, 12 Nov 2018 14:31:07 GMT
Content-Type: text/plain; charset=utf-8
Via: 1.1 vegur
$ curl -I https://docs.ejabberd.im
HTTP/1.1 200 OK
Server: Cowboy
Connection: keep-alive
Set-Cookie: main-session=MTU0MjAzMzA1NnxOd3dBTkZWWVNrbEVRVkUwUVZvM1JGcEtTakpKTTA1RlYxQk1TelZKTmxkUlNGRk5Sa0ZVV0VSS1dVNHpSMDh6VEUxSVJFTkRVMEU9fHnVvedfnvRp4MtnGBKYfXIDSBTPilUvIp6Kz559FNKg; Path=/; Expires=Mon, 12 Nov 2018 22:30:56 GMT; Max-Age=28800; HttpOnly
Date: Mon, 12 Nov 2018 14:30:56 GMT
Content-Type: text/html; charset=utf-8
Via: 1.1 vegur
2018-11-12 15:30:22 +01:00
Badlop
78d4e90d47
Remove references in configs to http_poll; it was removed in ba69c469b5
2018-11-12 14:26:00 +01:00
Holger Weiss
133c45ce2b
Don't suppress notifications on PEP node removal
...
Send node deletion notifications (as per XEP-0060, #8.4.2) also for PEP
nodes.
2018-11-12 12:54:53 +01:00
Nathan Bruning
e965119c0e
Privacy lists: set from/to on packet *before* calling privacy_check_packet
2018-11-10 16:56:34 +01:00
Paweł Chmielowski
d43d9ff0e2
Fix mod_http_apt_test
2018-11-09 14:55:19 +01:00
Badlop
da9bcc3370
Recover logging of user joining room, lost in 32de9a56
(thanks to elexis1)
2018-11-09 13:21:35 +01:00
Alexey Shchepin
48594544ed
Fix for the previous commit
2018-11-09 14:18:48 +03:00
Alexey Shchepin
d16b99d830
Track presences sent via a multicast service
2018-11-09 03:27:24 +03:00
Holger Weiss
7d9c2b77f2
Merge remote-tracking branch 'processone/pr/2675'
...
* processone/pr/2675:
Fix another typo in ejabberd.yml
Fix tiny typo in configuration file
2018-11-07 12:51:32 +01:00
Ave
d11d9db3d6
Fix another typo in ejabberd.yml
2018-11-07 14:44:27 +03:00
Ave
2001418edd
Fix tiny typo in configuration file
2018-11-07 14:41:16 +03:00
Badlop
9f7d3520aa
Fix unused variable warning
2018-11-06 00:08:45 +01:00
Badlop
602bfa3c3c
Local stanzas are routed one by one, not by multicast
2018-11-06 00:07:34 +01:00
badlop
9253f3d113
Merge pull request #2655 from hamano/missing_redis_sm.lua
...
missing priv/lua/redis_sm.lua
2018-10-31 11:54:43 +01:00
Holger Weiss
dd93c0b457
ejabberd_logger: Disable debug logging properly
...
Don't forget to disable xmpp's debug logging when reducing the log level
from 5 to a lower value.
2018-10-31 02:42:54 +01:00
Badlop
a73aac691e
Don't preprocess arguments, format_args verifies and prepares them ( #2629 )
2018-10-31 01:34:04 +01:00
Badlop
36891175ec
Don't hide result of mod_*:set_* calls
2018-10-30 23:07:30 +01:00
Paweł Chmielowski
cb2b927085
Add send_ws_ping to c2s
2018-10-29 12:30:59 +01:00
HAMANO Tsukasa
3438f22de5
missing priv/lua/redis_sm.lua
2018-10-29 18:25:04 +09:00
Holger Weiss
30393bb690
Move unwrap_mucsub_message/1 into misc
2018-10-25 01:22:57 +02:00
Holger Weiss
a8b11b6474
Move some functions from xmpp back into ejabberd
2018-10-25 01:05:45 +02:00
Paweł Chmielowski
432ca80db6
Do no add 127.0.0.1 address to trusted_proxies list by default
2018-10-24 15:16:32 +02:00
Paweł Chmielowski
e369a93809
Use newer fast_tls that fixes some issues with tls1.3
2018-10-24 10:13:05 +02:00
Paweł Chmielowski
74e96afc10
Use tagged version of p1_mysql
2018-10-19 10:57:22 +02:00
Paweł Chmielowski
5181983d97
Recognize not_exists error in http_api
2018-10-19 10:30:05 +02:00
Paweł Chmielowski
0352b97f50
Update p1_mysql
2018-10-19 10:15:48 +02:00
Badlop
b010a1a0a0
Affiliations other than admin and owner cannot invite to members_only rooms
...
This is explained in the paragraph:
If the room is members-only, the service MAY also add the invitee to the
member list. (Note: Invitation privileges in members-only rooms SHOULD be
restricted to room admins; if a member without privileges to edit the
member list attempts to invite another user, the service SHOULD return
a <forbidden/> error to the occupant; for details, see the Modifying the
Member List section of this document.)
https://xmpp.org/extensions/xep-0045.html#invite-mediated
2018-10-17 12:57:18 +02:00
Holger Weiss
9a99284dfd
Merge remote-tracking branch 'processone/pr/2636'
...
* processone/pr/2636:
Config template recommend "open" access_model
2018-10-16 09:53:26 +02:00
Licaon_Kter
ae88be2011
Config template recommend "open" access_model
...
...instead of "comment out", as many seem to misunderstand what and why should be or not be commented out
2018-10-15 23:15:51 +00:00
Holger Weiss
7f97f3ae75
Enable mod_proxy65 by default
2018-10-15 23:09:52 +02:00
Holger Weiss
3d4f65812e
ejabberd_s2s_in: Fix indentation
2018-10-15 23:03:53 +02:00
Paweł Chmielowski
914fae3d3e
Change logic for archiving mucsub messages
...
This change should apply usual logic for message wrapped in mucsub except
check for groupchat message, so messages without bodies for example
should be rejected
2018-10-10 18:12:35 +02:00
Christophe Romain
d1e072821e
Fix version in mix.exs
2018-10-09 12:23:27 +02:00
Paweł Chmielowski
989da356c4
Add pkix to included_applications
2018-10-09 11:33:39 +02:00
Paweł Chmielowski
c1521d3f13
Add pkix to mix.exs
2018-10-09 10:15:10 +02:00
Paweł Chmielowski
a16acd77ed
Archive messages with type=normal and pubsub payload (like mucsub messages)
2018-10-08 15:56:44 +02:00
Evgeny Khramtsov
510925c9a1
Avoid using * in 'certfiles' option of default config
2018-10-04 15:00:43 +03:00
Evgeny Khramtsov
ed2b07fc10
Bump ejabberd version in the issue template
2018-10-04 14:42:11 +03:00
Evgeny Khramtsov
ebd50f8a69
Report available options in lexical order
2018-10-04 14:31:41 +03:00
Evgeny Khramtsov
d8f831de09
Run ejabberd_started hook earlier
2018-09-29 23:06:34 +03:00
Evgeny Khramtsov
73af98a8dc
Add forgotten TURN options to validator
...
Fixes #2621
2018-09-29 23:05:41 +03:00
Evgeny Khramtsov
984a00195a
Fix bugs introduced by previous commit
2018-09-28 00:28:34 +03:00
Evgeny Khramtsov
39fa1a810d
Move certificates processing code to pkix application
...
==== WARNING: MUST BE ADDED TO RELEASE NOTES =====
The commit introduces the following incompatibility:
- Option 'ca_path' is deprecated and has no effect anymore:
option 'ca_file' should be used instead if needed.
==================================================
2018-09-27 20:37:27 +03:00
Holger Weiss
e3a03394c7
mod_avatar: Reduce log level for too large avatars
...
Log a warning rather than an error when publishing an avatar fails due
to its size exceeding the ?MAX_PAYLOAD_SIZE for PubSub items.
2018-09-26 21:00:52 +02:00
Holger Weiss
aa162f30df
ejabberd_regexp: Support Unicode
2018-09-26 19:10:32 +02:00
Holger Weiss
5dcf2cde9c
MySQL: Use MEDIUMTEXT for PubSub payload
...
Let MySQL/MariaDB accept PubSub payloads with a size of up to 16 MiB,
rather than truncating at 64 KiB.
2018-09-26 19:01:45 +02:00
Paweł Chmielowski
b72ed7afa4
Update mix.lock
2018-09-26 15:01:27 +02:00
Christophe Romain
c109d3eff0
Add odbc connection robustness ( #2428 )
2018-09-25 16:59:49 +02:00
Paweł Chmielowski
0d743da595
Update xmpp
2018-09-25 16:18:16 +02:00
Paweł Chmielowski
ef57067edc
Update deps in mix.lock
2018-09-25 14:31:22 +02:00
Badlop
e054c2800b
Allow a subscribed owner/admin to kick lower-affiliation moderator
2018-09-25 10:55:57 +02:00
Badlop
49f1b4a691
Allow an occupant owner/admin to kick lower-affiliation moderator
2018-09-25 10:55:56 +02:00
Badlop
8b61c7fe4b
Allow a subscribed owner/admin to kick participants and visitors
2018-09-25 10:55:54 +02:00
Badlop
9bac2fa185
Allow a subscribed owner/admin to change participant<->visitor
2018-09-25 10:55:51 +02:00
Paweł Chmielowski
c3f62c037d
Update deps once more
2018-09-24 15:49:26 +02:00
Paweł Chmielowski
4ddee2d89b
Increase validity of generated test ca cert and regenerate all certs
2018-09-24 15:19:19 +02:00
Paweł Chmielowski
054426072e
Update deps
2018-09-24 14:37:54 +02:00
Evgeny Khramtsov
f28200b6de
Update ISSUE_TEMPLATE
2018-09-21 19:20:23 +03:00
Evgeny Khramtsov
8c16400332
Update ISSUE_TEMPLATE
2018-09-21 19:02:14 +03:00
Paweł Chmielowski
0394baaa7a
Allow changing invitation message from muc_invite hook
2018-09-21 16:37:52 +02:00
Paweł Chmielowski
1b3a6dd54a
Recognize more fields that aren't atom in format_room_option
2018-09-20 18:02:47 +02:00
Evgeny Khramtsov
6d1ea222c0
Remove forgotten debug line
2018-09-19 23:17:04 +03:00
Evgeny Khramtsov
08f3d066b1
Switch more log message to warning level
...
The commit is supposed to improve logging at loglevel 3, which
is the recommended level for high loaded ejabberd servers
2018-09-19 23:12:14 +03:00
Evgeny Khramtsov
ddca2e8b4a
Switch mod_fail2ban log messages to warning level
2018-09-19 19:33:33 +03:00
Evgeny Khramtsov
a2b2a27bb6
Resize SQL pool on configuration reload
...
Fixes #2541
2018-09-19 11:55:40 +03:00
Evgeny Khramtsov
d60d72d7bf
Don't hide 'undef' exceptions during config validation
2018-09-19 01:00:50 +03:00
Evgeny Khramtsov
7ff5f2d3fa
Fail early when loading unavailable SIP or STUN modules
2018-09-18 18:19:42 +03:00
Evgeny Khramtsov
1866b56e3b
Report real address of a listener
2018-09-18 14:51:42 +03:00
Evgeny Khramtsov
e96bfbdbfa
Remove useless type specs
2018-09-18 13:24:06 +03:00
Evgeny Khramtsov
3cc964fbcc
Fix listeners child specs creation
2018-09-18 13:22:34 +03:00
Evgeny Khramtsov
29f6c43ae3
Remove forgotten debug line
2018-09-18 12:58:29 +03:00
Evgeny Khramtsov
03de853e4f
Refactor ejabberd_listener
2018-09-18 12:53:36 +03:00
Paweł Chmielowski
fb367469d4
Add ability to configure test to use new sql schema
2018-09-18 09:44:54 +02:00
Holger Weiss
d2cdfa66f9
mod_http_upload: Log error if 'put_url' is reused
...
Log a proper [error] message if a single 'put_url' is used for multiple
virtual hosts.
2018-09-17 21:46:37 +02:00
Badlop
d5c1174385
Revert "New option tombstone_expiry locks recent room creation after destroy ( #2546 )"
...
This reverts commit efb4fd0d10
.
2018-09-17 12:28:39 +02:00
Evgeny Khramtsov
dd888f90ec
Improve error formatting
2018-09-17 12:08:04 +03:00
Badlop
bb9593dd12
Remove unused variables
2018-09-17 10:42:29 +02:00
Evgeny Khramtsov
de385591d0
Refactor ejabberd listener API
2018-09-17 11:21:02 +03:00
Paweł Chmielowski
78dae4036e
Reintroduce change removed by mistake in 'Improve match macro'
2018-09-17 09:34:15 +02:00
Holger Weiss
dafea66c0f
Increase 'max_stanza_size' limit for c2s listener
...
Specify a larger 'max_stanza_size' limit for c2s connections in the
default configuration in order to reduce the risk of this limit being
hit by legitimate traffic (such as avatar uploads).
2018-09-17 00:18:38 +02:00
Holger Weiss
c851f9608a
Set a 'max_stanza_size' for incoming s2s listener
...
Specify a 'max_stanza_size' limit for incoming s2s connections in the
example configuration, but use a relatively large value in order to
minimize the risk of this limit being hit by legitimate traffic.
2018-09-16 23:57:44 +02:00
Holger Weiss
3367c5b120
MySQL: Use MEDIUMTEXT for MAM/offline messages
...
Let MySQL/MariaDB accept message stanzas with a size of up to 16 MiB,
rather than truncating at 64 KiB.
2018-09-16 20:42:37 +02:00
Paweł Chmielowski
d4579d2a20
[test] Improve match macro
2018-09-14 20:27:59 +02:00
Paweł Chmielowski
410ac9b966
[tests] Update stream_id from stream:stream after auth
2018-09-14 20:27:33 +02:00
Holger Weiss
adf0d7de91
mod_muc_room: Fix the room's CAPS hash
...
Don't forget the room's xdata when calculating the CAPS hash.
2018-09-14 00:18:17 +02:00
Evgeny Khramtsov
8c03427c25
Merge pull request #2605 from af8a524db1/remove_unused_error
...
mod_register: Remove unused error 'too_many_users'
2018-09-13 22:36:59 +03:00
Marc Schink
c156eabb24
mod_register: Remove unused error 'too_many_users'
2018-09-13 21:34:12 +02:00
Badlop
1d6cbd2561
Trigger hook for user_send_packet in send_message command ( #2604 )
2018-09-13 18:21:30 +02:00
Evgeny Khramtsov
a7a1e7be94
Merge pull request #2602 from aquarhead/expect-mnesia-up
...
Expect mnesia_up event when joining cluster
2018-09-12 17:15:04 +03:00
AquarHEAD Lou
8673d2926d
Expect mnesia_up event when joining cluster
2018-09-12 11:01:05 +00:00
colm
b0b188aa68
remove some chatty SQL queries by pulling back all groups with opts and filtering in memory. move a call to get_group_name outside of a loop to eliminate redundant repeated queries
2018-09-10 00:08:00 +01:00
Evgeny Khramtsov
2d246f61dd
Fix some dialyzer warnings
2018-09-09 09:59:08 +03:00
Evgeny Khramtsov
9de2ca4568
Merge pull request #2597 from dmitryDemchenko/master
...
fix for freetds UTF-8 corruption
2018-09-07 22:50:16 +03:00
root
b545301f63
fix for freetds UTF-8 corruption
2018-09-07 19:56:39 +03:00
Evgeny Khramtsov
145c0116bf
Bump lager version
...
This is needed for OTP-21 compatibility
2018-09-07 18:03:36 +03:00
Paweł Chmielowski
79c511a441
Add information about real sender to mucsub message meta
2018-09-06 13:36:59 +02:00
Paweł Chmielowski
90b22da880
Use newere fast_tls
2018-09-05 11:14:19 +02:00
Paweł Chmielowski
57936bfa4e
Don't stop sending pings when receiving timeout for timeout_action=none
2018-09-04 09:52:41 +02:00
Evgeniy Khramtsov
5c931d7004
Correctly handle empty result with RSM
...
Fixes #2588
2018-09-02 00:37:07 +03:00
Evgeniy Khramtsov
88d0b71d58
Get stacktrace out of lager context
...
Calling erlang:get_stacktrace() inside lager functions produces
stacktraces of the logging function itself, not the function which has failed.
2018-09-01 19:37:26 +03:00
Evgeniy Khramtsov
b416527e4f
Don't set termination reason into presence-unavailable status
...
Fixes https://github.com/processone/xmpp/issues/35
2018-09-01 17:39:39 +03:00
Holger Weiss
8c8c480477
ejabberd_s2s_in: Log message on connection close
...
Log a message when an incoming s2s connection is closed, analogous to
the message on outgoing s2s connection close.
2018-08-29 16:23:56 +02:00
Paweł Chmielowski
66132353df
Sign certs used by tests with sha256
...
Seems that openssl1.1.1 (at least debian version) rejects certs signed with
md5 or sha1, so lets use something that works.
2018-08-28 11:27:44 +02:00
Evgeniy Khramtsov
b30a9f2f75
Better formatting of unexpected return from Module:start/2
2018-08-28 10:41:57 +03:00
Badlop
0cbd41fbdc
Fix max_user_conferences in Mnesia to consider only one MUC service ( #2556 )
2018-08-20 15:47:53 +02:00
Evgeniy Khramtsov
5b055d7eec
Use "localhost" as a default host
2018-08-17 18:42:09 +03:00
Evgeniy Khramtsov
01a1f929b4
Bump xmpp version
2018-08-17 18:16:14 +03:00
Evgeniy Khramtsov
f0f3ec211e
Disable cache for anonymous auth backend
...
Fixes #2566
2018-08-17 17:56:23 +03:00
Paweł Chmielowski
fd76bc9242
Update xmpp
2018-08-16 11:59:26 +02:00
Badlop
6cd70947be
Third attempt to fix the typo!
2018-08-15 12:56:41 +02:00
Badlop
8cefe58a89
Fix typo from commit 0bf93eefc
2018-08-15 12:40:39 +02:00
Badlop
c3361bab95
Handle get_presence(Pid) when session doesn't exist ( #2547 )
2018-08-15 12:16:01 +02:00
Badlop
f3f3b1586e
Fix typo in command description
2018-08-13 16:42:16 +02:00
Badlop
0bf93eefcb
Try to update tests to handle recent MUC subscriptions change ( #2272 )
2018-08-13 15:26:40 +02:00
Badlop
10e01b7bfc
Return human error messages when calling export2sql with wrong path ( #2480 )
2018-08-13 13:56:29 +02:00
Badlop
8f0e066135
In response with list of room subscriptions include also events ( #2272 )
2018-08-13 12:52:33 +02:00
Badlop
dfd96b6037
Remove num_active_users as it uses calls to last_activity mnesia table ( #2448 )
2018-08-08 14:18:49 +02:00
Badlop
5b373470ac
Remove direct calls to muc_room mnesia table in mod_muc_admin ( #2448 )
2018-08-08 14:18:34 +02:00
Badlop
0146189b65
Add markdown options as specified in the docs git repo
2018-08-07 16:59:26 +02:00
Badlop
4c4c82897c
Add import_prosody explanation from docs git repo
2018-08-07 16:58:53 +02:00
Badlop
5509e648ad
Allow acme and oauth commands to be read by gen_markdown_doc_for_commands
2018-08-07 16:58:48 +02:00
Badlop
c9ba0e83d2
Handle ejabberd_captcha error reports in mod_register_web ( #2553 )
2018-08-02 18:36:41 +02:00
Evgeny Khramtsov
b56c012407
Merge pull request #2551 from MarcelWaldvogel/configurable-extauth-pool
...
Make it possible to join extauth pools
2018-07-31 07:52:06 +03:00
Marcel Waldvogel
9b48dc9cc3
Make it possible to join extauth pools
2018-07-30 22:49:18 +02:00
Badlop
efb4fd0d10
New option tombstone_expiry locks recent room creation after destroy ( #2546 )
...
Setting the new mod_muc option tombstone_expiry to a positive integer
will make that any room destroyed gets replaced with a room tombstone.
That tombstone cannot be joined, so it blocks accessing the old room JID
until the expiry seconds have passed.
The default value is 0 seconds, so tombstones are not created.
2018-07-30 19:24:35 +02:00
Holger Weiss
83e2462853
mod_mam: Don't strip offline message stanza IDs
...
As mod_offline currently doesn't preserve metadata, add an explicit
check for messages retrieved from offline storage to avoid stripping
their stanza IDs.
Thanks to Zuglufttier for spotting this.
2018-07-27 00:27:10 +02:00
Holger Weiss
cdfd0cce7b
mod_mam: Make sure stanza IDs aren't reused
...
Strip the stanza ID from the metadata of outgoing messages to make sure
it's not reused for the (local) recipient's MAM archive.
2018-07-27 00:14:48 +02:00
Holger Weiss
2d45832a39
ejabberd_auth: Restore lost case clause
...
Let check_password_with_authmodule/6 handle the case where
validate_credentials/2 returns an error. This got lost in commit
4f8af723c6
.
2018-07-26 22:37:25 +02:00
Paweł Chmielowski
1af2cf37ea
Wait for more data than just <stream:stream> before sending in bosh
...
This fixes issue #2545
2018-07-26 18:56:05 +02:00
Paweł Chmielowski
ca022b6d1f
Make sure that we always start inactivity timer from drop_holding_receiver
2018-07-26 17:29:35 +02:00
Paweł Chmielowski
e54f1a8485
Set wait_timer to undefined when timer was triggered
2018-07-26 17:29:35 +02:00
Badlop
1be2112634
Fix search for User in vjud
...
See https://stackoverflow.com/questions/51478247/ejabberd-search-module-failed-to-handle-the-query
2018-07-24 20:01:22 +02:00
Paweł Chmielowski
6dc452e7f5
Update xmpp
2018-07-23 17:23:11 +02:00
Holger Weiss
57a3512dcc
mod_http_upload: Adjust default value of 'put_url'
...
Let the default 'put_url' point to the HTTPS listener specified in the
new default configuration.
2018-07-18 19:44:56 +02:00
Evgeny Khramtsov
1de69174ef
Merge pull request #2538 from weiss/tls-by-default
...
Enable TLS by default (and require it for c2s)
2018-07-18 19:38:13 +03:00
Holger Weiss
26b9d25f32
Enable TLS by default (and require it for c2s)
2018-07-18 18:22:24 +02:00
Holger Weiss
8ad6afd652
mod_http_upload: Deprecate 'service_url' option
...
Users should migrate to the 'external_secret' interface.
2018-07-18 18:16:42 +02:00
Evgeny Khramtsov
7fed5a3eb6
Merge pull request #2537 from rouen-sk/patch-1
...
Update mssql.sql
2018-07-18 18:37:30 +03:00
rouen-sk
b199b68380
Update mssql.sql
...
Fixed:
- conflicting clustered indexes on 2 tables
- semicolon type
- Azure SQL incompatibility
2018-07-18 17:12:17 +02:00
Holger Weiss
e433a63105
mod_http_upload: Avoid function-like macros
2018-07-17 22:28:31 +02:00
Holger Weiss
68c9328a9c
Move cancel_timer/1 function into 'misc' module
2018-07-17 20:50:58 +02:00
Holger Weiss
6601f182c4
mod_http_upload: Add "Allow" to OPTIONS response
...
RFC 2616 says: "A 200 response SHOULD include any header fields that
indicate optional features implemented by the server and applicable to
that resource (e.g., Allow) [...]."
2018-07-17 19:42:57 +02:00
Holger Weiss
326db5535c
mod_muc: Don't set default for muc#roomconfig_lang
...
For the muc#roomconfig_lang setting, no default is preferable over a
possibly incorrect default value.
2018-07-16 15:15:36 +02:00
Holger Weiss
2539be1a04
mod_http_upload: Avoid timers from timer module
...
Use erlang:start_timer/3 instead of timer:send_after/2, as the former is
more efficient.
2018-07-16 00:17:11 +02:00
Holger Weiss
4e9930597d
mod_http_upload: Don't store "external" slots
...
Don't store requested upload slots if an 'external_secret' is
configured.
2018-07-15 21:53:50 +02:00
Evgeniy Khramtsov
2dfb5a6a5c
Note about Redis requirement in the test suite README
2018-07-15 10:14:47 +03:00
Evgeniy Khramtsov
8faa6afa67
Require Redis version >= 3.2.0
...
Since we now use Lua scripting for cleaning up c2s sessions
the minimum supported Redis version is 3.2.0 or above because
we need to work correctly with Redis replication mechanism.
****** BACKWARD INCOMPATIBILITY WARNING *******
** THIS SHOULD BE ADDED TO THE RELEASE NOTES **
*** PACKAGE MAINTAINERS SHOULD BE INFORMED ***
***********************************************
2018-07-15 09:52:03 +03:00
Holger Weiss
12e537c43f
Avoid "ejabberdctl status" crash
2018-07-14 20:27:30 +02:00
Evgeniy Khramtsov
4394ec38b6
Don't forget to remove Lua scripts on uninstall
2018-07-14 18:02:50 +03:00
Evgeniy Khramtsov
420e05fa0d
Clean up contributed code for Redis SM
2018-07-14 17:53:00 +03:00
Evgeny Khramtsov
e2fb154fe9
Merge pull request #2525 from satish-olx/master
...
Use lua scripting to clear redis sessions.
2018-07-14 16:53:45 +03:00
Evgeniy Khramtsov
e9f219a0ac
Improve wording
2018-07-14 16:52:09 +03:00
Evgeny Khramtsov
711c5c0d54
Merge pull request #2526 from nosnilmot/enforce-pubsub-option-attributes
...
Enforce pubsub option required/rejected attributes
2018-07-14 16:42:15 +03:00
Stu Tomlinson
f9ed34db4d
Enforce pubsub option required/rejected attributes
...
XEP-0060 states that 'node' and 'jid' attributes to <options> element MUST NOT
be included when <options> are specified at same time as <subscribe> :
https://xmpp.org/extensions/xep-0060.html#subscriber-configure-subandconfig
mod_pubsub will require 'node' and 'jid' attributes on standalone pubsub
options requests, and reject subscribe requests that have options that include
either 'node' or 'jid'
2018-07-14 11:55:38 +01:00
Evgeny Khramtsov
9a895058e7
Merge pull request #2522 from weiss/bump-max-user-conferences
...
mod_muc: Increase default 'max_user_conferences' value
2018-07-14 08:51:11 +03:00
Paweł Chmielowski
e76a57e144
Ensure that returned priority in a number in mod_admin_extra
2018-07-13 09:51:19 +02:00
satish-olx
6fc6bdefc2
Update ejabberd_sm_redis.erl
2018-07-12 16:14:26 +05:30
satish-olx
96e35a3248
Lua script for cleaning redis sessions
...
Changes:
1. Added extra keys for tracking node -> session mapping
2. Lua script for clearing the sessions in redis itself.
2018-07-12 16:10:24 +05:30
Paweł Chmielowski
48be8e7b1e
Adopt code that uses parse_listener_portip after result change
2018-07-11 14:07:24 +02:00
Badlop
f40f3a9da7
Fix piefxis import of privacy lists (thanks to crosser)( #2412 )
2018-07-11 12:56:57 +02:00
Badlop
f81b49fe44
Fix piefxis import of vCard elements ( #2514 )
2018-07-11 12:56:38 +02:00
Evgeniy Khramtsov
395d2e86bc
Improve listener errors formatting
2018-07-11 09:29:55 +03:00
Holger Weiss
5b3af9d4cd
Fix compiler warnings regarding test cases
2018-07-11 00:07:57 +02:00
Holger Weiss
7e5d766a02
pubsub_tests: Fix race condition
2018-07-10 21:25:06 +02:00
Holger Weiss
c5dd1bdd9d
mod_http_upload_quota: Fix process name lookup
...
Fix mod_http_upload_quota's process name lookup for the case where a
slot is requested by a JID whose domain part is not the virtual host the
mod_http_upload_quota process is running on.
2018-07-10 21:19:15 +02:00
Evgeniy Khramtsov
d03432a956
Fix regression: list SASL EXTERNAL mechanism for inbound s2s
2018-07-10 10:14:08 +03:00
Holger Weiss
4b747c2c78
mod_muc: Increase 'max_user_conferences' default
...
Let up to 100 clients of a given account join MUC rooms by default. The
old default value can be too small, e.g., when users join many (private)
rooms with multiple devices.
2018-07-10 01:00:06 +02:00
Holger Weiss
3a566e3cdf
mod_stream_mgmt: Remove dead case clauses
2018-07-10 00:52:27 +02:00
Holger Weiss
b915469f5e
mod_stream_mgmt: Add descriptive text to errors
...
Closes #2485 .
2018-07-10 00:46:48 +02:00
Evgeniy Khramtsov
8b9166d067
Improve value formatting
2018-07-09 20:32:01 +03:00
Paweł Chmielowski
dc6861eb73
Use ejabberd_config:get_version in ejabberdctl status
2018-07-09 17:11:40 +02:00
Evgeny Khramtsov
90a4aafec0
Merge pull request #2516 from licaon-kter/patch-6
...
Remove vcard search default value
2018-07-09 10:08:00 +03:00
Licaon_Kter
4c06f13d18
Remove vcard search default value
2018-07-08 23:48:08 +00:00
Evgeniy Khramtsov
8c796ed027
Better format invalid values when logging them
2018-07-08 20:42:53 +03:00
Evgeniy Khramtsov
68d12017cc
Better detection of duplicated routes/hosts
2018-07-08 20:28:11 +03:00
Evgeniy Khramtsov
491993d401
Reload internal room's configuration when mod_muc is reloaded
...
Fixes #2513
2018-07-08 14:52:12 +03:00
Evgeny Khramtsov
a981bf9a59
Merge pull request #2511 from licaon-kter/patch-5
...
Remove stats and time from template
2018-07-08 10:43:25 +03:00
Evgeny Khramtsov
920e4512b6
Merge pull request #2515 from ChaosKid42/fix_HMAC_in_http_upload
...
fix generation of HMAC for external_secret
2018-07-08 10:42:55 +03:00
Christoph Scholz
fbdcc44fd9
fix HMAC for external_secret
2018-07-07 17:01:39 +02:00
Paweł Chmielowski
b2b29269ec
Remove cyrsasl elixir tests, we no longer have it
2018-07-06 09:49:30 +02:00
Evgeniy Khramtsov
11811e5f48
Only lookup FQDN at configuration (re)loading
2018-07-06 09:18:27 +03:00
Licaon_Kter
b7f62a4fa7
Remove stats and time from template
...
Are these important for a new admin?
2018-07-06 01:33:41 +00:00
Evgeniy Khramtsov
0bb14d16c7
Move XMPP stream and SASL processing to xmpp repo
2018-07-06 01:07:36 +03:00
Evgeniy Khramtsov
59f5a098b5
Use p1_rand in the test suite
2018-07-05 11:53:04 +03:00
Evgeniy Khramtsov
ed1ee6061e
Move move randoms module to p1_utils repo
2018-07-05 11:51:49 +03:00
Evgeniy Khramtsov
50b645aa92
Move shaper to p1_utils repo
2018-07-05 09:31:55 +03:00
Evgeniy Khramtsov
52f2a7de4b
Set 'from' attribute for client connections when it is absent
2018-07-04 08:59:14 +03:00
Evgeniy Khramtsov
bce8922e5d
Don't set from/to attributes in resource binding iq
2018-07-04 08:57:28 +03:00
Evgeniy Khramtsov
86236431b9
mod_http_upload: Treat file and network errors differently
2018-07-04 08:55:52 +03:00
badlop
c0d4d31b5b
Merge pull request #2495 from rodrigues/update_ptbr
...
Update pt-br translations
2018-07-03 16:50:29 +02:00
Evgeniy Khramtsov
295bec8551
Don't ignore send() result
2018-07-03 13:44:58 +03:00
Evgeniy Khramtsov
b341a3cef3
Increase default buffer size for mod_proxy65
2018-07-03 13:38:49 +03:00
Evgeniy Khramtsov
fface33d54
HTTP Upload: introduce new option 'external_secret'
...
The option makes it possible to offload all HTTP Upload processing
to a separate HTTP server. Both ejabberd and the HTTP server
should share this secret and behave exactly as described at
at https://modules.prosody.im/mod_http_upload_external.html
in the 'Implementation' section. Example configuration:
modules:
...
mod_http_upload:
...
put_url: "http://separate.http.server/upload "
external_secret: "foo bar baz"
...
2018-07-02 16:53:44 +03:00
Evgeniy Khramtsov
fbf6ba2738
Merge branch 'master' of github.com:processone/ejabberd
2018-07-02 01:08:09 +03:00
Evgeniy Khramtsov
38ec3f66c7
Enable Roster Versioning in the default config file
2018-07-02 01:08:02 +03:00
Evgeny Khramtsov
56dc625f9a
Merge pull request #2502 from licaon-kter/patch-4
...
Default config example fix reversed text
2018-07-02 00:20:46 +03:00
Licaon_Kter
7c5ee93c88
Default config example fix reversed text
...
...in enable OMEMO
2018-07-01 21:18:18 +00:00
Evgeniy Khramtsov
77163c43d2
Simplify the default configuration file
...
After some discussion with the community it was decided to
clean the configuration file from excessive comments and
explicitly configured default values. Also, mod_mam and
mod_http_upload have been added.
The rationale for this is to have a clean and not bloated
configuration file which doesn't scare away newcomers and
which has all features from the Compliance Suite 2018 (XEP-0387)
enabled by default.
For further configuration an admin is encouraged to read the
documentation at https://docs.ejabberd.im/admin/configuration
2018-07-01 23:57:27 +03:00
Victor Rodrigues
d1d02e2f26
Update pt-br translations
2018-07-01 15:15:41 +02:00
Evgeniy Khramtsov
6b8bc811ac
Don't crash on most common gen_server:call errors
2018-07-01 14:26:49 +03:00
Evgeniy Khramtsov
b662ec2a78
Accept IP address as a return value from resolve/2 callback
2018-06-30 10:19:58 +03:00
Paweł Chmielowski
8ca035496e
Update fast_xml and xmpp in mix.lock
2018-06-29 15:41:37 +02:00
Evgeniy Khramtsov
a463f5a25a
Replace hardcoded disco features with macros
2018-06-29 14:48:07 +03:00
Paweł Chmielowski
dce4e4de6d
Add check for files missing in hex packaging
2018-06-29 12:51:20 +02:00
Paweł Chmielowski
9b70177fd5
Update xmpp
2018-06-29 12:50:57 +02:00
Paweł Chmielowski
1fbb36c34a
Fix misc:try_url for erlang < R20
2018-06-29 11:13:29 +02:00
Christophe Romain
46abf7cfab
Rename obsolete type in comments
2018-06-29 11:10:35 +02:00
Paweł Chmielowski
62cb398734
Convert test that used moka, and drop that dependancy
2018-06-29 10:52:47 +02:00
Evgeniy Khramtsov
dff940b89e
Support both filenames and URLs in 'cssfile' option of mod_muc_log
...
If filename is provided, its content is inserted into the HTML page.
If URL is provided, it's used as a value of 'href' HTML attribute.
2018-06-29 11:34:53 +03:00
Evgeniy Khramtsov
66591b1c0d
Improve URLs validation
2018-06-29 11:06:24 +03:00
Evgeniy Khramtsov
b094ce8ea5
HTTP Upload: increase gen_server call timeout
2018-06-29 10:32:53 +03:00
Evgeniy Khramtsov
9c82c2f6d0
HTTP Upload: put more info in log messages
2018-06-29 09:58:33 +03:00
Evgeniy Khramtsov
0a40ab93c8
Don't crash when encoding {xmlcdata, _}
...
Fixes #2493
2018-06-28 15:04:46 +03:00
Paweł Chmielowski
c526b0e8ff
Update mix.lock
2018-06-28 12:11:44 +02:00
Paweł Chmielowski
35136f47ed
Bump version in mix.exs
2018-06-28 10:57:09 +02:00
Paweł Chmielowski
8f2233eff7
Update deps
2018-06-28 10:56:59 +02:00
Evgeniy Khramtsov
8879d1d533
Avoid code duplication when checking presence subscription
2018-06-28 10:37:20 +03:00
Evgeniy Khramtsov
71ae7e9fd9
Work-around against public_key incompatibility introduced in OTP21
...
The commit introduced the incompatility is
304dd8f81e
Thanks to Stu Tomlinson for spotting the issue.
Fixes #2488
2018-06-27 19:40:03 +03:00
Evgeniy Khramtsov
644873dae9
Don't check packets sent to self
2018-06-27 15:02:03 +03:00
Evgeniy Khramtsov
9a11db91f9
Use lists:foldl/3
2018-06-27 13:36:58 +03:00
Evgeniy Khramtsov
af8c6d2428
Generate HTTP Upload form using xdata codec
2018-06-27 13:29:38 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
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
Evgeniy Khramtsov
881e02632b
Improve error formatting in mod_http_upload
2018-06-26 19:32:29 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
cf6f540d53
Don't pass sockmod to xmpp_stream_out
2018-06-25 15:28:02 +03:00
Evgeniy Khramtsov
557e6ecdd0
Introduce resolve/2 and connect_options/3 callbacks for xmpp_stream_out
2018-06-25 15:19:49 +03:00
Evgeniy Khramtsov
5dd3f4c22b
Allow gen_server process registration
2018-06-25 14:55:33 +03:00
Evgeniy Khramtsov
e7c3b57b8b
Allow reconnecting from disconnected state
2018-06-25 14:52:33 +03:00
Evgeniy Khramtsov
c907915695
Intercept EXIT signal
2018-06-25 14:46:31 +03:00
Evgeniy Khramtsov
911ed4a7ca
Add Resource Binding support to xmpp_stream_out
2018-06-25 13:50:35 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
ac31c85866
Use error formatting functions from xmpp library
2018-06-25 09:45:45 +03:00
Evgeniy Khramtsov
c4c91cc956
Generate SASL failures on unencrypted connections only for s2s
2018-06-23 20:31:01 +03:00
Evgeniy Khramtsov
d809aafba0
Fix Erlang limits in ejabberdctl.cfg.example to reflect current situation
2018-06-23 20:01:21 +03:00
Evgeniy Khramtsov
6ffb120fce
Fix typo
2018-06-21 15:14:19 +03:00
Evgeniy Khramtsov
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
Paweł Chmielowski
274e9fe7b5
Guard against pres_last=undefined in mod_offline
2018-06-20 12:16:10 +02:00
Evgeniy Khramtsov
f465742f2c
Remove lowercased duplicates from ejabberd.pot
2018-06-20 13:02:06 +03:00
Evgeniy Khramtsov
9e83c45b3c
Restore forgotten translations from previous commit
2018-06-20 12:50:36 +03:00
Evgeniy Khramtsov
446e6e6f3b
Update ejabberd.pot
2018-06-20 12:32:10 +03:00
Evgeniy Khramtsov
3a5d2dbed8
Move mod_irc to ejabberd-contrib
2018-06-20 12:27:44 +03:00
Holger Weiss
aea6166efe
Omit summary form for push tests
2018-06-20 00:15:56 +02:00
Holger Weiss
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
Holger Weiss
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
Paweł Chmielowski
dee3081df1
Fix reset_stream in websocket using pre-rfc protocol
2018-06-19 17:51:09 +02:00
Evgeniy Khramtsov
6acac7c93f
Render roomname, allowinvites and allowpm in room disco#info
2018-06-19 14:02:45 +03:00
Holger Weiss
c2f664f941
mod_push_mnesia: Simplify record matching
...
Omit record fields that aren't used for matching.
2018-06-18 23:12:27 +02:00
Holger Weiss
75127a0deb
mod_push_mnesia: Fix lookup of all host sessions
2018-06-18 23:05:08 +02:00
Holger Weiss
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
Paweł Chmielowski
3099702039
New shaper implementation
2018-06-15 11:56:46 +02:00
Badlop
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
Evgeniy Khramtsov
6c323b729b
Improve type spec
2018-06-14 19:51:50 +03:00
Evgeniy Khramtsov
17b05ff4b7
Get rid of all calls to jlib.erl module
2018-06-14 19:49:27 +03:00
Evgeniy Khramtsov
7bd5c7fe59
Update mod_muc_room.hrl
2018-06-14 19:19:09 +03:00
Evgeniy Khramtsov
7b04a625be
Get rid of jlib.hrl/jlib.erl
2018-06-14 19:11:43 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
141be53c21
Get rid of ejabberd.hrl reference from the test suite
2018-06-14 14:24:15 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
c3c75affa9
Log modules startup
2018-06-14 10:18:10 +03:00
Holger Weiss
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
Evgeniy Khramtsov
645f11d79d
Advertise disco#info and disco#items features in mod_disco
...
Fixes #2470
2018-06-13 14:55:06 +03:00
Holger Weiss
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
Holger Weiss
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
Christophe Romain
4f293751f0
Update mix deps
2018-06-11 14:21:35 +02:00
Evgeniy Khramtsov
6f481e3ceb
Avoid lager crash on external authentication failure
...
Fixes #2463
2018-06-08 09:51:26 +03:00
Holger Weiss
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
Paweł Chmielowski
40185b6bd3
Add ability to modify version string
2018-06-07 15:38:33 +02:00
Evgeny Khramtsov
1de407c420
Merge pull request #2460 from imShara/patch-1
...
OMEMO enable HOWTO added
2018-06-06 20:05:42 +03:00
imShara
815b95c623
OMEMO enable HOWTO added
...
Depend on #2425
2018-06-06 20:03:42 +03:00
Holger Weiss
8e1a13b259
upload_tests: Make size error check stricter
2018-06-04 23:29:24 +02:00
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
43c3134f55
Also format gracefully errors returned during module reload
2018-06-03 18:53:30 +03:00
Paweł Chmielowski
67fc2015de
Fix problem in commit 548ef7b835
2018-06-01 18:36:39 +02:00
Paweł Chmielowski
548ef7b835
Don't crash in bosh when we receive request with RID < prev_rid
2018-06-01 16:12:22 +02:00
Evgeniy Khramtsov
4337300fce
Always display room's xdata in disco#info
2018-06-01 09:07:16 +03:00
Evgeniy Khramtsov
cab8005bf3
Display muc#roomconfig_changesubject in room's disco#info
...
Fixes #2449
2018-06-01 08:56:56 +03:00
Evgeniy Khramtsov
4fc8d1c4a4
Send trailer and close socket explicitly on stream end
2018-06-01 07:58:03 +03:00
Evgeniy Khramtsov
1261502f6a
Improve indentation
2018-05-30 22:53:34 +03:00
Holger Weiss
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
Stu Tomlinson
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
Evgeniy Khramtsov
5e446d50a8
Get rid of direct calls to 'session' Mnesia table
...
Fixes #2439
2018-05-30 19:21:56 +03:00
Evgeniy Khramtsov
22d76659c0
Bump xmpp version in order to support language tags validation
2018-05-30 09:54:26 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
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
Evgeny Khramtsov
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
Licaon_Kter
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
Evgeniy Khramtsov
0381ce1e75
Better report errors of module startup
2018-05-28 09:19:49 +03:00
Evgeniy Khramtsov
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
Holger Weiss
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
Holger Weiss
c6a9c30f1c
mod_push_mnesia: Apply cosmetic changes
...
Improve the readability of the 'max_user_sessions' check.
2018-05-23 21:40:54 +02:00
Holger Weiss
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
Paweł Chmielowski
97f7d99007
Handle "Expect: 100-continue" request header in ejabberd_http
2018-05-23 14:52:47 +02:00
Evgeny Khramtsov
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
Evgeny Khramtsov
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
Rogério da Silva Yokomizo
2e529f5826
Missing #block_item{} record building with mix
...
Ref: #638f2d2
2018-05-22 16:37:39 +02:00
Rogério da Silva Yokomizo
4a4cc32650
Export ext_mod:add_sources/1
2018-05-22 16:16:13 +02:00
Evgeniy Khramtsov
d2114be6f3
Correctly calculate remaining bytes on file upload
2018-05-19 18:29:33 +03:00
Christophe Romain
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
Evgeniy Khramtsov
82c42051c3
Correctly resolve upload.localhost for the test suite
2018-05-17 13:24:23 +03:00
Evgeniy Khramtsov
e4c106e0dd
Add tests for mod_http_upload
2018-05-17 12:02:00 +03:00
Evgeniy Khramtsov
b64e1d95d2
Fix typo file:read() -> file:open()
2018-05-17 12:00:06 +03:00
Paweł Chmielowski
c41bab9ca0
Clean state between requests in ejabberd_http
2018-05-15 14:25:19 +02:00
Evgeniy Khramtsov
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
Badlop
cb3bb710bd
Handle muc_register_nick success correctly ( #2415 )
2018-05-14 12:24:56 +02:00
Evgeniy Khramtsov
c30715e67b
Disable thumbnails creation by default
2018-05-11 18:56:31 +03:00
Evgeniy Khramtsov
27594db029
Support IPv6 connections for PostgreSQL, MySQL and LDAP
...
Fixes #2411
2018-05-11 16:43:49 +03:00
Paweł Chmielowski
6ac8f6eaee
Relax check for valid command name in access_persmissions
2018-05-11 12:24:00 +02:00
Paweł Chmielowski
338d27b45b
Use never version of moka
2018-05-09 10:58:00 +02:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
680384c342
Reduce IQ handler code copying
2018-05-09 10:30:00 +03:00
Evgeniy Khramtsov
11ff2a1ccf
Fix a typo
2018-05-09 09:44:26 +03:00
Evgeniy Khramtsov
3ac1675919
Option watchdog_admins has no effect anymore
2018-05-08 23:47:37 +03:00
Badlop
de85c1718e
Bypass account creation error when password is empty, caused by extauth
2018-05-08 18:19:07 +02:00
Evgeniy Khramtsov
46f47db512
Get rid of unused rebar instructions
2018-05-08 16:17:07 +03:00
Paweł Chmielowski
6811b92a80
Don't use warnings_as_errors in samerlib
2018-05-08 11:37:20 +02:00
Evgeniy Khramtsov
8766854870
Get rid of ?FUNCTION_NAME macro (it's OTP19+ feature)
2018-05-08 12:06:58 +03:00
Evgeniy Khramtsov
61ae0ff02c
Improve logging of external authentication failures
2018-05-08 09:36:34 +03:00
Evgeniy Khramtsov
5522403e8e
Don't stop on out-of-date requests
2018-05-07 22:43:01 +03:00
Evgeniy Khramtsov
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
Paweł Chmielowski
b1a03cc346
Make trusted_proxied ejabberd_http option accept ip masks
2018-05-04 09:53:07 +02:00
Paweł Chmielowski
ca94cbfd31
Teach acl ip matching about ipv4 mapped ipv6 addresses
2018-05-04 09:52:06 +02:00
Holger Weiss
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
Holger Weiss
638f2d2e67
mod_blocking: Use #block_item{} record
2018-05-02 22:17:32 +02:00
Evgeniy Khramtsov
56ee6f0518
Ignore any policy when signing a certificate for the test suite
2018-05-02 10:52:46 +03:00
Evgeniy Khramtsov
4e83fc41d4
Also generate CA certificates for the test suite
2018-05-02 10:28:22 +03:00
Evgeniy Khramtsov
4ea481d1dd
Add validator for 'accept_interval' listening option
2018-04-30 11:52:00 +03:00
Christophe Romain
0bd4d1aade
Update mix.exs version
2018-04-25 12:30:36 +02:00
Paweł Chmielowski
d49aa429ca
Update deps
2018-04-25 10:45:18 +02:00
Christophe Romain
316a19d600
Merge pull request #2399 from 4z3/ejabberdctl-fix-parser
...
ejabberdctl: fix parameters parsing
2018-04-25 10:39:19 +02:00
tv
c43037887a
ejabberdctl: fix parameter parsing
2018-04-25 00:41:30 +02:00
Holger Weiss
538e0d4844
misc: Catch all Base64 decoding errors
2018-04-24 18:29:10 +02:00
Holger Weiss
f3795e9d03
mod_http_upload: Add MIME type for M4A files
2018-04-24 18:16:16 +02:00
Christophe Romain
3df919244c
PubSub purge_node must use a transaction ( #2231 )
2018-04-24 15:58:56 +02:00
Christophe Romain
67773c5174
Merge branch 'master' of github.com:processone/ejabberd
2018-04-24 14:44:58 +02:00
Christophe Romain
61dee97738
Pubsub creation/modification use varchar ( #2397 )
2018-04-24 14:44:52 +02:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
ad6fcc7865
Get rid of useless memory/disk usage warnings
2018-04-24 12:12:48 +03:00
Evgeniy Khramtsov
ca28faa51a
Fix get_affiliation/2
2018-04-24 12:07:10 +03:00
Paweł Chmielowski
5b730cdbf2
Use httpc directly instead of using p1_http wrapper
2018-04-23 17:40:44 +02:00
Paweł Chmielowski
9ed0357760
Use correct headers in rest calls
2018-04-23 12:29:56 +02:00
Evgeniy Khramtsov
06ce884aa8
Add stubs for affiliation-specific backend callbacks
2018-04-23 11:35:43 +03:00
Paweł Chmielowski
3fc0eb4f5b
Use correct db backend for remove_mam_for_user_with_peer
2018-04-20 14:06:23 +02:00
Paweł Chmielowski
3bfa683586
Fix mnesia call in mam archive management function
2018-04-20 13:36:54 +02:00
Paweł Chmielowski
5be49cc0fa
Add commands for cleaning up mam archive
2018-04-20 13:27:46 +02:00
Christophe Romain
42c029d5f7
Fix type of rest:url/2
2018-04-19 13:21:33 +02:00
Christophe Romain
a567abcfdf
Fix deprecated call injected by 265c7b62
2018-04-18 14:16:56 +02:00
Christophe Romain
265c7b62c7
Add flexibility on rest url config
2018-04-18 13:16:08 +02:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
b2855d63a7
mod_http_upload*: Add function specifications
2018-04-16 18:17:28 +02:00
Holger Weiss
0282cf64a0
mod_push: Add function specification
2018-04-16 18:14:07 +02:00
Holger Weiss
e5cb9dad40
mod_push: Add/adjust debug messages
2018-04-16 18:12:46 +02:00
Evgeniy Khramtsov
ec819b4002
Update MUC MAM tests
2018-04-16 16:10:44 +03:00
Evgeniy Khramtsov
acc162f4f4
Carefully validate options list
2018-04-16 15:48:06 +03:00
Evgeniy Khramtsov
b8505f3e78
Don't crash on invalid module's sub-options
...
Fixes #2387
2018-04-16 11:06:57 +03:00
Holger Weiss
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
Evgeniy Khramtsov
a5284229cb
Merge branch 'muc-self-presence'
2018-04-14 18:32:12 +03:00
Evgeniy Khramtsov
d0f36537fb
Clear fast_tls cache on configuration reload
2018-04-13 11:10:20 +03:00
Holger Weiss
3cf4fbc7b0
mod_roster: Use 'lserver' for configuration lookup
2018-04-13 00:12:07 +02:00
Paweł Chmielowski
fe4b1a492c
Fix notification payload generated by pubsub
2018-04-12 18:02:32 +02:00
Paweł Chmielowski
c3b4b4ce4f
Pass access option from websocket to c2s
...
This fixes issue #2223
2018-04-12 17:42:59 +02:00
Paweł Chmielowski
95244c3b6f
Fix csi tests
2018-04-12 17:08:27 +02:00
a-iv
89d91b609a
New schema support for tests. ( #2355 )
2018-04-12 15:42:43 +02:00
Christophe Romain
d28064518b
Improve pubsub#itemreply implementation ( #2325 )
2018-04-12 15:38:12 +02:00
Evgeniy Khramtsov
7627575856
Update the xmpp dependency to support 'parent' attribute
...
Fixes #2375
2018-04-11 09:34:06 +03:00
Christophe Romain
99444f2d0e
Fix illegal match on previous commit
2018-04-10 15:02:03 +02:00
Christophe Romain
4c0f87b2ff
Improve fix for #2288 , don't mask errors on get_item
2018-04-10 14:47:18 +02:00
Holger Weiss
54363f8476
gen_mod: Support global module processes
2018-04-04 18:25:19 +02:00
Holger Weiss
094f586811
gen_mod: Remove frontend process support
...
ejabberd doesn't support frontend processes anymore.
2018-04-04 18:22:59 +02:00
Paweł Chmielowski
45a3c7e0ce
Improve mod_multicast
2018-04-04 12:06:35 +02:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
a2e1f5c882
Move ejabberd_http:url_encode/1 to 'misc' module
2018-04-03 00:12:43 +02:00
Badlop
7f5796fe31
Fix Code format when logging a MUC room kick/ban
2018-04-02 13:51:19 +02:00
Holger Weiss
5f1191b9f5
mod_client_state: Add 'csi_activity' hook
...
Closes #2358 .
2018-04-01 17:13:04 +02:00
Evgeny Khramtsov
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
Pouriya Jahanbakhsh
e17a16a300
fix: run 'component_send_packet' hook in global mode
2018-03-30 23:19:33 +04:30
Pouriya Jahanbakhsh
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
Evgeniy Khramtsov
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
Evgeniy Khramtsov
b283cfa6f2
Remove unused variable
2018-03-29 10:34:09 +03:00
Evgeny Khramtsov
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
Romain DEP.
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
Mickael Remond
ae151927ae
Add support for PATCH http method
...
This is needed to improve out APIs.
2018-03-28 17:34:47 +02:00
Paweł Chmielowski
dfbdffad44
Fix process_discoitems_result in mod_multicast
2018-03-28 11:23:28 +02:00
Paweł Chmielowski
d71bc73271
Update eimp
2018-03-26 16:18:29 +02:00
Evgeniy Khramtsov
ea9c3fd8f7
Fix returning value from mod_vcard_ldap's search() callback
...
Fixes #2335
2018-03-25 10:53:46 +03:00
Christophe Romain
f3b3bffec0
Get rid of 'fs' package dependency in mix
2018-03-23 14:48:17 +01:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
75450a62b3
Clarify the statement about mod_http_upload thumbnails
2018-03-23 16:19:13 +03:00
Evgeniy Khramtsov
a15039638b
Force node config for bookmarks
2018-03-23 16:16:27 +03:00
Evgeniy Khramtsov
50de427570
Set empty least as a default for force_node_config
2018-03-23 16:09:18 +03:00
Evgeniy Khramtsov
55604b2d97
Move force_node_config defaults into ejabberd.yml.example
2018-03-23 16:08:12 +03:00
Paweł Chmielowski
92bc5dc85b
Update mix deps
2018-03-23 13:27:58 +01:00
Christophe Romain
baf2473688
Update mix.exs version
2018-03-23 12:56:17 +01:00
Evgeniy Khramtsov
f5bab5d6c4
Fetch 'registration_watchers' option from the correct module
...
Fixes #2337
2018-03-23 09:42:55 +03:00
Paweł Chmielowski
b23be02dfe
Update deps
2018-03-22 16:15:19 +01:00
Christophe Romain
0bda169a5a
Remove items of unregistered user ( #2129 )
2018-03-22 11:59:24 +01:00
Paweł Chmielowski
96c183c04b
Accept atoms in api_permission command lists and commands with numbers in them
2018-03-21 12:53:46 +01:00
Badlop
b293e99aee
Add option --enable-group=xxx (thanks to andreabenini)( #1429 )
2018-03-20 23:39:07 +01:00
Badlop
b4b3ff50d6
If mod_last is disabled, return error instead of crashing ( #2330 )
2018-03-20 22:18:43 +01:00
Evgeniy Khramtsov
8962397cf3
Report meaningful error when luerl is not available
2018-03-19 20:09:35 +03:00
Evgeniy Khramtsov
b1ecd8ac01
Set -protocol() directive for mod_avatar
2018-03-19 19:23:15 +03:00
Evgeniy Khramtsov
4f1d7c4b66
Avoid logging IP addresses in mod_register when it's not desired
...
Fixes #2326
2018-03-19 18:23:52 +03:00
Evgeniy Khramtsov
bb20e5f3fa
Apply some dirty hacks for mod_shared_roster
...
Probably this fixes #1846
2018-03-19 12:32:43 +03:00
Evgeniy Khramtsov
e1e7986918
Hardcode ACL rules used by ejabberd_web_admin
2018-03-19 12:29:07 +03:00
Christophe Romain
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
Christophe Romain
7beb19b01e
Fix result of XEP-0060 §6.5.9.12 ( #2288 )
2018-03-16 17:48:42 +01:00
Christophe Romain
a84dd0f627
Add transient notification condition ( #2267 )
2018-03-16 17:26:51 +01:00
Christophe Romain
d8f9219b4f
Refactor publish_item conditions ( #2267 )
2018-03-16 17:17:53 +01:00
Evgeniy Khramtsov
ddc29d42de
Fulfill all requirements of XEP-0398 v0.2.0
...
These include:
- Avoid rewriting vcard❌ update tags with empty <photo/> element
- Advertise "urn:xmpp:pep-vcard-conversion:0" feature
2018-03-16 12:10:57 +03:00
Alexey Shchepin
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
Evgeniy Khramtsov
99b41146b1
Get rid of catch-all in mod_pubsub
2018-03-13 22:10:58 +03:00
Evgeniy Khramtsov
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
badlop
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
Badlop
be33c93344
Return errors in admin#add-user command response stanza ( #2321 )
2018-03-12 13:33:44 +01:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
b179874ec6
Add mod_fail2ban to the example config
2018-03-10 21:41:55 +03:00
Evgeniy Khramtsov
c3eeb8624b
Strip duplicates from module's options
2018-03-07 17:46:16 +03:00
Holger Weiss
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
Evgeniy Khramtsov
d9bf5a6865
Don't forget to remove mgmt_force_enqueue flag
2018-03-06 16:18:03 +03:00
Holger Weiss
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
Evgeniy Khramtsov
63dba3fd64
Merge branch 'master' into muc-self-presence
2018-03-03 21:09:27 +03:00
Evgeniy Khramtsov
da1a5036fe
Revert "Support for default values in default_room_opts"
...
This reverts commit 5054a9933f
.
The commit is plain wrong: similar options are not required to
be in pair.
2018-03-03 21:08:05 +03:00
Evgeniy Khramtsov
0d3637d18f
Simplify ejabberd_sup code
2018-03-03 18:05:12 +03:00
oxpa
f2a3118ecc
allow using hashes from "crypto" applications in mod_admin_extra
2018-03-02 04:10:30 -09:00
Badlop
dbf1cabdcd
Fix: mod_offline:store_offline_msg/1 expects a message, not list ( #2312 )
2018-03-02 11:44:10 +01:00
Badlop
ad0fd1eac1
Simplify result of get_room_affiliation command ( #2301 )
2018-03-01 19:45:16 +01:00
badlop
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
Evgeniy Khramtsov
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
Evgeny Khramtsov
b5138a8ddb
Merge pull request #2311 from nosnilmot/validate-listen-opts
...
Validate additional listen opts
2018-02-28 19:37:57 +03:00
Stu Tomlinson
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
Yusro Tsaqova
8a41cfc0f5
add ejabberd_command to get affiliation of a user in MUC room
2018-02-28 20:22:27 +07:00
Badlop
5054a9933f
Support for default values in default_room_opts
2018-02-26 17:22:37 +01:00
Paweł Chmielowski
5912c573ea
Use length on fields in mysql indexes
2018-02-26 09:43:04 +01:00
Paweł Chmielowski
b2095ebcfe
Simplify code for splitting auth string in cyrsasl
...
This may fix problem from issue #2296
2018-02-26 09:36:56 +01:00
Evgeny Khramtsov
0a67cdfb16
Merge pull request #2304 from weiss/run-auth-callbacks-earlier
...
Run SASL result callbacks earlier
2018-02-26 09:04:32 +03:00
Holger Weiss
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
Holger Weiss
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
Evgeny Khramtsov
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
Holger Weiss
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
Evgeny Khramtsov
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
Marc Schink
c1e5ae5308
Move make_rand_string() to 'randoms' module
2018-02-23 18:32:34 +01:00
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
ec0f0f7c72
Move some log messages to debug level
2018-02-21 17:12:50 +03:00
Evgeniy Khramtsov
0acc69e303
Use nicks in disco#items or disco#info report
2018-02-21 10:25:15 +03:00
Evgeniy Khramtsov
4bf4193d55
Add 'negotiation_timeout' to the known options list
2018-02-20 19:47:50 +03:00
Evgeniy Khramtsov
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
Holger Weiss
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
Evgeniy Khramtsov
06c480106f
Don't emit validator's warning if the module is not found
2018-02-19 22:07:09 +03:00
Evgeniy Khramtsov
e070e6bccb
Replace ?MYLANG with connection's language wherever possible
2018-02-19 21:47:20 +03:00
Evgeniy Khramtsov
de49e7631f
Push blocking related IQs from bare JID
...
Fixes #2287
2018-02-18 18:00:20 +03:00
Evgeniy Khramtsov
25abf8b634
Don't inject node name inside "id" attribute
...
Fixes #2284
2018-02-18 11:54:40 +03:00
Evgeniy Khramtsov
ff06bdf144
Don't ask other nodes to invalidate cache when the key is not updated
2018-02-18 09:02:23 +03:00
Evgeniy Khramtsov
d5afc767e6
Fix 'badmatch' crash
...
The crash was introduced in 4b012a99d2
2018-02-17 20:06:50 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
cffdb06b66
Cache 'isuser' queries to external auth program
2018-02-16 20:50:22 +03:00
Evgeniy Khramtsov
f5d208441d
Improve example extauth script
2018-02-16 20:34:09 +03:00
Paweł Chmielowski
71a856deaa
Handle gracefully that mnesia is already loaded when starting tests
2018-02-16 16:49:48 +01:00
Christophe Romain
7e1df0752a
Export helper function
2018-02-16 09:53:38 +01:00
Christophe Romain
f0ccdebf7f
Export helper functions
2018-02-16 09:52:29 +01:00
Evgeniy Khramtsov
32e5a3255d
Export aux functions from mod_muc_room
2018-02-16 08:28:33 +03:00
Evgeniy Khramtsov
c102a45fac
Rename some keys and functions for clarity
2018-02-15 15:50:20 +03:00
Evgeniy Khramtsov
52ded14b7f
Update incoming stanzas counter on invalid XML
2018-02-15 15:42:55 +03:00
Evgeniy Khramtsov
e5ba7c3f3c
Better solution for a previous fix
2018-02-15 10:48:59 +03:00
Evgeniy Khramtsov
51aa9d98a7
Don't forget to add invalid XML responses to sending queue
2018-02-15 10:18:06 +03:00
Evgeniy Khramtsov
a65500b6aa
Fix external components unregistration
2018-02-14 13:09:27 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
516f4d03a1
Fix indentation
2018-02-14 11:42:43 +03:00
Paweł Chmielowski
60a8623929
Change formatting of commands markdown documentation
2018-02-13 16:27:39 +01:00
Christophe Romain
9dbdeba6c1
Add case on create_room, avoid useless call
2018-02-13 11:08:13 +01:00
Evgeniy Khramtsov
4632f5520f
Really run use_cache/1 and cache_nodes/1 callbacks for mod_mam
2018-02-13 11:38:41 +03:00
Evgeniy Khramtsov
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
Evgeny Khramtsov
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
Tobias Koch
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
Evgeniy Khramtsov
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
Evgeniy Khramtsov
11a58f8dff
Bump xmpp version
2018-02-11 09:45:54 +03:00
Evgeniy Khramtsov
97f913b8d9
Merge branch 'master' of github.com:processone/ejabberd
2018-02-10 11:36:48 +03:00
Evgeniy Khramtsov
6c1a1bd000
Rely on use_cache/1 callback in mod_caps
2018-02-10 11:36:39 +03:00
Holger Weiss
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
Evgeniy Khramtsov
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
Evgeniy Khramtsov
5c85106a41
Fix type spec
2018-02-07 22:20:12 +03:00
Badlop
c2911222e4
Commands markdown also lack arguments when policy=user
2018-02-07 16:39:18 +01:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
3327da72a6
Merge branch 'master' of github.com:processone/ejabberd
2018-02-05 15:13:23 +03:00
Evgeniy Khramtsov
c65dcfeda7
Export is_online/1 function
2018-02-05 15:13:13 +03:00
Jérôme Sautret
411d1711a0
Merge pull request #2266 from mieciu/master
...
Fix MySQL ERROR 1170 (42000) 'server_host'
2018-02-05 13:04:25 +01:00
phejman
bef7d1ba66
Fix MySQL error server_host used in key specification without a key length
2018-02-05 12:33:59 +01:00
Evgeniy Khramtsov
c990abf222
Improve log message when module startup has failed
2018-02-02 13:16:14 +03:00
Paweł Chmielowski
983aaac765
Another try to fix travis
2018-01-31 17:54:32 +01:00
Paweł Chmielowski
0f25e59143
Properly escape string in travis config
2018-01-31 17:10:05 +01:00
Paweł Chmielowski
2a77805072
Print something when doing tests in travis, as not doing that get us killed
2018-01-31 17:03:18 +01:00
Paweł Chmielowski
b86402f3e7
Don't run tests in verbose mode on travis
2018-01-31 16:10:09 +01:00
Paweł Chmielowski
f6ebbe4c78
Fix compilation ordering in mix by s/-behavior/-behaviour/
2018-01-31 14:57:43 +01:00
Paweł Chmielowski
485f8e48e5
Fix mod_roster start invocation in elixir tests
2018-01-31 09:34:54 +01:00
Paweł Chmielowski
51f652a1e1
Fix elixir tests
2018-01-30 19:45:12 +01:00
Paweł Chmielowski
fc3c605945
Use correct default when getting list of modules from config
2018-01-30 19:44:27 +01:00
Paweł Chmielowski
69de43d5ee
Remove line left from debugging
2018-01-30 18:37:17 +01:00
Paweł Chmielowski
ad4ffce788
Start ejabberd_config earlier
2018-01-30 18:24:47 +01:00
Paweł Chmielowski
cd82a9d534
Disable riak in travis
2018-01-30 15:31:07 +01:00
Paweł Chmielowski
3b646cc2ec
Run tests only on backends enabled by configure
2018-01-30 15:30:37 +01:00
Paweł Chmielowski
bb58307190
Match all possible values in mod_privilege checks, or we get crashes
2018-01-30 13:10:22 +01:00
Paweł Chmielowski
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
Paweł Chmielowski
b69fb5aae0
Bump sqlite deps version
2018-01-30 12:51:38 +01:00
Paweł Chmielowski
ddf6076328
Fix elixir tests
2018-01-29 18:28:02 +01:00
Paweł Chmielowski
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
Paweł Chmielowski
dc601610b6
Don't return undefined from ejabberd_config:get_myhosts()
2018-01-29 11:05:59 +01:00
Paweł Chmielowski
719dfe12f6
Use named functions instead of carrying self as argument
2018-01-29 10:02:20 +01:00
Paweł Chmielowski
c47366ba97
Restore original return value to ejabberd_config:add_option
2018-01-29 09:46:11 +01:00
Holger Weiss
1b26c8d214
ejabberdctl: Omit redundant erl option
...
The "-detached" flag implies "-noinput".
2018-01-29 01:16:20 +01:00
Holger Weiss
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
Holger Weiss
d0af61f488
mod_caps: Fix indentation
2018-01-29 00:02:15 +01:00
Evgeniy Khramtsov
795efb2ee1
Improve logging of idle s2s connections
2018-01-28 11:10:22 +03:00
Evgeniy Khramtsov
6e5439db5c
Find and fix typos using 'codespell'
2018-01-27 19:35:38 +03:00
Evgeniy Khramtsov
5d582080be
Fix a typo in call to create_captcha()
...
Thanks to Paul Schaub for spotting this
2018-01-26 22:56:49 +03:00
Evgeniy Khramtsov
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
Paweł Chmielowski
7e561dd20a
Fix more tests
2018-01-25 18:43:34 +01:00
Paweł Chmielowski
2afdde84ea
Adopt tests to changes in xmpp
2018-01-25 18:24:05 +01:00
Evgeniy Khramtsov
2269d290d8
Switch to newer fast_xml and xmpp and update record fields in the code
2018-01-25 20:02:47 +03:00
Paweł Chmielowski
56d4224e08
Handle ignore from xmpp_socket callback start
...
This should help with issue #2244
2018-01-24 17:32:24 +01:00
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
1f6c0022dd
Fix a typo in mod_caps
2018-01-23 23:20:10 +03:00
Paweł Chmielowski
6cdb7b4468
Fix tag used in luerl dependency
2018-01-23 09:37:46 +01:00
Evgeniy Khramtsov
a917f4d451
Merge branch 'mod-default-options'
2018-01-23 11:00:00 +03:00
Evgeniy Khramtsov
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
Christophe Romain
121d12f4d1
Move luerl as optional tools dependency
2018-01-22 17:42:27 +01:00
Christophe Romain
7abd13974b
Remove deps override on mix
2018-01-22 17:42:02 +01:00
Holger Weiss
ae86af9399
Merge remote-tracking branch 'processone/pr/2238'
...
* processone/pr/2238:
Fix typo /this/it/
2018-01-21 15:05:05 +01:00
Licaon_Kter
a0c8cac1b6
Fix typo /this/it/
2018-01-21 13:44:30 +00:00
Holger Weiss
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
Evgeniy Khramtsov
c0ef054f6f
Do not try to start ezlib application too frequently
...
This may overload Erlang applicaton controller
2018-01-16 18:06:31 +03:00
Evgeniy Khramtsov
d35a8805b0
Return debug message back
2018-01-16 17:57:21 +03:00
Christophe Romain
1daa7ef785
Sync mix and rebar for eimp dep
2018-01-16 11:45:29 +01:00
Evgeniy Khramtsov
7b0fa7e6e2
Improve validation of 'convert' option
2018-01-16 01:06:20 +03:00
Christophe Romain
8bdccc25ab
Include acme deps in release, fixes f2c3fe8ac
2018-01-15 22:21:24 +01:00
Paweł Chmielowski
59b7c89944
Use correct name of new rebar command
2018-01-15 15:21:04 +01:00
Paweł Chmielowski
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
Paweł Chmielowski
99f8e58eaf
Use override syntax that rebar3 accepts
2018-01-15 11:56:20 +01:00
Evgeniy Khramtsov
d3aab2ea18
Get rid of a call to misc:have_eimp()
2018-01-15 13:14:51 +03:00
Evgeniy Khramtsov
b970c88941
Merge branch 'master' of github.com:processone/ejabberd
2018-01-15 13:00:19 +03:00
Evgeniy Khramtsov
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
Paweł Chmielowski
be592c9272
Don't report errors when trying to remove not existing files in make install
2018-01-15 10:38:36 +01:00
Paweł Chmielowski
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
Evgeny Khramtsov
d2427c98c3
Merge pull request #2221 from licaon-kter/patch-1
...
Fix example config macro names
2018-01-14 09:54:22 +03:00
Licaon_Kter
84819ba0fe
Fix example config macro names
...
These were missed in c26b56679e (diff-19e0c10699732f76181f70cfbec95d38)
I guess.
2018-01-13 21:38:01 +00:00
Evgeniy Khramtsov
f66a004821
Improve logging of failed s2s EXTERNAL authentication
2018-01-13 13:01:40 +03:00
Paweł Chmielowski
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
Paweł Chmielowski
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
Christophe Romain
f2c3fe8ac6
Add mix dependencies for acme support
2018-01-12 12:28:31 +01:00
Evgeniy Khramtsov
1c1b12fc64
Note about direct-tls connections in example config
2018-01-12 10:27:33 +03:00
Paweł Chmielowski
1825cfaf05
Include newly releases fast_tls/esip/stun in mix.lock
2018-01-11 14:38:54 +01:00
Paweł Chmielowski
b8319c6617
Update mix.lock
2018-01-11 11:20:07 +01:00
Paweł Chmielowski
9e3a000748
Update deps
2018-01-11 11:11:56 +01:00
Christophe Romain
d6e1bc242c
Remove old docker specs
2018-01-11 10:19:56 +01:00
Christophe Romain
465629d458
Prepare mix for 18.01
2018-01-10 23:06:06 +01:00
Christophe Romain
7875cac786
Update mix deps
2018-01-10 18:14:52 +01:00
Paweł Chmielowski
d0bfcbbfd8
Handle error case from code:lib_dir in ResolveDepPath in rebar.config.script
2018-01-10 16:34:16 +01:00
Christophe Romain
88e6f1c6aa
Update mix deps
2018-01-10 12:07:19 +01:00
Paweł Chmielowski
cea5f14e88
Update deps again
2018-01-10 11:55:34 +01:00
Christophe Romain
8641c6cb34
Update mix deps
2018-01-10 11:48:53 +01:00
Paweł Chmielowski
e04b4c52fd
Update deps
2018-01-10 11:32:11 +01:00
Christophe Romain
1fac3e58b3
Fix indentation in commented example
2018-01-10 11:24:09 +01:00
Christophe Romain
f914c61f42
Report fs not suported on SunOS ( #2204 )
2018-01-10 10:58:47 +01:00
Paweł Chmielowski
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
Mickaël Rémond
8a05c4ee27
Create CODE_OF_CONDUCT.md
2018-01-09 14:17:55 +01:00
Evgeniy Khramtsov
e822ce3554
Merge branch 'master' of github.com:processone/ejabberd
2018-01-08 13:45:21 +03:00
Evgeniy Khramtsov
aa9f2e5b88
Ignore result of sending stream trailer in test suite
2018-01-08 13:45:08 +03:00
Paweł Chmielowski
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
Paweł Chmielowski
2b0cc2ddb4
Make all install target rules as .PHONY
2018-01-08 11:11:50 +01:00
Paweł Chmielowski
3f8eff27fa
Refactor code for installing binaries
2018-01-08 11:11:50 +01:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
150f33b39b
Update copyright dates in header files
2018-01-06 14:01:45 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
ee23b688a7
Use TLS defaults from fast_tls
2018-01-06 13:46:02 +03:00
Evgeniy Khramtsov
cdc7c1d1ed
Update copyright dates
2018-01-05 23:18:58 +03:00
Evgeniy Khramtsov
da2353d996
Refer to new fast_tls version
2018-01-05 17:56:32 +03:00
Evgeniy Khramtsov
fb07c9929a
Return `true` or `false` from send() callback
...
Fixes #2209
2018-01-05 12:15:28 +03:00
Evgeny Khramtsov
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
Paweł Chmielowski
4c799528c7
Fix ejabberd command privacy_set
...
This fixes issue #2205
2018-01-04 14:57:36 +01:00
Holger Weiss
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
Marc Schink
264add87fa
mod_proxy65: Expand @HOST@ keyword in 'hostname' option
2018-01-03 22:31:06 +01:00
Holger Weiss
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
Mickael Remond
1fcb6d7f36
Make mysql and pgsql one of the default module for Mix
2017-12-29 17:22:59 +01:00
Mickael Remond
4ae688605f
Regenerated mix.lock file
2017-12-29 17:18:59 +01:00
Evgeniy Khramtsov
485100f907
Merge branch 'master' of github.com:processone/ejabberd
2017-12-28 21:37:19 +03:00
Evgeniy Khramtsov
240977a0da
Repair hosts check during certfiles validation
2017-12-28 21:36:57 +03:00
Christophe Romain
cdc9c93b9b
Fix stun/esip mix deps
2017-12-28 15:38:24 +01:00
Evgeniy Khramtsov
529d6d8a93
Return default certificate on domain mismatch
2017-12-28 17:24:23 +03:00
Christophe Romain
dd9281da13
Let mix pass compile ejabberd as dependency
2017-12-28 15:16:29 +01:00
Christophe Romain
1b8794c991
Update mix spec
2017-12-28 14:43:13 +01:00
Paweł Chmielowski
48c96dc1a9
Update stun and esip
2017-12-28 14:34:50 +01:00
Christophe Romain
439fe0b504
Fix check_opt_range when no boundary is configured
2017-12-28 13:51:26 +01:00
Evgeniy Khramtsov
e03d41647b
Merge branch 'master' of github.com:processone/ejabberd
2017-12-28 14:01:39 +03:00
Evgeniy Khramtsov
23c5fd9a4f
Return send() result to the caller
2017-12-28 14:01:34 +03:00
Christophe Romain
08e54dd621
Don't force rsm when max_items is not defined ( #2189 )
2017-12-28 11:48:54 +01:00
Christophe Romain
8918227fc3
Revert "Include os_mon application"
...
This reverts commit 56241feb58
.
That was a mistake, breaking application start
2017-12-28 10:32:21 +01:00
Paweł Chmielowski
5ba13df519
Revert "Start os_mon application"
...
This reverts commit 82b3bbf360
.
2017-12-27 17:21:17 +01:00
Evgeniy Khramtsov
dd4d45fd28
Fix a regression in xmpp_socket
2017-12-27 18:49:25 +03:00
Paweł Chmielowski
82b3bbf360
Start os_mon application
2017-12-27 16:23:04 +01:00
Paweł Chmielowski
d59d4e27ec
Adopt tests to changes introduced by b54e1e49ba
2017-12-27 16:16:15 +01:00
Paweł Chmielowski
e6d1ff85f1
Use bare jid when processing roster subscriptions
2017-12-27 16:14:47 +01:00
Christophe Romain
ef6af11f17
Rename mnesiadb
2017-12-27 12:42:55 +01:00
Christophe Romain
6bdf29676c
Add missing application building with mix
2017-12-27 12:33:52 +01:00
Christophe Romain
56241feb58
Include os_mon application
2017-12-27 12:28:13 +01:00
Christophe Romain
9fcc12dca7
Prepare mix for 17.12
2017-12-27 11:42:37 +01:00
Evgeny Khramtsov
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
Evgeniy Khramtsov
812acf0688
Update the test suite to support new XMPP socket API
2017-12-27 08:55:14 +03:00
Holger Weiss
60b6a508e0
Forget old access/shaper rules and ACLs on reload
2017-12-26 19:37:11 +01:00
Alexey Shchepin
34d09018a7
Add new schemas for SQLite and MySQL
2017-12-26 20:48:15 +03:00
Evgeniy Khramtsov
7cdc51becd
Merge branch 'no-more-ejabberd-receivers'
...
Conflicts:
rebar.config
2017-12-26 19:02:54 +03:00
Evgeniy Khramtsov
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
Christophe Romain
514df9ac18
Cleanup rebar.config
2017-12-26 11:16:48 +01:00
Christophe Romain
a8c3ed5ed4
Remove obsolete option
2017-12-26 11:13:47 +01:00
Christophe Romain
e7308b7d86
Update dependencies
2017-12-26 11:13:18 +01:00
Evgeniy Khramtsov
4e49919d16
Revert "Don't set twice"
...
This reverts commit 6dca89f616
.
2017-12-25 08:41:51 +03:00
Evgeniy Khramtsov
9ba471e210
Fix a typo in comment :)
2017-12-24 12:53:50 +03:00
Evgeniy Khramtsov
6dca89f616
Don't set twice
2017-12-24 12:34:47 +03:00
Evgeniy Khramtsov
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
Holger Weiss
b54e1e49ba
Don't let privacy list prevent local roster update
2017-12-23 22:45:01 +01:00
Holger Weiss
5e4c547856
mod_muc_admin: Fix last timestamp retrieval
2017-12-22 14:32:47 +01:00
Badlop
50b19b47e0
Fix commands rooms_unused_list and _destroy
2017-12-21 17:00:43 +01:00
Christophe Romain
a3083b5d71
Fix race between join_cluster and ejabberd_mnesia ( #2079 )
2017-12-21 14:07:29 +01:00
Paweł Chmielowski
32ad7d3761
Disable test for now
2017-12-21 11:49:33 +01:00
Paweł Chmielowski
7f073fbcd8
Update expected error type in test
2017-12-21 11:43:09 +01:00
Christophe Romain
826387446a
Let mix aware of unpackaged hex.pm dependencies ( #2170 )
2017-12-21 11:10:56 +01:00
Christophe Romain
af9183cd54
Add pubsub#multi-items to features list ( #2162 )
2017-12-20 11:54:12 +01:00
Christophe Romain
242c3c1da5
Fix mix_sql features and options
2017-12-20 11:53:18 +01:00
badlop
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
Holger Weiss
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
Evgeniy Khramtsov
08ce16f7ca
Change loglevel of TLS failures
2017-12-19 15:33:30 +03:00
Christophe Romain
051e1be832
send_direct_invitations accepts only user jids
2017-12-19 10:24:07 +01:00
Evgeniy Khramtsov
9bccac03f5
Set disk_almost_full_threshold to 99%
2017-12-19 09:55:19 +03:00
Evgeniy Khramtsov
c9333f247a
Don't crash on malformed IQ
...
Fixes #2175
2017-12-19 09:15:35 +03:00
Evgeniy Khramtsov
c658f871a5
Log a warning when a disk is almost full
2017-12-18 12:30:10 +03:00
Evgeniy Khramtsov
a0607f6740
Disable default alarm handler
2017-12-18 12:15:49 +03:00
Evgeniy Khramtsov
47c2118fa7
Handle also process_memory_high_watermark alarm
2017-12-18 10:41:11 +03:00
Evgeniy Khramtsov
59f4efe3dd
Kill and restart lager when it's overloaded
2017-12-17 21:03:40 +03:00
Evgeniy Khramtsov
bd1ff0e897
Fix processing order
2017-12-17 20:19:44 +03:00
Evgeniy Khramtsov
5b42fc1d0d
Avoid excessive logging of SQL failures
2017-12-17 19:46:55 +03:00
Evgeniy Khramtsov
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
Evgeny Khramtsov
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
Holger Weiss
5968bc9318
Send last PEP items to owner on initial presence
...
Closes #2112 .
2017-12-13 18:59:06 +01:00
Christophe Romain
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
Evgeniy Khramtsov
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
Christophe Romain
42932fd19e
PubSub: Add missing Nidx building records from sql result
2017-12-13 11:35:36 +01:00
Angelo Chan
b204f9349f
add muc_online_room_by_regex to mod_muc_admin to filter list online rooms
2017-12-13 11:07:12 +08:00
Holger Weiss
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
Christophe Romain
57e3f49352
Merge pull request #2160 from weiss/publish-options
...
Support pubsub#publish-options PRECONDITIONs
2017-12-12 10:53:17 +01:00
Holger Weiss
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
Christophe Romain
47f6fc8dd2
Revert removal of certfile option on http listener
2017-12-11 11:00:24 +01:00
Christophe Romain
42b2e6c5ab
Update example configuration
2017-12-11 10:27:48 +01:00
Evgeniy Khramtsov
303eea5e4d
Fix typos in mod_legacy_auth and mod_register
2017-12-11 10:00:16 +03:00
Evgeniy Khramtsov
bd064fa3fc
Use xmpp:try_subtag/2 wherever possible
2017-12-11 09:46:26 +03:00
Randy Barlow
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
Evgeniy Khramtsov
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
Evgeniy Khramtsov
614bd9dd72
Better process subtag decoding errors
2017-12-09 22:39:43 +03:00
Evgeniy Khramtsov
e15a9a2b9e
Log warning on empty wildcard paths
2017-12-08 12:50:10 +03:00
Evgeniy Khramtsov
f1ac793d56
Don't call pkix_is_self_signed/1 too frequently
2017-12-07 17:24:34 +03:00
Evgeniy Khramtsov
97c9058246
Eat less memory during building certificates graph
2017-12-07 16:41:49 +03:00
Evgeniy Khramtsov
a820d735c0
Replace s2s_cafile with ca_file in ejabberd.yml.example
2017-12-07 14:58:58 +03:00
Evgeniy Khramtsov
a303373b0f
Speedup certificate chains creation and validation
2017-12-07 14:32:12 +03:00
Paweł Chmielowski
d8ace67a50
Compile sql_pt early
2017-12-07 10:47:30 +01:00
Evgeniy Khramtsov
344a2611f2
Avoid infinite loop between self-signed certs
2017-12-07 00:29:19 +03:00
Holger Weiss
c2b22bd6c1
mod_muc_room: Fix typo
...
Thanks to Evgeniy for spotting this.
2017-12-06 16:50:45 +01:00
Evgeniy Khramtsov
abeee837fc
Bump xmpp and fast_xml revisions
2017-12-06 18:36:04 +03:00
Evgeniy Khramtsov
7a9d2cabc0
Improve code using new xmpp API
2017-12-06 17:21:57 +03:00
Evgeniy Khramtsov
e4a4839880
Use ejabberd_cluster:send() in SM/C2S
2017-12-06 14:15:20 +03:00
Holger Weiss
ab2a90181c
mod_offline: Always ignore groupchat messages
2017-12-02 21:35:09 +01:00
nosnilmot
bca87e2c89
Set executable permission on mac_listener when installing ( #2138 )
2017-12-01 17:28:31 +01:00
Holger Weiss
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
Holger Weiss
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
Christophe Romain
395b74a89f
Windows does not have /tmp, fallback to /home/chris/conf
2017-11-30 15:32:09 +01:00
Christophe Romain
a5849a0dab
Fix num_subscribers on node metadata ( #2122 )
2017-11-30 15:27:34 +01:00
Alexey Shchepin
8639da0e00
Fix session table cleanup
2017-11-30 13:31:23 +03:00
Alexey Shchepin
cf67b9ec54
Add missed server_host column in pg.new.sql
2017-11-30 13:08:38 +03:00
Evgeniy Khramtsov
ddaa8c7c1d
Merge branch 'master' of github.com:processone/ejabberd
2017-11-27 13:09:53 +03:00
Paweł Chmielowski
b072342aa9
Adapt test to changed error
2017-11-27 11:12:46 +01:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
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
Evgeniy Khramtsov
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
Christophe Romain
cf8e70abc8
Fix minor typo in comment
2017-11-24 17:17:48 +01:00
Evgeniy Khramtsov
5676adff30
Get rid of unused variable compile warning
2017-11-24 12:11:01 +03:00
Evgeniy Khramtsov
e31f6409a6
Fix function clause on filelib:wildcard/1
2017-11-24 12:10:03 +03:00
Evgeniy Khramtsov
a57c694f21
Fix SQL serialization
...
The regression is introduced in 11829906ac
Fixes #2121
2017-11-24 09:45:22 +03:00
Badlop
0e5b343f1b
Add Id attribute in stanza built by send_message command
2017-11-23 17:14:39 +01:00
Evgeniy Khramtsov
25f7f974b9
Use ejabberd_pkix API in mod_sip
2017-11-23 11:09:40 +03:00
Evgeniy Khramtsov
fbd6ea8a48
Move 'certfile' based options in a single place
2017-11-23 11:04:47 +03:00
Evgeniy Khramtsov
3a02c4369f
Get rid of meaningless log message
2017-11-22 10:12:49 +03:00
Alexey Shchepin
19975962ea
Fix a bug introduced in the previous commit in ejabberd_sql_pt
2017-11-20 15:14:44 +03:00
Evgeniy Khramtsov
6a0e24fb14
Update URL to IM Observatory
2017-11-20 15:07:06 +03:00
Evgeniy Khramtsov
e9e56ed183
Add notes about s2s_cafile
2017-11-20 15:02:24 +03:00
Paweł Chmielowski
6686a64d5f
Fix filtering of rebar list-deps
2017-11-20 12:51:19 +01:00
Evgeniy Khramtsov
c26b56679e
Modernize the example config a bit
2017-11-20 13:34:16 +03:00
Paweł Chmielowski
98b411523d
Update deps
2017-11-20 10:42:05 +01:00
Paweł Chmielowski
4b9d299e90
Make update-deps-releases.pl work with older perl
2017-11-20 10:41:52 +01:00
Evgeniy Khramtsov
49c4aa238f
Change file mode of ACME certficates
2017-11-19 10:10:21 +03:00
Evgeniy Khramtsov
e709d6561c
Re-read ACME certificates on config reload
2017-11-19 09:56:05 +03:00
Evgeniy Khramtsov
f06805534c
Fix renew_certificates ejabberdctl command
...
Thanks to Konstantinos Kallas
2017-11-17 18:37:49 +03:00
Evgeniy Khramtsov
3202b7a9a1
Log a message when a user gets registered
2017-11-17 18:02:12 +03:00
Evgeniy Khramtsov
4f12359b9c
Don't forget to include intermediate ACME certificate
...
Thanks to Konstantinos Kallas
2017-11-17 17:17:19 +03:00
Evgeniy Khramtsov
f599c2ef82
Fix ACME options validation
2017-11-17 15:55:33 +03:00
Badlop
b2680a776b
Prepare user and host arguments in get_user_rooms command ( #2064 )
2017-11-17 13:23:27 +01:00
Paweł Chmielowski
b67a114ef5
Fix elixir tests
2017-11-17 12:19:26 +01:00
Evgeniy Khramtsov
224a3e13c9
Improve ACME options validation
2017-11-17 13:06:04 +03:00
Evgeniy Khramtsov
382fb62f29
Merge branch 'master' of github.com:processone/ejabberd
2017-11-17 12:50:38 +03:00
Paweł Chmielowski
b6b70ec0d4
Switch riak backend to leveldb on travis
2017-11-17 10:54:28 +01:00
Evgeniy Khramtsov
4835537776
Move ejabberdctl ACME commands to other location
2017-11-17 12:50:27 +03:00
Evgeniy Khramtsov
ce98226603
Make ACME code working with ejabberd_pkix
2017-11-17 11:59:40 +03:00
Paweł Chmielowski
c05626a1ba
Fix sed invocation that was incompatible with FreeBSD sed
2017-11-17 09:50:24 +01:00
Christophe Romain
514c25caef
PubSub: PEP services must send notifications to the account owner ( #2108 )
2017-11-16 15:31:28 +01:00
Christophe Romain
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
Christophe Romain
44700d91ba
PubSub: Cleanup tree requests, rename pubsub_node.type->pubsub_node.plugin
2017-11-16 11:38:04 +01:00
Evgeniy Khramtsov
2531f37e5c
Let validator know about c2s_dhfile
2017-11-16 00:40:36 +03:00
Christophe Romain
62aab0fce4
Fix select_type race on plugin_init
2017-11-15 19:04:47 +01:00
Christophe Romain
e706e24b92
Cleanup pubsub subscriptions quering, fix pep case
2017-11-15 11:16:15 +01:00
Evgeniy Khramtsov
11ee896f10
Improve ACME description
2017-11-15 12:57:53 +03:00
Evgeniy Khramtsov
1f21f64d5f
Improve some error log messages
2017-11-15 11:54:38 +03:00
Evgeniy Khramtsov
ebb97bec44
Fix mod_mam reloading
2017-11-15 11:23:22 +03:00
nosnilmot
0c6ef98d01
Avoid badarg error when running get-deps before ./configure has created src/ejabberd.app ( #2103 )
2017-11-15 09:21:05 +01:00
Holger Weiss
6cd3867197
Makefile.in: Fix "make clean && make"
2017-11-15 08:50:40 +01:00
Evgeniy Khramtsov
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
Holger Weiss
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
Holger Weiss
75f150f7ae
mod_mam: Simplify 'message_is_archived' callback
2017-11-15 00:36:07 +01:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
06d4f1ff33
mod_mam: Add a few function specifications
2017-11-14 22:58:16 +01:00
Holger Weiss
5ae23a7301
mod_mam: Apply minor cosmetic changes
2017-11-14 22:36:46 +01:00
Holger Weiss
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
Evgeniy Khramtsov
054413d8f4
Halt ejabberd if the top supervisor fails to start
2017-11-14 18:41:28 +03:00
Konstantinos Kallas
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
Evgeniy Khramtsov
f953621ed2
Use xmpp:io_format_error/1 wherever possible
2017-11-14 09:02:43 +03:00
Christophe Romain
474536817e
Implement parentnodes seek for hometree ( #1921 )
2017-11-13 18:13:31 +01:00
Christophe Romain
daed6a05a6
Rewrite pubsub export to sql ( #1571 )
2017-11-13 17:34:37 +01:00
Evgeniy Khramtsov
9daf2dd925
Assign failed_auth ETS table to another owner
2017-11-13 14:34:59 +03:00
Evgeniy Khramtsov
1413f5dd23
Fix a record default
2017-11-13 11:29:03 +03:00
Evgeniy Khramtsov
b06adf1df2
Get rid of forgotten debug message
2017-11-13 11:26:49 +03:00
Evgeniy Khramtsov
11829906ac
Properly store <subject/> element
...
Fixes #2099
2017-11-13 11:25:35 +03:00
Konstantinos Kallas
78f494dd2e
Configuration file changes
...
Explain the acme configuration options
2017-11-11 15:38:47 +02:00
Evgeniy Khramtsov
76e9555d55
Improve some type specs
2017-11-11 09:33:42 +03:00
Evgeniy Khramtsov
e77172a784
Improve a diagnostic text
2017-11-11 09:30:19 +03:00
Evgeniy Khramtsov
675a1e0b0f
Fix a test related to mod_caps
2017-11-10 20:58:13 +03:00
Holger Weiss
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
Christophe Romain
5c6a37b20f
Cleanup some headers
2017-11-10 17:51:22 +01:00
Evgeniy Khramtsov
50b3206f06
Add forgotten type specs
2017-11-10 18:11:04 +03:00
Evgeniy Khramtsov
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
Evgeny Khramtsov
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
Holger Weiss
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
Paweł Chmielowski
e47b016e76
Add fs as dep in mix.exs
2017-11-09 09:59:49 +01:00
Holger Weiss
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
Holger Weiss
9c174e30b2
mod_mam: Fix indentation
2017-11-09 01:00:15 +01:00
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
902c6d476b
Prepare version 0.6.1 of XEP-0313 (MAM) support
2017-11-08 15:15:39 +03:00
Holger Weiss
74749f5dbb
ejabberdctl: Fix 'read' syntax for non-bash shells
2017-11-07 21:23:48 +01:00
Evgeniy Khramtsov
fe9b191382
Erase transient certificates on exit
2017-11-07 09:04:20 +03:00
Holger Weiss
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
Badlop
cbbfe32d8b
Unregister commands when stopping node only if it's last one ( #2083 )
2017-11-06 16:53:49 +01:00
Paweł Chmielowski
7121a95428
Define flags that depend on erlang version in mix.exs
2017-11-06 12:40:00 +01:00
Holger Weiss
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
Paweł Chmielowski
7d8ad17fa1
Remove code left from debugging
2017-11-03 16:11:34 +01:00
Alexey Shchepin
44293235e5
Simulate vars usage in ejabberd_sql_pt to avoid unused var warnings
2017-11-03 17:43:21 +03:00
Paweł Chmielowski
ec3ea61585
Don't start hosts for disabled backends from CT_BACKENDS passed to make test
2017-11-03 14:44:13 +01:00
Paweł Chmielowski
90e1f3f29d
Use correct table field name in sql query
2017-11-03 12:17:34 +01:00
Badlop
2060022b19
Remember previous German translator
2017-11-03 10:16:21 +01:00
badlop
681d81bdcc
Merge pull request #2081 from nekoswag/master
...
updated German translation
2017-11-03 09:56:19 +01:00
Evgeniy Khramtsov
c72e0a6ca6
Log warnings for c2s/s2s certfile option
2017-11-03 08:32:34 +03:00
Konstantinos Kallas
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
Alexey Shchepin
79a9a0ed29
Disable server_host warnings
2017-11-02 19:48:35 +03:00
Alexey Shchepin
78dfb832b8
Add SQL_INSERT macro and update SQL queries to use server_host field
2017-11-02 18:21:40 +03:00
Paweł Chmielowski
354a710e70
Fix pkix:validate() return value
2017-11-02 11:28:23 +01:00
Maximilian Trummer
8eb1e5c68c
updated de.po
2017-11-01 18:22:27 +01:00
Evgeniy Khramtsov
a22aad0a4b
Remove -include() directive for unused header
2017-11-01 10:59:28 +03:00
Evgeniy Khramtsov
ae07fd7f10
Clarify some error/warning messages
2017-11-01 10:14:34 +03:00
Evgeniy Khramtsov
86809dff06
Avoid using "bag" ETS type for certificate storage
2017-11-01 08:47:07 +03:00
Evgeniy Khramtsov
35dc164233
Start even if there are problems with fs application
2017-11-01 08:34:14 +03:00
Evgeniy Khramtsov
170be1fbd5
Lower log level
2017-11-01 00:55:05 +03:00
Evgeniy Khramtsov
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
Paweł Chmielowski
efc4996625
Fix sql query
2017-10-31 17:59:55 +01:00
Paweł Chmielowski
88558453fb
Typo
2017-10-31 17:11:17 +01:00
Paweł Chmielowski
ee2b5be7f4
Use store_room where possible
2017-10-31 16:12:35 +01:00
Paweł Chmielowski
ce98843dd4
Fix sql syntax error in lite.sql
2017-10-31 14:43:36 +01:00
Paweł Chmielowski
5f2e33bdd0
Don't use depraced functions
2017-10-31 14:21:34 +01:00
Christophe Romain
0452ffc1df
Optimize muc subscriptions handling
2017-10-31 14:00:41 +01:00
Christophe Romain
e24e05c6af
Enforce module_name/1
2017-10-31 12:06:40 +01:00
Christophe Romain
e697a3e262
Add missing type conversion from 675cc3e
2017-10-31 11:59:53 +01:00
Christophe Romain
8cb71255eb
Do not bind unused tail from 675cc3e
2017-10-31 11:25:01 +01:00
Christophe Romain
675cc3e0ea
Allow auth and pubsub plugin to use Elixir module
2017-10-31 11:04:32 +01:00
Paweł Chmielowski
5f0a84a331
Show real jid in mucsub subscription change events
2017-10-30 17:54:55 +01:00
Paweł Chmielowski
9b8ae80dab
Improve --enable-system-deps
2017-10-30 13:55:10 +01:00
Paweł Chmielowski
0633dd5802
Fix last commit
2017-10-30 13:27:37 +01:00
Paweł Chmielowski
2b363c7aee
Add mucsub event for subscribers list changes
2017-10-30 12:34:09 +01:00
Evgeny Khramtsov
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
Holger Weiss
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
Christophe Romain
dbdda745af
Delete cached item on node removal ( #2071 )
2017-10-27 21:16:25 +02:00
Badlop
df86ecdd87
Update Greek translation (thanks to James Iakovos Mandelis)
2017-10-27 15:39:48 +02:00
Alexey Shchepin
e1c8e88d87
Update SQL archive index to match mysql.sql
2017-10-27 15:20:29 +03:00
Evgeniy Khramtsov
b6c88fb17e
Fix typespec
2017-10-27 12:05:05 +03:00
Evgeniy Khramtsov
24df1262bb
Don't store xdata() in Mnesia table
2017-10-27 11:46:37 +03:00
Evgeniy Khramtsov
484e5de072
Simplify backend interface for mod_push
2017-10-27 10:55:48 +03:00
Evgeniy Khramtsov
568ab526e2
Improve ejd2sql logging
2017-10-27 08:59:49 +03:00
Evgeniy Khramtsov
a8238d6a54
Fix typo
2017-10-27 08:12:24 +03:00
Evgeniy Khramtsov
9eb2685f90
Make it possible to export push_session table to SQL
2017-10-26 21:05:09 +03:00
Evgeniy Khramtsov
db57394399
Add SQL support for mod_push
2017-10-26 20:11:43 +03:00
PaweÅ Chmielowski
88928c0149
Adopt 'make install' to updated output from 'rebar list-deps'
2017-10-26 11:21:41 +02:00
Evgeniy Khramtsov
2161063e5e
Don't forget to convert ljid() to jid()
2017-10-26 10:29:23 +03:00
Evgeniy Khramtsov
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
Christophe Romain
3162ec0d66
Allow dynamic node options on sql backends
2017-10-25 15:40:42 +02:00
Badlop
e4054aab79
Get next record before deleting previous on, in case it's last one ( #2069 )
2017-10-25 12:58:07 +02:00
Christophe Romain
8028a9545a
Cosmetic change, remove useless case
2017-10-25 11:48:56 +02:00
Christophe Romain
7c1b4d0fcd
Fix pubsub test, title not mandatory
2017-10-25 11:41:45 +02:00
Christophe Romain
17e3ed513b
Fix delete item from unregistered user ( #2067 )
2017-10-25 11:16:54 +02:00
Evgeniy Khramtsov
65c85eab03
Fix another typo ;)
2017-10-25 11:47:02 +03:00
Evgeniy Khramtsov
5151136d17
Fix typo
2017-10-25 11:44:53 +03:00
Evgeniy Khramtsov
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
Christophe Romain
8b588d2ff3
Add basic PubSub meta-data support ( #1421 )
2017-10-25 10:34:11 +02:00
Evgeniy Khramtsov
90ee405d81
Mention XEP-0368 support
2017-10-25 10:01:05 +03:00
Christophe Romain
b0fa27395f
Add missing fix from 07a193d4d
, Fix purge_offline ( #2057 )
2017-10-24 15:35:01 +02:00
Evgeny Khramtsov
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
Jorje Barrera
06cd373a18
Support for --enable-graphics in mix.exs
2017-10-24 18:02:52 +08:00
Badlop
46fb2d0f56
Update Hebrew translation (thanks to Genghis Khan)
2017-10-23 16:14:01 +02:00
badlop
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
badlop
5667b4b0f9
Merge pull request #2052 from suchatorg/patch-1
...
Update gl.po
2017-10-16 10:16:54 +02:00
Carlos
91e8249284
Update gl.po
2017-10-14 11:06:03 +02:00
Evgeniy Khramtsov
1bb2bae62b
Reflect changes in the xmpp lib
2017-10-13 20:48:21 +03:00
Evgeniy Khramtsov
152e0d77c1
Send presence-unavailable when expulsing a participant
2017-10-13 09:17:22 +03:00
Badlop
9d6ec1ba12
Fix ZH translation
2017-10-12 12:09:50 +02:00
badlop
0c29f07758
Merge pull request #2047 from fotock/patch-1
...
Update zh translations
2017-10-12 11:44:12 +02:00
Shelley Shyan
7f93b72a1d
Update zh.po
2017-10-12 00:17:32 -05:00
Evgeniy Khramtsov
e5e64c99f3
Don't crash when Host header is missing
2017-10-11 18:53:53 +03:00
Maximilian Trummer
85c703a8f7
updated and extended German translation
2017-10-11 16:56:05 +02:00
Badlop
2832130afc
Update Catalan translation
2017-10-11 16:21:28 +02:00
Shelley Shyan
f751023bd6
Update zh.po
2017-10-11 04:33:14 -05:00
Shelley Shyan
f0a68b85f0
Update zh.po
2017-10-11 01:47:43 -05:00
Evgeniy Khramtsov
02fa719a87
Fix a typo: meta -> viewport
2017-10-10 13:25:38 +03:00
Evgeniy Khramtsov
5a184b0433
Don't include CSS, javascript and image data directly in the code
2017-10-09 23:35:42 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
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
Evgeniy Khramtsov
8513e31498
Update Russian translation
2017-10-06 23:44:50 +03:00
Evgeniy Khramtsov
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
Christophe Romain
0ed210877a
Update French translation
2017-10-06 17:48:56 +02:00
Badlop
a06f1a0ba5
Update Czech translation (thanks to Jan Pinkas)
2017-10-06 13:23:33 +02:00
Badlop
4bd5846d40
More fix in mod_http_fileserver to log URLs with/out query elements ( #2021 )
2017-10-06 13:16:13 +02:00
Paweł Chmielowski
3c7ab13374
Update pl.po
2017-10-06 12:11:14 +02:00
Badlop
df439f27ee
Update Spanish translation
2017-10-06 10:54:36 +02:00
Badlop
d37d43495b
Updated all translation files
...
Simply running:
make; make translations
2017-10-06 10:02:16 +02:00
Evgeniy Khramtsov
6f922275eb
Improve logging of mismatched Hosts
2017-10-05 11:33:29 +03:00
Evgeniy Khramtsov
94de13981b
Log request in access.log even when Host doesn't match
2017-10-05 11:16:05 +03:00
Evgeniy Khramtsov
43e729293a
Don't report Host mismatch as an error
2017-10-05 11:08:58 +03:00
Evgeniy Khramtsov
f3af117108
Correctly handle mod_client_state (re)load
2017-10-05 11:03:36 +03:00
Evgeniy Khramtsov
bd06bc00e2
Accept routes in Host header and map them to vhosts
2017-10-05 10:26:10 +03:00
Christophe Romain
9e95150803
Fix warning when compile with newer elixir
2017-10-04 12:03:36 +02:00
Holger Weiss
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
Holger Weiss
79685da90b
Increase 'max_fsm_queue' default
...
The old default was becoming too small for some workloads.
2017-10-03 01:29:52 +02:00
Badlop
280aa2f1b0
Fix crash in mod_http_fileserver when logging URL with query elements ( #2021 )
2017-10-02 15:36:38 +02:00
Paweł Chmielowski
668d45cbc7
Install binaries with 755 permissions
2017-10-02 11:51:15 +02:00
Paweł Chmielowski
e2f4cb5838
Remove find-outdated-deps script, we have better replacement for it
2017-10-02 11:49:34 +02:00
Evgeniy Khramtsov
6658806820
Generate more readable code for run_fold hooks
2017-10-02 10:47:03 +03:00
Romain DEP.
a7341957f2
config: makes line endings consistent when followed by '-'
2017-09-30 11:12:20 +02:00
Romain DEP.
2cb0cedc6b
config: makes line endings consistent when followed by ':'
2017-09-30 11:10:34 +02:00
Paweł Chmielowski
77a1f728cf
Install eimp binary with +x attribute
2017-09-28 18:34:27 +02:00
Christophe Romain
d576902bd4
Prepare mix for 17.09
2017-09-28 15:21:11 +02:00
Christophe Romain
a3da27e917
Fix race introduced by ffdaff374
on ejabberd_mnesia init
2017-09-28 15:14:11 +02:00
Evgeniy Khramtsov
3f015c829c
Make sure Riak gets compiled on OTP20
2017-09-28 12:25:06 +03:00
Evgeniy Khramtsov
2732c8f6fc
Fix function clause introduced by c17ec50e3a
2017-09-28 12:24:24 +03:00
Evgeniy Khramtsov
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
Christophe Romain
126653e01b
Pubsub: implment '6.5.7 Requesting the Most Recent Items'
2017-09-27 20:54:50 +02:00
Christophe Romain
ce7acafe37
Remove useless condition
2017-09-27 20:40:07 +02:00
Christophe Romain
216a0c97b9
PubSub: add RSM support for mnesia backend
2017-09-27 20:39:54 +02:00
Christophe Romain
3c8308bb8d
PubSub: enforce controls on publish and delete
2017-09-27 17:37:38 +02:00
Holger Weiss
1c6aa5e84e
mysql.sql: Use multi-column index on username/ID
2017-09-27 15:30:23 +02:00
Christophe Romain
609a1d07cf
harden ejabberdctl ( #1977 )
2017-09-27 15:04:57 +02:00
Christophe Romain
8c026582ab
Fix xref error
2017-09-27 12:34:40 +02:00
Christophe Romain
81df1ae3af
Unbind unused variable
2017-09-27 12:13:45 +02:00
Christophe Romain
22435ca562
Remove calls to deprecated functions
2017-09-27 11:43:59 +02:00
Paweł Chmielowski
f464189819
Update dependences
2017-09-27 11:39:16 +02:00
Christophe Romain
89e504c55f
PubSub: fix get_items behaviour with mnesia
2017-09-27 11:18:12 +02:00
Christophe Romain
c1d3d1318e
Merge branch 'master' of github.com:processone/ejabberd
2017-09-27 11:12:09 +02:00
Christophe Romain
d120e0ad91
PubSub: add correct order when requesting all items
2017-09-27 11:12:01 +02:00
Evgeniy Khramtsov
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
Badlop
368ba3fc55
When running "make translations", use the new tools/prepare-tr.sh
2017-09-27 10:57:11 +02:00
Badlop
cd098c5adc
Remove remaining files of old contrib/ dir
2017-09-27 10:57:07 +02:00
Badlop
221e58fff0
Simplify prepare-tr.sh to work with new extract-tr.sh
2017-09-27 10:57:03 +02:00
Badlop
9b043ae276
Move prepare-translations.sh from contrib to tools/prepare-tr.sh
2017-09-27 10:56:58 +02:00
Evgeniy Khramtsov
abc09054e5
Remove forgotten export_all
2017-09-27 11:56:22 +03:00
Christophe Romain
07a193d4dc
PubSub: fix RSM support ( #1994 )(#2Â014)
2017-09-27 10:51:37 +02:00
Christophe Romain
cf09ed2df2
PubSub: fix node_options, default options only apply on first plugin
2017-09-27 09:29:04 +02:00
Holger Weiss
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
Evgeniy Khramtsov
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
Paweł Chmielowski
05feab35c4
Call earlier deps configure scripts durring compilation
2017-09-26 17:32:37 +02:00
Badlop
2198fbce97
Fix command set_last that always returned code 1, error ( #2010 )
2017-09-25 18:43:24 +02:00
Christophe Romain
b8ab80d1f3
Sync containers from rroemhild and add instructions in README ( #1655 )
2017-09-25 17:48:57 +02:00
Evgeniy Khramtsov
30e5c9bd3e
Add mod_avatar to the example configuration
2017-09-25 16:23:02 +03:00
Evgeniy Khramtsov
251756de00
Catch all p1_fsm errors
...
Fixes #2012
2017-09-25 13:01:00 +03:00
Evgeniy Khramtsov
3e987d3bae
Use eimp instead of ImageMagick calls for thumbnails creation
2017-09-25 12:41:12 +03:00
Evgeniy Khramtsov
138cc25355
Pre-install libgd and libwebp
2017-09-25 11:19:49 +03:00
Evgeniy Khramtsov
a15f186253
Remove OTP20 from Travis tests for now
2017-09-25 11:17:46 +03:00
Holger Weiss
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
Evgeniy Khramtsov
d7250111ce
Reuse some translation strings
2017-09-24 14:32:37 +03:00
Evgeniy Khramtsov
adfb924808
Replace translate:mark/1 with ?T() macro
2017-09-24 12:42:35 +03:00
Holger Weiss
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
Evgeniy Khramtsov
c378ea403e
Add script to extract translation strings
2017-09-24 00:08:01 +03:00
Holger Weiss
692ccd2e20
mod_push_mnesia: Fix typo in error message
2017-09-22 23:36:51 +02:00
Badlop
5882c9b456
Add some recommended TLSOPTS as comments in the default config ( #2004 )
2017-09-21 16:28:17 +02:00
Evgeniy Khramtsov
db41643bea
Also replace vcard-x-update in direct presences
2017-09-18 14:17:34 +03:00
Christophe Romain
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
Christophe Romain
cce4056040
Fix iexdebug and iexlive commands ( #1981 )
2017-09-18 13:01:10 +02:00
Christophe Romain
7ad525b542
PubSub: broadcast updated configuration ( #1945 )
2017-09-18 12:48:20 +02:00
Evgeniy Khramtsov
5bf64381cb
Add 'width' and 'height' to avatar info
2017-09-18 09:33:57 +03:00
Evgeniy Khramtsov
f435d0a103
Add GIF support
2017-09-17 17:34:31 +03:00
Evgeniy Khramtsov
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
Christophe Romain
5414cbe821
Add riakc dependency version
2017-09-13 09:49:43 +02:00
Holger Weiss
e6b1521b29
mod_push_keepalive: Remove unused 'db_type' option
2017-09-11 23:48:25 +02:00
Stu Tomlinson
2a7d9d93c8
Quote $PEER in ping command to avoid hostnames containing "-" being interpreted as arithmetic
2017-09-11 15:00:00 +01:00
Evgeniy Khramtsov
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
Badlop
9e35af54e0
The redis_reconnect_timeout was no longer used ( #1983 )
2017-09-07 20:25:20 +02:00
Badlop
d87151aee6
Simple optimization in get_room_occupants_number command ( #1964 )
2017-09-07 18:32:26 +02:00
Evgeniy Khramtsov
4ecd8a0780
Really delete cache on set_data()
...
Fixes #1991
2017-09-07 19:27:48 +03:00
Evgeniy Khramtsov
803c31f760
Always accept messages from local (sub)domains
2017-09-07 13:53:42 +03:00
Evgeniy Khramtsov
978c92f5e1
Fix a typo and improve logging message
2017-09-07 13:41:51 +03:00
Konstantinos Kallas
315e330237
Fix version of jose library
2017-09-06 18:35:33 +03:00
Konstantinos Kallas
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
Badlop
32397aa0c3
Replace example config of drop_chat_states with queue_* in mod_client_state ( #1985 )
2017-09-06 13:48:33 +02:00
Evgeniy Khramtsov
1a58a201f8
Block messages from strangers before mod_mam/mod_offline processing
...
Fixes #1713
2017-09-02 22:54:46 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
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
Badlop
68dee8cbb3
Fix deletion of multiple offline messages using WebAdmin ( #1962 )
2017-08-25 12:44:53 +02:00
Evgeniy Khramtsov
f7e8d287d5
Fix a typo
2017-08-25 12:47:33 +03:00
Konstantinos Kallas
80b44d8c15
Remove some unused variable warnings, replace lists:join with string join
2017-08-25 12:08:16 +03:00
Evgeniy Khramtsov
30bca124f4
Add forgotten caching options to the validator (thanks to Jan Pinkas)
2017-08-24 21:40:54 +03:00
Paweł Chmielowski
d7891a5562
Fix 'make install' to work with new output from rebar list-deps
2017-08-24 11:43:47 +02:00
Badlop
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
Evgeniy Khramtsov
7f3fceb432
Recompile rebar script with OTP17.5
2017-08-23 11:45:10 +03:00
Evgeniy Khramtsov
81581f7794
Use forked repo of Riak Erlang client
2017-08-23 10:35:39 +03:00
Evgeniy Khramtsov
47175adc74
Explicitly match against <domain/resource>
...
Fixes #1958
2017-08-23 09:00:13 +03:00
Evgeniy Khramtsov
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
Konstantinos Kallas
f1ea67817c
More whitespace changes
2017-08-22 14:58:12 +03:00
Konstantinos Kallas
30e729a150
Whitespace change
2017-08-22 14:54:23 +03:00
Konstantinos Kallas
8c56fbc0d8
Remove debugging script
2017-08-22 14:53:38 +03:00
Konstantinos Kallas
a59ccc6c9c
Merge remote-tracking branch 'upstream/master' into lets_encrypt_acme_support
2017-08-22 14:51:21 +03:00
Konstantinos Kallas
62903155fd
Show SANs in list_Certificates
2017-08-22 14:44:19 +03:00
Konstantinos Kallas
25ca6e5582
Acquire certificates for all subdomains of a host and include them in SAN
2017-08-22 13:36:34 +03:00
Konstantinos Kallas
37a54cd498
List the possible ca_urls in example config file
2017-08-22 10:38:33 +03:00
Konstantinos Kallas
6f972fa3fe
Clean run_acme testcase
2017-08-22 10:29:12 +03:00
Konstantinos Kallas
10f7b5a548
Remove partial RSA key support
2017-08-22 10:25:37 +03:00
Konstantinos Kallas
f2876bdad7
Add certfile when acquired
2017-08-22 10:12:42 +03:00
Badlop
05c2995c7a
When creating room, set option to ensure config is set in muc_room table ( #1954 )
2017-08-21 15:58:10 +02:00
Badlop
2fa6e2fd90
Fix crash when destroying room without providing reason ( #1954 )
2017-08-21 15:57:48 +02:00
Konstantinos Kallas
9b3e160e18
Remove some debugging INFO_MSGs
2017-08-19 17:47:05 +03:00
Konstantinos Kallas
15dd88385f
Delete a development acme module
2017-08-19 16:58:06 +03:00
Konstantinos Kallas
f581e391ac
Merge remote-tracking branch 'upstream/master'
2017-08-19 13:42:05 +03:00
Konstantinos Kallas
dd42d52ff9
Merge remove_account_option branch
2017-08-19 13:36:42 +03:00
Konstantinos Kallas
e45f7ddfec
Cleanup some comments:
2017-08-19 13:32:13 +03:00
Konstantinos Kallas
7cc7b74f1e
Add acme certificates for all configured hosts in ejabberd_pkix
2017-08-19 12:50:40 +03:00
Konstantinos Kallas
ddfe8742c7
Add behaviour ejabberd_config in ejabberd_acme in order to validate the config
2017-08-19 11:35:15 +03:00
Holger Weiss
ba9a79c89c
Apply cosmetic changes to previous commit
2017-08-18 16:50:08 +02:00
Holger Weiss
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
Badlop
0b02d42836
Fix mod_multicast start and reading of configured limits ( #1949 )
2017-08-18 14:09:49 +02:00
Evgeniy Khramtsov
ee0a8d2966
Preserve correct order of deserialized XML elements
...
Fixes #1939
2017-08-18 10:20:27 +03:00
Evgeniy Khramtsov
793ca45dda
Add OTP 20.0 to Travis testsing platforms
2017-08-17 22:14:54 +03:00
Evgeniy Khramtsov
6e20e9bcf9
Get rid of deprecated crypto functions
2017-08-17 19:32:15 +03:00
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
9bd099013f
Don't attempt to access(2) a certificate file
...
Fixes #1375
2017-08-17 14:33:41 +03:00
Christophe Romain
68fb12153e
Revert "Temporary remove recent last_item refactor"
...
This reverts commit 1820b4f63b
.
2017-08-14 15:25:45 +02:00
Holger Weiss
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
Christophe Romain
1820b4f63b
Temporary remove recent last_item refactor
2017-08-14 09:43:02 +02:00
Holger Weiss
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
Evgeniy Khramtsov
63aabed320
Apply URL decoding wherever possible
...
Fixes #1936
2017-08-13 19:18:19 +03:00
Konstantinos Kallas
051e2c639c
Change some specs
2017-08-12 18:00:46 +03:00
Konstantinos Kallas
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
Konstantinos Kallas
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
Konstantinos Kallas
73f0b6707a
Move the ca_url to the config file
2017-08-12 15:59:54 +03:00
Christophe Romain
fd7bf7fed3
Fix typo from 9c5427e0c
2017-08-11 17:54:53 +02:00
Konstantinos Kallas
1aadb797b3
Remove the new account option from get certificate. There is no reason for having this
2017-08-11 14:10:55 +03:00
Konstantinos Kallas
7140c8d844
Format expired certificates differently in list_certificates
2017-08-11 13:28:17 +03:00
Christophe Romain
7a90cda8ff
Process on_user_offline only from valid sessions
2017-08-11 12:05:14 +02:00
Evgeniy Khramtsov
35eeaa5869
Fix regression introduced by b82b93f8f0
...
Fixes #1928
2017-08-11 11:43:16 +03:00
Christophe Romain
024713a441
Remove temporary debug
2017-08-11 10:53:19 +02:00
Christophe Romain
32fbfe1981
Use correct c2s process sending PEP with multi devices
2017-08-11 10:32:36 +02:00
Christophe Romain
9c5427e0c2
PubSub: refactor send_last_items remove send_loop
2017-08-11 10:20:33 +02:00
Christophe Romain
8f5a1c4a2a
Merge pull request #1926 from weiss/import-metronome-pep
...
prosody2ejabberd: Support PEP import
2017-08-11 10:19:17 +02:00
Holger Weiss
7d3609d954
prosody2ejabberd: Support PEP import
2017-08-10 19:49:20 +02:00
Holger Weiss
fc7ba53c37
prosody2ejabberd: Remove superfluous 'catch'
2017-08-10 18:54:00 +02:00
Konstantinos Kallas
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
Konstantinos Kallas
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
Konstantinos Kallas
011b7ac3f2
Support getting certificates for domains not specified in the configuration file
2017-08-10 15:26:35 +03:00
Evgeniy Khramtsov
a96d72330d
Rename remove_room hook back
2017-08-10 14:49:05 +03:00
Christophe Romain
7d626b4f5c
Add support of section 4.9.3.16 on rfc6120
2017-08-10 12:17:31 +02:00
Christophe Romain
e903348dd3
Fix pubsub send_loop after 3fec7824
2017-08-09 11:34:36 +02:00
badlop
bee251d928
Merge pull request #1912 from mathiasertl/master
...
fix FIREWALL_WINDOW option
2017-08-09 09:48:18 +02:00
Mathias Ertl
c658907331
fix typo
2017-08-08 19:09:55 +02:00
Konstantinos Kallas
97a4d57f2e
Remove some debugging functions
2017-08-08 18:00:37 +03:00
Evgeniy Khramtsov
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
Konstantinos Kallas
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
Konstantinos Kallas
7fa9a387ae
Try catch when formatting certificates
2017-08-08 12:45:57 +03:00
Konstantinos Kallas
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
Christophe Romain
52525eb76d
Fix tests for 8679cfd2f
2017-08-07 15:38:17 +02:00
Christophe Romain
8679cfd2f3
Rename stop_all_connections to stop_s2s_connections for consistency
2017-08-07 15:06:07 +02:00
PaweÅ Chmielowski
25af3fb029
Compile mod_push early as it defines behaviour
2017-08-07 09:32:58 +02:00
Evgeniy Khramtsov
2bceebc39d
Get rid of export_all
2017-08-05 21:01:29 +03:00
Evgeniy Khramtsov
92532a0d66
Replace gen_fsm with p1_fsm to avoid warnings in OTP20+
2017-08-05 20:58:21 +03:00
Holger Weiss
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
Holger Weiss
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
Mathias Ertl
aa9eb001d0
fix FIREWALL_WINDOW option
2017-08-04 18:49:33 +02:00
Badlop
101e808124
Fix warning in previous commit
2017-08-04 13:09:17 +02:00
Christophe Romain
766b7c65a6
Merge pull request #1881 from weiss/push
...
Support XEP-0357: Push Notifications
2017-08-04 12:58:06 +02:00
Badlop
0516a3dc0e
Remove unused 'managers' option, related to the deferred XEP-0321 ( #1443 )
2017-08-04 12:29:15 +02:00
Christophe Romain
3d185c0fb8
Fix missing validation from 633b68db1
( #1900 )
2017-08-04 11:53:32 +02:00
Christophe Romain
7815164216
Add minor details ( #1353 )
2017-08-04 10:34:13 +02:00
Christophe Romain
65f4094804
Prepare packaging for 17.08
2017-08-03 16:55:56 +02:00
Christophe Romain
06450f4a82
Keep disco#info on PEP compatible with XEP-0060 ( #1717 )
2017-08-03 15:48:23 +02:00
Christophe Romain
ce0beb550c
Move pubsub sql export to pubsub_db_sql module
2017-08-03 15:34:01 +02:00
Christophe Romain
96c0483533
Fix Xref from 5dcc97c
2017-08-03 14:54:06 +02:00
Paweł Chmielowski
1274bcdba9
Change policy of user_resources command
...
This fixes issue #1908
2017-08-03 13:49:06 +02:00
Badlop
5dcc97c85a
Preliminary export PubSub data from Mnesia tables to SQL file ( #1571 )
2017-08-03 10:53:01 +02:00
Konstantinos Kallas
e6e8e64f84
Improve return format of get_certificates command
2017-08-02 21:10:49 +03:00
Konstantinos Kallas
ac7105d39e
Implement verbose list_certificates option
2017-08-02 19:36:11 +03:00
Christophe Romain
6deceeec2e
Merge branch 'master' of github.com:processone/ejabberd
2017-08-02 14:36:43 +02:00
Christophe Romain
9edcbadd60
Fix clustering table reg_users_counter ( #1889 )
2017-08-02 14:36:32 +02:00
Christophe Romain
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
Christophe Romain
1df61a82c8
Merge branch 'master' of github.com:processone/ejabberd
2017-08-02 12:25:50 +02:00
Christophe Romain
73509686f1
Fix getting cached last item ( #1814 )
2017-08-02 12:24:34 +02:00
Evgeny Khramtsov
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
Jing Sun
50511fcff7
Fix spec for mod_pubsub:subscribe_node
2017-08-02 10:31:42 +02:00
Christophe Romain
5e26190b98
Fix PubSub send last published items ( #1572 )
2017-08-01 17:00:52 +02:00
Christophe Romain
f22bd6eb46
Fix PEP node removal ( #1839 )
2017-08-01 15:40:34 +02:00
Christophe Romain
0ba6c78ed0
Fix disco#items on PEP service
2017-08-01 15:15:01 +02:00
Christophe Romain
636d68e0a9
Fix PEP node identity ( #1717 )
2017-08-01 14:41:16 +02:00
Christophe Romain
7e6d1c24c2
Update spec from custom and allow modules dependencies ( #1740 )
2017-08-01 13:33:14 +02:00
Badlop
67918b17d3
Fix extauth.py so support : in passwords (thanks to jmberg)( #1676 )
2017-07-31 22:51:31 +02:00
Konstantinos Kallas
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
Paweł Chmielowski
51fa438340
Request basic auth dialog from browser
2017-07-28 16:08:05 +02:00
Christophe Romain
35a11526f9
Revert "Fix get_module_opt call in mod_block_strangers"
...
This reverts commit e5f64bc24a
.
2017-07-27 18:23:10 +02:00
Paweł Chmielowski
0cfec92c14
Generate log messages when websocket is closed due timeouts
2017-07-27 17:53:16 +02:00
Alexey Shchepin
e5f64bc24a
Fix get_module_opt call in mod_block_strangers
2017-07-27 17:48:41 +02:00
Konstantinos Kallas
cc6f4b90fb
Support certificate revocation
2017-07-27 18:25:44 +03:00
Paweł Chmielowski
5c48ba4609
Set high water mark in lager for all backends
2017-07-27 17:14:03 +02:00
Jérôme Sautret
3ca62a797a
Fix nick bug with MUC on riak
2017-07-27 17:06:34 +02:00
Christophe Romain
b66dab1313
Add muc related hooks
2017-07-27 17:02:06 +02:00
Christophe Romain
58110e4bc1
Update OTP version check by configure
2017-07-27 15:31:59 +02:00
Marco Adkins
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
Konstantinos Kallas
61d1411ab3
Sync fork with upstream
2017-07-26 09:54:23 +03:00
Konstantinos Kallas
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
Paweł Chmielowski
b8c26671c4
Update oauth2 dependency
2017-07-25 17:59:32 +02:00
Konstantinos Kallas
92e38190aa
Encode strings using a library function and not my custom made
2017-07-25 14:13:40 +03:00
Konstantinos Kallas
09918b5912
Add a try catch arounf list certificates
2017-07-23 21:47:22 +03:00
Christophe Romain
2e88d001d6
Fix errors from 1a0db3d
2017-07-21 11:42:03 +02:00
Badlop
1a0db3de3a
Describe commands arguments and results in ejabberd_sm, ext_mod, mod_mam
2017-07-21 11:26:53 +02:00
Badlop
250876ea1a
Fix indentation of commands lines
2017-07-21 11:26:47 +02:00
Holger Weiss
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
Holger Weiss
d6f1d3df5b
Support XEP-0357: Push Notifications
...
Closes #1379 .
2017-07-20 20:22:50 +02:00
Christophe Romain
72dbb6e7c1
Fix errors when running ejabberdctl as root
2017-07-20 14:40:50 +02:00
Paweł Chmielowski
b1082a96c9
Add ability to update changelog in update-deps-releases
2017-07-20 11:43:25 +02:00
Paweł Chmielowski
ed17586cf0
Update cache_tab and xmpp dep
2017-07-20 11:43:06 +02:00
Christophe Romain
26b8dd75f7
Merge pull request #1869 from wahjava/master
...
Fix ERLANG_OPTS when setting INET_DIST_INTERFACE
2017-07-19 11:33:38 +02:00
Paweł Chmielowski
c3473c2077
Update fast_tls
2017-07-19 10:58:10 +02:00
Paweł Chmielowski
e216654c52
Don't add indentation after single item result in docs
2017-07-18 17:48:53 +02:00
Christophe Romain
cc3391cc1c
Use string:join instead of lists:join
2017-07-18 15:43:46 +02:00
Christophe Romain
b8d56a7c11
Improve formatting of documented API parameters
2017-07-18 15:01:01 +02:00
Konstantinos Kallas
9ce1f12b66
Pretty print list-certificates
2017-07-18 13:28:44 +03:00
Evgeny Khramtsov
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
Paweł Dorofiejczyk
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
Konstantinos Kallas
2e18122cd9
Print validity in list-certificates
2017-07-17 13:40:53 +03:00
Konstantinos Kallas
8fe551cc68
Add a stub for the list-certificates command
2017-07-17 11:39:27 +03:00
Konstantinos Kallas
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
Konstantinos Kallas
fa3108e6e2
Save acquired certificates in persistent storage
2017-07-17 10:42:09 +03:00
Konstantinos Kallas
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
Konstantinos Kallas
478a12637d
Separate the persistent data structure functions
2017-07-17 09:40:36 +03:00
Konstantinos Kallas
4d977535f2
Make some persistent data wrapper functions
2017-07-17 09:35:37 +03:00
Ashish SHUKLA
95613a11ab
Fix ERLANG_OPTS when setting INET_DIST_INTERFACE
2017-07-15 16:42:47 +05:30
Paweł Chmielowski
2cd193f97c
Expand catch block used to report errors in doc generator
2017-07-14 17:18:07 +02:00
Paweł Chmielowski
33a9d6a3c3
Fix args_examples from last commit
2017-07-14 17:17:26 +02:00
Badlop
fdb863ce70
Describe even more command arguments and results in mod_admin_extra
2017-07-14 16:43:30 +02:00
Paweł Chmielowski
43fc29873e
Add refresh repos option in update-deps-releases
2017-07-14 15:08:13 +02:00
Paweł Chmielowski
e216a54ead
Update fast_tls
2017-07-14 15:08:13 +02:00
Konstantinos Kallas
77a96b0ec6
Solve acme challenges using built in http server
2017-07-12 19:23:52 +03:00
Badlop
d4cdc3a246
Fix ERLANG_OPTS end lines when setting FIREWALL_WINDOW ( #1856 )
2017-07-12 14:43:28 +02:00
Konstantinos Kallas
5199ede4a2
Changle acme file permissions
...
Also changed some specs
2017-07-11 11:11:00 +03:00
Konstantinos Kallas
b4b4e247dd
Add the certificate directory in ejabberd.yml.ecample
2017-07-07 19:40:57 +03:00
Konstantinos Kallas
c50f6c218f
Clean up code by adding throws instead of passing the error value
2017-07-07 18:32:07 +03:00
Konstantinos Kallas
5866124138
Clean up get_certificate code
2017-07-07 17:37:44 +03:00
Holger Weiss
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
Holger Weiss
8f25baada6
mod_privacy: Apply cosmetic change to type spec
2017-07-07 14:25:55 +02:00
Badlop
aaef1a14b4
Fix set_presence command to work in recent ejabberd
2017-07-07 10:55:08 +02:00
Evgeniy Khramtsov
22e8f5fd51
Add copyright and fix description for some sources
2017-07-06 21:27:04 +03:00
Paweł Chmielowski
88ab787ba6
Start gen_mod from elixir tests
2017-07-06 17:57:46 +02:00
Paweł Chmielowski
eb9faffadd
Improve elixir tests
2017-07-06 17:19:22 +02:00
Paweł Chmielowski
3b0eee785f
Handle new possible result from ejabberd_config.add_option
2017-07-06 17:19:22 +02:00
Paweł Chmielowski
5ef542a638
Remove tests for old commands interface
2017-07-06 17:19:22 +02:00
Evgeniy Khramtsov
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
Paweł Chmielowski
56d273477e
Remove old command calling interface
2017-07-06 14:24:25 +02:00
Evgeniy Khramtsov
a35b9dd9cc
Close accepted socket if sockname/peername has failed
...
Fixes #1834
2017-07-06 14:49:21 +03:00
Marc Philipp
c69720a1ab
Add integration test for set_room_affiliation
2017-07-06 13:33:13 +02:00
Konstantinos Kallas
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
Konstantinos Kallas
d3c477646f
Add support for command get_certificates, very crude
2017-07-03 13:37:32 +03:00
Paweł Chmielowski
a58de70f06
Fix invalid argument in get_messages_susbset
...
This should fix #1818
2017-06-30 14:24:35 +02:00
Christophe Romain
800965a957
Avoid useless calls on simples subscriptions ( #1313 )
2017-06-29 15:24:18 +02:00
Alexey Shchepin
fcf672c50e
Add allow_local_users to mod_block_strangers ( #1804 , #1809 )
2017-06-29 14:55:24 +03:00
Badlop
b66e369a1d
Fix Salt import from prosody SCRAMmed password ( #1803 )
2017-06-29 10:28:44 +02:00
Paweł Chmielowski
9dd03c873c
Fix clone code in update-deps-release
2017-06-28 16:47:31 +02:00
Paweł Chmielowski
e42bb47ce3
Update deps
2017-06-28 16:46:48 +02:00
Paweł Chmielowski
dc7fa076d7
Fix problem with updating deps in rebar.config for non-tags
2017-06-28 16:36:59 +02:00
Paweł Chmielowski
960cf495c6
Don't use asn1rt:decode, it's not available on R20
2017-06-28 14:51:45 +02:00
Christophe Romain
0f12804a49
Quote paths to allow spaces ( #1789 )
2017-06-28 11:39:05 +02:00
Badlop
3c7c71cfa6
In offline export to SQL, first write all DELETE, later all INSERT ( #1509 )
2017-06-28 11:14:59 +02:00
Paweł Chmielowski
aac190255b
Update fast_tls
2017-06-27 15:02:23 +02:00
Paweł Chmielowski
85a08a087b
Improve update-deps-releases deps parsing
2017-06-27 14:56:00 +02:00
Konstantinos Kallas
637d9b054b
Support get-cert, revoke-cert. Also cleaned some typespecs
2017-06-26 19:03:21 +03:00
Badlop
1bfb0ab39c
Fix username in mam export ( #1510 )(thanks to themaverik)
2017-06-26 14:38:12 +02:00
Badlop
4ef1cdec12
Write validator for mod_multicast's limits option
2017-06-26 13:39:50 +02:00
Badlop
0534678028
Use YAML syntax for limits option in mod_multicast
2017-06-26 11:26:53 +02:00
Paweł Chmielowski
70606d7f1a
Catch exception that may happen when sending data over websocket
...
This fixes #1667
2017-06-23 17:19:37 +02:00
Mickaël Rémond
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
Evgeny Khramtsov
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
Evgeniy Khramtsov
5bb7a0b0db
Don't let a receiver to crash if a controller is unavailable
...
Fixes #1796
2017-06-22 16:58:46 +03:00
Konstantinos Kallas
330456bcf0
Indent using Emacs
2017-06-22 14:47:56 +03:00
Konstantinos Kallas
396bd5eb3d
Removed some ?INFO_MSG
2017-06-22 11:38:40 +03:00
Konstantinos Kallas
dd79dea81d
Support new_cert, make certificate request
2017-06-22 11:31:50 +03:00
Marc Philipp
976a8c9cc9
Fix mod_muc_admin:set_room_affiliation
2017-06-21 17:20:58 +02:00
Christophe Romain
a095477b4c
Fix outgoing_s2s_timeout description ( #1684 )
2017-06-21 16:30:51 +02:00
Holger Weiss
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
Holger Weiss
985b0a1933
mod_stream_mgmt: Add missing function specs
2017-06-21 01:00:29 +02:00
Christophe Romain
a7841ed486
Improve API documentation generator
2017-06-20 14:45:57 +02:00
Christophe Romain
a11e833a98
Make ext_mod api return rescode
2017-06-20 14:45:31 +02:00
Paweł Chmielowski
62ee051c6e
Fix invalid {args,result}_examples in mod_muc_admin
2017-06-19 16:31:07 +02:00
Paweł Chmielowski
5424ead01d
Generate better errors when not being able to generate documentation
2017-06-19 16:30:45 +02:00
Paweł Chmielowski
96d385bf82
Another tweak to md generator
2017-06-19 15:10:34 +02:00
Paweł Chmielowski
8e2258b16a
Update markdown api document generator
2017-06-19 15:02:02 +02:00
Konstantinos Kallas
dc4c00a78c
Add support for solving http-01 challenge
2017-06-18 13:20:47 +03:00
Konstantinos Kallas
1d1250b056
Cleanup acme_challenge.erl, move types and records in ejabberd_acme.hrl
2017-06-17 19:06:39 +03:00
Badlop
f87b46f454
Fix srg_user_add/del for non-Mnesia database backends ( #1780 )
2017-06-15 11:05:41 +02:00
Konstantinos Kallas
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
Christophe Romain
5418b37314
Add pubsub import from prosody/metronome
2017-06-15 09:56:05 +02:00
Paweł Chmielowski
6353a06a5d
Catch exception from Elixir.ExUnit.Server.cases_loaded
2017-06-14 14:56:59 +02:00
Christophe Romain
58b9077b51
Fix OTP-17.5 support
2017-06-14 14:18:35 +02:00
PaweÅ Chmielowski
10fcfa860a
Show operations to perform before asking to apply them
2017-06-14 14:05:41 +02:00
Konstantinos Kallas
4fc3d511ce
Synchronize fork
2017-06-14 12:35:01 +03:00
Konstantinos Kallas
032ce9e53c
Refactor get requests, Implement authorization handling functions
2017-06-14 12:12:43 +03:00
Holger Weiss
5f2dcc51ce
Bump xmpp version
2017-06-14 01:05:15 +02:00
Evgeniy Khramtsov
0aa64381ff
Fix IP address parsing for mod_metrics
2017-06-13 16:54:29 +03:00
Christophe Romain
6c8b037422
Fix refactor bug on wait_status
2017-06-13 12:37:27 +02:00
Christophe Romain
d63ea000c7
Prepare package for 17.06-beta
2017-06-13 11:02:30 +02:00
Christophe Romain
5e148df0a9
Update esip and stun dependencies
2017-06-13 10:35:00 +02:00
Konstantinos Kallas
4b1c59e199
Major Refactoring, Separated Logic from Requests
2017-06-12 21:35:43 +03:00
Paweł Chmielowski
d8f05acb67
Add script for managing updates to deps
2017-06-12 19:23:41 +02:00
Paweł Chmielowski
d6f4c99243
Remove luerl from floating_deps
2017-06-12 19:23:41 +02:00
Konstantinos Kallas
c25aa8378f
Add new-authz, refactor the http requests that all used the same code
2017-06-12 15:31:48 +03:00
Badlop
63b6e0d381
Switch access rule delete_old_users with protect_old_users ( #1772 )
2017-06-09 19:18:47 +02:00
Konstantinos Kallas
911b8188d2
Refactor the http response handlers.
...
Encapsulate some dangerous calls with try catch.
2017-06-09 19:47:50 +03:00
Konstantinos Kallas
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
Konstantinos Kallas
53d47483c8
Implement some basic account handling functions
2017-06-09 15:49:27 +03:00
Paweł Chmielowski
8c1568ff93
Add more ipv6 loopback addresses
2017-06-09 14:38:34 +02:00
Paweł Chmielowski
7b5895c90d
Allow api access on both ipv4 and 6 loopback addresses
...
This should fix issue #1769
2017-06-09 13:57:26 +02:00
Paweł Chmielowski
115cb23bd8
Fix elixir tests on elixir 1.4
2017-06-09 12:59:47 +02:00
Paweł Chmielowski
62806607bf
Add missing ,
2017-06-09 12:10:40 +02:00
Badlop
b25b5c2f98
Improve export2sql explanation; remove obsolete and duplicated command
2017-06-09 12:02:49 +02:00
Christophe Romain
444c385f23
Update dependencies
2017-06-09 10:34:35 +02:00
Badlop
ee8bbccb2a
Fix and document push_roster_all command
2017-06-08 19:54:34 +02:00
Christophe Romain
66237abd35
Merge pull request #1766 from IRog/master
...
fixing exec_iex bug with proper --name arguement
2017-06-08 10:41:26 +02:00
Ivy Rogatko
0973a8d6c1
fixing iex bug with proper --name arguement
2017-06-07 21:15:17 -07:00
Christophe Romain
fbead19c88
Update elixir
2017-06-07 17:09:06 +02:00
Christophe Romain
baf574d6c4
Update lager p1_mysql and p1_pgsql dependencies
2017-06-07 16:56:00 +02:00
Christophe Romain
e3c801f1f5
Update dependencies
2017-06-07 16:18:41 +02:00
Paweł Chmielowski
f773edcb98
Override version of subdeps with version from main rebar.config
2017-06-07 16:06:28 +02:00
Christophe Romain
2a73068aac
Add missing space separator on EJABBERD_OPTS
2017-06-06 15:41:48 +02:00
Konstantinos Kallas
926de60f5d
Support for new_cert
2017-06-05 17:10:37 +03:00
Evgeny Khramtsov
5971eb3da0
Merge pull request #1758 from reneklacan/fix-mix-warnings
...
Fix mix warnings
2017-06-04 14:25:31 +04:00
Rene Klacan
04fd5567a7
Fix mix warnings
2017-06-04 12:24:35 +02:00
Evgeny Khramtsov
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
Rene Klacan
a98685e0bb
Fix version to be SemVer compatible
2017-06-04 03:01:51 +02:00
Konstantinos Kallas
df5d673e63
Solve http-01 challenge
2017-06-03 12:34:15 +03:00
Christophe Romain
12733bd21b
Fix EJABBERD_OPTS
2017-06-02 17:56:57 +02:00
Badlop
f6767ed061
Fix rooms list in WebAdmin ( #1753 )
2017-06-01 19:27:41 +02:00
Christophe Romain
de10a7a8ce
Respect INSTALLUSER when creating spool directory
2017-06-01 17:48:44 +02:00
Christophe Romain
5081a180fa
Create spool directory at start if not exists
2017-06-01 17:44:23 +02:00
Christophe Romain
a576f3a6d1
Remove use of getopt to support simpler shells
2017-06-01 12:10:06 +02:00
Christophe Romain
3201f8e513
Improve ejabberdctl parameters parsing
2017-06-01 11:48:11 +02:00
Christophe Romain
92003fa4dc
Minor ejabberdctl improvements
2017-06-01 08:04:11 +02:00
Christophe Romain
818d9c8c42
Merge branch 'joudinet-master'
2017-05-31 18:12:26 +02:00
Christophe Romain
cbe6553baa
Refactor ejabberdctl
2017-05-31 18:11:45 +02:00
Paweł Chmielowski
5d3870faa3
Add --enable-system-deps configure option
2017-05-31 11:30:34 +02:00
Christophe Romain
2d8ce266bd
Add license files into lib and deps directories
2017-05-30 15:03:06 +02:00
Christophe Romain
0042f18c1f
Merge branch 'master' of https://github.com/joudinet/ejabberd into joudinet-master
2017-05-30 12:37:27 +02:00
Badlop
0982a9bc3c
Parse correctly presence_broadcast option in change_room_option command
2017-05-29 12:49:53 +02:00
Evgeniy Khramtsov
50327a0cfc
Fix case clause
...
Fixes #1746
2017-05-25 13:46:17 +03:00
Holger Weiss
5802062746
Cosmetic change: Fix indentation errors
2017-05-24 17:16:16 +02:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
6e8895f9e9
Get rid of sql_queries.erl
2017-05-23 12:25:13 +03:00
Evgeniy Khramtsov
e93762a720
Deprecate misc:encode_base64/1 and misc:decode_base64/1
2017-05-23 10:43:26 +03:00
Evgeniy Khramtsov
268065e5c4
Validate all certfiles on startup
2017-05-23 09:27:52 +03:00
Evgeniy Khramtsov
d7878ef131
Implement cache for mod_announce
2017-05-22 16:14:28 +03:00
Badlop
908bedeaa6
Describe command arguments and results in mod_muc_admin
2017-05-22 12:55:32 +02:00
Evgeniy Khramtsov
504860f065
Don't leak with UDP sockets
2017-05-22 11:29:53 +03:00
Evgeniy Khramtsov
3a96d72a7f
Implement cache for mod_private
2017-05-22 10:34:57 +03:00
Evgeniy Khramtsov
d88e4d495f
Don't store messages via a single process
2017-05-21 23:21:13 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
0a77b9f43e
Get rid of a workaround against old Erlang bug
2017-05-21 13:30:46 +03:00
Evgeniy Khramtsov
470669fa6b
Get rid of db_type warning for mod_vcard_xupdate
2017-05-21 11:40:24 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
be50d57ddd
Declare ejabberd_oauth behaviour
2017-05-21 11:31:30 +03:00
Evgeniy Khramtsov
35d19b32f4
Implement cache for mod_privacy/mod_blocking
2017-05-20 22:36:32 +03:00
Paweł Chmielowski
654d907dcf
export_all is not needed here
2017-05-19 17:03:41 +02:00
Paweł Chmielowski
b013c29c7e
Fix values put in args_examples
2017-05-19 16:56:37 +02:00
Evgeniy Khramtsov
0ed23980a6
Get rid of Mnesia transaction in get_vcard/2
2017-05-18 21:24:47 +03:00
Evgeniy Khramtsov
a78862e05e
The default 'iqdisc' is now 'no_queue'
2017-05-18 19:13:18 +03:00
Evgeniy Khramtsov
bcb44ccb6f
Implement cache for mod_last
2017-05-18 13:21:17 +03:00
Evgeniy Khramtsov
736a182544
?SQL_UPSERT returns 'ok' on success
2017-05-18 12:10:36 +03:00
Evgeniy Khramtsov
97bb1250ba
Avoid erroneous usage of ?MODULE macro
2017-05-18 12:09:28 +03:00
Evgeniy Khramtsov
b0b7ac101c
Fix function_clause after authentication refactoring
...
Fixes https://github.com/processone/ejabberd-contrib/issues/213
2017-05-18 09:51:04 +03:00
Evgeniy Khramtsov
3e35d44b0f
Replace 'if_version_above' directive with 'if_have_fun'
2017-05-17 19:37:06 +03:00
Evgeniy Khramtsov
6691c59a7a
Clean up database code related to mod_vcard_xupdate
2017-05-17 19:29:19 +03:00
Evgeniy Khramtsov
1391d5a304
Use disc_only_copies for oauth_token Mnesia table
2017-05-17 17:42:22 +03:00
Evgeniy Khramtsov
8f595b58a7
Increase gen_mod's supervisor shutdown time
2017-05-17 17:33:07 +03:00
Evgeniy Khramtsov
5bdc6c0822
Get rid of deprecated option 'resume_timeout' in test config
2017-05-17 17:21:59 +03:00
Evgeniy Khramtsov
1925b94131
Implement cache for mod_vcard and mod_vcard_xupdate
2017-05-17 17:13:34 +03:00
Konstantinos Kallas
ddb043aa71
More account support(Update/Info)
2017-05-17 16:55:26 +03:00
Evgeniy Khramtsov
fc794b680a
Add cache options to the validator
2017-05-17 16:03:41 +03:00
Evgeniy Khramtsov
a71065fcda
Ciphers should be a binary string
2017-05-17 15:42:18 +03:00
Evgeniy Khramtsov
7165196211
Get rid of unused variable
2017-05-17 15:24:32 +03:00
Evgeniy Khramtsov
f782955c06
Implement cache for roster
2017-05-17 14:47:35 +03:00
Evgeniy Khramtsov
3f13396d73
Fix use_cache/1 callback
2017-05-15 08:58:37 +03:00
Konstantinos Kallas
88365ed507
New account functional, very crude
2017-05-15 01:41:09 +03:00
Evgeniy Khramtsov
061d5f2380
Shut up dialyzer/xref if public_key:short_name_hash/1 is not available
2017-05-13 13:11:08 +03:00
Evgeniy Khramtsov
2d17a2850c
Only validate certfiles if public_key:short_name_hash/1 is available
2017-05-12 17:51:17 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
d3c8fb7705
Check presence of some files during option validation
2017-05-12 09:34:57 +03:00
Evgeniy Khramtsov
9fe16a29e1
Gracefully process malformed passwords during password change
2017-05-11 17:15:23 +03:00
Evgeniy Khramtsov
31a3cc7b10
Gracefully process malformed passwords during registration
2017-05-11 17:09:26 +03:00
Evgeniy Khramtsov
a8dc5f80d1
Add 'access_remove' ACL to mod_register
2017-05-11 16:37:01 +03:00
Evgeniy Khramtsov
81d9770d4f
Update Elixir tests for using new auth API
2017-05-11 16:15:18 +03:00
Evgeniy Khramtsov
cdb191bb48
Rename is_user_exists -> user_exists
2017-05-11 15:49:06 +03:00
Evgeniy Khramtsov
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
Badlop
e890525788
Use misc:atom_to_binary/1 instead of the deprecated jlib.erl ( #1510 )
2017-05-10 12:05:52 +02:00
Badlop
6b8c61b3a2
Update comment: aux.erl was renamed to misc.erl
2017-05-10 12:03:13 +02:00
Badlop
4849ac9781
Use jid:encode/1 instead of the deprecated jid:to_string/1 ( #1510 )
2017-05-10 11:22:15 +02:00
Lamtei W
cd18d3d8a7
Fix: update sql statement, added missing delimeter for sql queries
2017-05-10 11:22:11 +02:00
Lamtei W
a0908ba393
Added export function for mam module
2017-05-10 11:22:07 +02:00
Konstantinos Kallas
02dbe39b06
Examining jose functionality
2017-05-09 23:27:37 +03:00
Konstantinos Kallas
67a00939db
Small improvements to the acme module
2017-05-08 20:29:58 +03:00
Evgeniy Khramtsov
5d7a704ca5
Remove forgotten 'export_all'
2017-05-08 17:23:29 +03:00
Evgeniy Khramtsov
cee90a886e
Don't list 'redis_pool_size' option multiple times
2017-05-08 17:22:34 +03:00
Evgeniy Khramtsov
6b6d07745d
Split some functions in smaller ones
2017-05-08 16:29:01 +03:00
Konstantinos Kallas
05362b9a7d
Very basic acme client, only stubs
2017-05-08 15:35:11 +03:00
Evgeniy Khramtsov
bf2a2f291f
State that Erlang 17.5 or higher is only supported
2017-05-08 15:10:42 +03:00
Evgeniy Khramtsov
8368a0850a
Don't call gen_mod:get_opt() outside of modules
2017-05-08 14:34:35 +03:00
Evgeniy Khramtsov
01a2c9fe12
Add type specs for Module:opt_type/1
2017-05-08 12:59:28 +03:00
Evgeniy Khramtsov
6aefd24eb3
LOG_PATH macro should be of string type
2017-05-06 09:42:06 +03:00
Evgeniy Khramtsov
3241c2506b
Introduce 'sql_connect_timeout' option ( #1698 )
2017-05-05 16:25:10 +03:00
Evgeniy Khramtsov
48d6ae1def
Introduce 'sql_query_timeout' option
...
Fixes #1698
2017-05-05 13:20:28 +03:00
Evgeniy Khramtsov
f2dc8c0442
Emit deprecation warning for SM related listening options
2017-05-05 12:31:17 +03:00
Evgeniy Khramtsov
b174e2c9c6
Improve validation of second-level options
2017-05-05 11:11:17 +03:00
Evgeniy Khramtsov
fb17c1b99f
Make it possible to validate second-level options
2017-05-04 17:34:32 +03:00
Paweł Chmielowski
e790e66f47
Fix elixir tests
2017-05-04 12:17:41 +02:00
Paweł Chmielowski
c64e77a08c
Catch exceptions from acl:add_list in web admin
2017-05-04 12:01:22 +02:00
Evgeniy Khramtsov
cf53d834e9
Introduce 'iqdisc' global option
2017-05-04 12:24:47 +03:00
Evgeniy Khramtsov
a2a4a4970e
Validate module options on start_module/2
2017-05-04 09:09:10 +03:00
Badlop
31fa36003f
Parse ldap_uids in mod_vcard_ldap like in eldap_utils ( #319 )
2017-05-03 23:32:56 +02:00
Christophe Romain
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
Evgeniy Khramtsov
54cc49bc70
Validate new options before module reloading
2017-05-01 14:01:12 +03:00
Evgeniy Khramtsov
fe662c1a0a
Don't forget to delete digraph
2017-05-01 10:14:00 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
2b63d07329
Merge branch 'new-option-validation'
2017-04-29 11:48:57 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
7129aebe76
Don't re-define validation functions in multiple places
2017-04-28 13:23:32 +03:00
Paweł Chmielowski
2bcf822637
Fix elixir tests
2017-04-28 10:08:09 +02:00
Evgeniy Khramtsov
6658c0d386
Bump cache_tab version
2017-04-27 20:07:44 +03:00
Evgeniy Khramtsov
0b93cb7ece
Store options using p1_options module
2017-04-27 19:44:58 +03:00
badlop
b51e2aa213
Merge pull request #1702 from skuroki/patch-1
...
Fix typo
2017-04-27 09:58:37 +02:00
Badlop
d18d99e8ec
Bug requesting non-existent data with private_get command ( #1690 )
2017-04-26 23:14:30 +02:00
Holger Weiss
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
KUROKI Shinsuke
959419419f
Fix typo
2017-04-26 17:35:51 +09:00
Paweł Chmielowski
2988d84cfb
Don't check result of jid.start
2017-04-26 09:50:49 +02:00
Badlop
c0eb85ce53
Allow a room admin also to subscribe another JID
2017-04-26 01:30:12 +02:00
Holger Weiss
56a4bf8f3c
mod_stream_mgmt: Fix typo in variable name
2017-04-25 22:37:27 +02:00
Holger Weiss
9cc332d6b3
mod_stream_mgmt: Fix 'if_offline' detection
2017-04-25 22:32:03 +02:00
Evgeniy Khramtsov
120682ec8b
Include original 'id' and 'type' attributes in offline event
2017-04-25 17:59:26 +03:00
Paweł Chmielowski
a67b3dc6a6
Don't check result of jid.start
2017-04-25 16:54:01 +02:00
Paweł Chmielowski
f4c98f635b
Don't check result of jid.start
2017-04-25 16:46:00 +02:00
Evgeniy Khramtsov
069bf6dec6
Make sure only jabber ❌ event tag is present in offline event
2017-04-25 17:21:24 +03:00
Fernando Ripoll
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
Holger Weiss
d0f3696596
randoms: Keep compatibility with Erlang/OTP 17
2017-04-24 23:51:01 +02:00
Evgeniy Khramtsov
c923bb5c10
Avoid changing configuration on listener deletion
2017-04-23 16:42:54 +03:00
Evgeniy Khramtsov
9a93acc62a
Improve Mnesia tables creation and transformation
2017-04-23 16:37:58 +03:00
Evgeniy Khramtsov
8770fc98e1
Use round-robin algorithm when selecting worker from DB pool
2017-04-23 11:54:56 +03:00
Evgeniy Khramtsov
18433e289f
Add clear_cache admin command
2017-04-22 11:33:39 +03:00
Holger Weiss
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
PaweÅ Chmielowski
44ae6bcc83
Fix elixir tests
2017-04-21 12:17:23 +02:00
Evgeniy Khramtsov
02790b105e
Speedup Mnesia tables initialization
2017-04-21 12:27:15 +03:00
Evgeniy Khramtsov
d88c08e074
Use new cache API in mod_shared_roster_ldap
2017-04-21 10:43:14 +03:00
Evgeniy Khramtsov
9937cb48fd
Use new cache API in ejabberd_oauth
2017-04-21 09:02:10 +03:00
Evgeniy Khramtsov
5444475b1d
Correct option validation
2017-04-20 18:55:16 +03:00
Evgeniy Khramtsov
264a40f217
Use new cache API in mod_mam
2017-04-20 18:52:16 +03:00
Evgeniy Khramtsov
a26f90a346
Use new cache API in mod_caps
2017-04-20 18:18:26 +03:00
Badlop
ca9d04ba6b
Fix private_get command sending a proper xmlel ( #1683 )
2017-04-20 16:50:08 +02:00
Badlop
4e86a71ab2
When getting user rooms, filter by the serverhost as expected ( #1683 )
2017-04-20 16:49:32 +02:00
Holger Weiss
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
Holger Weiss
3adf720bc1
Use #jid{} type for #muc_unsubscribe.jid
2017-04-19 22:18:23 +02:00
Badlop
d7a999eaf5
Don't use jid:from_string as it's deprecated, see jid.erl line 43
2017-04-19 21:47:59 +02:00
Evgeniy Khramtsov
64333f69ea
Don't try to load already loaded applications
2017-04-19 11:40:58 +03:00
Holger Weiss
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
Evgeniy Khramtsov
7c9415356d
Function fix_from_to/2 should not crash when 'from' is undefined
...
Fixes #1678
2017-04-18 01:38:35 +03:00
Evgeny Khramtsov
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
getong
ab751d290a
lager_crash_log in some cases not run, catch it
2017-04-17 12:07:23 +08:00
Evgeniy Khramtsov
f496d22074
Improve logging message
2017-04-16 23:56:12 +03:00
Evgeniy Khramtsov
86b680a3ad
Move compile_exprs() to misc module
2017-04-16 20:05:46 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
3b14b35252
Default config file should be ejabberd.yml
2017-04-16 01:26:33 +03:00
Evgeniy Khramtsov
878c762cdf
Log human readable description when configuration file is not found
2017-04-16 01:22:55 +03:00
Evgeniy Khramtsov
920f2678ac
Report configuration file location on startup
2017-04-16 01:02:46 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
41fe062a8d
Lower log level for some messages
2017-04-15 15:47:00 +03:00
Evgeniy Khramtsov
4c5f97bb9a
Add Riak as mod_proxy65 RAM backend
2017-04-15 15:38:48 +03:00
Evgeniy Khramtsov
f9c24ab16d
Add Riak as mod_carboncopy RAM backend
2017-04-15 14:41:14 +03:00
Evgeniy Khramtsov
72b536b52d
Add Riak as BOSH RAM backend
2017-04-15 13:52:36 +03:00
Evgeniy Khramtsov
598c79ff86
Fix cleaning of Riak route table
2017-04-15 13:36:29 +03:00
Evgeniy Khramtsov
da66eb5714
Add Riak as router RAM backend
2017-04-15 13:07:56 +03:00
Evgeniy Khramtsov
c290b4284f
Fix closing of outbound S2S connections
2017-04-15 11:15:50 +03:00
Evgeniy Khramtsov
fcb978248f
Add Riak as session manager RAM backend
2017-04-15 10:02:32 +03:00
Evgeniy Khramtsov
5774edfe79
Improve ejabberd_c2s:close()
2017-04-15 08:30:41 +03:00
Evgeniy Khramtsov
5c23187d2c
Make sure stream trailer is sent in the very end
2017-04-14 20:56:01 +03:00
Evgeniy Khramtsov
0a7eb33772
Better process session close
2017-04-14 20:41:25 +03:00
Evgeniy Khramtsov
9de075029b
Fix a typo
2017-04-14 20:40:39 +03:00
Evgeniy Khramtsov
d110cbb6e2
Fix ejabberd_router:is_my_route/1
2017-04-14 20:34:00 +03:00
Evgeniy Khramtsov
5f1f126613
Don't forget to disconnect
2017-04-14 20:32:26 +03:00
Evgeniy Khramtsov
e40baf0bda
Use cache in front of Redis/SQL RAM backends
2017-04-14 13:57:52 +03:00
Paweł Chmielowski
aa7d5df6a0
Bump xmpp dependency, it's required by previous commit
2017-04-14 09:47:25 +02:00
Badlop
177d5fec86
Allow a room admin to unsubscribe another JID
2017-04-13 22:37:39 +02:00
Holger Weiss
0c0d79fd93
Travis CI: Update MySQL package
...
The "mysql-server-5.6" package is no longer available.
2017-04-11 13:52:10 +02:00
Holger Weiss
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
Christophe Romain
b1acd1183f
Rename aux.erl as misc.erl
...
Thanks Microsoft Windows to not support some filenames
2017-04-11 12:13:58 +02:00
Christophe Romain
265aa54bc2
Use p1_utils 1.0.8
2017-04-11 08:11:29 +02:00
Badlop
1e82db5655
New muc_register_nick command (thanks to Peter Marheine)( #1407 )
2017-04-10 12:23:14 +02:00
Christophe Romain
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
Christophe Romain
cf784772c9
Merge pull request #1664 from weiss/fix-routing
...
Fix routing of groupchat and headline messages
2017-04-07 15:10:26 +02:00
Christophe Romain
0567d528c6
Let ext_mod be aware of p1_utils includes
2017-04-07 12:51:43 +02:00
Christophe Romain
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
Christophe Romain
2a6c50832e
Improve S2S examples ( #1583 )
2017-04-07 11:12:27 +02:00
Christophe Romain
d759875db8
Add more examples on config template ( #1583 )
2017-04-07 11:02:11 +02:00
Christophe Romain
1510ee0b3c
Merge pull request #1660 from michal800106/master
...
Fix order of starting supervisors.
2017-04-07 10:04:38 +02:00
Evgeniy Khramtsov
3729acc5b0
Improve logging of Redis errors
2017-04-07 09:10:33 +03:00
Holger Weiss
9fa5f37f74
mod_client_state: Remove some empty lines
2017-04-06 23:00:53 +02:00
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
245fe04289
Improve type specs and return values
2017-04-06 20:56:46 +03:00
Evgeniy Khramtsov
6876a37e61
Add Redis pool support
...
Fixes #1624
2017-04-06 17:56:37 +03:00
Christophe Romain
00c613b351
Set default prefix to /usr/local
2017-04-06 15:35:02 +02:00
michal
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
89f81c89da
ejabberd_sm: Fix typo in debug message
2017-04-05 20:23:28 +02:00
Evgeniy Khramtsov
ad948d33c0
Add description to feature-not-implemented error
2017-04-05 15:19:00 +03:00
Evgeniy Khramtsov
6fa55e7c38
Set 'read_concurrency' for some ETS tables
2017-04-05 15:10:18 +03:00
Evgeniy Khramtsov
2febbe5ffb
Don't misuse monotonic_time/0
2017-04-05 10:42:42 +03:00
Christophe Romain
578ecad93c
Disable mix tests
2017-04-04 17:02:15 +02:00
Evgeniy Khramtsov
f5b0cd1793
Don't log warning on successful ping reply
2017-04-04 17:14:24 +03:00
Evgeniy Khramtsov
3a0b4ad8da
Merge branch 'master' of github.com:processone/ejabberd
2017-04-04 09:53:45 +03:00
Evgeniy Khramtsov
408f9b515e
Fix c2s connection close on demand
...
Fixes #1652
2017-04-04 09:52:42 +03:00
Alexey Shchepin
f45dc46856
Forget prepared SQL queries on database connect ( #1325 )
2017-04-03 16:42:41 +03:00
Christophe Romain
b75780b9cd
Always init pubsub_index when using mnesia
2017-04-03 12:13:20 +02:00
Alexey Shchepin
19614678e9
Change mnesia dir detection
2017-04-03 12:57:47 +03:00
Christophe Romain
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
Evgeniy Khramtsov
9d9037856c
Improve redis related code
2017-04-02 11:56:09 +03:00
Evgeniy Khramtsov
5087e9c2df
Use ejabberd_sql:abort/1 instead of exit/1
2017-03-31 19:10:07 +03:00
Evgeniy Khramtsov
178a0a3e1b
Merge branch 'master' of github.com:processone/ejabberd
2017-03-31 19:08:16 +03:00
Evgeniy Khramtsov
05ef009552
Add Redis as mod_proxy65 RAM backend
2017-03-31 19:07:56 +03:00
Alexey Shchepin
316da00345
Add ejabberd_sql:abort/1 and ejabberd_sql:restart/1
2017-03-31 17:37:24 +03:00
Evgeniy Khramtsov
f449df161a
Add SQL as mod_proxy65 RAM backend
2017-03-31 08:16:28 +03:00
Evgeniy Khramtsov
3e4ed83cb3
Raise bad_node instead of node_down for consistency reason
2017-03-30 17:51:37 +03:00
Evgeniy Khramtsov
f5f353d90a
Do not duplicate enc_pid/dec_pid functions
2017-03-30 17:44:43 +03:00
Christophe Romain
bfde473c3b
Add missing jlib->aux convertion
2017-03-30 14:28:55 +02:00
Christophe Romain
c93bf732db
Refactor pubsub's get_last_items
2017-03-30 14:26:30 +02:00
Evgeniy Khramtsov
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
Christophe Romain
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
Evgeniy Khramtsov
085b61eea5
Add Redis as mod_carboncopy RAM backend
2017-03-30 11:45:09 +03:00
Evgeniy Khramtsov
31fd83b2ae
Add SQL as mod_carboncopy RAM backend
2017-03-30 10:31:51 +03:00
Badlop
4b4c039fde
oauth_list_tokens and oauth_revoke_token work only in Mnesia ( #1644 )
2017-03-29 12:41:27 +02:00
Evgeniy Khramtsov
0b3cf26406
Fix a typo
2017-03-29 13:20:15 +03:00
Evgeniy Khramtsov
12e01a5119
Add SQL as mod_muc RAM backend
2017-03-29 12:58:01 +03:00
Evgeniy Khramtsov
ba6c88cb90
Add Redis as mod_bosh RAM backend
2017-03-28 21:12:26 +03:00
Evgeniy Khramtsov
e5815553cb
Add SQL as mod_bosh RAM backend
2017-03-28 20:33:57 +03:00
Evgeniy Khramtsov
cba6e1b3ab
Add Redis as router RAM backend
2017-03-28 19:34:04 +03:00
Christophe Romain
0f864d9466
Mix needs include path to p1_utils
2017-03-28 16:08:10 +02:00
Evgeniy Khramtsov
117f31125d
Add SQL as router RAM backend
2017-03-28 16:31:37 +03:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Christophe Romain
5b6d042de2
Fix PEP issues ( #1636 )
2017-03-27 16:24:24 +02:00
Evgeniy Khramtsov
e30d41e5f0
Merge branch 'new_queue'
...
Conflicts:
rebar.config
src/mod_muc_admin.erl
2017-03-24 13:27:56 +03:00
Evgeniy Khramtsov
e1f01f0c8a
Avoid PID collisions
...
Fixes #1470
2017-03-24 11:03:23 +03:00
Christophe Romain
e56c6545fa
Add inets in included_application for mix
2017-03-23 12:20:02 +01:00
Paweł Chmielowski
cb0627e6b2
Expand ejabberd.yml.example by enabling mod_http_api with couple commands
2017-03-22 14:30:12 +01:00
Christophe Romain
6c0419db2b
Update mix dependencies
2017-03-22 11:59:39 +01:00
Christophe Romain
232cb3dd45
Update dependencies
2017-03-22 10:06:21 +01:00
Christophe Romain
430fc8eb62
Update docker files from latest Rafael's changes
2017-03-21 18:59:12 +01:00
Holger Weiss
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
Holger Weiss
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
Paweł Chmielowski
f819272b88
Fix crash in mod_muc_admin, we operate on integers here not lists
2017-03-21 15:36:42 +01:00
Alexey Shchepin
9fb188afbc
Don't block contacts with subscription=to in mod_block_strangers ( #1609 )
2017-03-21 15:42:38 +03:00
Christophe Romain
70050b52ad
Use item creation date in rsm order ( #1516 )
2017-03-21 12:45:41 +01:00
Evgeny Khramtsov
44484fa4ae
Merge pull request #1626 from weiss/fix-scram-import
...
prosody2ejabberd: Fix SCRAM hash conversion
2017-03-21 15:44:29 +04:00
Christophe Romain
69b52196bd
Replace mod_http_bind by mod_bosh in config example
2017-03-21 11:15:01 +01:00
Evgeniy Khramtsov
f7cb7ef014
Remove misleading sentence about s2s dialback
2017-03-20 21:48:31 +03:00
Paweł Chmielowski
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
Christophe Romain
6017785e10
Fix compilation with mix ( #1588 )
2017-03-20 16:58:48 +01:00
Christophe Romain
186fda098c
Update mix deps
2017-03-20 16:26:16 +01:00
Christophe Romain
b6e1858ce6
Update xmpp and fast_tls versions
2017-03-20 15:33:55 +01:00
Evgeniy Khramtsov
7ab4f32c1a
Revert "Bump OTP version to 19.3 in Travis config"
...
This reverts commit 7113f2b8ba
.
2017-03-20 14:08:58 +03:00
Evgeniy Khramtsov
7113f2b8ba
Bump OTP version to 19.3 in Travis config
2017-03-20 13:49:23 +03:00
Evgeniy Khramtsov
c526c02d92
Remove webtool from erlang.plt creation
2017-03-20 13:48:17 +03:00
Evgeniy Khramtsov
f3ecba0445
Use new xdata compiler API
2017-03-20 09:57:11 +03:00
Evgeniy Khramtsov
06f42bc749
Better log s2s auth failures when TLS is not available
2017-03-18 13:59:24 +03:00
Evgeniy Khramtsov
72da5bd062
Log startup time
2017-03-18 10:24:42 +03:00
Evgeny Khramtsov
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
Edward Chow
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
Evgeniy Khramtsov
91245141e9
Set translation callback on startup
2017-03-17 21:35:02 +03:00
Paweł Chmielowski
2d67ff2249
Teach mod_http_fileserver ability to send 304 Not Modified
2017-03-17 11:58:40 +01:00
Holger Weiss
0ef6973457
prosody2ejabberd: Fix SCRAM hash conversion
...
Closes #1549 .
2017-03-16 23:15:08 +01:00
Badlop
1aeaa794e1
Encode in base64 when getting scram data with import_prosody ( #1549 )
2017-03-15 11:42:26 +01:00
Evgeniy Khramtsov
b932afb0cd
Use correct pid when registering local route
...
This fixes #1600
2017-03-15 10:27:22 +03:00
Alexey Shchepin
9a142eb807
Update cyrsasl_oauth to internal API changes
2017-03-14 17:25:09 +03:00
Alexey Shchepin
069d28b1ed
Get rid of p1_sha calls
2017-03-14 02:31:51 +03:00
Paweł Chmielowski
301b1b7a7a
Fix handling of xmlrpc request without authentication structure
...
This is problem from issue #1602
2017-03-13 16:41:52 +01:00
Badlop
113ed66f49
In module_install copy also deps/ebin and priv files (ejabberd-contrib#200)
2017-03-13 11:26:58 +01:00
Evgeny Khramtsov
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
Evgeniy Khramtsov
071c1dcb64
Return 'closed' instead of 'einval' on closed sockets
2017-03-12 08:55:54 +03:00
Alex Jordan
c4ed1c2764
Note how to apply s2s Access Rights in the example
2017-03-10 23:53:01 -05:00
Evgeniy Khramtsov
4b1bdb563e
Improve overloaded S2S queue processing
2017-03-10 20:21:04 +03:00
Paweł Chmielowski
0822108fc8
Teach web admin about ip acl rules
2017-03-10 14:39:47 +01:00
Evgeniy Khramtsov
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
Paweł Chmielowski
782caaa678
Improve formatting of erlang terms shown in web admin
2017-03-10 10:33:16 +01:00
Badlop
ee849338dd
Include shared groups also when contact is is personal roster ( #1585 )
2017-03-09 19:21:45 +01:00
Badlop
7e2380ab0c
Remove mod_pubsub from ejd2sql export, as it isn't implemented ( #1584 )
2017-03-08 16:23:01 +01:00
Badlop
b0a950b6dd
Fix handling ejabberd_sql:sql_transaction result ( #1584 )
2017-03-08 16:22:13 +01:00
Evgeniy Khramtsov
dd11ed82d7
Report more TLS errors
2017-03-08 08:27:54 +03:00
Evgeniy Khramtsov
bdc278399d
Fix typo and spec
2017-03-07 22:21:44 +03:00
Evgeniy Khramtsov
b71c4c0e52
Remove forgotten compile_all
2017-03-07 21:40:39 +03:00
Evgeniy Khramtsov
d0a185f2d9
Report some TLS errors
2017-03-07 18:46:02 +03:00
Evgeniy Khramtsov
0aa22e5149
Don't call deprecated jid functions from the test suite
2017-03-07 18:11:28 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
e5aac80cb4
Better handle errors in ejabberd_receiver calls
2017-03-02 16:02:44 +03:00
Evgeniy Khramtsov
4e014b4c5c
Fix previous commit
2017-03-02 15:34:26 +03:00
Evgeniy Khramtsov
cebdb87387
Revert "Remove relict mod_service_log"
...
This reverts commit 0d4e1abbd1
.
However, stanzas are now encapsulated into forwarded element
(as per XEP-0297) instead of <route/> nonza.
2017-03-02 15:30:34 +03:00
Evgeniy Khramtsov
8e41bdc25e
Improve reporting of unavailable SASL mechanisms
2017-03-01 15:23:22 +03:00
Evgeniy Khramtsov
28f4131d50
Resolve all addresses from SRV lookup
2017-03-01 14:37:35 +03:00
Evgeniy Khramtsov
f6e2840947
External components must always provide 'to' attribute
2017-03-01 00:17:27 +03:00
Evgeniy Khramtsov
c3ef56702a
Add s2s work-around for gmail.com
2017-02-28 20:15:05 +03:00
Evgeniy Khramtsov
489385d565
Make sure all hooks are called with proper host in ejabberd_c2s
2017-02-28 16:47:31 +03:00
Paweł Chmielowski
ce3317da7a
Fix bug in api_permission parsing
2017-02-28 13:36:34 +01:00
Jerome Sautret
d6a9ef5bc1
Propagate the TRANSACTION_TIMEOUT to pgsql driver (EJAB-1266)
2017-02-28 12:19:07 +01:00
Evgeniy Khramtsov
ac74b7dca1
Don't crash on malformed IP addresses
2017-02-28 13:11:49 +03:00
Evgeniy Khramtsov
d81b07bd5f
Improve logging of outbound s2s auth failures
2017-02-28 12:13:35 +03:00
Evgeniy Khramtsov
95a8f58314
Improve logging of dialback failures
2017-02-28 10:13:09 +03:00
Evgeniy Khramtsov
f3594ec881
Resend stream header before calling handle_auth_success/2 callback
2017-02-28 10:12:11 +03:00
Paweł Chmielowski
7a186e242d
Fix compilation on R17
2017-02-27 20:38:59 +01:00
Paweł Chmielowski
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
Evgeniy Khramtsov
ac025ee6f2
Clarify new modules usage in the example config
2017-02-27 17:20:04 +03:00
Paweł Chmielowski
b1b3aba439
Fix elixir tests
2017-02-27 13:05:08 +01:00
Evgeniy Khramtsov
719b4d1183
Don't perform useless resourceprep
2017-02-27 13:58:57 +03:00
Paweł Chmielowski
a098d1ec62
Update tests to ejabberd_commands changes
2017-02-27 10:45:39 +01:00
Paweł Chmielowski
ac548f2e95
Update tests to cyrsasl modifications
2017-02-27 10:45:15 +01:00
Paweł Chmielowski
6808865068
Return ok from start/2
2017-02-27 10:05:35 +01:00
Evgeniy Khramtsov
7a9fa52e91
Change loglevel on configuration reload
2017-02-27 11:11:29 +03:00
Evgeniy Khramtsov
d523357ba8
Invalidate access permissions on configuration reload
2017-02-27 09:55:54 +03:00
Evgeniy Khramtsov
933351ab4c
Fix log message format
2017-02-26 16:27:26 +03:00
Evgeniy Khramtsov
fadcc85553
Put more stuff under supervision
2017-02-26 15:10:59 +03:00
Evgeniy Khramtsov
7decd58aaa
Don't fail on elements decoding
2017-02-26 11:53:41 +03:00
Evgeniy Khramtsov
c1439ddd5b
Get rid of jid:to_string/1 and jid:from_string/1
2017-02-26 10:07:12 +03:00
Evgeniy Khramtsov
603ec9cb19
Don't pass empty resource to jid:make()
2017-02-25 10:01:01 +03:00
Evgeniy Khramtsov
485aae8134
Don't pass 'from' and 'to' along with stanza in hooks' arguments
2017-02-24 21:25:25 +03:00
Evgeniy Khramtsov
039ac46963
Don't polute log with known content types
2017-02-24 20:57:24 +03:00
Evgeniy Khramtsov
4892b01eb4
Get rid of unused variable warning
2017-02-24 17:48:17 +03:00
Evgeniy Khramtsov
03e2b0f0bf
Remove previous options when the config gets reloaded
2017-02-24 17:03:11 +03:00
Evgeniy Khramtsov
0124d292b5
Add gen_mod:is_loaded_elsewhere/2
2017-02-24 16:31:39 +03:00
Evgeniy Khramtsov
b8fbac72ac
Restart listeners on configuration reload
2017-02-24 15:18:10 +03:00
Paweł Chmielowski
e8c0e21f71
We don't like now()
2017-02-24 12:08:57 +01:00
Paweł Chmielowski
a85a953e8e
Adapt get_last tests to new output
2017-02-24 12:08:57 +01:00
Paweł Chmielowski
c950fc05f0
Update tests for changes in acl start code
2017-02-24 12:08:57 +01:00
Evgeniy Khramtsov
0db99ccb4b
Improve config reloading support by ejabberd_auth
2017-02-24 14:06:47 +03:00
Paweł Chmielowski
6aab450c16
Make sure that addr_re is always initialized when creating http state
2017-02-24 11:30:36 +01:00
Evgeniy Khramtsov
c15d230a57
Return ejabberd_sm:stop/0 back
2017-02-24 12:39:44 +03:00
Paweł Chmielowski
f310d7bb12
Make host header parser work correctly with ipv6 literal addresses
2017-02-24 10:25:26 +01:00
Evgeniy Khramtsov
67d6ca9f10
Improve startup procedure
2017-02-24 12:05:47 +03:00
Evgeniy Khramtsov
5b112c86bf
Fix a case clause and run c2s_filter_send on send_error/3
2017-02-24 07:57:57 +03:00
Badlop
57181c0a76
get_last now always returns tuple with UTC XEP-0082 and status ( #1565 )
2017-02-23 23:27:57 +01:00
Badlop
6314a96b05
Protect users from delete_old_users command using a fixed access rule ( #1462 )
2017-02-23 19:38:17 +01:00
Badlop
4294ba6b52
Separate list of strings with \n for srg_get_info in mod_http_api ( #1500 )
2017-02-23 19:23:24 +01:00
Holger Weiss
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
Christophe Romain
e7901f9d70
Prepare mix for 17.03
2017-02-23 18:14:29 +01:00
Christophe Romain
1030f041e3
Update dependencies
2017-02-23 18:13:10 +01:00
Holger Weiss
c76253cb0a
tools/hook_deps.sh: Search for escript in PATH
2017-02-23 17:38:56 +01:00
Evgeny Khramtsov
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
Holger Weiss
b475df2250
Include stanza ID with archived offline messages
...
Fixes #1480 .
2017-02-23 16:55:35 +01:00
Christophe Romain
720741b725
Avoid orphan_item leak on affiliation/subscription removal ( #1563 )
2017-02-23 16:43:22 +01:00
Jerome Sautret
bc9f178b6d
Fix pubsub MySQL schema
2017-02-23 16:04:29 +01:00
Evgeniy Khramtsov
6cdead166b
Start/stop auth modules when host is added/deleted
2017-02-23 16:19:22 +03:00
Evgeniy Khramtsov
0542c65a07
Stop all s2s connections via supervisor calls
2017-02-23 16:18:29 +03:00
Paweł Chmielowski
f4081a363b
Fix elixir tests
2017-02-23 09:53:20 +01:00
Evgeniy Khramtsov
a3ea6e7723
Improve reload_config admin command
2017-02-23 11:14:49 +03:00
Evgeniy Khramtsov
7d68112265
Start/stop virtual hosts when reloading configuration file
2017-02-23 10:12:19 +03:00
Evgeniy Khramtsov
ed34b04e9b
Remove unused macro
2017-02-22 20:48:51 +03:00
Evgeniy Khramtsov
96a690f607
Merge branch 'master' of github.com:processone/ejabberd
2017-02-22 19:47:00 +03:00
Evgeniy Khramtsov
3c4057ff55
Reload modules when reloading configuration file
2017-02-22 19:46:47 +03:00
Evgeniy Khramtsov
ff67860cdb
Make sure all hooks are called with proper host
2017-02-22 19:45:12 +03:00
Christophe Romain
87b5e2500b
Fix match of itemid on get_cached_item, fixes 14e771d8
2017-02-22 17:44:47 +01:00
Christophe Romain
56df6e7ba8
Add missing NOT NULL restrictions
2017-02-22 15:47:36 +01:00
Christophe Romain
c0b346e0b8
Move archive tables into lite.sql for better comparison with other schemas
2017-02-22 15:44:03 +01:00
Evgeniy Khramtsov
635dfa2eae
Re-enable "replaced" tests
2017-02-21 12:53:08 +03:00
Evgeniy Khramtsov
6ffd5ffd0c
Test stream management queue overload
2017-02-21 12:38:03 +03:00
Evgeniy Khramtsov
e11bcf9c43
Improve stream management tests
2017-02-21 09:19:51 +03:00
Evgeniy Khramtsov
adbd174959
Rename mod_sm -> mod_stream_mgmt
2017-02-21 09:18:58 +03:00
Evgeniy Khramtsov
1c34f89c19
Merge branch 'master' of github.com:processone/ejabberd
2017-02-21 08:46:28 +03:00
Evgeniy Khramtsov
bbfd089b7e
Don't count resent stanzas
...
Thanks to Holger Weiß for an advise
2017-02-21 08:44:39 +03:00
Holger Weiss
1e679e6f84
Travis CI: Update MySQL APT repository key
...
The old key expired on February 16, 2017.
2017-02-20 21:17:34 +01:00
Holger Weiss
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
Badlop
7d767fac7f
Support scrammed passwords in ejabberdctl import_prosody ( #1549 )
2017-02-20 12:47:56 +01:00
Evgeniy Khramtsov
9426c67302
Fix s2s_dns_timeout issues
2017-02-20 10:42:16 +03:00
Evgeny Khramtsov
a664d6389e
Merge pull request #1555 from weiss/count-session-iq
...
Let ejabberd_c2s handle <session/> IQ
2017-02-20 10:21:15 +04:00
Holger Weiss
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
Evgeniy Khramtsov
70bfc5b4a8
Get rid of non-breaking space
2017-02-18 12:13:48 +03:00
Evgeniy Khramtsov
940ca9311d
Fix some dialyzer warnings
2017-02-18 09:36:27 +03:00
Evgeny Khramtsov
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
Peter Lemenkov
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
Christophe Romain
68cc1e775c
Fix compilation when included as Elixir dependency ( #1526 )
2017-02-17 16:26:39 +01:00
Badlop
a1e8d3c3dc
Commands documentation lack arguments when policy=user ( #1514 )
2017-02-17 12:37:42 +01:00
Evgeny Khramtsov
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
Peter Lemenkov
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
Peter Lemenkov
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
Paweł Chmielowski
eec63dbefe
Correct access_matches spec
2017-02-16 15:38:44 +01:00
Evgeniy Khramtsov
218eeae797
Fix some dialyzer warnings
2017-02-16 14:18:36 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
26a5811744
Merge branch 'master' of github.com:processone/ejabberd
2017-02-16 00:23:00 +03:00
Evgeniy Khramtsov
0d4e1abbd1
Remove relict mod_service_log
2017-02-16 00:22:48 +03:00
Paweł Chmielowski
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
Evgeniy Khramtsov
f2b5153a8c
Report password change in the log
2017-02-14 17:10:16 +03:00
Evgeniy Khramtsov
6fd89f5fe0
Attach IP metadata to every stanza received from stream
2017-02-14 17:09:25 +03:00
Paweł Chmielowski
0b304731c5
Use newer p1_utils
2017-02-14 15:06:00 +01:00
Paweł Chmielowski
63da351038
Fix handling of config.ctc files
2017-02-14 14:39:24 +01:00
Paweł Chmielowski
cad02bb1b0
Add more check to make xref
2017-02-14 14:39:24 +01:00
Evgeniy Khramtsov
f61c933a7a
Only use GEN_SERVER macro where appropriate
2017-02-14 15:39:57 +03:00
Evgeniy Khramtsov
28f66ddd7c
Attach modules to gen_mod's supervisor
2017-02-14 12:39:26 +03:00
Evgeny Khramtsov
a1e45ab56c
Merge pull request #1539 from lemenkov/use_crypto_sha
...
RFE: Use crypto:hash/2 function
2017-02-14 11:38:05 +04:00
Evgeniy Khramtsov
f664e39374
Improve modules start/stop procedures
2017-02-14 10:25:08 +03:00
Peter Lemenkov
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
Evgeniy Khramtsov
e1ba499bd6
Check result of gen_mod:start/2 callback ( #1534 )
2017-02-13 11:11:41 +03:00
Evgeniy Khramtsov
fd885d0818
Apply SASLprep before storing/converting passwords
...
Fixes #996 and #1295
2017-02-12 10:06:30 +03:00
Evgeniy Khramtsov
67c9de6461
Use p1_server behaviour in xmpp_stream layer
2017-02-08 17:16:18 +03:00
Paweł Chmielowski
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
Paweł Chmielowski
b703b4f022
Don't shadow binding in match
2017-02-06 11:38:51 +01:00
Evgeniy Khramtsov
f30c9d49f7
Add TLS support for external components
2017-02-06 13:30:58 +03:00
Paweł Chmielowski
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
Badlop
a31154c035
Set subscribers nicks when recreating room (thanks to Girdhar Sojitra)( #1495 )
2017-01-31 19:18:39 +01:00
Badlop
b2a2e0f135
Support non-JID lines in command create_rooms_file
2017-01-31 17:50:04 +01:00
Christophe Romain
85eb8f022c
Depend on fast_xml-1.1.20
2017-01-31 11:02:23 +01:00
Christophe Romain
589bc73838
Don't warn if custom schema is not available
2017-01-31 09:53:52 +01:00
Evgeny Khramtsov
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
Peter Lemenkov
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
Paweł Chmielowski
326e8da06d
Use newer version of epam
2017-01-29 14:51:03 +01:00
Paweł Chmielowski
44a9ceac0b
More changes that are required from p1_pam -> epam
2017-01-29 14:35:22 +01:00
Paweł Chmielowski
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
Paweł Chmielowski
dd458c637e
Floating deps should always be executed
...
This fixes problem with recognizing latest_deps configure option
2017-01-29 12:14:32 +01:00
Paweł Chmielowski
2f3f6f8b71
Improve compilation with rebar3
2017-01-26 16:45:04 +01:00
Evgeniy Khramtsov
11326692f2
Merge branch 'master' of github.com:processone/ejabberd
2017-01-26 10:59:31 +03:00
Evgeniy Khramtsov
9d144bd495
Do not drop default TLS options
...
Fixes #1484
2017-01-26 10:58:26 +03:00
Paweł Chmielowski
a284722fd0
Adapt to coveralls api change
2017-01-24 19:16:50 +01:00
Evgeniy Khramtsov
c0a89e328a
Change OTP version from 19.1 to 19.2 in travis config
2017-01-24 10:39:40 +03:00
Evgeniy Khramtsov
99fd621aed
Speedup features list when a lot of virtual hosts configured
2017-01-24 10:38:29 +03:00
Paweł Chmielowski
5183f7724d
Fix tests
2017-01-23 20:43:35 +01:00
Evgeniy Khramtsov
0c57044c59
Make mod_disco handle features of mod_ping
2017-01-23 22:33:46 +03:00
Evgeniy Khramtsov
5e2c105396
Merge branch 'master' of github.com:processone/ejabberd
2017-01-23 21:52:35 +03:00
Evgeniy Khramtsov
0ce3a3665a
Make sure only {exit, normal} is not catched when executing a hook
2017-01-23 21:52:25 +03:00
PaweÅ Chmielowski
b0e72ece43
Adapt to new ejabberd_sm changes
2017-01-23 19:34:29 +01:00
Alexey Shchepin
8b5e6e4a13
Compatibility with R17 in mod_block_strangers
2017-01-23 19:04:22 +03:00
Alexey Shchepin
43bfa0efbc
Check message subject in mod_block_strangers
2017-01-23 17:10:28 +03:00
Christophe Romain
ca298c7c39
Update deps in mix.lock
2017-01-23 14:42:52 +01:00
Evgeniy Khramtsov
48d8498dbb
Avoid using maps:get/2 to keep compatibility with OTP 17.5
2017-01-23 16:30:16 +03:00
Evgeniy Khramtsov
19bec62eb5
Fix calling to mod_offline:store_packet
2017-01-23 15:00:46 +03:00
Paweł Chmielowski
5e5a8bbdcf
Don't use maps:take it available in R19 only
2017-01-23 12:56:08 +01:00
Paweł Chmielowski
7c2ccb2cb7
Add tool for checking which dependences need update
2017-01-23 12:24:25 +01:00
Evgeniy Khramtsov
435e5e6263
Make test suite working again
2017-01-23 13:51:05 +03:00
Evgeniy Khramtsov
e564f9ae31
Make a message is not bounced if it's archived
2017-01-21 13:47:47 +03:00
Evgeniy Khramtsov
68cf45a8b9
Archive message before delivering it to offline storage ( #1348 )
2017-01-21 11:47:04 +03:00
Evgeniy Khramtsov
94b23482a9
Send <compressed/> in correct order
2017-01-21 10:47:55 +03:00
Evgeny Khramtsov
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
Holger Weiss
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
Evgeniy Khramtsov
56ef607904
Add stanza-id to every archived message ( #1477 )
2017-01-20 23:21:06 +03:00
Evgeniy Khramtsov
17fe272dc5
Update copyright headers in new files
2017-01-20 19:56:19 +03:00
Evgeniy Khramtsov
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
Christophe Romain
3b2c2b5c04
Prepare 17.01 for hex.pm
2017-01-20 12:19:55 +01:00
Christophe Romain
39cfee239d
Use xmpp 1.1.6
2017-01-20 11:51:56 +01:00
Paweł Chmielowski
1f02567507
Make shim for mod_http_api admin_ip_access more robust
2017-01-20 10:19:09 +01:00
Christophe Romain
4f5d54f062
Try db migration only when mnesia is configured ( #1458 )
2017-01-20 09:26:13 +01:00
Evgeniy Khramtsov
fc2b71a04e
Restore muc_invite_hook ( #1467 )
2017-01-19 18:24:29 +03:00
Evgeniy Khramtsov
87b964a7f6
Make sure 'jabber:client' namespace is added to forwarded messages ( #1474 )
2017-01-19 18:03:07 +03:00
Evgeniy Khramtsov
4cf83ca3a7
Restore multiple invitations support ( #1468 )
2017-01-19 17:26:08 +03:00
Evgeniy Khramtsov
3d9997288d
Don't forget to convert muc#roomconfig_mam
2017-01-19 16:42:04 +03:00
Evgeniy Khramtsov
527472f18c
Support legacy muc#roomconfig values ( #1469 )
2017-01-19 11:12:27 +03:00
Christophe Romain
d2b8569452
Fix typo
2017-01-18 17:11:08 +01:00
Christophe Romain
3482ee5c75
Reset table only if new def change from runtime
2017-01-18 17:02:03 +01:00
Christophe Romain
3029e84faf
Improve check of mnesia schema opearations
2017-01-18 16:53:36 +01:00
Evgeniy Khramtsov
044e55b98e
Fix reporting dialback failures
2017-01-18 18:26:31 +03:00
Evgeniy Khramtsov
60a09285b7
Don't attempt to resolve _jabber._tcp SRV record
2017-01-18 17:54:42 +03:00
Evgeniy Khramtsov
ba47fd4649
Improve <delay/> tag insertion
2017-01-18 14:09:39 +03:00
Evgeniy Khramtsov
2de2d00f14
Cope with malformed values in 'rosterusers' SQL table ( #1466 )
2017-01-18 11:59:46 +03:00
Evgeniy Khramtsov
7b8c01da12
Better log bytestream termination
2017-01-17 23:06:55 +03:00
Evgeniy Khramtsov
9021ba01ac
Use crypto:exor/2 instead of hand-crafted bxor
2017-01-17 22:37:44 +03:00
Evgeniy Khramtsov
b8db0a8ed6
Reset XML stream before sending SASL <success/>
2017-01-17 22:06:26 +03:00
Christophe Romain
2a68591181
Remove wrong index setting
2017-01-17 16:23:45 +01:00
Christophe Romain
94ac777f93
Let ejabberd_mnesia handles copy_type
2017-01-17 15:05:14 +01:00
Christophe Romain
0ea6c1dcf6
Fix index processing ( #1461 )
2017-01-17 14:53:41 +01:00
Christophe Romain
2ce6d49a40
Speedup table setup, no io if EJABBERD_SCHEMA_PATH not set ( #1461 )
2017-01-17 14:22:12 +01:00
Evgeniy Khramtsov
c7476875e6
Avoid stopping mod_offline before supervisor termination ( #1464 )
2017-01-17 14:31:00 +03:00
Evgeniy Khramtsov
22ee16fd9d
Get rid of ejabberd_frontend_socket
2017-01-17 14:00:01 +03:00
Evgeniy Khramtsov
c68ac1d5eb
Improve error reporting for forbidden servers
2017-01-17 13:38:05 +03:00
Alexey Shchepin
a23c76fb82
Drop only messages with <body/> in mod_block_strangers
2017-01-17 01:34:40 +03:00
Alexey Shchepin
fd4f5c0996
Stop hook on message drop in mod_block_strangers
2017-01-16 18:45:26 +03:00
Alexey Shchepin
b080b8f54d
Use user_receive_packet hook in mod_block_strangers
2017-01-16 18:40:30 +03:00
Alexey Shchepin
5a8dea1591
Remove stub in mob_block_strangers
2017-01-16 18:21:36 +03:00
Evgeniy Khramtsov
a849b384f8
Merge branch 'new_stream' of github.com:processone/ejabberd into new_stream
2017-01-16 18:15:08 +03:00
Alexey Shchepin
fedfe5427c
Add mod_block_strangers
2017-01-16 18:14:14 +03:00
Evgeniy Khramtsov
1176e1f096
Add script to check hook dependencies
2017-01-16 17:14:33 +03:00
Evgeniy Khramtsov
22c25e4413
Don't allow raw elements in process_iq/3
2017-01-16 16:40:11 +03:00
Evgeniy Khramtsov
557820707b
Implement database backend interface for mod_proxy65
2017-01-16 15:28:11 +03:00
Evgeniy Khramtsov
0078a3b904
Correctly set gen_server's name
2017-01-16 11:43:35 +03:00
Evgeniy Khramtsov
65d352d5de
Remove handle_event/1 callback
2017-01-16 11:34:49 +03:00
Evgeniy Khramtsov
64997d9961
Add mod_sm and mod_s2s_dialback to example config
2017-01-16 10:12:46 +03:00
Paweł Chmielowski
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
Evgeniy Khramtsov
7606be93d5
Decode message before checking for expiration ( #1458 )
2017-01-13 14:20:25 +03:00
Badlop
e2665c5da9
Usable size for Shared rosters members textarea (EJAB-1753)
2017-01-13 12:16:23 +01:00
Evgeniy Khramtsov
32d548d99b
Fix configuration commands ( #1432 )
2017-01-13 13:36:28 +03:00
Evgeniy Khramtsov
25ddb6c69d
Add forgotten -include_lib()
2017-01-13 13:28:55 +03:00
Evgeniy Khramtsov
0baaad30b1
Implement database backend interface for MUC, BOSH and auth_anonyous
2017-01-13 12:03:39 +03:00
Evgeniy Khramtsov
31491ebe16
Fix some corner cases while re-reading RFC6120
2017-01-13 11:35:47 +03:00
Evgeniy Khramtsov
b10e10efae
Ignore unexpected events
2017-01-11 16:50:11 +03:00
Evgeniy Khramtsov
02f96d0f41
Implement database backend interface for ejabberd_router
2017-01-11 16:25:43 +03:00
Evgeniy Khramtsov
2129a33077
Fix attaching ejabberd_s2s_out process to a supervisor
2017-01-11 11:09:56 +03:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
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
Christophe Romain
f2acf57412
update deps
2017-01-10 15:11:41 +01:00
Christophe Romain
efccee55e3
pubsub_subscription may is not used (migration is optional)
2017-01-10 13:53:23 +01:00
Christophe Romain
6ff81946cf
Fix migration of old pubsub database ( #1409 )
2017-01-10 12:10:11 +01:00
Evgeniy Khramtsov
08d482b064
Allow old-stype mod_vcard_ldap in the config ( #1410 )
2017-01-10 11:29:01 +03:00
Evgeniy Khramtsov
dd5389df23
Don't forget to advertise disco features
2017-01-10 11:25:12 +03:00
Evgeniy Khramtsov
e01bece552
Make stream related calls module independent
2017-01-09 22:03:42 +03:00
Badlop
3d0d9cb354
Fix typo in previous commit
2017-01-09 17:54:10 +01:00
Badlop
afc7f5aa37
Simplify setting allow_subscription ( #1404 )
2017-01-09 15:56:25 +01:00
Evgeniy Khramtsov
f14a966680
Set from/to in every routed packet
2017-01-09 17:51:08 +03:00
Evgeniy Khramtsov
6c564775c4
Remove unused mod_ip_blacklist module
2017-01-09 17:22:31 +03:00
Evgeniy Khramtsov
1e55e018e5
Adopt remaining code to support new hooks
2017-01-09 17:02:17 +03:00
Badlop
9605e2b2a4
Fix problem with get_vcard command ( #1447 )
2017-01-06 16:13:57 +01:00
Christophe Romain
a910ab8171
Get nodes from ejabberd_cluster instead of mnesia
2017-01-03 17:21:02 +01:00
Christophe Romain
32e5781a6a
Cleanup file headers
2017-01-03 15:58:52 +01:00
Badlop
f5290a8e44
Specify that process_rosteritems command works only with Mnesia storage
2017-01-03 01:38:56 +01:00
Badlop
5fdd1c39fe
Update copyright date automatically ( #1442 )
2017-01-02 21:42:06 +01:00
Paweł Chmielowski
769975f6d7
Remove mod_http_bind and migration code to mod_bosh
2017-01-02 15:53:25 +01:00
Paweł Chmielowski
1bda40dac7
Fix cyrsasl test after recent changes
2017-01-02 13:36:21 +01:00
Evgeniy Khramtsov
5ef60bf594
Correctly process errors from new cyrsasl API
2017-01-02 15:02:03 +03:00
Evgeniy Khramtsov
666608544b
Improve return values in cyrsasl API
2017-01-02 14:55:06 +03:00
Evgeniy Khramtsov
3dd2a614ac
Get rid of "jlib.hrl" header in some files
2017-01-02 14:45:52 +03:00
Evgeniy Khramtsov
50682b98d6
Better cope with IPv6 domains
2016-12-31 17:43:40 +03:00
Evgeniy Khramtsov
cf87c5664f
Reflect cyrsasl API changes in remaining code
2016-12-31 13:48:55 +03:00
Evgeniy Khramtsov
247ca872f6
Improve return values in cyrsasl API
2016-12-31 13:47:35 +03:00
Evgeniy Khramtsov
e7fe4dc474
More refactoring on session management
2016-12-30 00:00:36 +03:00
Badlop
c6b5dd6c4f
Fix case clauses when using compression ( #1431 )(thanks to Evgeniy Khramtsov)
2016-12-29 15:18:42 +01:00
Evgeniy Khramtsov
309bdfbe28
Add xmpp_stream_out behaviour and rewrite s2s/SM code
2016-12-28 09:47:11 +03:00
Christophe Romain
ed679279fd
Cleanup file headers
2016-12-27 10:57:50 +01:00
Badlop
fad7612cf1
Allow subscriber to create room, then set allow_subscription=true ( #1404 )
2016-12-26 21:16:17 +01:00
Holger Weiss
df92d96d4f
Revert "Fix 'nodetree' configuration lookups for PEP"
...
This reverts commit 7ef8dfb4e0
.
The config/3 function copes with the PEP case.
2016-12-25 01:24:40 +01:00
Holger Weiss
7ef8dfb4e0
Fix 'nodetree' configuration lookups for PEP
2016-12-25 00:58:20 +01:00
Christophe Romain
b30b70db70
Prepare mix for 16.12
2016-12-22 20:41:01 +01:00
Paweł Chmielowski
08f73a5aeb
Update deps
2016-12-22 15:10:57 +01:00
Badlop
3811a61573
Extract correctly the text from #stanza_error ( #1425 )
2016-12-17 11:46:16 +01:00
Badlop
cc14e223c6
Describe command arguments and results in ejabberd_admin
2016-12-12 13:19:17 +01:00
Evgeniy Khramtsov
7f653cfe76
Rewrite ejabberd_service to use new XMPP stream API
2016-12-11 18:24:51 +03:00
Evgeniy Khramtsov
5cc8e807df
Initial version of new XMPP stream behaviour (for review)
2016-12-11 15:03:37 +03:00
Badlop
1a4f63f058
Copy recent make_opts function from mod_muc_room.erl
2016-12-09 13:07:48 +01:00
Christophe Romain
bcc04d93e1
Enforce pubsub node removal, revert previous commit ( #1320 )
...
This reverts commit 2976c2d921
.
and enforce node purge/removal instead
2016-12-09 12:51:08 +01:00
Christophe Romain
2976c2d921
Enforce affiliation removal, remove corresponding items ( #1320 )
2016-12-09 11:35:51 +01:00
Paweł Chmielowski
a50247c20d
Improve handling on acl rules in api_permissions
2016-12-08 18:08:54 +01:00
Mickael Remond
fdf69dcd0d
API call does not necessary use token, it could use basic auth
2016-12-08 16:28:47 +01:00
Paweł Chmielowski
a3b12fd745
Recognize "- who:" not only "who:" syntax in api_permissions
2016-12-08 12:01:24 +01:00
Christophe Romain
8a7ea85a7e
Cleanup ext_mod and fix compilation path
2016-12-07 09:27:21 +01:00
Paweł Chmielowski
a681874f67
Try to fix interminent failures in cyrsasl tests
2016-12-06 18:33:16 +01:00
Mickael Remond
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
Christophe Romain
1883a98d1c
Fix compilation of external module with new xmpp lib
2016-12-06 12:01:04 +01:00
Christophe Romain
0c2491d9ea
Remove obsolete remove_node api (use leave_cluster)
2016-12-05 14:17:57 +01:00
Christophe Romain
23f7075313
Fix reload_config
2016-12-02 16:29:46 +01:00
Paweł Chmielowski
23786c95c9
Grab new version of xmpp dep
2016-12-02 16:28:14 +01:00
Badlop
847376924e
Add password support in muc_subscribe ( #1306 )
2016-12-02 16:18:35 +01:00
Badlop
d7e1f6d7b3
When unsubscribes, check if room should get closed ( #1396 )
2016-12-01 22:09:57 +01:00
Badlop
34f2a8a4f2
Fix error formatting, which closed client connection ( #1389 )
2016-12-01 21:02:54 +01:00
Paweł Chmielowski
68cf6845e1
Fix mod_http_api_mock_test on 19.1
2016-12-01 18:51:23 +01:00
Paweł Chmielowski
294d58a393
Add more tests for digest-md5 cyrsasl
2016-12-01 18:51:23 +01:00
Mickael Remond
732eecac43
Move to latest Elixir version
2016-12-01 15:44:52 +01:00
Mickael Remond
a3c134c43b
We can now use dependencies published in hex.pm
2016-12-01 15:10:00 +01:00
Mickael Remond
309fd56fb4
Merge branch 'master' of github.com:processone/ejabberd
2016-12-01 15:05:09 +01:00
Badlop
8618af4e34
Fixes pt-br translation (thanks to Rodrigues)( #1393 )
2016-11-30 16:51:42 +01:00
Christophe Romain
32f484a349
Fix typo introduced by 92db9ff
changes
2016-11-30 13:50:46 +01:00
Christophe Romain
92db9ff105
Improve handling of mnesia schema
2016-11-30 11:09:17 +01:00
Christophe Romain
95a4b1b266
Cleanup admin_extra, add few functions
2016-11-30 10:31:36 +01:00
Christophe Romain
2cd70280d2
Merge branch 'docker' from Rafael Römhild
2016-11-30 10:30:19 +01:00
Christophe Romain
fc7e52df71
Adds optional post_install and pre_uninstall hooks (thanks Igor Manturov Jr.)( #1300 )
2016-11-28 17:15:57 +01:00
Evgeniy Khramtsov
56b30ab598
Improve translation of some messages
2016-11-26 10:05:22 +03:00
Christophe Romain
3ac73f9607
Update dependencies
2016-11-25 13:02:31 +01:00
Christophe Romain
18609befa4
Merge branch 'master' of github.com:processone/ejabberd
2016-11-25 10:07:04 +01:00
Christophe Romain
ae297a4ae6
Merge branch 'ukutaht-enable-elixir-in-mix'
2016-11-25 10:05:28 +01:00
Christophe Romain
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
Evgeniy Khramtsov
ca1b22bdd4
Use ejabberd_router:route_error/4 wherever possible
2016-11-25 11:41:24 +03:00
Christophe Romain
4d6eb31264
Use new version of xmpp in mix
2016-11-25 09:31:49 +01:00
Evgeniy Khramtsov
e1539e5769
Get rid of compile warnings
2016-11-25 09:48:26 +03:00
Evgeniy Khramtsov
993cbcb133
Use new version of xmpp
2016-11-25 09:39:09 +03:00
Evgeniy Khramtsov
d554827ebc
Don't check for faked carbons
2016-11-24 20:16:07 +03:00
Evgeniy Khramtsov
0f11b1be36
Don't forget to erase cache on user removal
2016-11-24 18:40:20 +03:00
Paweł Chmielowski
28d0a1b9d2
Make compatible with rebar3
2016-11-24 14:23:20 +01:00
Evgeniy Khramtsov
49f1275e20
Get rid of excessive (io)list_to_binary/1 calls
2016-11-24 15:06:06 +03:00
Paweł Chmielowski
b14843d098
Add missing -callbacks
2016-11-24 12:44:21 +01:00
Evgeny Khramtsov
8f692f51d8
Merge pull request #1391 from weiss/mark-copies
...
Mark messages as copies by attaching metadata
2016-11-24 15:43:38 +04:00
Holger Weiss
560038c808
Use xmpp:put_meta/3 to update metadata
2016-11-24 10:47:26 +01:00
Holger Weiss
d12210f4e1
Use new versions of fast_xml and xmpp
2016-11-24 10:45:57 +01:00
Holger Weiss
9c3ebb7d22
Don't make ejabberd.service file executable
2016-11-24 07:59:27 +01:00
Holger Weiss
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
Christophe Romain
cbda2e038e
Merge branch 'weiss-systemd-unit-improvements' ( #1346 )
2016-11-23 14:37:34 +01:00
Christophe Romain
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
Christophe Romain
12683b4aaf
Fix typo in copyright date
2016-11-23 14:36:11 +01:00
Evgeniy Khramtsov
5d434c1aea
Move copyright definition to ejabberd.hrl
2016-11-23 15:51:48 +03:00
Johan Oudinet
d364eab74b
Merge remote-tracking branch 'upstream/master'
2016-11-23 11:45:13 +01:00
Evgeniy Khramtsov
6f2f1e87c9
Don't use deprecated functions from jlib.erl
2016-11-23 10:41:26 +03:00
Holger Weiss
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
Holger Weiss
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
Christophe Romain
ee8cc1dac2
Fix xref issue injected by fbfbb96
2016-11-22 17:51:21 +01:00
Christophe Romain
9ab169bc63
Fix get_roster issue injected by fbfbb96
2016-11-22 16:59:02 +01:00
Christophe Romain
24ef90c556
Fix vcard_ldap exports
2016-11-22 16:23:02 +01:00
Christophe Romain
c0e7b298db
Add missing export
2016-11-22 16:12:19 +01:00
Christophe Romain
cc63bcc997
Fix issues on import improvements
2016-11-22 16:01:08 +01:00
Paweł Chmielowski
a2fb493f91
Add missing include file
2016-11-22 15:35:47 +01:00
Paweł Chmielowski
ebadcf71c2
New bosh module
2016-11-22 15:26:15 +01:00
Christophe Romain
fbfbb96872
Improve ODBC import
2016-11-22 14:48:01 +01:00
Christophe Romain
577eeb642f
Add new xmpp repo as dependency in mix.exs
2016-11-22 14:43:10 +01:00
Paweł Chmielowski
7ffab38b44
Remove now() from mod_offline.hrl
2016-11-22 13:15:43 +01:00
Evgeniy Khramtsov
2786df651a
Add OTP 19.1 to Travis' testing platforms
2016-11-22 09:52:26 +03:00
Evgeniy Khramtsov
c0b5c6e9d4
Fix logging in tests on R17
2016-11-21 22:04:25 +03:00
Evgeniy Khramtsov
3189bb3bb9
Set 'sql_pool_size' to 1 by default for sqlite
2016-11-21 21:34:56 +03:00
Johan Oudinet
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
Evgeniy Khramtsov
3908a80ac9
Merge branch 'master' of github.com:processone/ejabberd
2016-11-21 16:55:28 +03:00
Evgeniy Khramtsov
1a02a2a51d
Set 'sql_pool_size' to 1 for sqlite tests
2016-11-21 16:55:18 +03:00
Paweł Chmielowski
b8e8e4b971
Fix elixir tests
2016-11-21 12:50:51 +01:00
Evgeniy Khramtsov
04fdf69737
Fix non-empty disco-nodes processing
2016-11-21 14:21:34 +03:00
Paweł Chmielowski
e57de02e0f
Fix s2s test
2016-11-21 12:06:58 +01:00
Badlop
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
Evgeniy Khramtsov
e6365979bd
Merge branch 'master' of github.com:processone/ejabberd
2016-11-21 12:14:37 +03:00
Evgeniy Khramtsov
274303f248
Fix conference disco#items when running multiple virtual hosts
2016-11-21 12:14:24 +03:00
Evgeniy Khramtsov
507e756b69
Do not send empty <after/> tag
2016-11-21 12:13:34 +03:00
Paweł Chmielowski
3f91668c46
Log more data for failed s2s connection
2016-11-21 09:52:36 +01:00
Evgeniy Khramtsov
c7ae916afc
Don't forget to start XMPP application
2016-11-21 10:23:09 +03:00
Evgeniy Khramtsov
049a6d97f1
Fix RSM for conference disco#items
2016-11-20 18:08:49 +03:00
Evgeniy Khramtsov
13c6039700
Use xmpp_util.erl from XMPP library
2016-11-19 13:57:25 +03:00
Evgeniy Khramtsov
de7a143a2c
Transform ejabberd_commands on the start
2016-11-19 13:05:13 +03:00
Evgeniy Khramtsov
9aff7e52a8
Switch to stand-alone XMPP library
2016-11-19 13:03:33 +03:00
Paweł Chmielowski
d00a634025
Fix includes in eunit compilation flags
2016-11-18 14:02:47 +01:00
Paweł Chmielowski
daab95e3b5
Fix elixir tests
2016-11-18 12:54:06 +01:00
Christophe Romain
45e77ea483
Remove useless NO_EXT_LIB flag
2016-11-18 12:25:01 +01:00
Paweł Chmielowski
e69937d93a
Get rid of substitute_forwarded
2016-11-18 11:51:57 +01:00
Evgeniy Khramtsov
f57f267c54
Merge branch 'master' of github.com:processone/ejabberd
...
Conflicts:
test/ejabberd_SUITE.erl
2016-11-18 13:39:10 +03:00
Evgeniy Khramtsov
b8dcc911a3
Make common tests working again
2016-11-18 13:38:08 +03:00
Paweł Chmielowski
995c97671d
Add auth to mod_http_fileserver
2016-11-17 12:59:46 +01:00
Christophe Romain
1c90b19d74
Fix typo
2016-11-16 18:24:12 +01:00
Christophe Romain
8ced3bdbe9
Remove obsolete/temp file
2016-11-16 14:18:51 +01:00
Badlop
3cd174cb56
Ensure that presence_broadcast room option is stored ( #1380 )
2016-11-16 13:35:50 +01:00
Badlop
e69ddd981f
Tell git to ignore the example file ejabberd.service
2016-11-16 13:12:57 +01:00
Badlop
b1723c6e2d
Handle correctly p1_http:request result
2016-11-16 13:11:23 +01:00
Rafael Römhild
5a01b5f1fc
add docker support
2016-11-16 11:48:50 +01:00
Christophe Romain
2929f5b5bc
Minor cosmetic changes on pubsub code
2016-11-15 18:35:20 +01:00
Christophe Romain
4d4ad922a2
Cosmetic validator changes
2016-11-15 18:14:21 +01:00
Christophe Romain
8df68266f2
Add missing verbs for RESTfull operation
2016-11-15 14:35:26 +01:00
Christophe Romain
2b93de6912
apply string optimizations
2016-11-15 14:32:22 +01:00
Christophe Romain
909e0eb5dd
Add configurable weight for commands
2016-11-15 14:18:34 +01:00
Paweł Chmielowski
e75dd17e2c
Fix tests that use #forwarded
2016-11-15 10:02:21 +01:00
Paweł Chmielowski
41794c57d6
Use new version of fast_xml
2016-11-15 10:02:21 +01:00
Paweł Chmielowski
5ffc01db53
Fix types in check_password_hash
2016-11-15 10:02:21 +01:00
Paweł Chmielowski
717159a98f
Make string args in http_api be list strings
2016-11-15 10:02:21 +01:00
Christophe Romain
309962fb8b
Use p1_http from p1_utils 1.0.6
2016-11-14 16:52:03 +01:00
Evgeniy Khramtsov
3765210698
Fix IQ result processing
2016-11-13 16:56:05 +03:00
Evgeniy Khramtsov
13d5da4da6
Add some copyright notices
2016-11-13 16:46:04 +03:00
Evgeniy Khramtsov
75c15d3853
Make xref working again if elixir is disabled
2016-11-13 14:29:52 +03:00
Evgeniy Khramtsov
ebefd0d8d6
Add more control for decoding IQ payloads
2016-11-13 14:17:21 +03:00
Evgeniy Khramtsov
7e9f1a6dc1
Don't auto-decode forwarded payload
2016-11-13 13:41:04 +03:00
Evgeniy Khramtsov
132033d01a
Remove unused header file
2016-11-13 10:57:53 +03:00
Evgeniy Khramtsov
21d78ed7f4
Don't use jlib.hrl outside of jlib.erl
2016-11-13 10:56:36 +03:00
Evgeniy Khramtsov
b8f22ff538
Deprecate most of the functions from jlib.erl
2016-11-13 10:44:53 +03:00
Evgeniy Khramtsov
534e73f732
Uncomment forgotten block of code
2016-11-12 14:51:43 +03:00
Evgeniy Khramtsov
de81c50199
Revert "Support to provide password when subscribing to a room ( #1306 )"
...
This reverts commit 566ac872fe
.
2016-11-12 14:47:29 +03:00
Evgeniy Khramtsov
5d552c8463
Merge branch 'master' into xml-ng
2016-11-12 14:41:37 +03:00
Evgeniy Khramtsov
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
Badlop
566ac872fe
Support to provide password when subscribing to a room ( #1306 )
2016-11-10 20:48:43 +01:00
Mickael Remond
42bede77a1
Merge branch 'master' of github.com:processone/ejabberd
2016-11-09 09:04:58 +01:00
Mickael Remond
35506f5470
Expose unregister API command
2016-11-09 09:04:52 +01:00
Evgeniy Khramtsov
e841a6ec34
Add more tests for offline storage
2016-11-08 15:15:19 +03:00
Evgeniy Khramtsov
e9dd3ffe9c
Merge branch 'xml-ng' of github.com:processone/ejabberd into xml-ng
2016-11-07 10:11:40 +03:00
Evgeniy Khramtsov
56c91d3c58
Add roster tests
2016-11-07 10:10:57 +03:00
Badlop
bd060bc1bb
Support several groups separated by ; in add_rosteritem command
2016-11-04 18:45:27 +01:00
Badlop
49d3b7ec1d
Throw error if room name or host has invalid characters ( #1360 )
2016-11-04 17:28:28 +01:00
Badlop
5e723bc90e
Fix reading room jids from file for create and destroy_rooms_file commands
2016-11-04 16:54:31 +01:00
Badlop
bab71f0832
Replace ctlscriptpath and produce ejabberd.service file ( #434 )
2016-11-04 16:35:59 +01:00
Paweł Chmielowski
62db030942
Merge mod_opt_type from db sub-modules to main module mod_opt_type
2016-11-04 12:58:08 +01:00
Holger Weiss
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
Badlop
149cc9654f
Append ; to privacy_list_data exporting lines (thanks to Marcio Luciano Donada)
2016-10-24 13:42:33 +02:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
f6236d456d
Add more tests for privacy lists and blocking command
2016-10-22 13:01:45 +03:00
badlop
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
Prasad Vaidya
cdafd3254b
Rollback minor change, to avoid redundant use of fail-safe function
2016-10-21 15:02:39 +05:30
Prasad Vaidya
509776a0d1
Fix: Replace erlang function with fail-safe jlib function.
2016-10-21 13:57:47 +05:30
Badlop
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
Badlop
0212559ca7
If a participant can change subject, let asubscriber too ( #1345 )
2016-10-20 20:35:00 +02:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
686305bb21
Use "Type=forking" in systemd unit
...
ejabberd is not a "oneshot" process.
2016-10-19 23:32:07 +02:00
Holger Weiss
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
Holger Weiss
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
Christophe Romain
059a806bb0
Let mix be able to cope with configured deps
2016-10-19 13:57:19 +02:00
badlop
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
colm
3b876875e9
mod_muc: made the constant MAX_ROOMS_DISCOITEMS configurable
2016-10-18 21:59:34 +01:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
4c5460f0bd
Get rid of compile warnings for random/crypto modules on R19
2016-10-18 08:17:21 +03:00
badlop
90acec8a2b
Merge pull request #1338 from marcphilipp/muc_invite_hook
...
Introduce muc_invite hook
2016-10-17 17:46:25 +02:00
Jerome Sautret
305d4c05dc
Fix delete_old_messages command for SQL backends
2016-10-17 17:02:23 +02:00
Evgeniy Khramtsov
67720c7713
Add more MUC tests
2016-10-17 13:37:23 +03:00
Paweł Chmielowski
fd6f0f94b5
Convert ejabberd_xmlrpc to new api_permissions
2016-10-14 13:55:50 +02:00
Marc Philipp
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
Holger Weiss
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
Holger Weiss
b693601dd1
Don't let MAM messages go into offline storage
2016-10-12 23:10:25 +02:00
badlop
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
Holger Weiss
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
Christophe Romain
0f67a8f98b
Update riakc to support r19
2016-10-10 10:57:04 +03:00
Evgeniy Khramtsov
a915fd161e
Create room on configuration request as per XEP-0045, 10.1.3
2016-10-10 10:51:39 +03:00
Holger Weiss
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
Uku Taht
5c48263579
Enable elixir when ejabberd used as a mix dependency
2016-10-07 10:47:20 +01:00
Evgeniy Khramtsov
6a3691ef7c
Add xdata generator and make some code using it
2016-10-07 10:31:03 +03:00
Holger Weiss
d701230555
Make map syntax compatible with Erlang/OTP 17
2016-10-07 00:36:47 +02:00
Holger Weiss
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
Paweł Chmielowski
0ae84a646f
Disable one test for now, we may change how this part is handled
2016-10-06 11:17:10 +02:00
Paweł Chmielowski
b01fbfadf3
Use correct field for oauth scope
2016-10-06 11:03:26 +02:00
Paweł Chmielowski
438dbc8bda
Make handling of oauth clauses be more consistent with other rules
2016-10-06 10:59:43 +02:00
Paweł Chmielowski
8accb8ee0c
Use proper default value for api_permissions
2016-10-06 10:59:43 +02:00
Badlop
a78c3422cd
Fix typos in Czech translation ( #1318 )
2016-10-05 15:04:42 +02:00
Paweł Chmielowski
695d22ef95
Initialize ejabberd_access_permissions in elixir tests
2016-10-05 13:54:29 +02:00
Paweł Chmielowski
98e0123ca4
New api permissions framework
2016-10-05 13:21:11 +02:00
s.budaev
026394a314
Added option to disable prepared statements (postgresql only)
2016-10-05 04:27:08 +04:00
Holger Weiss
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
Christophe Romain
1de0bb83a0
PubSub: creation jid must be bare jid
2016-09-30 07:51:33 +03:00
Christophe Romain
7566e267a7
PubSub: fix error type on item deletion with insufficient priviledge
2016-09-30 07:51:17 +03:00
Christophe Romain
15ebb79160
PubSub: creation jid must be bare jid
2016-09-29 16:10:11 +02:00
Christophe Romain
767dba8f3b
PubSub: fix notification on subscription change
2016-09-29 12:00:59 +02:00
Christophe Romain
a42bf67957
PubSub: fix error type on item deletion with insufficient priviledge
2016-09-29 11:20:56 +02:00
Badlop
6f538545b4
Fix 404 response formatting (thanks to Kaggggggga)( #1306 )
2016-09-28 11:03:46 +02:00
Holger Weiss
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
Alexey Shchepin
acab2270f1
Use inets instead of lhttpc in http_p1
2016-09-27 07:12:10 +03:00
Alexey Shchepin
ac6f701033
Add http_p1.erl, rest.erl, and oauth2 ReST backend for tokens.
2016-09-27 05:57:14 +03:00
Evgeniy Khramtsov
d327119cf7
Text legacy IQ handler support
2016-09-25 10:17:03 +03:00
Evgeniy Khramtsov
3112a7187f
Test anonymous auth
2016-09-25 09:57:56 +03:00
Evgeniy Khramtsov
7100c67be6
Get rid of compile warnings in test suite
2016-09-25 08:38:41 +03:00
Evgeniy Khramtsov
fa31e3ef23
Deprecate jlib:integer_to_binary/1 and jlib:binary_to_integer/1
2016-09-24 23:34:28 +03:00
Evgeniy Khramtsov
58969fb854
Improve namespace handling
2016-09-24 14:17:21 +03:00
Evgeniy Khramtsov
53209b9ab1
Add tests for s2s code
2016-09-23 12:30:33 +03:00
Evgeniy Khramtsov
ceda073766
Add tests for external component
2016-09-21 10:45:11 +03:00
Evgeniy Khramtsov
a4ec064455
Add more tests for C2S
2016-09-20 14:04:07 +03:00
Holger Weiss
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
Badlop
5bcfcf4c5e
When getting list of subscribed rooms, check all including temporary ones ( #1242 )
2016-09-19 13:46:01 +02:00
Badlop
9fa92092bf
Revert "Fix getting of subscribed rooms: consider also temporary ones ( #1242 )"
...
This reverts commit f2cc81dfea
.
2016-09-19 12:54:19 +02:00
Badlop
f2cc81dfea
Fix getting of subscribed rooms: consider also temporary ones ( #1242 )
2016-09-19 12:35:53 +02:00
Badlop
8244c1fa8c
Store the Allow Subscription room option ( #1301 )
2016-09-19 12:35:32 +02:00
Badlop
ed62d705d8
Don't worry about storage_type of the Acl mnesia table ( #1206 )
2016-09-19 11:59:40 +02:00
Badlop
da291d804c
Use mnesia calls instead of ets for Acl and Access tables ( #1206 )
2016-09-19 11:56:22 +02:00
Christophe Romain
662b6f1020
Update riakc to support r19
2016-09-16 14:59:06 +02:00
Holger Weiss
27999a122f
node_mb_sql: Add missing (SQL-specific) functions
2016-09-15 23:02:04 +02:00
Evgeniy Khramtsov
151668ac10
Fix dialyzer warnings for mod_mam
2016-09-13 16:56:34 +03:00
Christophe Romain
405a0a21c1
Merge pull request #1249 from weiss:push-requirements
2016-09-13 14:31:39 +02:00
Christophe Romain
c39501a48d
Merge branch 'push-requirements' of https://github.com/weiss/ejabberd into weiss-push-requirements
2016-09-13 14:29:14 +02:00
Christophe Romain
c3543e002d
Allow to create room with custom config
2016-09-13 11:52:59 +02:00
Evgeniy Khramtsov
e987b88848
Make common tests working again
2016-09-13 12:30:05 +03:00
Paweł Chmielowski
2f596b0e10
Expand parsing of json input to be able to handle update_roster command
2016-09-13 11:27:59 +02:00
Paweł Chmielowski
054382f074
Add X-Admin and basic auth header to CORS allowed headers in http_api
2016-09-12 15:40:38 +02:00
Paweł Chmielowski
96d05dad8f
Properly process OPTIONS header in http_api for all paths
2016-09-12 15:40:38 +02:00
Evgeniy Khramtsov
1aca541639
Fix nick-to-jid mapping for MUC subscribers
2016-09-12 14:41:33 +03:00
Badlop
d0761039ff
Support multiple room invitations ( #1285 )
2016-09-09 12:18:27 +02:00
Evgeniy Khramtsov
fe1bf27ef3
Fix subscribed rooms list retreivement
2016-09-09 13:04:47 +03:00
Holger Weiss
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
Holger Weiss
8fd888eb2b
Revert "Don't log an [error] message if Elixir is missing"
...
This reverts commit 41386d718d
. The issue
was fixed with commit 4bd45bada7
.
2016-09-08 18:11:54 +02:00
Holger Weiss
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
Christophe Romain
26a040e2d5
Fix typo on previous commit ( #1284 )
2016-09-08 16:32:16 +02:00
Paweł Chmielowski
4bd45bada7
Start elixir config code only if elixir was enabled in configure script
2016-09-08 16:29:45 +02:00
Christophe Romain
ad39da0b0a
Full jid entity subscriptions should include bare jid records ( #1284 )
2016-09-08 16:27:16 +02:00
Evgeniy Khramtsov
c29a48695d
Rename #error{} record to #stanza_error{}
2016-09-08 17:08:48 +03:00
Evgeniy Khramtsov
36ab9cc2ea
Fix message routing from subscribers
2016-09-08 16:39:34 +03:00
Evgeniy Khramtsov
5ec972b00f
Improve pubsub code
2016-09-08 15:49:27 +03:00
Paweł Chmielowski
6c943aa293
Merge pull request #1287 from weiss/ack-timeout
...
New stream management option: ack_timeout
2016-09-08 12:45:16 +02:00
gabrielgatu
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
Mickael Remond
e6f7233351
Support for publishing to hex.pm with latest Elixir mix
2016-09-08 10:52:43 +02:00
Mickael Remond
58a72bd395
Fix compilation with Elixir 1.3 / R19
2016-09-08 10:29:44 +02:00
Paweł Chmielowski
d2621130a3
Typo
2016-09-08 10:27:14 +02:00
Paweł Chmielowski
a8368278ec
Properly normalize resource_regexp acl rule
...
This fixes issue #1288 .
2016-09-08 08:45:10 +02:00
Holger Weiss
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
Christophe Romain
7a538bb88b
Enforce pathtype use with config path ( #1264 )
2016-09-07 17:38:35 +02:00
Christophe Romain
af0a493c66
Merge pull request #1253 from Amuhar/xep0356
2016-09-07 14:34:31 +02:00
Evgeniy Khramtsov
f304149615
Create room on configuration request as per XEP-0045, 10.1.3
2016-09-07 11:15:19 +03:00
Evgeniy Khramtsov
3803a8de3c
Link MUC subscription to bare JID
2016-09-07 10:33:37 +03:00
Holger Weiss
1edca899ff
Add SQL support for microblogging node plugin
2016-09-07 07:15:12 +02:00
Evgeniy Khramtsov
c6afb9731b
Handle <subscriptions/> request to list MUC subscribers
2016-09-06 19:06:02 +03:00
Evgeniy Khramtsov
5ec2874a96
Do not update muc_online_users table on MUC/Sub operations
2016-09-06 18:17:30 +03:00
Evgeniy Khramtsov
417284a921
Add get_subscribers command to list MUC subscribers
2016-09-06 17:55:18 +03:00
Holger Weiss
af2999a783
node_mb: Call node_pep instead of node_hometree
2016-09-06 00:30:46 +02:00
Holger Weiss
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
Holger Weiss
e29f47893f
mod_pubsub: Remove outdated comment
2016-09-06 00:05:54 +02:00
Paweł Chmielowski
c770a54aac
Clean ejabberd_commands before tests
2016-09-05 17:18:27 +02:00
Paweł Chmielowski
96a748d34f
ejabberd_oauth requiere working cache_tab, initialize it before tests
2016-09-05 16:42:05 +02:00
Evgeniy Khramtsov
45eb49125b
Rewrite mod_pubsub to use XML codec
2016-08-30 09:48:08 +03:00
Holger Weiss
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
Igor Manturov Jr
f1afea223b
Fixed typo in Stream Management option name
2016-08-23 02:21:09 +06:00
Holger Weiss
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
Igor Manturov Jr
d5659735b3
Fixed #1260 Stream Management feature for the websocket connections
2016-08-23 00:59:39 +06:00
Holger Weiss
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
badlop
8dd2044a27
Merge pull request #1254 from lemenkov/remove_p1_xmlrpc
...
Remove no longer necessary p1_xmlrpc
2016-08-19 11:53:20 +02:00
Peter Lemenkov
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
Badlop
8af85d913f
Erlang R17 has a Time limit in erlang:send_after ( #1246 )
2016-08-16 18:32:06 +02:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
e7217e6320
Add functions to get/set some c2s state elements
2016-08-15 20:24:43 +02:00
Badlop
5b4f347da8
Support sql backend in mod_shared_roster commands ( #1244 )
2016-08-15 15:53:35 +02:00
Evgeny Khramtsov
38666cfd58
Merge pull request #1245 from hamano/clean_redis_table
...
fix clean redis table
2016-08-15 15:12:20 +04:00
HAMANO Tsukasa
877d0752e2
fix clean redis table
2016-08-15 17:51:06 +09:00
Badlop
0ab08f4eeb
Don't delete ejabberd_commands table, it's problematic in cluster ( #1210 )
2016-08-14 20:35:25 +02:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
31faa4eb9a
Add more type specs
2016-08-12 13:17:42 +03:00
Evgeniy Khramtsov
ffba664f2c
Add a requirement for full JID in subscribe_room command
2016-08-11 17:13:20 +03:00
Paweł Chmielowski
50596dc4d3
Provide proper args_desc in oauth_issue_token command
2016-08-10 11:26:04 +02:00
Paweł Chmielowski
e63fe5c216
Fix result type of subscribe_room command
2016-08-10 11:22:19 +02:00
Evgeniy Khramtsov
1fc58ace2f
Add commands for MUC subscriptions management
2016-08-09 13:36:43 +03:00
Evgeniy Khramtsov
522a186a38
Improve some type specs
2016-08-09 10:56:32 +03:00
Mickael Remond
c4b14d045a
Update to released version
2016-08-07 18:31:55 +02:00
Mickael Remond
9c6ee60f1a
Update moka dependency
2016-08-07 18:28:14 +02:00
Mickael Remond
efc744092b
We do not force yet access rules check on register command
2016-08-07 18:27:16 +02:00
Mickael Remond
a0c8012c66
Do not force command line to pass a credentials
2016-08-07 18:24:08 +02:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Paweł Chmielowski
d969e917c6
Use newer samerlib/moka
2016-08-05 13:03:22 +02:00
Evgeniy Khramtsov
4ff8d7918a
Change code to reflect recent changes in fxml_gen
2016-08-05 08:41:08 +03:00
Holger Weiss
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
Evgeniy Khramtsov
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
Evgeniy Khramtsov
ca217dc105
Rewrite HTTP Bind and Web Admin code to use XML generator
2016-08-04 13:41:38 +03:00
Evgeniy Khramtsov
8b81b9ecb1
Rewrite PIEFXIS code to use XML generator
2016-08-04 13:37:07 +03:00
Evgeniy Khramtsov
cbdc106427
Rewrite jd2ejd to use XML generator
2016-08-04 12:34:12 +03:00
Evgeniy Khramtsov
bc33a3873d
Rewrite multicast code to use XML generator
2016-08-04 11:49:17 +03:00
Christophe Romain
72b0fb49e8
Fix type convertion bug injected by 4ccc40b
( #1229 )
2016-08-04 09:49:23 +02:00
Alexey Shchepin
111aa83f5e
Add tokens cache to ejabberd_oauth
2016-08-04 01:59:28 +03:00
Evgeniy Khramtsov
abb4446b51
Fix calls to undefined functions
2016-08-03 21:00:22 +03:00
Evgeniy Khramtsov
a417fbf45b
Rewrite mod_irc to use XML generator
2016-08-03 20:57:05 +03:00
Evgeniy Khramtsov
5d06c6acbf
Rewrite mod_configure to use XML generator
2016-08-03 10:34:54 +03:00
Holger Weiss
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
Holger Weiss
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
Alexey Shchepin
4add262090
Add OAUTH SQL backend
2016-08-01 16:55:43 +03:00
Mickael Remond
76eba3647a
Implement gen_mod callback in ModPresenceDemo module
2016-08-01 15:46:14 +02:00
Mickaël Rémond
2ef58a33a9
Merge pull request #1223 from processone/expand_api
...
More API fixes and improvements
2016-08-01 15:36:47 +02:00
Mickael Remond
d02d7b2b6a
Remove compile warning
2016-08-01 15:35:54 +02:00
Mickael Remond
90ea3ca361
Improve error message when try to call api on api root
2016-08-01 15:29:47 +02:00
Christophe Romain
bf45c9eeee
Switch mix worker to transient
2016-08-01 14:09:16 +02:00
Christophe Romain
a9c6748ec7
Add missing comas in sql statement ( #1219 )
2016-08-01 10:55:02 +02:00
Mickael Remond
4982639d05
Fix error return expectation in command test
2016-08-01 09:28:54 +02:00
Mickael Remond
c5c394e929
Fix HTTP process return formatting
2016-08-01 08:58:49 +02:00
Mickael Remond
6ea7153e31
Improve error handling
2016-07-31 22:48:24 +02:00
Evgeniy Khramtsov
c0272ae766
Rewrite mod_stats to use XML generator
2016-07-31 14:51:16 +03:00
Evgeniy Khramtsov
e258462b6b
Improve vCard creation from LDAP result
2016-07-31 14:17:17 +03:00
Evgeniy Khramtsov
0bcbd12776
Rewrite mod_mix to use XML generator
2016-07-31 08:51:47 +03:00
Mickael Remond
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
Mickael Remond
674a8039ef
Add support for sending back missing scope error to API ReST command calls
2016-07-30 18:51:54 +02:00
Mickael Remond
4bf8ce7681
Make s2s stats commands more robust
2016-07-30 18:50:58 +02:00
Evgeniy Khramtsov
eb1d385d4e
Get rid of "jlib.hrl" dependency in mod_service_log
2016-07-30 18:42:17 +03:00
Evgeniy Khramtsov
5cd1cf5096
Get rid of "jlib.hrl" dependency in some modules
2016-07-30 18:37:57 +03:00
Evgeniy Khramtsov
792e6a7c1c
Rewrite mod_http_upload to use XML generator
2016-07-30 17:48:52 +03:00
Mickael Remond
19ad6e6145
Ensure ejabberdctl status result is in valid shell supported range
2016-07-30 13:18:39 +02:00
Mickael Remond
39640b67c7
Add support for rich error reporting for API
2016-07-30 13:08:30 +02:00
Evgeniy Khramtsov
d2d3b961eb
Rewrite mod_sic to use XML generator
2016-07-30 13:30:29 +03:00
Mickael Remond
fb2603d3cd
Return 409 conflict error code on register if user already exists
2016-07-30 11:50:04 +02:00
Mickaël Rémond
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
Evgeniy Khramtsov
f19d2fdcff
Rewrite mod_shared_roster backends module to use XML generator
2016-07-30 08:39:30 +03:00
Evgeniy Khramtsov
a093e9d441
Rewrite mod_shared_roster to use XML generator
2016-07-30 08:37:34 +03:00
Mickael Remond
42e6f72ee9
Do not crash on check when we do not have JID
2016-07-29 20:38:05 +02:00
Evgeniy Khramtsov
9bf1bac7df
Rewrite mod_vcard_ldap to use XML generator
2016-07-29 17:39:13 +03:00
Evgeniy Khramtsov
f91f2bc3d2
Rewrite several modules to use XML generator
2016-07-29 13:21:00 +03:00
Christophe Romain
3c58a93eb8
Merge pull request #1178 from candrews/patch-1
...
Harden the systemd unit
2016-07-29 11:33:32 +02:00
Christophe Romain
a080322055
Switch workers from temporary to transient
2016-07-29 11:18:42 +02:00
Paweł Chmielowski
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
Christophe Romain
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
gabrielgatu
91865c66c0
Start elixir application after ejabberd_app:start_apps()
2016-07-28 15:57:35 +02:00
Mickaël Rémond
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
Evgeniy Khramtsov
b31ebd2ea0
Rewrite captcha to use XML generator
2016-07-28 15:10:41 +03:00
Evgeniy Khramtsov
96e912b09a
Rewrite mod_register to use XML generator
2016-07-27 18:06:54 +03:00
Evgeniy Khramtsov
8275e95a16
Swap variables in their correct places
2016-07-27 18:06:34 +03:00
Evgeniy Khramtsov
1097d31d63
Fix type spec for set_from_to/3
2016-07-27 18:05:11 +03:00
Evgeniy Khramtsov
c409ed2f2c
Rewrite S2S and ejabberd_service code to use XML generator
2016-07-27 10:45:08 +03:00
Holger Weiss
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
Evgeniy Khramtsov
984c4cf6bd
Add 'allow_subscription' MUC configuration option
2016-07-26 14:37:28 +03:00
Mickael Remond
2a8005e47f
Add ability to run test with Elixir mix
2016-07-26 12:17:37 +02:00
Mickael Remond
7781f39b74
Clarify command module API
2016-07-26 12:15:03 +02:00
Mickael Remond
e5fd1ee4f6
Avoid starting several time the owner process
2016-07-26 12:12:48 +02:00
Mickael Remond
9ff7257287
Make jlib ETS table more resilient
2016-07-26 11:58:14 +02:00
Mickael Remond
12f74b4aa7
Fix list appending bug
2016-07-26 11:57:38 +02:00
Mickael Remond
fede85c9bd
Remove unused import
2016-07-26 11:53:34 +02:00
Evgeniy Khramtsov
23858469b7
Get rid of "jlib.hrl" dependency in some files
2016-07-26 11:29:17 +03:00
Evgeniy Khramtsov
c26d38a893
Remove jlib dependency from acl.erl
2016-07-26 10:01:59 +03:00
Evgeniy Khramtsov
da310a5173
Rewrite mod_adhoc and mod_announce to use XML generator
2016-07-26 09:52:29 +03:00
Alexey Shchepin
839490b0d9
Add DB backend support for ejabberd_oauth
2016-07-25 20:08:30 +03:00
Mickael Remond
dbc0498279
Fix tests, command need to be properly added to list of exposed commands
2016-07-25 18:28:40 +02:00
Mickael Remond
c183092aa4
Simplify code for command policy group expansion
2016-07-25 18:28:05 +02:00
Badlop
5d4f8bcf0d
Export acl:parse_ip_netmask/1 for mod_rest (ejabberd-contrib#175)
2016-07-25 16:57:05 +02:00
Evgeniy Khramtsov
179fcd9521
Rewrite mod_mam and mod_muc to use XML generator
2016-07-25 13:50:30 +03:00
Mickael Remond
d7ad99f147
Initial attempt on access on commands
...
May change and will require more work / test / refactor
2016-07-25 11:43:49 +02:00
Holger Weiss
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
Mickael Remond
b4a430541d
Return more user friendly, human readable error description
2016-07-24 14:10:12 +02:00
Mickael Remond
bfa61eaa46
Make default OAuth token TTL values more user friendly
2016-07-23 18:57:57 +02:00
Mickael Remond
68555ff466
Add support for checking access rules conformance for commands
2016-07-23 18:21:45 +02:00
Mickael Remond
caf2c20210
Error when not authorized should be 403
2016-07-23 18:21:45 +02:00
Mickael Remond
1485b56211
Move any access rules check to ACL module
2016-07-23 18:21:45 +02:00
Mickael Remond
2c70c572c8
Clean-up of error codes and format json structure
2016-07-23 18:21:45 +02:00
Holger Weiss
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
Holger Weiss
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
Pablo Polvorin
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
Pablo Polvorin
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
Pablo Polvorin
12b58b9870
Fix elixir test case: stringprep was required
2016-07-22 16:25:54 -03:00
Pablo Polvorin
caf7b54305
oauth: single jid field instead of username/password fields
2016-07-22 15:37:48 -03:00
Badlop
c5d9d35e7b
Convert password provided by web form to UTF8 before passing it ( #375 )
2016-07-22 16:52:13 +02:00
Jerome Sautret
ffbe97d988
Quote postgresql database name ( #1136 )
2016-07-22 16:33:40 +02:00
Paweł Chmielowski
bdfef09c0f
Fix handling of complex values as arguments in http_api
2016-07-22 15:26:27 +02:00
Evgeny Khramtsov
dd38bef8b1
Merge pull request #1201 from xmppjingle/master
...
External Component Connection Hooks
2016-07-22 00:35:43 +04:00
xmppjingle
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
Pablo Polvorin
cbfab687e8
Oauth callback must pass expires_in as ttl instead of epoch
2016-07-20 14:47:11 -03:00
Paweł Chmielowski
c2753cd51c
Use different version of elixir depending on erlang version
2016-07-20 10:12:00 +02:00
Paweł Chmielowski
5458d8bfcb
Add else branch to if_version_{above,below}
2016-07-20 10:11:34 +02:00
Paweł Chmielowski
7748dd4e5d
Make processing of if_* clauses in rebar.config recursive
2016-07-20 10:11:08 +02:00
Pablo Polvorin
0c0c6465ba
Fix test for changes in oauth expiry
2016-07-19 20:36:02 -03:00
Pablo Polvorin
b5a90be3cb
Merge branch 'master' of github.com:processone/ejabberd
2016-07-19 20:19:17 -03:00
Pablo Polvorin
1d317e8068
Let user choose the desired oauth token TTL
2016-07-19 20:18:07 -03:00
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
5d90292849
Fix hooks de-registration
2016-07-19 15:33:17 +03:00
Mickael Remond
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
Mickael Remond
f79ac6874e
Lock relx version as newer version does not compile fine
2016-07-19 12:35:45 +02:00
Paweł Chmielowski
655cbf6055
Make access rules in ejabberd_web_admin configurable
2016-07-19 11:27:45 +02:00
Evgeniy Khramtsov
bc802a4049
Rewrite mod_blocking to use XML generator
2016-07-19 10:07:04 +03:00
Evgeniy Khramtsov
a4a9dd7f03
Rewrite mod_offline to use XML generator
2016-07-19 07:56:14 +03:00
Pablo Polvorin
483ef09263
Fix command argument formatting
2016-07-19 00:51:04 -03:00
Pablo Polvorin
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
Pablo Polvorin
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
xmppjingle
48c88b61b6
Merge remote-tracking branch 'processone/master'
2016-07-18 17:55:31 -03:00
xmppjingle
fca2f24231
External Component Connection Hooks
2016-07-18 17:55:10 -03:00
Holger Weiss
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
Evgeniy Khramtsov
9a8e197d7e
Initial version based on XML generator
2016-07-18 15:01:32 +03:00
Holger Weiss
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
Evgeniy Khramtsov
f6e960d326
Fix compilation error
2016-07-10 08:45:24 +03:00
Evgeniy Khramtsov
786bd4f26c
Use hooks instead of direct calls to mod_mam
2016-07-09 12:43:01 +03:00
Holger Weiss
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
Mickael Remond
1a62d4e04b
Update stringprep and iconv
2016-07-08 18:28:51 +02:00
Christophe Romain
6b38d19085
Do send last items only for subscription on current plugin type
2016-07-08 15:18:39 +02:00
Evgeniy Khramtsov
661b041302
Rename MUC/Sub's namespace
2016-07-08 15:07:26 +03:00
Evgeniy Khramtsov
368b202144
Handle MUC/Sub subscriptions list request
2016-07-08 15:07:10 +03:00
Evgeniy Khramtsov
caaf02eaa0
Advertise MUC/Sub support in MUC service disco#info
2016-07-08 15:06:08 +03:00
Evgeniy Khramtsov
32de9a56a5
Experimental MUC/Sub support
2016-07-08 15:05:50 +03:00
Mickael Remond
febbc2bb5a
Update dependencies
2016-07-08 11:40:28 +02:00
Evgeniy Khramtsov
71f27ee7d4
Get rid of warnings
2016-07-07 12:17:38 +03:00
Evgeniy Khramtsov
c718cbbd9f
Warn on cyclic modules dependencies
2016-07-07 11:34:17 +03:00
Badlop
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
Evgeniy Khramtsov
4220a2b98c
Make modules loading in a dependent order ( #1191 )
2016-07-06 14:58:48 +03:00
Christophe Romain
de9f80f2ce
Add missing '/' for jid matching from commit e300f80
2016-07-06 10:06:17 +02:00
Alexey Shchepin
be3a4acb55
Fix missed escaping in node_flat_sql.erl
2016-07-05 17:45:37 +03:00
Christophe Romain
3820aaa421
Quote reserver 'type' keyword for pgsql to fix e300f80
2016-07-05 16:16:40 +02:00
Christophe Romain
e300f8095d
Fix use of like parameter in sql pubsub's requests
2016-07-05 15:43:59 +02:00
gabrielgatu
b31c0d9e2e
Support elixir module installer
2016-07-05 12:36:49 +02:00
Holger Weiss
8e04a7ef4d
mod_configure: Fix editing of access rules
2016-07-03 22:58:54 +02:00
Paweł Chmielowski
16b1d8541a
Grab new p1_utils that has fix for R19
2016-07-01 21:41:12 +02:00
Paweł Chmielowski
0737958b45
Fix compilation issues on R19
2016-07-01 21:20:10 +02:00
Mickael Remond
024124decb
Fix dependencies when using Elixir Mix
2016-06-30 11:35:42 +02:00
Mickael Remond
88ac1dc56b
Update dependencies
2016-06-30 11:33:38 +02:00
Holger Weiss
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
Holger Weiss
10d4c16a97
mod_client_state: Throttle PEP stanzas by default
2016-06-29 22:22:49 +02:00
Pablo Polvorin
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
Craig Andrews
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
Paweł Chmielowski
3446aba753
Include correct version in stream:stream when reporting errors
...
This fixes issue #1174
2016-06-27 16:40:57 +02:00
Paweł Chmielowski
75366ca2fd
Inline muc access rules
2016-06-24 15:12:58 +02:00
Paweł Chmielowski
f56cff925c
acl: ACLName rule should match if any part of ACLName matches
2016-06-24 15:09:51 +02:00
Christophe Romain
94461948db
Update dependencies for 16.06x
2016-06-24 11:12:18 +02:00
Christophe Romain
0b438d09d1
Fix typo from d8bb5d9c
2016-06-23 17:31:32 +02:00
Christophe Romain
06bf8cb032
Prepare hex.pm release
2016-06-23 15:23:28 +02:00
Holger Weiss
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
Paweł Chmielowski
1b5c50a384
When convertion of xmlrpc argument to type fails, report it as error
2016-06-23 10:41:16 +02:00
Jerome Sautret
a9b456ccb3
xref was broken when Elixir wasn't enabled
2016-06-23 10:23:02 +02:00
Paweł Chmielowski
2ebdd8915e
Compile gen_mod early to help with undefined behaviour warnings
2016-06-23 10:22:01 +02:00
Evgeny Khramtsov
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
Holger Weiss
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
Paweł Chmielowski
751be3cca6
Add some tests for {shaper,access}_rules_validator
2016-06-22 16:52:45 +02:00
Christophe Romain
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
Christophe Romain
f029488260
Restore get_items conditions when not using RSM ( #1147 )
2016-06-22 13:12:40 +02:00
Badlop
eeeb190680
Set HTTP/1.0 so github accepts the request ( #1157 )
2016-06-22 12:43:24 +02:00
Christophe Romain
95ff94b054
Fix PubSub RSM on get_items ( #1147 )
2016-06-22 12:25:41 +02:00
Christophe Romain
7744339347
Update supported xep version
2016-06-22 11:24:01 +02:00
Christophe Romain
2efa8677c9
Fix pgsql compatibility on delete_old_messages ( #1137 )
2016-06-22 11:21:11 +02:00
Holger Weiss
c928956d73
XEP-0198: Apply cosmetic changes
2016-06-21 23:17:17 +02:00
Holger Weiss
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
Paweł Chmielowski
3a8da27d86
Use {access,shaper}_rules_validator in other places where access rules are used
2016-06-21 13:18:24 +02:00
Paweł Chmielowski
52d45604ba
Use new access_rules_validator in couple places
2016-06-21 12:28:53 +02:00
Paweł Chmielowski
804190e4a8
Add acl:{access,shaper}_rules_validator for use in {mod_}opt_type()
2016-06-21 12:26:31 +02:00
Paweł Chmielowski
4b9613e8fe
Allow {mod_}opt_type to transform values passed to it, and for better error reporting
2016-06-21 12:25:29 +02:00
Christophe Romain
b2f53fb962
Avoid cleanup on bag when disc_only, switch in memory ( #1161 )
2016-06-21 10:43:19 +02:00
Holger Weiss
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
Christophe Romain
6f2b0179e7
Give more time to stop and kill epmd ( #882 )
2016-06-17 17:09:45 +02:00
Christophe Romain
8583958268
Use shorter jid acl in config template
2016-06-17 11:58:51 +02:00
Paweł Chmielowski
d1425f0d78
Use new short access rules in config template
2016-06-16 11:13:07 +02:00
Paweł Chmielowski
f1138baa80
Add test for more allowed access_rules
2016-06-16 11:12:16 +02:00
Paweł Chmielowski
1fb1e8721b
Allow using shaper defined by name like in in s2s_shaper: fast
2016-06-16 11:04:01 +02:00
Paweł Chmielowski
0a09f27373
Typo in option name
2016-06-16 11:00:38 +02:00
Paweł Chmielowski
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
Badlop
9004608181
Check password with jid:resourceprep when registering account ( #996 )
2016-06-14 23:35:47 +02:00
Holger Weiss
26bce5dee3
mod_mam: Fix "assume_mam_usage: if_enabled"
2016-06-14 16:40:46 +02:00
Badlop
34cf693231
Recover ec6c58a
which was reverted in 100827e
(thanks to Alexey Shchepin)
2016-06-10 13:18:32 +02:00
Mickael Remond
0e61e57ed9
Preparing hex.pm release to fix lager bug
2016-06-10 11:02:45 +02:00
Mickael Remond
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 4c87abcd4f
2016-06-10 11:01:46 +02:00
Badlop
4ccc40bce5
push_roster must convert read strings to binaries ( #1075 )
2016-06-08 21:16:30 +02:00
Badlop
53f3a45803
Recover fix of 907e239
lost in 9deb294
(thanks to Alexey Shchepin)
2016-06-08 19:34:05 +02:00
Badlop
858d880675
Allow again multiple fqdn values in configuration (EJAB-1578)
2016-06-08 19:28:17 +02:00
badlop
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
Badlop
5173de503c
Produce mod_last entry on account creation ( processone/ejabberd-contrib#62 )
2016-06-08 13:02:20 +02:00
Badlop
8a7b31ca63
When stopping ejabberd, stop modules after broadcasting c2s shutdown ( #1144 )
2016-06-07 18:41:38 +02:00
Paweł Chmielowski
f8d2589ee5
Add tests for new acl functions
2016-06-06 17:12:39 +02:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Pablo Polvorin
41c3751fa1
Fix quicktest case
...
Missing initialization, required for ets table to exists
2016-06-05 16:35:51 -03:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
5c1db176a9
Fix "unused variable" warning
2016-06-03 12:58:20 +02:00
Badlop
0503d899cf
Fix problem in dfee843
when non-occupant admin kicks an occupant ( #1135 )
2016-06-03 00:10:25 +02:00
Alexey Shchepin
0093326f7d
Fix ejabberd.ldif
2016-06-02 18:56:27 +03:00
Alexey Shchepin
9ef52b8c64
Fix a typo
2016-06-02 18:22:50 +03:00
Alexey Shchepin
d201f013b2
Stronger tests in the test suite, SQL updates and fixes
2016-06-02 18:09:58 +03:00
Badlop
5352037680
Report in SQL when scram is enabled but the stored password isn't ( #1096 )
2016-06-01 20:48:52 +02:00
Holger Weiss
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
Paweł Chmielowski
9c27f31d72
Process cover information on travis only if cover support is enabled
2016-05-31 12:12:46 +02:00
Christophe Romain
e7843bf92b
Fix set_presence API
2016-05-31 11:47:08 +02:00
Paweł Chmielowski
db240413ab
Disable cover analyzys on R17 as this causes problems with elixir tests
2016-05-31 11:29:19 +02:00
Paweł Chmielowski
8e883a76e3
Update test after roster code reorganization
2016-05-31 00:09:26 +02:00
Paweł Chmielowski
622bff23a4
Update test
2016-05-31 00:07:26 +02:00
Paweł Chmielowski
be0dd51e51
Fix mod_http_api_test.exs
2016-05-30 23:06:29 +02:00
Paweł Chmielowski
fc2b7018cc
More strict check for commands with policy user
2016-05-30 23:06:29 +02:00
Paweł Chmielowski
17f87eb899
Fix tests
2016-05-30 23:06:29 +02:00
Paweł Chmielowski
1ade88402c
Better code for setting up ejabberd app location
2016-05-30 23:06:29 +02:00
Paweł Chmielowski
f252b9d489
Update acl tests to new internal access rules syntax
2016-05-30 14:36:17 +02:00
Paweł Chmielowski
1d3959b5a2
Make tests run correctly even when ejabberd src in not in ejabberd-xxx dir
2016-05-30 14:35:53 +02:00
Paweł Chmielowski
e81302dc79
Allow @ inside acl user{,_glob,_regexp} to pass both user and server in single string
2016-05-30 12:30:44 +02:00
Paweł Chmielowski
9e68c4c0d9
Convert example config to use new syntax for access rules
2016-05-26 11:08:53 +02:00
Paweł Chmielowski
1981e13326
Allow passing username and ip to ejabberd_comamnds, and use it in mod_http_api
2016-05-26 11:08:53 +02:00
Paweł Chmielowski
fffae97940
Use acl:access_matches in c2s
2016-05-26 11:08:53 +02:00
Paweł Chmielowski
49658e1655
New ACL infrastructure
2016-05-26 11:08:53 +02:00
Paweł Chmielowski
c55319c81e
Do not call transform_terms multiple times on configs when merging them
2016-05-26 11:08:53 +02:00
Paweł Chmielowski
13ead140f4
Copy lite.sql to place where tests expect it in failback mode
2016-05-26 11:08:53 +02:00
Badlop
ca329826cb
Retrieve parenthesis for easy reading, lost in old commit 9deb294
2016-05-25 12:44:05 +02:00
Evgeny Khramtsov
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
Evgeny Khramtsov
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
Christophe Romain
639e9fab4e
Merge pull request #1132 from weiss/publish-options
...
Add support for PubSub publishing options
2016-05-25 07:49:55 +00:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
8c16fdf59f
mod_mam_mnesia: Clarify error message
2016-05-24 07:58:07 +02:00
Holger Weiss
a2f0e157bc
ejabberd_auth*: Fix indentation
2016-05-24 00:40:25 +02:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
vthriller
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Badlop
ba2680df61
Delete duplicated command export_sql, use export2sql instead ( #1118 )
2016-05-16 17:57:57 +02:00
Tobias Kräntzer
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
Holger Weiss
ff199a323d
Fix jid:from_string/1 function specification
2016-05-15 16:19:13 +02:00
Alexey Shchepin
64bb371285
Fix a typo
2016-05-13 18:22:59 +03:00
Alexey Shchepin
9bd446e519
Less strict extauth.py
2016-05-13 17:56:52 +03:00
Alexey Shchepin
792f47b4bd
Update SQL escaping
2016-05-13 17:56:48 +03:00
Evgeniy Khramtsov
be2a9e35ae
Fix C2S session data leak ( #1078 )
2016-05-09 14:18:47 +03:00
Evgeniy Khramtsov
068db1a2d9
Handle Redis connection in a separate module
2016-05-09 08:36:30 +03:00
Holger Weiss
4717d64d7a
mod_client_state: Delete only the configured hooks
2016-05-08 16:45:31 +02:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Badlop
86d5cf6d6c
Don't require ejabberd to be installed to run "make translations"
2016-05-06 13:47:02 +02:00
Alexey Shchepin
b2ffa1db96
Add missed jlib:term_to_expr and jlib:expr_to_term functions
2016-05-05 16:42:48 +03:00
Alexey Shchepin
0ea0ba3004
Update more SQL queries
2016-05-05 15:51:58 +03:00
Holger Weiss
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
Christophe Romain
13c6430341
Add missing odbc->sql in comment from commit 1aae8a9f
2016-05-04 09:11:18 +02:00
Holger Weiss
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
Holger Wei
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
Holger Weiss
575ef9c619
Merge remote-tracking branch 'processone/pr/1102'
...
* processone/pr/1102:
Fix ejabberdctl.template duplication
2016-05-03 19:07:11 +02:00
Matthias Rieber
5e5328da4a
Fix ejabberdctl.template duplication
2016-05-03 16:36:20 +02:00
Holger Weiss
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
Paweł Chmielowski
0c0ce17bc0
Add ability to configure server loglevel when running tests
2016-05-02 15:25:30 +02:00
Christophe Romain
8a6c51290a
Pass noauth when auth isn't provided
2016-05-02 15:07:00 +02:00
Juan Pablo Carlino
671bc4e573
Use MEDIUMTEXT type for muc_room.opts in MySQL schema
2016-05-02 15:06:40 +02:00
Christophe Romain
07196b6c62
Fix sender in case of explicit pep subscriptions
2016-05-02 15:04:14 +02:00
Paweł Chmielowski
53e1100cc4
Don't halt program when include_config_file is missing/can't be read
2016-05-02 14:52:23 +02:00
Evgeniy Khramtsov
47050db6b8
Don't forget to import mod_opt_type/1 in mod_metrics
2016-05-02 12:18:18 +03:00
Holger Weiss
d54f211514
Add mod_opt_type/1 callback to gen_mod behaviour
2016-05-01 22:09:40 +02:00
Holger Weiss
b46ed7044a
Cope with modules that don't export mod_opt_type/1
2016-05-01 22:06:15 +02:00
Holger Weiss
b202004862
ejabberdctl: Fix path to epmd
2016-05-01 21:29:59 +02:00
Evgeniy Khramtsov
8700a3401e
Add tests for MUC MAM
2016-05-01 12:48:23 +03:00
Evgeniy Khramtsov
82082f1799
Add behaviour to mod_vcard_xupdate DB modules
2016-05-01 11:03:20 +03:00
Evgeniy Khramtsov
3493a87469
Fix typo in mod_mam:select() ( #1098 )
2016-04-30 21:37:18 +03:00
Christophe Romain
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
Christophe Romain
639c2fb640
Add pubsub subscribe/unsubscribe hook
2016-04-28 15:57:55 +02:00
Evgeniy Khramtsov
c585f74730
Better formatting of configuration problem log message
2016-04-28 09:03:05 +03:00
Mickael Remond
d18fe138aa
Update esip and stun to match Fast TLS version
2016-04-27 16:22:47 +02:00
Christophe Romain
d6f02a51e4
Use fast_tls 1.0.3
2016-04-27 16:18:24 +02:00
Evgeniy Khramtsov
9c369b7a8c
Improve detection of databases supported by modules ( #1092 )
2016-04-27 17:10:50 +03:00
Christophe Romain
d8bb5d9c01
Force ERL_PATH for elixir
2016-04-27 12:32:01 +02:00
Mickael Remond
26d3a978cc
Update stun and esip dependencies
2016-04-27 12:19:55 +02:00
Mickael Remond
0f06ed8a9b
Prepare 16.04 release
2016-04-27 11:59:05 +02:00
Mickael Remond
d1db9f92c4
We now use fast_tls 1.0.2
2016-04-27 11:54:50 +02:00
Evgeniy Khramtsov
52fde758b3
Get rid of "internal" DB type. This also fixes #1092
2016-04-27 09:44:32 +03:00
Christophe Romain
b79aef3bbc
SCRIPT_DIR needed for release
2016-04-25 15:26:23 +02:00
Christophe Romain
bae24464d3
Remove useless variable and quote EPMD and SPOOL_DIR
2016-04-25 14:26:04 +02:00
Christophe Romain
ef90a389c1
Fix use of pubsub node plugin when configured with default_node_config
2016-04-25 09:44:46 +02:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
65ad70d7dc
Fix error text for message bounces
2016-04-25 00:53:48 +02:00
Holger Weiss
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
Holger Weiss
58478e52bf
Don't omit bounces for messages of type "result"
2016-04-24 22:47:53 +02:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
badlop
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
Holger Weiss
f0e6def3ed
Set default value for pubsub#itemreply option
2016-04-21 23:47:07 +02:00
Christophe Romain
8487b51ecd
Fix node ping command
2016-04-21 12:16:21 +02:00
Christophe Romain
f7d4aae64d
Use UUID for ctl node name ( #1021 )
2016-04-21 12:00:51 +02:00
Paweł Chmielowski
97e3a33077
Accept commands: add_commands syntax (along commands: - add_commands)
2016-04-21 11:16:36 +02:00
Evgeniy Khramtsov
1aae8a9fda
Rename odbc to sql everywhere
2016-04-20 13:25:42 +03:00
Evgeniy Khramtsov
fafeeb80c2
Rename ejabberd_sm_odbc -> ejabberd_sm_sql
2016-04-20 09:11:02 +03:00
Christophe Romain
655c22021b
Fix hometree root check ( #1070 )
2016-04-19 15:18:32 +02:00
Holger Weiss
382c6ce1fb
Specify type of second terminate/2 parameter
2016-04-19 09:15:09 +02:00
Paweł Chmielowski
0bdcafdb02
Use erlang 18.3 in travis tests
2016-04-18 14:25:41 +02:00
Badlop
e5e4f39c01
Remove --auth in ejabberd_ctl.erl as it's useless, still useful for mod_rest
2016-04-15 15:35:57 +02:00
Evgeniy Khramtsov
222572bd56
Clean mod_carboncopy.erl from DB specific code
2016-04-15 15:48:56 +03:00
Evgeniy Khramtsov
64fdbe7866
Add mod_mam header file
2016-04-15 15:13:38 +03:00
Evgeniy Khramtsov
fb0ecf3361
Merge branch 'move-db-code'
2016-04-15 15:12:12 +03:00
Evgeniy Khramtsov
52571e8624
Clean mod_mam.erl from DB specific code
2016-04-15 15:11:31 +03:00
Evgeniy Khramtsov
901d2e0aed
Clean mod_offline.erl from DB specific code
2016-04-15 13:44:33 +03:00
Evgeniy Khramtsov
860db2ddca
Clean mod_blocking.erl from DB specific code
2016-04-14 14:17:20 +03:00
Evgeniy Khramtsov
c8c4a41b66
Clean mod_privacy.erl from DB specific code
2016-04-14 14:16:32 +03:00
Evgeniy Khramtsov
79d64e0d71
Clean mod_irc.erl from DB specific code
2016-04-14 12:18:04 +03:00
Evgeniy Khramtsov
f8e3560ad2
Clean mod_shared_roster.erl from DB specific code
2016-04-14 11:45:43 +03:00
Evgeniy Khramtsov
398f1de5ae
Clean mod_roster.erl from DB specific code
2016-04-14 10:58:32 +03:00
Evgeniy Khramtsov
0b439a7d5b
Clean mod_muc.erl from DB specific code
2016-04-13 21:07:32 +03:00
Evgeniy Khramtsov
ae69f09257
Clean mod_vcard.erl from DB specific code
2016-04-13 17:37:52 +03:00
Evgeniy Khramtsov
ef70ce65ab
Clean mod_private.erl from DB specific code
2016-04-13 14:09:34 +03:00
Evgeniy Khramtsov
b5d1ce795f
Clean mod_announce.erl from DB specific code
2016-04-13 13:04:04 +03:00
Evgeniy Khramtsov
cd094bc903
Clean mod_caps.erl from DB specific code
2016-04-13 11:41:04 +03:00
Evgeniy Khramtsov
2d7e03f5e1
Clean mod_vcard_xupdate.erl from DB specific code
2016-04-13 11:06:59 +03:00
Mickaël Rémond
b2abc1edb7
Add preliminary tests on ACL module and prepare clean-up / refactor
2016-04-13 09:45:56 +02:00
Evgeniy Khramtsov
7fd4808cde
Clean mod_last.erl from DB specific code
2016-04-13 09:59:39 +03:00
Evgeniy Khramtsov
5eef8a8bcf
Make it possible to get DB backend of a module
2016-04-13 09:56:10 +03:00
Mickael Remond
cd2e2b1a88
Synchronizing master changes
2016-04-12 10:34:24 +02:00
Mickael Remond
5958a91428
Fix typo in error message
2016-04-12 10:27:43 +02:00
Holger Weiss
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
Badlop
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
Badlop
695592a38c
Update check_password tests are the command now is fixed
2016-04-11 13:39:35 +02:00
badlop
bd3b7cd2df
Merge pull request #1064 from sezuan/fix_check_password
...
Fix check_password
2016-04-11 13:38:22 +02:00
Matthias Rieber
b67dc00db2
Fix check_password
2016-04-10 15:37:36 +02:00
Mickael Remond
127342449e
Allow testing user pattern directly in access rules
2016-04-08 19:45:25 +02:00
Paweł Chmielowski
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
Mickael Remond
1dbdd58b1b
Add TODO to improve ACL
2016-04-08 12:55:35 +02:00
Evgeniy Khramtsov
c5dbdfc71a
'serverkey' and 'salt' should have empty string as default
2016-04-08 13:02:08 +03:00
Paweł Chmielowski
86dfbe6ece
Make sure that ejabberd_sm sid are unique
2016-04-08 10:52:29 +02:00
Evgeniy Khramtsov
b83ec483e9
Send stream trailer at the very end
2016-04-08 11:49:50 +03:00
Paweł Chmielowski
afd3accf75
Generate shorted jid for anonymous connections
2016-04-07 16:47:30 +02:00
Paweł Chmielowski
0935f493ee
Add tests for anonymous and digest-md5 auth
2016-04-07 16:47:01 +02:00
Mickael Remond
373f9fb0eb
Add tests on Access rules returning values
2016-04-07 13:04:58 +02:00
Mickael Remond
60c0c8e968
Add test when mixing ip / user rules
2016-04-07 12:35:29 +02:00
Paweł Chmielowski
18557fa3d6
Start of tests for cyrsasl module
2016-04-07 12:28:19 +02:00
Mickael Remond
a938af4180
IP based ACL / Access rules and sequential evaluation of rules
2016-04-07 12:06:30 +02:00
Paweł Chmielowski
d5c29360fb
Fix anonymous auth
2016-04-07 10:02:37 +02:00
Mickael Remond
48a1d818d6
Rebase master
2016-04-06 18:14:47 +02:00
Mickael Remond
eb36440c2e
Variant for user ACL test
2016-04-06 18:13:08 +02:00
Mickael Remond
47039aed15
Allow clearing all ACL and access rules
2016-04-06 18:13:08 +02:00
Mickael Remond
d45ad3e3a5
Add initial basic ACL test
2016-04-06 18:13:08 +02:00
Mickael Remond
5ad8c790c7
Export add_access/3 to allow setting ACL outside of yaml config file
2016-04-06 18:13:08 +02:00
Mickael Remond
5efcf0a175
Stringprep can already be started, do not check result
2016-04-06 18:11:46 +02:00
Mickael Remond
0916694e0e
Merge branch 'master' of github.com:processone/ejabberd
2016-04-06 17:56:01 +02:00
Mickael Remond
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
Badlop
27b4217a9d
Tweak srg_get_info result formatting ( #1048 )
2016-04-06 17:55:19 +02:00
Mickael Remond
a9e50468b6
Better error message in logs
2016-04-06 15:07:44 +02:00
Mickael Remond
abf768274a
Fix error message paramater formatting
2016-04-06 15:05:19 +02:00
Mickael Remond
f78b170c24
Add initial basic ACL test
2016-04-06 13:59:33 +02:00
Mickael Remond
991529a657
Export add_access/3 to allow setting ACL outside of yaml config file
2016-04-06 13:59:06 +02:00
Mickael Remond
b2279d481d
Merge branch 'master' of github.com:processone/ejabberd
2016-04-06 13:57:12 +02:00
Mickael Remond
267fdb2e95
Now we need to start stringprep before config
2016-04-06 13:51:05 +02:00
badlop
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
badlop
dd654fa794
Merge pull request #1052 from genric/patch-2
...
Fix mod_muc_admin:get_room_options
2016-04-06 13:25:46 +02:00
Mickael Remond
1b9b5f8e6a
Merge branch 'master' of github.com:processone/ejabberd
2016-04-06 12:59:58 +02:00
Mickael Remond
67b9b82261
We need to set hosts in options to be able to retrieve 'MYHOSTS'
2016-04-06 12:59:27 +02:00
Mickaël Rémond
2eee2de6e2
Merge pull request #1054 from richp10/master
...
upgrade stringprep to 1.03
2016-04-06 12:05:26 +02:00
richp10
acc11195f8
upgrade stringprep to 1.03
2016-04-06 08:40:10 +00:00
genric
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
Evgeniy Khramtsov
232915184c
Merge branch 'add-error-reason'
2016-04-05 13:10:09 +03:00
Evgeniy Khramtsov
9ac6e4edf7
Replace more ?ERR_* macros with ?ERRT_*
2016-04-05 13:09:44 +03:00
genric
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
Mickaël Rémond
ca9ac019eb
Merge pull request #1046 from processone/commands-update
...
Add support for versioning in ejabberd commands
2016-04-01 14:24:08 +02:00
Mickael Remond
e24da5789e
Apply fixes and remove tests for missing methods
2016-04-01 13:05:41 +02:00
Mickael Remond
47266de6d7
Do not use underscore variable
2016-04-01 12:24:49 +02:00
Mickael Remond
f243c30847
Rollback mod_admin_extra
2016-04-01 12:24:00 +02:00
Mickael Remond
2a2a47b5c6
Fix merge issues
2016-04-01 12:12:19 +02:00
Mickael Remond
b5f1479763
Fix tests, they are now running fine locally
2016-04-01 11:13:48 +02:00
Mickael Remond
a8f92ae767
Add logger macro to help troubleshooting Elixir tests
2016-04-01 11:11:42 +02:00
Mickael Remond
97d345d287
Port mod_admin_extra test to work with new API
2016-03-31 22:01:57 +02:00
Mickael Remond
ef2e2e45b3
Fix failing tests
2016-03-31 17:34:58 +02:00
Mickael Remond
3290a5ff15
Force protobuffs version to be able to use new meck release
2016-03-31 16:05:18 +02:00
Mickael Remond
7988e2e350
Merge lastest commits from master
2016-03-31 15:37:21 +02:00
Mickael Remond
dc0ca51ef1
Try keeping names of test same as master to limit merge conflicts
2016-03-31 15:06:41 +02:00
Mickael Remond
78c4a0d65f
Add test file whose name was conflicting during merge
2016-03-31 14:42:08 +02:00
Mickael Remond
91233eafaa
Use version of moka that do not depend on proper
2016-03-31 14:36:30 +02:00
Mickael Remond
da0751239c
Rename conflicting test file after merge
2016-03-31 14:33:34 +02:00
Alexey Shchepin
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
Mickael Remond
d35c5ebde5
Test / Document ejabberd_commands checks
2016-03-31 13:14:06 +02:00
Mickael Remond
3cfcdbb245
Check that various type of commands are properly rejected without auth
2016-03-31 12:38:53 +02:00
Mickaël Rémond
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
Evgeniy Khramtsov
fced8dc3d9
Replace some ?ERR_* macros with ?ERRT_*
2016-03-31 11:00:29 +03:00
Mickael Remond
c00cfca8e7
mix version updated for 16.03 release
2016-03-30 19:21:12 +02:00
Mickael Remond
3c480a5b0b
Fix Dialyzer inconsistency
2016-03-30 16:47:40 +02:00
Paweł Chmielowski
b160bd7ac1
Provide authzid in scream response
2016-03-30 16:08:04 +02:00
Mickael Remond
809057678b
Better error report when command is not exposed through API
2016-03-30 15:59:29 +02:00
Mickael Remond
36ac1cd6c7
Returns unauthorized error when we do not have correct credentials
2016-03-30 14:49:19 +02:00
Mickael Remond
ead83b008c
HTTP ReST API now supports 'open' ejabberd commands
2016-03-30 14:23:09 +02:00
Mickael Remond
6f25122f8c
Support flagging so Elixir tests as pending
2016-03-30 13:59:01 +02:00
Holger Weiss
bf79f223df
Travis CI: Cosmetic changes to Riak setup commands
2016-03-30 01:15:12 +02:00
Holger Weiss
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
Mickael Remond
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
Mickael Remond
6d7891ed16
Merge branch 'master' of github.com:processone/ejabberd
2016-03-29 15:45:57 +02:00
Mickael Remond
c7c70ffa0a
Add basic test for command registration
2016-03-29 15:45:48 +02:00
Badlop
78a44d8099
Move start and stop_modules/0 from ejabberd_app to gen_mod ( #1039 )
2016-03-29 15:26:34 +02:00
Mickael Remond
b49a615e21
Fix commands api option
2016-03-29 13:19:16 +02:00
Mickael Remond
3b2d0fd24a
Fix commands access check.
...
Fixes ECS-20
2016-03-29 13:06:13 +02:00
Mickael Remond
aa15148898
Fix commands access check.
2016-03-29 13:05:12 +02:00
Badlop
3809b898aa
Pass noauth when auth isn't provided, reverts a1129dc
( processone/ejabberd-contrib#159 )
2016-03-29 12:51:26 +02:00
Badlop
e386bf6b58
In SQL files create Users table with SCRAM support by default ( #956 )
2016-03-29 12:37:49 +02:00
Mickael Remond
221d8e0e5d
Merge branch 'master' of github.com:processone/ejabberd
2016-03-29 11:21:58 +02:00
Mickael Remond
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
Evgeniy Khramtsov
b0ef3e66a8
Update MSSQL schema
2016-03-29 11:53:13 +03:00
Evgeniy Khramtsov
7a9e93839a
Fix some LIMIT related problems with MSSQL
2016-03-29 11:34:00 +03:00
Mickael Remond
54ddc990c2
Use new fast_yaml
2016-03-29 09:21:24 +02:00
Mickaël Rémond
4afe0b195c
Merge pull request #1036 from processone/shared-roster-ldap
...
Fix issue getting shared roster
2016-03-25 19:36:10 +01:00
Evgeny Khramtsov
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
Evgeny Khramtsov
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
Mickael Remond
381065397f
Fix issue getting shared roster
...
I rollbacked to correct version and slightly refactored the code
2016-03-25 17:44:12 +01:00
Mickael Remond
a08ecc0f41
Proper naming for LDAP test function for shared roster
2016-03-25 17:42:58 +01:00
Mickael Remond
eace5fc463
Switch back to proper log level
2016-03-25 17:42:19 +01:00
Mickael Remond
0afcf561d6
Add test to demonstrate issue to retrieve roster with mod_shared_roster_ldap
2016-03-25 17:30:12 +01:00
Evgeniy Khramtsov
46568fb959
Merge commit 'refs/pull/524/head' of github.com:processone/ejabberd into sasl-api-change
2016-03-25 18:16:50 +03:00
Mickaël Rémond
c7cf95ba99
Merge pull request #1035 from processone/modular-tests-run
...
Allow running test groups independently
2016-03-24 15:46:51 +01:00
Christophe Romain
914578a85e
Fix start via systemd ( #978 )
2016-03-24 11:06:42 +01:00
Christophe Romain
df4c551f06
Specify lacking nodename (thanks to hamano)( #1020 )
2016-03-24 10:21:51 +01:00
Mickael Remond
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
Mickael Remond
7066338948
Enable Riak test suite on Travis-CI
2016-03-23 16:16:50 +01:00
Evgeniy Khramtsov
cb27a3540e
Fix is_connected/0 function
2016-03-22 20:01:23 +03:00
Evgeniy Khramtsov
61e914a83f
Keep alive Riak connections by default
2016-03-22 19:32:30 +03:00
Evgeniy Khramtsov
b90c3764c0
Fix a typo in travis.yml
2016-03-22 19:05:38 +03:00
Evgeniy Khramtsov
bdce5556bd
Tell Travis not to fail if some tests are skipped
2016-03-22 19:03:06 +03:00
Evgeniy Khramtsov
57f7b34b90
Do not auto append IP suffix to usernames ( #1008 )
2016-03-22 13:25:34 +03:00
Mickael Remond
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
Badlop
e7ef65a22d
Improve ban_account command to work with other DBs than Mnesia ( #977 )
2016-03-21 18:30:05 +01:00
Badlop
107569a17d
New command delete_mnesia deletes all tables that can be exported
2016-03-21 16:19:06 +01:00
Mickael Remond
0112135096
Elixir test suite is already run with global CT run command
2016-03-21 14:12:00 +01:00
Mickaël Rémond
4be9cc1b6d
Merge pull request #1029 from processone/coveralls
...
Add support for test code coverage
2016-03-21 12:45:02 +01:00
Mickael Remond
95475966fd
We do not have C code to cover, they are in dependencies.
2016-03-21 12:15:07 +01:00
Mickael Remond
ef04dd75aa
Add Coveralls support
2016-03-21 12:01:20 +01:00
Paweł Chmielowski
3441157a38
Use static key for mysql repo
2016-03-21 11:02:32 +01:00
Mickael Remond
c98df3c0da
Attempting to use other keyserver, as we see failure from Travis fetching
2016-03-21 10:06:07 +01:00
Mickael Remond
c924cd42ff
Run basic Elixir unit tests
2016-03-21 09:45:40 +01:00
Mickael Remond
31c194a682
Add simple Elixir unit test on jid:from_string
2016-03-21 09:44:23 +01:00
Mickael Remond
5b7dc0c215
Merge branch 'master' of github.com:processone/ejabberd
2016-03-21 09:43:14 +01:00
Mickael Remond
0e3026539e
Comment on error failures in logs + indenting
2016-03-21 09:42:59 +01:00
Badlop
dc7b2c45c2
Fix indentation of mod_register in default configuration file
2016-03-19 17:42:12 +01:00
Evgeny Khramtsov
cf9ef456b7
Merge pull request #1022 from hamano/riak_auth
...
riak authentication support
2016-03-18 23:10:37 +04:00
Randy Barlow
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
HAMANO Tsukasa
2d103b4ae1
support riak authentication
2016-03-19 01:41:14 +09:00
Christophe Romain
939bb244e1
Extend scope of ejabberdctl ping
2016-03-18 11:08:30 +01:00
Christophe Romain
f19a54e9a1
Escape quoting node name for ejabberdctl ping
2016-03-18 10:22:11 +01:00
Paweł Chmielowski
ef02053a9d
Fix issue #1015
2016-03-17 18:41:39 +01:00
Mickaël Rémond
d9bb3730b7
Merge pull request #926 from lpil/fix/remove-empty-mod
...
Remove empty and unused module
2016-03-16 18:28:01 +01:00
Paweł Chmielowski
7b72247b2c
Don't use jlib:jid_remove_resource
2016-03-16 13:32:19 +01:00
Paweł Chmielowski
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
Paweł Chmielowski
efbaba5d04
Make auto generated resources shorter
2016-03-16 11:30:45 +01:00
Badlop
c985a2bd3d
Start ezlib only if required, as it's optional ( #1006 )
2016-03-16 11:11:43 +01:00
Mickael Remond
74053b114e
When building Elixir inside ejabberd, rely on version 1.1 for Erlang R17 compliance
2016-03-16 09:01:40 +01:00
Mickael Remond
b40154f8f4
Update OTP release to use and drop release 17.1
...
Attempt to build with Elixir
2016-03-16 08:55:25 +01:00
Mickael Remond
3c2cd91fb1
Merge branch 'master' of github.com:processone/ejabberd
2016-03-15 22:42:15 +01:00
Mickael Remond
367adc2113
Better error reporting when running Elixir test suite
2016-03-15 22:42:07 +01:00
Paweł Chmielowski
5b5548b8ca
Produce less verbose logs for tests on travis
2016-03-15 18:14:27 +01:00
root
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
Holger Weiss
68675effac
Apply cosmetic changes to GitHub templates
2016-03-15 00:12:01 +01:00
badlop
3fef1a4435
Merge pull request #991 from suchatorg/patch-1
...
Update Galician (galego) translations
2016-03-14 17:08:30 +01:00
Carlos
7f25c3b3e8
Update gl.po
2016-03-14 16:52:16 +01:00
Evgeny Khramtsov
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
Badlop
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
Carlos
9440049208
Update gl.po
2016-03-14 12:47:52 +01:00
Holger Weiss
b871fbba1b
Fix result type of "connected_users_info" command
...
Closes #1002 .
2016-03-14 00:51:12 +01:00
Holger Weiss
91573a8e82
Don't store watchdog notifications in MAM archives
2016-03-14 00:05:50 +01:00
Evgeniy Khramtsov
55c567ff00
Unregister route at the very end
2016-03-13 17:37:39 +03:00
Evgeniy Khramtsov
5a4b7817df
Add ODBC backend for MIX
2016-03-13 15:38:50 +03:00
Evgeniy Khramtsov
50e5cdc2fa
Add ODBC tests for MIX
2016-03-13 13:16:55 +03:00
Evgeniy Khramtsov
5045fb584d
Define pubsub node configuration per route/host explicitly
2016-03-13 13:16:43 +03:00
Evgeniy Khramtsov
357e48fb6b
Make it possible to get virtual host of a registered route
2016-03-13 11:38:40 +03:00
Mickael Remond
9ceeaf213b
Provide guidance for issue reporting and pull requests on Github
2016-03-12 17:54:23 +01:00
Christophe Romain
9297782868
Fix config fetch after host/serverhost cleanup
2016-03-11 17:25:46 +01:00
Holger Weiss
0d1edc4771
Don't enable in-band registration by default
2016-03-11 12:31:16 +01:00
Mickaël Rémond
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
Elias Rohrer
8b03c0a385
Minimal auth_method ordering fix
2016-03-10 17:52:55 +01:00
Evgeniy Khramtsov
15ee72138a
Add tests for MIX
2016-03-10 17:42:37 +03:00
Mickael Remond
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
Mickael Remond
035c63fd2a
Fix call to lager_util:is_loggable/3
2016-03-09 21:03:06 +01:00
Mickael Remond
9e6efaf9bc
Use p1_time_compat util for generating timestamp
2016-03-09 20:57:01 +01:00
Mickael Remond
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
Paweł Chmielowski
842d52352a
Fix escaping of argument in iexlive and iexdebug
2016-03-09 14:26:28 +01:00
Evgeniy Khramtsov
e31799a3b1
Define mod_opt_type/1 callback
2016-03-09 11:19:15 +03:00
Evgeniy Khramtsov
1860801e36
Unregister hooks and iq handlers on terminate
2016-03-09 11:14:45 +03:00
Holger Weiss
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
Evgeniy Khramtsov
b5121a346d
Experimental MIX (XEP-0369) support
2016-03-08 20:04:29 +03:00
Carlos
b6289d646f
Update gl.po
2016-03-08 01:21:37 +01:00
Carlos
c065a2c5b9
Update gl.po
2016-03-07 22:26:46 +01:00
badlop
6e40573c13
Merge pull request #989 from galambalazs/patch-1
...
fix syntax highlighting by keeping "~s" together
2016-03-07 19:06:59 +01:00
badlop
eb0890284a
Merge pull request #988 from tnull/edoc_fix
...
Fixed type specifications for 'rebar doc'
2016-03-07 18:44:05 +01:00
Badlop
16c1b9a5c2
Fix format_result also in xmlrpc, after aa5caa3
( #982 )
2016-03-07 17:34:08 +01:00
Balázs Galambosi
83accedded
fix syntax highlighting by keeping "~s" together
2016-03-07 16:06:18 +01:00
Elias Rohrer
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
Anton Samets
4013629e5d
EJAB-1480: fix issue with retreiving user roster
2016-03-04 15:52:38 +03:00
Paweł Chmielowski
6e14a47316
Define opt_type required be ejabberd_config behaviour.
2016-03-04 11:45:18 +01:00
Paweł Chmielowski
304afd75ac
Compile ejabberd_config early to stop undefined behaviour warnings
2016-03-04 11:32:34 +01:00
Badlop
9c3d57e63e
Mark get_queue_length obsolete, and use count_offline_messages ( #970 )
2016-03-04 11:09:14 +01:00
Christophe Romain
44978ce978
ext_mod: switch to fast_xml and remove old p1_logger reference
2016-03-03 15:46:15 +01:00
Christophe Romain
10d6c330a5
Fix pubsub disco after host/serverhost cleanup
2016-03-03 14:52:03 +01:00
Evgeniy Khramtsov
e95cf420a2
Enable flexible offline on disco#info as well
2016-03-03 14:10:40 +03:00
Christophe Romain
3ecd7e850c
Use Elixir v1.2.3
2016-03-03 10:36:13 +01:00
Christophe Romain
fee5873310
Minor format cleanup
2016-03-03 10:34:45 +01:00
Mickael Remond
96b09c587d
Use upcoming version of ejabberd with Elixir 1.2
2016-03-02 13:35:35 +01:00
Alexey Shchepin
79853ad44f
Missed a few calls in previous commits
2016-03-02 02:00:02 +03:00
Alexey Shchepin
9a049442ff
Raise an error when there are no fields to set in ?SQL_UPSERT
2016-03-02 00:12:49 +03:00
Alexey Shchepin
e21f25f5b9
Update more SQL queries
2016-03-02 00:12:49 +03:00
Alexey Shchepin
1f9fd25ff8
Update more SQL queries
2016-03-02 00:12:49 +03:00
Alexey Shchepin
968576d4f2
Update p1_pgsql tag
2016-03-02 00:12:49 +03:00
Alexey Shchepin
d8fbe8a289
Update more SQL queries
2016-03-02 00:12:49 +03:00
Alexey Shchepin
6d7ce0237a
Update mod_last SQL queries to the new API
2016-03-02 00:12:49 +03:00
Alexey Shchepin
2d042f078e
New parse transform for ?SQL_UPSERT and ?SQL_UPSERT_T
2016-03-02 00:12:49 +03:00
Alexey Shchepin
3d8219d8f9
Update mod_roster and ejabberd_auth_odbc SQL queries to the new API
2016-03-02 00:12:49 +03:00
Alexey Shchepin
7f3bffe821
Allow balanced expressions inside @(...) in ejabberd_sql_pt
2016-03-02 00:12:49 +03:00
Alexey Shchepin
99255631dd
Updated some mod_offline SQL queries to the new API
2016-03-02 00:12:11 +03:00
Alexey Shchepin
ba35c1ed9d
Use 'any' to match any DBMS in sql_query
2016-03-01 22:50:20 +03:00
Alexey Shchepin
437e768e4a
Better error handling in ejabberd_sql_pt
2016-03-01 22:50:07 +03:00
Alexey Shchepin
c58a4be6ee
Support for run-time SQL queries selection depending on DBMS version
2016-03-01 22:49:56 +03:00
Alexey Shchepin
6374ef4866
New parse transform for SQL queries, use prepare/execute calls with Postgres
2016-03-01 22:48:30 +03:00
Mickael Remond
eeac7f9b02
Update ejabberd version for hex.pm release
2016-02-29 17:51:06 +01:00
Paweł Chmielowski
8c49d1e1af
Disable back undefined_function_calls xref check
2016-02-29 14:56:28 +01:00
Evgeniy Khramtsov
382c7c21ad
Do not call to deprected/undefined functions from mod_shared_roster_ldap
2016-02-29 16:35:45 +03:00
Paweł Chmielowski
59fe967ebb
Enable undefined_function_calls xref option
2016-02-29 13:51:59 +01:00
Holger Weiss
6d8c7232d8
mod_register_web: Choose the right error messages
2016-02-29 00:39:57 +01:00
Evgeniy Khramtsov
6b126171da
Improve LDAP shared roster support (EJAB-1480)
2016-02-26 17:27:12 +03:00
Christophe Romain
56523784e1
Implementation of pubsub#itemreply (EJAB-1347)( #928 )
2016-02-26 10:32:03 +01:00
Christophe Romain
1c6d20924b
Fix host/serverhost usage ( #902 )
2016-02-26 09:33:07 +01:00
Marek Foss
ebaf750a9b
Fix for #935
2016-02-25 18:56:43 +01:00
Paweł Chmielowski
217ba09408
Add extra items to .gitignore
2016-02-25 12:23:23 +01:00
Paweł Chmielowski
24617b5e25
Split long lines
2016-02-25 12:23:23 +01:00
Paweł Chmielowski
d9ec923357
Elixir want {src_dirs, ["include"]} on top of a config
2016-02-25 12:23:23 +01:00
Paweł Chmielowski
a9de13c5d9
Don't include empty line after java example
2016-02-25 12:14:17 +01:00
Badlop
2c856c71f6
Update translated files, as there wee many improvements
2016-02-24 12:34:53 +01:00
Christophe Romain
576c10ee3a
Make caps warning less confusing ( #955 )
2016-02-23 14:14:24 +01:00
Holger Weiss
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
Holger Weiss
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
Alexey Shchepin
9db9cbd814
Merge pull request #961 from weiss/compression-after-sasl
...
Accept stream compression request after SASL
2016-02-19 21:02:26 +03:00
Holger Weiss
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
Evgeniy Khramtsov
8f9c18edf2
Add Redis backend to the test suite
2016-02-19 17:06:41 +03:00
Evgeniy Khramtsov
4b0860e7de
Make it possible to define 'sm_db_type' per virtual host
2016-02-19 16:38:43 +03:00
Badlop
eece6e69cb
Fix format_result so get_room_options command works again after aa5caa3
2016-02-17 20:43:35 +01:00
Paweł Chmielowski
d40a091eda
Another fix for \n in ejabberdctl arguments
2016-02-15 15:21:27 +01:00
badlop
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
Paweł Chmielowski
47a67c7320
Allow to pass \n in argument to ejabberdctl
2016-02-12 23:38:39 +01:00
Christian Dröge
c579313821
Fix the color of links in tables in web admin
2016-02-12 18:45:45 +01:00
badlop
06f2237132
Merge pull request #951 from rodrigues/master
...
Update Portuguese (Brazil) translations
2016-02-12 13:16:46 +01:00
Victor Rodrigues
4f7f66fae8
Update Portuguese (Brazil) translations
2016-02-11 23:16:41 +01:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
5680d4c3e9
Get rid of calls to jlib.erl from tests
2016-02-11 12:19:23 +03:00
Evgeniy Khramtsov
8e6adb4b3c
Do not forget sending initial presence in XEP-0013 test
2016-02-11 11:53:33 +03:00
Holger Weiss
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
Evgeniy Khramtsov
d6323a7b5e
Add tests for XEP-0013
2016-02-10 16:15:43 +03:00
Badlop
02a519a11e
Mention new XEP support
2016-02-08 21:35:46 +01:00
Badlop
1de085ec23
Prepare room JID in create_room command
2016-02-08 21:35:26 +01:00
Paweł Chmielowski
217b6da5fd
Fix example value for rescode return type
2016-02-09 16:44:57 +01:00
Paweł Chmielowski
d5b3e6af00
More documentation of arguments in mod_admin_extra
2016-02-09 16:33:32 +01:00
Evgeniy Khramtsov
4839ba5ae4
XEP-0013: Flexible Offline Message Retrieval support
2016-02-09 17:59:54 +03:00
Paweł Chmielowski
2bca8d5121
Remove remanants of pre-binary strings
2016-02-09 15:50:35 +01:00
Christophe Romain
583476380a
Use muc_online_room record for pattern matching
2016-02-09 15:33:00 +01:00
Paweł Chmielowski
c0da9b43ce
Better presentation of result description in docs
2016-02-09 13:18:01 +01:00
Paweł Chmielowski
30d171e79e
Start documenting arguments in mod_admin_extra commands
2016-02-09 13:03:40 +01:00
Paweł Chmielowski
d36c351fc7
Typo in markdown generator
2016-02-09 13:03:40 +01:00
Holger Weiss
10ed4a1c85
Add most status codes only to initial MUC presence
2016-02-08 20:10:20 +01:00
Badlop
04a315eb52
Fix section links to the Guide in the WebAdmin
2016-02-08 16:16:53 +01:00
badlop
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
badlop
ebd5ee36d9
Merge pull request #945 from nikolauspolak/master
...
Update German translation
2016-02-08 13:41:48 +01:00
Evgeny Khramtsov
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
Mickael Remond
6af9aa3de8
Add link to ProcessOne site
2016-02-08 11:50:04 +01:00
Mickael Remond
3af055fabe
Link to Hex.pm
2016-02-08 11:34:52 +01:00
Mickael Remond
ed30bd64cd
Preparing to release beta package on hex.pm
2016-02-08 10:54:05 +01:00
Mickael Remond
0b1620a45c
Remove compile warnings
2016-02-08 10:50:28 +01:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Nikolaus Polak
f44bf00e0d
Update German translation
2016-02-06 09:25:39 +01:00
Badlop
7435ee464f
Rename option to regexp_room_id for consistency with other options ( #905 )
2016-02-05 12:09:27 +01:00
HAMANO Tsukasa
268f0b30ec
add room_id_regexp option
2016-02-05 12:09:18 +01:00
Christian Dröge
30388fa2bf
Allow to modify host when deleting account or changing password over web
2016-02-04 21:31:16 +01:00
Pablo Polvorin
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
Mickaël Rémond
e207d0af56
Merge pull request #943 from processone/deps-cleanup
...
Dependencies rework
2016-02-04 15:48:56 +01:00
Mickael Remond
89dda473cf
Convert tests to Fast XML
2016-02-03 19:22:59 +01:00
Mickael Remond
dfc29ea03c
Switch to Fast XML module
2016-02-03 19:03:17 +01:00
Badlop
315fc9493e
Handle spaces in vsn attribute of app file when installing deps ( #940 )
2016-02-03 17:45:27 +01:00
Mickael Remond
5539db37b6
Remove reference to p1_logger
2016-02-03 16:26:15 +01:00
Mickael Remond
71ee0d56fa
Switch to fast_tls and update app names
2016-02-03 16:13:16 +01:00
Mickael Remond
9ae1371c6e
Convert more dependencies to new repository / packages
2016-02-03 12:30:12 +01:00
Mickael Remond
e83ae9e461
Proper name for included applications
2016-02-03 11:31:23 +01:00
Mickael Remond
0de222d998
Convert code to use Fast YAML
2016-02-03 11:30:48 +01:00
Mickael Remond
b137ee3beb
Move to new dependencies for SIP and STUN
2016-02-03 11:26:14 +01:00
Mickael Remond
99b5c5712c
Move to new iconv package
2016-02-03 11:17:24 +01:00
Mickael Remond
bad50b8dd1
Move database dependencies to new repository / modules
2016-02-03 11:10:11 +01:00
Mickael Remond
ba11165fb4
Syntax highlight file + comment on rebar_elixir_plugin
2016-02-03 11:00:12 +01:00
Mickael Remond
9b837860cd
Switch a few version to hex.pm version
2016-02-03 10:55:40 +01:00
Mickael Remond
a457105831
Run ejabberd test on Erlang R18
2016-02-03 10:16:05 +01:00
Mickael Remond
e8ba7bce24
Use stringprep app name
2016-02-03 10:12:25 +01:00
Christophe Romain
59c471aad5
Merge pull request #937 from Iperity/fix-presence-based-delivery
...
Fix presence-based delivery
2016-02-02 15:41:21 +01:00
Nathan Bruning
80fc34fb0c
Fix presence-based delivery
2016-02-02 14:06:07 +01:00
Paweł Chmielowski
fa55ac5c8f
More strict checking for MUC initial presence
2016-02-01 12:09:58 +01:00
Paweł Chmielowski
dc52ec904c
Send presence with code 170 only in initial presence from MUC
2016-02-01 11:30:49 +01:00
Evgeniy Khramtsov
d3ee2a9c18
Add 'import_prosody' command
2016-01-29 14:30:50 +03:00
Evgeniy Khramtsov
54dc2f56c6
Import privacy lists from Prosody
2016-01-29 14:14:08 +03:00
Richard
ae77b1300a
change mod_ping Timers using maps instead of dict
2016-01-29 00:07:38 +08:00
Evgeniy Khramtsov
b20db3b736
Initial version of migration script from Prosody to ejabberd
2016-01-28 14:23:51 +03:00
Paweł Chmielowski
aaa84dc118
Need extra line before ## in markdown
2016-01-27 11:42:13 +01:00
Louis Pilfold
d89bbba181
Remove empty and unused module
2016-01-26 21:25:34 +00:00
Paweł Chmielowski
239b1c6f74
Always use lagger
2016-01-26 14:34:58 +01:00
Christophe Romain
b2c6e397fc
Set set utf8mb4 charset on mysql connection
2016-01-26 13:47:24 +01:00
Paweł Chmielowski
621dff7307
Add header to generated markdown file
2016-01-26 10:46:38 +01:00
Paweł Chmielowski
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
Mickael Remond
fc2d5da112
Merge branch 'master' of github.com:processone/ejabberd
2016-01-25 23:28:33 +01:00
Mickael Remond
28569d6209
As default, attempt to add path to Elixir
2016-01-25 23:28:27 +01:00
Paweł Chmielowski
22696e8388
Geenarte markdown that is acceptable by docs.ejabberd.org processor
2016-01-25 16:51:54 +01:00
Mickael Remond
6c499f510b
Merge branch 'master' of github.com:processone/ejabberd
2016-01-25 10:47:29 +01:00
Mickael Remond
0b492f43fe
If lager is false, we will use p1_logger
2016-01-25 10:47:20 +01:00
Badlop
60175784f0
Updated Portuguese-Brazilian translation (thanks to Otávio Fernandes)
2016-01-24 19:59:53 +01:00
Mickael Remond
14c0ff1c82
Add missing description
2016-01-24 10:19:28 +01:00
Mickael Remond
a7e3df4fec
Merge branch 'master' of github.com:processone/ejabberd
2016-01-24 10:07:25 +01:00
Mickael Remond
67b5162df9
Prepare hex.pm release
2016-01-24 10:07:12 +01:00
Paweł Chmielowski
a2a692d081
Merge pull request #919 from hamano/rename_timestamp_function
...
rename timestamp function #917
2016-01-24 07:51:25 +01:00
Mickael Remond
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
Mickael Remond
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
Mickael Remond
e97195b3a6
Mix requires override
2016-01-23 18:44:38 +01:00
Mickael Remond
a3931e6b73
lager is the default logger, we need to reverse the define flag
2016-01-23 18:43:06 +01:00
Mickael Remond
7cc951ab1b
Make sure all version are consistent before big repositories changes
2016-01-23 18:42:16 +01:00
Mickael Remond
dae1ec2b7b
Make sure mix does not trigger conflict on p1_utils
2016-01-23 17:36:40 +01:00
Mickael Remond
f933cae2d6
Update Elixir dependency to latest p1_utils and cache_tab
2016-01-23 17:29:18 +01:00
HAMANO Tsukasa
5a85b0fb52
rename timestamp function #917
2016-01-23 17:58:10 +09:00
Christophe Romain
a189655f31
Add missing ref key
2016-01-21 12:56:03 +01:00
Badlop
42f86e7c3b
Fix order of arguments references
2016-01-20 19:43:12 +01:00
badlop
3d42be5394
Merge pull request #915 from fotock/master
...
Update translations
2016-01-20 19:38:54 +01:00
Shelley Shyan
46a85d3f9b
Merge pull request #1 from fotock/fotock-patch-1
...
Update zh.po
2016-01-21 01:02:28 +08:00
Shelley Shyan
e2c1368e0e
Update zh.po
...
Translated untranslated. Fixed fuzzy messages. Other fixes.
2016-01-21 01:01:14 +08:00
Shelley Shyan
3d3034cd11
Update zh.po
...
to be continued
2016-01-20 23:07:45 +08:00
Holger Weiss
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
Badlop
278d8a6fcd
Fix fuzzy tag in correct string
2016-01-19 22:34:58 +01:00
Christophe Romain
2ddbd032ee
Add error handling to send_stanza
2016-01-19 16:16:04 +01:00
Holger Weiss
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
Badlop
3feceb8279
Update Czech translation (thanks to Jan Pinkas)
2016-01-18 19:09:58 +01:00
Badlop
6b775fb9a1
Update Walon translation (thanks to Pablo Saratxaga)
2016-01-18 18:44:55 +01:00
Badlop
05bc0d4d17
Update Ukrainian translation (thanks to Oleg Deordiev)
2016-01-18 18:44:50 +01:00
Alexey Shchepin
a150bf8fdc
Make C2S session establishment optional (ECS-11)
2016-01-18 16:33:57 +03:00
Holger Weiss
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
Paweł Chmielowski
9741dba51f
Update polish localisation
2016-01-18 13:18:40 +01:00
Paweł Chmielowski
ee1cf939c5
Make --disable-debug work again
2016-01-18 13:10:28 +01:00
Holger Weiss
0125870f92
Merge remote-tracking branch 'processone/pr/907'
...
* processone/pr/907:
don't escape ERL_OPTIONS
2016-01-17 00:08:30 +01:00
Holger Weiss
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
badlop
6ac839dd76
Merge pull request #906 from hamano/stats_processes
...
add stats processes command
2016-01-15 19:26:23 +01:00
badlop
c31875cad0
Merge pull request #911 from hamano/ja
...
update japanese translation
2016-01-15 19:21:53 +01:00
HAMANO Tsukasa
7ab3b0d793
update japanese translation
2016-01-16 00:35:23 +09:00
HAMANO Tsukasa
ad448efa1d
update japanese translation
2016-01-16 00:15:24 +09:00
Evgeniy Khramtsov
c8bc6cecdc
Fix records in mod_muc.hrl
2016-01-15 15:46:07 +03:00
Evgeniy Khramtsov
33b67f54ba
Include mod_muc.hrl
2016-01-15 15:45:16 +03:00
Evgeniy Khramtsov
a83c5a8f3a
Do not redefine records
2016-01-15 15:44:50 +03:00
Evgeniy Khramtsov
1d452c98c1
Describe option type of 'domain_balancing'
2016-01-15 14:32:10 +03:00
Badlop
09ab01084d
Update Spanish and Catalan translation
2016-01-15 12:27:22 +01:00
Badlop
fc1237963a
Update translations files
2016-01-15 10:40:49 +01:00
Holger Weiss
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
HAMANO Tsukasa
b244bce49c
don't escape ERL_OPTIONS
2016-01-15 00:30:40 +09:00
HAMANO Tsukasa
6cb1905f7c
add stats processes command
2016-01-15 00:27:15 +09:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
11afa45646
mod_mam: Remove unused variable
2016-01-14 01:15:11 +01:00
Holger Weiss
89f63a4fdf
mod_mam: Check whether MUC message is desired
2016-01-14 01:13:16 +01:00
Holger Weiss
85f4f90b45
mod_mam: Support XEP-0313 v0.2 MUC archive queries
2016-01-14 00:58:48 +01:00
Holger Weiss
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
Holger Weiss
89b1700279
mod_mam: Add 'from' attribute to <delay/> tag
2016-01-13 23:17:23 +01:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
0183b2487e
Advertise MUC MAM v0.4.1 in room JID's disco#info
2016-01-13 20:30:44 +01:00
Badlop
f448ff608a
Update copyright to 2016 ( #901 )
2016-01-13 12:29:14 +01:00
Evgeniy Khramtsov
fd3e3a99c5
Log failed SQL requests
2016-01-13 14:13:32 +03:00
Evgeniy Khramtsov
776fe8b32a
Fix MAM MUC for v0.4.1
2016-01-13 11:45:08 +03:00
Evgeny Khramtsov
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
Holger Wei
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
Holger Weiss
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
Evgeniy Khramtsov
65e6dfb9dd
Do not fail on incorrect data coming from SQL (898)
2016-01-11 14:35:11 +03:00
Evgeniy Khramtsov
c7931b4a4f
CVE-2016-1232: Add Dialback Key Generation and Validation support (XEP-0185)
2016-01-11 14:22:17 +03:00
Matthias Rieber
0ad0fd2187
mod_http_upload: Use application/octet-stream instead of text/html for security reasons
2016-01-11 12:13:19 +01:00
Badlop
15245e9ec4
Update Hebrew translation (thanks to Genghis Khan)
2016-01-08 13:14:44 +01:00
Badlop
c7b67ff00b
Clarify a little more room error string (thanks to Genghis Khan)
2016-01-08 13:14:40 +01:00
Christophe Romain
00f502f6e9
Fix 'make install' to work on osx
2016-01-08 11:22:59 +01:00
Paweł Chmielowski
0d750ff169
Add version sufixes to application locations in 'make install'
2016-01-07 18:51:48 +01:00
Paweł Chmielowski
6d8263df15
Extract deps from rebar.config to use in reltool.config.script
2016-01-07 14:11:16 +01:00
Christophe Romain
006e96612c
We need to checkout elixir first when elixir enabled
2016-01-06 16:03:10 +01:00
Christophe Romain
14815b9a45
Update mix deps
2016-01-06 12:27:43 +01:00
Paweł Chmielowski
bbd428a0e1
Update deps in reltool.config.scripts
2016-01-06 12:08:20 +01:00
Holger Weiss
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
Holger Weiss
3f5a20c90a
mod_http_upload: Rename variable for clarity
2016-01-05 22:06:34 +01:00
Christophe Romain
efda70e73a
Update dependencies
2016-01-05 16:00:47 +01:00
Badlop
c01e3f24a5
Error converting times in mod_fail2ban ( #889 )
2016-01-05 12:29:21 +01:00
Paweł Chmielowski
da45a064a8
Fix handling of some options in old style configs
...
This fixes issue #893 .
2016-01-04 22:06:19 +01:00
Paweł Chmielowski
98bad73d56
Improve escaping of arguments passed to ejabberdctl
...
This fixes issue #804
2016-01-04 12:13:18 +01:00
Alexey Shchepin
fb8a511365
Use crypto:rand_uniform instead of random:uniform
2016-01-04 13:59:37 +03:00
Holger Weiss
94c620cc27
mod_http_upload: Fix logging of file size mismatch
2016-01-04 01:01:14 +01:00
Holger Weiss
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
Holger Weiss
5deb6a91f7
mod_admin_extra: Replace deprecated function calls
2016-01-02 21:27:48 +01:00
Holger Weiss
b73678992b
mod_muc_admin: Allow for setting MAM option
...
Fixes #890 .
2016-01-02 20:57:01 +01:00
Badlop
91d205715e
New send_stanza command (ejabberd_contrib#142)
2015-12-30 12:53:40 +01:00
Holger Weiss
1d2dc6cdc1
mod_muc_room: Replace deprecated function call
2015-12-29 11:11:50 +01:00
Holger Weiss
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
Badlop
48deb47021
Update translations
2015-12-28 15:09:49 +01:00
Badlop
0df6d7ae39
Improve explanation in registration page ( #876 )
2015-12-28 15:08:59 +01:00
Paweł Chmielowski
a18a3dfbb1
Add commands for generating html or markdown documentation for commands
2015-12-28 12:20:06 +01:00
Evgeniy Khramtsov
babb484cfc
Restrict access to MAM archives for members-only rooms
2015-12-24 15:04:06 +03:00
Badlop
f3cb5e0d77
Support binary strings in extract_translations
2015-12-23 20:54:40 +01:00
Badlop
c42e026f9c
Degenderise room error message ( #747 )
2015-12-23 19:34:23 +01:00
Paweł Chmielowski
1f4916041e
Update set-dep-versions script to work with new rebar.config
2015-12-23 14:11:49 +01:00
Holger Weiss
8cf0d31ee9
Revert "mod_mam: Keep 'to' attribute for MUC MAM messages"
...
This reverts commit 0e330da2a6
. XEP-0313
says: "When sending out the archives to a requesting client, the 'to' of
the forwarded stanza MUST be empty".
2015-12-22 13:20:23 +01:00
Paweł Chmielowski
cfe0aea219
Use built-in nif for integer_to_binary/binary_to_integer
2015-12-22 11:49:12 +01:00
Badlop
88c9991f90
Adding WEBIRC, custom realname & ident, ISO-8859-15 (thanks to iwalkalone69)( #877 )
2015-12-21 16:20:20 +01:00
Alexey Shchepin
d88d5d6807
Support presence_broadcast in default_room_options mod_muc option
2015-12-21 02:25:31 +03:00
Holger Weiss
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
Holger Weiss
d039b9b72b
ejabberd_http: Log debug message on receive errors
2015-12-20 23:26:57 +01:00
Paweł Chmielowski
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
Paweł Chmielowski
99fdba0745
Convert rebar.config.script to more declarative format
2015-12-18 17:20:41 +01:00
Christophe Romain
bb5a8a42c3
Fix pubsub virtual nodetree plugin
2015-12-17 10:16:17 +01:00
Christophe Romain
6957e892dd
Fix last item message type as message attribute
2015-12-16 17:04:45 +01:00
Christophe Romain
c8986ffa5e
Use correct notification_type for last items ( #827 )
2015-12-16 16:19:35 +01:00
Alexey Shchepin
c6798fc515
Add accept_interval option in ejabberd_listener
2015-12-16 17:26:44 +03:00
Christophe Romain
5ffdfdd95d
Merge branch 'master' of github.com:processone/ejabberd
2015-12-16 13:01:12 +01:00
Christophe Romain
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
Holger Weiss
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
Paweł Chmielowski
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
0e330da2a6
mod_mam: Keep 'to' attribute for MUC MAM messages
2015-12-15 21:05:04 +01:00
Holger Weiss
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
Christophe Romain
6efdf78ce3
PubSub plugin for online users only
2015-12-15 16:23:04 +01:00
Christophe Romain
3b69d26368
Fix pubsub headers
2015-12-15 16:12:20 +01:00
Badlop
51b9dd029b
Restore header in Hebrew translation file
2015-12-14 14:08:44 +01:00
badlop
2b00c13ad8
Merge pull request #875 from GreenLunar/patch-1
...
Update hebrew translation
2015-12-14 14:04:45 +01:00
GreenLunar
a8683d5bcf
Update hebrew translation
...
Minor corrections, enhancements, and refinements
2015-12-14 14:39:18 +02:00
Paweł Chmielowski
6052f7bfa8
Fix pubsub test error
2015-12-14 10:21:23 +01:00
Evgeniy Khramtsov
7d1c75d0e8
Use UTF8MB4 character set in MySQL tables
2015-12-11 16:13:48 +01:00
Pablo Polvorin
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
Christophe Romain
e3005f68e7
Remove undefined macro injected in 3bdd5d0d
2015-12-11 15:33:22 +01:00
Christophe Romain
8ee5f9fb6f
Remove http supervisors
2015-12-11 14:13:24 +01:00
Christophe Romain
3bdd5d0d25
Remove receiver's supervisor
2015-12-11 14:11:44 +01:00
Christophe Romain
1a32f20c07
Disable use of multi-subscribe and subscription-option on standard plugins
2015-12-11 12:46:49 +01:00
Christophe Romain
6357ea1d5d
Limit number of subscriptions per node and allow custom default node configuration
2015-12-11 12:46:44 +01:00
Christophe Romain
86a8606fd1
Virtual nodetree is not attached to any backend
2015-12-11 12:46:40 +01:00
Christophe Romain
c4943cffe8
Follow pubsub configuration when using virtual nodetree
2015-12-11 12:46:35 +01:00
Christophe Romain
10c920ef13
Don't force max_items_node to MAXITEMS if not defined
2015-12-11 12:30:16 +01:00
Holger Weiss
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
Holger Weiss
e09afe367f
Document XEP-0334 support
2015-12-09 22:28:44 +01:00
Evgeniy Khramtsov
4c47ee63f2
Do not forget to include xmlns in mam prefs response ( #859 )
2015-12-09 12:53:02 +03:00
Paweł Chmielowski
be4d687a86
Fix problem with handling of old db entries in mod_mam
2015-12-09 09:47:03 +01:00
Holger Weiss
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
Holger Weiss
325c17f277
mod_mam: Update record field type
2015-12-08 22:21:39 +01:00
Holger Weiss
14609dbfa2
mod_mam: Remove unused code
2015-12-08 22:15:55 +01:00
Holger Weiss
59ba09826b
mod_offline: Fix outdated comments
2015-12-08 21:58:54 +01:00
Holger Weiss
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
Alexey Shchepin
c2f6bf0343
Improve muc#roomconfig_presencebroadcast support
2015-12-08 21:53:42 +03:00
Paweł Chmielowski
67f93b0d60
Don't keep 10 sec timeout that i used for testing...
2015-12-08 11:28:03 +01:00
Paweł Chmielowski
7a69dab596
Add ability to disable timeout for ejabberdctl command
2015-12-08 11:25:26 +01:00
Holger Weiss
5ce0b062ff
mod_mam: Honor Message Processing Hints (XEP-0334)
2015-12-08 00:10:00 +01:00
Badlop
3e57850da7
If mod_register access_from is 'none', then don't advertise IBR ( #857 )
2015-12-07 18:30:52 +01:00
Paweł Chmielowski
95a9100623
Fix more places where random:seed is used
2015-12-07 16:48:29 +01:00
Paweł Chmielowski
d0df7be722
Fix randoms.erl on R17 that don't have random:seed(integer())
2015-12-07 16:37:40 +01:00
Paweł Chmielowski
5ac10d6555
Remove now() in pubsub code
2015-12-07 16:16:11 +01:00
Paweł Chmielowski
29db302808
More now() replacements
2015-12-07 16:09:48 +01:00
Paweł Chmielowski
b9f751e099
Fix bug in last commit
2015-12-07 10:26:51 +01:00
Paweł Chmielowski
0a846d03bf
More now() removal
2015-12-06 15:58:46 +01:00
Paweł Chmielowski
5c329a7699
Remove now() - part 1
2015-12-04 15:08:43 +01:00
Badlop
daad71bc7e
trusted_proxies option not parsed correctly ( #860 )
2015-12-04 13:14:39 +01:00
Holger Weiss
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
Badlop
f9e12d900c
No need for a top menu link as there's a top page link
2015-12-02 17:10:23 +01:00
Paweł Chmielowski
c3888cb0ca
Don't forget copying files that were compiled during `make install`
2015-12-02 12:40:49 +01:00
Badlop
e412438aba
When user joins logged room, he must be warned (EJAB-726)
2015-12-02 12:07:29 +01:00
Badlop
086fbc6a50
Only filter rooms in Service Disco when more than 100 (EJAB-343)
2015-12-02 02:32:25 +01:00
Badlop
ff22782752
List in Service Disco non-empty rooms and provide Node for empty (EJAB-343)
2015-12-02 01:51:39 +01:00
Mickael Remond
e5ae35c66b
Update cache_tab app name
2015-12-01 19:17:51 +01:00
Evgeny Khramtsov
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
Evgeniy Khramtsov
f1ecbf80fb
Fix archive preference retreiving ( #848 )
2015-12-01 14:06:23 +03:00
Christophe Romain
9eeee67da7
Webadmin console visual refresh (thanks to Marek Foss) (EJAB-1142)
2015-11-30 11:35:53 +01:00
Evgeniy Khramtsov
9cc5a5d467
Simplify external components configuration
2015-11-28 17:38:34 +03:00
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
87fb5132be
Make JID related functions from jlib.erl deprecated
2015-11-24 20:31:26 +03:00
Evgeniy Khramtsov
95265dd3ad
Move JID related functions to jid.erl ( #847 )
2015-11-24 18:44:13 +03:00
Evgeniy Khramtsov
7eddfe073b
Make Riak working on R18
2015-11-24 17:53:44 +03:00
Christophe Romain
16881597c9
Remove useless export_all flag
2015-11-23 12:03:08 +01:00
Christophe Romain
f3ff660eae
Export content_type/3 needed by mod_http_upload
2015-11-23 11:53:36 +01:00
Christophe Romain
4480749a52
Merge branch 'cluster_fix'
2015-11-20 14:52:36 +01:00
Christophe Romain
b4ae1b63bc
Allow longer command execution time
2015-11-20 10:39:32 +01:00
Christophe Romain
67a70b9107
Integrate join/leave cluster as ejabberd command
2015-11-20 10:39:27 +01:00
Evgeny Khramtsov
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
Badlop
2659e2c4a0
Explain that reload_config only affects to ACL and Access
2015-11-18 13:25:19 +01:00
Nycholas de Oliveira e Oliveira
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
Badlop
2f9f4e6938
Fix example config about ejabberd_xmlrpc ( #771 )
2015-11-17 21:33:28 +01:00
Holger Weiss
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
Badlop
53d72bd85a
Disable vJUD by default also in mod_vcard_ldap source code
2015-11-13 19:33:23 +01:00
Badlop
f6d8f47451
Disable vJUD search in the default config and when not specified
2015-11-13 19:30:11 +01:00
Alexey Shchepin
aa5caa30e2
Support for muc#roomconfig_presencebroadcast option
2015-11-12 19:53:10 +03:00
Paweł Chmielowski
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
113c315857
mod_http_upload: Apply cosmetic changes
2015-11-09 19:12:08 +01:00
Holger Weiss
842db2ca15
mod_http_upload: Don't flatten command strings
2015-11-09 18:50:45 +01:00
Holger Weiss
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
Paweł Chmielowski
58c1bc4276
Use xml_stream:reset() when possible
2015-11-09 16:05:09 +01:00
Evgeny Khramtsov
de7422b372
Merge pull request #821 from scrogson/update_readme_openssl
...
Update minimum required OpenSSL version
2015-11-05 12:10:38 +03:00
Sonny Scroggin
d252b9948c
Update minimum required OpenSSL version
2015-11-04 23:21:08 -06:00
Christophe Romain
341be9b682
Remove supervisor option, disable it for c2s and muc
2015-11-04 16:24:35 +01:00
Holger Weiss
fec7e47169
Add copyright and license to HTTP upload modules
2015-11-04 01:22:39 +01:00
Holger Weiss
46bf190fd0
mod_client_state: Add my email address to header
2015-11-04 01:19:19 +01:00
Paweł Chmielowski
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
8bff06bea9
Merge branch 'master' of github.com:processone/ejabberd
2015-10-30 17:20:50 +03:00
Evgeniy Khramtsov
99f506135b
Fix ipv6 configuration processing ( #803 )
2015-10-30 17:20:32 +03:00
Paweł Chmielowski
2814dd2cb8
Merge pull request #801 from nanoz/patch-1
...
feat(ejabberdctl): Foreground option for docker
2015-10-29 19:46:18 +01:00
Arno B
bee767158d
feat(ejabberdctl): Foreground option for docker
...
Docker needs services to run in foreground.
2015-10-29 19:39:21 +01:00
Holger Weiss
915383e150
mod_http_upload: Add missing trailing dot
...
(Thanks to Matthias Rieber.)
2015-10-29 10:09:55 +01:00
Holger Weiss
43e7814714
mod_mam: Update supported XEP version
2015-10-28 23:53:53 +01:00
Holger Weiss
32fe74c923
mod_http_upload: Document protocol support
2015-10-28 23:52:33 +01:00
Paweł Chmielowski
f112a91321
Copy elixir files in copy-files makefile target
2015-10-28 18:12:39 +01:00
Christophe Romain
1d5a441ce8
Revert "set dependencies versions for 15.10"
...
This reverts commit a497cdff5e
.
2015-10-28 16:07:00 +01:00
Christophe Romain
a497cdff5e
set dependencies versions for 15.10
2015-10-28 15:53:12 +01:00
Holger Weiss
47b17acbaf
ejabberdctl.cfg: Document CONTRIB_MODULES_CONF_DIR
2015-10-26 22:46:58 +01:00
Holger Weiss
788049be7b
ejabberdctl: export CONTRIB_MODULES_CONF_DIR
2015-10-26 22:42:07 +01:00
Holger Weiss
62ea763089
mod_http_upload: Fix string()/binary() type issue
2015-10-26 22:32:12 +01:00
Holger Weiss
3e7ee6af6d
mod_http_upload: Add/fix function specifications
2015-10-26 22:30:58 +01:00
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
6f2e178de1
Rename badly entitled record field
2015-10-26 15:05:28 +03:00
Evgeniy Khramtsov
137a4ee087
Add HTTP File Upload support (XEP-0363)
2015-10-26 14:10:55 +03:00
Evgeniy Khramtsov
b2eb9f197a
Don't crash on certificates without extensions (EJAB-1724)
2015-10-23 18:41:35 +03:00
Christophe Romain
2a115a83d2
Let modules_update_specs report failures ( #756 )
2015-10-23 17:21:19 +02:00
Evgeny Khramtsov
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
Mickaël Rémond
c6f48022a4
Merge pull request #781 from scrogson/master
...
Fix-up mix.exs; Include mix.lock
2015-10-22 18:50:11 +02:00
colm
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
Christophe Romain
efdf5636be
Add simple metrics module for use with grapherl
2015-10-22 14:02:26 +02:00
Evgeny Khramtsov
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
colm
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
Badlop
c62bd0c911
Use homogeneous s2s connections stats ( #761 )
2015-10-21 12:51:22 +02:00
Alexey Shchepin
8a2fa62cac
Remove access_commands 'unrestricted' option, use [] instead. Fix unauthenticated calls to commands with policy=user.
2015-10-20 17:20:13 +03:00
Paweł Chmielowski
2d22d6061e
Pass {C,CPP,LD}FLAGS used in main ./configure call to invocations from deps
2015-10-20 15:23:23 +02:00
Alexey Shchepin
7c1e7e5b5f
Improve access_commands option backward compatibility
2015-10-19 20:16:04 +03:00
Alexey Shchepin
1f2b7e8f20
Fix access_commands option handling
2015-10-19 18:50:44 +03:00
Paweł Chmielowski
06701b126b
Make COPY_template compatible with gmake 3.8
2015-10-19 16:39:08 +02:00
Holger Weiss
ff4a00b1f3
Let Travis CI test "make install"
2015-10-19 14:23:37 +02:00
Paweł Chmielowski
97a93263c1
Make install should work even without having DESTDIR set
2015-10-19 13:47:01 +02:00
Holger Weiss
28e28e926a
ejabberd_listener: Fix ETS update on port reuse
2015-10-18 01:14:48 +02:00
Holger Weiss
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
Holger Weiss
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
Paweł Chmielowski
70606667c6
Use OTP directory structure for 'make install'
2015-10-15 15:08:45 +02:00
Paweł Chmielowski
7d99484859
Make KEEPALIVE_QUERY list as this is what sql_query/3 expects
2015-10-15 10:07:24 +02:00
Sonny Scroggin
35c33a8a29
Improve line lengths; use spaces in between commas.
2015-10-14 22:52:27 -05:00
Sonny Scroggin
98c172aed6
mix.lock should be commited to ensure consistent builds.
2015-10-14 22:50:28 -05:00
Sonny Scroggin
25f95d6954
This dependency was removed in 83dd79a
2015-10-14 22:49:47 -05:00
Alexey Shchepin
4fce1a17d7
Fix cyrsasl_oauth:mech_new call
2015-10-12 20:53:52 +03:00
Christophe Romain
1578f17eff
Remove obsolete sasl init
2015-10-12 10:41:07 +02:00
Evgeniy Khramtsov
87273619a6
Advertise MAM (XEP-0313) v0.4 support in room disco
2015-10-11 19:43:24 +03:00
Paweł Chmielowski
b5ac0db895
Be able to merge old style configs with {listen,...}
2015-10-08 13:07:00 +02:00
Paweł Chmielowski
6d25db6600
Handler module shouldn't be used for differentiating listeners when merging configs
2015-10-07 16:45:07 +02:00
Christophe Romain
880114a909
Enforce get_allowed_items_call
2015-10-07 16:40:37 +02:00
Christophe Romain
653105a44f
Fix acl issue from cleanup
2015-10-07 15:12:15 +02:00
Christophe Romain
f938c2a5e2
Revert "Avoid crypto:hmac/3 call for R15B compatibility"
...
This reverts commit 31e356c126
.
2015-10-07 14:18:56 +02:00
Christophe Romain
6a23cad454
Revert "Fix compilation on Erlang R15B"
...
This reverts commit a5d6044448
.
2015-10-07 14:18:47 +02:00
Christophe Romain
6aeb9dcb38
cosmetic cleanup
2015-10-07 14:18:38 +02:00
Christophe Romain
83dd79a6a7
Remove unused dependency
2015-10-06 11:06:04 +02:00
Evgeniy Khramtsov
6378c673df
Avoid MAM dups when routing to multiple resources
2015-10-02 16:09:55 +02:00
Evgeniy Khramtsov
c7750689e8
Fix force_update_presence
2015-10-02 16:06:47 +02:00
Mickael Remond
41d65f8fe2
We want oauth2 to be supported as default in Elixir environment
2015-10-02 10:40:55 +02:00
Paweł Chmielowski
24fa95fd60
Fix problem with --auth in ejabberd_ctl:process2/2
2015-10-01 21:09:03 +02:00
Paweł Chmielowski
67d3b50598
Switch macros resolving in config files to be global instead of per file
2015-10-01 14:34:48 +02:00
Mickaël Rémond
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
Mickaël Rémond
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
Sonny Scroggin
9c82f160e5
Use lowecase directory name for lib/ejabberd
2015-09-29 14:08:39 -05:00
Evgeny Khramtsov
189267c1a1
Merge pull request #754 from scrogson/gitignore
...
Ignore mnesiadb and _build
2015-09-29 21:27:49 +03:00
Sonny Scroggin
59b6a46f82
Ignore mnesiadb and _build
2015-09-29 13:21:35 -05:00
Sonny Scroggin
6b81a1ed90
clean up whitespace
2015-09-29 13:19:35 -05:00
Sonny Scroggin
b63c51c245
Add additional package information for hex.pm
2015-09-29 13:18:49 -05:00
Paweł Chmielowski
704844fd2a
Temporary switch to fork of oauth2 that compiles with r18
2015-09-29 15:34:02 +02:00
Christophe Romain
3fc1d8ca9a
Set version 15.09 for mix
2015-09-29 14:21:57 +02:00
Badlop
d08f73da47
Recompile translations
2015-09-29 08:19:44 +02:00
Alexey Shchepin
cf975da8f2
Update several commands for recent ejabberd_commands changes
2015-09-28 15:29:25 +03:00
Paweł Chmielowski
846b520edc
oauth uses jiffy so fetch it unconditionally
2015-09-28 10:08:27 +02:00
Alexey Shchepin
88a206400a
Add oauth_access option
2015-09-25 19:48:53 +03:00
Badlop
1781a58929
Strip Nick element in message stanzas sent to a room ( #686 )
2015-09-25 17:00:00 +02:00
Paweł Chmielowski
e2cc45933f
Enable oauth unconditionally
2015-09-25 16:39:47 +02:00
Christophe Romain
5eab6e315e
Revert "Remove "--enable-json" flag"
...
This reverts commit 5bb137940c
.
This is needed for mod_http_api
2015-09-25 16:09:46 +02:00
Christophe Romain
a1129dc96b
Add OAuth support (thanks to Aleksey)
2015-09-25 15:49:07 +02:00
Christophe Romain
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
Badlop
deccf91280
Fix calling problem introduced when reducing bashisms ( #748 )
2015-09-25 13:35:03 +02:00
badlop
825f4fcc35
Merge pull request #748 from joudinet/bashisms
...
Remove bashisms in {join,leave}cluster scripts
2015-09-24 19:26:03 +02:00
Badlop
ee456cc2af
Fix regression introduced when code was binarized (EJAB-641)
2015-09-24 17:21:14 +02:00
Johan Oudinet
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
Holger Weiss
484fd1f51f
Log TLS errors as [debug] messages only
...
Closes #652 and closes #679 .
2015-09-24 12:00:59 +02:00
Evgeniy Khramtsov
89b3471742
Add <stanza-id/> (XEP-0359) to archived messages
2015-09-22 21:15:34 +03:00
Johan Oudinet
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
Paweł Chmielowski
3300c8d994
Set disable caching headers in http-bind responses (EJAB-1643)
2015-09-22 15:42:57 +02:00
Paweł Chmielowski
e289344972
Nameprep host name passed to http-bind before using in (EJAB-1658)
2015-09-22 15:42:57 +02:00
Christophe Romain
23a1aceac0
Improve external module configuration management (EJAB-1746)
2015-09-22 12:49:55 +02:00
Evgeniy Khramtsov
70b1dc479c
Add MAM (XEP-0313) v0.4 support
2015-09-22 12:23:36 +03:00
Christophe Romain
e57c1896f7
Avoid wrong failing cases on make install ( #468 )
2015-09-21 17:51:13 +02:00
Jerome Sautret
df3862cf84
Add set_loglevel command (EJABS-2524)
2015-09-21 17:07:44 +02:00
Christophe Romain
497cbb3ec2
Merge branch 'master' of github.com:processone/ejabberd
2015-09-18 09:06:51 +02:00
Christophe Romain
ec1969ddca
Remove unused functions from old get_items api
2015-09-17 18:00:17 +02:00
Paweł Chmielowski
a1a7beb24d
Make sure that lager is first on our deps list
2015-09-17 17:59:13 +02:00
Paweł Chmielowski
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
Holger Weiss
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
Evgeny Khramtsov
5d11a19087
Merge pull request #736 from quanzhuo/master
...
Comment unused type, unused term
2015-09-16 18:22:19 +03:00
Quan Zhuo
ae51277316
Comment unused type, unused term
2015-09-16 22:52:36 +08:00
Paweł Chmielowski
5593ebbbca
Properly handle define_macros in merged config files
2015-09-16 12:20:07 +02:00
Mickael Remond
a8d6439a4b
Update French translation
2015-09-16 11:33:00 +02:00
Mickael Remond
18d3329f8f
Update French translation
2015-09-16 11:14:20 +02:00
Paweł Chmielowski
e6279123e5
Update polish translation
2015-09-16 11:08:21 +02:00
Holger Weiss
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
Evgeniy Khramtsov
ab857b1a5e
Improve MSSQL schema
2015-09-14 14:05:07 +03:00
Evgeniy Khramtsov
fc7d3a44b8
Simplify MSSQL configuration
2015-09-13 18:34:10 +03:00
Evgeniy Khramtsov
25791cfde8
Fix MSSQL support
2015-09-13 18:31:49 +03:00
Christophe Romain
48c5e73321
ext_mod must be started before ejabberd_config
2015-09-11 15:14:12 +02:00
Badlop
8c1864eca1
Update German translation (thanks to Nikolaus Polak)
2015-09-11 13:22:52 +02:00
Badlop
df08253e91
Update Hebrew translation (thanks to Isratine Citizen)
2015-09-10 21:25:12 +02:00
Badlop
a50f00f9e8
Include ext_mod modules when checking accepted options (ejabberd-contrib#116)
2015-09-10 20:11:02 +02:00
Christophe Romain
8fd9670da2
typo fix
2015-09-10 12:21:50 +02:00
Badlop
4d19ef55b6
Update Esperanto and Dutch translations (thanks to Andreas van Cranenburgh)
2015-09-08 21:40:00 +02:00
Mickael Remond
6b79bcdc97
Merge branch 'master' of github.com:processone/ejabberd
2015-09-07 17:56:09 +02:00
Mickael Remond
73932fb507
Fix typo
2015-09-07 17:55:54 +02:00
Badlop
5a9f1b9bba
Update Brazilian Portuguese translation (thanks to Otávio Fernandes)
2015-09-07 17:46:50 +02:00
Badlop
7b230e7e44
Update Japanese translation (thanks to Tsukasa Hamano)( #729 )
2015-09-07 17:46:05 +02:00
Mickael Remond
420cf68ecd
Use our own includes + includes from all dependencies
2015-09-07 17:35:58 +02:00
Badlop
64d1efa6f2
Update Catalan and Spanish translations
2015-09-07 15:06:57 +02:00
Evgeniy Khramtsov
9195fc5573
Update Russian PO file
2015-09-07 15:21:42 +03:00
Badlop
5d59a534a3
Run "make translations" and get updated PO files
2015-09-07 13:37:54 +02:00
Badlop
096d56235b
Fix German translation (thanks to STPKITT)( #726 )
2015-09-07 13:16:56 +02:00
Paweł Chmielowski
f56a9e400d
Pass stream management options defined in http listener to http-bind and websocket
2015-09-04 12:42:53 +02:00
Holger Weiss
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
Badlop
8d1ea87e02
Use hide_sensitive_log_data in eldap.erl
2015-09-03 16:28:21 +02:00
Mickael Remond
a85a8dff45
Merge branch 'master' of github.com:processone/ejabberd
2015-09-02 17:02:20 +02:00
Mickael Remond
06193d18b8
Better to keep config file in a different config directory
2015-09-02 17:02:09 +02:00
Evgeniy Khramtsov
6740b1f0e1
Rename idna.erl to ejabberd_idna.erl ( #702 )
2015-09-02 16:02:46 +03:00
Mickaël Rémond
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
Badlop
1bc2c8cbb1
Add verification of hide_sensitive_log_data global option
2015-09-02 13:46:03 +02:00
Evgeniy Khramtsov
eebd4bbd8f
Remove unused function now_to_iso/1
2015-09-02 14:13:23 +03:00
Mickael Remond
4ae7c81cfa
Allow building ejabberd with Elixir mix and building and ejabberd OTP release
2015-09-02 12:49:19 +02:00
Mickael Remond
e179727a0e
ignore ejabberd release result directory
2015-09-02 12:48:19 +02:00
Mickael Remond
79d3b77de1
Update mix.exs to comply with exrm release system
2015-09-02 11:38:16 +02:00
Mickaël Rémond
87f39c8750
Update mix.exs
...
Fix version number.
2015-09-02 10:54:24 +02:00
Mickael Remond
b6bf1eba42
Upgrade version number to ejabberd 15.07
...
We forgot before previous release
2015-09-02 09:11:06 +02:00
Evgeniy Khramtsov
14ddbce3a9
Do not forget to set from/to when fetching from MUC history
2015-09-01 12:35:51 +03:00
Paweł Chmielowski
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
Evgeniy Khramtsov
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
Holger Weiss
9f62426343
Update MAM tests to always expect RSM in response
2015-08-30 23:26:37 +02:00
Evgeny Khramtsov
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
oxpa
3d5d1ecbe4
get_room_options will not crash in case of query for a non-existent room
2015-08-28 03:34:51 -08:00
Holger Weiss
5bb137940c
Remove "--enable-json" flag
...
The "--enable-json" flag currently has no effect.
2015-08-27 22:16:11 +02:00
Evgeniy Khramtsov
832f6d39f9
Always include RSM in final message
2015-08-24 13:29:15 +03:00
Evgeniy Khramtsov
94444c87e8
Remove MAM archives on MUC room destroy
2015-08-24 13:28:58 +03:00
Badlop
247bd9eae5
More eye-candy mod_http_bind help page (thanks to Marek Foss)
2015-08-21 15:23:15 +02:00
Evgeniy Khramtsov
6177ae3ffb
Improve S2S certificate checks
2015-08-20 01:04:56 +03:00
Evgeniy Khramtsov
b570070834
Fix case clause during S2S certificate checks
2015-08-19 23:47:45 +03:00
Evgeniy Khramtsov
775cf2d459
Change namespace from muc#admin to muc#user
2015-08-19 15:31:35 +03:00
Paweł Chmielowski
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
Paweł Chmielowski
f89db30d77
Catch errors when calling inet:peername in ejabberd_http
2015-08-17 15:50:35 +02:00
Holger Weiss
6d16029716
Let ejabberdctl handle more shell metacharacters
...
Closes #704 .
2015-08-15 17:01:47 +02:00
Holger Weiss
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
Badlop
ac6b436dcf
Prettify copyright links (thanks to GreenLunar)( #692 )
2015-08-13 12:22:14 +02:00
Badlop
994602c97d
Store and retrieve "mam" value in room configuration
2015-08-12 20:28:23 +02:00
Badlop
279d4b00ac
Fix and document create_rooms_file and destroy_
2015-08-12 17:18:41 +02:00
Badlop
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
Badlop
ab0f488dda
Room response to disco#info node muc#traffic should be an error (EJAB-741)
2015-08-12 12:40:51 +02:00
Paweł Chmielowski
2392f09e99
Ejabberd now requires erlang R17+
2015-08-12 11:53:54 +02:00
Evgeniy Khramtsov
40feed723d
Add support for MUC MAM
2015-08-08 22:15:36 +03:00
Paweł Chmielowski
c71d57a05d
Handle merging of append_host_config as is done for host_config
2015-08-06 17:53:18 +02:00
Paweł Chmielowski
5a1ac4faf1
Add ability to override main config file options with data from included files
2015-08-06 17:12:15 +02:00
Christophe Romain
45a312a0eb
Remove obsolete pubsub migration command
2015-08-06 16:57:04 +02:00
Holger Weiss
d9caa51c12
Merge branch 'typo' of https://github.com/sezuan/ejabberd
2015-08-06 08:57:10 +02:00
Matthias Rieber
f5e857a5bd
typo
2015-08-06 08:44:15 +02:00
Alexey Shchepin
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
Paweł Chmielowski
3a5dd51b42
Use websocket pings also on old style connections
2015-08-05 16:09:23 +02:00
Christophe Romain
dc0934bff7
Update FSF address
2015-08-05 09:52:54 +02:00
Holger Weiss
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
Holger Weiss
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
Evgeny Khramtsov
6e61932765
Merge pull request #696 from weiss/muc-presence-hook
...
New hook: muc_filter_presence
2015-08-04 22:14:18 +03:00
Holger Weiss
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
Mickael Remond
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
Evgeniy Khramtsov
f377992232
Do not crash SIP authentication on SCRAMed passwords
2015-08-02 14:47:45 +03:00
Alexey Shchepin
dfe3082445
Update crypto calls
2015-07-30 19:17:53 +03:00
Evgeny Khramtsov
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
wcy123
3e49bf0e83
bug fix: ejabberd:start_app need to pass Type to application:start
2015-07-30 18:57:59 +08:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
1048e21643
XEP-0198: Don't add <delay/> tags to IQ stanzas
2015-07-28 21:00:12 +02:00
Badlop
0dbedb69a6
Recompile translations
2015-07-27 11:45:04 +02:00
Badlop
5788609e5c
Updated Spanish translation
2015-07-27 11:43:31 +02:00
Badlop
5305b4a82c
Updated Hebrew translation (thanks to Isratine Citizen)
2015-07-27 11:41:38 +02:00
Badlop
d03d08539b
Reuse some strings in WebAdmin's Listening Ports
2015-07-27 11:40:56 +02:00
Paweł Chmielowski
76104cd117
Fix problem with merging values from multiple config files
2015-07-24 15:46:08 +02:00
Christophe Romain
e211bf7131
Ensure config snippet is loaded at module installation (EJAB-1741)
2015-07-24 15:09:57 +02:00
Christophe Romain
32fc586c08
Allow contribution to include .yml or .yaml config file
2015-07-24 14:30:31 +02:00
Christophe Romain
8fedc945bf
Allow migration of old pubsub items with xmlelement in body ( #479 )
2015-07-24 13:44:01 +02:00
Christophe Romain
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
Badlop
19aad464da
Provide command for ODBC's convert_to_scram
2015-07-23 13:16:15 +02:00
Paweł Chmielowski
8df134e025
Don't crash web admin when displaying info about websocket using users
2015-07-22 11:54:11 +02:00
Christophe Romain
9091fcb1a1
Let nodetree call default flat plugin now
...
this fix mistake from previous commit 311fedaa
2015-07-22 11:20:06 +02:00
Christophe Romain
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
Christophe Romain
311fedaa12
Let flat be default plugin ( #609 )
2015-07-22 10:37:26 +02:00
Christophe Romain
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
Christophe Romain
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
Evgeny Khramtsov
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
Evgeny Khramtsov
a724893887
Merge pull request #618 from weiss/muc-message-hook
...
New hook: muc_filter_packet
2015-07-21 12:35:27 +03:00
Evgeniy Khramtsov
7f4c74dec9
Print content types more gracefully
2015-07-17 14:29:11 +03:00
Evgeniy Khramtsov
44cc99d616
Get rid of 'db_type' for mod_blocking in test suite
2015-07-16 13:32:46 +03:00
Badlop
7395cc910e
Set direction of resource and connection ( #650 )
2015-07-15 21:39:13 +02:00
Badlop
c53d764119
If local guide.html file not found, redirect to the online guide
2015-07-15 20:45:55 +02:00
Badlop
3eb0b161b2
Update links to Guide in WebAdmin
2015-07-15 20:40:13 +02:00
Badlop
65551afcba
Support RTL page direction in WebAdmin for Hebrew ( #650 )
2015-07-15 19:01:32 +02:00
Badlop
f4376671ac
Set LTR direction to Raw links ( #650 )
2015-07-15 18:51:31 +02:00
Badlop
c012d7555b
Add links in WebAdmin to ejabberd and ProcessOne ( #661 )
2015-07-15 13:10:12 +02:00
Badlop
9ede414f01
Support more mod_muc_admin translation strings ( #659 )
2015-07-15 11:54:35 +02:00
Mickael Remond
062d2d696f
Update dev section to show erl command-line start command
2015-07-11 11:20:38 +02:00
Evgeniy Khramtsov
a53191fed5
Add "complete" attribute to MAM final response (EJABS-2484)
2015-07-10 14:05:47 +03:00
Evgeniy Khramtsov
8e27decdfd
Fix mod_mam compatibility with RSM for other backends
2015-07-10 13:59:33 +03:00
Evgeniy Khramtsov
0dfc8ade68
Fix tests related to MAM
2015-07-10 13:57:27 +03:00
Jerome Sautret
1db65e3614
Fix mod_mam compatibility with RSM (only with odbc backend).
2015-07-10 13:56:33 +03:00
Evgeniy Khramtsov
a168340838
During halt only shutdown MUC rooms on local node
2015-07-08 15:35:26 +03:00
Jerome Sautret
6604b9efbb
Fix MAM tests (EJABS-2480).
2015-07-08 15:34:34 +03:00
Jerome Sautret
2598375051
Changed mam iq get to set as specified by XEP-0313 v0.3
2015-07-08 13:15:14 +03:00
Holger Weiss
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
Holger Weiss
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
Mickael Remond
0770252e9b
Fix dialyzer warning
...
The function is call with binary format from ejabberd_c2s.
2015-07-05 13:33:34 +02:00
Evgeniy Khramtsov
b0453ea2ce
Remove ehyperloglog dependency
2015-07-03 13:18:35 +03:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Evgeny Khramtsov
3267d4c923
Merge pull request #628 from joudinet/master
...
configure.ac: add AC_CONFIG_MACRO_DIR
2015-06-30 12:06:49 +03:00
Johan Oudinet
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
Mickael Remond
0474804d4b
Version number must be SemVersion in mix
...
Semantic version expects versioning with 3 components
2015-06-29 23:32:00 +02:00
Mickael Remond
56034e6ed5
Use https url for git dependencies for consistency
2015-06-29 23:23:31 +02:00
Mickael Remond
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
Evgeniy Khramtsov
3c12d1a960
Do not rely on behaviour info when doing config validation
2015-06-29 22:50:34 +03:00
badlop
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
Holger Weiss
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
Badlop
4ae1b4db03
When passwords are scrammed, report check_password_hash cannot work ( #559 )
2015-06-25 13:39:45 +02:00
Badlop
72f35a6dc6
Add xep definition to mod_mam
2015-06-24 11:58:37 +02:00
Evgeniy Khramtsov
83cce468a5
Add MAM (XEP-0313) support
2015-06-22 16:56:08 +03:00
Badlop
6631078884
Document a few more supported protocols
2015-06-22 13:11:37 +02:00
Holger Weiss
fc0754c609
Add s2s_dhfile to list of known options
2015-06-20 00:14:54 +02:00
Holger Weiss
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
Holger Weiss
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
Christophe Romain
4dc23a5d81
Allow several ';' passed in commands ( #599 )
2015-06-18 14:59:00 +02:00
Badlop
36a96ae3f5
change_room_option misses handling some room options #604
2015-06-18 13:13:49 +02:00
Christophe Romain
d528457ba5
Don't force persistence if cache enabled (fix previous commit)
2015-06-18 12:54:46 +02:00
Christophe Romain
e5a98b100d
Fix max_items and don't let PEP depends on item cache
2015-06-18 12:06:29 +02:00
Badlop
1cf2dfe63a
New hide_sensitive_log_data option to hide client IP in log ( #452 #471 )
2015-06-17 11:32:42 +02:00
Christophe Romain
3c47a5bb75
Allow password with ';' passed in ejabberdctl ( #599 )
2015-06-17 08:59:09 +02:00
Holger Weiss
e608274243
Add s2s_dhfile option to configuration validator
2015-06-16 15:18:34 +02:00
Alexey Shchepin
2110b929bc
Merge pull request #581 from weiss/dh-param-file
...
New options: dhfile and s2s_dhfile
2015-06-16 11:59:06 +03:00
Paweł Chmielowski
dcf5aefea0
Add option to set net_ticktime (EJAB-1742)
2015-06-15 14:57:07 +02:00
Badlop
357ff6c8f7
Fix bug introduced in commit b88fa6f617
2015-06-04 15:47:02 +02:00
Badlop
c04053cfae
Use https instead of git in rebar file for dependencies url ( #589 )
2015-06-04 13:12:49 +02:00
Badlop
fe10c6f6f2
Pick first local multicast service, otherwise remote (ejabberd-contrib#105)
2015-06-04 12:13:10 +02:00
badlop
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
Holger Weiss
6c712b6caa
Don't add body element to MUC subject messages
2015-06-04 09:55:38 +02:00
Evgeny Khramtsov
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
jpegger
6f48f22c71
Authmodule using old style XML:get_attr_s()
2015-06-03 18:11:35 +02:00
Evgeniy Khramtsov
9a9633dbc5
Do not ignore unknown options so far
2015-06-03 16:21:22 +03:00
Evgeniy Khramtsov
c1119b1f39
Remove unused validation code
2015-06-03 16:05:17 +03:00
Evgeniy Khramtsov
ab196b4b02
Move opt_type/1 function out of if-else block
2015-06-03 15:52:19 +03:00
Evgeniy Khramtsov
730fd55ec9
Fix typo
2015-06-03 15:45:15 +03:00
Evgeniy Khramtsov
0ae9ef2b41
Add missing options of ejabberd_logger to validator
2015-06-03 15:25:20 +03:00
Evgeniy Khramtsov
83faff37e5
Add missing options of mod_muc to validator
2015-06-03 15:18:09 +03:00
Badlop
4ed6a3d78f
Fix commands export2odbc, connected_users_vhost and push_alltoall ( #586 )
2015-06-02 12:52:15 +02:00
badlop
0de7864880
Merge pull request #585 from CorCornelisse/master
...
push_roster* not updated on binarification
2015-06-02 12:24:46 +02:00
Evgeniy Khramtsov
157ff4d093
Merge branch 'master' of github.com:processone/ejabberd
2015-06-01 15:38:37 +03:00
Evgeniy Khramtsov
fb6267f38e
Add config validation at startup
2015-06-01 15:38:27 +03:00
Badlop
9a802185ad
Fix anonymous user login, it wasn't stored in anonymous mnesia table
2015-06-01 14:34:49 +02:00
Evgeniy Khramtsov
a9f7d9481f
Do not try to fetch module options via eldap_utils
2015-06-01 15:22:31 +03:00
Evgeniy Khramtsov
ea7de2097f
Reorganize get_opt() code in some modules
2015-06-01 15:20:49 +03:00
Evgeniy Khramtsov
48213b09ce
Get rid of some fuzzy macros as it makes syntax tools getting mad
2015-06-01 15:19:56 +03:00
Cor Cornelisse
22d9011c0c
These arguments should be binary instead of strings, otherwise it won't work properly
2015-06-01 13:30:26 +02:00
Badlop
100827ec6e
In xmlrpc use process_unicode_codepoints instead of list_to_binary
2015-05-29 15:49:12 +02:00
Evgeniy Khramtsov
a291e7d4e6
Fix MUC room options vaildation
2015-05-29 12:08:36 +03:00
Christophe Romain
6cba7bf834
Add correct package version for mix ( #577 )
2015-05-29 09:30:16 +02:00
Evgeniy Khramtsov
e8ffbbb0b4
Validate MUC room options from the configuration file
2015-05-28 11:42:17 +03:00
badlop
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
Badlop
d0443bb714
An auth external module requires ext_mod to be started first ( #578 )
2015-05-27 13:10:15 +02:00
Holger Weiss
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
Christophe Romain
b83c07251c
Fix pubsub/odbc crash on remote user unsubscribe (EJAB-1483)
2015-05-26 19:19:57 +02:00
Alexey Shchepin
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
Mickael Remond
9574e71e8d
Include session record from header file instead of duplicating it
2015-05-26 10:08:46 +02:00
Paweł Chmielowski
3af507cc43
Fix merging of not yaml config files
2015-05-25 15:37:46 +02:00
Christophe Romain
e54e556e01
Fix use of publish_only affiliation with odbc backend
2015-05-22 18:47:17 +02:00
Christophe Romain
90225a4744
Minor cosmetic changes and add ping command
2015-05-22 17:28:40 +02:00
Badlop
0d322d8dab
Add fold markers to config file for Vim editors
2015-05-22 12:42:24 +02:00
Badlop
be6ac85f31
A few more... Fix epmd not in PATH ( #484 )(thanks to acediac)
2015-05-22 10:40:24 +02:00
Badlop
b07cb1ed84
Use namespace definitions when possible
2015-05-21 17:04:14 +02:00
Badlop
0c725b5fac
Document protocol support (EJABS-1620)
2015-05-21 17:04:05 +02:00
Badlop
3b24923458
Fix dialyzer warning in mod_muc_admin:206
2015-05-21 12:00:41 +02:00
badlop
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
Christophe Romain
3188941af2
Add minor robustness on cluster scripts
2015-05-20 14:06:03 +02:00
Christophe Romain
fcdb519770
Add missing sm table (thanks to Rasim Kalimullin)(EJAB-1740)
2015-05-20 13:50:59 +02:00
Evgeny Khramtsov
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
Evgeny Khramtsov
05011e6918
Revert "added sm table to pg.sql"
2015-05-20 13:57:44 +03:00
Evgeny Khramtsov
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
Holger Weiss
889459b45c
Fix function specification
2015-05-20 12:13:15 +02:00
Christophe Romain
1854b5e411
Remove obsolete doc and win32 files (EJAB-1738)
2015-05-20 11:43:29 +02:00
Evgeniy Khramtsov
3b267eaa61
Do not bounce normal messages sent to unavailable resource
2015-05-19 10:58:36 +03:00
Holger Weiss
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
Christophe Romain
8bb994dbca
Call integer_to_binary using jlib ( #554 )
2015-05-18 17:30:25 +02:00
Holger Weiss
dfbef8be8f
Remove XEP-0091 tags from test suite
2015-05-18 14:38:57 +02:00
Badlop
2af659b737
Remove deprecated XEP-0090 Entity Time and 91 Delayed Delivery (EJAB-849)
2015-05-18 12:38:25 +02:00
Matthias Rieber
16532dd643
Fixed some string()/binary() issues in ejabberd_odbc
2015-05-18 12:14:56 +02:00
Holger Weiss
555c1736b7
Revert "Fix EJABBERD_OPTS quoting for Elixir"
...
This reverts commit 2a15453d98
.
The commit broke the case where 'log_rotate_date' is set to "$D0", for
example.
2015-05-18 00:48:56 +02:00
Evgeny Khramtsov
e66b45d886
Merge pull request #571 from sezuan/fix_export_term
...
fixed erl_prettypr in encode_term
2015-05-17 22:44:14 +03:00
Matthias Rieber
0800a9733c
pg - added sm table
2015-05-17 21:38:33 +02:00
Matthias Rieber
f5c9dfbc93
fixed erl_prettypr in encode_term
2015-05-17 19:37:49 +02:00
Badlop
084d0c4efe
New command get_room_options ( #567 )
2015-05-15 17:47:10 +02:00
Holger Weiss
61afd668c2
Fix indentation
2015-05-15 15:50:43 +02:00
Paweł Chmielowski
de7ff536b2
Load config snippets for modules installed with ext_mod (EJAB-1741)
2015-05-15 12:30:15 +02:00
Paweł Chmielowski
5dbe7a3c6c
Export modules_dir/0
2015-05-15 12:27:59 +02:00
Holger Weiss
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
Holger Weiss
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
Christophe Romain
dbcfd38c18
Allow run joincluster as non root when ejabberd installed as root ( #497 )
2015-05-13 15:54:28 +02:00
Christophe Romain
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
Badlop
d885435552
Fix setting 'description' with change_room_option command ( #567 )
2015-05-12 17:37:39 +02:00
Mickaël Rémond
eca3b46ee1
Merge pull request #560 from benlangfeld/feature/dev-vm
...
Point out availability of development environment
2015-05-12 09:52:12 +02:00
Badlop
f817762cc4
New max_users_presence mod_muc option (thanks to anhcoi123)( #562 )
2015-05-08 13:09:25 +02:00
Badlop
25beb46391
Fix check_password_hash argument parsing ( #559 )
2015-05-08 12:04:04 +02:00
Badlop
7ab6c4b4fd
Try to support access_commands in YAML (ejabberd-contrib#45)
2015-05-07 18:34:05 +02:00
Badlop
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
Badlop
f7d9bb7ce4
Don't announce register feature once user is authenticated ( #41 )
2015-05-07 11:41:59 +02:00
Ben Langfeld
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
Ben Langfeld
d9814709e2
Remove commented code
2015-05-06 12:55:35 -03:00
Evgeny Khramtsov
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
Holger Weiss
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
Ben Langfeld
6eab111d05
Point out availability of development environment
2015-05-05 09:24:41 -03:00
Badlop
fa99519f8b
Simplify internal code of get_last and set_last commands
2015-05-05 12:54:20 +02:00
Badlop
96c62acb1b
Improve get_last command to provide also last activity status
2015-05-05 12:46:21 +02:00
Badlop
77e57afae1
Fix set_last command to work with recent ejabberd ( #555 )
2015-05-05 12:45:53 +02:00
Evgeniy Khramtsov
60fe008268
Remove duplicated code
2015-04-29 14:51:45 +03:00
Christophe Romain
6987e85602
Improve module install code, allows better error checking
2015-04-29 13:30:03 +02:00
Badlop
7492ecae52
New command get_user_rooms
2015-04-29 13:22:49 +02:00
Christophe Romain
4440b03b89
Fix fetching from git@github url and allow compilation from ejabberd sources
2015-04-29 10:19:15 +02:00
Christophe Romain
01718a4e42
Merge pull request #549 from joudinet/master
...
ejabberdctl: define mnesia options
2015-04-28 17:34:57 +02:00
badlop
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
Johan Oudinet
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
Badlop
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
Holger Weiss
dc449687a0
mod_disco: Apply minor readability improvements
2015-04-26 16:36:17 +02:00
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
9c85cb5f25
Fix validating function for iqdisc
2015-04-23 14:59:18 +03:00
Christophe Romain
23aa8598ab
Allow bypassing script interraction ( #516 )
2015-04-23 10:14:08 +02:00
Christophe Romain
38dd44e18f
Improve purge_offline filter and speed ( #543 )
2015-04-22 18:11:39 +02:00
Christophe Romain
df3afafb48
Add publish_only to affiliation type spec
2015-04-22 18:10:35 +02:00
Badlop
2e194bd997
Add private and roster local handlers to get listed in disco#info (EJAB-682)
2015-04-22 13:27:25 +02:00
Christophe Romain
43f2064daa
Remove obsolete release notes
2015-04-22 12:21:48 +02:00
Badlop
e280de8452
Allow to modify host when registering account in web ( #291 )
2015-04-22 11:01:47 +02:00
Christophe Romain
6e4d6caebf
Add support for publish-only ( #30 )
2015-04-21 17:23:59 +02:00
Christophe Romain
cf37f3977a
Fix typo, oups...
2015-04-21 16:13:23 +02:00
Christophe Romain
61f80396da
remove deferred Collection shim header
2015-04-21 16:11:00 +02:00
Christophe Romain
cbd45974e2
Owner can subscribe to its node ( #454 )
2015-04-21 15:24:31 +02:00
Christophe Romain
747d25b4ad
Fixed node type (thanks to saczawap) ( #435 )
2015-04-21 15:24:24 +02:00
Christophe Romain
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
Christophe Romain
63926efd20
Improve join/leave cluster scripts
2015-04-21 13:32:14 +02:00
Christophe Romain
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
Evgeniy Khramtsov
ed79a61752
Fix LDAP substrings filter (EJAB-1715)
2015-04-21 11:49:41 +03:00
Holger Weiss
94936b261e
Add privacy error stanza to XEP-0198 queue
2015-04-20 22:03:18 +02:00
Alexey Shchepin
fd54181435
Fixed error replying on blocked messages
2015-04-20 17:19:09 +03:00
Paweł Chmielowski
e8576c23c5
Make s2s port configurable in test runner
2015-04-20 16:16:30 +02:00
Badlop
c2e6ce0f04
Remove load_config command because is superseded by reload_config ( #532 )
2015-04-20 15:57:44 +02:00
Evgeny Khramtsov
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
Holger Weiss
aa36742a40
mod_fail2ban: Add 'access' option for whitelisting
...
Closes #535 .
2015-04-18 11:08:05 +02:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
b447839592
CSI test: Simplify and improve readability
2015-04-16 23:20:14 +02:00
Holger Weiss
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
Badlop
d624753410
Update get_password_s description with SCRAM return values
2015-04-15 11:51:34 +02:00
Badlop
a5adaf5798
Revert "Hook on group message"
...
This reverts commit b81250d667
.
2015-04-15 11:51:29 +02:00
Paweł Chmielowski
63d6d68979
Make sure that server processed our inactive request before processing further in testing
2015-04-15 11:21:37 +02:00
badlop
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
Paweł Chmielowski
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
Paweł Chmielowski
a1f81057ca
Enable websocket connection in default config file
2015-04-15 10:35:17 +02:00
Holger Weiss
e408276283
Don't forget gen_tcp:listen/2 options
...
Fixes #530 .
2015-04-14 20:22:34 +02:00
Badlop
b67af5e036
Fix nick logging in mod_muc_log plaintext ( #522 )
2015-04-14 15:46:59 +02:00
Badlop
25449a076f
Clean multicast routing code detected by xref
2015-04-10 16:02:45 +02:00
Paweł Chmielowski
b9fdcc3985
Add ability to configure parameters used by "make test" with test/config.ctc
2015-04-09 17:14:30 +02:00
Paweł Chmielowski
e8701802ee
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
Paweł Chmielowski
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
Paweł Chmielowski
8732817c3c
Fix problem with pushing bufferend #xmlel-s to receiver in websocket code
2015-04-09 13:35:37 +02:00
Badlop
f129c6530c
Fix bug when sorting the list of rooms in WebAdmin
2015-04-08 15:34:08 +02:00
Evgeniy Khramtsov
32b60d4250
Remove hack with binary to integer conversion
2015-04-08 16:11:06 +03:00
Evgeniy Khramtsov
7a89dda816
Merge branch 'master' of github.com:processone/ejabberd
2015-04-08 15:31:41 +03:00
Evgeniy Khramtsov
9b4942890d
Add virtual host support for SQLite
2015-04-08 15:31:28 +03:00
Badlop
0cf8d1fa6e
Copy multicast code from ejabberd-contrib to provide XEP-0033 ( #521 )
2015-04-08 14:01:16 +02:00
Evgeniy Khramtsov
fb0e82f743
Add SQLite3 library checks at the configure script
2015-04-08 14:49:14 +03:00
Evgeniy Khramtsov
675c428f21
Disable awkward trap_exit flag
2015-04-08 14:40:28 +03:00
Evgeniy Khramtsov
bdedcf8d8a
Enable FOREIGN KEYS by default
2015-04-08 14:39:47 +03:00
Evgeniy Khramtsov
2a3a2d9804
Make sure SQLite always returns binaries
2015-04-08 14:38:04 +03:00
Evgeny Khramtsov
5a820aca40
Merge pull request #486 from saa/sqlite_support
...
Add SQLite support
2015-04-08 14:34:56 +03:00
Jerome Sautret
c3280e9dad
Add mod_muc_admin contrib.
2015-04-07 17:05:43 +02:00
Holger Weiss
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
Evgeny Khramtsov
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
Mickael Remond
c140f98276
Explicitly start crypto with start
...
This is to please Elixir / Phoenix enviroment
2015-04-07 09:03:37 +02:00
liudan
f981a53f9a
fix otp version check in listen_tcp/5
2015-04-07 09:28:35 +08:00
Holger Weiss
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
Paweł Chmielowski
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
Paweł Chmielowski
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
Mickael Remond
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
Mickael Remond
cc247c5510
Fix compilation result for asn1 files
2015-04-06 12:39:21 +02:00
Mickael Remond
1106afb2f6
Remove unused variable
2015-04-06 12:31:32 +02:00
Mickael Remond
cf83a75ceb
Fix asn1 module compilation with mix
...
This should solve building ejabberd as an Elixir dependency.
2015-04-06 12:29:11 +02:00
Evgeniy Khramtsov
69bff82301
Fix type spec
2015-04-06 12:38:54 +03:00
Mickael Remond
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
Holger Weiss
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
Mickael Remond
ea8db9967f
ejabberd can be embedded in an Elixir application
2015-04-04 17:42:12 +02:00
Badlop
7d3b2cad26
Replace crypto calls that will be removed in a future release
2015-04-04 14:09:58 +02:00
Badlop
cf40daf663
Replace undefined value with empty one ( processone/ejabberd-contrib#92 )
2015-04-04 13:48:17 +02:00
Holger Weiss
1fa73fd33f
Remove unused case clauses to make dialyzer happy
2015-04-03 20:37:42 +02:00
Badlop
94761ff31e
Improve srg_get_info result format ( processone/ejabberd-contrib#92 )
2015-04-03 12:16:11 +02:00
Paweł Chmielowski
088c5c4672
Fix output formatting in srg_get_info commend from mod_admin_extra
2015-04-02 16:55:51 +02:00
Paweł Chmielowski
b580da3547
Fix problems with get_vcard* functions from mod_admin_extra
2015-04-01 16:32:34 +02:00
Paweł Chmielowski
cf3b4dbc7b
Drop exmpp usage from mod_admin_extra
2015-04-01 15:44:49 +02:00
Evgeny Khramtsov
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
Evgeniy Khramtsov
821039b7d5
Swap 'mnesia' and 'internal' types correctly
2015-03-30 12:25:25 +03:00
Evgeniy Khramtsov
fb1fd50df5
The 'default_db' option should impact ejabberd_auth as well
2015-03-30 12:18:18 +03:00
Evgeniy Khramtsov
4af15df546
Add new 'default_db' option
2015-03-30 12:15:29 +03:00
Sergey Abramyan
15af88a09a
Fix lite.sql and convert binary to integer
2015-03-27 22:14:29 +03:00
Badlop
176114d28e
Try to fix more Dialyzer warnings
2015-03-27 15:55:57 +01:00
Badlop
9c96d30719
Ensure set_presence changes are kept in state (thanks to Davide Colombo)(EJAB-1184)
2015-03-27 15:03:14 +01:00
Paweł Chmielowski
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
Badlop
30dc82a98a
Fix even more dialyzer warnings
2015-03-27 12:28:24 +01:00
Badlop
8707c0b045
Fix set_presence command (ejabberd-contrib#61)
2015-03-27 11:43:56 +01:00
Badlop
10dfd182f6
Fix more mod_admin_extra commands
2015-03-26 20:41:16 +01:00
Badlop
9b3dda105d
Fix problems in process_rosteritems command
2015-03-26 16:18:39 +01:00
Badlop
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
Badlop
fbb6b65192
Detect correctly when vCard does not exist ( #21 )
2015-03-26 14:00:58 +01:00
Badlop
0c30beb93d
Fix return error when requesting non-existing vcard value ( #21 )
2015-03-26 14:00:54 +01:00
Mickaël Rémond
c9393bc4f4
Ignore errors when retrieving status if the users just got offline
...
Fix possible race condition.
2015-03-26 14:00:50 +01:00
Holger Weiss
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
Badlop
88cd8c7b12
Update FSF address (solves #73 )
2015-03-26 14:00:46 +01:00
HAMANO Tsukasa
00fe68ed06
fix connected_users_info in mod_admin_extra
2015-03-26 14:00:44 +01:00
Holger Weiss
09dd288ac0
mod_admin_extra: Fix private_get/private_set types
2015-03-26 14:00:42 +01:00
Badlop
2186c03a9c
Support TEL XXX in set and get_vcard commands
2015-03-26 14:00:40 +01:00
colm
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
Badlop
c3afc3c7c0
Join three send_message_* commands in one (PR #68 )
2015-03-26 14:00:36 +01:00
HAMANO Tsukasa
9a64bfe605
add send_message_normal command
2015-03-26 14:00:34 +01:00
HAMANO Tsukasa
ca25d44c8b
fix mod_admin_extra stats command
2015-03-26 14:00:32 +01:00
Holger Weiss
4e9b4cbc11
mod_admin_extra: Fix stats(_host) argument types
2015-03-26 14:00:30 +01:00
Badlop
46b33b51b4
Update kick_session to work with ejabberd master
2015-03-26 14:00:28 +01:00
Sonny Scroggin
3eebf100f9
Binary conversions
2015-03-26 14:00:24 +01:00
Sonny Scroggin
5c0a1dde1c
More binary conversions
2015-03-26 14:00:21 +01:00
Badlop
949705b04a
Update add_roster_item and get_roster to ejabberd 13
2015-03-26 14:00:18 +01:00
Badlop
f682dfe3a6
Fix get_vcard and set_vcard when using option module_resource (issue #21 )
2015-03-26 14:00:16 +01:00
Sonny Scroggin
14a3662ca4
Fix add_rosteritem, delete_rosteritem, and get_roster
2015-03-26 14:00:14 +01:00
Badlop
ffea2bf350
Update get_vcard and set_vcard to ejabberd 13 (fixes issue #21 )
2015-03-26 14:00:12 +01:00
Rahul Gautam
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
Badlop
d72c739630
Fix command change_password ( fixes #16 )
2015-03-26 14:00:08 +01:00
Badlop
57035b383c
Handle error when requesting information of a non-existing shared roster ( fixes #14 )
2015-03-26 14:00:06 +01:00
Badlop
2746e358b3
Fixes srg_* commands ( fixes #147 )
2015-03-26 14:00:04 +01:00
Badlop
d66f40d94f
Fix srg_create when calling ejabberd_regexp (fixes issue #12 )
2015-03-26 14:00:01 +01:00
Badlop
e6a9c5ccee
Add get_last to ejabberdctl for last user activity (thanks to lehrblogger)
...
The logic for determining the response is borrowed from here:
6d811f5178/src/web/ejabberd_web_admin.erl (L1583-L1601)
2015-03-26 13:59:59 +01:00
Badlop
f0cf90c11e
Initial import from ejabberd-modules SVN
2015-03-26 13:59:57 +01:00
Paweł Chmielowski
de26af3fdb
Make sure that we send each time <close> before closing websocket connection
2015-03-25 17:10:08 +01:00
Badlop
d9ad26b4ec
If command crashes, return restuple with error and explanation (ejabberd-contrib #21 )
2015-03-25 13:57:08 +01:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
27a4d783a5
Fix "IP address not available" error message
2015-03-24 17:32:57 +01:00
Alexey Shchepin
736710cc9c
Add support for ciphers and protocol_options in ejabberd_http
2015-03-24 18:14:47 +03:00
Christophe Romain
8f46ca48c1
export CONTRIB_MODULES_PATH (thanks to sezuan)( #489 )
2015-03-24 16:00:56 +01:00
Christophe Romain
b6999b126a
Make R16B03-1 the minimal reguired otp version
2015-03-23 14:54:29 +01:00
Holger Weiss
31e356c126
Avoid crypto:hmac/3 call for R15B compatibility
2015-03-21 22:56:23 +01:00
Holger Weiss
a5d6044448
Fix compilation on Erlang R15B
2015-03-21 22:06:38 +01:00
Alexey Shchepin
477d27a3dc
Remove duplicate CREATE INDEX in mysql.sql
2015-03-21 23:41:43 +03:00
Christophe Romain
8b23727cc6
Start ext_mod before module as it's setup contrib path
2015-03-20 15:06:02 +01:00
Alexey Shchepin
5135e30633
Removed deprecated calls to crypto:sha_mac in scram.erl
2015-03-20 14:09:38 +03:00
Alexey Shchepin
f6db84282b
Add ejabberd_auth_odbc:convert_to_scram/1
2015-03-20 13:46:17 +03:00
Alexey Shchepin
e575c87ea2
Add SCRAM support to ejabberd_auth_odbc
2015-03-20 13:45:24 +03:00
Alexey Shchepin
0eb6b942ff
Add a missed SQL index on privacy_list_data table
2015-03-20 10:40:25 +01:00
Jerome Sautret
6b67a66a1b
Added MySQL support for delete_old_messages (offline) command.
2015-03-20 10:40:19 +01:00
Evgeniy Khramtsov
4d2924a3ef
Fix mod_offline termination
2015-03-20 10:40:13 +01:00
Alexey Shchepin
b7726ee392
Explicitly set standard_conforming_strings to off with PostreSQL
2015-03-20 10:39:29 +01:00
Evgeniy Khramtsov
51508a9fc3
Report TLS errors
2015-03-20 10:39:14 +01:00
Sergey Abramyan
5ae01e8bb4
Add SQLite support
2015-03-20 01:10:47 +03:00
Christophe Romain
7976d3eb48
Fix epmd not in PATH ( #484 )
2015-03-18 22:26:06 +01:00
Holger Weiss
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
Christophe Romain
aa1250a3dd
Add missing list_to_binary call
2015-03-13 17:59:19 +01:00
Christophe Romain
5b9635cc07
Add contributed modules code path on start
2015-03-13 12:20:25 +01:00
Christophe Romain
588f98fc3a
Rename module function to keep them grouped on help
2015-03-13 11:54:32 +01:00
Christophe Romain
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
Holger Weiss
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
Evgeniy Khramtsov
f72799b3cc
Improve module structure
2015-03-13 13:05:16 +03:00
Evgeniy Khramtsov
bbe5c6b74e
Do not fail on badly formed SQL results
2015-03-13 12:59:16 +03:00
Evgeniy Khramtsov
c7dc56c314
Fix unblock all when Riak is used as a backend
2015-03-13 12:47:08 +03:00
Christophe Romain
6093dedb65
Extra arguments to cluster scripts are not mandatory
2015-03-13 09:56:51 +01:00
Christophe Romain
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
Holger Weiss
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
Holger Weiss
6447aeb726
Replace bashism in ejabberdctl
2015-03-12 19:29:41 +01:00
Paweł Chmielowski
bf5c7198fc
Update sockmod() type after adding websocket support
2015-03-12 13:15:31 +01:00
Christophe Romain
7209954a5f
Remove unused clause
2015-03-12 13:15:07 +01:00
Paweł Chmielowski
e855791f16
Update types to fix dialyzer warnings
2015-03-12 10:34:34 +01:00
Holger Weiss
b045bd806a
mod_offline: Remove a few superfluous newlines
2015-03-11 20:38:22 +01:00
Holger Weiss
0bfde19ebd
Don't crash in mod_offline:export/1
...
(Thanks to Christophe Romain.)
2015-03-11 20:35:08 +01:00
Christophe Romain
2d53f7f83e
start ext_mod in later stage at init
2015-03-11 17:39:07 +01:00
Christophe Romain
a1a46f7df5
Remove unused code
2015-03-11 17:15:42 +01:00
Christophe Romain
c9b82ff1e5
Compile contributed module with lager if enabled in ejabberd
2015-03-11 14:35:01 +01:00
Christophe Romain
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
Evgeniy Khramtsov
a0fafc383a
Add Redis backend for SM
2015-03-11 14:46:57 +03:00
Holger Weiss
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
badlop
0a88255ef6
Merge pull request #467 from hamano/mod_offline_restart
...
change mod_offline restart type
2015-03-09 19:26:19 +01:00
Evgeniy Khramtsov
c0540e1377
Fix R15B compilation
2015-03-09 17:50:14 +03:00
Evgeniy Khramtsov
72d9b099c6
Make it possible to use SQL as an SM backend
2015-03-09 16:41:13 +03:00
Evgeniy Khramtsov
36b7da3ad8
Add forgotten header file
2015-03-09 16:39:29 +03:00
Evgeniy Khramtsov
86e03f3828
Separate db backend from the SM
2015-03-09 14:57:33 +03:00
HAMANO Tsukasa
f55de94314
change mod_offline restart type
2015-03-09 20:28:55 +09:00
Mickaël Rémond
db9a400279
Merge pull request #466 from mremond/hooks_refactor
...
Hooks module refactor
2015-03-09 09:34:54 +01:00
Mickaël Rémond
8fef3d1f3f
Reorganize / clean ejabberd_hooks header
2015-03-08 19:03:02 +01:00
Mickaël Rémond
a339df2d6a
More ejabberd_hooks refactor
2015-03-08 18:44:43 +01:00
Mickaël Rémond
fd91ee5169
ejabberd_hooks refactor and better types
2015-03-08 18:23:22 +01:00
Mickaël Rémond
6b0bcfa5d7
Suppress warnings in Elixir test
2015-03-08 18:22:14 +01:00
Mickaël Rémond
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
Mickaël Rémond
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
Mickaël Rémond
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
Mickaël Rémond
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
Mickaël Rémond
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
Mickaël Rémond
f845299eb2
Merge pull request #460 from mremond/run-elixir-test
...
Fix Elixir tests failure detection
2015-03-07 11:59:44 +01:00
Mickaël Rémond
da468db648
Fix Elixir tests failure detection
...
We now make sure we have no failure.
Solves #438
2015-03-07 11:49:37 +01:00
Christophe Romain
8cf4ef0aac
add mnesia cluster helper scripts
2015-03-06 15:42:41 +01:00
Badlop
f18ce9564c
Fix: default_host is forgotten between consecutive HTTP requests ( #416 )
2015-03-06 12:40:48 +01:00
Badlop
e0228e9b7a
Access list editing broken in web_admin ( #252 )
2015-03-05 11:34:25 +01:00
Badlop
e575f401cd
Accept configuration file with .yaml extension ( #290 )
2015-03-04 17:18:57 +01:00
Mickaël Rémond
8a99287374
Merge branch 'master' of github.com:processone/ejabberd
2015-03-03 22:20:08 +01:00
Mickaël Rémond
f0f8301b5e
Fix typo on state reuse
...
It should help with the crash on #453
2015-03-03 22:19:51 +01:00
Mickaël Rémond
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
Holger Weiss
cffe0b0dfe
Fix IPv6 loopback address in the guide
...
Thanks to Erik Huelsmann for spotting this.
2015-03-03 21:23:11 +01:00
badlop
7c4efca361
Merge pull request #448 from hamano/ja
...
update japanese translation.
2015-03-02 11:09:06 +01:00
Christophe Romain
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
HAMANO Tsukasa
c1f7b30045
additional japanese translation.
2015-02-27 19:21:47 +09:00
Badlop
83c2dd78a7
Update Spanish translation
2015-02-26 17:57:51 +01:00
Badlop
97ae67b8d6
Run "make translations" to update PO and MSG files
2015-02-26 17:16:27 +01:00
badlop
a1f4206fbe
Merge pull request #445 from hamano/ja
...
improve japanese translation
2015-02-26 17:13:35 +01:00
HAMANO Tsukasa
e8039f3609
improve japanese translation
2015-02-26 23:42:52 +09:00
Badlop
1b67ac0c20
Update remanining old RFC links (EJAB-1728)( #444 )
2015-02-26 12:18:51 +01:00
badlop
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
Holger Weiss
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
Ben Langfeld
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
Badlop
5bd8724801
Update FSF address
2015-02-25 15:19:33 +01:00
Paweł Chmielowski
ab3d38c9fc
Fix processing POST messages after changes from adding websocket handling
2015-02-25 14:36:48 +01:00
Paweł Chmielowski
8e33f31f50
Try not to use c2s:send_text, it causes problem with websocket
2015-02-25 13:57:03 +01:00
Paweł Chmielowski
b42b171613
Add support for websocket connections
2015-02-25 13:57:02 +01:00
Holger Weiss
2a15453d98
Fix EJABBERD_OPTS quoting for Elixir
2015-02-24 23:59:39 +01:00
Mickaël Rémond
011099ce43
Merge pull request #442 from weiss/use-stable-elixir
...
Use Elixir's 'v1.0' branch
2015-02-24 12:46:56 +01:00
Holger Weiss
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
Feotov Daniil
b81250d667
Hook on group message
2015-02-24 11:06:41 +03:00
Christophe Romain
6a094f9118
Merge branch 'master' of github.com:processone/ejabberd
2015-02-23 15:52:23 +01:00
Christophe Romain
e0ffcbe45d
Add script for systemd (Guthub #434 )
2015-02-23 15:52:18 +01:00
Mickaël Rémond
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
Christophe Romain
0c0947a241
Add compatibility macros for deprecated types (thanks to Alexey)
2015-02-23 09:58:00 +01:00
Mickaël Rémond
17be6a303b
Improve comments for running Elixir tests
2015-02-22 17:45:25 +01:00
Mickaël Rémond
510a717dbb
Support for running Elixir ExUnit tests from Common Test
2015-02-22 17:41:17 +01:00
Mickaël Rémond
d8b048663d
Update links
2015-02-19 12:17:39 +01:00
Mickaël Rémond
ab5dd79ca2
Display build status
2015-02-19 12:10:25 +01:00
Badlop
725af2de45
Update mod_vcard_ldap Guide documentation from Erlang to YAML format (Github #274 #394 )
2015-02-17 13:41:06 +01:00
Holger Weiss
e87d332394
mod_carboncopy: Apply small code simplification
2015-02-12 00:14:57 +01:00
Holger Weiss
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
Holger Weiss
9f822dd2b8
Don't crash if 'request_path' has unexpected type
2015-02-11 15:38:55 +01:00
Mickaël Rémond
3cba2cb1ec
Fix incorrect Elixir name
2015-02-11 10:19:40 +01:00
Holger Weiss
834c680f97
Remove unused function clause in mod_carboncopy
2015-02-11 00:52:47 +01:00
Holger Weiss
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
Paweł Chmielowski
fbb512cb5a
Disable elixir support in travis tests
2015-02-10 18:22:54 +01:00
Mickaël Rémond
0f80523736
Merge pull request #429 from mremond/master
...
Add Elixir support to ejabberd
2015-02-10 18:10:27 +01:00
Mickaël Rémond
01e1f677c7
Add Elixir support to ejabberd
2015-02-10 17:56:44 +01:00
Holger Weiss
cf929e730f
Document EJABBERD_CONFIG_PATH in ejabberdctl.cfg
2015-02-10 00:15:06 +01:00
Holger Weiss
5c32ba49e2
README: Mention commands in the right order
2015-02-09 14:57:23 +01:00
Holger Weiss
2ccbff3b98
README: Mention how to create "configure" script
2015-02-09 14:31:59 +01:00
Holger Weiss
d00f0fb1f4
Don't convert configuration values to strings
2015-02-09 01:08:01 +01:00
Holger Weiss
7fd7e53e4a
Fix typo in debug message
2015-02-08 23:49:17 +01:00
Feotov Daniil
eb52c118d0
Migration of scram passwords with piefxis (riak and internal only)
2015-02-05 18:44:08 +03:00
Badlop
ed502673f4
List all available commands in the guide (EJAB-1735)
2015-01-28 17:54:05 +01:00
Badlop
87d2eb5f9a
Support for "> ." in YAML configuration files
2015-01-28 17:16:10 +01:00
Evgeny Khramtsov
0c501b760f
Merge pull request #414 from weiss/fix-function-specs
...
Fix a few jlib function specifications
2015-01-23 16:44:48 +03:00
Holger Weiss
0a047d790f
Fix a few function specifications
2015-01-23 00:42:18 +01:00
Christophe Romain
c4d17d939d
Fix integer parameter which can be set to 0
2015-01-22 12:40:27 +01:00
Evgeny Khramtsov
561025ba32
Merge pull request #413 from weiss/fix-timestamp-overflow
...
Fix timestamp formatting
2015-01-22 11:00:41 +03:00
Badlop
15e77e9c0f
New command to reload config (EJAB-1140)
2015-01-21 15:18:46 +01:00
Christophe Romain
120e581865
Fix missing copyright dates to 2015 (EJAB-1733)
2015-01-21 14:52:37 +01:00
Holger Weiss
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
Holger Weiss
18d9f18642
Don't match integer() against float() value
2015-01-21 11:06:06 +01:00
Nathan Bruning
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
Christophe Romain
0559edd1cd
Merge pull request #410 from weiss/enable-transient-supervisors
...
Enable transient supervisors by default
2015-01-20 13:16:10 +01:00
Holger Weiss
2683b340ae
Cosmetic changes for "./configure --help" output
2015-01-20 12:32:22 +01:00
Holger Weiss
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
Evgeny Khramtsov
104009b3a9
Merge pull request #409 from hamano/scram-stringprep-checking
...
Scram stringprep checking(correct fix)
2015-01-19 15:23:47 +03:00
HAMANO Tsukasa
e01eb734b4
correct fix for #396
2015-01-19 16:00:18 +09:00
HAMANO Tsukasa
cb57cfa1a6
correct fix for #396
2015-01-19 15:25:58 +09:00
Badlop
146adce3d6
Update the Guide about using access_commands in YAML/CFG files
2015-01-15 20:00:35 +01:00
Badlop
2c4647a980
Fix binaries when ejabberd_ctl passes auth details
2015-01-15 20:00:06 +01:00
Badlop
7690320f0f
Fix access_commands option in ejabberd_xmlrpc, now it works
2015-01-15 17:39:12 +01:00
Evgeniy Khramtsov
4575649e10
Get rid of asn1rt calls
2015-01-15 14:51:20 +03:00
Evgeniy Khramtsov
d53a54d900
Ignore warnings_as_errors everywhere
2015-01-15 13:49:24 +03:00
Evgeny Khramtsov
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
Taufan Aditya
f650fc83ae
Fix spec comment and remove useless case block
2015-01-09 22:19:46 +07:00
Evgeny Khramtsov
17a7844e40
Merge pull request #399 from toopay/patch-cleanup-unused-vars
...
Fix unused vars warning
2015-01-08 21:47:20 +03:00
Taufan Aditya
864e113256
Fix unused vars warning
2015-01-09 01:00:26 +07:00
Badlop
e7e8f2f63a
Update some RFC links (EJAB-1728)
2015-01-08 18:18:17 +01:00
Badlop
3063a84fe2
Update compilation from git (github #397 )
2015-01-08 17:53:25 +01:00
Badlop
5a35405cd5
Update copyright dates to 2015 (EJAB-1733)
2015-01-08 17:34:43 +01:00
Evgeny Khramtsov
4ef2d08456
Merge pull request #396 from hamano/scram-stringprep-checking
...
checking stringprep in scram authentication
2015-01-08 11:02:23 +03:00
HAMANO Tsukasa
ede5a353e8
checking stringprep in scram authentication
2015-01-08 14:12:05 +09:00
Badlop
b88fa6f617
Fix missing presences when adding shared groups (Github PR#99, thanks to Bokner)
2015-01-07 13:11:53 +01:00
Badlop
3882c4d514
Fix binaries in command ejabberdctl stop_kindly
2015-01-07 11:44:04 +01:00
badlop
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
badlop
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
Holger Weiss
a7f578089a
Fix example: turn_ip must be specified as string
2015-01-04 00:55:00 +01:00
Evgeny Khramtsov
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Jerome Sautret
cc958f7787
Fix upgrade of PubSub mnesia tables from older ejabberd version.
2014-12-18 11:51:28 +01:00
Evgeny Khramtsov
8781c8346b
Merge pull request #379 from weiss/polish-readme
...
Polish the README file a bit
2014-12-17 18:36:05 +03:00
Holger Weiss
ad4b41730e
Apply various cosmetic changes to README file
2014-12-16 22:14:36 +01:00
Christophe Romain
5935b4e104
improve readability of links on github page
2014-12-15 10:52:47 +01:00
Christophe Romain
d1f09a29b9
improve README adding feature list
2014-12-15 10:26:57 +01:00
Evgeny Khramtsov
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
Holger Weiss
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
Holger Weiss
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
Christophe Romain
7e6d310fe4
include static versions of deps in rebar.config/script (thanks to Holger Weiß)(EJAB-1730)
2014-12-11 15:21:58 +01:00
Evgeny Khramtsov
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Evgeny Khramtsov
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
Holger Weiss
2cb16bc509
Remove unused field from c2s #state
2014-11-26 00:15:19 +01:00
Evgeny Khramtsov
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
Evgeny Khramtsov
4163626844
Merge pull request #365 from weiss/csi-config
...
Fix mod_client_state's configuration parsing
2014-11-25 14:21:18 +03:00
Evgeny Khramtsov
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
Evgeny Khramtsov
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
Evgeny Khramtsov
6b916e7a04
Merge pull request #354 from weiss/pep-privacy
...
Respect privacy lists for incoming PEP messages
2014-11-25 14:20:01 +03:00
Evgeny Khramtsov
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
30687c40ef
Don't route PEP error messages to clients
2014-11-24 21:19:32 +01:00
Holger Weiss
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
badlop
b85357d280
Merge pull request #223 from kaLaJengkinG/patch-1
...
Update id.msg
2014-11-24 11:49:26 +01:00
Evgeny Khramtsov
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
Holger Weiss
46d035c142
Fix parsing of "ldap_dn_filter" option
2014-11-22 01:33:23 +01:00
Evgeny Khramtsov
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
Leif Bredgaard Honore
5afa1f6ade
Fix for ejabbed bug #359 - now strings are formatted correctly.
2014-11-20 14:21:51 +04:00
Holger Weiss
c566b1d01e
Respect privacy lists for incoming PEP messages
2014-11-18 01:25:12 +01:00
Holger Weiss
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
Evgeny Khramtsov
ab12270837
Merge pull request #351 from weiss/floating-muc-intervals
...
Support floating point message/presence intervals
2014-11-16 12:35:21 +03:00
Holger Weiss
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
Gu Feng
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
Evgeny Khramtsov
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
Evgeny Khramtsov
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
Holger Weiss
2446b66016
Use correct type for initial c2s #state.user value
2014-11-14 15:32:48 +01:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Evgeny Khramtsov
de3e1c3508
Merge pull request #341 from sezuan/fix-kick-user-command
...
Fix kick_user command
2014-11-10 23:14:34 +03:00
Matthias Rieber
8184326eb9
Fix kick_user command
2014-11-10 20:53:00 +01:00
Evgeny Khramtsov
f47a59de2f
Merge pull request #340 from weiss/disable-mechanisms
...
New option: disable_sasl_mechanisms
2014-11-10 11:47:10 +03:00
Holger Weiss
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
Evgeny Khramtsov
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
Holger Weiss
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
Evgeny Khramtsov
25e5253f33
Merge pull request #335 from weiss/avoid-carbon-dups
...
Avoid duplicates of carbon copies
2014-11-05 23:17:45 +03:00
Holger Weiss
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
Jerome Sautret
1d2efcc168
Add xref test to travis.
...
Conflicts:
.travis.yml
2014-10-31 11:24:56 +01:00
Evgeniy Khramtsov
dfb21e802e
Fix race in CSI test case
2014-10-31 00:26:22 +03:00
Evgeniy Khramtsov
9a0b951855
Add tests for mod_vcard_xupdate
2014-10-30 23:57:15 +03:00
Christophe Romain
7819986ec0
Merge branch 'master' of github.com:processone/ejabberd
2014-10-30 17:44:04 +01:00
Christophe Romain
295681283a
don't stop on error if jiffy.so symlink exists #309
2014-10-30 17:43:57 +01:00
Jerome Sautret
5b0d8b7776
Merge branch 'master' of github.com:processone/ejabberd
2014-10-30 17:19:37 +01:00
Jerome Sautret
1d2ef85b33
Clean up rebar script.
2014-10-30 16:51:01 +01:00
Christophe Romain
b550f247e7
fix invalid path of jiffy.so on install #309
2014-10-30 15:47:33 +01:00
Jerome Sautret
565f064b15
Fix xref check when odbc driver is not used.
2014-10-30 15:21:42 +01:00
Jerome Sautret
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
Jerome Sautret
fad0d867fc
Add xref Makefile target.
...
Conflicts:
rebar.config.script
2014-10-30 15:21:25 +01:00
Evgeny Khramtsov
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
Evgeniy Khramtsov
74b67fa0dc
Add new option: store_empty_body
2014-10-27 14:18:09 +03:00
Evgeniy Khramtsov
067958d705
Merge branch 'master' of github.com:processone/ejabberd
2014-10-27 13:44:59 +03:00
Evgeniy Khramtsov
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
Evgeny Khramtsov
76b9098a25
Merge pull request #330 from weiss/accept-newline
...
Accept trailing newline characters in Base64 strings
2014-10-25 21:17:56 +04:00
Holger Weiss
2399aba67d
Accept trailing whitespace in Base64 strings
2014-10-25 02:05:02 +02:00
Gu Feng
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
Evgeniy Khramtsov
bf33f74ef8
Get rid of a hyphen in VSN
2014-10-24 18:01:42 +04:00
Evgeny Khramtsov
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
Holger Weiss
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
Evgeny Khramtsov
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
Evgeny Khramtsov
c7d9b46b6f
Merge pull request #324 from liudanking/master
...
fix odbc_keepalive_interval configuration bug
2014-10-21 11:03:16 +04:00
liudan
d2edcf1288
fix odbc keepalive interval bug
2014-10-21 10:05:44 +08:00
Evgeniy Khramtsov
160c9d7698
Remove append_host_config from ejabberd.yml.example
2014-10-20 12:59:30 +04:00
Evgeny Khramtsov
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
Holger Weiss
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
Holger Weiss
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
Evgeny Khramtsov
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
Evgeny Khramtsov
724a31fa13
Merge pull request #318 from weiss/remove-xmlrpc-dep
...
Remove "xmlrpc" dependency for "make rel"
2014-10-13 20:37:28 +04:00
Holger Weiss
1ccc0d8bcb
XEP-0198: Set #state.conn field on session resume
2014-10-12 19:44:35 +02:00
Holger Weiss
3f3f64c217
Remove "xmlrpc" dependency for "make rel"
...
The "xmlrpc" library isn't used anymore.
2014-10-12 17:23:25 +02:00
Evgeny Khramtsov
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
Holger Weiss
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
Evgeniy Khramtsov
4bbf16b21a
Fix list unblocking when Riak is used as a backend
2014-10-10 11:38:13 +04:00
Evgeniy Khramtsov
d87ca9fb7b
Fix format of an XML-RPC response
2014-10-04 12:55:59 +04:00
Evgeniy Khramtsov
7b3209cc7f
Switch to P1 implementation of XML-RPC
2014-10-04 12:49:33 +04:00
Evgeniy Khramtsov
1d782db84f
Process XML-RPC requests via p1_xml and ejabberd_http
2014-10-04 12:49:12 +04:00
Evgeniy Khramtsov
e109f352e3
Make directory creation more robust
2014-10-02 14:21:27 +04:00
Evgeny Khramtsov
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
Holger Weiss
90fb19797d
Let Git ignore the "rel/ejabberd" directory
2014-09-30 11:35:58 +02:00
Evgeny Khramtsov
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
Holger Weiss
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
Holger Weiss
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
Evgeny Khramtsov
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
Holger Weiss
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
Evgeny Khramtsov
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
Holger Weiss
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
Evgeny Khramtsov
57dec40007
Merge pull request #301 from Iperity/master
...
Fix init script
2014-09-18 01:17:04 +04:00
Nathan Bruning
29a841d8c7
Fix init script: use getent to allow ejabberd user from external authentication sources (LDAP)
2014-09-17 21:28:50 +02:00
Evgeny Khramtsov
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
Holger Weiss
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
Evgeny Khramtsov
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
stewart
8d9a9228d9
added p1_utils to reltool.config resolving treap:empty() undefined error
2014-09-15 04:06:07 +00:00
Evgeniy Khramtsov
72fd353988
Avoid generation of excessive records
2014-09-13 22:54:07 +04:00
Evgeny Khramtsov
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
Holger Weiss
1a320baad8
Add tests for Client State Indication support
2014-09-11 18:18:20 +02:00
Holger Weiss
b8c98232b8
Support XEP-0352: Client State Indication
2014-09-11 17:44:29 +02:00
Evgeny Khramtsov
f723c00762
Merge pull request #297 from weiss/remove-configure-flag
...
Travis CI: Remove unused configure flag
2014-09-11 19:35:50 +04:00
Holger Weiss
4d59f677a9
Travis CI: Remove unused configure flag
...
The --disable-http flag no longer exists.
2014-09-10 21:04:43 +02:00
Evgeny Khramtsov
7a48e30523
Merge pull request #296 from weiss/remove-unused-clause
...
XEP-0198: Remove unused function clause
2014-09-07 07:27:17 +04:00
Evgeny Khramtsov
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Christophe Romain
646b445515
allow guide not to be compiled for install
2014-09-05 19:16:13 +04:00
Evgeniy Khramtsov
50d7046517
Test MUC nick registration
2014-09-03 21:30:44 +04:00
Evgeniy Khramtsov
c3eaa29f70
Parse x:data in jabber:register
2014-09-03 21:30:27 +04:00
Evgeniy Khramtsov
ac2ba399a9
Make sure x:data form possesses 'type' attribute
2014-09-03 21:28:55 +04:00
Evgeniy Khramtsov
fda73c3d16
Fix privacy checks of presence probes
2014-09-01 16:39:02 +04:00
Evgeniy Khramtsov
a1ce33ebf8
Automatically remove IPs from ban, add the documentation
2014-08-27 13:25:49 +04:00
Evgeniy Khramtsov
9be9949dab
Remove useless -include()
2014-08-27 13:18:29 +04:00
Evgeniy Khramtsov
0f1d95a074
Ban the IP if there are too many failed authentications
2014-08-27 13:18:22 +04:00
Evgeniy Khramtsov
2430e6691b
Add mod_fail2ban
2014-08-27 13:17:56 +04:00
Evgeniy Khramtsov
bfd028beea
Recompile the xmpp_codec using updated XML generator
2014-08-27 12:55:31 +04:00
Evgeny Khramtsov
2cb0f92fe6
Merge pull request #293 from weiss/fix-comment
...
Fix a comment in ejabberd_hooks
2014-08-27 12:48:58 +04:00
Evgeny Khramtsov
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
Holger Weiss
f1ad6f017b
Fix a comment in ejabberd_hooks
2014-08-26 01:04:15 +02:00
Holger Weiss
c658984531
Fix an XEP reference in the guide
2014-08-26 01:01:11 +02:00
Evgeny Khramtsov
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
vesvalo
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
Evgeny Khramtsov
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
vesvalo
c48b7f272b
fix 404 on pep first publishing with odbc
2014-08-21 11:23:58 +04:00
Evgeny Khramtsov
4a9417c501
Merge pull request #284 from weiss/infinity-vs-unlimited
...
Guide: For consistency, use 'infinity' everywhere
2014-08-21 01:26:22 +04:00
Holger Weiss
72049e5323
Guide: For consistency, use 'infinity' everywhere
2014-08-20 20:43:38 +02:00
Evgeny Khramtsov
33e0bf1c19
Merge pull request #283 from weiss/allow-unlimited-ack-queue
...
Support "max_ack_queue: infinity"
2014-08-20 17:47:04 +04:00
Evgeny Khramtsov
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
Holger Weiss
2802b6cee2
Allow for "max_ack_queue: infinity", as documented
2014-08-20 12:53:26 +02:00
Holger Weiss
44828c54fe
Fix MUC option docs: "infinity", not "infinite"
2014-08-20 12:26:03 +02:00
Evgeny Khramtsov
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
Holger Weiss
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
Evgeny Khramtsov
bc2e26fecd
Merge pull request #277 from weiss/xep-0198
...
XEP-0198: Create shorter session resume IDs
2014-08-15 19:15:32 +04:00
Holger Weiss
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
Evgeny Khramtsov
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
Holger Weiss
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
Holger Weiss
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
Evgeny Khramtsov
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
Evgeny Khramtsov
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
Evgeniy Khramtsov
5c88f6423a
Fix the deprecation warning to reflect YAML format
2014-08-12 14:26:15 +04:00
Evgeniy Khramtsov
56d61c2784
Do not call functions from ejabberd_riak directly
2014-08-12 14:25:54 +04:00
Evgeny Khramtsov
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
vesvalo
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
vesvalo
436f0832c1
fix mod_offline to store only chat messages with body xml element
2014-08-08 13:57:27 +04:00
Nikolay Bondarenko
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
vesvalo
92f89e3d45
Fix odbc update_t and update insert case return value
2014-08-08 13:26:16 +04:00
Evgeny Khramtsov
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
Holger Weiss
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
Nathan Bruning
4f63cb21c2
Fix migration of pubsub nodes. Was deleting and re-creating all nodes on each startup.
2014-08-03 21:03:16 +02:00
Evgeny Khramtsov
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
Alexey Shchepin
f00725dffb
mod_offline now uses gen_server
2014-07-31 14:26:09 +04:00
Christophe Romain
4205108f30
typo fix on roster subscription (EJAB-1711)
2014-07-31 11:50:22 +02:00
Ben Langfeld
651de2ca8e
Set dnAttributes on when it's requested by a filter
2014-07-29 15:22:54 -03:00
Holger Weiss
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
Evgeniy Khramtsov
db3c469d4d
Reorganize mod_announce test in order to avoid race
2014-07-28 13:42:50 +04:00
Evgeny Khramtsov
7d93463d31
Merge pull request #266 from weiss/remove-http
...
Remove "--enable-http" flag
2014-07-28 11:08:13 +04:00
Evgeny Khramtsov
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
Evgeny Khramtsov
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
Holger Weiss
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
Holger Weiss
4a02df8b6d
Mention "starttls_required" option in ejabberd.yml
...
Closes #258 .
2014-07-27 12:44:34 +02:00
Holger Weiss
bee9ffd91e
Apply minor improvement to ejabberd.yml comment
2014-07-27 11:54:30 +02:00
Holger Weiss
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
Evgeniy Khramtsov
c0001184fd
Merge branch 'master' of github.com:processone/ejabberd
2014-07-27 13:06:46 +04:00
Evgeniy Khramtsov
abeaac1c11
Add tests for mod_announce
2014-07-27 13:06:20 +04:00
Evgeny Khramtsov
6427d9398a
Merge pull request #263 from weiss/fix-ejabberdctl-issues
...
Fix ejabberdctl issues
2014-07-24 20:56:32 +04:00
Evgeny Khramtsov
677b358a9a
Merge pull request #262 from weiss/update-gitignore
...
Let Git ignore the "configure" script
2014-07-24 20:55:50 +04:00
Holger Weiss
b997c4325a
Let Git ignore the "configure" script
2014-07-24 17:50:43 +02:00
Holger Weiss
9c279f2e06
ejabberdctl: Remove outdated comment
...
The home directory is no longer set to $SPOOL_DIR.
2014-07-24 17:20:09 +02:00
Holger Weiss
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
Evgeny Khramtsov
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
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
a087af7060
Re-generate the XMPP codec using updated xml_gen
2014-07-24 10:35:17 +04:00
Evgeniy Khramtsov
3d3a4f7543
Fix events broadcasting via C2S
2014-07-22 19:42:49 +04:00
Evgeny Khramtsov
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
Holger Weiss
4efca05149
Fix "s2s_access" option name in documentation
2014-07-22 15:06:19 +02:00
Christophe Romain
f19e19e2b6
reflect correct default value un example documentation
2014-07-22 14:35:31 +02:00
Evgeniy Khramtsov
25676b43ed
Add tests for session management
2014-07-22 14:00:48 +04:00
Christophe Romain
870d822f08
old release notes are not installed anymore
2014-07-21 17:58:14 +02:00
Christophe Romain
320abee110
apply pull request #250 to pubsub_odbc as well
2014-07-21 17:14:59 +02:00
Christophe Romain
0579fc80ec
Merge pull request #250 from Iperity/master
...
Fix configuraton with custom nodetree plugin
2014-07-21 17:11:29 +02:00
Christophe Romain
08ff969896
html guide is now generated when building source tarball
2014-07-21 16:36:10 +02:00
Christophe Romain
40ef406ec7
remove bash dependency, fix EJABBERD_OPTS use
2014-07-21 15:25:16 +02:00
Christophe Romain
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
Evgeniy Khramtsov
f2003943db
Add tests for mod_carboncopy
2014-07-21 09:08:54 +04:00
Evgeniy Khramtsov
014d61955c
Move some namespaces definitions into header file
2014-07-21 08:32:26 +04:00
Evgeny Khramtsov
c068712373
Merge pull request #254 from weiss/replace-bashism
...
Replace bash-specific syntax in ejabberdctl
2014-07-20 19:20:00 +04:00
Holger Weiss
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
Evgeny Khramtsov
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
Holger Weiss
105b421418
Fix ejabberd.yml comment on overload protection
2014-07-20 07:36:24 +02:00
Holger Weiss
277fe5ab25
Fix ejabberd.yml comment on log rotation syntax
2014-07-20 07:29:45 +02:00
Evgeniy Khramtsov
744018425b
Improve MUC test cases
2014-07-19 17:30:02 +04:00
Evgeniy Khramtsov
1f4e0c8aea
Fix Record-Route signing
2014-07-17 20:30:36 +04:00
Paweł Chmielowski
e0c9242dcf
treap.erl was moved to p1_utils
2014-07-17 11:57:23 +02:00
Paweł Chmielowski
0456b78d87
Use p1_utils
2014-07-17 10:52:31 +02:00
Evgeniy Khramtsov
568068c79f
Get rid of p1_mnesia file
2014-07-17 08:32:13 +04:00
Evgeniy Khramtsov
b5c4fe6626
Change return type to reflect recent changes in p1_sip
2014-07-16 15:28:36 +04:00
Evgeniy Khramtsov
64205426bf
Fix returned types
2014-07-16 10:33:49 +04:00
Evgeniy Khramtsov
89025eea39
Fix blocklist get
2014-07-16 07:43:24 +04:00
Evgeny Khramtsov
4a918c5b18
Merge pull request #251 from weiss/enable-riak-tests
...
Travis CI: Enable Riak tests
2014-07-15 22:56:55 +04:00
Holger Weiss
9a7c26eaa8
Travis CI: Enable Riak tests
2014-07-15 20:42:12 +02:00
Evgeniy Khramtsov
eb803832b7
Remove unnecessary defaults from the xmpp_codec spec
2014-07-15 20:42:53 +04:00
Evgeniy Khramtsov
4ef0dd6997
Better Riak usage detection
2014-07-15 20:26:45 +04:00
Evgeniy Khramtsov
b5f1b17926
Fix broken hooked functions
2014-07-15 19:22:33 +04:00
Evgeniy Khramtsov
fd298521e2
Add mod_caps checks to the testing suite
2014-07-15 18:35:23 +04:00
Nathan Bruning
99c28ab4d6
Fix configuraton with custom nodetree plugin
2014-07-15 12:04:06 +02:00
Evgeniy Khramtsov
2d6a838905
Do not check for Erlang apps at configure time as it looks redundant
2014-07-14 08:29:57 +04:00
Evgeniy Khramtsov
792b5a24df
Serialize records to proplists before storing then in Riak
2014-07-14 08:24:44 +04:00
Evgeny Khramtsov
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
Mathias Ertl
86a6667122
Move warnings inside check for , use variable for path
2014-07-11 12:34:52 +02:00
Evgeniy Khramtsov
07501f8085
Re-generate the HTML documents
2014-07-10 19:07:09 +04:00
Evgeniy Khramtsov
dd77236d75
Mention about Riak in yet another place
2014-07-10 15:34:09 +04:00
Evgeniy Khramtsov
926c9193e7
Try to bypass Riak tests by Travis CI
2014-07-10 14:45:54 +04:00
Evgeniy Khramtsov
a5987633e0
Fix compile errors introduced by previous cherry picks
2014-07-10 14:16:33 +04:00
Evgeniy Khramtsov
aa8dce9804
Re-generate the configure script
2014-07-10 13:59:11 +04:00
Evgeniy Khramtsov
edfb5fc2f8
Add --enable-riak configure flag
2014-07-10 13:58:43 +04:00
Evgeniy Khramtsov
91fcdf9f6a
Document Riak support
2014-07-10 13:55:49 +04:00
Evgeniy Khramtsov
54cfd5091f
Check Riak connection before running the corresponding suite
2014-07-10 13:55:38 +04:00
Evgeniy Khramtsov
2fe8e0dea5
Make it possible to check Riak connection status
2014-07-10 13:55:24 +04:00
Evgeniy Khramtsov
9d62d13492
Don't forget to shutdown rooms before starting the testing suite
2014-07-10 13:55:08 +04:00
Evgeniy Khramtsov
f40d5e4a89
Improve test suite explanation
2014-07-10 13:54:51 +04:00
Evgeniy Khramtsov
c559c9425a
Clear Riak data when initializing the testing suite
2014-07-10 13:54:17 +04:00
Evgeniy Khramtsov
6a73b96459
Fix roster versioning support when Riak backend is enabled
2014-07-10 13:54:06 +04:00
Evgeniy Khramtsov
538d4ffbd0
Fix case clause
2014-07-10 13:53:57 +04:00
Evgeniy Khramtsov
c15dc01cff
Improve Riak pool management
2014-07-10 13:52:29 +04:00
Evgeniy Khramtsov
f1d0b05db5
Fixate Riak client library
2014-07-10 13:44:14 +04:00
Evgeniy Khramtsov
a60dd672b7
Add Riak backend to the testing suit
2014-07-10 13:42:31 +04:00
Evgeniy Khramtsov
e82219185b
Add SQL to Riak converter
2014-07-10 13:29:01 +04:00
Evgeniy Khramtsov
0490c2f139
Improve Riak support
2014-07-10 13:26:37 +04:00
Alexey Shchepin
a4b02c38db
Updated riak support
2014-07-10 13:15:15 +04:00
Alexey Shchepin
47763c10e3
Preliminary Riak support
2014-07-10 13:04:39 +04:00
Evgeniy Khramtsov
fc692ea512
Add start_module/2
2014-07-08 20:58:03 +04:00
Evgeniy Khramtsov
28479321bb
Improve documentation of mod_sip
2014-07-07 09:40:20 +04:00
Evgeniy Khramtsov
2b8c4acd57
Rename options
2014-07-07 09:40:08 +04:00
Evgeniy Khramtsov
ee40c0e9a7
Add new option support: always_record_route
2014-07-07 09:40:01 +04:00
Evgeny Khramtsov
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
Matwey V. Kornilov
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
Evgeniy Khramtsov
76ebebf2a0
Revert "Fix IQ XML generation."
...
This reverts commit 26a4d91297
.
2014-07-05 17:53:45 +04:00
Jerome Sautret
aba7150af1
Return MySQL error messages as binary.
2014-07-04 17:39:28 +02:00
Jerome Sautret
26a4d91297
Fix IQ XML generation.
2014-07-04 15:21:40 +02:00
Christophe Romain
9265720f92
add ability to rotate logs on given date condition
2014-07-02 23:46:54 +02:00
Evgeniy Khramtsov
273631c242
New option support: log_rotate_count
2014-07-02 14:59:05 +02:00
Evgeniy Khramtsov
bb8a0f71e6
Support new options: log_rotate_size and log_rate_limit
2014-07-02 14:58:58 +02:00
Evgeniy Khramtsov
ffdb39d269
Disable SASL error logger if lager is enabled
2014-07-02 14:58:46 +02:00
Badlop
8fae4748a1
mod_caps doesn't provide Mnesia export feature
2014-06-27 13:49:17 +02:00
Christophe Romain
643a31dcea
let ejabberdctl explicitely use bash
2014-06-20 14:34:14 +02:00
Evgeny Khramtsov
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
Holger Weiss
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
Evgeniy Khramtsov
b29615561c
Change default flow timeout as recommended per the RFC
2014-06-12 09:30:10 +04:00
Evgeniy Khramtsov
7892b72bcb
Don't forget to close socket of timed out flow
2014-06-12 09:30:04 +04:00
Evgeny Khramtsov
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
Holger Weiss
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
Evgeny Khramtsov
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
Evgeniy Khramtsov
87f8c2ecd8
Don't stop roster table conversion on broken askmessage
2014-06-09 10:55:05 +04:00
Evgeniy Khramtsov
62be3bc111
Fix previous commit
2014-06-09 10:40:52 +04:00
Evgeniy Khramtsov
c485aea48b
Don't stop irc table conversion on broken JIDs
2014-06-09 10:36:42 +04:00
Evgeniy Khramtsov
6f4b4ad087
Ignore malformed parameters for mod_irc module
2014-06-07 07:45:36 +04:00
Evgeniy Khramtsov
3e8a0af6d1
Fix data convertion
2014-06-07 07:05:24 +04:00
Evgeniy Khramtsov
12ab5a749f
Clean up all timers gracefully
2014-06-06 22:29:50 +04:00
Evgeniy Khramtsov
ddfbca5830
Use a different timer for flow control
2014-06-06 13:53:13 +04:00
Evgeniy Khramtsov
9e72529544
SIP Outbound (RFC 5626) support
2014-06-06 09:36:45 +04:00
Christophe Romain
11aa51373a
add missing format handler
2014-06-05 16:23:17 +02:00
Evgeny Khramtsov
5992582bc5
Merge pull request #232 from weiss/dont-drop-listen-options
...
Don't "forget" listener options
2014-06-04 23:37:13 +04:00
Holger Weiss
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
HAMANO Tsukasa
cc228db337
e_clause error at node_hometree_odbc:get_items/3
2014-06-04 18:53:37 +09:00
Evgeniy Khramtsov
c546ce2439
Reply to pings
2014-06-03 21:18:30 +04:00
Evgeniy Khramtsov
fdda4d506f
Always enable STUN at compile time
2014-06-03 20:54:39 +04:00
Evgeny Khramtsov
5de16493d1
Merge pull request #230 from weiss/fix-dependency-list
...
Fix the list of dependencies
2014-06-03 16:28:13 +04:00
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
6441c284e0
Don't add 'rport' paramater to 'Via' header
2014-06-02 20:46:29 +04:00
Evgeniy Khramtsov
0aea9c74bd
Rename option 'route' to 'record_route' and add new option 'routes'
2014-06-02 10:16:34 +04:00
Evgeniy Khramtsov
9a0d77571d
Add global static shared_key option
2014-06-01 14:20:09 +04:00
Evgeniy Khramtsov
f446e7fc0b
Sign 'Record-Route' in order to proxy unauthorized ACKs
2014-06-01 13:35:14 +04:00
Evgeniy Khramtsov
b75b5ebeb2
Fix 'via' option lookup
2014-05-31 14:22:39 +04:00
Evgeniy Khramtsov
d19903877d
Add new option: route
2014-05-31 14:22:31 +04:00
Evgeny Khramtsov
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
Evgeniy Khramtsov
c76201b6b4
Don't add 'Record-Route' header for mid-dialog requests
2014-05-31 10:00:51 +04:00
Evgeniy Khramtsov
86f2af6fdc
Process bindings from multiple UACs correctly
2014-05-31 09:06:53 +04:00
Evgeniy Khramtsov
da22da23cd
Don't substitute URI in ACK
2014-05-31 07:50:16 +04:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
2cd17c7988
Fix previous commit
2014-05-30 23:49:50 +04:00
Evgeniy Khramtsov
32998f7e18
Process 'Contact' headers more accurately (as per RFC3261)
2014-05-30 23:14:52 +04:00
Evgeny Khramtsov
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
Holger Weiss
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
Evgeny Khramtsov
5a29d56d94
Merge pull request #227 from weiss/xep-0198
...
XEP-0198: Cosmetic change: Reuse event handler
2014-05-28 13:43:29 +04:00
Holger Weiss
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
Evgeny Khramtsov
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
Holger Weiss
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
Evgeny Khramtsov
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
Evgeny Khramtsov
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
Holger Weiss
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
Holger Weiss
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
Evgeny Khramtsov
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
Evgeny Khramtsov
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
Evgeny Khramtsov
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
Evgeny Khramtsov
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
Evgeniy Khramtsov
52221127cc
Fix odbc_port option processing
2014-05-27 15:27:42 +04:00
Evgeniy Khramtsov
dceab3689d
Don't forget to include 'Contact' header field in 2xx registrar responses
2014-05-26 21:34:23 +04:00
Christophe Romain
123b01aaa0
don't stop make install if epam is not compiled
2014-05-25 13:02:25 +02:00
Christophe Romain
572938aa49
install epam binary when available
2014-05-25 02:31:28 +02:00
bLaDe
48600ae71d
Update id.msg
2014-05-24 17:53:39 +07:00
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
8925975c86
Fix proxying of ACK requests for 2xx responses
2014-05-23 20:14:53 +04:00
Holger Weiss
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
Badlop
6baf3a24de
Merge branch 'weiss-check-packet-type' into 3
2014-05-21 18:45:43 +02:00
Badlop
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
badlop
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
badlop
419a98d45a
Merge pull request #216 from lavrin/p1-c2s
...
Cleanup some pieces of ejabberd_c2s
2014-05-21 17:35:24 +02:00
badlop
0dc8429d16
Merge pull request #215 from weiss/fix-url-markup
...
Fix URL markup in the guide
2014-05-21 17:33:56 +02:00
badlop
b9210d491a
Merge pull request #208 from weiss/update-travis-config
...
Travis CI: Remove unnecessary configure flag
2014-05-21 17:31:49 +02:00
badlop
5d855f3723
Merge pull request #207 from weiss/xep-0334
...
Honor XEP-0334: Message Processing Hints
2014-05-21 17:31:22 +02:00
Holger Weiss
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
Holger Weiss
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
Badlop
5010cea1a4
If log uses file:write, no need to double escape ~ in messages (EJAB-1696)
2014-05-20 14:49:52 +02:00
Radosław Szymczyszyn
5726636053
Fix check_from/2 formatting
2014-05-20 12:31:28 +01:00
Radosław Szymczyszyn
b7a542e074
Sanitize copy-pasted get_statustag/1
2014-05-20 12:28:14 +01:00
Radosław Szymczyszyn
9c37450fe4
Fix formatting
2014-05-20 12:26:33 +01:00
Radosław Szymczyszyn
c39ce133de
Build proceed/compressed elements in a sane way
2014-05-20 11:52:02 +01:00
Holger Weiss
dd543af2f6
Fix URL markup in the guide
2014-05-20 00:24:34 +02:00
Badlop
6d06f22f64
MUC messages with ~ were not logged (EJAB-1696)
2014-05-19 19:07:46 +02:00
badlop
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
Holger Weiss
4e54c53abb
Update ejabberd_xmlrpc documentation URL
2014-05-14 22:39:19 +02:00
Badlop
a6ddab1e9d
Fix bug when joining empty path
2014-05-14 13:28:39 +02:00
Evgeny Khramtsov
3c045ba8aa
Merge pull request #212 from weiss/fix-presence-updates
...
Don't miss incoming presence updates
2014-05-14 08:06:40 +04:00
Holger Weiss
6e8dd5bdff
Don't miss incoming presence updates
2014-05-14 01:04:38 +02:00
Holger Weiss
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
badlop
23fdf0e889
Merge pull request #209 from weiss/rename-disconnect-user
...
Rename disconnect_user/2 command
2014-05-12 12:55:15 +02:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Evgeny Khramtsov
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
Evgeniy Khramtsov
003fd321ee
Do not try to retreive vCards via local SM for foreign JIDs
2014-05-09 21:26:55 +04:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
318b0f2208
Fix previous commit (C2S session close on server shutdown)
2014-05-08 21:47:50 +04:00
Evgeniy Khramtsov
b995178e30
Merge branch 'master' of github.com:processone/ejabberd
2014-05-08 21:40:14 +04:00
Evgeniy Khramtsov
181e7a823e
Fix C2S session close on server shutdown
2014-05-08 21:39:53 +04:00
Badlop
0716a8cdae
Recompile the Guide
2014-05-08 17:58:25 +02:00
Evgeniy Khramtsov
90a5c054d4
TURN support (EJAB-1017)
2014-05-08 16:14:21 +04:00
Evgeny Khramtsov
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
Evgeny Khramtsov
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
Badlop
79a49b1175
Webadmin with extauth requires internal to run at least once (issue #201 )
2014-05-07 17:13:51 +02:00
badlop
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
HAMANO Tsukasa
d3ed12d4ba
fix mod_offline:count_offline_messages/2
2014-05-07 15:38:18 +09:00
Evgeniy Khramtsov
e7c94975eb
Revert "Document that ejabberd compilation requires pkg-config"
...
This reverts commit bd0060715e
.
2014-05-07 01:05:07 +04:00
Evgeny Khramtsov
47f627e605
Merge pull request #166 from weiss/xep-0198
...
Add support for XEP-0198: Stream Management
2014-05-06 23:50:49 +04:00
Holger Weiss
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
Christophe Romain
cc1f93d7a0
Fix PEP broadcasting issue on ODBC (EJAB-1680)
2014-05-06 13:29:35 +02:00
Christophe Romain
58717923eb
Fix PEP broadcasting issue (EJAB-1680)
2014-05-06 12:37:44 +02:00
Evgeny Khramtsov
1aa56af541
Merge pull request #198 from weiss/add-travis-support
...
Add Travis CI configuration file
2014-05-06 13:13:56 +04:00
Holger Weiss
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
Holger Weiss
66437c5e4d
Add Travis CI configuration
2014-05-05 22:42:15 +02:00
Christophe Romain
52f3acbdb1
Merge branch 'master' of github.com:processone/ejabberd
2014-05-05 18:42:49 +02:00
Christophe Romain
a6244275b7
remove compilation warnings
2014-05-05 18:16:48 +02:00
Badlop
402dec8354
Recompile the ejabberd Guide html
2014-05-05 17:55:45 +02:00
Christophe Romain
4bdf1bc7a6
avoid sending duplicated events
2014-05-05 17:53:50 +02:00
Christophe Romain
faa6ad26a0
avoid sending empty events
2014-05-05 17:53:44 +02:00
Badlop
bd0060715e
Document that ejabberd compilation requires pkg-config
2014-05-05 17:46:52 +02:00
Christophe Romain
530ac43758
store item when persist_item=false and cache_last_item=false but need last_item
2014-05-05 17:40:42 +02:00
Evgeny Khramtsov
2723056fae
Merge pull request #195 from Iperity/master
...
Fix small bug in presence_based_delivery implementation
2014-05-05 16:38:16 +04:00
Nathan Bruning
f3aa74a043
Fix small bug in presence_based_delivery implementation
2014-05-05 14:14:03 +02:00
Badlop
872cc12dd8
Temporary room not destroyed when the last participant is expulsed (EJAB-520)
2014-05-05 13:50:52 +02:00
Badlop
70f00a1b1f
extauth_cache can have value 0
2014-05-05 13:13:35 +02:00
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Evgeniy Khramtsov
fafec77e56
Make it possible to get/set vCards for MUC rooms
2014-05-04 23:23:17 +04:00
Evgeny Khramtsov
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
Holger Weiss
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
Evgeniy Khramtsov
806c0e56e1
Do not crash on version downgrade
2014-05-03 17:55:03 +04:00
Evgeniy Khramtsov
d0ffcb7fd4
Assume udp_recv/5 now returns new options
2014-05-03 17:48:26 +04:00
Evgeniy Khramtsov
955487391d
Assume tcp_init/2 and udp_init/2 now return new options
2014-05-03 17:48:17 +04:00
Evgeniy Khramtsov
e00215a12f
Always enable SIP at compile time
2014-05-02 17:46:24 +04:00
Evgeniy Khramtsov
47a39ce738
Remove unused function
2014-05-02 17:43:23 +04:00
Evgeniy Khramtsov
ebd760b7c9
Forking support
2014-05-02 17:43:17 +04:00
Evgeniy Khramtsov
f8417f7c1f
Remove empty line
2014-05-02 17:43:09 +04:00
Evgeniy Khramtsov
3c98de69dc
Some cleanup
2014-05-02 17:43:03 +04:00
Evgeniy Khramtsov
ab6774d93d
Fix CSeq comparison
2014-05-02 17:42:57 +04:00
Evgeniy Khramtsov
58aa200297
Optimize request processing
2014-05-02 17:42:51 +04:00
Evgeniy Khramtsov
a1337cb73f
Do not proxy stray responses statelessly (as per RFC 6026)
2014-05-02 17:42:45 +04:00
Evgeniy Khramtsov
e7e4055cbb
Don't use erlang:integer_to_binary/1
2014-05-02 17:42:37 +04:00
Evgeniy Khramtsov
1d771fe646
Rewrite 'Contact' headers in REGISTER requests
2014-05-02 17:42:31 +04:00
Evgeniy Khramtsov
8e2bc8d19e
Check for 'max_user_sessions' option
2014-05-02 17:42:13 +04:00
Evgeniy Khramtsov
0117787317
Process gen_server timeouts correctly
2014-05-02 17:40:25 +04:00
Evgeniy Khramtsov
16e5d66572
Move some code in a separate function
2014-05-02 17:38:47 +04:00
Evgeniy Khramtsov
6a95422af8
Multiple REGISTER bindings support
2014-05-02 17:38:28 +04:00
Evgeniy Khramtsov
35faffe7da
Locate sessions by proxy processes directly
2014-05-02 17:31:17 +04:00
Evgeny Khramtsov
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
HAMANO Tsukasa
d83368d73d
fix ejabberd_system_monitor:s2s_out_info/1 error
2014-05-01 15:12:04 +09:00
Evgeny Khramtsov
c545b3de6d
Merge pull request #178 from hamano/devel
...
undefined ejabberd_socket:get_conn_type/1
2014-04-30 21:49:54 +04:00
Evgeniy Khramtsov
02e0649d18
SIP support
...
Conflicts:
configure
configure.ac
doc/guide.tex
2014-04-30 19:38:15 +04:00
HAMANO Tsukasa
0904b8b8ff
improve error handling when sql calling with (empty|unknown) host.
...
see #191
2014-05-01 00:20:58 +09:00
Badlop
ec6c58a21c
Fix error reporting in previous commit
2014-04-30 16:02:20 +02:00
Badlop
b3714a1b2e
Fix formatting string argument (thanks to Locojay)(github #129 )
2014-04-30 15:59:44 +02:00
Evgeny Khramtsov
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
badlop
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
badlop
a1b8c54c16
Merge pull request #187 from weiss/fix-ejabberdctl-output
...
Let ejabberdctl accept binary string arguments
2014-04-30 12:41:12 +02:00
HAMANO Tsukasa
a6408e9281
fix error handling when sql calling with unknown host.
2014-04-30 15:32:07 +09:00
HAMANO Tsukasa
0e0bd3329d
mod_register_web should response 404 instead of process crash.
2014-04-30 13:39:17 +09:00
Evgeny Khramtsov
ce22239d85
Merge pull request #189 from weiss/markdown-readme
...
Convert README to Markdown
2014-04-30 07:55:27 +04:00
Holger Weiss
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
Evgeny Khramtsov
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
Evgeny Khramtsov
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
Evgeny Khramtsov
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
Evgeny Khramtsov
599fdb9ac2
Merge pull request #186 from weiss/add-disconnect-command
...
New ejabberd command: disconnect_user/2
2014-04-29 15:41:41 +04:00
Holger Weiss
ebbceab93f
Translate disconnect_user/2 string sent to client
2014-04-29 11:56:28 +02:00
Holger Weiss
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
Evgeny Khramtsov
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
Evgeny Khramtsov
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
Evgeny Khramtsov
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
Holger Weiss
16dd6b03c6
Update README: XEP-0227 code no longer uses exmpp
2014-04-29 10:17:00 +02:00
Holger Weiss
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
Holger Weiss
6d1055abec
New ejabberd command: disconnect_user/2
2014-04-29 00:50:43 +02:00
Evgeny Khramtsov
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
Holger Weiss
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
HAMANO Tsukasa
71dba66330
fix checking acl in mod_register_web
2014-04-24 18:15:39 +09:00
Holger Weiss
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
HAMANO Tsukasa
0734562ded
added privacy_list_data index for mysql database.
2014-04-24 16:04:40 +09:00
HAMANO Tsukasa
ffe9f3c192
added get_random_pid/1 error handling
2014-04-24 15:34:41 +09:00
HAMANO Tsukasa
219f9276d1
undefined ejabberd_socket:get_conn_type/1
2014-04-24 12:42:22 +09:00
Holger Weiss
f988aad940
Log TLS status for outgoing s2s with SASL EXTERNAL
2014-04-23 23:28:13 +02:00
badlop
3a3f8240c1
Merge pull request #176 from hamano/devel
...
added error handling in mod_pubsub_odbc.
2014-04-23 17:06:46 +02:00
HAMANO Tsukasa
9ec014c184
added error handling in mod_pubsub_odbc.
2014-04-23 23:35:34 +09:00
badlop
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
Holger Weiss
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
Holger Weiss
4bc8b6bc9f
Fix extraction of host names from certificates
2014-04-22 22:12:04 +02:00
badlop
9497dbff17
Merge pull request #162 from weiss/enable-carbons
...
Enable mod_carboncopy in example configuration
2014-04-22 13:53:23 +02:00
badlop
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
badlop
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
Holger Weiss
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
badlop
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
Holger Weiss
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
badlop
727197613a
Merge pull request #171 from weiss/update-doc-url
...
Update a URL in the guide
2014-04-16 10:03:07 +02:00
badlop
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
Holger Weiss
27a7b38dee
Update a URL in the guide
2014-04-16 00:31:15 +02:00
Holger Weiss
45687c52dc
Fix two small typos in the guide
2014-04-16 00:25:11 +02:00
Paweł Chmielowski
7af7b7d3f0
Fix compilation on pre-R17
2014-04-15 17:05:25 +02:00
Paweł Chmielowski
d97b4fd9ca
Fix loading translation files on R17
2014-04-15 17:05:22 +02:00
Alexey Shchepin
f93758a3cd
Merge pull request #160 from runcom/protocol_options
...
Add option to specify openssl options
2014-04-15 19:01:21 +04:00
badlop
77d6d36a9d
Merge pull request #167 from weiss/fix-modules-doc
...
Remove outdated comment from guide
2014-04-15 16:41:48 +02:00
badlop
57ba57b908
Merge pull request #168 from weiss/carbons-doc
...
Mention mod_carboncopy in documentation
2014-04-15 16:40:48 +02:00
Holger Weiss
c9d4f2146c
Mention mod_carboncopy in documentation
2014-04-15 01:29:00 +02:00
Holger Weiss
46001aafaa
Remove outdated comment from guide
2014-04-15 01:21:41 +02:00
badlop
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
Holger Weiss
be43aa85f4
Fix description of access rules syntax
2014-04-11 14:00:10 +02:00
badlop
285c4c17cf
Merge pull request #146 from jamielinux/master
...
Update FSF address
2014-04-11 13:35:46 +02:00
Evgeniy Khramtsov
a21edc2f3a
Pretty print accepted transport address
2014-04-11 12:30:58 +02:00
Holger Weiss
515331baad
Enable mod_carboncopy in example configuration
...
XEP-0280 seems to be quite popular these days.
2014-04-08 23:38:04 +02:00
Holger Weiss
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
Antonio Murdaca
fbf71f86f3
Add option to specify openssl options
2014-04-08 18:46:52 +02:00
Holger Weiss
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
Holger Weiss
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
Badlop
66006ba017
Update Hebrew translation (thanks to Isratine Citizen)
2014-04-07 16:26:50 +02:00
badlop
f3bbfb1c66
Merge pull request #159 from weiss/update-gitignore
...
Update the gitignore(5) file
2014-04-07 13:29:37 +02:00
badlop
766ab1eb46
Merge pull request #158 from weiss/fix-lang-type
...
Fix a type error
2014-04-07 13:28:41 +02:00
badlop
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
badlop
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
Holger Weiss
0befeb7d93
Let Git ignore the "ebin" directory
2014-04-06 00:56:36 +02:00
Holger Weiss
a2679e9d51
Let Git ignore files generated by "make install"
2014-04-06 00:56:09 +02:00
Holger Weiss
37f409d254
Fix a type error
2014-04-06 00:39:51 +02:00
Holger Weiss
e02a4913d2
Fix badarg issue on module update web site
2014-04-05 23:23:44 +02:00
HAMANO Tsukasa
1250ee5d77
mod_register_web: check same acl as mod_register.
2014-04-04 04:07:29 +09:00
Badlop
8b9c49440a
Fix user_resources command, and ejabberd_xmlrpc parsing auth details in call
2014-03-31 16:51:47 +02:00
Badlop
5bf3c784da
New Bash completion script for ejabberdctl, experimental (EJAB-1042)
2014-03-26 16:43:56 +01:00
Badlop
a5a065290b
Small change in ejabberd_ctl output format to support bash completion
2014-03-26 16:43:53 +01:00
Badlop
ac0e199d36
Provide meaningful text to user when admin kicks session (EJAB-1455)
2014-03-26 16:01:37 +01:00
Holger Weiss
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
Evgeniy Khramtsov
2150b10901
Fix service_info options processing
2014-03-25 09:52:57 +04:00
Evgeniy Khramtsov
5c36c44689
Remove annyoing warnings
2014-03-25 09:42:12 +04:00
Badlop
d5f90965d7
Fix ACLs syntax change (thanks to jokker23)(issue #140 )
2014-03-24 19:40:55 +01:00
Holger Weiss
2da6933bb7
Remove "fun" element from c2s #state
...
Memory consumption wise, local "fun" references are quite expensive.
2014-03-22 20:25:43 +01:00
Holger Weiss
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
badlop
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
Holger Weiss
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
Badlop
633d47f784
Update copyright dates to 2014 (EJAB-1679)
2014-03-13 12:30:57 +01:00
Holger Weiss
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
Badlop
0f0e99ccd3
Provide header with latin-1 encoding in translations to work with Erlang/OTP R17
2014-03-12 17:26:27 +01:00
iulianlaz
9ef1ad0b6e
#148 Carbon copy sends message back to original sender solved
2014-03-06 08:40:38 +00:00
Evgeniy Khramtsov
afba5bc5f5
Merge branch 'master' of github.com:processone/ejabberd
2014-02-28 15:36:46 +04:00
Evgeniy Khramtsov
4a02893dac
Regenerate XMPP codec
2014-02-28 15:36:34 +04:00
Badlop
e211bf522e
Support XEP-0321: Remote Roster Management (EJAB-1381)
2014-02-26 18:02:37 +01:00
Badlop
46b2d91105
Convert DB details to string when calling odbc:connect/2 (EJAB-1681)
2014-02-26 17:26:46 +01:00
Badlop
c29ba14dbf
Don't provide current password in webinterface (github issue #137 )
2014-02-26 17:19:07 +01:00
badlop
4c8aeefa7f
Merge pull request #145 from weiss/fix-configure-flag
...
Fix --enable-transient_supervisors flag
2014-02-24 12:46:09 +01:00
badlop
8e628fdad3
Merge pull request #144 from weiss/fix-supervisor-start
...
Add missing parenthesis
2014-02-24 12:40:10 +01:00
Jamie Nguyen
8538997d61
Update FSF address
2014-02-22 10:27:40 +00:00
Holger Weiss
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
Holger Weiss
e82a79efd5
Add missing parenthesis
2014-02-21 23:33:13 +01:00
Badlop
63a7011c38
When occupant changes nick, include status 110 in stanzas sent to him
2014-02-14 16:22:14 +01:00
Badlop
4c8b6fe16b
Fixing mod_carboncopy sends carbons of carbons ( fixes #107 )
2014-01-23 17:29:24 +01:00
badlop
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
mrjameshamilton
5ccc6db093
Fixed parameter order in call to restore_room/3
2014-01-23 14:39:52 +00:00
Alexey Shchepin
9422164dda
Clear SASL state after finishing auth
2014-01-21 13:44:29 +02:00
Alexey Shchepin
cbbfd921b4
Fix for the previous commit
2014-01-21 11:54:18 +02:00
Alexey Shchepin
d63be79df9
Use 'to' field only in the first client stream initialization
2014-01-20 16:06:05 +02:00
Badlop
155c8bb29a
Add some ejabberd_xmlrpc documentation, and link to full details
2014-01-02 16:31:28 +01:00
Badlop
e107e78773
Fix auth verification in ejabberd_xmlrpc (thanks to Vicis)
2014-01-02 16:10:19 +01:00
Badlop
27302fb7ac
Fix example configuration option 'add' to 'append_host_config'
2014-01-02 15:03:05 +01:00
Evgeniy Khramtsov
d03de1bb43
Fix some type specs and errors
2013-12-10 21:44:46 +10:00
Evgeniy Khramtsov
33764bb931
Add ejabberd_xmlrpc
2013-12-10 21:25:12 +10:00
Christophe Romain
eadc899046
remove version.tex file which is auto-generated
2013-12-05 14:19:55 +01:00
Badlop
5a1300bc70
Add access rule to mod_roster (EJAB-72)
2013-12-04 14:57:44 +01:00
Christophe Romain
9c17163b55
bind values for get_parentnodes_tree
2013-12-03 10:51:01 +01:00
Christophe Romain
e11c835bd3
fix use of virtual nodetree
2013-12-03 10:34:59 +01:00
badlop
5ecd832e81
Merge pull request #119 from Mikhail-D/patch-1
...
Create mssql2012.sql
2013-12-02 02:02:44 -08:00
Mikhail-D
a95aa46fe5
Create mssql2012.sql
...
replace sp_dboption with new instructions
2013-12-02 00:29:52 -08:00
Alexey Shchepin
1dd94ac0d0
Support for OpenSSL ciphers list in ejabberd_c2s, ejabberd_s2s_in and ejabberd_s2s_out
2013-11-28 19:39:11 +02:00
Badlop
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
Evgeniy Khramtsov
89a17ba84a
Correctly convert ACLs into YAML representation
2013-11-07 02:43:43 +10:00
Evgeniy Khramtsov
a87b475361
Do not use functions from crypto module wherever possible
2013-11-05 20:07:38 +10:00
Evgeniy Khramtsov
b7c7d2747b
Fix some type errors
2013-11-05 19:49:30 +10:00
Evgeniy Khramtsov
c0240e7249
Do not try to start STUN application during config checks
2013-11-02 10:30:19 +10:00
Evgeniy Khramtsov
6dd31299cf
Avoid case clause crash when loading permanent rooms
2013-10-23 12:23:00 +10:00
Evgeniy Khramtsov
2846a2978b
Get rid of deprecated MySQL variable 'table_type'
2013-10-23 11:58:26 +10:00
Evgeniy Khramtsov
6df09f5ad6
Check libyaml presence at configure time
2013-10-22 20:12:39 +10:00
Badlop
d9da6b77de
Enumerate convert_to_yaml command in list of commands
2013-10-09 16:05:45 +02:00
Badlop
cd0381bab5
Fix display ACLs in WebAdmin
2013-10-01 23:23:01 +02:00
Christophe Romain
f2f2f64161
update default version to 13.10
2013-09-27 11:19:22 +02:00
Badlop
2c09d7c8a7
Fix handling of format_status arguments (thanks to Nbaronov)
2013-09-26 17:19:56 +02:00
Badlop
389a99b2db
Fix bypass for tls-required (thanks to Zeha)
2013-09-26 16:41:57 +02:00
Evgeniy Khramtsov
07c8bf5064
Fix roster version support
2013-09-24 18:59:20 +10:00
Evgeniy Khramtsov
7fd91a4b12
Better web-handlers detection
2013-09-22 21:47:59 +10:00
Evgeniy Khramtsov
ae4356265f
Merge branch 'master' of github.com:processone/ejabberd
2013-09-19 19:00:08 +10:00
Evgeniy Khramtsov
a0396620f2
Reflect modules name changes in p1_mysql
2013-09-19 18:59:32 +10:00
Paweł Chmielowski
7e73ed88f7
Fix problem with decoding http headers over tls connections
...
This fixed GitHub issue 96.
2013-09-16 16:32:02 +02:00
Evgeniy Khramtsov
150a5392e5
Fix the template: do not use 'global' keyword
2013-08-30 20:44:12 +10:00
Jerome Sautret
8cbbe4a3eb
Fix release version number.
2013-08-30 09:12:33 +02:00
Christophe Romain
4b82cb9953
update default version number
2013-08-27 17:14:58 +02:00
Christophe Romain
63b2d21b13
clean subscriptions handling and avoid function_clause
2013-08-27 14:46:54 +02:00
Christophe Romain
1b8876bf55
fix build of Parents list in #pubsub_node
2013-08-27 14:46:35 +02:00
Christophe Romain
b82eeeeec9
fix call to get_session_pid with binary arguments
2013-08-27 14:46:22 +02:00
Evgeniy Khramtsov
dd26398a02
Fix the ACL rule
2013-08-27 20:12:26 +10:00
Evgeniy Khramtsov
11292c809f
Remove non-existent module from the testing config
2013-08-27 20:08:22 +10:00
Evgeniy Khramtsov
a62fb69e20
Remove multiple host_config sections
2013-08-27 20:05:12 +10:00
Evgeniy Khramtsov
e3483ef9e1
Do not rely on p1_logger_h module when lager is enabled
2013-08-27 17:45:07 +10:00
Evgeniy Khramtsov
0fe3de6b30
Fix ejabberdctl config name
2013-08-24 22:10:10 +10:00
Evgeniy Khramtsov
91a74e3e27
Change configuration file format to YAML
2013-08-21 22:17:59 +10:00
Evgeniy Khramtsov
f68dfacbbf
Do not try to read/write the deprecated "config" table
2013-08-21 19:37:22 +10:00
Evgeniy Khramtsov
0b9754884e
Do not distribute the ACL table
2013-08-21 19:37:08 +10:00
Evgeniy Khramtsov
cc6dcd161c
Get rid of global configuration options
2013-08-21 19:36:35 +10:00
Badlop
7a77186fbe
Enumerate in guide.tex what processes are started for ejabberd (EJAB-1082)
2013-08-05 19:22:22 +02:00
Evgeny Khramtsov
06bb10a032
Merge pull request #85 from imtal/patch-1
...
Fix version check
2013-07-24 06:01:45 -07:00
tjeerd
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
Evgeniy Khramtsov
807a1fe164
Fix timestamp processing
2013-07-23 15:27:18 +10:00
Evgeniy Khramtsov
8ce22b790d
Fix some type errors
2013-07-22 19:24:09 +10:00
Evgeniy Khramtsov
f75d78d3f5
Make it possible to import without cursor usage
2013-07-22 10:46:47 +10:00
Evgeniy Khramtsov
ca6463ed78
Typo fix
2013-07-22 00:22:05 +10:00
Evgeniy Khramtsov
d58148fa8d
Add SQL to Mnesia converter
2013-07-21 23:10:38 +10:00
Evgeniy Khramtsov
a2ead99c83
Make it possible to enable/disable TLS compression
2013-07-17 22:46:18 +10:00
Evgeny Khramtsov
33f09c7a78
Merge pull request #83 from tagged/makefile
...
make deps/.built depend on deps/.got
2013-07-15 20:06:35 -07:00
Christopher A. Stelma
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
Evgeniy Khramtsov
986f4d1a7f
Do not forget to re-define the crash.log path
2013-07-15 11:51:09 +10:00
Evgeniy Khramtsov
8482641b4e
Increase the timetrap timeout
2013-07-15 11:51:02 +10:00
Evgeny Khramtsov
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
Tuncer Ayaz
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
Badlop
0d7a5476c0
Allow room member to get members list using XEP
2013-07-11 12:11:48 +02:00
Christophe Romain
4e72dd6751
fix badmatch in send_loop (EJAB-1650)
2013-07-10 09:47:49 +02:00
Christophe Romain
48819d163a
fix badmatch on remove_user on PEP nodes (EJAB-1649)
2013-07-09 21:50:56 +02:00
Christophe Romain
8621a8f006
fix invalid response on get_options when no options set (EJAB-1648)
2013-07-09 18:11:27 +02:00
Badlop
b66e4fbdc4
Apparently configure.erl is not needed anymore
2013-07-08 15:58:38 +02:00
Alexey Shchepin
b5623d6bee
gen_iq_handler:check_type was missing
2013-07-08 10:40:39 +03:00
Evgeniy Khramtsov
e89f0f6461
Cleanup the test suite (just a little)
2013-07-07 04:47:47 +10:00
Evgeniy Khramtsov
2b24e97936
Use error_logger directly in the LDAP test server
2013-07-07 03:48:16 +10:00
Evgeniy Khramtsov
a302af7770
Do not build p1_logger if lager is enabled
2013-07-07 03:10:51 +10:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
c262c08513
Improve the XMPP codec, fix the test suite accordingly
2013-07-07 02:19:10 +10:00
Christophe Romain
0266207e9d
fix pubsub unsubscription without SubId on odbc
2013-07-04 15:13:21 +02:00
Christophe Romain
60600c341e
improve pubsub odbc use of i2l
2013-07-04 10:07:53 +02:00
Evgeniy Khramtsov
02c59422cf
Re-generate the XMPP codec
2013-07-03 01:55:00 +10:00
Evgeniy Khramtsov
97810b4cc3
Update the rebar script
2013-07-01 02:22:18 +10:00
Evgeniy Khramtsov
1a9f0ab084
Update the rebar script
2013-06-30 23:41:24 +10:00
Evgeniy Khramtsov
fa7fe73a0e
Improve the rebar script. Keep the build graph by default.
2013-06-30 23:41:18 +10:00
Evgeniy Khramtsov
49e17922a3
Remove stupid slow code from rebar, regenerate the script
2013-06-30 23:41:09 +10:00
Evgeniy Khramtsov
09c450062a
Update XMPP codec spec to reflect
...
the changes in xml_gen
2013-06-29 18:41:00 +10:00
Christophe Romain
ac3cd2ebaa
ip_adresse() does not need binary representation in config
2013-06-28 18:32:22 +02:00
Evgeniy Khramtsov
2636da0d98
Fix IDNA conversion
2013-06-28 02:45:42 +10:00
Badlop
91744733c1
Store only messages with body or subject (EJABS-2034)
2013-06-27 11:58:31 +02:00
Evgeniy Khramtsov
295ea0633e
Re-create the configure script
2013-06-27 19:46:38 +10:00
Evgeniy Khramtsov
bc2ea224eb
Fix a typo
2013-06-27 19:45:45 +10:00
Evgeniy Khramtsov
9f4d12bd0a
Add --enable-tools to --enable-all
2013-06-27 19:45:28 +10:00
Evgeniy Khramtsov
653e23c0e7
Re-create the configure script
2013-06-27 19:31:33 +10:00
Evgeniy Khramtsov
c7e2128dab
Enable lager support by default
2013-06-27 19:31:05 +10:00
Evgeniy Khramtsov
8a9743ab3b
Avoid custom loglevels processing for lager
2013-06-27 19:27:56 +10:00
Evgeniy Khramtsov
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
Evgeniy Khramtsov
2ea397e476
Pre-load applications before setting the environment variables
2013-06-27 19:03:25 +10:00
Evgeniy Khramtsov
9094169440
Do not forget to remove testing beams on "clean"
2013-06-27 15:36:39 +10:00
Evgeniy Khramtsov
3631301304
Do not check the second SASL challenge
2013-06-27 15:36:31 +10:00
Evgeniy Khramtsov
42a9e4f4cf
Split the test suite into modules
2013-06-27 15:36:23 +10:00
Evgeniy Khramtsov
aab70fc066
Fix external authentication
2013-06-26 12:30:32 +10:00
Evgeniy Khramtsov
167f02ab72
Do not fetch disco#info multiple times
2013-06-26 03:32:38 +10:00
Evgeniy Khramtsov
1b0c02cb2e
Start the LDAP server before ejabberd application
2013-06-26 03:06:19 +10:00
Evgeniy Khramtsov
c05edabe58
Add more pubsub test cases
2013-06-26 03:06:11 +10:00
Christophe Romain
ae1af885ce
fix feature build on node disco#info
2013-06-25 14:49:22 +02:00
Badlop
9840b8395e
Fix previous commit
2013-06-25 13:46:21 +02:00
Badlop
b524e79f55
Normalize HTTP path (thanks to Justin Kirby)
2013-06-25 11:26:44 +02:00
Evgeniy Khramtsov
7d678fdd09
Change pubsub plugins in the testing configuration
2013-06-25 18:26:55 +10:00
Christophe Romain
b03bf0df9f
update guide with simplified pubsub_odbc config
2013-06-24 22:49:12 +02:00
Christophe Romain
277ba798fc
typo fix in spec
2013-06-24 22:38:15 +02:00
Christophe Romain
b07b820c4e
fix missing binarization switch on pep nodes
2013-06-24 19:56:27 +02:00
Christophe Romain
1cc76ebb68
cosmetic change
2013-06-24 19:56:14 +02:00
Christophe Romain
1cb03439f2
add missing list conversion
2013-06-24 18:05:42 +02:00
Christophe Romain
3976351c4d
decode_jid always gets binary(), encode_jid lets mod_pubsub handle conversion
2013-06-24 18:04:42 +02:00
Christophe Romain
6bfa34e8e0
minor improvements and binary fix
2013-06-24 16:31:38 +02:00
Christophe Romain
4195259d47
typo fix, related to commit 9194872
2013-06-24 16:29:43 +02:00
Christophe Romain
95546ac20d
remove obsolete node attribute
2013-06-24 13:55:30 +02:00
Christophe Romain
0e28e4b600
Merge branch 'master' of github.com:processone/ejabberd
2013-06-24 13:46:44 +02:00
Christophe Romain
831ae2927a
change default PEP config for simpler setup (EJAB-1494)
2013-06-24 13:46:27 +02:00
Christophe Romain
91948729e9
remove need of extra _odbc in pubsub plugin name
2013-06-24 13:43:11 +02:00
Christophe Romain
222a94300b
fix decode function for binaryzed data
2013-06-24 13:42:34 +02:00
Evgeniy Khramtsov
9e73bdbb7d
Check exit codes carefully when running dialyzer
2013-06-24 20:59:13 +10:00
Evgeniy Khramtsov
f9390f3e9a
Fix some dialyzer warnings
2013-06-24 20:04:56 +10:00
Evgeniy Khramtsov
fc3939c8a9
Merge branch 'master' of github.com:processone/ejabberd
2013-06-24 20:04:14 +10:00
Alexey Shchepin
339353f2e2
Regenerated configure script
2013-06-24 13:01:54 +03:00
Evgeniy Khramtsov
1014593aa6
Split dialyzer tasks into separate Makefile targets
2013-06-24 13:16:34 +10:00
Evgeniy Khramtsov
75b8f035f7
Do not try to call obsoleted function directly
2013-06-24 13:15:25 +10:00
Evgeniy Khramtsov
7b07c2a9b2
Improve the type spec
2013-06-24 13:15:07 +10:00
Evgeniy Khramtsov
521bae7fa0
Get rid of useless clause
2013-06-24 13:13:43 +10:00
Evgeniy Khramtsov
e68473fea8
Improve the "dialyzer" target
2013-06-24 10:49:13 +10:00
Evgeniy Khramtsov
eb74efb5e6
Add LDAP test cases
2013-06-22 03:28:17 +10:00
Evgeniy Khramtsov
1e9b54d0b7
Do not ignore ASN.1-generated files
2013-06-22 03:28:09 +10:00
Evgeniy Khramtsov
a3354f5dc4
Do not generate LDAP's ASN.1 code when compiling ejabberd.
...
We need ASN.1 codec to decode messages into binaries, so we
fixed generated ELDAPv3.erl. A better solution is needed to be found.
2013-06-22 03:27:59 +10:00
Badlop
109ed1a8b1
According to XEP-0045, a MUC member is allowed to retrieve the members list
2013-06-21 11:43:23 +02:00
Christophe Romain
0c60718bef
fix empty itemid on publish when passing Access
2013-06-20 17:51:07 +02:00
Christophe Romain
4221d56c04
fix pubsub issue on binary switch
2013-06-20 17:07:40 +02:00
Evgeniy Khramtsov
4dc80dddd4
Fix all calls to functions of p1_tls application
2013-06-20 18:40:44 +10:00
Christophe Romain
66ad9e9722
inet_dist_use_interface requires argument quoting
2013-06-19 17:28:05 +02:00
Alexey Shchepin
1e633638e1
Disable lager by default
2013-06-19 16:28:20 +03:00
Evgeniy Khramtsov
f34e9734ec
Clarify MySQL/PostgreSQL preparation for running the test suite.
2013-06-19 21:52:50 +10:00
Evgeniy Khramtsov
89c3cf3677
Shutdown rooms before starting test cases
2013-06-19 21:46:22 +10:00
Evgeniy Khramtsov
4f8bb4f918
Add tests for modules using MySQL/PostgreSQL
2013-06-19 20:12:15 +10:00
Evgeniy Khramtsov
2ec048a5ae
Merge branch 'master' of github.com:processone/ejabberd
2013-06-19 10:41:33 +10:00
Evgeniy Khramtsov
7b870f5a30
Better DLL location detection when executing `make install`
2013-06-19 10:41:06 +10:00
Badlop
79c51a059a
Improve handling of INET_DIST_INTERFACE option (EJAB-1611)
...
In old releases, only the erlang format {127,0,0,1} was supported.
Now we support also 127.0.0.1, but we want backwards compatibility.
2013-06-18 19:35:55 +02:00
Jerome Sautret
fedea8bca0
Added missing license and copyright headers.
2013-06-18 16:56:29 +02:00
Christophe Romain
55fb85107e
improve ejabberdctl, and support different node names (thanks to Zach Calvert)(EJAB-1611)
2013-06-18 15:56:28 +02:00
Evgeniy Khramtsov
1ea5614209
Some deps have their DLLs in "priv" directory (not "priv/lib").
...
Do not forget to `install` them as well.
2013-06-18 23:15:06 +10:00
Evgeniy Khramtsov
94c21f3149
Better handle incoming packets sequence
2013-06-18 22:36:43 +10:00
Evgeniy Khramtsov
ec01ab3945
Add some missing applications to the reltool script
2013-06-18 21:55:56 +10:00
Christophe Romain
c030e8e136
sync pubsub_odbc with last fix
2013-06-18 12:23:32 +02:00
Evgeniy Khramtsov
8ea41718ac
Fix node auto-creation
2013-06-18 04:11:54 +10:00
Evgeniy Khramtsov
6b060649c6
Merge branch 'master' of github.com:processone/ejabberd
2013-06-18 04:05:31 +10:00
Evgeniy Khramtsov
7fa9def24c
Re-generate XMPP codec, decrease tests verbosity
2013-06-18 04:05:01 +10:00
Christophe Romain
20598c7be4
sync and cleanup pubsub_odbc
2013-06-17 16:34:21 +02:00
Christophe Romain
08fc6df853
fix auto-create issue due to bad binary matching
2013-06-17 16:30:20 +02:00
Alexey Shchepin
62fb432e3e
Fixed broadcast messages handling
2013-06-17 16:41:02 +03:00
Alexey Shchepin
862a08e9eb
Fixed conversion to ezlib
2013-06-17 16:33:25 +03:00
Evgeniy Khramtsov
a616123200
Add simple mod_offline checks
2013-06-17 16:10:58 +03:00
Evgeniy Khramtsov
96b94e3ebb
Add some MUC checks. Several cleanups
2013-06-17 16:10:54 +03:00
Evgeniy Khramtsov
45edf337cf
Add mod_proxy65 test case
2013-06-17 16:10:49 +03:00
Evgeniy Khramtsov
831dc1f253
Check item groups separately
2013-06-17 16:10:43 +03:00
Evgeniy Khramtsov
3f8a10c092
Add roster checks
2013-06-17 16:10:38 +03:00
Evgeniy Khramtsov
0baf4e6088
Advertise privacy lists support via disco#info
2013-06-17 16:10:30 +03:00
Evgeniy Khramtsov
7865c6a146
Don't include sub-elements in IQ results where it's not required
...
by the corresponding spec (RFC or XEP).
2013-06-17 16:09:54 +03:00
Evgeniy Khramtsov
1b96856d92
Improve "unregister" test case
2013-06-17 16:05:16 +03:00
Evgeniy Khramtsov
adf75e3c18
Add registration remove test case
2013-06-17 16:05:08 +03:00
Evgeniy Khramtsov
7b96d8cc24
Test suite cleanup.
...
* Split test cases in groups.
* Increase a loglevel of common_test framework.
2013-06-17 16:04:54 +03:00
Evgeniy Khramtsov
b50a4948ed
Fix the error report of an incorrect certfile
2013-06-17 16:04:43 +03:00
Evgeniy Khramtsov
c9efdf6167
Better certfile location detection by the test suite
2013-06-17 16:04:18 +03:00
Evgeniy Khramtsov
2f7d27677e
Remove forgotten comments
2013-06-17 16:04:07 +03:00
Evgeniy Khramtsov
60dbaa0dac
Add zlib compression test case
2013-06-17 16:03:58 +03:00
Evgeniy Khramtsov
167dd59941
Add STARTTLS test case
2013-06-17 16:03:52 +03:00
Evgeniy Khramtsov
5872ce5cc3
Add mod_register checks
2013-06-17 16:03:35 +03:00
Evgeniy Khramtsov
8a5ec41279
Convert XMPP codec specification to the new format
2013-06-17 16:01:51 +03:00
Christophe Romain
f123263230
set version to community
2013-06-17 14:42:46 +02:00
Badlop
243d24015c
Remove old obsolete R14 code
2013-06-14 16:18:22 +02:00
Badlop
4c445b37fd
In frontends, if result is in binary then convert to string
2013-06-14 16:08:47 +02:00
Paweł Chmielowski
f6e39f64e2
Make ejabberd_ctl not die for ejabberd_commands with binary arguments
2013-06-14 16:08:02 +02:00
Christophe Romain
26b815f52d
cosmetic changes, move badly placed comments
2013-06-14 00:04:25 +02:00
Evgeniy Khramtsov
4d8f770624
Switch to rebar build tool
...
Use dynamic Rebar configuration
Make iconv dependency optional
Disable transient_supervisors compile option
Add hipe compilation support
Only compile ibrowse and lhttpc when needed
Make it possible to generate an OTP application release
Add --enable-debug compile option
Add --enable-all compiler option
Add --enable-tools configure option
Add --with-erlang configure option.
Add --enable-erlang-version-check configure option.
Add lager support
Improve the test suite
2013-06-13 11:11:02 +02:00
Badlop
4f77348255
Fix Guide: ejabberd_service expects a shaper_rule, not a shaper
2013-06-10 17:57:28 +02:00
Badlop
0080f1f308
Detect correctly newer Darwin versions (EJAB-1594)
2013-06-06 12:24:18 +02:00
Christophe Romain
58e769d68f
fix getting ServerHost from Host due to binary portage (EJAB-1638)
2013-06-06 11:32:52 +02:00
Christophe Romain
c8cba04f05
access_createnode acl also applies to auto created nodes ported to pubsub_odbc
2013-06-06 11:11:37 +02:00
Badlop
d1e1191793
Handle multiple < and > in mod_muc_log plaintext mode (EJAB-1640)
2013-05-31 13:23:08 +02:00
Badlop
3025bfd3ff
Handle ~ control sequence in text of mod_muc_log (EJAB-1639)
2013-05-30 14:28:39 +02:00
badlop
2639d262f1
Merge pull request #69 from PaulSD/master
...
Fix a bug when reading tuples from config
2013-05-27 04:46:40 -07:00
Paul Donohue
089c664bad
Fix a bug when reading tuples from config
...
If the config contains a tuple of integers (for example, if a bind IP
address is specified) then strings_to_binary() calls tuple_to_list()
followed by strings_to_binary(), which then calls list_to_binary()
because the list looks like a string. Then list_to_tuple() is called on
the returned binary, causing a crash.
This patch corrects the problem by calling strings_to_binary1() instead,
which ensures that the value that is passed into list_to_tuple() is a
list.
2013-05-24 14:29:41 -04:00
badlop
34a4493df9
Merge pull request #67 from anton-ryzhov/config_example
...
Removed wrong option for `ejabberd_service` module (since 174c16a1
)
2013-05-16 02:58:08 -07:00
Anton Ryzhov
e71650325b
Removed wrong option for `ejabberd_service` module (since 174c16a1
)
2013-05-16 01:22:02 +04:00
Badlop
c0bf054583
Tweak ejabberd_listener to allow ejabberd_xmlrpc work properly
2013-05-14 18:50:54 +02:00
Badlop
80f165a55c
Fix get of announcement form
2013-04-25 16:00:24 +02:00
badlop
54667511f6
Merge pull request #62 from PaulSD/master
...
Fix errors when generating random binary strings
2013-04-25 03:48:55 -07:00
Badlop
d38ccbea6b
access_createnode acl also applies to auto created nodes (thanks to Matthias Rieber)
2013-04-25 12:37:16 +02:00
Badlop
dfee84374f
Include actor element in MUC stanzas when kicking (thanks to Purvesh Sahoo)(EJAB-1206)
2013-04-24 11:01:02 +02:00
Badlop
3e93fbfd2e
Revert "Include actor element in MUC stanzas when kicking (thanks to Purvesh Sahoo)(EJAB-1206)"
...
This reverts commit 066c47ca96
.
2013-04-23 13:57:18 +02:00
Badlop
066c47ca96
Include actor element in MUC stanzas when kicking (thanks to Purvesh Sahoo)(EJAB-1206)
2013-04-23 13:55:40 +02:00
Stephen Röttger
9fa415e557
SCRAM optional parameter parsing bugfix
...
The server gave an authentication error, if optional parameters
were present in the GS2 Header. Specifically, the "a=" parameter,
that can be used by admins to login as a different user.
2013-04-23 13:55:36 +02:00
Paul Donohue
b33a482582
Fix error when generating random binary strings
2013-04-19 15:30:13 -04:00
Badlop
c0afb1f282
Fix bug when getting room config
2013-04-15 11:14:32 +02:00
Badlop
abc1341b3f
Fix mod_http_fileserver work with binaries (GITHUB-59)
2013-04-12 12:55:49 +02:00
Badlop
c7eaa9aeac
ejabberd 13 requires Erlang/OTP R15B or higher (EJAB-1630)
...
Fix documents and remove useless code.
2013-04-11 17:12:53 +02:00
badlop
c98540b8db
Merge pull request #57 from rraptorr/carboncopy
...
Change message type of carbon copies from 'chart' to 'chat'
2013-04-10 04:40:28 -07:00
Janusz Dziemidowicz
74808b25a1
Change message type of carbon copies from 'chart' to 'chat'
2013-04-09 23:21:06 +02:00
Badlop
cbd3062365
Don't overwrite inetrc when installing (thanks to skeltoac)
2013-04-04 13:36:15 +02:00
Christophe Romain
65298d34c9
remove obsolete packaging file
2013-04-02 10:57:48 +02:00
Evgeniy Khramtsov
7a00622aa8
Merge branch 'master' of github.com:processone/ejabberd
2013-03-29 19:38:19 +10:00
Evgeniy Khramtsov
0d80e7e68a
Get rid of references to non-existent module
2013-03-29 19:38:01 +10:00
Evgeniy Khramtsov
299a0f823a
Fix several refactoring related bugs
2013-03-29 19:23:52 +10:00
Badlop
fc7360068a
Update version number to beta2
2013-03-29 10:04:30 +01:00
Badlop
4c2d2bd4e9
Add mod_carboncopy that implements XEP-0280 v0.8
2013-03-27 17:53:56 +01:00
Badlop
627f597989
Update URL of ejabberd's Git repository
2013-03-27 17:17:52 +01:00
Badlop
e5cbcbdac5
Fix documentation of mysql and pgsql configuration
2013-03-27 17:14:21 +01:00
Badlop
06a98ae6fa
Improve documentation of MSSQL database configuration
2013-03-27 17:05:26 +01:00
Badlop
9b735450b3
Improve documentation of MySQL storage
2013-03-27 16:44:25 +01:00
Badlop
807c67d964
Improve documentation of anonymous auth
2013-03-27 13:06:13 +01:00
Badlop
9b510579b3
Fix room configuration after binarization
2013-03-22 17:14:47 +01:00
Badlop
d901aa982b
Fix privacy list broadcast internal stanza after binarization
2013-03-22 13:57:45 +01:00
Badlop
2c6b12228a
Change version number
2013-03-20 20:54:53 +01:00
Badlop
f92a94a737
Copied PostgreSQL erlang library from ejabberd-modules SVN
2013-03-19 13:30:17 +01:00
Badlop
1b304aaf0a
Copied MySQL erlang library from ejabberd-modules SVN
2013-03-19 13:30:15 +01:00
Badlop
9deb294328
Accumulated patch to binarize and indent code
2013-03-14 10:33:02 +01:00
Badlop
9c41abde10
list_to_integer/2 only works in OTP R14 and newer
2013-03-14 10:25:41 +01:00
Badlop
907e239d4e
Fix bug when displaying offline messages in WebAdmin
2013-03-14 10:25:38 +01:00
Badlop
c058687bf9
Update ejabberd version number to 2.1.12
2013-02-05 17:22:34 +01:00
Badlop
aa47033fa1
Added release notes for 2.1.12
2013-02-05 17:20:29 +01:00
Badlop
3f93931409
New mod_muc_log option file_permissions (EJAB-1588)
2013-02-05 16:20:14 +01:00
Steven Lehrburger
426f1107c5
Fix issue with ejabberd_xmlrpc user auth and SCRAM
...
After enabling SCRAM password hashing and SSL in ejabberd, XMLRPC ejabberdctl commands were resulting in errors like this:
W(<0.2623.0>:ejabberd_xmlrpc:328) : Error -118
A problem '{error,invalid_account_data}' occurred executing the command user_sessions_info with arguments
It seems that this because ejabberd_commands was using a different authentication check than everything else, which wasn't properly taking account for potential password hashing. (Note I'm not really sure what AccountPassMD5 is doing, but it seems to be different than the ejabberd_auth_internal's SCRAM hasing.)
2013-02-04 12:57:56 +01:00
Badlop
2704378d43
Fix compatibility of LDAP support with Erlang R16A (EJAB-1612)
...
As explained in Erlang/OTP git log:
eldap: Remove calls to undocumented asn1rt* functions.
We are about to remove the old asn1rt* modules, so we must remove
the calls that eldap make to them. Since the calls are just a
sanity check, we can just remove the calls. Just doing the decode
will do roughly the same tests and generate similar exceptions.
2013-02-04 10:31:54 +01:00
Badlop
e500fd74ad
Fix warning about unused variable
2013-02-01 16:50:42 +01:00
Badlop
e7f85411fe
Update Hebrew translation (thanks to Isratine Citizen)
2013-01-31 17:27:47 +01:00
Badlop
15073aafa5
Fix angle brackets handle in MUC plaintext log (EJAB-1610)
2013-01-31 17:25:03 +01:00
Alexey Shchepin
0ae400533c
Update copyright dates
2013-01-24 16:25:13 +02:00
Evgeniy Khramtsov
d47dee8009
Make sure update_info returns atoms only (EJAB-1595) (Thanks to Jose M Herrero)
2013-01-03 20:26:16 +10:00
Alexey Shchepin
d5506a3ff0
Fixed signedness issue in tls_drv GET_DESCRYPTED_INPUT (EJAB-1591)
2012-12-20 14:01:45 +02:00
Remco Wendt
d81eb95cab
Added command to list all the vhosts registered in an ejabberd node
2012-12-19 15:00:57 +02:00
alexeyshch
1f290c8a29
Merge pull request #37 from rraptorr/tls
...
TLS driver impovements
2012-12-17 04:53:09 -08:00
Evgeniy Khramtsov
be33ab890e
Fix broken JPEG photo (EJAB-1526)
2012-12-12 18:08:24 +10:00
Badlop
2c26926689
Copy, fix and document export2odbc command from mod_admin_extra.erl
2012-11-26 13:22:29 +01:00
Evgeniy Khramtsov
9208f4dd50
Make terms serialization faster
2012-11-22 16:18:48 +02:00
Alexey Shchepin
dfcdf1ca7a
Fixed mod_offline:store_offline_msg argument (EJAB-1581)
2012-11-09 12:48:25 +02:00
Badlop
ec51ba7bc6
New Hebrew translation (thanks to Isratine Citizen)
2012-10-17 18:26:55 +02:00
Badlop
625e801431
Document in the guide the db_type modules option (EJAB-1560)
2012-10-03 18:14:36 +02:00
Badlop
2dc2769c92
Log IP address when auth attempt fails (thanks to Zach Calvert)
2012-08-27 17:40:01 +02:00
Badlop
8a737f875f
Add SCRAM and remove MD5 support to ejabberd commands auth verification
2012-08-27 16:57:56 +02:00
Badlop
4147081f0b
Added clause so ejabberdctl number of arguments error report works with R15
2012-08-27 16:38:52 +02:00
Badlop
a47fd96cc8
On shutdown, first stop listeners, then modules (thanks to Vishal Xica)(EJAB-1566)
2012-07-25 13:02:21 +02:00
Badlop
4d54bce621
Send announce Message stanzas as Headline type instead of Normal
2012-07-24 18:35:41 +02:00
Janusz Dziemidowicz
5e7a1c8829
Detect OpenSSL version at runtime, not at compile time
2012-07-24 07:40:07 +02:00
Janusz Dziemidowicz
bc65b5008e
Enable DHE key exchange in TLS driver
2012-07-19 12:06:03 +02:00
Janusz Dziemidowicz
a407382d9f
Enable ECDHE key exchange in TSL driver
2012-07-18 22:33:38 +02:00
Janusz Dziemidowicz
d2d51381ec
Disable old and unsecure ciphers in TLS driver
...
Disable:
- export ciphers - broken by design, 40 and 56 bit encryption
- low encryption ciphers - 56 and 64 bit encryption
- SSLv2 ciphers - some ciphers using MD5 MAC
2012-07-18 22:00:58 +02:00
Janusz Dziemidowicz
e06c1c49c1
Disable SSL 2.0 in TLS driver
...
SSL 2.0 is not used anywhere as it has security problems. Disable it
unconditionally both in server and client mode. This does _not_
disable support for SSL 2.0 compatible client hello which still will
be accepted in the server mode.
2012-07-18 21:57:28 +02:00
Evgeniy Khramtsov
0cc920579c
Fix regression introduced in odbc/mnesia merge
2012-07-17 23:35:16 +10:00
Janusz Dziemidowicz
efc0b0ba5a
Reduce size of XML stream state
...
This makes size of hibernated ejabberd_receiver a lot smaller (from
~290 words down to ~40).
2012-07-09 17:03:33 +03:00
Badlop
4e6eff3f1a
Fix file name of Name Service Switch (thanks to Konstantin Khomoutov)
2012-07-06 12:07:41 +02:00
Badlop
2bf8125abf
Allow multiple fqdn values in configuration (EJAB-1578)
2012-06-27 11:10:48 +02:00
Badlop
75756f0fc9
Check node name is available before starting ejabberd (EJAB-1572)
2012-06-08 17:33:21 +02:00
Badlop
bc077266d9
Fix MUC start when Mnesia tables don't exist yet
2012-06-08 16:39:15 +02:00
Badlop
a99c1e7031
Fix account registration
2012-06-06 12:55:35 +02:00
Badlop
bb026ef598
Update Slovak translation (thanks to Marek Bečka)
2012-05-15 12:00:04 +02:00
Badlop
e5d5ea49be
Revert "Update ejabberd version number to 2.1.11"
...
This reverts commit 453e249de3
.
2012-05-15 11:46:31 +02:00
Paweł Chmielowski
6c94d040fa
Repeated http-bind request should abort only requests with same rid
...
Before this change, when request with repeat rid was received any waiting
request was aborted (but only after next request was delivered). With this
change, only request with identical rid are aborted and this is done
immediately
2012-05-03 11:44:34 +02:00
Paweł Chmielowski
e8921d79ba
Receiving missing http-bind request shouldn't close waiting out-ouf-order request
2012-05-03 11:44:21 +02:00
Evgeniy Khramtsov
6719d9669b
Fix get_subscription_lists/4
2012-04-29 19:34:57 +10:00
Paweł Chmielowski
8b13226d00
Do not trigger item-not-found errors in mod_http_bind (part of EJABS-1827)
...
This changes what happens to request received with out of order rid,
previously response to such request was send immediately, and client was
free to submit another request, which triggered item-not-found if it was
delivered before request with missing rid.
This change make us wait for sending response to out of order request until
request with missing rid arrives. It also queues all outgoing data before
that condition is meet.
2012-04-27 13:23:19 +02:00
Evgeniy Khramtsov
437f68a9f3
Merge SQL and Mnesia code into one module (EJAB-1560)
2012-04-27 19:52:05 +10:00
Badlop
453e249de3
Update ejabberd version number to 2.1.11
2012-04-26 16:04:16 +02:00
Badlop
8688030d7a
Add ejabberd 2.1.11 release notes
2012-04-26 15:57:37 +02:00
Badlop
6e2003c2e2
Recompile translation files
2012-04-26 15:54:54 +02:00
Badlop
5ed8959eba
Update Italian translation (thanks to Luca Brivio)
2012-04-25 00:00:52 +02:00
Maxim Ignatenko
7623ebd327
mod_irc: Make use of MUC password
2012-04-24 15:21:46 +02:00
Badlop
522eb0fe9d
Update PO files manually according to the English fix
2012-04-24 13:52:59 +02:00
Badlop
7dd171322d
Fix English strings (thanks to Andreas van Cranenburgh)
2012-04-24 13:51:54 +02:00
Badlop
752652e56c
Update German translation again (thanks to Nikolaus Polak)
2012-04-24 13:51:04 +02:00
Badlop
2582a478ab
Update Portuguese-Brazil translation (thanks to Otávio Fernandes)
2012-04-23 09:58:03 +02:00
Badlop
52ff5de564
Update Polish translation (thanks to Zbyszek Żółkiewski)
2012-04-23 09:58:01 +02:00
Badlop
ba793af8b7
Update Norwegian translation (thanks to Stian B. Barmen)
2012-04-23 09:57:59 +02:00
Badlop
3304ecd1f0
Update Catalan translation (thanks to Jan Kusanagi)
2012-04-23 09:57:56 +02:00
Badlop
4e0394cab3
Update Japanese translation (thanks to Mako N)
2012-04-20 15:42:41 +02:00
Badlop
eaa963a840
Update Greek translation (thanks to James Iakovos Mandelis)
2012-04-20 15:42:38 +02:00
Evgeniy Khramtsov
31c13cc1c8
Remove useless mnesia call
2012-04-20 16:52:33 +10:00
Badlop
310aa7a00d
Update Czech translation (thanks to Jan Pinkas)
2012-04-18 11:13:36 +02:00
Badlop
fafd605d4d
Update Chinese translation (thanks to Shelley Shyan)
2012-04-18 10:13:34 +02:00
Badlop
078f3583f0
Update Turkish translation (thanks to Doruk Fisek)
2012-04-18 10:13:15 +02:00
Badlop
0b337329ba
Update Russian translation (thanks to Evgeniy Khramtsov)
2012-04-18 10:12:47 +02:00
Badlop
f5df63554f
Update Dutch translation (thanks to Andreas van Cranenburgh)
2012-04-18 10:12:22 +02:00
Badlop
46c4f46451
Update Esperanto translation (thanks to Andreas van Cranenburgh)
2012-04-18 10:12:09 +02:00
Badlop
e034864c12
Update German translation (thanks to Nikolaus Polak)
2012-04-18 10:11:36 +02:00
Badlop
91f38cc849
Extract new strings
2012-04-18 10:08:30 +02:00
Evgeniy Khramtsov
e616d2686f
Perform user part substitution in ldap_rfilter (EJAB-1555)
2012-04-17 17:19:53 +10:00
Badlop
5a09d671ab
Photos from LDAP not displayed in some clients, lacking TYPE (thanks to Alex Crycheck)(EJAB-1554)
2012-04-16 12:25:14 +02:00
Badlop
58d49d2867
Update Spanish translation
2012-04-15 00:21:22 +02:00
Badlop
8bb58ba3c3
Extract new strings
2012-04-15 00:21:15 +02:00
Badlop
017ce4e092
Fix translation script to use ejabberd_regexp (EJAB-921)
2012-04-15 00:21:10 +02:00
Badlop
49859683b0
Document how to provide a long announcement (EJAB-1553)
2012-04-14 23:29:55 +02:00
Badlop
169b83b36d
Handle the scenario of disabled mod_muc (EJAB-1553)
2012-04-14 23:29:30 +02:00
Evgeniy Khramtsov
86435ba9aa
ODBC support for mod_blocking
2012-04-12 14:22:56 +10:00
Paweł Chmielowski
e2d6bc95a4
Parse and encode https header names like native http parser does
...
This code adds case normalization step to https headers parsing, making
it correctly use atoms for some special header no matter how upper/lower
case letters are used in input string
2012-04-11 17:28:18 +02:00
Christophe Romain
06f570f4ff
return user affiliation for a specified node (thanks to Karim Gemayel) (EJAB-1294)
2012-04-11 16:50:36 +02:00
Badlop
730dfe8fc7
Add comments about Dialyzer warnings
2012-04-11 16:34:03 +02:00
Evgeniy Khramtsov
5619d39bd3
Add odbc modules to Makefile.win32
2012-04-09 14:53:15 +10:00
Evgeniy Khramtsov
959e0ff1c9
Remove obsoleted function call
2012-04-09 10:43:49 +10:00
Paweł Chmielowski
2c228e6414
Don't use binary:match to extract lines from binaries
...
This was added in R13B3, lets roll our own implementation to make sure it
works on older erlang versions.
2012-04-06 18:55:27 +02:00
Paweł Chmielowski
82468bff00
Fix makefile rules for building dll-s in Makefile.win32 files
2012-04-06 16:31:17 +02:00
Paweł Chmielowski
5f82846732
Parse correctly https request split into multiple packets
...
This fixes case when SockMod:recv() calls returns only part of first line
of http request (GET/POST/OPTION/HEAD line). Before that change request
like that (and if keep-alive was active, all further request) were dropped.
This fixes EJAB-1537.
2012-04-06 16:22:08 +02:00
Paweł Chmielowski
09c75af15c
Make sure that res is initialized in all cases
2012-04-06 12:00:43 +02:00
Alexey Shchepin
91964b1aba
Added missed tls:recv_data/2
2012-04-06 11:53:53 +02:00
Paweł Chmielowski
af2e9169e6
Don't ignore Length parameter in tls:recv
2012-04-06 11:53:21 +02:00
Alexey Shchepin
4637e2c66b
Avoid quadratic behavior in reading SSL data
2012-04-06 11:47:53 +02:00
Paweł Chmielowski
1f1a98d7ae
Properly handle HEAD request in mod_http_bind (this fixes EJAB-1538)
2012-04-06 11:47:38 +02:00
Evgeniy Khramtsov
cea23b055b
Get rid of duplicated code
2012-04-06 12:31:29 +10:00
Evgeniy Khramtsov
41a0eae0bd
ODBC support for mod_shared_roster
2012-04-04 20:37:43 +10:00
Evgeniy Khramtsov
5fab00011e
ODBC support for mod_irc
2012-04-03 20:23:41 +10:00
Evgeniy Khramtsov
ca5f028016
ODBC support for mod_vcard_xupdate
2012-04-02 15:21:54 +10:00
Evgeniy Khramtsov
b43444f674
ODBC support for mod_announce
2012-04-02 14:49:13 +10:00
Evgeniy Khramtsov
866085c918
Add ODBC exporting function for privacy table
2012-04-02 12:39:23 +10:00
Evgeniy Khramtsov
585c5afd1a
Add notes about mod_muc_odbc
2012-04-02 10:57:10 +10:00
Evgeniy Khramtsov
6ec5c7c4d8
Use proper module name
2012-03-31 22:56:51 +10:00
Evgeniy Khramtsov
6b3875814c
ODBC support for mod_muc
2012-03-31 21:41:54 +10:00
Evgeniy Khramtsov
3a51c801e1
Change log level from informational to error
2012-03-19 18:52:20 +10:00
Badlop
983da9c887
Relax digest-uri handling (thanks to Daniel Willmann)(EJAB-1529)
...
This patch introduces a new config option - fqdn - to set the fully
qualified domain name of the host:
{fqdn, "foo.example.com"}.
This fixes a problem with Pidgin not being able to log in on a server
that used SRV records.
2012-03-16 14:16:17 +01:00
Evgeniy Khramtsov
f7b6446c74
Assume we have only one CPU when an auto-detection fails (EJAB-1516)
2012-02-29 00:45:45 +10:00
Evgeniy Khramtsov
deb87f2dfa
Cache caps timestamp before the IQ-request is done
2012-02-28 16:38:24 +10:00
Alexey Shchepin
b1e2538488
Update copyright dates
2012-02-23 17:52:34 +02:00
Badlop
7b9e59d15d
Recommend Erlang/OTP R13B04 and R14B04
2012-02-22 15:42:13 +01:00
Badlop
794d0bbe69
Fix Enlish in the Guide (thanks to Ludovic Bocquet)
2012-02-22 15:40:31 +01:00
Christophe Romain
f7ffdfa15d
Fix typo in xep number, bosh is xep0206 (thanks to Ludovic Bocquet)
2012-02-20 14:15:08 +01:00
Badlop
4900ac31a7
Add thanks to Ludovic Bocquet for past Guide contributions
2012-02-15 18:30:16 +01:00
Badlop
112a18f966
Work also with some unicode strings in PgSQL (EJAB-1490)
2012-02-14 13:18:18 +01:00
Badlop
7d623d5eb4
Option default_host for handling HTTP requests with ambiguous Host (EJAB-1261)
2012-02-14 11:35:52 +01:00
Evgeniy Khramtsov
4819738e8f
Receiver should not generate an exception
2012-02-14 17:03:08 +10:00
Badlop
948318ca19
Fix the documentation about default value of captcha_cmd option
2012-02-01 00:09:51 +01:00
Evgeniy Khramtsov
89aa7baa5b
Replace a single quote with double quotes in
...
an ODBC escape (thanks to Vladislav Chugunov)
2012-01-31 11:18:37 +10:00
Badlop
95928a7cd4
http_bind webserver TLS fail on Chrome (thanks to Adam Langley)(EJAB-1530)
2012-01-19 13:21:25 +01:00
Alexey Shchepin
1ecc9ac48c
Fixed ejabberd_http:get_line
2012-01-19 12:20:48 +02:00
Badlop
288196c7e8
Foreign shared rosters items not pushed (thanks to Nathan Bruning)(EJAB-1509)
2012-01-04 19:21:31 +01:00
Badlop
0283c6cdfe
Revert "Update ejabberd version number to 2.1.10"
...
This reverts commit bcdae19141
.
2011-12-31 20:40:04 +01:00
Alexey Shchepin
d4e7b0cda0
mod_private.erl: misc errors cases fixes (thanks to Karim Gemayel)
2011-12-30 16:08:24 +02:00
Badlop
bcdae19141
Update ejabberd version number to 2.1.10
2011-12-23 12:27:30 +01:00
Badlop
6edbbded40
New release notes for 2.1.10
2011-12-23 12:25:50 +01:00
Badlop
684cac274d
Support undefinition of ssl:seed in R15B
2011-12-23 12:19:38 +01:00
Badlop
ce7b008b8f
Use the regexp frontend module (EJAB-921)
2011-12-23 11:33:33 +01:00
Alexey Shchepin
a3c58f2896
Always allow packets from user's server and bare jid in mod_privacy*
2011-12-22 16:37:47 +02:00
Alexey Shchepin
3839f1055a
Fixed the previous mod_blocking patch
2011-12-21 18:28:04 +02:00
Alexey Shchepin
94350ddb3a
Corrected mod_blocking hooks return value, activate "Blocked Contacts" privacy list after it is changed
2011-12-21 16:25:01 +02:00
Badlop
919cdc27db
Fix update with stripped beams (thanks to Jose M Herrero)(EJAB-1520)
2011-12-21 12:58:58 +01:00
Badlop
2029e39299
Support Erlang/OTP R15B driver (EJAB-1521)
2011-12-21 12:15:21 +01:00
Evgeniy Khramtsov
707bb0a321
Replace regexp with ejabberd_regexp
2011-12-19 16:10:48 +10:00
Evgeniy Khramtsov
298a4a3acf
Get rid of +driver option because it is incompatible with R15B
2011-12-19 16:01:04 +10:00
Badlop
262157c88d
Preliminary support for groupname@vhost in Displayed Groups (EJAB-506)
2011-12-15 17:27:28 +01:00
Badlop
37107af7b4
Fix command "update" to return response in the expected format
2011-12-08 19:39:36 +01:00
Badlop
13a9ca65a4
Don't reveal invitee's resource when room informs invitor
2011-12-08 16:35:31 +01:00
Badlop
d3369c83e7
Add callback function print_state/1 for behavior p1_fsm
2011-12-08 12:50:40 +01:00
Badlop
48308042b6
Use the regexp frontend module (EJAB-921)
2011-12-08 12:40:04 +01:00
Badlop
d30ad8ba28
Frontend module to Re and Regexp (EJAB-921)
2011-12-08 12:39:58 +01:00
Pablo Polvorin
cf973f27bb
Prevent overload of incomming s2s connections
...
Three changes were introduced:
1) ejabberd_s2s_in now uses p1_fsm instead of gen_fsm. And uses
the {max_queue, N} option to kill the process if its input
queue grows too much.
2) If a ejabberd_s2s_in process is overload and killed, the server
that originated that connection is not allowed to connect back
to us for X seconds (set to 60seconds on the source)
3) The list of blocked (both statically and dynamically by the above
method) host is now also checked for hosts authenticating by
starttls+sasl. Previusly it was only used during dialback.
2011-12-02 15:30:20 -03:00
Pablo Polvorin
87df27109a
Fix bug on s2s shaper when TLS is used
...
The shaper was not enabled if the remote server authenticates
using a certificate instead of dialback.
2011-12-01 13:16:21 -03:00
Christophe Romain
89e4e822bf
add hooks for node creation/deletion (EJAB-1470)
2011-11-29 14:13:13 +01:00
Badlop
b89d4c7476
Use httpc instead of the deprecated http
2011-11-26 17:20:06 +01:00
Badlop
ee968b5573
Fix error in mod_vcard when lowercasing some vjud search result fields (EJAB-1490)
2011-11-26 17:08:17 +01:00
Badlop
1f97740cfa
Avoid a possible race condition
2011-11-26 17:03:24 +01:00
Badlop
07cfc000ea
Comment section 6.3.1 because it has no content at all
2011-11-15 16:46:00 +01:00
Evgeniy Khramtsov
944791e888
Fix presence problem after first unavailable (thanks to Christopher Faulet) (EJAB-1466)
2011-11-09 15:09:02 +10:00
Badlop
0656377165
Support to update modules in R14B04 and higher
2011-11-03 19:47:11 +01:00
Badlop
1a419972d2
Fix previous commit about language name
2011-10-20 16:28:53 +02:00
Badlop
98b150e1a4
Fix extraction of language name from PO files
2011-10-20 15:45:17 +02:00
Evgeniy Khramtsov
96800e9b75
Get rid of useless mnesia transaction (EJAB-1502)
2011-10-14 16:57:51 +10:00
Badlop
c1d479f863
Set ejabberd version to 2.1.x
2011-10-13 17:56:19 +02:00
Badlop
4be7984a0e
Update ejabberd version number to 2.1.9
2011-09-26 18:11:18 +02:00
Badlop
3b0b318730
New release notes for 2.1.9
2011-09-26 18:09:01 +02:00
Evgeniy Khramtsov
39bc499b10
Fix instruction and error text
2011-09-26 20:00:43 +10:00
Evgeniy Khramtsov
de4d4a4bbb
Change "muc#role" field type to "hidden"
2011-09-26 19:54:55 +10:00
Evgeniy Khramtsov
8631dd14e9
Correct lists:keysearch output processing and fix dialyzer warning
2011-09-26 19:06:34 +10:00
Evgeniy Khramtsov
e7d12f4b9e
Code cleanup
2011-09-26 18:44:41 +10:00
Maxim Ignatenko
f17a531e15
Use treap correctly
2011-09-26 11:16:30 +03:00
Maxim Ignatenko
ff57c8a58c
Apply patch from Evgeniy Khramtsov
2011-09-26 11:16:30 +03:00
Maxim Ignatenko
499b884c67
Use treap for keeping last voice request timestamps
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
0c261fb903
Fix voice request/approvement detection and extract_jid_from_voice_approvement/1
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
322263fd5c
Fix typo
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
845f5cabec
Fix patterns in check_voice_request_fields/2 and check_voice_approvement_fields/2
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
f919349173
Use more pattern-matching
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
a91ae03dc6
Remove try/catch
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
faed7698c2
Use pattern matching in check_voice_request_fields/2 and check_voice_approvement_fields/2
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
eb8347f92b
Reverse arguments order for timer:now_diff/2
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
c53ffe6dc5
Fix return value inconsistency in last_voice_request_time/2
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
7c8eab4f43
Use jlib:parse_xdata_submit/1 in is_voice_request/1 and is_voice_approvement/1
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
b1d8168dd3
Use bare JID as key in state.last_voice_request_time
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
c196c1f5e5
Use lists:foreach instead of lists:map in send_voice_request/2
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
604563af76
Remove needless time conversions
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
6848d3affe
Ignore any extra elements in voice approvement form submission
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
6708914e99
Add 2 room config options
...
- Allow voice requests?
- Minimum interval between voice requests
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
5921f9c506
Simple rate control
...
Visitor allowed to send new voice request only after specified amount of
time (or after rejoining).
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
6193ed63b1
Voice approvement support
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
18dd0d08cb
Implement basic voice request processing logic.
...
No rate control or configuration for now
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
8dd6f128bf
Implement voice approvement detection and remove some debug code
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
04267930de
Fix form instructions
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
d83716dece
Use ejabberd_router:route/3 directly, instead of send_packet_to/3
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
c77358bdc1
Use exception handling in is_invitation/1
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
44987479a5
Fix exception handling in is_voice_request/1
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
30d89abf66
Implemented sending voice request and fixed some bugs
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
f175be6b78
Add function for detecting voice requests
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
2a41ca0628
More correct dispatching of normal messages to conference room
...
is_invitation/1 function returns true if <x> element of message is
an invitation
2011-09-26 11:16:27 +03:00
Janusz Dziemidowicz
c4f9a050c9
Decrease CPU usage caused by tls:send with large data.
...
Sending one large chunk of data with tls:send eats lots of
CPU power and blocks whole Erlang emulator. This is caused by the
fact that encrypted output is read from memory BIO in 1k chunks.
Memory BIO, after reading data, shifts the remaining part.
If large chunks of data (few MB) is sent and then read in 1k
chunks, then a _lot_ of shifting is performed eating CPU.
The solution is to simply allocate binary of the needed size
(amount of data in memory BIO can be retrieved with
BIO_ctrl_pending) and then issue only one read that reads the
whole data.
2011-09-25 00:23:31 +02:00
Badlop
32ff6b56eb
Fix mod_muc_log crash when first log entry is room being destroyed (EJAB-1499)
2011-09-23 17:00:50 +02:00
Christophe Romain
33c0ebb100
fix broken PEP after EJAB-1498 (thanks to Karim Gemayel)
2011-09-22 20:51:59 +02:00
Badlop
cb9aecf35e
ejabberdctl doesn't support parameters with blankspaces (EJAB-1458)
...
Revert "Escape output from ctlexec() to erl script (thanks to Dan Scott)(EJAB-1399)"
This reverts commit 6dea2d2307
.
2011-09-22 16:18:04 +02:00
Christophe Romain
d5b4d67858
Fix Denial of Service when user sends malformed publish stanza (thanks to Oleg Smirnov) (EJAB-1498)
2011-09-21 14:39:50 +02:00
Badlop
9f4ae07100
added svg mimetype to default content types (thanks to Markus Kohlhase)
2011-09-20 16:50:22 +02:00
Badlop
32fc36b17d
Add support for @online@ to add_user_to_group
2011-09-20 16:44:51 +02:00
Evgeniy Khramtsov
33766a124d
New option support: ldap_deref_aliases (EJAB-639)
2011-09-19 16:58:55 +10:00
Evgeniy Khramtsov
ede8d57373
Fix dialyzer warnings
2011-09-17 10:48:52 +10:00
Evgeniy Khramtsov
2494e39c9e
Fix dialyzer warnings
2011-09-15 16:59:45 +10:00
Badlop
07fdd089a0
No need to explicitly skip old useless tables, simply fix keep_tables
2011-09-14 12:15:53 +02:00
Evgeniy Khramtsov
228a587fc5
Fix previous commit
2011-09-09 12:40:07 +10:00
Evgeniy Khramtsov
e432ff58f9
Avoid crash when performing admin action
2011-09-09 12:34:06 +10:00
Badlop
b8969f68e0
Fixed support for multi-resource occupants (EJAB-305)
2011-09-08 16:10:38 +02:00
Badlop
dbb2d1c229
Fix room config change logging, due to allow_private_messages_from_visitors
2011-09-08 12:34:25 +02:00
Badlop
609b7ed5c5
Support to import XML files without password-format attribute
2011-09-08 11:41:45 +02:00
Badlop
3eca0259f7
Clarification about system user of ejabberd.init
2011-09-06 13:39:43 +02:00
Badlop
20f3fc96c3
Fix SCRAM to support attributes which value has only one character
2011-09-05 23:21:38 +02:00
Badlop
76a174a007
Fix typo in the Guide about user_regexp
2011-09-05 19:24:05 +02:00
Evgeniy Khramtsov
0fde148a9f
Fix dialyzer warnings
2011-09-05 22:00:50 +10:00
Evgeniy Khramtsov
6b0eb1f09d
Reorganize the code to shut up the dialyzer
2011-09-05 21:27:31 +10:00
Evgeniy Khramtsov
f3c90ee266
Get rid of useless check
2011-09-05 21:06:18 +10:00
Evgeniy Khramtsov
2482c9c5ed
Merge set_affiliation/3 and set_affiliation_and_reason/4 into set_affiliation/4
2011-09-05 20:53:01 +10:00
Badlop
da555fb908
Fix SCRAM auth of uppercase passwords (EJAB-1196)
2011-09-05 12:50:24 +02:00
Evgeniy Khramtsov
7ae7d6315f
Remove useless clauses
2011-09-05 18:07:50 +10:00
Evgeniy Khramtsov
eccb499346
Add some magic in order to shut up the dialyzer (because I do not want to replace the macro with a function)
2011-09-05 17:33:51 +10:00
Evgeniy Khramtsov
0c1796ea40
Fix potential case-clause crash
2011-09-05 17:27:15 +10:00
Evgeniy Khramtsov
826fab9999
Remove useless case clause
2011-09-05 17:12:45 +10:00
Evgeniy Khramtsov
3b95108a3a
Replace VVALUEL macro with function in order to shut up the dialyzer
2011-09-05 17:09:36 +10:00
Evgeniy Khramtsov
ab2a298ebf
Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x
2011-09-05 16:53:10 +10:00
Evgeniy Khramtsov
8b5fa88b6f
Export do_client_version/3 in order to shut up the dialyzer
2011-09-05 16:52:36 +10:00
Evgeniy Khramtsov
de712e5ccb
Remove useless case clauses
2011-09-05 16:48:04 +10:00
Evgeniy Khramtsov
ffdf5cb206
Remove useless case clause
2011-09-05 16:47:18 +10:00
Evgeniy Khramtsov
f1a91108ef
Correct some function clauses and value types
2011-09-05 16:31:58 +10:00
Evgeniy Khramtsov
ffe063a0e9
Get rid of useless code
2011-09-05 15:59:30 +10:00
Evgeniy Khramtsov
d74f02e367
ejabberd_auth:remove_user/2 always returns ok
2011-09-05 15:39:55 +10:00
Evgeniy Khramtsov
0da2107974
Fix some case clauses
2011-09-05 15:35:46 +10:00
Evgeniy Khramtsov
1994c8a174
Change argument of open_port/2 to string in order to shut up the dialyzer
2011-09-05 15:28:14 +10:00
Evgeniy Khramtsov
2434be4803
Get rid of useless function clause
2011-09-05 15:13:54 +10:00
Badlop
d6fcee4faa
Replace calls of OTP's Binary, since they would require R14
2011-09-04 14:56:56 +02:00
Badlop
41d028d101
First check occupant existence, later check the message
2011-09-04 13:28:32 +02:00
Christophe Romain
75fc431fb8
enable pubsub#deliver_notification checking (thanks to Karim Gemayel)(EJAB-1453)
2011-08-31 16:11:01 +02:00
Badlop
917d1be994
Explicitly skip useless ejabberd 2.0* mnesia tables when restoring backup
...
Reference:
http://www.ejabberd.im/node/4867
2011-08-29 12:36:49 +02:00
Christophe Romain
900b013658
typo fix (thanks to Artem Sh)(EJAB-1424)
2011-08-25 17:22:48 +02:00
Badlop
84486dcb2c
Support multiple sessions per nick in muc_online_users, relevant for max_user_conferences (EJAB-305)
2011-08-23 21:53:41 +02:00
Badlop
9a190f3bc4
Send private messages to all the sessions with same nick (EJAB-305)
2011-08-23 21:53:30 +02:00
Badlop
c76bbdf16f
Don't send unavailable presence when leaving occupant has other nicks in the room (EJAB-305)
2011-08-23 21:53:19 +02:00
Badlop
24c5063b99
Allow multiple entry with same nick to MUC rooms (thanks to Magnus Henoch)(EJAB-305)
2011-08-23 21:52:20 +02:00
Badlop
a0f8a2c3a4
New option resource_conflict defines server action (thanks to Lee Boynton)(EJAB-650)
2011-08-17 19:44:39 +02:00
Badlop
3edea6c806
Fix bug in scram is_alpha
2011-08-17 19:33:58 +02:00
Badlop
abebabc487
Fix ODBC account counting (thanks to Artem Sh)(EJAB-1491)
2011-08-16 19:33:22 +02:00
Badlop
1ee6eae684
Fix and improve support for SCRAM auth method (EJAB-1196)
2011-08-16 00:26:49 +02:00
Badlop
24852b9be8
Indicate license and copyright (thanks to Stephen Röttger)(EJAB-1196)
2011-08-16 00:25:40 +02:00
Badlop
e80b92b481
Preliminary patch for SASL SCRAM-SHA-1 (thanks to Stephen Röttger)(EJAB-1196)
2011-08-16 00:25:03 +02:00
Pablo Polvorin
573a84b2ec
handle case when roster version on DB is enabled but version is not found.
...
Thanks Evgeniy.
2011-08-05 12:21:24 -03:00
Badlop
75f8e174dc
Add comment about ping requests sent even to non-supporting clients
2011-08-04 18:29:13 +02:00
Badlop
e690afc33b
Verify username provided in registration web form
2011-07-27 12:25:51 +02:00
Badlop
493b664f19
Handle case when ejabberd_auth_* says the account exists
2011-07-27 11:44:35 +02:00
Badlop
83014fb77b
Include status 110 in presence to new occupant (EJAB-740)
2011-07-16 19:35:59 +02:00
Badlop
1a4722e909
Fix typo in modules overview
2011-07-15 02:53:32 +02:00
Badlop
369fefd5a8
Use #roster record instead of direct tuple
2011-07-13 17:06:17 +02:00
Evgeniy Khramtsov
cc0aa707c4
Document ldap_tls_cacertfile and ldap_tls_depth options (EJAB-1299)
2011-07-13 15:57:01 +10:00
Evgeniy Khramtsov
7e14b2d46a
Add ldap_tls_cacertfile and ldap_tls_depth options (EJAB-1299)
2011-07-13 15:40:27 +10:00
Badlop
1e88c3f180
Room option to ignore private messages from visitors (thanks to Maxim Ignatenko)
2011-07-11 17:34:07 +02:00
Maxim Ignatenko
49ee637a5c
One more fix
2011-07-11 12:55:38 +02:00
Maxim Ignatenko
71f085fec0
Improve spelling and fix some typos
2011-07-11 12:55:35 +02:00
Badlop
caa84e2731
Fix reference to 'admin' ACL name (thanks to Samuel Wejeus)(EJAB-1476)
2011-07-05 16:33:06 +02:00
Alexey Shchepin
2787df035c
Merge branch '2.1.x' of git+ssh://git@gitorious.process-one.net/ejabberd/mainline.git into 2.1.x
2011-07-03 18:58:45 +03:00
Alexey Shchepin
32da749041
Minor mod_version bugfix
2011-07-03 18:58:07 +03:00
Juan Pablo Carlino
0cbd702419
is_user_in_group/3 must check if user belongs to given Group from Host specified on third argument.
...
* is_user_in_group/3 was checking if given user (passed on first parameter as
a bare jid) belonged to group of the server derived from this jid.
2011-07-01 12:51:52 -03:00
Alexey Shchepin
15f664af26
Optimized mod_roster_odbc:get_roster
2011-06-29 11:56:23 +03:00
Badlop
d673ff5fad
Support servers that reply error on any command before registration (thanks to Gelraen)
...
This makes mod_irc actually work with servers that reply with error
on any command before the registration procedure is completed.
Such servers, after NICK/USER they send PING and wait for client response.
In such situation they reply with message 451 to CODEPAGE command,
and mod_irc thinks that connection failed.
Example IRC server that works thanks to the patch: irc.mibbit.com
2011-06-28 23:04:12 +02:00
Badlop
f112df2cfc
Comment in the cfg file the correct node name used in ejabberdctl.template
2011-06-28 00:31:13 +02:00
Evgeniy Khramtsov
35644cf73c
Match ldap_uidattr_format case-insensitively (EJAB-1449)
2011-06-23 15:14:15 +10:00
Evgeniy Khramtsov
6cc6c04c4a
Log an error when an LDAP filter is incorrect (EJAB-1395)
2011-06-15 20:06:32 +10:00
Badlop
b9e1bc34da
Clarify in mod_register_web example what host to put in the URL
2011-06-11 16:15:37 +02:00
Evgeniy Khramtsov
f4d0b201ad
Escape iolist correctly when NIFs are disabled (EJAB-1462)
2011-06-11 23:28:10 +10:00
Badlop
aff99097e7
Fix compilation in Windows (thanks to flyingwow99)
...
See http://www.ejabberd.im/node/4549
2011-06-07 13:27:00 +02:00
Jerome Sautret
18f6b02065
Added 2.1.8 release notes.
2011-06-06 11:18:10 +02:00
Badlop
33544569fb
Fix crash when user publishes an item (EJAB-1457)
2011-06-01 23:22:25 +02:00
Badlop
529ab22a79
Recompile the Guide
2011-05-31 22:31:24 +02:00
Badlop
9f6afab09c
Update ejabberd version number to 2.1.7
2011-05-31 22:31:22 +02:00
Badlop
2137c03da1
Recompile translations
2011-05-31 22:31:20 +02:00
Badlop
58fe9d3345
Add release_notes_2.1.7.txt
2011-05-31 22:30:57 +02:00
Badlop
deb5e45bff
Fix some typos in the Guide
2011-05-31 21:12:31 +02:00
Badlop
bd1df027c6
Disable all entity expansions (thanks to Alexey Shchepin)(EJAB-1451)
2011-05-31 21:12:29 +02:00
Badlop
20290cab01
Update the 'configure' script with: aclocal; autoconf
2011-05-31 21:03:45 +02:00
Christophe Romain
adcf2d5c4e
Pubsub node maxitem forced to 0 if non persistent node (thanks to Karim Gemayel)(EJAB-1434)
2011-05-31 15:51:30 +02:00
Christophe Romain
8faafc5b0d
apply filtered notification to PEP last items (thanks to karim Gemayel)(EJAB-1456)
2011-05-31 15:40:07 +02:00
Badlop
370093afde
Fix minor English error
2011-05-31 12:27:45 +02:00
Badlop
32d3d1626b
New ERL_EPMD_ADDRESS that works since Erlang/OTP R14B03
2011-05-31 12:26:44 +02:00
Badlop
d4d28e038b
Cut the string when calling halt/1
2011-05-30 17:11:32 +02:00
Evgeniy Khramtsov
d6a076dae8
Under some circumstances the "uri" variable in StartNamespaceDeclHandler could be NULL. We check this now.
2011-05-30 22:39:56 +10:00
Badlop
2cacf21d51
Fix a recent commit about "Set script as executable"
2011-05-30 11:46:13 +02:00
Badlop
0874b93e7c
Support anonymous accounts in Shared Roster @all@ directive (EJAB-1264)
...
With this change, logged anonymous accounts are considered to be registered.
2011-05-30 11:00:21 +02:00
Badlop
ba9094a089
Add link in the Backup page to the Guide
2011-05-29 20:51:33 +02:00
Badlop
bfebcebeb7
Support XEP-0191 Simple Communications Blocking (thanks to Stephan Maka)(EJAB-695)
2011-05-27 11:47:22 +02:00
Badlop
1c0b99e162
A user can query his own Last activity, even if not subscribed to oneself
2011-05-26 12:50:40 +02:00
Badlop
f850bcbbc9
Several fixes and improvements in ejabberd.init.template
...
Changes:
* Set script as executable
* Add LSB tags and overrides, copied from Debian's ejabberd package
* Add chkconfig support (thanks to Ivan Martinez)(EJAB-1450)
* Don't use nounset, as that breaks when no argument is provided
* Add status command
2011-05-24 23:46:44 +02:00
Evgeniy Khramtsov
7bc879c6f4
When checking captcha setup, try to generate image only when captcha is enabled in order to avoid logging of confusing error
2011-05-18 12:48:02 +10:00
Badlop
f7d532f2f7
When module start fails during server start, stop erlang (EJAB-1446)
2011-05-16 22:33:59 +02:00
Evgeniy Khramtsov
dfbf32ecba
Note that ejabberd works with CGP LDAP server
2011-05-07 10:32:52 +10:00
Christophe Romain
17abbf3d82
Owner can delete any items from its own node (EJAB-1445)
2011-05-06 13:58:49 +02:00
Evgeniy Khramtsov
dfbfd90f8c
Take into consideration internal queue length when sorting processes queues
2011-05-05 16:08:28 +10:00
Evgeniy Khramtsov
84c1cf8033
Do not accept XML with undefined prefixes (EJAB-680)
2011-05-03 20:26:07 +10:00
Badlop
5a0cfe7e2b
Reorganize the push_item function, and handle version not_found (EJAB-1420)
2011-04-29 20:34:08 +02:00
Badlop
714dce84db
No need to inform that XEP-0237 is optional; clarified in XEP version 1.2
2011-04-29 20:34:06 +02:00
Badlop
b807b21a59
Show configuration for HTTPS http_bind
2011-04-28 13:24:18 +02:00
Badlop
4f4c8eb61e
mod_register Access now also controls account unregistrations
2011-04-26 22:55:04 +02:00
Badlop
3952888f94
Escape user input in mod_privacy_odbc (EJAB-1442)
2011-04-26 20:57:48 +02:00
Badlop
9b145385af
Throw error when captcha fails at server start, not later at runtime
2011-04-26 13:59:08 +02:00
jabber
897b46c31d
Do not decrease MUC admin's role/affiliation
2011-04-18 21:06:05 +10:00
Evgeniy Khramtsov
72299ab078
Add captcha_limit option to the example config
2011-04-18 16:16:10 +10:00
Evgeniy Khramtsov
e7ab83b612
Remove forgotten -compile(export_all).
2011-04-18 16:09:05 +10:00
Evgeniy Khramtsov
07cf6f09b8
Implement CAPTCHA limit
2011-04-18 16:06:36 +10:00
Evgeniy Khramtsov
252ee6228b
Fix syntax error
2011-04-18 15:50:24 +10:00
Evgeniy Khramtsov
cf6264f507
CAPTCHA whitelist support
2011-04-18 15:47:06 +10:00
Badlop
4f1ececbd1
Try to improve support for roster_version in MSSQL (EJAB-1437)
2011-04-14 23:11:37 +02:00
Badlop
70bf5b4eda
The responses to HEAD must have empty Body
2011-04-12 23:31:08 +02:00
Badlop
f59a979f7c
Support as read-only HTTP method not only GET, also HEAD
2011-04-12 23:13:46 +02:00
Badlop
05e3893f60
If extauth script crashes, ejabberd should restart it (EJAB-1428)
2011-04-11 21:27:19 +02:00
Badlop
7d7621c67c
Support more captcha_host value formats (EJAB-1418)
2011-04-11 19:59:26 +02:00
Badlop
449e56ed52
Send jid attribute when occupant is banned (EJAB-1432)
2011-04-07 12:54:39 +02:00
Badlop
aded966370
mod_ping uses iqdisc no_queue by default (thanks to Chris Moos)(EJAB-1435)
2011-04-07 12:08:31 +02:00
Badlop
dac1f328d7
Clarify {iqdisc, no_queue}
2011-04-07 12:06:31 +02:00
Badlop
90ea752046
Updated Japanese translation (thanks to Mako N)
2011-03-30 19:18:26 +02:00
Badlop
e4b3bd5005
Fix typo (thanks to Krzee)
2011-03-17 12:15:31 +01:00
Badlop
abcbcd1f2c
Update the changed string in the PO translation files
2011-03-13 18:34:55 +01:00
Badlop
18fd67b311
Change string in WebAdmin to reuse an existing one
2011-03-13 18:34:50 +01:00
Badlop
b116957982
Fix bashism and make some lines similar to master branch (EJAB-1404)
2011-03-09 16:25:05 +01:00
Badlop
a1f20a5bc0
If the port number isn't listener, then specify the protocol (EJAB-1418)
2011-03-03 11:38:00 +01:00
Badlop
e0d14c3b8d
captcha_host must have the port number to get protocol (EJAB-1418)
2011-03-03 00:02:43 +01:00
Badlop
1548a18b5e
mod_irc must send presence unavailable to the departing occupant (EJAB-1417)
2011-03-01 22:33:11 +01:00
Badlop
339fa6e41b
ejabberdctl needs space between INET_DIST_INTERFACE (thanks to Dale Chase)(EJAB-1416)
2011-02-28 18:40:45 +01:00
Badlop
db0962804d
Tweak pg2_backport.erl to work with Erlang older than R13A (EJAB-1349)
2011-02-22 23:44:45 +01:00
Badlop
677d8b1a29
Add support for '@online@' Shared Roster Group (thanks to Martin Langhoff)(EJAB-1391)
...
New version of the @online@ patch originally by Collabora.
Notes:
- the presence push is mediated via the group rather than
per user - this may reduce memory footprint... _if_ ejabberd
has some smart optimisation in that codepath
- it assumes that any group with membership @online@ _displays_
online as well -- this is a simplification and breaks the
decoupling that ejabberd has in this regard.
2011-02-21 22:34:15 +01:00
Badlop
850218c2df
Forward old messages to newly spawned extauth process (thanks to Mika Seppänen)(EJAB-1385)
2011-02-21 16:13:41 +01:00
Badlop
1c89914382
New route_iq/5 accepting Timeout (thanks to Edwin Fine)(EJAB-1398)
...
Also new register_iq_response_handler/5
2011-02-21 13:44:39 +01:00
Badlop
fe40a9c5f6
New DIST_USE_INTERFACE to restrict IP where erlang connections are listened (EJAB-1404)
2011-02-16 23:53:29 +01:00
Badlop
bc0ae5a017
New Indonesian translation (thanks to Irfan Mahfudz Guntur)(EJAB-1407)
2011-02-16 13:46:20 +01:00
Christophe Romain
91ab7e029b
fix empty pubsub payload check on odbc version
2011-02-14 16:45:49 +01:00
Christophe Romain
c3a88c713b
fix empty pubsub payload check
2011-02-14 16:41:32 +01:00
Christophe Romain
fd52f2cb7d
update copyright up to 2011
2011-02-14 13:50:55 +01:00
Badlop
f91eb52890
Provide HTTPS URL in CAPTCHA form when listener has 'tls' option (EJAB-1406)
2011-02-14 13:11:21 +01:00
Badlop
ca59a7f027
Fix typo in French translation
2011-02-11 20:19:59 +01:00
Badlop
6dea2d2307
Escape output from ctlexec() to erl script (thanks to Dan Scott)(EJAB-1399)
2011-02-09 16:38:54 +01:00
Badlop
650b2802b5
Remove erroneous comment (EJAB-645)
2011-02-03 17:23:09 +01:00
Badlop
6ddc66db9f
Handle Tigase's unexpected version=1.0 when ejabberd doesn't announce it (EJAB-1379)
2011-01-31 19:43:28 +01:00
Badlop
792512459d
mod_pres_counter prevents subscription flood (thanks to Ahmed Omar and Alexey Shchepin)(EJAB-1388)
2011-01-31 18:52:07 +01:00
Badlop
0359e345b0
Add to example config file access_from comment
2011-01-28 17:13:44 +01:00
Badlop
a09c319357
Update exmpp version to 0.9.6
2011-01-28 12:46:09 +01:00
Badlop
36166aa40e
Comment unused code
2011-01-28 12:11:34 +01:00
Badlop
a25c9c5df3
Don't let presence-in privacy rule block a presence subscription using ODBC (EJAB-255)
2011-01-19 20:58:57 +01:00
Badlop
6e3a9ac4fd
Fix delayed response of a timeout call was reused for next login (EJAB-1385)
2011-01-19 19:06:46 +01:00
Badlop
f4c74c147b
Clarify more the expected content of welcome_message mod_register option
2011-01-17 23:46:08 +01:00
Badlop
0edda6150b
Clarify error message when BOSH query is sent to non-running module
2011-01-12 21:22:43 +01:00
Mickaël Rémond
bd43505db9
Use route instead of send_element to go through standard workflow Offline messages should thus be tracked for ack if needed (TEXTO-226).
...
Signed-off-by: Evgeniy Khramtsov <ekhramtsov@process-one.net>
2011-01-04 15:21:10 +01:00
Badlop
a2e1d2030a
Keep the order of stanzas when BOSH sends several (EJAB-1374)
2010-12-30 13:42:53 +01:00
Evgeniy Khramtsov
4c8b034874
Change c2s state before offline messages resending
2010-12-28 21:09:15 +09:00
Alexey Shchepin
b47c50145d
Make jlib:ip_to_list safe to use
2010-12-20 19:29:05 +02:00
Badlop
b9f4daca46
Revert branch name back to 2.1.x
2010-12-20 13:10:33 +01:00
Evgeniy Khramtsov
606c207e21
Make sure 'closed' event is correctly processed on every state
2010-12-17 17:26:20 +09:00
W. Andrew Loe III
d9c01e8ed9
Ignore OS X libraries.
2010-12-15 17:01:14 +01:00
Badlop
3e9c9fc750
Remove Type and Spec, backport list comprehensions, so R12B-5 can compile
2010-12-13 12:17:28 +01:00
Badlop
fbcb9bb154
Recompile the Guide
2010-12-13 11:15:19 +01:00
Badlop
6242fd2bb8
Update ejabberd version number to 2.1.6
2010-12-13 11:15:18 +01:00
Badlop
1c566057f8
Recompile translations
2010-12-13 11:15:16 +01:00
Badlop
aa59d8f1f0
Add release notes for ejabberd 2.1.6
2010-12-13 11:15:14 +01:00
Badlop
6dd35923b0
Fix warning about unused variables
2010-12-13 11:14:39 +01:00
Badlop
b9bbe19d4c
Option to reject S2S connection if untrusted certificate (EJAB-464)
2010-12-11 02:29:53 +01:00
Badlop
44b2002504
Include From attribute in the stream header of outgoing S2S connections
2010-12-11 02:29:52 +01:00
Badlop
faf422202f
When TLS is required in s2s, add subelement to stream:features starttls
2010-12-11 02:29:50 +01:00
Badlop
eb884c80d0
Add option to require encryption in S2S connections (EJAB-495)
2010-12-11 02:29:48 +01:00
Badlop
b83dd9f954
Support for X-Forwarded-For HTTP header (EJAB-1356)
2010-12-07 16:47:55 +01:00
Christophe Romain
fd828c3e9b
update pubsub_odbc patch
2010-12-07 14:00:40 +01:00
Christophe Romain
79648ce853
add node attribute to pubsub subscribe event (EJAB-1361)
2010-12-07 13:51:10 +01:00
Badlop
ddc94a8c96
Update Czech Translation (thanks to Lukáš Polívka)
2010-12-06 12:04:12 +01:00
Badlop
aa413d63da
Fix detection of mod_last at server start (EJAB-641)
2010-12-03 17:26:12 +01:00
Badlop
548be4cf3d
Update example extauth script with tryregister, removeuser and removeuser3 (EJAB-641)
2010-12-03 17:26:10 +01:00
Pablo Polvorin
0e5b0b43fa
Revert "Fix cyrsasl_digest RFC-2831 2.1.2.1 (EJAB-476)"
...
This reverts commit c890b17834
.
This change made ejabberd more strict in protocol compliance, which breaks Psi 0.14 and other clients.
We must grant a grace period to client developers to fix their clients. So this isn't going to be included
in 2.1.x.
2010-12-03 11:12:43 -03:00
Badlop
8258f5940b
Support PostgreSQL 9.0 (EJAB-1359)(thanks to Stephen Gibberd and Konstantin Nikiforov)
2010-12-03 12:43:05 +01:00
Pablo Polvorin
c890b17834
Fix cyrsasl_digest RFC-2831 2.1.2.1 (EJAB-476)
...
Fix sasl digest bug when username|password|resource strings had
all characters <= U+00FF and at least one character >= U+0080.
Warnning:
Note that by fixing the bug, we may be broking compatibility with clients
that "implements" it.
See comments on https://support.process-one.net/browse/EJAB-476
2010-12-02 12:55:06 -03:00
Christophe Romain
f0a848ef45
fix pubsub cross domain eventing (EJAB-1340)
2010-12-02 13:56:45 +01:00
Badlop
20d66e6736
Update Greek translation (thanks to James Iakovos Mandelis)
2010-12-01 13:28:20 +01:00
Evgeniy Khramtsov
731c9b86e0
Increase maximum restart strategy of the ODBC supervisor. Do not brutally kill ODBC processes on supervisor shutdown to avoid polution of the mnesia table
2010-12-01 14:24:51 +09:00
Badlop
955343f6aa
When the Password attribute is missing in PIEFXIS file, don't check account auth.
2010-12-01 00:55:09 +01:00
Otavio Fernandes
1b73ac5118
Corrections on pt_BR translations.
2010-11-30 22:43:04 +01:00
Badlop
9ee8191939
Update Ukrainian translation (thanks to Ruslan Rakhmanin)
2010-11-30 22:43:02 +01:00
Christopher tofu Zorn
f2231a2282
expose find_connection for routing in other modules (if needed)
2010-11-29 20:05:39 +01:00
Christopher tofu Zorn
3e24408710
add the ability to send raw xml packets over http bind
2010-11-29 20:05:37 +01:00
Badlop
3e67200d64
Update mod_register_web string in PO files
2010-11-29 19:35:18 +01:00
Badlop
6374b5b1e7
Fix characters not allowed in username. Don't include that in translatable string.
...
List mentioned in:
http://xmpp.org/rfcs/rfc3920.html#nodeprep-prohibited
2010-11-29 19:34:26 +01:00
Badlop
26ac75bdc9
Support negative part-hour TZ values (thanks to Alexander Zhukov)(EJAB-1301)
2010-11-29 14:36:09 +01:00
Alexey Shchepin
1d1496a667
Don't loop when there is nothing after a stream start
2010-11-26 17:08:00 +01:00
Andreas Köhler
e34eebb5ad
Correct domain_certfile tlsopts modifications for s2s connections (EJAB-1086)
...
* In ejabberd_s2s_out:wait_for_feature_request/2, the domain to use for
looking up domain_certfile options is #state.myname and not
#state.server
* If s2s_certfile is not specified, connect should still be part of the
tls options used by ejabberd_s2s_out
* Add #state.server to ejabberd_s2s_in processes and store the to
attribute in :wait_for_stream/2. Then use that server in
:wait_for_feature_request/2 to change the tls options like in
ejabberd_s2s_out.
Fixes EJAB-1086.
2010-11-26 00:14:46 +01:00
Badlop
776930fa06
Update French translation (thanks to Nicolas Vérité)
2010-11-25 21:31:21 +01:00
Badlop
38af7c85a6
Update German translation (thanks to Nikolaus Polak)
2010-11-25 21:31:19 +01:00
Badlop
99b7a285d7
Update Japanese translation (thanks to Tsukasa Hamano)
2010-11-24 17:10:54 +01:00
Badlop
19e20f75d7
Update Chinese translation (thanks to Shelley Shyan)
2010-11-24 13:42:19 +01:00
Evgeniy Khramtsov
b8d6aee1ce
Merge branch 'caps' into 2.1.x
...
Conflicts:
src/ejabberd_c2s.erl
2010-11-24 16:45:05 +09:00
Otavio Fernandes
48b768b5b0
Updating Brazilian Portuguese (pt_BR) translations for v2.1.6
2010-11-23 17:54:37 +01:00
Badlop
bd604945c9
Update Polish translation (thanks to Zbyszek Żółkiewski)
2010-11-23 13:07:14 +01:00
Badlop
0a59ebe405
Use pg2 from R14B in systems with older versions (EJAB-1349)
...
pg2_backport.erl is a copy of pg2.erl from Erlang/OTP R14B.
That module is used in ejabberd installations where an OTP
previous to R14 is installed.
2010-11-22 16:04:07 +01:00
Christophe Romain
32eaa01929
Revert "populate pubsub#roster_groups_allowed in node configuration options (EJAB-1344)"
...
This reverts commit dfaeb3bc88
.
2010-11-22 11:15:04 +01:00
Badlop
baf9363bdf
Disapprove the use of R14A and R14B due to the rwlock bug.
2010-11-19 15:33:48 +01:00
Badlop
12aaa0125b
Update Russian translation (thanks to Evgeniy Khramtsov)
2010-11-19 15:15:47 +01:00
Badlop
cb7cd9abb8
Update translate files
2010-11-19 13:47:24 +01:00
Badlop
ca701e1675
Update the Spanish translation
2010-11-19 13:45:32 +01:00
Badlop
9b88fd6646
Fix some English strings
2010-11-19 13:44:30 +01:00
Badlop
76ca7ae7f0
Translate mod_register_web to Ukrainian (thanks to Rain)
2010-11-19 00:23:40 +01:00
Evgeniy Khramtsov
1ab223568d
Document mod_shared_roster_ldap (thanks to Marcin Owsiany)
2010-11-18 16:59:35 +09:00
Badlop
043effc3ce
Translate mod_register_web to Spanish
2010-11-17 23:16:46 +01:00
Badlop
4fd1a8ba63
Translate mod_register_web to Russian (thanks to Rain)
2010-11-17 22:42:43 +01:00
Badlop
36303fb4be
Update strings to translate
2010-11-17 22:36:56 +01:00
Badlop
62357b9589
Add extract_translations.beam to gitignore
2010-11-17 22:35:33 +01:00
Badlop
808029b868
Fix http-bind supervisor to support multiple vhosts (EJAB-1321)
2010-11-17 20:31:28 +01:00
Andreas Köhler
cfd377b98e
Fix R12B5 compatibility in ejabberd_http_bind.erl (EJAB-1343)
...
erlang:max/2 and :min/2 are new functions
2010-11-17 13:01:17 +01:00
Andreas Köhler
6eeb355a22
Use LFrom and LTo consistently in ejabberd_s2s_in:stream_established/2 (EJAB-1342)
2010-11-17 12:57:05 +01:00
Evgeniy Khramtsov
a0e2e943b4
Do not start mod_proxy65 if it is unable to bind an address (EJAB-1336)
2010-11-17 18:13:19 +09:00
Evgeniy Khramtsov
78931d8efa
Use MEDIUMTEXT type for vcard avatars in MySQL schema (EJAB-1252)
2010-11-17 17:36:51 +09:00
Evgeniy Khramtsov
0d2a8cd04f
Do not print full error message when LDAP timeout occurs (EJAB-1324)
2010-11-17 17:14:47 +09:00
Evgeniy Khramtsov
97087eb3b9
Set SSL_MODE_RELEASE_BUFFERS mode when available (EJAB-1351)
2010-11-17 13:54:27 +09:00
Badlop
6eeef62ce4
Provide new, not old, affiliation in kick/ban presence with codes 321 and 301
2010-11-16 00:03:09 +01:00
Evgeniy Khramtsov
0ccff15599
Strip status when needed in presence-unavailable as well
2010-11-15 13:47:31 +09:00
Badlop
325fb8caef
Fix typos in the example configuration file
2010-11-12 21:24:01 +01:00
Andreas Köhler
18ef908759
Before binding tcp ports, checks the socket type and listener options
...
If the callback module has a socket type of independent and needs to
create the listener itself, do not pre-bind the port. The same holds if
there are errors in the listener configuration.
2010-11-10 23:46:18 +01:00
Andreas Köhler
1f1d2bd5f5
Bind listener ports early and start accepting connections later
...
It may happen that auth or rdbms client tcp connections bind a local
socket to a port number required by a configered listener. The ejabberd
applications fails to start up and needs to be restarted.
In plain C you would bind(2) the listener port and listen(2) later on.
gen_tcp:listen/2 does not allow to separate these two steps though, so
another way is not to accept connections while start up. OTOH, the
kernel will syn/ack incoming connections and receive data, leaving them
in a buffer for the ejabberd to read from. If this is unwanted, a load
balancer would need to receive data from the ejabberd server before
adding the node to its pool.
This patch binds tcp ports while initializing the ejabberd_listener
process, storing ListenSockets in an ets table. start_listeners/0 will
reuse these ports later on.
2010-11-10 23:46:16 +01:00
Andreas Köhler
0c484369c9
In mod_last*:get_last_iq/4, check for user resources first to return 0 seconds if there is one
...
Fixes problem 2 of EJAB-1158.
2010-11-10 15:40:04 +01:00
Andreas Köhler
100f2e9a13
Refactor mod_last to use the same core get_last/2 functionality, but keep api stable
...
The local function get_last/4 has been renamed to get_last_iq/4, since
it converts the result of get_last/2 (typically {ok, TimeStamp, Status})
to an iq packet.
2010-11-10 15:40:03 +01:00
Andreas Köhler
510fd8cf73
Before forwarding last activity requests to a user, check that the user's presence is visible for From
...
According to XEP-0012, 4. Online User Query, "if the requesting entity
is not authorized to view the user's presence information (normally via
a presence subscription as defined in XMPP IM), the user's server MUST
NOT deliver the IQ-get to an available resource but instead MUST return
a <forbidden/> error in response to the last activity request."
So check for a subscription of from of the jid and bare jid and whether
outgoing presences to From are allowed.
Fixes problem 3 of EJAB-1158.
2010-11-10 15:40:01 +01:00
Andreas Köhler
080922a3de
Remove dead code for NS_VCARD iq packets from ejabberd_c2s
...
For EJAB-1045, the special NS_VCARD block for handling incoming vcard
iqs on behalf of clients has already been restricted to cases where the
user or resource part of the recipient is empty. But then the packets
should not have been routed to the c2s process anyway. This patch
completely removes it.
2010-11-10 15:40:00 +01:00
Andreas Köhler
cb7d8c8ead
Use ejabberd_c2s:privacy_check_packet/5 for all those hook folded runs in the c2s module
2010-11-10 15:39:59 +01:00
Andreas Köhler
c47252aea1
Use c2s state data as user and server in ejabberd_c2s:is_privacy_allow
...
is_privacy_allow is only used in ejabberd_c2s:handle_info/3 to determine
for a few presence types whether the packet is allowed to be forwarded
to the user's client. This only makes sense if To#jid.user and
To#jid.server match StateData#state.user and StateData#state.server.
Also, add the atom in as parameter to a new argument Dir of
is_privacy_allow and extract from that function
privacy_check_packet(StateData, From, To, Packet, Dir) which runs the
privavcy check without converting allow/deny to true/false.
2010-11-10 15:39:57 +01:00
Andreas Köhler
f96074057c
Correct error responses of forbidden offline last activity queries
...
According to XEP-0012 Last Activity, the server must return iq errors
with forbidden instead of not-allowed.
Fixes problem 1 of EJAB-1158.
2010-11-10 15:39:55 +01:00
Christophe Romain
dfaeb3bc88
populate pubsub#roster_groups_allowed in node configuration options (thanks to Karim Gemayel)(EJAB-1344)
2010-11-10 15:15:03 +01:00
Christophe Romain
c31f59e326
fix bad plugin order issue injected in previous patch (EJAB-1286)
2010-11-09 14:32:40 +01:00
Andreas Köhler
7c2b9eaf97
Correct privacy check direction in mod_last (EJAB-1339)
...
The change for EJAB-1271 to change the direction of the privacy check
from out to in violates the idea that the check should imitate a
subscription state check of from. Rather correct the order of the From
and To parameters.
2010-11-09 13:57:57 +01:00
Andreas Köhler
79f5251d69
Change max restart strategy of ejabberd_odbc_sup to handle some SQL timeouts.
2010-11-08 18:41:03 +01:00
Christophe Romain
917e8640c2
avoid node_call to break transaction (thanks to Karim Gemayel)(EJAB-1286)
2010-11-08 11:16:51 +01:00
Andreas Köhler
c4bc0e7252
Re-raise exceptions caught in gen_mod:start_module/3 (EJAB-1335)
...
Modules configured by the administrator normally should not be treated
as optional, so a exception (error, exit, throw) to start them should not
be caught and logged only.
This patch re-raises a caught exception instead of ignoring the
exception and inserting the module's opts on success. That way
gen_mod:get_module_opt/4 should work while calling Module:start/2.
2010-11-07 00:49:52 +01:00
Evgeniy Khramtsov
1f16e4783c
Take care of xml:lang attribute in unauthenticated stanzas as well
2010-11-06 13:58:52 +09:00
Badlop
7f3a5066c6
New ip_access option restricts which IPs can register (thanks to Alexey Shchepin)(EJAB-915)
2010-11-05 19:33:52 +01:00
Badlop
6f3713a67d
Disable mod_register_web in default config because by default captcha is disabled
2010-11-05 19:33:50 +01:00
Badlop
abfb4a2841
Recompile the Guide
2010-11-05 18:21:20 +01:00
Badlop
f672fd0824
Added mod_register_web: web page for account registration (EJAB-471)
2010-11-05 18:19:52 +01:00
Evgeniy Khramtsov
60b36beda8
Disable LRU caching algorithm for LDAP shared rosters
2010-11-05 17:01:18 +09:00
Evgeniy Khramtsov
c4289095e0
Do not store long language tag to avoid possible DoS/flood attacks
2010-11-05 05:10:18 +09:00
Evgeniy Khramtsov
31757116fc
LDAP shared roster support (thanks to Realloc and Marcin Owsiany)
2010-11-05 02:34:45 +09:00
Jonas Ådahl
2f68733708
Fixes a leak of ejabberd_receiver processes.
...
When a (non-frontend) socket module without any custom receiver fails to
start, the newly created ejabberd_receiver process needs to be properly
closed.
2010-11-03 17:10:52 +01:00
Badlop
dccaff0544
Correct in the Guide the default mod_irc encoding
...
The default option value was last changed in EJAB-302,
but the Guide was not properly updated yet.
2010-11-02 22:47:28 +01:00
Badlop
184ec38510
Implement the mod_irc option default_encoding, it was already documented
...
Related:
http://www.ejabberd.im/node/4270#comment-56609
http://www.ejabberd.im/node/4270#comment-56780
2010-11-02 22:40:08 +01:00
Badlop
2d59efb515
Fix crash in ejabberd_c2s when blacklist hook returned true (thanks to Jonas Ådahl)
...
Cause of the crash jlib:ip_to_list/1 only supports IP tuples using the
form {N1,N2,N3,N4} which is not the case when IPv6 is enabled.
2010-11-02 13:51:36 +01:00
Evgeniy Khramtsov
195d22d906
Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x
2010-11-01 22:23:01 +09:00
Evgeniy Khramtsov
ab80513755
Do not run set_last request inside a transaction
2010-11-01 22:22:41 +09:00
Badlop
8a116411bb
Fix errors in EDoc comments
2010-10-28 18:48:27 +02:00
Badlop
bd3889b6ec
Include a Required xml element in the captcha field
2010-10-27 00:50:17 +02:00
Andreas Köhler
400fb69f15
Ignore Length argument to tls:recv/[23] (EJAB-1327)
...
The Length argument cannot be used for gen_tcp:recv/3, because the
compressed size does not equal the desired uncompressed one.
2010-10-26 19:32:15 +02:00
Andreas Köhler
9da45d40c7
Re-use the TLSSock argument in tls:send/2 (EJAB-1327)
2010-10-26 19:30:32 +02:00
Evgeniy Khramtsov
23db206ea1
* Add top-level instructions for x:data incompatible clients
...
* Remove trailing dot
2010-10-26 03:47:14 +10:00
Badlop
964b7b6b67
Changes in registration form to workaround client problems (EJAB-1262)
...
Changes included:
* Remove var in fixed field because Gajim and Tkabber display it to user
* Add workaround for Psi's overlap fields
* Add var=url attribute, required by Psi to display the field
* Provide the image URL as a copy-able form field
2010-10-25 19:00:52 +02:00
Badlop
9c5f34794a
Workaround for Psi's wrong Type in form submission
2010-10-25 18:58:31 +02:00
Badlop
eca7588abf
Recompile the guide.html
2010-10-25 18:57:54 +02:00
Badlop
a15d583d4d
Add CAPTCHA example configurations to cfg (EJAB-1262)(EJAB-1326)
2010-10-25 18:57:39 +02:00
Evgeniy Khramtsov
e03c453c78
Provide image url in registration form when captcha is enabled
2010-10-25 23:36:31 +10:00
Evgeniy Khramtsov
641dc7d695
Add password entropy check (EJAB-1326)
2010-10-24 17:17:30 +10:00
Evgeniy Khramtsov
0a1b0498a6
* Rename option captcha to captcha_protected for consistency.
...
* Document captcha_protected option
2010-10-24 15:45:42 +10:00
Evgeniy Khramtsov
a6858a6ce4
Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x
2010-10-24 15:30:37 +10:00
Evgeniy Khramtsov
f4beeb1706
CAPTCHA IBR support (EJAB-1262)
2010-10-24 15:30:16 +10:00
Badlop
75298b4c27
Improve example of outoging_s2s_options
2010-10-22 23:14:24 +02:00
Christophe Romain
011464e6ac
improve documentation (thanks to Karim Gemayel)
2010-10-21 11:14:24 +02:00
Peter Lemenkov
c53e8012b2
Change directory before any operation to one readable by INSTALLUSER (EJAB-1322)
...
This is required in order to suppress error messages like
"File operation error: eacces" when ejabberd was started from directory,
which is not readable by INSTALLUSER (/root, for example). See rhbz #564686 :
https://bugzilla.redhat.com/564686
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2010-10-19 01:05:31 +02:00
Badlop
fe04d57284
Fix bug in mod_pubsub in_subscription return value
2010-10-19 00:26:36 +02:00
Christophe Romain
0f3bd782c4
documentation update (thanks to Karim Gemayel)
2010-10-18 16:53:21 +02:00
Badlop
91cf9194d8
When privacy list denies local user's outgoing stanza, try to return error (EJAB-1320)
...
See:
http://xmpp.org/extensions/xep-0016.html#example-51
Example 51. Error: contact is blocked
2010-10-16 22:53:12 +02:00
Badlop
e2dbad6242
Check privacy of outgoing IQ stanzas (EJAB-1320)
2010-10-16 22:53:10 +02:00
Badlop
84d4a1619b
Check privacy of incoming IQ stanzas (EJAB-1320)
2010-10-16 22:53:08 +02:00
Badlop
16fae4d117
Add support to ejabberd_ctl to handle anonymous command arguments
2010-10-15 21:53:03 +02:00
Badlop
76f7548935
Rename aclocal.m4 to acinclude.m4 (thanks to Andreas Köhler)
...
Also fixed minor typos, added the compiled aclocal.m4 to gitignore.
As the 2.1.x branch includes the 'configure' script, it isn't needed
to document here how to build it, only in the master branch.
Related documentation:
http://www.gnu.org/software/hello/manual/automake/Local-Macros.html#Local-Macros
http://www.gnu.org/software/hello/manual/automake/Invoking-aclocal.html#Invoking-aclocal
2010-10-15 16:29:47 +02:00
Badlop
2d08dcf11a
Fix errors detected by Dialyzer
2010-10-15 13:17:32 +02:00
Badlop
7af47b9dbe
Document ejabberd_loglevel using EDoc (EJAB-225)
2010-10-15 13:17:19 +02:00
Andreas Köhler
437da38342
Fix unused variable warning in ejabberd_loglevel
2010-10-15 13:15:52 +02:00
Andreas Köhler
801ee586b7
Add set_custom/2, clear_custom/0 and clear_custom/1 to ejabberd_loglevel
2010-10-15 13:15:50 +02:00
Andreas Köhler
6ff3fda14b
Document new loglevel configuration form.
2010-10-15 13:15:49 +02:00
Andreas Köhler
cfca2b502a
Add support for changing the loglevels for given modules (EJAB-225)
...
ejabberd_loglevel:set/1 now understands more input formats:
set(Param) -> {module, ejabberd_logger}
Param = Level | {Level, CustomLevels}
CustomLevels = [CustomLevel]
CustomLevel = {Module, Level}
Module = atom()
Level = integer() | atom()
set(Level) is equivalent to set({Level, []}), so it clears all module
level customizations. log_src/2 adds additional function heads for those
_msg function and module combinations that need non-default behavior,
i.e. add or filter logging.
ejabberd_loglevel:get/0 only returns the default log level. To retrieve
the complete setting use ejabberd_logger:get/0 instead.
2010-10-15 13:15:48 +02:00
Andreas Köhler
e1a4ae8264
Use warning_msg event type for warning log level.
2010-10-15 13:15:46 +02:00
Andreas Köhler
19826858a4
Add warning message and report handlers to ejabberd_logger_h.erl.
2010-10-15 13:15:45 +02:00
Andreas Köhler
0c2677bc50
Improve ejabberd_logger code generation
...
Split the monolithic function ejabberd_loglevel:ejabberd_logger_src/1
into separate functions returning deep lists.
log_src/2 now returns the code for any of *_msg/4. Its parameters are
the current loglevel (integer()) and a loglevel specification
(#loglevel{}), with added information in #loglevel:
- function: The api function enabled by this level, may be no_log
- event_type: The type of the event sent to the error_logger
- msg_prefix: One character used in the message (one of "DIWEC")
If the current loglevel is too low for logging, the api function is
optimized at compile time.
2010-10-15 13:15:44 +02:00
Andreas Köhler
d1c1902687
Use records for encoding static loglevel information.
2010-10-15 13:15:42 +02:00
Badlop
a5230c46c2
Speed up ejabberd_s2s:is_service/2, allow_host/2 (thanks to Andreas Köhler)(EJAB-1319)
...
Iterating through the list of possible parent domains of a given domain
and comparing with the list of hosts or routes is almost always faster
than doing it the other way around. It naturally returns the shortest or
longest parent domain satisfying a predicate, whereas the possibly long
list compared with would need to be sorted by length first.
2010-10-14 21:15:40 +02:00
Badlop
95ce77f80d
Include a gitignore file in the ejabberd git repository (EJAB-1312)
2010-10-14 19:53:31 +02:00
Christophe Romain
a93f4f7750
make http-bind restartable (thanks to Andreas Köhler)(EJAB-1318)
2010-10-13 10:54:12 +02:00
Evgeniy Khramtsov
ac87749d55
add find_s2s_bridge hook
2010-10-11 18:40:57 +10:00
Evgeniy Khramtsov
50b747041f
use one_queue IQ discipline by default
2010-10-05 21:28:45 +10:00
Evgeniy Khramtsov
36df8c9035
implement lifetime for broken hashes
2010-10-05 21:27:28 +10:00
Evgeniy Khramtsov
58a5ed9cdc
change caps hook name
2010-10-03 16:04:29 +10:00
Evgeniy Khramtsov
5ea909885e
call caps hook when caps is changed
2010-10-03 16:02:50 +10:00
Evgeniy Khramtsov
1f2c9b7971
fixes typo in stop_connection/1
2010-09-28 14:20:02 +10:00
Evgeniy Khramtsov
c13940e1de
new CAPS processing
2010-09-28 14:18:57 +10:00
Evgeniy Khramtsov
8e5297f4c3
fixes default value for cache_life_time
2010-09-21 04:31:18 +10:00
Andreas Köhler
3278f019cb
Add missing needdb check in mod_privacy, to enable blocking by group and subscription again.
2010-09-17 18:48:45 +02:00
Andreas Köhler
e2c3925b7d
Discard unmatched INFO messages in ejabberd services.
...
This patch will stop services terminating with function clause messages,
but doesn't affect the message queue at all.
2010-09-17 18:48:43 +02:00
Badlop
8a0ccfc401
Support timezone West of UTC (thanks to Edwin Fine)(EJAB-1301)
2010-09-13 12:06:13 +02:00
Evgeniy Khramtsov
c29b2fda99
cache lifetime should be converted in microseconds
2010-09-08 02:33:49 +10:00
Evgeniy Khramtsov
c75b7b2b12
Implemented dirty (non-atomic) functions; added copyright notice
2010-08-31 18:06:02 +10:00
Badlop
c754c91ad1
Add IPv6 support to mod_irc (thanks to Matthias Schiffer)(EJAB-1298)
2010-08-30 23:25:02 +02:00
Evgeniy Khramtsov
6952324509
implemented backend-independed key-value cacheing table; applied to mod_caps.erl first
2010-08-30 14:02:47 +10:00
Badlop
4b5ef8f2ce
Add mod_pubsub_odbc to list of ODBC modules (EJAB-1293)
2010-08-21 18:56:01 +02:00
Badlop
d87fff1a4c
Bugfix http-poll for correctly parsing binary (thanks to Peter Lemenkov)
2010-08-19 17:38:38 +02:00
Evgeniy Khramtsov
3024bb0cbf
fixes ampersand escaping (EJAB-1258)
2010-08-19 16:28:31 +10:00
Evgeniy Khramtsov
f8dd973373
fixes typo for table copy
2010-08-10 19:42:22 +10:00
Badlop
972440c2ca
When user joins non-anonymous room, warn also in presence stanza (EJAB-310)
2010-08-07 20:48:36 +02:00
Badlop
b14899d41a
Update the 'configure' script
2010-08-07 19:42:56 +02:00
Evgeniy Khramtsov
d2d8a09b4a
Make MD2 autodetected (EJAB-1285)
2010-08-07 22:04:57 +10:00
Evgeniy Khramtsov
1ea09b09a2
Make xml.c correctly compiles on R14A (EJAB-1288)
2010-08-07 21:06:50 +10:00
Badlop
071c0a1afe
Go back to the 2.1.x branch name
2010-08-05 20:39:55 +02:00
Badlop
4ed00c3d1f
Fix detection of Erlang R11 and older (thanks to Mathias Ertl)(EJAB-1287)
2010-08-05 20:27:12 +02:00
Evgeniy Khramtsov
c9ff370278
Loading ASN.1 driver explicitly to avoid races in LDAP (EJAB-1284)
2010-08-04 19:23:52 +10:00
Badlop
8ab8da82c4
Update ejabberd version number to 2.1.5
2010-08-02 17:38:36 +02:00
Badlop
4b6a42f539
New 2.1.5 release notes
2010-08-02 17:33:16 +02:00
Christophe Romain
8a251ccafe
enforce disco features results (thanks to Karim)(EJAB-1033, EJAB-1228, EJAB-1238)
2010-08-02 17:07:23 +02:00
Badlop
550363cd52
Support parallel extauth script (thanks to Jesse Thompson)(EJAB-1280)
2010-07-30 20:33:03 +02:00
Badlop
367353100b
Don't say v1.2, because that number is never increased and is confusing
2010-07-28 19:59:39 +02:00
Badlop
5113d28bb4
Return Registered element when account exists (thanks to PioneerMike)
2010-07-28 19:32:42 +02:00
Badlop
c8df607173
Fix typo (thanks to Evgeniy Khramtsov)
2010-07-23 00:38:15 +02:00
Badlop
c8033833f9
When logging s2s out connection attempt or success, log if TLS is used
2010-07-23 00:25:43 +02:00
Badlop
cf4f0dbe6d
The command Update now returns meaningful message and exit-status (EJAB-1237)
2010-07-22 16:32:55 +02:00
Evgeniy Khramtsov
8c4884d665
Use driver allocators in iconv_erl.c for reflecting memory in erlang:memory(system)
2010-07-20 15:28:22 +10:00
Evgeniy Khramtsov
26f6eebaa9
Use driver allocators in ejabberd_zlib_drv.c for reflecting memory in erlang:memory(system)
2010-07-20 14:57:23 +10:00
Badlop
ac84267b22
Describe what a user gets when he hits the registration_timeout limit
2010-07-19 12:08:02 +02:00
Evgeniy Khramtsov
5030f35558
correct handling of SQL boolean types (EJAB-1275)
2010-07-14 21:23:21 +10:00
Evgeniy Khramtsov
d7930d7f82
Use driver allocators in expat for reflecting memory in erlang:memory(system)
2010-07-14 14:19:16 +10:00
Badlop
42ddc297fe
Fix my flock change from last friday
2010-07-12 18:53:16 +02:00
Badlop
e82db8cc7f
Remove ejabberd_debug because p1_prof provides similar and better features
2010-07-12 16:02:52 +02:00
Badlop
10d43c7cc6
Only compile and install p1_prof when: make debugtools=true
2010-07-12 16:02:41 +02:00
Badlop
d539fd28c1
Recompile the 'configure' script
2010-07-12 15:18:15 +02:00
Badlop
12e00c57f9
When using OTP R14, use public_key library instead of old ssl (EJAB-953)
2010-07-12 13:57:07 +02:00
Badlop
0c95cf7e61
Mention missing modules in the overview table
2010-07-11 12:14:23 +02:00
Badlop
d106f741d9
Some systems delete the lock dir; in such case don't use flock at all
2010-07-09 22:39:13 +02:00
Evgeniy Khramtsov
6c96157d1b
Added functions to collect statistics about queues, memory, reductions etc. Several cleanups
2010-07-10 01:36:12 +10:00
Evgeniy Khramtsov
a42a012f94
Added new ejabberd profiler
2010-07-05 13:43:44 +10:00
Badlop
7e90d6cf92
Fix print of command result that contains ~ (thanks to Tsukasa Hamano)
2010-07-03 00:42:54 +02:00
Badlop
e19ac27803
Show some more room options in the log file
2010-07-02 15:19:54 +02:00
Badlop
c100cbedd1
Document the mod_muc option captcha_protected
2010-07-02 13:08:33 +02:00
Evgeniy Khramtsov
4c2e7e38a1
Use ets insead of asking supervisor in ejabberd_odbc_sup:get_pids/1 (Thanks to Alexey Shchepin)
2010-07-02 20:31:42 +10:00
Badlop
fa22b23435
Recompile the Guide and Configure
2010-07-01 17:03:36 +02:00
Badlop
c3c23a04f6
Requirement of OpenSSL increased from 0.9.6 to 0.9.8
2010-07-01 17:01:13 +02:00
Badlop
ae6545989e
Fix typo in --enable-transient_supervisors
2010-07-01 16:59:26 +02:00
Badlop
baeb3d076e
Document the optional --enable-nif
2010-07-01 16:57:47 +02:00
Badlop
0ac5684bf0
Clarify that to use the optional --enable-nif, R13B04 is needed.
2010-07-01 16:51:26 +02:00
Evgeniy Khramtsov
715cc5ea3b
New configure option: --enable-nif
2010-07-01 20:54:01 +10:00
Badlop
d9e2931ed9
Fix privacy check when serving local Last (thanks to Brian Acton)(EJAB-1271)
2010-06-29 11:58:05 +02:00
Badlop
1531541331
Fix problem when FIREWALL_WINDOW options for erl kernel were used
...
http://www.ejabberd.im/node/4120
2010-06-28 13:17:55 +02:00
Badlop
b7e02cc42e
Inform client that SSL session caching is disabled (thanks to Pawel Chmielowski)
2010-06-25 18:33:49 +02:00
Badlop
3ab90c9d3a
Don't ask for client certificate when using tls (EJAB-1267)
2010-06-25 18:33:46 +02:00
Badlop
1b7948f50a
OpenSSL is required, not optional
2010-06-25 16:56:44 +02:00
Badlop
fe23dbd76e
When account is deleted, delete also member of stored shared rosters.
2010-06-24 00:02:16 +02:00
Evgeniy Khramtsov
21d2f4efab
now admins are able to see private rooms in disco (EJAB-1269)
2010-06-23 17:44:35 +10:00
Evgeniy Khramtsov
f66f049ef3
Added support for all hash functions required by XEP-0115
2010-06-22 03:10:41 +10:00
Evgeniy Khramtsov
49dd83e731
Added md2/1 support
2010-06-22 02:56:34 +10:00
Evgeniy Khramtsov
9cd2d5e0cf
New OpenSSL functions wrapper: sha224/1, sha256/1, sha384/1, sha512/1
2010-06-22 02:30:16 +10:00
Badlop
fab705dc13
Rebuilt the configure script with: autoconf
2010-06-16 16:05:45 +02:00
Peter Lemenkov
a84f8bc9ef
Pass correct version to autoreconf
...
It seems that AC_INIT macro is wrongly initialized. See this link
for explanation of a particular AC_INIT variables:
http://www.gnu.org/software/autoconf/manual/html_node/Initializing-configure.html
Briefly, AC_INIT macro should be populated with the following data:
AC_INIT (package, version, [bug-report], [tarname], [url])
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2010-06-16 16:05:07 +02:00
Peter Lemenkov
2477b735bf
Install COPYING file along with other docs
...
It's a generally good idea to provide file with licensing terms.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2010-06-16 16:05:07 +02:00
Peter Lemenkov
8db328af60
Install dev.html, and guide.pdf if it exists
...
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2010-06-16 16:05:07 +02:00
Christophe Romain
bc2280be70
remove outdated and useless file, use ejabberdctl.template instead
2010-06-16 12:20:08 +02:00
Badlop
a28aaa1fdd
Log error when HTTP request has ambiguous Host header (EJAB-1261)
2010-06-16 11:33:17 +02:00
Badlop
afa0f4d403
Fix for Erlang R12, that doesn't support: true andalso ok
2010-06-15 22:59:53 +02:00
Jerome Sautret
0e5b930b22
Discard queued requests that are too old (the caller has already got a timeout).
2010-06-11 16:35:45 +02:00
Badlop
7d8f8a7e99
Explain that 2 LDAP connections are established per vhost
2010-06-10 13:58:55 +02:00
Badlop
a7924adee9
Fix typo in update_list command (EJAB-1237)
2010-06-07 15:58:16 +02:00
Badlop
d4ec7a2f01
New optional BOSH connection attribute process-delay (EJAB-1257)
2010-06-07 13:44:55 +02:00
Badlop
e0fab19345
Revert version number from 2.1.4 tag to 2.1.x branch
2010-06-04 11:26:42 +02:00
Evgeniy Khramtsov
4646a5dbb8
fixes wrong SQL escaping when --enable-full-xml is set
2010-06-04 13:31:34 +10:00
Badlop
1567592ac7
Update ejabberd version number to 2.1.4
2010-06-02 18:48:55 +02:00
Badlop
3b735c269c
Remove duplicate item in release notes
2010-06-02 18:23:19 +02:00
Badlop
5bdef05f12
Add release notes for ejabberd 2.1.4
2010-06-02 17:33:35 +02:00
Badlop
077626c40a
Clarify in the Guide that mssql configuration is similar to odbc
2010-06-02 17:10:48 +02:00
Christophe Romain
c544384c83
sync last changes in pubsub_odbc patch
2010-06-02 16:46:02 +02:00
Christophe Romain
d56522c8a0
final fix on created node notification (EJAB-1225)
2010-06-02 14:37:18 +02:00
Badlop
b83e77ca21
Update the Norwegian translation (thanks to Stian B. Barmen)
2010-06-01 19:44:27 +02:00
Badlop
361400691d
Recommend Erlang/OTP R12B-5 and R13B04
2010-06-01 15:45:00 +02:00
Badlop
ba9247c530
Update the Slovak translation (thanks to Marek Bečka)
2010-05-31 00:27:58 +02:00
Badlop
91d22109c8
Update the Czech translation (thanks to Lukáš Polívka)
2010-05-28 18:46:08 +02:00
Badlop
cb702a770d
Update the Russian translation (thanks to Evgeniy Khramtsov)
2010-05-28 18:46:06 +02:00
Christophe Romain
db059bdfaf
fix error code when unsubscribing from a non-existent ODBC node (EJAB-1227)
2010-05-28 13:42:35 +02:00
Christophe Romain
2291a6afea
fix error code when unsubscribing from a non-existent node (thanks to Karim Gemayel)(EJAB-1227)
2010-05-28 13:37:20 +02:00
Christophe Romain
af7fe0c21e
send created node notifications (EJAB-1225)
2010-05-28 13:34:05 +02:00
Christophe Romain
7ce3291603
fix jlib calls from previous patch
2010-05-28 12:33:11 +02:00
Christophe Romain
07e870271e
make last_item_cache feature cluster aware (EJAB-1234)
2010-05-28 11:56:09 +02:00
Badlop
a5f8aeb6da
Handle error response from auth modules (thanks to Eric Liang)
2010-05-28 01:36:19 +02:00
Badlop
1777ecd15a
Makefile with optional ejabberd_debug.erl compilation (EJAB-1242)
...
Only compile and install ejabberd_debug.erl when running:
make ejabberd_debug=true
2010-05-28 00:51:25 +02:00
Christopher tofu Zorn
d4d45f3a50
remove the silly loop that isnt needed, this speeds up all requests by 100 milliseconds. Clean up prepare response function and add two new functions to handle out going payloads based of whether its a new session or not.
2010-05-27 21:21:17 +02:00
Badlop
9900be3d68
Update the Portuguese Brazil translation (thanks to Otávio Fernandes)
2010-05-26 19:53:32 +02:00
Badlop
b88372c313
Update the Ukrainian translation (thanks to Konstantin Khomoutov)
2010-05-26 19:53:29 +02:00
Badlop
e4aab7f749
Add created_at column also to PostgreSQL schema (thanks to Mathias Ertl)(EJAB-1240)
2010-05-26 16:13:45 +02:00
Badlop
42cbd0c1c4
Update the Catalan translation (thanks to Jan Kusanagi)
2010-05-25 20:11:16 +02:00
Badlop
9318678e08
Mix the commands update_all/0 and update_module/1 into update/1 (EJAB-1237)
2010-05-25 20:01:04 +02:00
Badlop
bd992bcb87
Update the Italian translation (thanks to Luca Brivio)
2010-05-25 12:18:16 +02:00
Badlop
01d2bcfd92
Update the Greek translation (thanks to James Iakovos Mandelis)
2010-05-24 20:44:23 +02:00
Badlop
0bfda4e628
New ejabberd commands to update modified modules (EJAB-1237)
2010-05-24 13:58:11 +02:00
Badlop
a2f659a2c6
Only log when script errors are found
2010-05-24 13:58:10 +02:00
Badlop
9a04a60c7d
Update the Polish translation (thanks to Zbyszek Żółkiewski)
2010-05-24 13:34:54 +02:00
Badlop
7238ab6f05
Update the Dutch translation (thanks to Andreas van Cranenburgh)
2010-05-24 11:10:41 +02:00
Badlop
dd954ef1c2
Update the Esperanto translation (thanks to Andreas van Cranenburgh)
2010-05-24 11:10:30 +02:00
Badlop
f1b8853339
Update the German translation (thanks to Nikolaus Polak)
2010-05-23 16:21:44 +02:00
Badlop
479a2adaae
Recompile Japanese translation
2010-05-23 02:30:30 +02:00
Tsukasa Hamano
dd3c939025
update ja.po
2010-05-23 02:30:21 +02:00
Badlop
767e7d65ef
Update the French translation (thanks to Nicolas Vérité)
2010-05-23 02:29:44 +02:00
Badlop
5feb20afd0
Update the Chinese translation (thanks to Shelley Shyan)
2010-05-23 02:28:57 +02:00
Badlop
9038bbd3e7
Update the Spanish translation
2010-05-23 02:28:26 +02:00
Badlop
506fbbe7f7
Update translations
2010-05-20 21:12:36 +02:00
Christopher tofu Zorn
08f1f55e0c
typo on exported function
2010-05-20 20:45:37 +02:00
Christopher tofu Zorn
5ea9a0ddb7
expose more functions so developers can implement prebinding methods
2010-05-20 20:32:07 +02:00
Christophe Romain
d4e0fab06b
fix EJAB-1233 on pubsub_odbc patch
2010-05-19 11:05:02 +02:00
Christophe Romain
217aaf78f9
prevent orphaned pubsub node (EJAB-1233)
2010-05-19 10:47:47 +02:00
Badlop
2ee788e0bf
Fix English typos
2010-05-17 11:54:22 +02:00
Christophe Romain
f0f4b2719c
sync pubsub_odbc with latest code
2010-05-12 13:54:44 +02:00
Christophe Romain
406a31c8be
Enforce pubsub#show_values subscription option (EJAB-1096)(thanks to Karim Gemayel)
2010-05-12 13:45:56 +02:00
Badlop
c32332898b
Show HTTP auth username and IP address in logs, not the password (EJAB-1231)
2010-05-12 10:27:47 +02:00
Badlop
4bbf6684b4
Don't show HTTP request in logs, because reveals password (EJAB-1231)
2010-05-10 23:23:31 +02:00
Badlop
9476d8a2c3
Optionally cache extauth users in mnesia (EJAB-641)
2010-05-10 16:42:54 +02:00
Badlop
6ac46c6171
Fix EDoc comment
2010-05-10 16:12:48 +02:00
Badlop
6ae8b9c4d6
Use a standard method to get a random seed (EJAB-1229)
2010-05-10 15:38:38 +02:00
Badlop
39119192a1
New option pam_userinfotype to provide username or JID (EJAB-652)
2010-05-10 15:14:49 +02:00
Badlop
25e4038623
Recompile the guide
2010-05-10 15:11:40 +02:00
Evgeniy Khramtsov
f58d03c12e
new option ldap_tls_verify is added (EJAB-1229)
2010-05-10 19:37:37 +10:00
Evgeniy Khramtsov
58590cf08d
full support for XEP-0115 v1.5 (EJAB-1223) (EJAB-1189)
2010-05-08 02:32:57 +10:00
Christopher tofu Zorn
cce57310b0
Change max inactivity from 30 to 120 seconds
2010-05-06 20:52:40 +02:00
Christopher tofu Zorn
516d369174
Use dirty_delete when removing the session.
...
There is no need for a transaction and has less overhead
2010-05-06 20:52:36 +02:00
Christophe Romain
7fc1207661
enforce pubsub#presence_based_delivery (EJAB-1221) (thanks to Karim Gemayel)
2010-05-05 15:42:49 +02:00
Badlop
951808658d
Indicate explicitly what nodes are handled by mod_configure
2010-05-04 11:37:44 +02:00
Badlop
cd9e1621f9
Add xml default content type (thanks to Aaron Winborn)(EJAB-1214)
2010-04-28 20:06:27 +02:00
Badlop
650966ce2c
Minor fixes in listeners options list
2010-04-28 20:06:27 +02:00
Badlop
2a99af8cce
Rename some JEP references to XEP
2010-04-28 20:06:27 +02:00
Badlop
3ba0061ada
Reduce verbosity of log when captcha_cmd is checked but not configured.
2010-04-28 20:06:27 +02:00
Badlop
705c5b4c1c
New Access rule webadmin_view for read-only (thanks to Oleg Palij)(EJAB-213)
2010-04-27 23:27:44 +02:00
Badlop
6ae1f62469
Don't store blocked messages in offline queue (thanks to Brian Acton)(EJAB-1224)
2010-04-27 13:30:00 +02:00
Badlop
1c00a9713d
Automatic vcard avatar addition in presence (thanks to Igor Goryachev)(EJAB-208)
2010-04-27 12:33:56 +02:00
Badlop
5e7d8868c0
No need to handle IQ requests other than Get and Set
2010-04-22 20:19:42 +02:00
Emilio Bustos
55dbdf5dba
Fixed Bugs handling Service Discovery to contacts.
...
Resolves [#EJAB-1207]
2010-04-22 10:29:20 -03:00
Badlop
2ff291899d
Don't send error stanza as reply to error stanza (EJAB-930)
2010-04-20 20:31:42 +02:00
Badlop
2d375e0429
Recompile the Guide
2010-04-19 15:22:10 +02:00
Evgeniy Khramtsov
4669ae0a81
added notes about LDAP password change
2010-04-19 23:05:48 +10:00
Evgeniy Khramtsov
c2362db03d
allow inband password change (EJAB-199)
2010-04-19 20:57:24 +10:00
Evgeniy Khramtsov
1405e9d375
LDAP extensible match support (EJAB-722)
2010-04-19 14:08:00 +10:00
Pablo Polvorin
84c4d75735
Remove warning for undefined print_state/1 function for p1_fsm processes (thanks Badlop).
...
Include a identity function as implementation of print_state/1.
2010-04-09 14:25:00 -03:00
Pablo Polvorin
41aa693896
Allow customizing the StateData in p1_fsm before error reporting.
...
A new callback is introduced on the p1_fsm behaviour:
print_error/1
If the module implements this function, it will be invoked
in case of process crash with the current state data *before*
printing the error in the log. The function must return the
desired State to print.
It is used in ejabberd_c2s to prune the presence sets that
can be large. Instead, the state is changed to include only
the # of elements on each set.
Change inspired in comming changes to gen_server on OTP, and
b01d15abc3 (diff-0)
2010-03-30 16:39:34 -03:00
Badlop
44b282474a
Fix indentation (EJAB-1038)
2010-03-29 20:51:24 +02:00
Badlop
70cfcb1008
Fix crash in number of occupants; other minor changes (EJAB-1038)
2010-03-29 20:51:04 +02:00
Badlop
fa28c8baf6
Refactor code to reduce calls to get_affiliation and get_role (thanks to Steam)(EJAB-1038)
2010-03-29 20:49:52 +02:00
Evgeniy Khramtsov
584fa98564
- pass jid into feature_check_packet hook;
...
- bounce messages when closing c2s session;
- implemented treap:to_list/1 and treap:from_list/1
2010-03-17 23:40:48 +09:00
Mickael Remond
214c62bf9c
Move HTTP session timeout log from warning level to info. Timeout can be generated when user close the browser for example.
2010-03-15 11:42:11 +01:00
Badlop
962b66b099
Update ejabberd version number to 2.1.3
2010-03-12 10:21:32 +01:00
Badlop
417cf11bdd
Add 2.1.3 release notes
2010-03-11 20:50:26 +01:00
Christophe Romain
b3da1c7d86
improve remove_user (EJAB-1172)
2010-03-11 16:00:42 +01:00
Evgeniy Khramtsov
839b406903
don't route PEP error messsages to a client
2010-03-09 14:03:27 +09:00
Peter Lemenkov
95e085beb7
More compliance with LSB
...
The init-script shall return 4 in case then user doesn't have sufficient privileges for action.
See http://refspecs.freestandards.org/LSB_3.2.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2010-03-08 21:16:18 +01:00
Christophe Romain
df63fcd353
typo fix on previous pubsub patch
2010-03-08 15:40:08 +01:00
Christophe Romain
77e549e504
allow sending PEP to bare jid on s2s
2010-03-08 15:16:58 +01:00
Badlop
20c2bc54cd
Document mod_sic (EJAB-1205)
2010-03-08 13:58:22 +01:00
Badlop
63ccbe90d3
Implement XEP-0279: Server IP Check (thanks to Karim Gemayel)(EJAB-1205)
2010-03-08 13:58:06 +01:00
Badlop
1f02b5db0f
Fix warnings about unused variable.
2010-03-08 12:43:38 +01:00
Badlop
6bde01cd45
Replace concat_binary supported until R14 with list_to_binary supported since R9
2010-03-08 12:41:11 +01:00
Badlop
f36ac2b809
Catch errors when exporting to PIEFXIS file (EJAB-1178)
2010-03-08 11:13:56 +01:00
Badlop
e4f19df428
Recompile the Guide
2010-03-08 11:07:28 +01:00
Evgeniy Khramtsov
606860e1cc
ldap_dn_filter option is documented; now fetching only needed attributes in LDAP search requests (EJAB-1204)
2010-03-08 16:44:14 +09:00
Evgeniy Khramtsov
22d490486a
now using "%u" pattern as default for ldap_uids (EJAB-1203)
2010-03-08 14:04:56 +09:00
Christophe Romain
d2d06403ac
fix mistake in previous broadcast_stanza change
2010-03-05 18:20:22 +01:00
Christophe Romain
6ee8ec49a5
add extended stanza addressing 'replyto' on PEP (EJAB-1198) (thanks karim)
2010-03-05 17:52:41 +01:00
Denis Kurochkin
6e878d17e6
MSSQL support was broken (EJAB-1201)
2010-03-05 14:40:33 +01:00
Christophe Romain
4984320f17
fix compilations issues
2010-03-05 11:53:26 +01:00
Christophe Romain
09250c0b65
minor intentation fix, and sync _odbc code
2010-03-05 11:35:20 +01:00
Christophe Romain
6e8f5a9cd3
add pubsub#purge_offline (EJAB-1186) (thanks karim)
2010-03-05 11:11:44 +01:00
Christophe Romain
c3edcd0575
fix pubsub#title option (EJAB-1190) (thanks karim)
2010-03-05 10:40:34 +01:00
Christophe Romain
6fb99fbb48
mod_caps optimizations (thanks evgeniy)
2010-03-05 10:34:15 +01:00
Evgeniy Khramtsov
31c3a78453
improved s2s connections clean up (EJAB-1202)
2010-03-04 12:36:57 +09:00
Pablo Polvorin
a3f2588df6
Remove print debug (thanks evgeniy)
2010-03-02 12:45:59 -03:00
Badlop
41c455fabb
Add quotes in documentation of some erl arguments (thanks to Vincent Courcelle)(EJAB-1191)
2010-02-25 00:04:48 +01:00
Badlop
8045fec882
Fix German translation (thanks to Florian Zumbiehl)(EJAB-1195)
2010-02-24 23:06:09 +01:00
Badlop
414004eae4
Fix resending authorization problem
2010-02-24 13:14:45 +01:00
Badlop
8e8a1a3bf5
Run user_receive_packet also when sending offline messages to client (thanks to Brian Acton)(EJAB-1193)
2010-02-22 22:57:08 +01:00
Badlop
fbd8547d94
Fix typos in example config comments (thanks to Florian Zumbiehl)(EJAB-1192)
2010-02-22 13:40:42 +01:00
Badlop
6df9a6ab33
Use alternative of file:read_line/1 to not require R13B02
2010-02-20 19:31:36 +01:00
Evgeniy Khramtsov
2907446e87
fixes typo in Russian translation
2010-02-20 20:41:39 +09:00
Evgeniy Khramtsov
f60804b060
get rid of queue:filter/2 to keep compatibility with older Erlang versions
2010-02-20 20:05:48 +09:00
Evgeniy Khramtsov
e569087d83
now using mnesia:async_dirty when cleaning table from failed node
2010-02-19 16:38:18 +09:00
Badlop
4a7a33168a
Reduce verbosity of HTTP Binding log messages (thanks to Alexey Shchepin)
2010-02-19 00:01:26 +01:00
Badlop
d7fbad6fa1
Recompile guide.html
2010-02-18 22:13:28 +01:00
ekhramtsov
e6c23e0413
improved explanation of "max_fsm_queue" option; included this option in ejabberd.cfg.example (EJAB-1185)
2010-02-18 15:48:11 +09:00
ekhramtsov
35e00ebcf6
option "access_from" is now documented (EJAB-1187)
2010-02-18 14:57:08 +09:00
ekhramtsov
1a96944929
new option "hostname" is added (thanks to Stefan Hepp) (EJAB-838)
2010-02-17 23:17:33 +09:00
Badlop
bc69b96e4c
Close also legacy sessions that were half connected (thanks to Evgeniy Khramtsov)(EJAB-1165)
2010-02-16 12:46:20 +01:00
Badlop
35c9c95e4b
Remove references to the old SVN repository.
2010-02-16 11:55:01 +01:00
Badlop
47ee65d101
Rewrite mnesia counter functions to use dirty_update_counter (EJAB-1177)
...
(thanks to Juan Pablo Carlino and Alexey Shchepin)
2010-02-15 23:38:17 +01:00
Badlop
8a856df2f0
New command to set master Mnesia node
2010-02-15 23:24:48 +01:00
Badlop
6795675108
Shared roster gets contact nickname from vcard, when available (EJAB-114)
2010-02-15 22:47:28 +01:00
Badlop
6867ca43e4
Cross-domain HTTP-Bind support (thanks to Jack Moffitt)(EJAB-1168)
2010-02-15 22:42:59 +01:00
Badlop
ab0905ce56
Fix cluster race condition in route read (thanks to Alexey Shchepin)
2010-02-15 18:29:17 +01:00
Badlop
a71b47ea27
Improve TTY code to work on more operating systems (thanks to Jan Koum)
2010-02-12 22:11:15 +01:00
Badlop
2cca00acc0
Added support for Jot in ctl and TTY in debug (thanks to Jan Koum)
2010-02-12 20:50:56 +01:00
Badlop
7c36e304f0
Minor fixes in the new ejabberdctl flock code
2010-02-12 20:25:31 +01:00
Martin Langhoff
10c16b1cdf
ejabberdctl: support concurrent connections with bound conn names
...
If flock is available, ejabberdctl will use it to grab one
of a bound number of connection names. This allows concurrent
connections while using a bound number of atoms.
Using PID, timestamps or random strings for transient connection IDs
(which would avoid the need for flock) uses an unbound number of atoms.
This can effectively DoS servers, as these connection names are
not garbage collected.
2010-02-12 20:23:33 +01:00
Badlop
8bd37462cb
Remove unnecessary section about Snow Leopard with Erlang R13B
2010-02-11 13:20:06 +01:00
Badlop
78f1fe9ba5
Replace mention of ejabberd SVN with Git.
2010-02-11 13:14:55 +01:00
Badlop
b17c7848fd
Fix bashism in 'ejabberdctl started'
2010-02-11 11:02:57 +01:00
Badlop
071aa123e8
Allow a request_handler to serve a file in root of HTTP
2010-02-10 20:17:09 +01:00
Badlop
abdb7f2742
Fix character in README file
...
SVN Revision: 2963
2010-02-05 13:30:27 +01:00
Pablo Polvorin
bc70e90853
Add new debuging hook to the http receiving process.
...
The new hook is called http_request_debug, and receive the LocalPath and Request as parameter.
SVN Revision: 2961
2010-02-05 13:30:27 +01:00
Pablo Polvorin
787e078f6a
Hibernate http-bind process after handling a request.
...
When using BOSH, this reduces memory consuption of the http-bind process, with negligible CPU impact.
SVN Revision: 2960
2010-02-05 13:30:27 +01:00
Pablo Polvorin
17607ecaa4
Bug Fix: The value of max # of erlang process specified in ejabberdctl.cfg was not used.
...
It was called PROCESSES in the .cfg file, and ERL_PROCESSES in the script. The latter is the correct, to be coherent with ERL_MAX_PORTS and ERL_MAX_ETS_TABLES.
SVN Revision: 2959
2010-02-05 13:30:26 +01:00
Evgeniy Khramtsov
9d84caebdb
avoid resending <stream:error> stanzas on terminate (EJAB-1180)
...
SVN Revision: 2955
2010-02-03 11:25:03 +00:00
Evgeniy Khramtsov
35bcadde7a
avoid 'invalid' value in #iq{} record
...
SVN Revision: 2954
2010-02-02 13:41:34 +00:00
Evgeniy Khramtsov
d9e345a4d8
iq_query_info/1 now returns 'invalid' if XMLNS is invalid
...
SVN Revision: 2953
2010-02-02 12:20:19 +00:00
Evgeniy Khramtsov
46c667c567
changed Reason to shutdown when stopping destroyed MUC room
...
SVN Revision: 2952
2010-02-02 11:49:49 +00:00
Badlop
db3f8487fc
Fix bug handling Reason in gen_fsm:terminate
...
SVN Revision: 2950
2010-02-02 11:14:48 +00:00
Evgeniy Khramtsov
34234b4a46
Added new acl for mod_register: access_from. This acl is applied if existing account tries to register a new account (either via s2s or c2s). The default value is to deny such operations.
...
SVN Revision: 2949
2010-01-31 13:55:10 +00:00
Evgeniy Khramtsov
03454c7f1d
improved SQL reconnect behaviour
...
SVN Revision: 2947
2010-01-31 11:41:28 +00:00
Evgeniy Khramtsov
1cced15c0d
regenerated guide.html
...
SVN Revision: 2945
2010-01-28 15:37:42 +00:00
Evgeniy Khramtsov
4c8beae585
ejabberd_c2s option "max_fsm_queue" is now documented
...
SVN Revision: 2941
2010-01-28 13:56:38 +00:00
Evgeniy Khramtsov
0a3cfeeed9
new ejabberd_c2s option support: max_fsm_queue
...
SVN Revision: 2939
2010-01-28 13:44:49 +00:00
Evgeniy Khramtsov
933d4a69b8
fixes regression with configure script
...
SVN Revision: 2938
2010-01-28 13:34:17 +00:00
Evgeniy Khramtsov
352afa7902
now using p1_fsm behaviour in c2s FSM (EJAB-1173)
...
SVN Revision: 2936
2010-01-28 13:00:04 +00:00
Mickaël Rémond
ce18cfb41b
Fix typo in doc
...
SVN Revision: 2928
2010-01-26 13:16:51 +00:00
Badlop
4fe8d76b83
Fix documentation installation, no need for executable permission (thanks to Peter)(EJAB-1170)
...
SVN Revision: 2926
2010-01-25 18:40:17 +00:00
Badlop
d804698541
Fix typo in EJABBERD_BIN_PATH (thanks to Martin Langhoff)(EJAB-891)
...
SVN Revision: 2925
2010-01-25 18:37:58 +00:00
Badlop
1b1a0d7ed3
Support in ejabberdctl help command names with old - characters.
...
SVN Revision: 2924
2010-01-25 18:32:45 +00:00
Badlop
a0de5bc317
Revert version number from 2.1.2 tag to 2.1.x branch
...
SVN Revision: 2916
2010-01-18 14:37:36 +00:00