557820707b
Implement database backend interface for mod_proxy65
2017-01-16 15:28:11 +03:00
0078a3b904
Correctly set gen_server's name
2017-01-16 11:43:35 +03:00
65d352d5de
Remove handle_event/1 callback
2017-01-16 11:34:49 +03:00
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
7606be93d5
Decode message before checking for expiration ( #1458 )
2017-01-13 14:20:25 +03:00
e2665c5da9
Usable size for Shared rosters members textarea (EJAB-1753)
2017-01-13 12:16:23 +01:00
32d548d99b
Fix configuration commands ( #1432 )
2017-01-13 13:36:28 +03:00
25ddb6c69d
Add forgotten -include_lib()
2017-01-13 13:28:55 +03:00
0baaad30b1
Implement database backend interface for MUC, BOSH and auth_anonyous
2017-01-13 12:03:39 +03:00
31491ebe16
Fix some corner cases while re-reading RFC6120
2017-01-13 11:35:47 +03:00
b10e10efae
Ignore unexpected events
2017-01-11 16:50:11 +03:00
02f96d0f41
Implement database backend interface for ejabberd_router
2017-01-11 16:25:43 +03:00
2129a33077
Fix attaching ejabberd_s2s_out process to a supervisor
2017-01-11 11:09:56 +03:00
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
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
efccee55e3
pubsub_subscription may is not used (migration is optional)
2017-01-10 13:53:23 +01:00
6ff81946cf
Fix migration of old pubsub database ( #1409 )
2017-01-10 12:10:11 +01:00
08d482b064
Allow old-stype mod_vcard_ldap in the config ( #1410 )
2017-01-10 11:29:01 +03:00
dd5389df23
Don't forget to advertise disco features
2017-01-10 11:25:12 +03:00
e01bece552
Make stream related calls module independent
2017-01-09 22:03:42 +03:00
3d0d9cb354
Fix typo in previous commit
2017-01-09 17:54:10 +01:00
afc7f5aa37
Simplify setting allow_subscription ( #1404 )
2017-01-09 15:56:25 +01:00
f14a966680
Set from/to in every routed packet
2017-01-09 17:51:08 +03:00
6c564775c4
Remove unused mod_ip_blacklist module
2017-01-09 17:22:31 +03:00
1e55e018e5
Adopt remaining code to support new hooks
2017-01-09 17:02:17 +03:00
9605e2b2a4
Fix problem with get_vcard command ( #1447 )
2017-01-06 16:13:57 +01:00
a910ab8171
Get nodes from ejabberd_cluster instead of mnesia
2017-01-03 17:21:02 +01:00
32e5781a6a
Cleanup file headers
2017-01-03 15:58:52 +01:00
f5290a8e44
Specify that process_rosteritems command works only with Mnesia storage
2017-01-03 01:38:56 +01:00
5fdd1c39fe
Update copyright date automatically ( #1442 )
2017-01-02 21:42:06 +01:00
769975f6d7
Remove mod_http_bind and migration code to mod_bosh
2017-01-02 15:53:25 +01:00
5ef60bf594
Correctly process errors from new cyrsasl API
2017-01-02 15:02:03 +03:00
666608544b
Improve return values in cyrsasl API
2017-01-02 14:55:06 +03:00
3dd2a614ac
Get rid of "jlib.hrl" header in some files
2017-01-02 14:45:52 +03:00
50682b98d6
Better cope with IPv6 domains
2016-12-31 17:43:40 +03:00
cf87c5664f
Reflect cyrsasl API changes in remaining code
2016-12-31 13:48:55 +03:00
247ca872f6
Improve return values in cyrsasl API
2016-12-31 13:47:35 +03:00
e7fe4dc474
More refactoring on session management
2016-12-30 00:00:36 +03:00
c6b5dd6c4f
Fix case clauses when using compression ( #1431 )(thanks to Evgeniy Khramtsov)
2016-12-29 15:18:42 +01:00
309bdfbe28
Add xmpp_stream_out behaviour and rewrite s2s/SM code
2016-12-28 09:47:11 +03:00
ed679279fd
Cleanup file headers
2016-12-27 10:57:50 +01:00
fad7612cf1
Allow subscriber to create room, then set allow_subscription=true ( #1404 )
2016-12-26 21:16:17 +01:00
df92d96d4f
Revert "Fix 'nodetree' configuration lookups for PEP"
...
This reverts commit 7ef8dfb4e0
2016-12-25 01:24:40 +01:00
7ef8dfb4e0
Fix 'nodetree' configuration lookups for PEP
2016-12-25 00:58:20 +01:00
3811a61573
Extract correctly the text from #stanza_error ( #1425 )
2016-12-17 11:46:16 +01:00
cc14e223c6
Describe command arguments and results in ejabberd_admin
2016-12-12 13:19:17 +01:00
7f653cfe76
Rewrite ejabberd_service to use new XMPP stream API
2016-12-11 18:24:51 +03:00
5cc8e807df
Initial version of new XMPP stream behaviour (for review)
2016-12-11 15:03:37 +03:00
1a4f63f058
Copy recent make_opts function from mod_muc_room.erl
2016-12-09 13:07:48 +01:00
bcc04d93e1
Enforce pubsub node removal, revert previous commit ( #1320 )
...
This reverts commit 2976c2d921
2016-12-09 12:51:08 +01:00
2976c2d921
Enforce affiliation removal, remove corresponding items ( #1320 )
2016-12-09 11:35:51 +01:00
a50247c20d
Improve handling on acl rules in api_permissions
2016-12-08 18:08:54 +01:00
fdf69dcd0d
API call does not necessary use token, it could use basic auth
2016-12-08 16:28:47 +01:00
a3b12fd745
Recognize "- who:" not only "who:" syntax in api_permissions
2016-12-08 12:01:24 +01:00
8a7ea85a7e
Cleanup ext_mod and fix compilation path
2016-12-07 09:27:21 +01:00
1883a98d1c
Fix compilation of external module with new xmpp lib
2016-12-06 12:01:04 +01:00
0c2491d9ea
Remove obsolete remove_node api (use leave_cluster)
2016-12-05 14:17:57 +01:00
23f7075313
Fix reload_config
2016-12-02 16:29:46 +01:00
847376924e
Add password support in muc_subscribe ( #1306 )
2016-12-02 16:18:35 +01:00
d7e1f6d7b3
When unsubscribes, check if room should get closed ( #1396 )
2016-12-01 22:09:57 +01:00
34f2a8a4f2
Fix error formatting, which closed client connection ( #1389 )
2016-12-01 21:02:54 +01:00
309fd56fb4
Merge branch 'master' of github.com:processone/ejabberd
2016-12-01 15:05:09 +01:00
32f484a349
Fix typo introduced by 92db9ff changes
2016-11-30 13:50:46 +01:00
92db9ff105
Improve handling of mnesia schema
2016-11-30 11:09:17 +01:00
95a4b1b266
Cleanup admin_extra, add few functions
2016-11-30 10:31:36 +01:00
fc7e52df71
Adds optional post_install and pre_uninstall hooks (thanks Igor Manturov Jr.)( #1300 )
2016-11-28 17:15:57 +01:00
56b30ab598
Improve translation of some messages
2016-11-26 10:05:22 +03:00
ca1b22bdd4
Use ejabberd_router:route_error/4 wherever possible
2016-11-25 11:41:24 +03:00
e1539e5769
Get rid of compile warnings
2016-11-25 09:48:26 +03:00
0f11b1be36
Don't forget to erase cache on user removal
2016-11-24 18:40:20 +03:00
49f1275e20
Get rid of excessive (io)list_to_binary/1 calls
2016-11-24 15:06:06 +03:00
b14843d098
Add missing -callbacks
2016-11-24 12:44:21 +01:00
8f692f51d8
Merge pull request #1391 from weiss/mark-copies
...
Mark messages as copies by attaching metadata
2016-11-24 15:43:38 +04:00
560038c808
Use xmpp:put_meta/3 to update metadata
2016-11-24 10:47:26 +01:00
12683b4aaf
Fix typo in copyright date
2016-11-23 14:36:11 +01:00
5d434c1aea
Move copyright definition to ejabberd.hrl
2016-11-23 15:51:48 +03:00
6f2f1e87c9
Don't use deprecated functions from jlib.erl
2016-11-23 10:41:26 +03:00
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
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
ee8cc1dac2
Fix xref issue injected by fbfbb96
2016-11-22 17:51:21 +01:00
9ab169bc63
Fix get_roster issue injected by fbfbb96
2016-11-22 16:59:02 +01:00
24ef90c556
Fix vcard_ldap exports
2016-11-22 16:23:02 +01:00
c0e7b298db
Add missing export
2016-11-22 16:12:19 +01:00
cc63bcc997
Fix issues on import improvements
2016-11-22 16:01:08 +01:00
ebadcf71c2
New bosh module
2016-11-22 15:26:15 +01:00
fbfbb96872
Improve ODBC import
2016-11-22 14:48:01 +01:00
3189bb3bb9
Set 'sql_pool_size' to 1 by default for sqlite
2016-11-21 21:34:56 +03:00
04fdf69737
Fix non-empty disco-nodes processing
2016-11-21 14:21:34 +03:00
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
e6365979bd
Merge branch 'master' of github.com:processone/ejabberd
2016-11-21 12:14:37 +03:00
274303f248
Fix conference disco#items when running multiple virtual hosts
2016-11-21 12:14:24 +03:00
3f91668c46
Log more data for failed s2s connection
2016-11-21 09:52:36 +01:00
c7ae916afc
Don't forget to start XMPP application
2016-11-21 10:23:09 +03:00
049a6d97f1
Fix RSM for conference disco#items
2016-11-20 18:08:49 +03:00
13c6039700
Use xmpp_util.erl from XMPP library
2016-11-19 13:57:25 +03:00
de7a143a2c
Transform ejabberd_commands on the start
2016-11-19 13:05:13 +03:00
9aff7e52a8
Switch to stand-alone XMPP library
2016-11-19 13:03:33 +03:00
45e77ea483
Remove useless NO_EXT_LIB flag
2016-11-18 12:25:01 +01:00
f57f267c54
Merge branch 'master' of github.com:processone/ejabberd
...
Conflicts:
test/ejabberd_SUITE.erl
2016-11-18 13:39:10 +03:00
b8dcc911a3
Make common tests working again
2016-11-18 13:38:08 +03:00
995c97671d
Add auth to mod_http_fileserver
2016-11-17 12:59:46 +01:00
1c90b19d74
Fix typo
2016-11-16 18:24:12 +01:00
3cd174cb56
Ensure that presence_broadcast room option is stored ( #1380 )
2016-11-16 13:35:50 +01:00
b1723c6e2d
Handle correctly p1_http:request result
2016-11-16 13:11:23 +01:00
2929f5b5bc
Minor cosmetic changes on pubsub code
2016-11-15 18:35:20 +01:00
4d4ad922a2
Cosmetic validator changes
2016-11-15 18:14:21 +01:00
8df68266f2
Add missing verbs for RESTfull operation
2016-11-15 14:35:26 +01:00
2b93de6912
apply string optimizations
2016-11-15 14:32:22 +01:00
5ffc01db53
Fix types in check_password_hash
2016-11-15 10:02:21 +01:00
717159a98f
Make string args in http_api be list strings
2016-11-15 10:02:21 +01:00
309962fb8b
Use p1_http from p1_utils 1.0.6
2016-11-14 16:52:03 +01:00
3765210698
Fix IQ result processing
2016-11-13 16:56:05 +03:00
13d5da4da6
Add some copyright notices
2016-11-13 16:46:04 +03:00
ebefd0d8d6
Add more control for decoding IQ payloads
2016-11-13 14:17:21 +03:00
7e9f1a6dc1
Don't auto-decode forwarded payload
2016-11-13 13:41:04 +03:00
21d78ed7f4
Don't use jlib.hrl outside of jlib.erl
2016-11-13 10:56:36 +03:00
b8f22ff538
Deprecate most of the functions from jlib.erl
2016-11-13 10:44:53 +03:00
534e73f732
Uncomment forgotten block of code
2016-11-12 14:51:43 +03:00
de81c50199
Revert "Support to provide password when subscribing to a room ( #1306 )"
...
This reverts commit 566ac872fe
2016-11-12 14:47:29 +03:00
5d552c8463
Merge branch 'master' into xml-ng
2016-11-12 14:41:37 +03:00
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
566ac872fe
Support to provide password when subscribing to a room ( #1306 )
2016-11-10 20:48:43 +01:00
42bede77a1
Merge branch 'master' of github.com:processone/ejabberd
2016-11-09 09:04:58 +01:00
35506f5470
Expose unregister API command
2016-11-09 09:04:52 +01:00
e841a6ec34
Add more tests for offline storage
2016-11-08 15:15:19 +03:00
e9dd3ffe9c
Merge branch 'xml-ng' of github.com:processone/ejabberd into xml-ng
2016-11-07 10:11:40 +03:00
56c91d3c58
Add roster tests
2016-11-07 10:10:57 +03:00
bd060bc1bb
Support several groups separated by ; in add_rosteritem command
2016-11-04 18:45:27 +01:00
49d3b7ec1d
Throw error if room name or host has invalid characters ( #1360 )
2016-11-04 17:28:28 +01:00
5e723bc90e
Fix reading room jids from file for create and destroy_rooms_file commands
2016-11-04 16:54:31 +01:00
62db030942
Merge mod_opt_type from db sub-modules to main module mod_opt_type
2016-11-04 12:58:08 +01:00
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
149cc9654f
Append ; to privacy_list_data exporting lines (thanks to Marcio Luciano Donada)
2016-10-24 13:42:33 +02:00
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
f6236d456d
Add more tests for privacy lists and blocking command
2016-10-22 13:01:45 +03:00
cdafd3254b
Rollback minor change, to avoid redundant use of fail-safe function
2016-10-21 15:02:39 +05:30
509776a0d1
Fix: Replace erlang function with fail-safe jlib function.
2016-10-21 13:57:47 +05:30
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
0212559ca7
If a participant can change subject, let asubscriber too ( #1345 )
2016-10-20 20:35:00 +02:00
3b876875e9
mod_muc: made the constant MAX_ROOMS_DISCOITEMS configurable
2016-10-18 21:59:34 +01:00
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
4c5460f0bd
Get rid of compile warnings for random/crypto modules on R19
2016-10-18 08:17:21 +03:00
90acec8a2b
Merge pull request #1338 from marcphilipp/muc_invite_hook
...
Introduce muc_invite hook
2016-10-17 17:46:25 +02:00
305d4c05dc
Fix delete_old_messages command for SQL backends
2016-10-17 17:02:23 +02:00
67720c7713
Add more MUC tests
2016-10-17 13:37:23 +03:00
fd6f0f94b5
Convert ejabberd_xmlrpc to new api_permissions
2016-10-14 13:55:50 +02:00
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
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
b693601dd1
Don't let MAM messages go into offline storage
2016-10-12 23:10:25 +02:00
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
Evgeniy Khramtsov