b7a542e074
Sanitize copy-pasted get_statustag/1
2014-05-20 12:28:14 +01:00
9c37450fe4
Fix formatting
2014-05-20 12:26:33 +01:00
c39ce133de
Build proceed/compressed elements in a sane way
2014-05-20 11:52:02 +01:00
6d06f22f64
MUC messages with ~ were not logged (EJAB-1696)
2014-05-19 19:07:46 +02:00
a6ddab1e9d
Fix bug when joining empty path
2014-05-14 13:28:39 +02:00
6e8dd5bdff
Don't miss incoming presence updates
2014-05-14 01:04:38 +02:00
f6da708b02
XEP-0198: Check whether routed packets are stanzas
...
Only stanzas are subject to stream management, so when XEP-0198 support
is enabled, we must distinguish them from non-stanza elements. This
commit adds a send_packet/2 function that can be used in place of
send_stanza/2 or send_element/2 whenever a packet is delivered that
might or might not be a stanza.
2014-05-12 19:20:25 +02:00
9121ca14de
Rename disconnect_user/2 command
...
The mod_admin_extra module provides a kick_session/4 command. Rename
the disconnect_user/2 command to kick_user/2 for consistency.
2014-05-12 12:44:40 +02:00
47efe4e6a9
Don't log MUC messages with <no-store/> hint
...
Honor the <no-store/> and <no-permanent-store/> hints defined in
XEP-0334.
2014-05-12 00:27:20 +02:00
03fd88e4ec
Don't store messages with <no-store/> hint
...
Honor the <no-store/> hint defined in XEP-0334.
2014-05-12 00:00:34 +02:00
9b16d09261
Don't carbon copy messages with <no-copy/> hint
...
Honor the <no-copy/> hint defined in XEP-0334.
2014-05-11 23:52:20 +02:00
5d22159e9a
Merge pull request #205 from weiss/xep-0198
...
XEP-0198: Improve handling of incorrect stanza counts reported by client
2014-05-10 00:05:17 +04:00
003fd321ee
Do not try to retreive vCards via local SM for foreign JIDs
2014-05-09 21:26:55 +04:00
6d5bfcfe9b
XEP-0198: Improve handling of too large 'h' values
...
If the client says that it handled more stanzas than we sent (due to a
bug in the client's or in our code), increase our outgoing stanza count
accordingly. There's no point in sticking to the old value even if it
was correct, as the client surely won't fix its count during the current
session.
2014-05-09 18:28:14 +02:00
15369ff9d7
XEP-0198: Reject <resume/> with negative 'h' value
...
Make sure the 'h' attribute sent with a <resume/> request is
nonnegative, as mandated by XEP-0198.
We already have this check for <a/> elements.
2014-05-09 18:01:31 +02:00
a60fda7df4
XEP-0198: Don't warn on invalid ACK elements
...
Do not log a warning (but only a debug message) if the client sends an
invalid </a> packet. Some clients do that occasionally, and there's
nothing server admininistrators could do about that.
2014-05-09 17:54:12 +02:00
318b0f2208
Fix previous commit (C2S session close on server shutdown)
2014-05-08 21:47:50 +04:00
181e7a823e
Fix C2S session close on server shutdown
2014-05-08 21:39:53 +04:00
90a5c054d4
TURN support (EJAB-1017)
2014-05-08 16:14:21 +04:00
115da54557
Merge pull request #203 from hamano/added_get_random_pid_error_handling
...
improve error handling when sql calling with (empty|unknown) host.
2014-05-08 10:02:27 +04:00
79a49b1175
Webadmin with extauth requires internal to run at least once (issue #201 )
2014-05-07 17:13:51 +02:00
d3ed12d4ba
fix mod_offline:count_offline_messages/2
2014-05-07 15:38:18 +09:00
d343447cc9
Merge remote-tracking branch 'processone/master' into xep-0198
...
Conflicts:
doc/guide.tex
src/ejabberd_c2s.erl
2014-05-06 21:41:29 +02:00
cc1f93d7a0
Fix PEP broadcasting issue on ODBC (EJAB-1680)
2014-05-06 13:29:35 +02:00
58717923eb
Fix PEP broadcasting issue (EJAB-1680)
2014-05-06 12:37:44 +02:00
8b1f92575a
XEP-0198: Use "mgmt_" prefix for all #state fields
...
Prefix all ejabberd_c2s #state fields that are used for stream
management with "mgmt_".
2014-05-06 07:27:10 +02:00
a6244275b7
remove compilation warnings
2014-05-05 18:16:48 +02:00
4bdf1bc7a6
avoid sending duplicated events
2014-05-05 17:53:50 +02:00
faa6ad26a0
avoid sending empty events
2014-05-05 17:53:44 +02:00
530ac43758
store item when persist_item=false and cache_last_item=false but need last_item
2014-05-05 17:40:42 +02:00
f3aa74a043
Fix small bug in presence_based_delivery implementation
2014-05-05 14:14:03 +02:00
872cc12dd8
Temporary room not destroyed when the last participant is expulsed (EJAB-520)
2014-05-05 13:50:52 +02:00
70f00a1b1f
extauth_cache can have value 0
2014-05-05 13:13:35 +02:00
3b3f3b9131
XEP-0198: Don't log protocol issues
...
There are corner cases where certain clients acknowledge more stanzas
than they received. Nothing really bad will happen in those cases, and
server administrators can't do anything about such issues anyway.
2014-05-05 01:11:14 +02:00
32abcbca6c
XEP-0198: Accept stream elements in pending state
...
Due to timing issues, ejabberd_c2s might receive stream elements from
the client while the session is waiting for stream resumption. Those
elements are now accepted.
2014-05-05 00:02:55 +02:00
a0917a8e9b
XEP-0198: Log message when waiting for resumption
...
Log an informational message when a session goes into the pending state
(waiting for resumption) after the connection was lost. Administrators
may well be interested in this state change when looking into issues.
2014-05-04 23:08:42 +02:00
fafec77e56
Make it possible to get/set vCards for MUC rooms
2014-05-04 23:23:17 +04:00
806c0e56e1
Do not crash on version downgrade
2014-05-03 17:55:03 +04:00
d0ffcb7fd4
Assume udp_recv/5 now returns new options
2014-05-03 17:48:26 +04:00
955487391d
Assume tcp_init/2 and udp_init/2 now return new options
2014-05-03 17:48:17 +04:00
47a39ce738
Remove unused function
2014-05-02 17:43:23 +04:00
ebd760b7c9
Forking support
2014-05-02 17:43:17 +04:00
f8417f7c1f
Remove empty line
2014-05-02 17:43:09 +04:00
3c98de69dc
Some cleanup
2014-05-02 17:43:03 +04:00
ab6774d93d
Fix CSeq comparison
2014-05-02 17:42:57 +04:00
58aa200297
Optimize request processing
2014-05-02 17:42:51 +04:00
a1337cb73f
Do not proxy stray responses statelessly (as per RFC 6026)
2014-05-02 17:42:45 +04:00
e7e4055cbb
Don't use erlang:integer_to_binary/1
2014-05-02 17:42:37 +04:00
1d771fe646
Rewrite 'Contact' headers in REGISTER requests
2014-05-02 17:42:31 +04:00
8e2bc8d19e
Check for 'max_user_sessions' option
2014-05-02 17:42:13 +04:00
0117787317
Process gen_server timeouts correctly
2014-05-02 17:40:25 +04:00
16e5d66572
Move some code in a separate function
2014-05-02 17:38:47 +04:00
6a95422af8
Multiple REGISTER bindings support
2014-05-02 17:38:28 +04:00
35faffe7da
Locate sessions by proxy processes directly
2014-05-02 17:31:17 +04:00
d83368d73d
fix ejabberd_system_monitor:s2s_out_info/1 error
2014-05-01 15:12:04 +09:00
c545b3de6d
Merge pull request #178 from hamano/devel
...
undefined ejabberd_socket:get_conn_type/1
2014-04-30 21:49:54 +04:00
02e0649d18
SIP support
...
Conflicts:
configure
configure.ac
doc/guide.tex
2014-04-30 19:38:15 +04:00
0904b8b8ff
improve error handling when sql calling with (empty|unknown) host.
...
see #191
2014-05-01 00:20:58 +09:00
ec6c58a21c
Fix error reporting in previous commit
2014-04-30 16:02:20 +02:00
b3714a1b2e
Fix formatting string argument (thanks to Locojay)(github #129 )
2014-04-30 15:59:44 +02:00
81a906af01
Merge pull request #191 from hamano/added_get_random_pid_error_handling
...
fix error handling when sql calling with unknown host.
2014-04-30 17:02:39 +04:00
65519cf262
Merge pull request #190 from hamano/mod_register_web_response_404
...
mod_register_web should response 404 instead of process crash.
2014-04-30 12:42:43 +02:00
a1b8c54c16
Merge pull request #187 from weiss/fix-ejabberdctl-output
...
Let ejabberdctl accept binary string arguments
2014-04-30 12:41:12 +02:00
a6408e9281
fix error handling when sql calling with unknown host.
2014-04-30 15:32:07 +09:00
0e0bd3329d
mod_register_web should response 404 instead of process crash.
2014-04-30 13:39:17 +09:00
9563b0228f
Merge pull request #177 from weiss/log-tls-sasl-external
...
Log TLS status for outgoing s2s with SASL EXTERNAL
2014-04-30 00:38:18 +04:00
8419322884
Merge pull request #181 from weiss/check-tls-before-auth
...
Check TLS state before requesting SASL EXTERNAL for outgoing s2s connections
2014-04-30 00:36:08 +04:00
c37aa1b46d
Merge pull request #185 from weiss/verify-cert-for-s2s-out
...
Support certificate verification for outgoing s2s connections
2014-04-30 00:08:24 +04:00
599fdb9ac2
Merge pull request #186 from weiss/add-disconnect-command
...
New ejabberd command: disconnect_user/2
2014-04-29 15:41:41 +04:00
ebbceab93f
Translate disconnect_user/2 string sent to client
2014-04-29 11:56:28 +02:00
bb2c8b59f8
Avoid #state.lang type errors in corner cases
...
If #state.lang is used before being initialized to some binary string,
the translation code would crash.
2014-04-29 11:41:24 +02:00
4073394e7a
Merge pull request #182 from hamano/register_account_acl
...
fix checking acl in mod_register_web
2014-04-29 13:06:53 +04:00
29aead19d9
Merge pull request #179 from hamano/added_get_random_pid_error_handling
...
added get_random_pid/1 error handling
2014-04-29 13:05:58 +04:00
d09c268b20
Let ejabberdctl accept binary string arguments
...
Don't print the following message if an ejabberd command expects binary
string arguments: "This command cannot be executed using ejabberdctl.
Try ejabberd_xmlrpc."
2014-04-29 01:11:08 +02:00
6d1055abec
New ejabberd command: disconnect_user/2
2014-04-29 00:50:43 +02:00
49bdbf2895
Support certificate verification for outgoing s2s
...
Handle "s2s_use_starttls: required_trusted" the same way for outgoing
s2s connections as for incoming connections. That is, check the remote
server's certificate (including the host name) and abort the connection
if verification fails.
2014-04-28 01:42:02 +02:00
a21d2298af
XEP-0198: Turn some warnings into info messages
...
Don't log warnings on events that will happen during normal operation.
2014-04-28 01:01:30 +02:00
1aa4ed3f35
Don't mess with s2s out when aborting s2s in
...
Don't try to look up and close outgoing connections to a given server
when aborting incoming connections from that server due to certificate
verification errors. The ejabberd_s2s:find_connection/2 call actually
created one or more *new* connections if less than 'max_s2s_connections'
connections were found. Then, no more than one of those possibly new
connections were stopped by the ejabberd_s2s_out:stop_connection/1 call.
It's not really necessary to bother with outgoing connections at all,
here.
2014-04-28 00:17:05 +02:00
eabca82765
Send stream trailer before closing s2s connection
...
When aborting an incoming s2s connection due to certificate verification
errors, send a stream trailer before closing the socket.
2014-04-27 00:28:42 +02:00
71dba66330
fix checking acl in mod_register_web
2014-04-24 18:15:39 +09:00
d805d198ac
Check TLS state before requesting SASL EXTERNAL
...
Make sure a remote server can't circumvent "s2s_use_starttls: required"
by offering SASL EXTERNAL authentication over a non-TLS connection.
2014-04-24 11:04:10 +02:00
ffe9f3c192
added get_random_pid/1 error handling
2014-04-24 15:34:41 +09:00
219f9276d1
undefined ejabberd_socket:get_conn_type/1
2014-04-24 12:42:22 +09:00
f988aad940
Log TLS status for outgoing s2s with SASL EXTERNAL
2014-04-23 23:28:13 +02:00
9ec014c184
added error handling in mod_pubsub_odbc.
2014-04-23 23:35:34 +09:00
86e17c379c
Verify host name before offering SASL EXTERNAL
...
Prior to this commit, ejabberd handled certificate authentication for
incoming s2s connections like this:
1. Verify the certificate without checking the host name. On failure,
behave according to 's2s_use_starttls'. On success:
2. Offer SASL EXTERNAL.
3. If the remote server chooses SASL EXTERNAL, compare the authorization
identity against the certificate host name(s). On failure, abort the
connection unconditionally.
ejabberd now does this instead:
1. Verify the certificate and compare the certificate host name(s)
against the 'from' attribute of the stream header. On failure,
behave according to 's2s_use_starttls'. On success:
2. Offer SASL EXTERNAL.
3. If the remote server chooses SASL EXTERNAL, ignore the authorization
identity (if any) and consider the peer authenticated.
The old behavior was suggested by previous versions of XEP-0178, the new
behavior is suggested by the current version 1.1.
2014-04-23 11:45:17 +02:00
4bc8b6bc9f
Fix extraction of host names from certificates
2014-04-22 22:12:04 +02:00
37d4109e8a
Merge pull request #161 from weiss/fix-carbons
...
Let mod_carboncopy take care of messages sent to bare/unavailable JIDs
2014-04-22 13:52:11 +02:00
d350cc6361
Accept "extauth_cache: false"
...
Don't log a "configuration problem" message if "extauth_cache: false" is
explicitly specified, as that's a valid configuration setting as per the
documentation.
2014-04-16 14:15:14 +02:00
7af7b7d3f0
Fix compilation on pre-R17
2014-04-15 17:05:25 +02:00
d97b4fd9ca
Fix loading translation files on R17
2014-04-15 17:05:22 +02:00
f93758a3cd
Merge pull request #160 from runcom/protocol_options
...
Add option to specify openssl options
2014-04-15 19:01:21 +04:00
285c4c17cf
Merge pull request #146 from jamielinux/master
...
Update FSF address
2014-04-11 13:35:46 +02:00
a21edc2f3a
Pretty print accepted transport address
2014-04-11 12:30:58 +02:00
b3b12effbc
Carbons: Handle unavailable resource like bare JID
...
As the session manager handles messages sent to unavailable resources
just like messages sent to bare JIDs, mod_carboncopy must do that, too.
That is, forward them only to those carbon-copy-enabled resources that
don't have a top priority, in order to avoid duplicates.
2014-04-08 23:32:30 +02:00
fbf71f86f3
Add option to specify openssl options
2014-04-08 18:46:52 +02:00
9d5426315f
Carbons: Also forward messages sent to bare JIDs
...
Don't ignore messages sent to bare JIDs, but forward them to all
carbon-copy-enabled resources that don't have the highest priority.
2014-04-07 22:10:08 +02:00
c114eb3736
XEP-0198: Don't bounce/resend forwarded messages
...
On connection timeout, drop any messages that were forwarded by some
encapsulating protocol, such as XEP-0280 carbon copies or XEP-0313
archive messages. Bouncing or resending them could easily lead to
unexpected results.
2014-04-07 21:21:11 +02:00
766ab1eb46
Merge pull request #158 from weiss/fix-lang-type
...
Fix a type error
2014-04-07 13:28:41 +02:00
76fb7d284a
Merge pull request #157 from weiss/fix-mod-update
...
Fix badarg issue on module update web site
2014-04-07 13:27:31 +02:00
37f409d254
Fix a type error
2014-04-06 00:39:51 +02:00
e02a4913d2
Fix badarg issue on module update web site
2014-04-05 23:23:44 +02:00
1250ee5d77
mod_register_web: check same acl as mod_register.
2014-04-04 04:07:29 +09:00
8b9c49440a
Fix user_resources command, and ejabberd_xmlrpc parsing auth details in call
2014-03-31 16:51:47 +02:00
a5a065290b
Small change in ejabberd_ctl output format to support bash completion
2014-03-26 16:43:53 +01:00
ac0e199d36
Provide meaningful text to user when admin kicks session (EJAB-1455)
2014-03-26 16:01:37 +01:00
a97c716352
XEP-0198: Bounce unacked stanzas by default
...
If the new "resend_on_timeout" option is set to false (which it is by
default), bounce any unacknowledged stanzas instead of re-routing them.
2014-03-25 23:23:38 +01:00
2150b10901
Fix service_info options processing
2014-03-25 09:52:57 +04:00
5c36c44689
Remove annyoing warnings
2014-03-25 09:42:12 +04:00
d5f90965d7
Fix ACLs syntax change (thanks to jokker23)(issue #140 )
2014-03-24 19:40:55 +01:00
2da6933bb7
Remove "fun" element from c2s #state
...
Memory consumption wise, local "fun" references are quite expensive.
2014-03-22 20:25:43 +01:00
e360c56f87
Support XEP-0198 session resumption
...
Implement the optional session resumption feature described in XEP-0198.
A client that supports this feature may now resume the previous session
(within a configurable number of seconds) if the connection was lost.
During resumption, ejabberd will retransmit any stanzas that hadn't been
acknowledged by the client.
2014-03-19 00:51:33 +01:00
2b527f5e9a
Merge pull request #149 from iulianlaz/carboncopy-fix-msg-back-to-original-sender
...
#148 Carbon copy sends message back to original sender solved
2014-03-16 20:59:49 +01:00
88a200e100
Remove some commented out code
...
The code that had been commented out at some earlier point in time would
now break XEP-0198.
2014-03-16 00:12:47 +01:00
633d47f784
Update copyright dates to 2014 (EJAB-1679)
2014-03-13 12:30:57 +01:00
7d594086c3
Add initial XEP-0198 support (EJAB-532)
...
Implement partial support for XEP-0198: Stream Management. After
successful negotiation of this feature, the server requests an ACK for
each stanza transmitted to the client and responds to ACK requests
issued by the client. On session termination, the server re-routes any
unacknowledged stanzas. The length of the pending queue can be limited
by setting the "max_ack_queue" option to some integer value (default:
500). XEP-0198 support can be disabled entirely by setting the
"stream_management" option to false (default: true).
So far, stream management is implemented only for c2s connections, and
the optional stream resumption feature also described in XEP-0198 is not
(yet) supported.
This addition was originally based on a patch provided by Magnus Henoch
and updated by Grzegorz Grasza. Their code implements an early draft of
XEP-0198 for some previous version of ejabberd. It has since been
rewritten almost entirely.
2014-03-12 23:34:14 +01:00
9ef1ad0b6e
#148 Carbon copy sends message back to original sender solved
2014-03-06 08:40:38 +00:00
e211bf522e
Support XEP-0321: Remote Roster Management (EJAB-1381)
2014-02-26 18:02:37 +01:00
46b2d91105
Convert DB details to string when calling odbc:connect/2 (EJAB-1681)
2014-02-26 17:26:46 +01:00
c29ba14dbf
Don't provide current password in webinterface (github issue #137 )
2014-02-26 17:19:07 +01:00
8538997d61
Update FSF address
2014-02-22 10:27:40 +00:00
e82a79efd5
Add missing parenthesis
2014-02-21 23:33:13 +01:00
63a7011c38
When occupant changes nick, include status 110 in stanzas sent to him
2014-02-14 16:22:14 +01:00
4c8b6fe16b
Fixing mod_carboncopy sends carbons of carbons ( fixes #107 )
2014-01-23 17:29:24 +01:00
5ccc6db093
Fixed parameter order in call to restore_room/3
2014-01-23 14:39:52 +00:00
9422164dda
Clear SASL state after finishing auth
2014-01-21 13:44:29 +02:00
cbbfd921b4
Fix for the previous commit
2014-01-21 11:54:18 +02:00
d63be79df9
Use 'to' field only in the first client stream initialization
2014-01-20 16:06:05 +02:00
e107e78773
Fix auth verification in ejabberd_xmlrpc (thanks to Vicis)
2014-01-02 16:10:19 +01:00
d03de1bb43
Fix some type specs and errors
2013-12-10 21:44:46 +10:00
33764bb931
Add ejabberd_xmlrpc
2013-12-10 21:25:12 +10:00
5a1300bc70
Add access rule to mod_roster (EJAB-72)
2013-12-04 14:57:44 +01:00
9c17163b55
bind values for get_parentnodes_tree
2013-12-03 10:51:01 +01:00
e11c835bd3
fix use of virtual nodetree
2013-12-03 10:34:59 +01:00
1dd94ac0d0
Support for OpenSSL ciphers list in ejabberd_c2s, ejabberd_s2s_in and ejabberd_s2s_out
2013-11-28 19:39:11 +02:00
a6b0e18bde
add Pubsub data migration from mnesia to odbc (EJAB-1126)
...
By calling:
ejd2odbc:export_pubsub("localhost","/tmp/aa.txt").
it will generate SQL files like these:
/tmp/pubsub_item.txt
/tmp/pubsub_node.txt
/tmp/pubsub_state.txt
Conflicts:
src/ejabberd_admin.erl
src/ejd2odbc.erl
2013-11-14 19:29:16 +01:00
89a17ba84a
Correctly convert ACLs into YAML representation
2013-11-07 02:43:43 +10:00
a87b475361
Do not use functions from crypto module wherever possible
2013-11-05 20:07:38 +10:00
b7c7d2747b
Fix some type errors
2013-11-05 19:49:30 +10:00
c0240e7249
Do not try to start STUN application during config checks
2013-11-02 10:30:19 +10:00
6dd31299cf
Avoid case clause crash when loading permanent rooms
2013-10-23 12:23:00 +10:00
cd0381bab5
Fix display ACLs in WebAdmin
2013-10-01 23:23:01 +02:00
2c09d7c8a7
Fix handling of format_status arguments (thanks to Nbaronov)
2013-09-26 17:19:56 +02:00
389a99b2db
Fix bypass for tls-required (thanks to Zeha)
2013-09-26 16:41:57 +02:00
07c8bf5064
Fix roster version support
2013-09-24 18:59:20 +10:00
7fd91a4b12
Better web-handlers detection
2013-09-22 21:47:59 +10:00
ae4356265f
Merge branch 'master' of github.com:processone/ejabberd
2013-09-19 19:00:08 +10:00
a0396620f2
Reflect modules name changes in p1_mysql
2013-09-19 18:59:32 +10:00
7e73ed88f7
Fix problem with decoding http headers over tls connections
...
This fixed GitHub issue 96.
2013-09-16 16:32:02 +02:00
63b2d21b13
clean subscriptions handling and avoid function_clause
2013-08-27 14:46:54 +02:00
1b8876bf55
fix build of Parents list in #pubsub_node
2013-08-27 14:46:35 +02:00
b82eeeeec9
fix call to get_session_pid with binary arguments
2013-08-27 14:46:22 +02:00
e3483ef9e1
Do not rely on p1_logger_h module when lager is enabled
2013-08-27 17:45:07 +10:00
91a74e3e27
Change configuration file format to YAML
2013-08-21 22:17:59 +10:00
f68dfacbbf
Do not try to read/write the deprecated "config" table
2013-08-21 19:37:22 +10:00
0b9754884e
Do not distribute the ACL table
2013-08-21 19:37:08 +10:00
cc6dcd161c
Get rid of global configuration options
2013-08-21 19:36:35 +10:00
807a1fe164
Fix timestamp processing
2013-07-23 15:27:18 +10:00
8ce22b790d
Fix some type errors
2013-07-22 19:24:09 +10:00
f75d78d3f5
Make it possible to import without cursor usage
2013-07-22 10:46:47 +10:00
ca6463ed78
Typo fix
2013-07-22 00:22:05 +10:00
d58148fa8d
Add SQL to Mnesia converter
2013-07-21 23:10:38 +10:00
a2ead99c83
Make it possible to enable/disable TLS compression
2013-07-17 22:46:18 +10:00
986f4d1a7f
Do not forget to re-define the crash.log path
2013-07-15 11:51:09 +10:00
0d7a5476c0
Allow room member to get members list using XEP
2013-07-11 12:11:48 +02:00
4e72dd6751
fix badmatch in send_loop (EJAB-1650)
2013-07-10 09:47:49 +02:00
48819d163a
fix badmatch on remove_user on PEP nodes (EJAB-1649)
2013-07-09 21:50:56 +02:00
8621a8f006
fix invalid response on get_options when no options set (EJAB-1648)
2013-07-09 18:11:27 +02:00
b66e4fbdc4
Apparently configure.erl is not needed anymore
2013-07-08 15:58:38 +02:00
b5623d6bee
gen_iq_handler:check_type was missing
2013-07-08 10:40:39 +03:00
0aca3a4585
Improve the applications start-up
...
* Check if all modules present for every application loaded.
* Get rid of now obsoleted 'ejabberd_check' module.
2013-07-07 02:19:51 +10:00
0266207e9d
fix pubsub unsubscription without SubId on odbc
2013-07-04 15:13:21 +02:00
60600c341e
improve pubsub odbc use of i2l
2013-07-04 10:07:53 +02:00
ac3cd2ebaa
ip_adresse() does not need binary representation in config
2013-06-28 18:32:22 +02:00
2636da0d98
Fix IDNA conversion
2013-06-28 02:45:42 +10:00
91744733c1
Store only messages with body or subject (EJABS-2034)
2013-06-27 11:58:31 +02:00
8a9743ab3b
Avoid custom loglevels processing for lager
2013-06-27 19:27:56 +10:00
597934637c
Logger improvements.
...
lager:
* It is now possible to change the loglevel.
* Log rotation is now supported as well.
p1_logger:
* When rotating a log file, add suffix ".0" to the renamed file.
This is needed in order to be consistent with lager
rotation mechanism.
2013-06-27 19:03:33 +10:00
aab70fc066
Fix external authentication
2013-06-26 12:30:32 +10:00
ae1af885ce
fix feature build on node disco#info
2013-06-25 14:49:22 +02:00
9840b8395e
Fix previous commit
2013-06-25 13:46:21 +02:00
b524e79f55
Normalize HTTP path (thanks to Justin Kirby)
2013-06-25 11:26:44 +02:00
277ba798fc
typo fix in spec
2013-06-24 22:38:15 +02:00
b07b820c4e
fix missing binarization switch on pep nodes
2013-06-24 19:56:27 +02:00
1cc76ebb68
cosmetic change
2013-06-24 19:56:14 +02:00
1cb03439f2
add missing list conversion
2013-06-24 18:05:42 +02:00
3976351c4d
decode_jid always gets binary(), encode_jid lets mod_pubsub handle conversion
2013-06-24 18:04:42 +02:00
6bfa34e8e0
minor improvements and binary fix
2013-06-24 16:31:38 +02:00
4195259d47
typo fix, related to commit 9194872
2013-06-24 16:29:43 +02:00
95546ac20d
remove obsolete node attribute
2013-06-24 13:55:30 +02:00
0e28e4b600
Merge branch 'master' of github.com:processone/ejabberd
2013-06-24 13:46:44 +02:00
831ae2927a
change default PEP config for simpler setup (EJAB-1494)
2013-06-24 13:46:27 +02:00
91948729e9
remove need of extra _odbc in pubsub plugin name
2013-06-24 13:43:11 +02:00
222a94300b
fix decode function for binaryzed data
2013-06-24 13:42:34 +02:00
f9390f3e9a
Fix some dialyzer warnings
2013-06-24 20:04:56 +10:00
7b07c2a9b2
Improve the type spec
2013-06-24 13:15:07 +10:00
521bae7fa0
Get rid of useless clause
2013-06-24 13:13:43 +10:00
a3354f5dc4
Do not generate LDAP's ASN.1 code when compiling ejabberd.
...
We need ASN.1 codec to decode messages into binaries, so we
fixed generated ELDAPv3.erl. A better solution is needed to be found.
2013-06-22 03:27:59 +10:00
109ed1a8b1
According to XEP-0045, a MUC member is allowed to retrieve the members list
2013-06-21 11:43:23 +02:00
0c60718bef
fix empty itemid on publish when passing Access
2013-06-20 17:51:07 +02:00
4221d56c04
fix pubsub issue on binary switch
2013-06-20 17:07:40 +02:00
4dc80dddd4
Fix all calls to functions of p1_tls application
2013-06-20 18:40:44 +10:00
89c3cf3677
Shutdown rooms before starting test cases
2013-06-19 21:46:22 +10:00
fedea8bca0
Added missing license and copyright headers.
2013-06-18 16:56:29 +02:00
c030e8e136
sync pubsub_odbc with last fix
2013-06-18 12:23:32 +02:00
8ea41718ac
Fix node auto-creation
2013-06-18 04:11:54 +10:00
20598c7be4
sync and cleanup pubsub_odbc
2013-06-17 16:34:21 +02:00
08fc6df853
fix auto-create issue due to bad binary matching
2013-06-17 16:30:20 +02:00
62fb432e3e
Fixed broadcast messages handling
2013-06-17 16:41:02 +03:00
862a08e9eb
Fixed conversion to ezlib
2013-06-17 16:33:25 +03:00
0baf4e6088
Advertise privacy lists support via disco#info
2013-06-17 16:10:30 +03:00
7865c6a146
Don't include sub-elements in IQ results where it's not required
...
by the corresponding spec (RFC or XEP).
2013-06-17 16:09:54 +03:00
b50a4948ed
Fix the error report of an incorrect certfile
2013-06-17 16:04:43 +03:00
243d24015c
Remove old obsolete R14 code
2013-06-14 16:18:22 +02:00
4c445b37fd
In frontends, if result is in binary then convert to string
2013-06-14 16:08:47 +02:00
f6e39f64e2
Make ejabberd_ctl not die for ejabberd_commands with binary arguments
2013-06-14 16:08:02 +02:00
26b815f52d
cosmetic changes, move badly placed comments
2013-06-14 00:04:25 +02:00
4d8f770624
Switch to rebar build tool
...
Use dynamic Rebar configuration
Make iconv dependency optional
Disable transient_supervisors compile option
Add hipe compilation support
Only compile ibrowse and lhttpc when needed
Make it possible to generate an OTP application release
Add --enable-debug compile option
Add --enable-all compiler option
Add --enable-tools configure option
Add --with-erlang configure option.
Add --enable-erlang-version-check configure option.
Add lager support
Improve the test suite
2013-06-13 11:11:02 +02:00
0080f1f308
Detect correctly newer Darwin versions (EJAB-1594)
2013-06-06 12:24:18 +02:00
58e769d68f
fix getting ServerHost from Host due to binary portage (EJAB-1638)
2013-06-06 11:32:52 +02:00
c8cba04f05
access_createnode acl also applies to auto created nodes ported to pubsub_odbc
2013-06-06 11:11:37 +02:00
d1e1191793
Handle multiple < and > in mod_muc_log plaintext mode (EJAB-1640)
2013-05-31 13:23:08 +02:00
3025bfd3ff
Handle ~ control sequence in text of mod_muc_log (EJAB-1639)
2013-05-30 14:28:39 +02:00
089c664bad
Fix a bug when reading tuples from config
...
If the config contains a tuple of integers (for example, if a bind IP
address is specified) then strings_to_binary() calls tuple_to_list()
followed by strings_to_binary(), which then calls list_to_binary()
because the list looks like a string. Then list_to_tuple() is called on
the returned binary, causing a crash.
This patch corrects the problem by calling strings_to_binary1() instead,
which ensures that the value that is passed into list_to_tuple() is a
list.
2013-05-24 14:29:41 -04:00
e71650325b
Removed wrong option for `ejabberd_service` module (since 174c16a1)
2013-05-16 01:22:02 +04:00
c0bf054583
Tweak ejabberd_listener to allow ejabberd_xmlrpc work properly
2013-05-14 18:50:54 +02:00
80f165a55c
Fix get of announcement form
2013-04-25 16:00:24 +02:00
54667511f6
Merge pull request #62 from PaulSD/master
...
Fix errors when generating random binary strings
2013-04-25 03:48:55 -07:00
d38ccbea6b
access_createnode acl also applies to auto created nodes (thanks to Matthias Rieber)
2013-04-25 12:37:16 +02:00
dfee84374f
Include actor element in MUC stanzas when kicking (thanks to Purvesh Sahoo)(EJAB-1206)
2013-04-24 11:01:02 +02:00
3e93fbfd2e
Revert "Include actor element in MUC stanzas when kicking (thanks to Purvesh Sahoo)(EJAB-1206)"
...
This reverts commit 066c47ca96
2013-04-23 13:57:18 +02:00
066c47ca96
Include actor element in MUC stanzas when kicking (thanks to Purvesh Sahoo)(EJAB-1206)
2013-04-23 13:55:40 +02:00
9fa415e557
SCRAM optional parameter parsing bugfix
...
The server gave an authentication error, if optional parameters
were present in the GS2 Header. Specifically, the "a=" parameter,
that can be used by admins to login as a different user.
2013-04-23 13:55:36 +02:00
b33a482582
Fix error when generating random binary strings
2013-04-19 15:30:13 -04:00
c0afb1f282
Fix bug when getting room config
2013-04-15 11:14:32 +02:00
abc1341b3f
Fix mod_http_fileserver work with binaries (GITHUB-59)
2013-04-12 12:55:49 +02:00
c7eaa9aeac
ejabberd 13 requires Erlang/OTP R15B or higher (EJAB-1630)
...
Fix documents and remove useless code.
2013-04-11 17:12:53 +02:00
74808b25a1
Change message type of carbon copies from 'chart' to 'chat'
2013-04-09 23:21:06 +02:00
cbd3062365
Don't overwrite inetrc when installing (thanks to skeltoac)
2013-04-04 13:36:15 +02:00
7a00622aa8
Merge branch 'master' of github.com:processone/ejabberd
2013-03-29 19:38:19 +10:00
0d80e7e68a
Get rid of references to non-existent module
2013-03-29 19:38:01 +10:00
299a0f823a
Fix several refactoring related bugs
2013-03-29 19:23:52 +10:00
fc7360068a
Update version number to beta2
2013-03-29 10:04:30 +01:00
4c2d2bd4e9
Add mod_carboncopy that implements XEP-0280 v0.8
2013-03-27 17:53:56 +01:00
9b510579b3
Fix room configuration after binarization
2013-03-22 17:14:47 +01:00
d901aa982b
Fix privacy list broadcast internal stanza after binarization
2013-03-22 13:57:45 +01:00
2c6b12228a
Change version number
2013-03-20 20:54:53 +01:00
f92a94a737
Copied PostgreSQL erlang library from ejabberd-modules SVN
2013-03-19 13:30:17 +01:00
1b304aaf0a
Copied MySQL erlang library from ejabberd-modules SVN
2013-03-19 13:30:15 +01:00
9deb294328
Accumulated patch to binarize and indent code
2013-03-14 10:33:02 +01:00
Radosław Szymczyszyn