7748dd4e5d
Make processing of if_* clauses in rebar.config recursive
2016-07-20 10:11:08 +02:00
0c0c6465ba
Fix test for changes in oauth expiry
2016-07-19 20:36:02 -03:00
b5a90be3cb
Merge branch 'master' of github.com:processone/ejabberd
2016-07-19 20:19:17 -03:00
1d317e8068
Let user choose the desired oauth token TTL
2016-07-19 20:18:07 -03:00
8f8c499cfa
mod_mam: Fix handling of result set page limit
...
Restore function clause for handling a client-specified result set page
limit that doesn't exceed mod_mam's upper threshold.
2016-07-19 21:23:30 +02:00
9fcb81dea9
mod_mam: Always limit result set page size
...
Limit the number of messages returned for a given MAM request even if
the client didn't specify an RSM set (not just if the client specified
an RSM set without a limit).
This is still not done for MAM v0.2 requests though, as that version of
the XEP doesn't require clients to support RSM.
2016-07-19 21:08:13 +02:00
490a758050
Upgrade Elixir version to 1.2 in rebar config
...
This matches the version used in mix.exs
2016-07-19 13:05:01 +02:00
f79ac6874e
Lock relx version as newer version does not compile fine
2016-07-19 12:35:45 +02:00
655cbf6055
Make access rules in ejabberd_web_admin configurable
2016-07-19 11:27:45 +02:00
483ef09263
Fix command argument formatting
2016-07-19 00:51:04 -03:00
33e0283f0d
Add 'ejabberd:user' and 'ejabberd:admin' oauth scopes
...
'ejabberd:user' includes all commands defined with policy "user".
'ejabberd:admin' includes commands defined with policy "admin".
2016-07-19 00:24:06 -03:00
673a654c47
Fix ce0d1704c6
...
Original request was to allow ejabberd sysadmin to generate
tokens for specific users. JIDs must not be passed as argument
when requesting the tokens.
2016-07-18 20:25:23 -03:00
48c88b61b6
Merge remote-tracking branch 'processone/master'
2016-07-18 17:55:31 -03:00
fca2f24231
External Component Connection Hooks
2016-07-18 17:55:10 -03:00
8bc3dc9c49
jlib: Don't try to keep just one <delay/> tag
...
It seems unclear whether XEP-0203 really mandates that stanzas may not
have multiple <delay/> tags. Editing/removing existing tags doesn't
seem worth the effort, especially as we'd have to take more care which
tag to keep if the stanza already has more than one.
2016-07-18 22:31:08 +02:00
749033598d
Omit [info] message with number of queued stanzas
...
Just log a debug message if a stream management session times out and
some stanzas weren't acknowledged.
2016-07-10 22:21:57 +02:00
f6e960d326
Fix compilation error
2016-07-10 08:45:24 +03:00
786bd4f26c
Use hooks instead of direct calls to mod_mam
2016-07-09 12:43:01 +03:00
5f48d2641b
mod_http_upload_quota: Depend on mod_http_upload
...
mod_http_upload_quota uses mod_http_upload's "docroot" option, so the
mod_http_upload configuration must be parsed, first. Fixes #1025 .
2016-07-08 20:47:02 +02:00
1a62d4e04b
Update stringprep and iconv
2016-07-08 18:28:51 +02:00
6b38d19085
Do send last items only for subscription on current plugin type
2016-07-08 15:18:39 +02:00
661b041302
Rename MUC/Sub's namespace
2016-07-08 15:07:26 +03:00
368b202144
Handle MUC/Sub subscriptions list request
2016-07-08 15:07:10 +03:00
caaf02eaa0
Advertise MUC/Sub support in MUC service disco#info
2016-07-08 15:06:08 +03:00
32de9a56a5
Experimental MUC/Sub support
2016-07-08 15:05:50 +03:00
febbc2bb5a
Update dependencies
2016-07-08 11:40:28 +02:00
71f27ee7d4
Get rid of warnings
2016-07-07 12:17:38 +03:00
c718cbbd9f
Warn on cyclic modules dependencies
2016-07-07 11:34:17 +03:00
12c0d888b1
Revert "Recover fix of 907e239 lost in 9deb294 (thanks to Alexey Shchepin)" ( #1183 )
...
This reverts commit 53f3a45803
2016-07-06 17:54:37 +02:00
4220a2b98c
Make modules loading in a dependent order ( #1191 )
2016-07-06 14:58:48 +03:00
de9f80f2ce
Add missing '/' for jid matching from commit e300f80
2016-07-06 10:06:17 +02:00
be3a4acb55
Fix missed escaping in node_flat_sql.erl
2016-07-05 17:45:37 +03:00
3820aaa421
Quote reserver 'type' keyword for pgsql to fix e300f80
2016-07-05 16:16:40 +02:00
e300f8095d
Fix use of like parameter in sql pubsub's requests
2016-07-05 15:43:59 +02:00
b31c0d9e2e
Support elixir module installer
2016-07-05 12:36:49 +02:00
8e04a7ef4d
mod_configure: Fix editing of access rules
2016-07-03 22:58:54 +02:00
16b1d8541a
Grab new p1_utils that has fix for R19
2016-07-01 21:41:12 +02:00
0737958b45
Fix compilation issues on R19
2016-07-01 21:20:10 +02:00
024124decb
Fix dependencies when using Elixir Mix
2016-06-30 11:35:42 +02:00
88ac1dc56b
Update dependencies
2016-06-30 11:33:38 +02:00
8be1d49961
mod_mam_mnesia: Force garbage collection
...
The VM fails to collect the garbage generated during MAM lookups
automatically, so mod_mam_mnesia's memory usage easily goes up to
several gigabytes if we don't force garbage collection.
2016-06-29 22:32:59 +02:00
10d4c16a97
mod_client_state: Throttle PEP stanzas by default
2016-06-29 22:22:49 +02:00
ce0d1704c6
Allow generation of oauth tokens from command line
...
Oauth tokens can be generated for commands (scopes) having admin|user|open
policy. Restricted commands are not available as those are only usable
from ejabberdctl command line.
Four new commands are available:
$ejabberdctl oauth_issue_token "stats;get_roster"
Generates a token authorized to call both stats and get_roster
commands. Note scopes must be separated by semicolon.
$ejabberdctl oauth_list_tokens
List tokens generated from the command line, with their scope
and expirity time.
$ejabberdctl oauth_list_scopes
List scopes available
$ejabberdctl oauth_revoke_token "Lbs7qdJfdKXOWzVrArgyckY055tE1xnt"
Revokes the given token
2016-06-29 00:22:28 -03:00
2e28d06744
Harden the systemd unit
...
Restrict capabilities, have a private tmp directory, private /dev, and don't accessing file system locations that really shouldn't be accessed.
2016-06-28 17:02:41 -04:00
3446aba753
Include correct version in stream:stream when reporting errors
...
This fixes issue #1174
2016-06-27 16:40:57 +02:00
75366ca2fd
Inline muc access rules
2016-06-24 15:12:58 +02:00
f56cff925c
acl: ACLName rule should match if any part of ACLName matches
2016-06-24 15:09:51 +02:00
94461948db
Update dependencies for 16.06x
2016-06-24 11:12:18 +02:00
0b438d09d1
Fix typo from d8bb5d9c
2016-06-23 17:31:32 +02:00
06bf8cb032
Prepare hex.pm release
2016-06-23 15:23:28 +02:00
Paweł Chmielowski