16c1b9a5c2
Fix format_result also in xmlrpc, after aa5caa3 ( #982 )
2016-03-07 17:34:08 +01:00
83accedded
fix syntax highlighting by keeping "~s" together
2016-03-07 16:06:18 +01:00
8e6a301026
Fixed type specifications for 'rebar doc'
...
- Fixed type @specs and -specs to remove 'rebar doc' errors
- Removed a lot of wrong and deprecated documentation in ejabberd_piefxis.erl
2016-03-07 15:06:19 +01:00
4013629e5d
EJAB-1480: fix issue with retreiving user roster
2016-03-04 15:52:38 +03:00
6e14a47316
Define opt_type required be ejabberd_config behaviour.
2016-03-04 11:45:18 +01:00
9c3d57e63e
Mark get_queue_length obsolete, and use count_offline_messages ( #970 )
2016-03-04 11:09:14 +01:00
44978ce978
ext_mod: switch to fast_xml and remove old p1_logger reference
2016-03-03 15:46:15 +01:00
10d6c330a5
Fix pubsub disco after host/serverhost cleanup
2016-03-03 14:52:03 +01:00
e95cf420a2
Enable flexible offline on disco#info as well
2016-03-03 14:10:40 +03:00
79853ad44f
Missed a few calls in previous commits
2016-03-02 02:00:02 +03:00
9a049442ff
Raise an error when there are no fields to set in ?SQL_UPSERT
2016-03-02 00:12:49 +03:00
e21f25f5b9
Update more SQL queries
2016-03-02 00:12:49 +03:00
1f9fd25ff8
Update more SQL queries
2016-03-02 00:12:49 +03:00
d8fbe8a289
Update more SQL queries
2016-03-02 00:12:49 +03:00
6d7ce0237a
Update mod_last SQL queries to the new API
2016-03-02 00:12:49 +03:00
2d042f078e
New parse transform for ?SQL_UPSERT and ?SQL_UPSERT_T
2016-03-02 00:12:49 +03:00
3d8219d8f9
Update mod_roster and ejabberd_auth_odbc SQL queries to the new API
2016-03-02 00:12:49 +03:00
7f3bffe821
Allow balanced expressions inside @(...) in ejabberd_sql_pt
2016-03-02 00:12:49 +03:00
99255631dd
Updated some mod_offline SQL queries to the new API
2016-03-02 00:12:11 +03:00
ba35c1ed9d
Use 'any' to match any DBMS in sql_query
2016-03-01 22:50:20 +03:00
437e768e4a
Better error handling in ejabberd_sql_pt
2016-03-01 22:50:07 +03:00
c58a4be6ee
Support for run-time SQL queries selection depending on DBMS version
2016-03-01 22:49:56 +03:00
6374ef4866
New parse transform for SQL queries, use prepare/execute calls with Postgres
2016-03-01 22:48:30 +03:00
382c7c21ad
Do not call to deprected/undefined functions from mod_shared_roster_ldap
2016-02-29 16:35:45 +03:00
6d8c7232d8
mod_register_web: Choose the right error messages
2016-02-29 00:39:57 +01:00
6b126171da
Improve LDAP shared roster support (EJAB-1480)
2016-02-26 17:27:12 +03:00
56523784e1
Implementation of pubsub#itemreply (EJAB-1347)( #928 )
2016-02-26 10:32:03 +01:00
1c6d20924b
Fix host/serverhost usage ( #902 )
2016-02-26 09:33:07 +01:00
ebaf750a9b
Fix for #935
2016-02-25 18:56:43 +01:00
a9de13c5d9
Don't include empty line after java example
2016-02-25 12:14:17 +01:00
576c10ee3a
Make caps warning less confusing ( #955 )
2016-02-23 14:14:24 +01:00
44f581c3b5
mod_http_upload: Also expand @HOST@ in 'docroot'
...
In some environments, it might be desirable to use separate document
roots for each virtual host.
2016-02-20 20:13:30 +01:00
b971449f12
mod_http_upload: Expand 'docroot' before using it
...
Expand the @HOME@ keyword within the 'docroot' value before setting the
permissions of the document root directory.
2016-02-20 18:21:38 +01:00
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
4b0860e7de
Make it possible to define 'sm_db_type' per virtual host
2016-02-19 16:38:43 +03:00
eece6e69cb
Fix format_result so get_room_options command works again after aa5caa3
2016-02-17 20:43:35 +01:00
c9c59f00ad
Merge pull request #953 from cdroege/fix_css
...
Fix the color of links in tables in web admin
2016-02-15 12:52:54 +01:00
47a67c7320
Allow to pass \n in argument to ejabberdctl
2016-02-12 23:38:39 +01:00
c579313821
Fix the color of links in tables in web admin
2016-02-12 18:45:45 +01:00
eaaab45c14
mod_muc_room: Let members see admin/owner JIDs
...
Let members retrieve all affiliation lists in non-anonymous rooms, not
just the list of members.
2016-02-11 22:52:27 +01:00
041e886b87
mod_muc_room: Don't expose JIDs in anonymous rooms
...
Don't let room members retrieve the member list unless the room is
non-anonymous.
2016-02-11 22:24:14 +01:00
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
02a519a11e
Mention new XEP support
2016-02-08 21:35:46 +01:00
1de085ec23
Prepare room JID in create_room command
2016-02-08 21:35:26 +01:00
217b6da5fd
Fix example value for rescode return type
2016-02-09 16:44:57 +01:00
d5b3e6af00
More documentation of arguments in mod_admin_extra
2016-02-09 16:33:32 +01:00
4839ba5ae4
XEP-0013: Flexible Offline Message Retrieval support
2016-02-09 17:59:54 +03:00
2bca8d5121
Remove remanants of pre-binary strings
2016-02-09 15:50:35 +01:00
583476380a
Use muc_online_room record for pattern matching
2016-02-09 15:33:00 +01:00
c0da9b43ce
Better presentation of result description in docs
2016-02-09 13:18:01 +01:00
30d171e79e
Start documenting arguments in mod_admin_extra commands
2016-02-09 13:03:40 +01:00
d36c351fc7
Typo in markdown generator
2016-02-09 13:03:40 +01:00
10ed4a1c85
Add most status codes only to initial MUC presence
2016-02-08 20:10:20 +01:00
04a315eb52
Fix section links to the Guide in the WebAdmin
2016-02-08 16:16:53 +01:00
cf2f80bd09
Merge pull request #944 from cdroege/configureable_host-mod_register_web
...
Allow to modify host when deleting account or changing password over web
2016-02-08 13:48:11 +01:00
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
0b1620a45c
Remove compile warnings
2016-02-08 10:50:28 +01:00
bf49c292f8
Omit redundant check for overcrowded MUC room
...
The send_update_presence/4 function already checked whether the room is
overcrowded before calling send_update_presence1/4, so there's no need
to have send_new_presence/4 perform the same check.
2016-02-08 00:46:33 +01:00
8098f7d9a8
mod_mam: Don't let outcasts access MUC archive
...
XEP-0313 says: "A MUC archive MUST check that the user requesting the
archive has the right to enter it at the time of the query [...]. In
the case of open MUC rooms, the MUC archives can generally be accessed
by any users [...] who do not have an affiliation of 'outcast'".
2016-02-08 00:16:02 +01:00
a31f59ea31
XEP-0198: Fix session timeout corner case
...
If the "resend_on_timeout" option is set to 'if_offline' and a pending
stream management session is terminated because a new session is opened
by the same resource (while no other resource is online), resend
unacknowledged messages rather than bouncing error messages.
2016-02-06 22:28:55 +01:00
7435ee464f
Rename option to regexp_room_id for consistency with other options ( #905 )
2016-02-05 12:09:27 +01:00
268f0b30ec
add room_id_regexp option
2016-02-05 12:09:18 +01:00
30388fa2bf
Allow to modify host when deleting account or changing password over web
2016-02-04 21:31:16 +01:00
942072cf9d
Make hibernate timeouts configurable
...
Two *global* options added:
c2s_hibernate and receiver_hibernate.
Default if not specified is 90000, the previous hardcoded value.
2016-02-04 15:45:29 -03:00
dfc29ea03c
Switch to Fast XML module
2016-02-03 19:03:17 +01:00
71ee0d56fa
Switch to fast_tls and update app names
2016-02-03 16:13:16 +01:00
9ae1371c6e
Convert more dependencies to new repository / packages
2016-02-03 12:30:12 +01:00
0de222d998
Convert code to use Fast YAML
2016-02-03 11:30:48 +01:00
b137ee3beb
Move to new dependencies for SIP and STUN
2016-02-03 11:26:14 +01:00
99b5c5712c
Move to new iconv package
2016-02-03 11:17:24 +01:00
e8ba7bce24
Use stringprep app name
2016-02-03 10:12:25 +01:00
80fc34fb0c
Fix presence-based delivery
2016-02-02 14:06:07 +01:00
fa55ac5c8f
More strict checking for MUC initial presence
2016-02-01 12:09:58 +01:00
dc52ec904c
Send presence with code 170 only in initial presence from MUC
2016-02-01 11:30:49 +01:00
d3ee2a9c18
Add 'import_prosody' command
2016-01-29 14:30:50 +03:00
54dc2f56c6
Import privacy lists from Prosody
2016-01-29 14:14:08 +03:00
b20db3b736
Initial version of migration script from Prosody to ejabberd
2016-01-28 14:23:51 +03:00
aaa84dc118
Need extra line before ## in markdown
2016-01-27 11:42:13 +01:00
239b1c6f74
Always use lagger
2016-01-26 14:34:58 +01:00
b2c6e397fc
Set set utf8mb4 charset on mysql connection
2016-01-26 13:47:24 +01:00
621dff7307
Add header to generated markdown file
2016-01-26 10:46:38 +01:00
bdeb4a7e32
Add a way to get all ejabberd_commands, not only those that was registered
...
This is part of (TECH-1828).
2016-01-26 10:00:28 +01:00
22696e8388
Geenarte markdown that is acceptable by docs.ejabberd.org processor
2016-01-25 16:51:54 +01:00
a2a692d081
Merge pull request #919 from hamano/rename_timestamp_function
...
rename timestamp function #917
2016-01-24 07:51:25 +01:00
a3931e6b73
lager is the default logger, we need to reverse the define flag
2016-01-23 18:43:06 +01:00
5a85b0fb52
rename timestamp function #917
2016-01-23 17:58:10 +09:00
b62607037a
mod_mam: Expose MUC occupant JID in more cases
...
Include the occupant JID with MUC MAM messages if the room is not
anonymous, and also when the MAM user sent the MUC message himself (not
just in the case where he is a room moderator).
2016-01-20 00:02:40 +01:00
2ddbd032ee
Add error handling to send_stanza
2016-01-19 16:16:04 +01:00
5e4ed4266d
mod_mam: Strip existing JID tags from MUC messages
...
Strip any pre-existing <x/> tags which have an <item/> child with a
'jid' attribute from MUC MAM messages. This way, if such a tag exists,
clients can be sure it was added by mod_mam.
2016-01-19 00:39:10 +01:00
a150bf8fdc
Make C2S session establishment optional (ECS-11)
2016-01-18 16:33:57 +03:00
bd383fb8c1
mod_mam: Remove unused code
...
This mod_mam version doesn't store groupchat messages in user archives,
and it also doesn't support the "store_body_only" option.
2016-01-18 13:27:29 +01:00
63777f830d
Use maps instead of dicts in HTTP upload modules
...
ejabberd currently depends on Erlang/OTP 17.1 or higher, so we can now
use maps.
2016-01-16 01:30:22 +01:00
6ac839dd76
Merge pull request #906 from hamano/stats_processes
...
add stats processes command
2016-01-15 19:26:23 +01:00
a83c5a8f3a
Do not redefine records
2016-01-15 15:44:50 +03:00
1d452c98c1
Describe option type of 'domain_balancing'
2016-01-15 14:32:10 +03:00
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
6cb1905f7c
add stats processes command
2016-01-15 00:27:15 +09:00
db04cdf2ca
mod_mam: Sort messages returned by Mnesia
...
Sort the messages retrieved from an Mnesia archive before selecting the
subset limited by the <max/> value. This makes sure the desired subset
of messages is sent to the client.
2016-01-14 02:27:02 +01:00
58c8fc5770
mod_mam: Limit result set page size
...
If the client doesn't specify a maximum number of messages to retrieve
per page, set a limit of 50 messages. If the client specifies a limit
larger than 250, cap the number to 250 messages.
These limits aren't enforced for MAM v0.2 requests though, as that
version of the XEP doesn't require clients to support RSM. The newer
revisions say that "a server MAY place a reasonable limit on how many
stanzas may be pushed to a client in one request. Whether or not the
client query included a <set/> element, the server MAY simply return its
limited results, modifying the <set/> element it returns appropriately."
2016-01-14 02:12:28 +01:00
35ec0d58a4
mod_mam: Reject <index/>-based paging
...
If an <index/> is specified in the MAM request, reject the request
rather than ignoring the desired index and returning wrong results.
XEP-0059 says that the server "MAY return a <feature-not-implemented/>
error."
2016-01-14 01:39:19 +01:00
11afa45646
mod_mam: Remove unused variable
2016-01-14 01:15:11 +01:00
89f63a4fdf
mod_mam: Check whether MUC message is desired
2016-01-14 01:13:16 +01:00
85f4f90b45
mod_mam: Support XEP-0313 v0.2 MUC archive queries
2016-01-14 00:58:48 +01:00
8117092e6a
mod_mam: Respond to form requests
...
If the client requests a data form with the supported filters, return it
as per XEP-0313 v0.3 and newer.
2016-01-13 23:56:05 +01:00
89b1700279
mod_mam: Add 'from' attribute to <delay/> tag
2016-01-13 23:17:23 +01:00
9cd048c442
mod_mam: Improve binary comparison of message UIDs
...
Make sure the binary comparison performed when clients use message UIDs
to page through Mnesia archives yields correct results even if the
specified UIDs don't have the same number of digits as the UIDs of the
stored messages. This way, MAM will continue to work as expected after
migrating from mod_mam_mnesia to mod_mam.
2016-01-13 23:01:51 +01:00
3dccc20d8b
mod_mam: Add "delete_old_mam_messages" command
...
The new "delete_old_mam_messages" command allows for purging all MAM
messages of the specified type older than the specified number of days.
(Currently only implemented for Mnesia archives.)
2016-01-13 22:46:30 +01:00
a61b0c303d
mod_mam: Add "request_activates_archiving" option
...
Enabling "request_activates_archiving" tells mod_mam not to store any
messages for a user until his client issued a MAM request, regardless of
mod_mam's "default" option. Once a MAM request is issued, messages are
archived as usual.
2016-01-13 21:38:08 +01:00
0183b2487e
Advertise MUC MAM v0.4.1 in room JID's disco#info
2016-01-13 20:30:44 +01:00
f448ff608a
Update copyright to 2016 ( #901 )
2016-01-13 12:29:14 +01:00
fd3e3a99c5
Log failed SQL requests
2016-01-13 14:13:32 +03:00
776fe8b32a
Fix MAM MUC for v0.4.1
2016-01-13 11:45:08 +03:00
64d96778b4
Don't return error for blocked MUC messages
...
If a message stanza is blocked as per XEP-0016 or XEP-0191, return an
error only if the type of the blocked message is "normal" or "chat".
This makes sure users won't be kicked from MUC rooms when blocking other
participants.
Closes #897 .
2016-01-12 10:20:35 +01:00
3e1425b905
Merge remote-tracking branch 'processone/pr/899'
...
* processone/pr/899:
mod_http_upload: Use application/octet-stream instead of text/html for security reasons
2016-01-11 12:38:51 +01:00
65e6dfb9dd
Do not fail on incorrect data coming from SQL (898)
2016-01-11 14:35:11 +03:00
c7931b4a4f
CVE-2016-1232: Add Dialback Key Generation and Validation support (XEP-0185)
2016-01-11 14:22:17 +03:00
0ad0fd2187
mod_http_upload: Use application/octet-stream instead of text/html for security reasons
2016-01-11 12:13:19 +01:00
c7b67ff00b
Clarify a little more room error string (thanks to Genghis Khan)
2016-01-08 13:14:40 +01:00
e1539a11be
mod_http_upload: Use full PUT URL for process name
...
Don't just use the "put_url" domain name, but also any path components
of the specified URL, to generate a mod_http_upload process name. This
way, a single domain name can be used for multiple virtual hosts by
specifying a "put_url" such as "https://example.com/@HOST@/ ".
2016-01-06 00:12:36 +01:00
3f5a20c90a
mod_http_upload: Rename variable for clarity
2016-01-05 22:06:34 +01:00
c01e3f24a5
Error converting times in mod_fail2ban ( #889 )
2016-01-05 12:29:21 +01:00
da45a064a8
Fix handling of some options in old style configs
...
This fixes issue #893 .
2016-01-04 22:06:19 +01:00
fb8a511365
Use crypto:rand_uniform instead of random:uniform
2016-01-04 13:59:37 +03:00
94c620cc27
mod_http_upload: Fix logging of file size mismatch
2016-01-04 01:01:14 +01:00
5deb6a91f7
mod_admin_extra: Replace deprecated function calls
2016-01-02 21:27:48 +01:00
b73678992b
mod_muc_admin: Allow for setting MAM option
...
Fixes #890 .
2016-01-02 20:57:01 +01:00
91d205715e
New send_stanza command (ejabberd_contrib#142)
2015-12-30 12:53:40 +01:00
1d2dc6cdc1
mod_muc_room: Replace deprecated function call
2015-12-29 11:11:50 +01:00
4cdb30d59e
mod_mam: Use <stanza-id/> tags for deduplication
...
Use <stanza-id/> elements instead of <delay/> tags to check for messages
resent by the stream management code. The <stanza-id/> element is
preferable, as it is added by mod_mam itself.
2015-12-29 09:54:48 +01:00
0df6d7ae39
Improve explanation in registration page ( #876 )
2015-12-28 15:08:59 +01:00
a18a3dfbb1
Add commands for generating html or markdown documentation for commands
2015-12-28 12:20:06 +01:00
babb484cfc
Restrict access to MAM archives for members-only rooms
2015-12-24 15:04:06 +03:00
c42e026f9c
Degenderise room error message ( #747 )
2015-12-23 19:34:23 +01:00
8cf0d31ee9
Revert "mod_mam: Keep 'to' attribute for MUC MAM messages"
...
This reverts commit 0e330da2a6
2015-12-22 13:20:23 +01:00
cfe0aea219
Use built-in nif for integer_to_binary/binary_to_integer
2015-12-22 11:49:12 +01:00
88c9991f90
Adding WEBIRC, custom realname & ident, ISO-8859-15 (thanks to iwalkalone69)( #877 )
2015-12-21 16:20:20 +01:00
d88d5d6807
Support presence_broadcast in default_room_options mod_muc option
2015-12-21 02:25:31 +03:00
2d22507636
ejabberd_http: Cope with large POST/PUT requests
...
gen_tcp returns 'enomem' if we try to receive more than 64 MiB.
2015-12-20 23:30:11 +01:00
d039b9b72b
ejabberd_http: Log debug message on receive errors
2015-12-20 23:26:57 +01:00
bb5a8a42c3
Fix pubsub virtual nodetree plugin
2015-12-17 10:16:17 +01:00
6957e892dd
Fix last item message type as message attribute
2015-12-16 17:04:45 +01:00
c8986ffa5e
Use correct notification_type for last items ( #827 )
2015-12-16 16:19:35 +01:00
c6798fc515
Add accept_interval option in ejabberd_listener
2015-12-16 17:26:44 +03:00
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
5fd1aa0d04
Advertise MAM in disco info for account/room JID
...
As per XEP-0313 version 0.2 and newer, advertise the MAM feature in the
service discovery information for the bare account (or MUC room) JID.
Some clients check the server's discovery information instead, so we'll
continue to advertise the feature there as well.
2015-12-16 00:08:23 +01:00
11ad96fced
Use MUC domain for 'by' attribute of <stanza-id/>
...
Let mod_mam specify only the domain part of the room JID in the 'by'
attribute of <stanza-id/> tags.
2015-12-15 21:37:41 +01:00
0e330da2a6
mod_mam: Keep 'to' attribute for MUC MAM messages
2015-12-15 21:05:04 +01:00
6efdf78ce3
PubSub plugin for online users only
2015-12-15 16:23:04 +01:00
3b69d26368
Fix pubsub headers
2015-12-15 16:12:20 +01:00
6052f7bfa8
Fix pubsub test error
2015-12-14 10:21:23 +01:00
Badlop