* src/mod_muc/mod_muc.erl: Added access rules for using serveice

and creating rooms (thanks to Sergei Golovan)

* src/win32/ejabberd.nsi: Updated (thanks to Sergei Golovan)
* src/win32/CheckUserH.ini: Likewise

* src/translate.erl: Search translations in priv_dir instead of
lib_dir (thanks to Sergei Golovan)

* src/msgs/ru.msg: Updated (thanks to Sergei Golovan)

* src/ejabberd.cfg.example: Updated (thanks to Sergei Golovan)

* src/**/Makefile.in: Updated (thanks to Sergei Golovan)
* src/**/Makefile.win32: Likewise

2004-05-16  Alexey Shchepin  <alexey@sevcom.net>

* src/web/ejabberd_web_admin.erl: Updated

SVN Revision: 235

3 files changed, 97 insertions, 61 deletions

diff --git a/src/mod_muc/Makefile.in b/src/mod_muc/Makefile.in
index 67566dcc..8dcab077 100644
--- a/src/mod_muc/Makefile.in
+++ b/src/mod_muc/Makefile.in
@@ -28,6 +28,9 @@ $(OUTDIR)/%.beam:       %.erl
 clean:
 	rm -f $(OBJS)
 
+distclean: clean
+	rm -f Makefile
+
 TAGS:
 	etags *.erl
 
diff --git a/src/mod_muc/mod_muc.erl b/src/mod_muc/mod_muc.erl
index 0098ae5d..81fd87c9 100644
--- a/src/mod_muc/mod_muc.erl
+++ b/src/mod_muc/mod_muc.erl
@@ -13,7 +13,7 @@
 -behaviour(gen_mod).
 
 -export([start/1,
-	 init/1,
+	 init/2,
 	 stop/0,
 	 room_destroyed/1,
 	 store_room/2,
@@ -40,43 +40,63 @@ start(Opts) ->
 			 {attributes, record_info(fields, muc_registered)}]),
     mnesia:add_table_index(muc_registered, nick),
     Host = gen_mod:get_opt(host, Opts, "conference." ++ ?MYNAME),
-    register(ejabberd_mod_muc, spawn(?MODULE, init, [Host])).
+    Access = gen_mod:get_opt(access, Opts, all),
+    AccessCreate = gen_mod:get_opt(access_create, Opts, all),
+    AccessAdmin = gen_mod:get_opt(access_admin, Opts, none),
+    register(ejabberd_mod_muc,
+	     spawn(?MODULE, init, [Host, {Access, AccessCreate, AccessAdmin}])).
 
 
 
-init(Host) ->
+init(Host, Access) ->
     catch ets:new(muc_online_room, [named_table,
 				    public,
 				    {keypos, #muc_online_room.name}]),
     ejabberd_router:register_route(Host),
-    load_permanent_rooms(Host),
-    loop(Host).
+    load_permanent_rooms(Host, Access),
+    loop(Host, Access).
 
-loop(Host) ->
+loop(Host, Access) ->
     receive
 	{route, From, To, Packet} ->
-	    case catch do_route(Host, From, To, Packet) of
+	    case catch do_route(Host, Access, From, To, Packet) of
 		{'EXIT', Reason} ->
 		    ?ERROR_MSG("~p", [Reason]);
 		_ ->
 		    ok
 	    end,
-	    loop(Host);
+	    loop(Host, Access);
 	{room_destroyed, Room} ->
 	    ets:delete(muc_online_room, Room),
-	    loop(Host);
+	    loop(Host, Access);
 	stop ->
 	    % TODO
 	    ejabberd_router:unregister_global_route(Host),
 	    ok;
 	_ ->
-	    loop(Host)
+	    loop(Host, Access)
     end.
 
 
-do_route(Host, From, To, Packet) ->
+do_route(Host, Access, From, To, Packet) ->
+    {AccessRoute, _AccessCreate, _AccessAdmin} = Access,
+    case acl:match_rule(AccessRoute, From) of
+	allow ->
+	    do_route1(Host, Access, From, To, Packet);
+	_ ->
+	    {xmlelement, _Name, Attrs, _Els} = Packet,
+	    Lang = xml:get_attr_s("xml:lang", Attrs),
+	    ErrText = "Access denied by service policy",
+	    Err = jlib:make_error_reply(Packet,
+					?ERRT_FORBIDDEN(Lang, ErrText)),
+	    ejabberd_router:route(To, From, Err)
+    end.
+
+
+do_route1(Host, Access, From, To, Packet) ->
+    {_AccessRoute, AccessCreate, AccessAdmin} = Access,
     {Room, _, Nick} = jlib:jid_tolower(To),
-    {xmlelement, Name, Attrs, Els} = Packet,
+    {xmlelement, Name, Attrs, _Els} = Packet,
     case Room of
 	"" ->
 	    case Nick of
@@ -155,7 +175,7 @@ do_route(Host, From, To, Packet) ->
 				"error" ->
 				    ok;
 				_ ->
-				    case acl:match_rule(muc_admin, From) of
+				    case acl:match_rule(AccessAdmin, From) of
 					allow ->
 					    Msg = xml:get_path_s(
 						    Packet,
@@ -193,14 +213,23 @@ do_route(Host, From, To, Packet) ->
 		    Type = xml:get_attr_s("type", Attrs),
 		    case {Name, Type} of
 			{"presence", ""} ->
-			    ?DEBUG("MUC: open new room '~s'~n", [Room]),
-			    {ok, Pid} = mod_muc_room:start(
-					  Host, Room, From, Nick),
-			    ets:insert(
-			      muc_online_room,
-			      #muc_online_room{name = Room, pid = Pid}),
-			    mod_muc_room:route(Pid, From, Nick, Packet),
-			    ok;
+			    case acl:match_rule(AccessCreate, From) of
+				allow ->
+				    ?DEBUG("MUC: open new room '~s'~n", [Room]),
+				    {ok, Pid} = mod_muc_room:start(
+						  Host, Access, Room, From, Nick),
+				    ets:insert(
+				      muc_online_room,
+				      #muc_online_room{name = Room, pid = Pid}),
+				    mod_muc_room:route(Pid, From, Nick, Packet),
+				    ok;
+				_ ->
+				    Lang = xml:get_attr_s("xml:lang", Attrs),
+				    ErrText = "Room creation is denied by service policy",
+				    Err = jlib:make_error_reply(
+					    Packet, ?ERRT_FORBIDDEN(Lang, ErrText)),
+				    ejabberd_router:route(To, From, Err)
+			    end;
 			_ ->
 			    Lang = xml:get_attr_s("xml:lang", Attrs),
 			    ErrText = "Conference room does not exist",
@@ -251,7 +280,7 @@ forget_room(Name) ->
     mnesia:transaction(F).
 
 
-load_permanent_rooms(Host) ->
+load_permanent_rooms(Host, Access) ->
     case catch mnesia:dirty_select(muc_room, [{'_', [], ['$_']}]) of
 	{'EXIT', Reason} ->
 	    ?ERROR_MSG("~p", [Reason]),
@@ -261,6 +290,7 @@ load_permanent_rooms(Host) ->
 				  Room = R#muc_room.name,
 				  {ok, Pid} = mod_muc_room:start(
 						Host,
+						Access,
 						Room,
 						R#muc_room.opts),
 				  ets:insert(
@@ -314,7 +344,7 @@ iq_get_register_info(From, Host, Lang) ->
     {LUser, LServer, _} = jlib:jid_tolower(From),
     LUS = {LUser, LServer},
     {Nick, Registered} = case catch mnesia:dirty_read(muc_registered, LUS) of
-	       {'EXIT', Reason} ->
+	       {'EXIT', _Reason} ->
 		   {"", []};
 	       [] ->
 		   {"", []};
@@ -384,9 +414,9 @@ iq_set_register_info(From, XData, Lang) ->
     end.
 
 process_iq_register_set(From, SubEl, Lang) ->
-    {xmlelement, Name, Attrs, Els} = SubEl,
+    {xmlelement, _Name, _Attrs, Els} = SubEl,
     case xml:remove_cdata(Els) of
-	[{xmlelement, "x", Attrs1, Els1} = XEl] ->
+	[{xmlelement, "x", _Attrs1, _Els1} = XEl] ->
 	    case {xml:get_tag_attr_s("xmlns", XEl),
 		  xml:get_tag_attr_s("type", XEl)} of
 		{?NS_XDATA, "cancel"} ->
@@ -419,14 +449,14 @@ iq_get_vcard(Lang) ->
 
 broadcast_service_message(Msg) ->
     lists:foreach(
-      fun(#muc_online_room{name = Name, pid = Pid}) ->
+      fun(#muc_online_room{pid = Pid}) ->
 	      gen_fsm:send_all_state_event(
 		Pid, {service_message, Msg})
       end, ets:tab2list(muc_online_room)).
 
 
 
-can_use_nick(JID, "") ->
+can_use_nick(_JID, "") ->
     false;
 can_use_nick(JID, Nick) ->
     {LUser, LServer, _} = jlib:jid_tolower(JID),
@@ -434,7 +464,7 @@ can_use_nick(JID, Nick) ->
     case catch mnesia:dirty_index_read(muc_registered,
 				       Nick,
 				       #muc_registered.nick) of
-	{'EXIT', Reason} ->
+	{'EXIT', _Reason} ->
 	    true;
 	[] ->
 	    true;
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index 12a51b3c..ba6187d6 100644
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -14,8 +14,8 @@
 
 
 %% External exports
--export([start/4,
-	 start/3,
+-export([start/5,
+	 start/4,
 	 route/4]).
 
 %% gen_fsm callbacks
@@ -59,6 +59,7 @@
 
 -record(state, {room,
 		host,
+		access,
 		jid,
 		config = #config{},
 		users = ?DICT:new(),
@@ -81,11 +82,11 @@
 %%%----------------------------------------------------------------------
 %%% API
 %%%----------------------------------------------------------------------
-start(Host, Room, Creator, Nick) ->
-    gen_fsm:start(?MODULE, [Host, Room, Creator, Nick], ?FSMOPTS).
+start(Host, Access, Room, Creator, Nick) ->
+    gen_fsm:start(?MODULE, [Host, Access, Room, Creator, Nick], ?FSMOPTS).
 
-start(Host, Room, Opts) ->
-    gen_fsm:start(?MODULE, [Host, Room, Opts], ?FSMOPTS).
+start(Host, Access, Room, Opts) ->
+    gen_fsm:start(?MODULE, [Host, Access, Room, Opts], ?FSMOPTS).
 
 %%%----------------------------------------------------------------------
 %%% Callback functions from gen_fsm
@@ -98,16 +99,17 @@ start(Host, Room, Opts) ->
 %%          ignore                              |
 %%          {stop, StopReason}                   
 %%----------------------------------------------------------------------
-init([Host, Room, Creator, Nick]) ->
-    LCreator = jlib:jid_tolower(Creator),
+init([Host, Access, Room, Creator, Nick]) ->
     State = set_affiliation(Creator, owner,
 			    #state{host = Host,
+				   access = Access,
 				   room = Room,
 				   jid = jlib:make_jid(Room, Host, ""),
 				   just_created = true}),
     {ok, normal_state, State};
-init([Host, Room, Opts]) ->
+init([Host, Access, Room, Opts]) ->
     State = set_opts(Opts, #state{host = Host,
+				  access = Access,
 				  room = Room,
 				  jid = jlib:make_jid(Room, Host, "")}),
     {ok, normal_state, State}.
@@ -160,7 +162,7 @@ normal_state({route, From, "",
 			    case IsAllowed of
 				true ->
 				    lists:foreach(
-				      fun({LJID, Info}) ->
+				      fun({_LJID, Info}) ->
 					      ejabberd_router:route(
 						jlib:jid_replace_resource(
 						  StateData#state.jid,
@@ -275,7 +277,7 @@ normal_state({route, From, "",
     end;
 
 normal_state({route, From, "",
-	      {xmlelement, "iq", Attrs, Els} = Packet},
+	      {xmlelement, "iq", _Attrs, _Els} = Packet},
 	     StateData) ->
     case jlib:iq_query_info(Packet) of
 	#iq{type = Type, xmlns = XMLNS, lang = Lang, sub_el = SubEl} = IQ when
@@ -326,7 +328,7 @@ normal_state({route, From, "",
     end;
 
 normal_state({route, From, Nick,
-	      {xmlelement, "presence", Attrs, Els} = Packet},
+	      {xmlelement, "presence", Attrs, _Els} = Packet},
 	     StateData) ->
     Type = xml:get_attr_s("type", Attrs),
     Lang = xml:get_attr_s("xml:lang", Attrs),
@@ -413,7 +415,7 @@ normal_state({route, From, Nick,
     end;
 
 normal_state({route, From, ToNick,
-	      {xmlelement, "message", Attrs, Els} = Packet},
+	      {xmlelement, "message", Attrs, _Els} = Packet},
 	     StateData) ->
     Type = xml:get_attr_s("type", Attrs),
     Lang = xml:get_attr_s("xml:lang", Attrs),
@@ -484,7 +486,7 @@ normal_state({route, From, ToNick,
     end;
 
 normal_state({route, From, ToNick,
-	      {xmlelement, "iq", Attrs, Els} = Packet},
+	      {xmlelement, "iq", Attrs, _Els} = Packet},
 	     StateData) ->
     Lang = xml:get_attr_s("xml:lang", Attrs),
     case {(StateData#state.config)#config.allow_query_users,
@@ -556,12 +558,12 @@ normal_state(Event, StateData) ->
 %%          {next_state, NextStateName, NextStateData, Timeout} |
 %%          {stop, Reason, NewStateData}                         
 %%----------------------------------------------------------------------
-handle_event({service_message, Msg}, StateName, StateData) ->
+handle_event({service_message, Msg}, _StateName, StateData) ->
     MessagePkt = {xmlelement, "message",
 		  [{"type", "groupchat"}],
 		  [{xmlelement, "body", [], [{xmlcdata, Msg}]}]},
     lists:foreach(
-      fun({LJID, Info}) ->
+      fun({_LJID, Info}) ->
 	      ejabberd_router:route(
 		StateData#state.jid,
 		Info#user.jid,
@@ -573,7 +575,7 @@ handle_event({service_message, Msg}, StateName, StateData) ->
 				 StateData),
     {next_state, normal_state, NSD};
 
-handle_event(Event, StateName, StateData) ->
+handle_event(_Event, StateName, StateData) ->
     {next_state, StateName, StateData}.
 
 %%----------------------------------------------------------------------
@@ -585,7 +587,7 @@ handle_event(Event, StateName, StateData) ->
 %%          {stop, Reason, NewStateData}                          |
 %%          {stop, Reason, Reply, NewStateData}                    
 %%----------------------------------------------------------------------
-handle_sync_event({get_disco_item, JID, Lang}, From, StateName, StateData) ->
+handle_sync_event({get_disco_item, JID, Lang}, _From, StateName, StateData) ->
     FAffiliation = get_affiliation(JID, StateData),
     FRole = get_role(JID, StateData),
     Tail =
@@ -615,11 +617,11 @@ handle_sync_event({get_disco_item, JID, Lang}, From, StateName, StateData) ->
 		    false
 	    end,
     {reply, Reply, StateName, StateData};
-handle_sync_event(Event, From, StateName, StateData) ->
+handle_sync_event(_Event, _From, StateName, StateData) ->
     Reply = ok,
     {reply, Reply, StateName, StateData}.
 
-code_change(OldVsn, StateName, StateData, Extra) ->
+code_change(_OldVsn, StateName, StateData, _Extra) ->
     {ok, StateName, StateData}.
 
 %%----------------------------------------------------------------------
@@ -628,7 +630,7 @@ code_change(OldVsn, StateName, StateData, Extra) ->
 %%          {next_state, NextStateName, NextStateData, Timeout} |
 %%          {stop, Reason, NewStateData}                         
 %%----------------------------------------------------------------------
-handle_info(Info, StateName, StateData) ->
+handle_info(_Info, StateName, StateData) ->
     {next_state, StateName, StateData}.
 
 %%----------------------------------------------------------------------
@@ -636,7 +638,7 @@ handle_info(Info, StateName, StateData) ->
 %% Purpose: Shutdown the fsm
 %% Returns: any
 %%----------------------------------------------------------------------
-terminate(Reason, StateName, StateData) ->
+terminate(_Reason, _StateName, StateData) ->
     mod_muc:room_destroyed(StateData#state.room),
     ok.
 
@@ -702,7 +704,8 @@ set_affiliation(JID, Affiliation, StateData) ->
     StateData#state{affiliations = Affiliations}.
 
 get_affiliation(JID, StateData) ->
-    case acl:match_rule(muc_admin, JID) of
+    {_AccessRoute, _AccessCreate, AccessAdmin} = StateData#state.access,
+    case acl:match_rule(AccessAdmin, JID) of
 	allow ->
 	    owner;
 	_ ->
@@ -803,7 +806,7 @@ filter_presence({xmlelement, "presence", Attrs, Els}) ->
 		     case El of
 			 {xmlcdata, _} ->
 			     false;
-			 {xmlelement, Name1, Attrs1, Els1} ->
+			 {xmlelement, Name1, _Attrs1, _Els1} ->
 			     XMLNS = xml:get_attr_s("xmlns", Attrs),
 			     case {Name1, XMLNS} of
 				 {"show", ""} ->
@@ -1067,9 +1070,9 @@ calc_shift(MaxSize, Size, Shift, [S | TSizes]) ->
 	    calc_shift(MaxSize, Size - S, Shift + 1, TSizes)
     end.
 
-extract_history([], Type) ->
+extract_history([], _Type) ->
     false;
-extract_history([{xmlelement, Name, Attrs, SubEls} = El | Els], Type) ->
+extract_history([{xmlelement, _Name, Attrs, _SubEls} = El | Els], Type) ->
     case xml:get_attr_s("xmlns", Attrs) of
 	?NS_MUC ->
 	    AttrVal = xml:get_path_s(El,
@@ -1077,7 +1080,7 @@ extract_history([{xmlelement, Name, Attrs, SubEls} = El | Els], Type) ->
 	    case Type of
 		"since" ->
 		    case catch parse_datetime(AttrVal) of
-			{'EXIT', Err} ->
+			{'EXIT', _Err} ->
 			    false;
 			Res ->
 			    Res
@@ -1211,7 +1214,7 @@ send_new_presence(NJID, StateData) ->
     SAffiliation = affiliation_to_list(Affiliation),
     SRole = role_to_list(Role),
     lists:foreach(
-      fun({LJID, Info}) ->
+      fun({_LJID, Info}) ->
 	      ItemAttrs =
 		  case (Info#user.role == moderator) orelse
 		      ((StateData#state.config)#config.anonymous == false) of
@@ -1311,7 +1314,7 @@ send_nick_changing(JID, OldNick, StateData) ->
     SAffiliation = affiliation_to_list(Affiliation),
     SRole = role_to_list(Role),
     lists:foreach(
-      fun({LJID, Info}) ->
+      fun({_LJID, Info}) ->
 	      ItemAttrs1 =
 		  case (Info#user.role == moderator) orelse
 		      ((StateData#state.config)#config.anonymous == false) of
@@ -1391,7 +1394,6 @@ add_message_to_history(FromNick, Packet, StateData) ->
     TimeStamp = calendar:now_to_universal_time(now()),
     TSPacket = append_subtags(Packet,
 			      [jlib:timestamp_to_xml(TimeStamp)]),
-    {xmlelement, Name, Attrs, Els} = TSPacket,
     SPacket = jlib:replace_from_to(
 		jlib:jid_replace_resource(StateData#state.jid, FromNick),
 		StateData#state.jid,
@@ -1605,13 +1607,13 @@ process_admin_items_set(UJID, Items, Lang, StateData) ->
     end.
 
     
-find_changed_items(UJID, UAffiliation, URole, [], Lang, StateData, Res) ->
+find_changed_items(UJID, UAffiliation, URole, [], _Lang, StateData, Res) ->
     {result, Res};
 find_changed_items(UJID, UAffiliation, URole, [{xmlcdata, _} | Items],
 		   Lang, StateData, Res) ->
     find_changed_items(UJID, UAffiliation, URole, Items, Lang, StateData, Res);
 find_changed_items(UJID, UAffiliation, URole,
-		   [{xmlelement, "item", Attrs, Els} = Item | Items],
+		   [{xmlelement, "item", Attrs, _Els} = Item | Items],
 		   Lang, StateData, Res) ->
     TJID = case xml:get_attr("jid", Attrs) of
 	       {value, S} ->
@@ -1728,7 +1730,8 @@ find_changed_items(UJID, UAffiliation, URole,
 	Err ->
 	    Err
     end;
-find_changed_items(UJID, UAffiliation, URole, Items, Lang, StateData, Res) ->
+find_changed_items(_UJID, _UAffiliation, _URole, _Items,
+		   _Lang, _StateData, _Res) ->
     {error, ?ERR_BAD_REQUEST}.