Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

Merge 1880 from trunk.

Browse Source 
* src/mod_muc/mod_muc_room.erl: Owner of a password protected room
must provide the password, like other participants (EJAB-867)

SVN Revision: 1946
This commit is contained in:
Badlop 2009-03-03 19:07:24 +00:00
parent fe297e1dea
commit 4046ecc99e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2009-03-03 Badlop <badlop@process-one.net> 2009-03-03 Badlop <badlop@process-one.net>
* src/mod_muc/mod_muc_room.erl: Owner of a password protected room
must provide the password, like other participants (EJAB-867)
* src/mod_muc/mod_muc_log.erl: Prevent XSS in MUC logs by * src/mod_muc/mod_muc_log.erl: Prevent XSS in MUC logs by
linkifying only a few known protocols (EJAB-850) linkifying only a few known protocols (EJAB-850)

5
src/mod_muc/mod_muc_room.erl
View File

@ -1512,7 +1512,7 @@ add_new_user(From, Nick, Packet, StateData) ->
From, Err), From, Err),
StateData; StateData;
{_, _, _, Role} -> {_, _, _, Role} ->
case check_password(Affiliation, case check_password(ServiceAffiliation,
exmpp_xml:get_child_elements(Packet), exmpp_xml:get_child_elements(Packet),
StateData) of StateData) of
true -> true ->
@ -1574,8 +1574,9 @@ add_new_user(From, Nick, Packet, StateData) ->
end. end.
check_password(owner, _Els, _StateData) -> check_password(owner, _Els, _StateData) ->
%% Don't check pass if user is owner in MUC service (access_admin option)
true; true;
check_password(_Affiliation, Els, StateData) -> check_password(_ServiceAffiliation, Els, StateData) ->
case (StateData#state.config)#config.password_protected of case (StateData#state.config)#config.password_protected of
false -> false ->
true; true;