[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/01/25 13:29:05

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverInterface.ml 
        src/networks/donkey: donkeyInteractive.ml 

Log message:
        patch #5711

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1163&r2=1.1164
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInterface.ml?cvsroot=mldonkey&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyInteractive.ml?cvsroot=mldonkey&r1=1.147&r2=1.148

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1163
retrieving revision 1.1164
diff -u -b -r1.1163 -r1.1164
--- distrib/ChangeLog   25 Jan 2007 13:09:16 -0000      1.1163
+++ distrib/ChangeLog   25 Jan 2007 13:29:04 -0000      1.1164
@@ -15,6 +15,7 @@
 =========
 
 2007/01/25
+5711: Multiuser: Block commands preferred, bs, bp, port for non-admin users
 5642: Swarmer: swarming_block_selection_algorithm = 3 (TripleM)
 - this new algorithm select always the rarest choice, if average availability
   is below 5, or one choice_availability is below average availability

Index: src/daemon/driver/driverInterface.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInterface.ml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- src/daemon/driver/driverInterface.ml        15 Jan 2007 18:26:27 -0000      
1.62
+++ src/daemon/driver/driverInterface.ml        25 Jan 2007 13:29:05 -0000      
1.63
@@ -1089,8 +1089,18 @@
               let s = server_find num in
               server_rename s name
           | P.ServerSetPreferred (num, preferred) ->
-              let s = server_find num in
-              server_set_preferred s preferred
+             if user2_is_admin gui.gui_conn.conn_user.ui_user then
+                server_set_preferred (server_find num) preferred
+             else
+               begin
+                  let o = gui.gui_conn in
+                  let buf = o.conn_buf in
+                  Buffer.reset buf; 
+                  Buffer.add_string buf "\nYou are not allowed to change 
preferred status\n";
+                  gui_send gui (P.Console (
+                      DriverControlers.dollar_escape o false
+                        (Buffer.contents buf)))
+               end
 
   with 
     Failure s ->

Index: src/networks/donkey/donkeyInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- src/networks/donkey/donkeyInteractive.ml    8 Jan 2007 11:06:42 -0000       
1.147
+++ src/networks/donkey/donkeyInteractive.ml    25 Jan 2007 13:29:05 -0000      
1.148
@@ -805,6 +805,7 @@
     ) , "<f1> <f2> ... :\t\ttry to recover these files at byte level";
 
     "preferred", Arg_two (fun arg1 arg2 o ->
+        if CommonUserDb.user2_is_admin o.conn_user.ui_user then
         let preferred = bool_of_string arg1 in
         let ip = Ip.of_string arg2 in
         Hashtbl.iter (fun ip_s s ->
@@ -814,19 +815,28 @@
             end
         ) servers_by_key;
         "ok"
+        else
+          _s "You are not allowed to change preferred status"
     ), "<true|false> <ip> :\t\tset the server with this IP as preferred";
 
     "bs", Arg_multiple (fun args o ->
+        if CommonUserDb.user2_is_admin o.conn_user.ui_user then begin
         List.iter (fun arg ->
             let range = Ip.range_of_string arg in
             server_black_list =:=  range :: !!server_black_list;
         ) args;
         "done"
+        end else
+          _s "You are not allowed to blacklist servers"
     ), "<range1> <range2> ... :\t\tadd these IPs to the servers black list 
(can be single IPs, CIDR ranges or begin-end ranges)";
 
     "port", Arg_one (fun arg o ->
+        if CommonUserDb.user2_is_admin o.conn_user.ui_user then begin
         donkey_port =:= int_of_string arg;
-        "new port will change at next restart"),
+        "new port will change at next restart"
+        end else
+          _s "You are not allowed to change connection port"
+    ),
     "<port> :\t\t\t\tchange connection port";
 
     "scan_temp", Arg_none (fun o ->
@@ -996,11 +1006,14 @@
     ), ":\t\t\t\treset client_md4/client_private_key to random values";
 
     "bp", Arg_multiple (fun args o ->
+        if CommonUserDb.user2_is_admin o.conn_user.ui_user then begin
         List.iter (fun arg ->
             let port = int_of_string arg in
             port_black_list =:=  port :: !!port_black_list;
         ) args;
         "done"
+        end else
+          _s "You are not allowed to blacklist ports"
     ), "<port1> <port2> ... :\t\tadd these ports to the port black list";
   ]