]> granicus.if.org Git - ejabberd/log
ejabberd
8 years agoSupport sql backend in mod_shared_roster commands (#1244)
Badlop [Mon, 15 Aug 2016 13:53:35 +0000 (15:53 +0200)]
Support sql backend in mod_shared_roster commands (#1244)

8 years agoMerge pull request #1245 from hamano/clean_redis_table
Evgeny Khramtsov [Mon, 15 Aug 2016 11:12:20 +0000 (15:12 +0400)]
Merge pull request #1245 from hamano/clean_redis_table

fix clean redis table

8 years agofix clean redis table
HAMANO Tsukasa [Mon, 15 Aug 2016 08:51:06 +0000 (17:51 +0900)]
fix clean redis table

8 years agoDon't delete ejabberd_commands table, it's problematic in cluster (#1210)
Badlop [Sun, 14 Aug 2016 18:35:25 +0000 (20:35 +0200)]
Don't delete ejabberd_commands table, it's problematic in cluster (#1210)

8 years agoStore announcements for offline users
Holger Weiss [Fri, 12 Aug 2016 22:07:27 +0000 (00:07 +0200)]
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".

8 years agoHonor <store/> hint for any non-"error" message
Holger Weiss [Fri, 12 Aug 2016 19:13:10 +0000 (21:13 +0200)]
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."

8 years agomod_mam: Don't store messages of type "headline"
Holger Weiss [Fri, 12 Aug 2016 18:38:17 +0000 (20:38 +0200)]
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."

8 years agoAdd a requirement for full JID in subscribe_room command
Evgeniy Khramtsov [Thu, 11 Aug 2016 14:13:20 +0000 (17:13 +0300)]
Add a requirement for full JID in subscribe_room command

8 years agoProvide proper args_desc in oauth_issue_token command
Paweł Chmielowski [Tue, 9 Aug 2016 17:22:51 +0000 (19:22 +0200)]
Provide proper args_desc in oauth_issue_token command

8 years agoFix result type of subscribe_room command
Paweł Chmielowski [Wed, 10 Aug 2016 09:16:20 +0000 (11:16 +0200)]
Fix result type of subscribe_room command

8 years agoAdd commands for MUC subscriptions management
Evgeniy Khramtsov [Tue, 9 Aug 2016 10:36:43 +0000 (13:36 +0300)]
Add commands for MUC subscriptions management

8 years agoUpdate to released version
Mickael Remond [Sun, 7 Aug 2016 16:31:55 +0000 (18:31 +0200)]
Update to released version

8 years agoUpdate moka dependency
Mickael Remond [Sun, 7 Aug 2016 16:28:14 +0000 (18:28 +0200)]
Update moka dependency

8 years agoWe do not force yet access rules check on register command
Mickael Remond [Sun, 7 Aug 2016 16:27:16 +0000 (18:27 +0200)]
We do not force yet access rules check on register command

8 years agoDo not force command line to pass a credentials
Mickael Remond [Sun, 7 Aug 2016 16:24:08 +0000 (18:24 +0200)]
Do not force command line to pass a credentials

8 years agomod_client_state: Let other modules filter stanzas
Holger Weiss [Sat, 6 Aug 2016 11:36:27 +0000 (13:36 +0200)]
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.

8 years agoAdd user's JID to CSI hook arguments
Holger Weiss [Fri, 5 Aug 2016 21:47:18 +0000 (23:47 +0200)]
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.

8 years agoCosmetic change: Set CSI state 'active' on resume
Holger Weiss [Fri, 5 Aug 2016 18:09:52 +0000 (20:09 +0200)]
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.

8 years agoUse newer samerlib/moka
Paweł Chmielowski [Fri, 5 Aug 2016 11:03:22 +0000 (13:03 +0200)]
Use newer samerlib/moka

8 years agomod_mam: Simplify "assume_mam_usage" option
Holger Weiss [Thu, 4 Aug 2016 23:57:01 +0000 (01:57 +0200)]
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.

8 years agoFix type convertion bug injected by 4ccc40b (#1229) 16.08
Christophe Romain [Thu, 4 Aug 2016 07:49:23 +0000 (09:49 +0200)]
Fix type convertion bug injected by 4ccc40b (#1229)

8 years agoAdd tokens cache to ejabberd_oauth
Alexey Shchepin [Wed, 3 Aug 2016 22:58:56 +0000 (01:58 +0300)]
Add tokens cache to ejabberd_oauth

8 years agoXEP-0198: Handle timeouts during stream resumption
Holger Weiss [Wed, 3 Aug 2016 00:28:46 +0000 (02:28 +0200)]
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.

8 years agoXEP-0198: Increase timeout for stream resumption
Holger Weiss [Wed, 3 Aug 2016 00:15:15 +0000 (02:15 +0200)]
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.

8 years agoAdd OAUTH SQL backend
Alexey Shchepin [Mon, 1 Aug 2016 13:53:25 +0000 (16:53 +0300)]
Add OAUTH SQL backend

8 years agoImplement gen_mod callback in ModPresenceDemo module
Mickael Remond [Mon, 1 Aug 2016 13:46:14 +0000 (15:46 +0200)]
Implement gen_mod callback in ModPresenceDemo module

8 years agoMerge pull request #1223 from processone/expand_api
Mickaël Rémond [Mon, 1 Aug 2016 13:36:47 +0000 (15:36 +0200)]
Merge pull request #1223 from processone/expand_api

More API fixes and improvements

8 years agoRemove compile warning
Mickael Remond [Mon, 1 Aug 2016 13:35:54 +0000 (15:35 +0200)]
Remove compile warning

8 years agoImprove error message when try to call api on api root expand_api
Mickael Remond [Mon, 1 Aug 2016 13:29:47 +0000 (15:29 +0200)]
Improve error message when try to call api on api root

8 years agoSwitch mix worker to transient
Christophe Romain [Mon, 1 Aug 2016 12:09:16 +0000 (14:09 +0200)]
Switch mix worker to transient

8 years agoAdd missing comas in sql statement (#1219)
Christophe Romain [Mon, 1 Aug 2016 08:55:02 +0000 (10:55 +0200)]
Add missing comas in sql statement (#1219)

8 years agoFix error return expectation in command test
Mickael Remond [Mon, 1 Aug 2016 07:28:54 +0000 (09:28 +0200)]
Fix error return expectation in command test

8 years agoFix HTTP process return formatting
Mickael Remond [Mon, 1 Aug 2016 06:58:49 +0000 (08:58 +0200)]
Fix HTTP process return formatting

8 years agoImprove error handling
Mickael Remond [Sun, 31 Jul 2016 20:48:24 +0000 (22:48 +0200)]
Improve error handling

8 years agoChange name of result key for offline count to value
Mickael Remond [Sat, 30 Jul 2016 18:12:04 +0000 (20:12 +0200)]
Change name of result key for offline count to value

This is more user friendly and should be more consistent with other commands.

8 years agoAdd support for sending back missing scope error to API ReST command calls
Mickael Remond [Sat, 30 Jul 2016 16:51:54 +0000 (18:51 +0200)]
Add support for sending back missing scope error to API ReST command calls

8 years agoMake s2s stats commands more robust
Mickael Remond [Sat, 30 Jul 2016 16:50:58 +0000 (18:50 +0200)]
Make s2s stats commands more robust

8 years agoEnsure ejabberdctl status result is in valid shell supported range
Mickael Remond [Sat, 30 Jul 2016 11:18:39 +0000 (13:18 +0200)]
Ensure ejabberdctl status result is in valid shell supported range

8 years agoAdd support for rich error reporting for API
Mickael Remond [Sat, 30 Jul 2016 11:08:30 +0000 (13:08 +0200)]
Add support for rich error reporting for API

8 years agoReturn 409 conflict error code on register if user already exists
Mickael Remond [Sat, 30 Jul 2016 09:50:04 +0000 (11:50 +0200)]
Return 409 conflict error code on register if user already exists

8 years agoMerge pull request #1221 from processone/expand_api
Mickaël Rémond [Sat, 30 Jul 2016 08:55:39 +0000 (10:55 +0200)]
Merge pull request #1221 from processone/expand_api

Do not crash on check when we do not have JID

8 years agoDo not crash on check when we do not have JID
Mickael Remond [Fri, 29 Jul 2016 18:38:05 +0000 (20:38 +0200)]
Do not crash on check when we do not have JID

8 years agoMerge pull request #1178 from candrews/patch-1
Christophe Romain [Fri, 29 Jul 2016 09:33:32 +0000 (11:33 +0200)]
Merge pull request #1178 from candrews/patch-1

Harden the systemd unit

8 years agoSwitch workers from temporary to transient
Christophe Romain [Fri, 29 Jul 2016 09:18:42 +0000 (11:18 +0200)]
Switch workers from temporary to transient

8 years agoDisplay data that is send to websocket connection in debug log level
Paweł Chmielowski [Thu, 28 Jul 2016 14:20:13 +0000 (16:20 +0200)]
Display data that is send to websocket connection in debug log level

This should help with detecting problems like in #1097

8 years agoMerge pull request #1193 from gabrielgatu/support-elixir-module-installer
Christophe Romain [Thu, 28 Jul 2016 14:06:12 +0000 (16:06 +0200)]
Merge pull request #1193 from gabrielgatu/support-elixir-module-installer

Fix issue #625: Writing Elixir modules

8 years agoStart elixir application after ejabberd_app:start_apps()
gabrielgatu [Thu, 28 Jul 2016 13:57:35 +0000 (15:57 +0200)]
Start elixir application after ejabberd_app:start_apps()

8 years agoMerge pull request #1211 from processone/expand_api
Mickaël Rémond [Thu, 28 Jul 2016 12:57:48 +0000 (14:57 +0200)]
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.

8 years agomod_http_upload_quota: Apply cosmetic changes
Holger Weiss [Tue, 26 Jul 2016 22:28:47 +0000 (00:28 +0200)]
mod_http_upload_quota: Apply cosmetic changes

Use "fun f/1" syntax in place of "fun(X) -> f(X) end".

8 years agoAdd 'allow_subscription' MUC configuration option
Evgeniy Khramtsov [Tue, 26 Jul 2016 11:37:28 +0000 (14:37 +0300)]
Add 'allow_subscription' MUC configuration option

8 years agoAdd ability to run test with Elixir mix
Mickael Remond [Tue, 26 Jul 2016 10:17:37 +0000 (12:17 +0200)]
Add ability to run test with Elixir mix

8 years agoClarify command module API
Mickael Remond [Tue, 26 Jul 2016 10:15:03 +0000 (12:15 +0200)]
Clarify command module API

8 years agoAvoid starting several time the owner process
Mickael Remond [Tue, 26 Jul 2016 10:12:48 +0000 (12:12 +0200)]
Avoid starting several time the owner process

8 years agoMake jlib ETS table more resilient
Mickael Remond [Tue, 26 Jul 2016 09:58:14 +0000 (11:58 +0200)]
Make jlib ETS table more resilient

8 years agoFix list appending bug
Mickael Remond [Tue, 26 Jul 2016 09:57:38 +0000 (11:57 +0200)]
Fix list appending bug

8 years agoRemove unused import
Mickael Remond [Tue, 26 Jul 2016 09:53:34 +0000 (11:53 +0200)]
Remove unused import

8 years agoAdd DB backend support for ejabberd_oauth
Alexey Shchepin [Wed, 20 Jul 2016 13:55:45 +0000 (16:55 +0300)]
Add DB backend support for ejabberd_oauth

8 years agoFix tests, command need to be properly added to list of exposed commands
Mickael Remond [Mon, 25 Jul 2016 16:28:40 +0000 (18:28 +0200)]
Fix tests, command need to be properly added to list of exposed commands

8 years agoSimplify code for command policy group expansion
Mickael Remond [Mon, 25 Jul 2016 16:28:05 +0000 (18:28 +0200)]
Simplify code for command policy group expansion

8 years agoExport acl:parse_ip_netmask/1 for mod_rest (ejabberd-contrib#175)
Badlop [Mon, 25 Jul 2016 14:57:05 +0000 (16:57 +0200)]
Export acl:parse_ip_netmask/1 for mod_rest (ejabberd-contrib#175)

8 years agoInitial attempt on access on commands
Mickael Remond [Mon, 25 Jul 2016 09:43:49 +0000 (11:43 +0200)]
Initial attempt on access on commands

May change and will require more work / test / refactor

8 years agoDon't return error for blocked MUC PMs
Holger Weiss [Sun, 24 Jul 2016 18:55:11 +0000 (20:55 +0200)]
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.

8 years agoReturn more user friendly, human readable error description
Mickael Remond [Sun, 24 Jul 2016 12:10:12 +0000 (14:10 +0200)]
Return more user friendly, human readable error description

8 years agoMake default OAuth token TTL values more user friendly
Mickael Remond [Sat, 23 Jul 2016 16:57:57 +0000 (18:57 +0200)]
Make default OAuth token TTL values more user friendly

8 years agoAdd support for checking access rules conformance for commands
Mickael Remond [Sat, 23 Jul 2016 15:57:44 +0000 (17:57 +0200)]
Add support for checking access rules conformance for commands

8 years agoError when not authorized should be 403
Mickael Remond [Sat, 23 Jul 2016 15:56:15 +0000 (17:56 +0200)]
Error when not authorized should be 403

8 years agoMove any access rules check to ACL module
Mickael Remond [Sat, 23 Jul 2016 14:21:00 +0000 (16:21 +0200)]
Move any access rules check to ACL module

8 years agoClean-up of error codes and format json structure
Mickael Remond [Wed, 20 Jul 2016 18:50:59 +0000 (20:50 +0200)]
Clean-up of error codes and format json structure

8 years agoXEP-0198: Log debug message when dropping stanza
Holger Weiss [Fri, 22 Jul 2016 23:23:24 +0000 (01:23 +0200)]
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.

8 years agoPreserve PID for offline sessions
Holger Weiss [Fri, 22 Jul 2016 23:08:05 +0000 (01:08 +0200)]
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.

8 years agoSupport oauth password grant type
Pablo Polvorin [Fri, 22 Jul 2016 22:17:12 +0000 (19:17 -0300)]
Support oauth password grant type

As in https://tools.ietf.org/html/rfc6749#section-4.3

8 years agostringprep might already be started
Pablo Polvorin [Fri, 22 Jul 2016 22:15:56 +0000 (19:15 -0300)]
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.

8 years agoFix elixir test case: stringprep was required
Pablo Polvorin [Fri, 22 Jul 2016 19:25:54 +0000 (16:25 -0300)]
Fix elixir test case: stringprep was required

8 years agooauth: single jid field instead of username/password fields
Pablo Polvorin [Fri, 22 Jul 2016 18:37:48 +0000 (15:37 -0300)]
oauth: single jid field instead of username/password fields

8 years agoConvert password provided by web form to UTF8 before passing it (#375)
Badlop [Fri, 22 Jul 2016 14:51:48 +0000 (16:51 +0200)]
Convert password provided by web form to UTF8 before passing it (#375)

8 years agoQuote postgresql database name (#1136)
Jerome Sautret [Fri, 22 Jul 2016 14:33:40 +0000 (16:33 +0200)]
Quote postgresql database name (#1136)

8 years agoFix handling of complex values as arguments in http_api
Paweł Chmielowski [Fri, 15 Jul 2016 14:42:13 +0000 (16:42 +0200)]
Fix handling of complex values as arguments in http_api

8 years agoMerge pull request #1201 from xmppjingle/master
Evgeny Khramtsov [Thu, 21 Jul 2016 20:35:43 +0000 (00:35 +0400)]
Merge pull request #1201 from xmppjingle/master

External Component Connection Hooks

8 years agoExternal Component Hook
xmppjingle [Thu, 21 Jul 2016 17:03:01 +0000 (14:03 -0300)]
External Component Hook

Changed Hook Trigger Event and included a Reason upon
component_disconnected/2 Hook

8 years agoOauth callback must pass expires_in as ttl instead of epoch
Pablo Polvorin [Wed, 20 Jul 2016 17:47:11 +0000 (14:47 -0300)]
Oauth callback must pass expires_in as ttl instead of epoch

8 years agoUse different version of elixir depending on erlang version
Paweł Chmielowski [Wed, 20 Jul 2016 08:12:00 +0000 (10:12 +0200)]
Use different version of elixir depending on erlang version

8 years agoAdd else branch to if_version_{above,below}
Paweł Chmielowski [Wed, 20 Jul 2016 08:11:34 +0000 (10:11 +0200)]
Add else branch to if_version_{above,below}

8 years agoMake processing of if_* clauses in rebar.config recursive
Paweł Chmielowski [Wed, 20 Jul 2016 08:11:08 +0000 (10:11 +0200)]
Make processing of if_* clauses in rebar.config recursive

8 years agoFix test for changes in oauth expiry
Pablo Polvorin [Tue, 19 Jul 2016 23:36:02 +0000 (20:36 -0300)]
Fix test for changes in oauth expiry

8 years agoMerge branch 'master' of github.com:processone/ejabberd
Pablo Polvorin [Tue, 19 Jul 2016 23:19:17 +0000 (20:19 -0300)]
Merge branch 'master' of github.com:processone/ejabberd

8 years agoLet user choose the desired oauth token TTL
Pablo Polvorin [Tue, 19 Jul 2016 23:18:07 +0000 (20:18 -0300)]
Let user choose the desired oauth token TTL

8 years agomod_mam: Fix handling of result set page limit
Holger Weiss [Tue, 19 Jul 2016 19:23:30 +0000 (21:23 +0200)]
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.

8 years agomod_mam: Always limit result set page size
Holger Weiss [Tue, 19 Jul 2016 19:08:13 +0000 (21:08 +0200)]
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.

8 years agoUpgrade Elixir version to 1.2 in rebar config
Mickael Remond [Tue, 19 Jul 2016 11:05:01 +0000 (13:05 +0200)]
Upgrade Elixir version to 1.2 in rebar config

This matches the version used in mix.exs

8 years agoLock relx version as newer version does not compile fine
Mickael Remond [Tue, 19 Jul 2016 10:35:45 +0000 (12:35 +0200)]
Lock relx version as newer version does not compile fine

8 years agoMake access rules in ejabberd_web_admin configurable
Paweł Chmielowski [Tue, 19 Jul 2016 09:26:33 +0000 (11:26 +0200)]
Make access rules in ejabberd_web_admin configurable

8 years agoFix command argument formatting
Pablo Polvorin [Tue, 19 Jul 2016 03:51:04 +0000 (00:51 -0300)]
Fix command argument formatting

8 years agoAdd 'ejabberd:user' and 'ejabberd:admin' oauth scopes
Pablo Polvorin [Tue, 19 Jul 2016 02:27:49 +0000 (23:27 -0300)]
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".

8 years agoFix ce0d1704c6cc167c8bc891587952f78c55f979ad
Pablo Polvorin [Mon, 18 Jul 2016 23:25:23 +0000 (20:25 -0300)]
Fix ce0d1704c6cc167c8bc891587952f78c55f979ad

Original request was to allow ejabberd sysadmin to generate
tokens for specific users.  JIDs must not be passed as argument
when requesting the tokens.

8 years agoMerge remote-tracking branch 'processone/master'
xmppjingle [Mon, 18 Jul 2016 20:55:31 +0000 (17:55 -0300)]
Merge remote-tracking branch 'processone/master'

8 years agoExternal Component Connection Hooks
xmppjingle [Mon, 18 Jul 2016 20:55:10 +0000 (17:55 -0300)]
External Component Connection Hooks

8 years agojlib: Don't try to keep just one <delay/> tag
Holger Weiss [Mon, 18 Jul 2016 20:31:08 +0000 (22:31 +0200)]
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.

8 years agoOmit [info] message with number of queued stanzas
Holger Weiss [Sun, 10 Jul 2016 20:21:57 +0000 (22:21 +0200)]
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.

8 years agoFix compilation error
Evgeniy Khramtsov [Sun, 10 Jul 2016 05:45:24 +0000 (08:45 +0300)]
Fix compilation error

8 years agoUse hooks instead of direct calls to mod_mam
Evgeniy Khramtsov [Sat, 9 Jul 2016 09:43:01 +0000 (12:43 +0300)]
Use hooks instead of direct calls to mod_mam