Changeset 6823

Timestamp:

Oct 1, 2008, 8:23:57 PM (13 years ago)

Author:

charles

Message:

#1309: Web/RPC interface ACL ignored

Location:

trunk

Files:

• cli/cli.c (modified) (1 diff)
• daemon/daemon.c (modified) (11 diffs)
• daemon/transmission-daemon.1 (modified) (1 diff)
• gtk/main.c (modified) (2 diffs)
• gtk/tr-prefs.c (modified) (15 diffs)
• gtk/tr-prefs.h (modified) (1 diff)
• libtransmission/rpc-server.c (modified) (15 diffs)
• libtransmission/rpc-server.h (modified) (3 diffs)
• libtransmission/session.c (modified) (4 diffs)
• libtransmission/transmission.h (modified) (5 diffs)
• libtransmission/trevent.c (modified) (1 diff)

trunk/cli/cli.c

@@ -311 +311 @@
         TR_DEFAULT_RPC_ENABLED,
         TR_DEFAULT_RPC_PORT,
-        TR_DEFAULT_RPC_ACL,
+        TR_DEFAULT_RPC_WHITELIST,
         FALSE, "fnord", "potzrebie",
         TR_DEFAULT_PROXY_ENABLED,

trunk/daemon/daemon.c

@@ -45 +45 @@
 #define KEY_USERNAME         "rpc-username"
 #define KEY_PASSWORD         "rpc-password"
-#define KEY_ACL              "rpc-access-control-list"
+#define KEY_WHITELIST        "rpc-whitelist"
 #define KEY_RPC_PORT         "rpc-port"
 #define KEY_DSPEED           "download-limit"
@@ -100 +100 @@
                    tr_sessionGetRPCPassword(
                        s ) );
-    replaceStr( &d, KEY_ACL,             strs[n++] = tr_sessionGetRPCACL( s ) );
+    replaceStr( &d, KEY_WHITELIST,       strs[n++] = tr_sessionGetRPCWhitelist( s ) );
     replaceInt( &d, KEY_RPC_PORT,        tr_sessionGetRPCPort( s ) );
     replaceInt( &d, KEY_AUTH_REQUIRED,   tr_sessionIsRPCPasswordEnabled( s ) );
@@ -161 +161 @@
               const char * downloadDir,
               int          rpcPort,
-              const char * acl,
+              const char * whitelist,
               int          authRequired,
               const char * username,
@@ -209 +209 @@
     getConfigInt( dict, KEY_RPC_PORT,        &rpcPort,
                   TR_DEFAULT_RPC_PORT );
-    getConfigStr( dict, KEY_ACL,             &acl,
-                  TR_DEFAULT_RPC_ACL );
+    getConfigStr( dict, KEY_WHITELIST,       &whitelist,
+                  TR_DEFAULT_RPC_WHITELIST );
     getConfigInt( dict, KEY_AUTH_REQUIRED,   &authRequired,      FALSE );
     getConfigStr( dict, KEY_USERNAME,        &username,          NULL );
@@ -232 +232 @@
                                     blocklistEnabled,
                                     TR_DEFAULT_PEER_SOCKET_TOS,
-                                    TRUE, rpcPort, acl, authRequired,
+                                    TRUE, rpcPort, whitelist, authRequired,
                                     username, password,
                                     TR_DEFAULT_PROXY_ENABLED,
@@ -271 +271 @@
 static const struct tr_option options[] =
 {
-    { 'a', "acl",
-      "Access Control List.  (Default: " TR_DEFAULT_RPC_ACL ")",       "a",
+    { 'a', "allowed",
+      "Allowed IP addresses.  (Default: " TR_DEFAULT_RPC_WHITELIST ")",       "a",
       1, "<list>"     },
     { 'b', "blocklist",    "Enable peer blocklists",
@@ -313 +313 @@
           const char ** downloadDir,
           int *         rpcPort,
-          const char ** acl,
+          const char ** whitelist,
           int *         authRequired,
           const char ** username,
@@ -327 +327 @@
         {
             case 'a':
-                *acl = optarg; break;
+                *whitelist = optarg; break;
 
             case 'b':
@@ -458 +458 @@
     const char * configDir = NULL;
     const char * downloadDir = NULL;
-    const char * acl = NULL;
+    const char * whitelist = NULL;
     const char * username = NULL;
     const char * password = NULL;
@@ -469 +469 @@
 
     readargs( argc, (const char**)argv, &nofork, &configDir, &downloadDir,
-              &rpcPort, &acl, &authRequired, &username, &password,
+              &rpcPort, &whitelist, &authRequired, &username, &password,
               &blocklistEnabled );
     if( configDir == NULL )
@@ -487 +487 @@
 
     session_init( configDir, downloadDir,
-                  rpcPort, acl, authRequired, username, password,
+                  rpcPort, whitelist, authRequired, username, password,
                   blocklistEnabled );
 

trunk/daemon/transmission-daemon.1

@@ -31 +31 @@
 .Bl -tag -width Ds
 
-.It Fl a Fl -acl Ar (+|-)x.x.x.x,...
-Specify access control list (ACL) to control which hosts may submit RPC requests.
-This is a comma-separated list of IP addresses, each prepended by a '-' or '+'
-to denote that access should be denied or allowed to that address.
+.It Fl a Fl -allowed Ar x.x.x.x,...
+Allow RPC accecss to a comma-delimited whitelist of IP addresses.
 Wildcards can be specified in an address by using '*'.
-Default: +127.0.0.1
+Default: "127.0.0.1"
+Example: "127.0.0.*,192.168.1.*"
 
 .It Fl b Fl -blocklist

trunk/gtk/main.c

@@ -485 +485 @@
             pref_flag_get( PREF_KEY_RPC_ENABLED ),
             pref_int_get( PREF_KEY_RPC_PORT ),
-            pref_string_get( PREF_KEY_RPC_ACL ),
+            pref_string_get( PREF_KEY_RPC_WHITELIST ),
             pref_flag_get( PREF_KEY_RPC_AUTH_ENABLED ),
             pref_string_get( PREF_KEY_RPC_USERNAME ),
@@ -1193 +1193 @@
         tr_sessionSetRPCEnabled( tr, pref_flag_get( key ) );
     }
-    else if( !strcmp( key, PREF_KEY_RPC_ACL ) )
+    else if( !strcmp( key, PREF_KEY_RPC_WHITELIST ) )
     {
         const char * s = pref_string_get( key );
-        tr_sessionSetRPCACL( tr, s );
+        tr_sessionSetRPCWhitelist( tr, s );
     }
     else if( !strcmp( key, PREF_KEY_RPC_USERNAME ) )

trunk/gtk/tr-prefs.c

@@ -128 +128 @@
     pref_flag_set_default   ( PREF_KEY_RPC_ENABLED, TR_DEFAULT_RPC_ENABLED );
     pref_int_set_default    ( PREF_KEY_RPC_PORT, TR_DEFAULT_RPC_PORT );
-    pref_string_set_default ( PREF_KEY_RPC_ACL, TR_DEFAULT_RPC_ACL );
+    pref_string_set_default ( PREF_KEY_RPC_WHITELIST, TR_DEFAULT_RPC_WHITELIST );
 
     rand = g_rand_new ( );
@@ -557 +557 @@
 ****/
 
-static GtkTreeModel*
-allow_deny_model_new( void )
-{
-    GtkTreeIter    iter;
-    GtkListStore * store = gtk_list_store_new( 2, G_TYPE_STRING,
-                                               G_TYPE_CHAR );
-
-    gtk_list_store_append( store, &iter );
-    gtk_list_store_set( store, &iter, 0, _( "Allow" ), 1, '+', -1 );
-    gtk_list_store_append( store, &iter );
-    gtk_list_store_set( store, &iter, 0, _( "Deny" ), 1, '-', -1 );
-    return GTK_TREE_MODEL( store );
-}
-
 enum
 {
     COL_ADDRESS,
-    COL_PERMISSION,
     N_COLS
 };
 
 static GtkTreeModel*
-acl_tree_model_new( const char * acl )
+whitelist_tree_model_new( const char * whitelist )
 {
     int            i;
@@ -587 +572 @@
                                                G_TYPE_STRING );
 
-    rules = g_strsplit( acl, ",", 0 );
+    rules = g_strsplit( whitelist, ",", 0 );
 
     for( i = 0; rules && rules[i]; ++i )
     {
+        GtkTreeIter iter;
         const char * s = rules[i];
         while( isspace( *s ) ) ++s;
-
-        if( *s == '+' || *s == '-' )
-        {
-            GtkTreeIter iter;
-            gtk_list_store_append( store, &iter );
-            gtk_list_store_set( store, &iter,
-                                COL_PERMISSION, *s == '+' ? _(
-                                    "Allow" ) : _( "Deny" ),
-                                COL_ADDRESS, s + 1,
-                                -1 );
-        }
+        gtk_list_store_append( store, &iter );
+        gtk_list_store_set( store, &iter, COL_ADDRESS, s, -1 );
     }
 
@@ -623 +600 @@
 
 static void
-refreshACL( struct remote_page * page )
+refreshWhitelist( struct remote_page * page )
 {
     GtkTreeIter    iter;
@@ -631 +608 @@
     if( gtk_tree_model_get_iter_first( model, &iter ) ) do
         {
-            char * permission;
             char * address;
-            gtk_tree_model_get( model, &iter, COL_PERMISSION, &permission,
+            gtk_tree_model_get( model, &iter,
                                 COL_ADDRESS, &address,
                                 -1 );
-            g_string_append_c( gstr, strcmp( permission, _(
-                                                "Allow" ) ) ? '-' : '+' );
             g_string_append( gstr, address );
-            g_string_append( gstr, ", " );
+            g_string_append( gstr, "," );
             g_free( address );
-            g_free( permission );
         }
         while( gtk_tree_model_iter_next( model, &iter ) );
 
-    g_string_truncate( gstr, gstr->len - 2 ); /* remove the trailing ", " */
-
-    tr_core_set_pref( page->core, PREF_KEY_RPC_ACL, gstr->str );
+    g_string_truncate( gstr, gstr->len - 1 ); /* remove the trailing comma */
+
+    tr_core_set_pref( page->core, PREF_KEY_RPC_WHITELIST, gstr->str );
 
     g_string_free( gstr, TRUE );
-}
-
-static void
-onPermissionEdited( GtkCellRendererText  * renderer UNUSED,
-                    gchar *                         path_string,
-                    gchar *                         new_text,
-                    gpointer                        gpage )
-{
-    GtkTreeIter          iter;
-    GtkTreePath *        path = gtk_tree_path_new_from_string( path_string );
-    struct remote_page * page = gpage;
-    GtkTreeModel *       model = GTK_TREE_MODEL( page->store );
-
-    if( gtk_tree_model_get_iter( model, &iter, path ) )
-        gtk_list_store_set( page->store, &iter, COL_PERMISSION, new_text,
-                            -1 );
-    gtk_tree_path_free( path );
-    refreshACL( page );
 }
 
@@ -673 +628 @@
 onAddressEdited( GtkCellRendererText  * r UNUSED,
                  gchar *                  path_string,
-                 gchar *                  new_text,
+                 gchar *                  address,
                  gpointer                 gpage )
 {
-    char *               acl;
     GtkTreeIter          iter;
     struct remote_page * page = gpage;
@@ -682 +636 @@
     GtkTreePath *        path = gtk_tree_path_new_from_string( path_string );
 
-    acl = g_strdup_printf( "+%s", new_text );
     if( gtk_tree_model_get_iter( model, &iter, path ) )
-        gtk_list_store_set( page->store, &iter, COL_ADDRESS, new_text, -1 );
-
-    g_free( acl );
+        gtk_list_store_set( page->store, &iter, COL_ADDRESS, address, -1 );
+
     gtk_tree_path_free( path );
-    refreshACL( page );
-}
-
-static void
-onAddACLClicked( GtkButton * b UNUSED,
+    refreshWhitelist( page );
+}
+
+static void
+onAddWhitelistClicked( GtkButton * b UNUSED,
                  gpointer      gpage )
 {
@@ -701 +653 @@
     gtk_list_store_append( page->store, &iter );
     gtk_list_store_set( page->store, &iter,
-                        COL_PERMISSION, _( "Allow" ),
                         COL_ADDRESS,  "0.0.0.0",
                         -1 );
@@ -714 +665 @@
 
 static void
-onRemoveACLClicked( GtkButton * b UNUSED,
+onRemoveWhitelistClicked( GtkButton * b UNUSED,
                     gpointer      gpage )
 {
@@ -724 +675 @@
     {
         gtk_list_store_remove( page->store, &iter );
-        refreshACL( page );
+        refreshWhitelist( page );
     }
 }
@@ -762 +713 @@
 
 static void
-onACLSelectionChanged( GtkTreeSelection * sel UNUSED,
+onWhitelistSelectionChanged( GtkTreeSelection * sel UNUSED,
                        gpointer               page )
 {
@@ -841 +792 @@
     /* access control list */
     {
-        const char *        val = pref_string_get( PREF_KEY_RPC_ACL );
-        GtkTreeModel *      m = acl_tree_model_new( val );
+        const char *        val = pref_string_get( PREF_KEY_RPC_WHITELIST );
+        GtkTreeModel *      m = whitelist_tree_model_new( val );
         GtkTreeViewColumn * c;
         GtkCellRenderer *   r;
@@ -851 +802 @@
         GtkTooltips *       tips = gtk_tooltips_new( );
 
-        s = _( "Access control list:" );
         page->store = GTK_LIST_STORE( m );
         w = gtk_tree_view_new_with_model( m );
@@ -865 +815 @@
         sel = gtk_tree_view_get_selection( v );
         g_signal_connect( sel, "changed",
-                          G_CALLBACK( onACLSelectionChanged ), page );
+                          G_CALLBACK( onWhitelistSelectionChanged ), page );
         g_object_unref( G_OBJECT( m ) );
         gtk_tree_view_set_headers_visible( v, TRUE );
@@ -877 +827 @@
                           G_CALLBACK( onAddressEdited ), page );
         g_object_set( G_OBJECT( r ), "editable", TRUE, NULL );
-        c = gtk_tree_view_column_new_with_attributes( _( "IP Address" ), r,
+        c = gtk_tree_view_column_new_with_attributes( NULL, r,
                                                       "text", COL_ADDRESS,
                                                       NULL );
         gtk_tree_view_column_set_expand( c, TRUE );
         gtk_tree_view_append_column( v, c );
-
+        gtk_tree_view_set_headers_visible( v, FALSE );
+
+        s = _( "Allowed _IP Addresses:" );
         w = hig_workarea_add_row( t, &row, s, w, NULL );
-        gtk_misc_set_alignment( GTK_MISC( w ), 0.0f, 0.1f );
+        gtk_misc_set_alignment( GTK_MISC( w ), 0.0f, 0.0f );
+        gtk_misc_set_padding( GTK_MISC( w ), 0, GUI_PAD );
         page->widgets = g_slist_append( page->widgets, w );
-
-        /* permission column */
-        m = allow_deny_model_new( );
-        r = gtk_cell_renderer_combo_new( );
-        g_object_set( G_OBJECT( r ), "model", m,
-                      "editable", TRUE,
-                      "has-entry", FALSE,
-                      "text-column", 0,
-                      NULL );
-        c = gtk_tree_view_column_new_with_attributes( _(
-                                                          "Permission" ), r,
-                                                      "text",
-                                                      COL_PERMISSION,
-                                                      NULL );
-        g_signal_connect( r, "edited",
-                          G_CALLBACK( onPermissionEdited ), page );
-        gtk_tree_view_append_column( v, c );
 
         h = gtk_hbox_new( TRUE, GUI_PAD );
         w = gtk_button_new_from_stock( GTK_STOCK_REMOVE );
         g_signal_connect( w, "clicked", G_CALLBACK(
-                              onRemoveACLClicked ), page );
+                              onRemoveWhitelistClicked ), page );
         page->remove_button = w;
-        onACLSelectionChanged( sel, page );
+        onWhitelistSelectionChanged( sel, page );
         gtk_box_pack_start_defaults( GTK_BOX( h ), w );
         w = gtk_button_new_from_stock( GTK_STOCK_ADD );
         page->widgets = g_slist_append( page->widgets, w );
-        g_signal_connect( w, "clicked", G_CALLBACK( onAddACLClicked ), page );
+        g_signal_connect( w, "clicked", G_CALLBACK( onAddWhitelistClicked ), page );
         gtk_box_pack_start_defaults( GTK_BOX( h ), w );
         w = gtk_hbox_new( FALSE, 0 );

trunk/gtk/tr-prefs.h

@@ -66 +66 @@
 #define PREF_KEY_RPC_PORT               "rpc-port"
 #define PREF_KEY_RPC_ENABLED            "rpc-enabled"
-#define PREF_KEY_RPC_ACL                "rpc-access-control-list"
+#define PREF_KEY_RPC_WHITELIST          "rpc-whitelist"
 #define PREF_KEY_RPC_AUTH_ENABLED       "rpc-authentication-required"
 #define PREF_KEY_RPC_PASSWORD           "rpc-password"

trunk/libtransmission/rpc-server.c

@@ -21 +21 @@
 
 #ifdef HAVE_LIBZ
-#include <zlib.h>
+ #include <zlib.h>
 #endif
 
@@ -43 +43 @@
 struct tr_rpc_server
 {
-    unsigned int     isEnabled         : 1;
-    unsigned int     isPasswordEnabled : 1;
-    uint16_t         port;
-    struct evhttp *  httpd;
-    tr_handle *      session;
-    char *           username;
-    char *           password;
-    char *           acl;
+    unsigned int       isEnabled         : 1;
+    unsigned int       isPasswordEnabled : 1;
+    uint16_t           port;
+    struct evhttp *    httpd;
+    tr_handle *        session;
+    char *             username;
+    char *             password;
+    char *             whitelist;
 };
 
-#define dbgmsg( fmt... ) tr_deepLog( __FILE__, __LINE__, MY_NAME, ## fmt )
+#define dbgmsg( fmt ... ) tr_deepLog( __FILE__, __LINE__, MY_NAME, ## fmt )
 
 /**
@@ -188 +188 @@
     const struct
     {
-        const char *  suffix;
-        const char *  mime_type;
+        const char *    suffix;
+        const char *    mime_type;
     } types[] = {
         /* these are just the ones we need for serving clutch... */
-        { "css",  "text/css"                   },
-        { "gif",  "image/gif"                  },
-        { "html", "text/html"                  },
-        { "ico",  "image/vnd.microsoft.icon"   },
-        { "js",   "application/javascript"     },
-        { "png",  "image/png"                  }
+        { "css",  "text/css"                       },
+        { "gif",  "image/gif"                      },
+        { "html", "text/html"                      },
+        { "ico",  "image/vnd.microsoft.icon"       },
+        { "js",   "application/javascript"         },
+        { "png",  "image/png"                      }
     };
     const char * dot = strrchr( path, '.' );
@@ -212 +212 @@
 compress_evbuf( struct evbuffer * evbuf )
 {
-    static struct evbuffer *tmp;
-    static z_stream stream;
-    static unsigned char buffer[2048];
-    
-    if( !tmp ) {
+    static struct evbuffer * tmp;
+    static z_stream          stream;
+    static unsigned char     buffer[2048];
+
+    if( !tmp )
+    {
         tmp = evbuffer_new( );
         deflateInit( &stream, Z_BEST_COMPRESSION );
@@ -222 +223 @@
 
     deflateReset( &stream );
-    stream.next_in = EVBUFFER_DATA(evbuf);
-    stream.avail_in = EVBUFFER_LENGTH(evbuf);
-
-    do {
+    stream.next_in = EVBUFFER_DATA( evbuf );
+    stream.avail_in = EVBUFFER_LENGTH( evbuf );
+
+    do
+    {
         stream.next_out = buffer;
         stream.avail_out = sizeof( buffer );
@@ -232 +234 @@
         else
             break;
-    } while (stream.avail_out == 0);
-
-/*fprintf( stderr, "deflated response from %zu to %zu bytes\n", EVBUFFER_LENGTH( evbuf ), EVBUFFER_LENGTH( tmp ) );*/
-    evbuffer_drain(evbuf, EVBUFFER_LENGTH(evbuf));
-    evbuffer_add_buffer(evbuf, tmp);
-}
+    }
+    while( stream.avail_out == 0 );
+
+/*fprintf( stderr, "deflated response from %zu to %zu bytes\n", EVBUFFER_LENGTH(
+  evbuf ), EVBUFFER_LENGTH( tmp ) );*/
+    evbuffer_drain( evbuf, EVBUFFER_LENGTH( evbuf ) );
+    evbuffer_add_buffer( evbuf, tmp );
+}
+
 #endif
 
 static void
-maybe_deflate_response( struct evhttp_request * req, struct evbuffer * response )
+maybe_deflate_response( struct evhttp_request * req,
+                        struct evbuffer *       response )
 {
 #ifdef HAVE_LIBZ
-    const char * accept_encoding = evhttp_find_header( req->input_headers, "Accept-Encoding" );
-    const int do_deflate = accept_encoding && strstr( accept_encoding, "deflate" );
-    if( do_deflate ) {
-        evhttp_add_header( req->output_headers, "Content-Encoding", "deflate" );
+    const char * accept_encoding = evhttp_find_header( req->input_headers,
+                                                       "Accept-Encoding" );
+    const int    do_deflate = accept_encoding && strstr( accept_encoding,
+                                                         "deflate" );
+    if( do_deflate )
+    {
+        evhttp_add_header( req->output_headers, "Content-Encoding",
+                           "deflate" );
         compress_evbuf( response );
     }
@@ -316 +326 @@
 }
 
-
 static void
 handle_rpc( struct evhttp_request * req,
@@ -357 +366 @@
                   const char *          address )
 {
-    const char * acl;
-
-    for( acl = server->acl; acl && *acl; )
-    {
-        const char * delimiter = strchr( acl, ',' );
-        const int    len = delimiter ? delimiter - acl : (int)strlen( acl );
-        char *       token = tr_strndup( acl, len );
-        const int    match = tr_wildmat( address, token + 1 );
+    const char * str;
+
+    for( str = server->whitelist; str && *str; )
+    {
+        const char * delimiter = strchr( str, ',' );
+        const int    len = delimiter ? delimiter - str : (int)strlen( str );
+        char *       token = tr_strndup( str, len );
+        const int    match = tr_wildmat( address, token );
         tr_free( token );
         if( match )
-            return *acl == '+';
+            return 1;
         if( !delimiter )
             break;
-        acl = delimiter + 1;
+        str = delimiter + 1;
     }
 
@@ -403 +412 @@
         }
 
-        if( server->acl && !isAddressAllowed( server, req->remote_host ) )
+        if( server->whitelist && !isAddressAllowed( server, req->remote_host ) )
         {
             send_simple_response( req, 401, "Unauthorized IP Address" );
@@ -481 +490 @@
         startServer( server );
 }
-    
 
 void
@@ -530 +538 @@
 
 void
-tr_rpcSetACL( tr_rpc_server * server,
-              const char *    acl )
-{
-    tr_free( server->acl );
-    server->acl = tr_strdup( acl );
+tr_rpcSetWhitelist( tr_rpc_server * server,
+                    const char *    whitelist )
+{
+    tr_free( server->whitelist );
+    server->whitelist = tr_strdup( whitelist );
 }
 
 char*
-tr_rpcGetACL( const tr_rpc_server * server )
-{
-    return tr_strdup( server->acl ? server->acl : "" );
+tr_rpcGetWhitelist( const tr_rpc_server * server )
+{
+    return tr_strdup( server->whitelist ? server->whitelist : "" );
 }
 
@@ -599 +607 @@
 {
     tr_rpc_server * s = vserver;
+
     stopServer( s );
-    tr_free( s->acl );
+    tr_free( s->whitelist );
     tr_free( s->username );
     tr_free( s->password );
@@ -609 +618 @@
 tr_rpcClose( tr_rpc_server ** ps )
 {
-    tr_runInEventThread( (*ps)->session, closeServer, *ps );
+    tr_runInEventThread( ( *ps )->session, closeServer, *ps );
     *ps = NULL;
 }
@@ -617 +626 @@
             int          isEnabled,
             uint16_t     port,
-            const char * acl,
+            const char * whitelist,
             int          isPasswordEnabled,
             const char * username,
@@ -627 +636 @@
     s->session = session;
     s->port = port;
-    s->acl = tr_strdup( acl && *acl ? acl : TR_DEFAULT_RPC_ACL );
+    s->whitelist = tr_strdup( whitelist && *whitelist ? whitelist : TR_DEFAULT_RPC_WHITELIST );
     s->username = tr_strdup( username );
     s->password = tr_strdup( password );

trunk/libtransmission/rpc-server.h

@@ -19 +19 @@
                             int                isEnabled,
                             uint16_t           port,
-                            const char *       acl,
+                            const char *       whitelist,
                             int                isPasswordEnabled,
                             const char *       username,
@@ -37 +37 @@
 
 int             tr_rpcSetTest( const tr_rpc_server * server,
-                               const char *          acl,
+                               const char *          whitelist,
                                char **               allocme_errmsg );
 
-void            tr_rpcSetACL( tr_rpc_server * server,
-                              const char *    acl );
+void            tr_rpcSetWhitelist( tr_rpc_server * server,
+                                    const char *    whitelist );
 
-char*           tr_rpcGetACL( const tr_rpc_server * server );
+char*           tr_rpcGetWhitelist( const tr_rpc_server * server );
 
 void            tr_rpcSetPassword( tr_rpc_server * server,
@@ -60 +60 @@
 int             tr_rpcIsPasswordEnabled( const tr_rpc_server * session );
 
-/** (public for the unit tests) */
-char*           cidrize( const char * acl );
-
 
 #endif

trunk/libtransmission/session.c

@@ -217 +217 @@
                     int                rpcIsEnabled,
                     uint16_t           rpcPort,
-                    const char *       rpcACL,
+                    const char *       rpcWhitelist,
                     int                rpcAuthIsEnabled,
                     const char *       rpcUsername,
@@ -295 +295 @@
 
     h->web = tr_webInit( h );
-    h->rpcServer = tr_rpcInit( h, rpcIsEnabled, rpcPort, rpcACL,
+    h->rpcServer = tr_rpcInit( h, rpcIsEnabled, rpcPort, rpcWhitelist,
                                rpcAuthIsEnabled, rpcUsername, rpcPassword );
 
@@ -327 +327 @@
                                TR_DEFAULT_RPC_ENABLED,
                                TR_DEFAULT_RPC_PORT,
-                               TR_DEFAULT_RPC_ACL,
+                               TR_DEFAULT_RPC_WHITELIST,
                                FALSE,
                                "fnord",
@@ -1004 +1004 @@
 
 void
-tr_sessionSetRPCACL( tr_session * session,
-                     const char * acl )
-{
-    return tr_rpcSetACL( session->rpcServer, acl );
+tr_sessionSetRPCWhitelist( tr_session * session,
+                           const char * whitelist )
+{
+    return tr_rpcSetWhitelist( session->rpcServer, whitelist );
 }
 
 char*
-tr_sessionGetRPCACL( const tr_session * session )
-{
-    return tr_rpcGetACL( session->rpcServer );
+tr_sessionGetRPCWhitelist( const tr_session * session )
+{
+    return tr_rpcGetWhitelist( session->rpcServer );
 }
 

trunk/libtransmission/transmission.h

@@ -130 +130 @@
 #define TR_DEFAULT_RPC_PORT_STR             "9091"
 /** @see tr_sessionInitFull */
-#define TR_DEFAULT_RPC_ACL                  "+127.0.0.1"
+#define TR_DEFAULT_RPC_WHITELIST            "127.0.0.1"
 /** @see tr_sessionInitFull */
 #define TR_DEFAULT_PROXY_ENABLED            0
@@ -237 +237 @@
  *  The port on which to listen for incoming RPC requests
  *
- * @param rpcACL
- *  The access control list for allowing/denying RPC requests
- *  from specific IP ranges.
- *  @see tr_sessionSetRPCACL()
+ * @param rpcWhitelist
+ *  The list of IP addresses allowed to make RPC connections.
+ *  @see tr_sessionSetRPCWhitelist()
  *
  * @see TR_DEFAULT_PEER_SOCKET_TOS
@@ -246 +245 @@
  * @see TR_DEFAULT_RPC_ENABLED
  * @see TR_DEFAULT_RPC_PORT
- * @see TR_DEFAULT_RPC_ACL
+ * @see TR_DEFAULT_RPC_WHITELIST
  * @see tr_sessionClose()
  */
@@ -268 +267 @@
                                 int                rpcIsEnabled,
                                 uint16_t           rpcPort,
-                                const char *       rpcAccessControlList,
+                                const char *       rpcWhitelist,
                                 int                rpcPasswordIsEnabled,
                                 const char *       rpcUsername,
@@ -347 +346 @@
 
 /**
- * @brief Specify access control list (ACL).
- *
- * ACL is a comma-delimited list of dotted-quad IP addresses, each preceded
- * by a '+' or '-' sign to denote 'allow' or 'deny'.  Wildmat notation is
- * supported, meaning that '?' is interpreted as a single-character wildcard
- * and '*' is interprted as a multi-character wildcard.
- */
-void   tr_sessionSetRPCACL( tr_session * session,
-                            const char * acl );
+ * @brief Specify a whitelist for remote RPC access
+ *
+ * The whitelist is a comma-separated list of dotted-quad IP addresses
+ * to be allowed.  Wildmat notation is supported, meaning that
+ * '?' is interpreted as a single-character wildcard and
+ * '*' is interprted as a multi-character wildcard.
+ */
+void   tr_sessionSetRPCWhitelist( tr_session * session,
+                                  const char * whitelist );
 
 /** @brief get the Access Control List for allowing/denying RPC requests.
-    @return a comma-separated string of ACL rules.  tr_free() when done.
+    @return a comma-separated string of whitelist domains.  tr_free() when done.
     @see tr_sessionInitFull
-    @see tr_sessionSetRPCACL */
-char* tr_sessionGetRPCACL( const tr_session * );
+    @see tr_sessionSetRPCWhitelist */
+char* tr_sessionGetRPCWhitelist( const tr_session * );
 
 void  tr_sessionSetRPCPassword( tr_session * session,

trunk/libtransmission/trevent.c

@@ -162 +162 @@
                veh );
     event_add( &eh->pipeEvent, NULL );
-
+    event_set_log_callback( logFunc );
     event_dispatch( );