]> granicus.if.org Git - ejabberd/log
ejabberd
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

8 years agomod_http_upload_quota: Depend on mod_http_upload
Holger Weiss [Fri, 8 Jul 2016 18:47:02 +0000 (20:47 +0200)]
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.

8 years agoUpdate stringprep and iconv
Mickael Remond [Fri, 8 Jul 2016 16:28:51 +0000 (18:28 +0200)]
Update stringprep and iconv

8 years agoDo send last items only for subscription on current plugin type
Christophe Romain [Fri, 8 Jul 2016 13:18:39 +0000 (15:18 +0200)]
Do send last items only for subscription on current plugin type

8 years agoRename MUC/Sub's namespace
Evgeniy Khramtsov [Thu, 7 Jul 2016 13:42:41 +0000 (16:42 +0300)]
Rename MUC/Sub's namespace

8 years agoHandle MUC/Sub subscriptions list request
Evgeniy Khramtsov [Thu, 7 Jul 2016 11:53:15 +0000 (14:53 +0300)]
Handle MUC/Sub subscriptions list request

8 years agoAdvertise MUC/Sub support in MUC service disco#info
Evgeniy Khramtsov [Thu, 7 Jul 2016 10:32:30 +0000 (13:32 +0300)]
Advertise MUC/Sub support in MUC service disco#info

8 years agoExperimental MUC/Sub support
Evgeniy Khramtsov [Sun, 26 Jun 2016 06:08:37 +0000 (09:08 +0300)]
Experimental MUC/Sub support

8 years agoUpdate dependencies
Mickael Remond [Fri, 8 Jul 2016 09:40:28 +0000 (11:40 +0200)]
Update dependencies

8 years agoGet rid of warnings
Evgeniy Khramtsov [Thu, 7 Jul 2016 09:17:38 +0000 (12:17 +0300)]
Get rid of warnings

8 years agoWarn on cyclic modules dependencies
Evgeniy Khramtsov [Thu, 7 Jul 2016 08:34:17 +0000 (11:34 +0300)]
Warn on cyclic modules dependencies

8 years agoRevert "Recover fix of 907e239 lost in 9deb294 (thanks to Alexey Shchepin)" (#1183)
Badlop [Wed, 6 Jul 2016 15:54:37 +0000 (17:54 +0200)]
Revert "Recover fix of 907e239 lost in 9deb294 (thanks to Alexey Shchepin)" (#1183)

This reverts commit 53f3a4580312ee503bfec1e2e14444ecad931fdd.

8 years agoMake modules loading in a dependent order (#1191)
Evgeniy Khramtsov [Wed, 6 Jul 2016 11:58:48 +0000 (14:58 +0300)]
Make modules loading in a dependent order (#1191)

8 years agoAdd missing '/' for jid matching from commit e300f80
Christophe Romain [Wed, 6 Jul 2016 08:06:17 +0000 (10:06 +0200)]
Add missing '/' for jid matching from commit e300f80

8 years agoFix missed escaping in node_flat_sql.erl
Alexey Shchepin [Tue, 5 Jul 2016 14:45:37 +0000 (17:45 +0300)]
Fix missed escaping in node_flat_sql.erl

8 years agoQuote reserver 'type' keyword for pgsql to fix e300f80
Christophe Romain [Tue, 5 Jul 2016 14:16:40 +0000 (16:16 +0200)]
Quote reserver 'type' keyword for pgsql to fix e300f80

8 years agoFix use of like parameter in sql pubsub's requests
Christophe Romain [Tue, 5 Jul 2016 13:43:59 +0000 (15:43 +0200)]
Fix use of like parameter in sql pubsub's requests

8 years agoSupport elixir module installer
gabrielgatu [Tue, 5 Jul 2016 10:36:49 +0000 (12:36 +0200)]
Support elixir module installer

8 years agomod_configure: Fix editing of access rules
Holger Weiss [Sun, 3 Jul 2016 20:58:54 +0000 (22:58 +0200)]
mod_configure: Fix editing of access rules

8 years agoGrab new p1_utils that has fix for R19
Paweł Chmielowski [Fri, 1 Jul 2016 19:41:12 +0000 (21:41 +0200)]
Grab new p1_utils that has fix for R19

8 years agoFix compilation issues on R19
Paweł Chmielowski [Fri, 1 Jul 2016 19:18:55 +0000 (21:18 +0200)]
Fix compilation issues on R19

8 years agoFix dependencies when using Elixir Mix
Mickael Remond [Thu, 30 Jun 2016 09:35:42 +0000 (11:35 +0200)]
Fix dependencies when using Elixir Mix

8 years agoUpdate dependencies
Mickael Remond [Thu, 30 Jun 2016 09:33:38 +0000 (11:33 +0200)]
Update dependencies

8 years agomod_mam_mnesia: Force garbage collection
Holger Weiss [Wed, 29 Jun 2016 20:32:59 +0000 (22:32 +0200)]
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.

8 years agomod_client_state: Throttle PEP stanzas by default
Holger Weiss [Wed, 29 Jun 2016 20:22:49 +0000 (22:22 +0200)]
mod_client_state: Throttle PEP stanzas by default

8 years agoAllow generation of oauth tokens from command line 16.06
Pablo Polvorin [Wed, 29 Jun 2016 03:22:28 +0000 (00:22 -0300)]
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

8 years agoHarden the systemd unit
Craig Andrews [Tue, 28 Jun 2016 21:02:41 +0000 (17:02 -0400)]
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.

8 years agoInclude correct version in stream:stream when reporting errors
Paweł Chmielowski [Mon, 27 Jun 2016 14:40:57 +0000 (16:40 +0200)]
Include correct version in stream:stream when reporting errors

This fixes issue #1174

8 years agoInline muc access rules
Paweł Chmielowski [Fri, 24 Jun 2016 13:12:58 +0000 (15:12 +0200)]
Inline muc access rules

8 years agoacl: ACLName rule should match if any part of ACLName matches
Paweł Chmielowski [Fri, 24 Jun 2016 13:09:51 +0000 (15:09 +0200)]
acl: ACLName rule should match if any part of ACLName matches

8 years agoUpdate dependencies for 16.06x
Christophe Romain [Fri, 24 Jun 2016 09:12:18 +0000 (11:12 +0200)]
Update dependencies for 16.06x

8 years agoFix typo from d8bb5d9c
Christophe Romain [Thu, 23 Jun 2016 15:31:32 +0000 (17:31 +0200)]
Fix typo from d8bb5d9c

8 years agoPrepare hex.pm release
Christophe Romain [Thu, 23 Jun 2016 13:23:28 +0000 (15:23 +0200)]
Prepare hex.pm release

8 years agomod_pubsub: Fix matching of set_node/1 result
Holger Weiss [Thu, 23 Jun 2016 12:23:24 +0000 (14:23 +0200)]
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.

8 years agoWhen convertion of xmlrpc argument to type fails, report it as error
Paweł Chmielowski [Thu, 16 Jun 2016 08:24:50 +0000 (10:24 +0200)]
When convertion of xmlrpc argument to type fails, report it as error

8 years agoxref was broken when Elixir wasn't enabled
Jerome Sautret [Fri, 13 May 2016 13:12:28 +0000 (15:12 +0200)]
xref was broken when Elixir wasn't enabled

8 years agoCompile gen_mod early to help with undefined behaviour warnings
Paweł Chmielowski [Thu, 5 May 2016 14:37:25 +0000 (16:37 +0200)]
Compile gen_mod early to help with undefined behaviour warnings

8 years agoMerge pull request #1165 from weiss/default-blocking-list
Evgeny Khramtsov [Thu, 23 Jun 2016 06:44:47 +0000 (10:44 +0400)]
Merge pull request #1165 from weiss/default-blocking-list

mod_blocking_sql: Handle default list corner case

8 years agomod_blocking_sql: Handle default list corner case
Holger Weiss [Wed, 22 Jun 2016 20:36:27 +0000 (22:36 +0200)]
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.

8 years agoAdd some tests for {shaper,access}_rules_validator
Paweł Chmielowski [Wed, 22 Jun 2016 14:52:37 +0000 (16:52 +0200)]
Add some tests for {shaper,access}_rules_validator

8 years agoMerge pull request #1120 from anagromataf/feature/archive-id-in-message-carbons
Christophe Romain [Wed, 22 Jun 2016 13:47:27 +0000 (15:47 +0200)]
Merge pull request #1120 from anagromataf/feature/archive-id-in-message-carbons

Send unique stanza id and archived tag also in the message carbons