Changeset 7450 for branches/1.4x/libtransmission/rpc-server.c

Timestamp:

Dec 21, 2008, 7:23:42 PM (12 years ago)

Author:

charles

Message:

(1.4x libT) add html and console hints about whitelist status & configuration

File:

• branches/1.4x/libtransmission/rpc-server.c (modified) (8 diffs)

branches/1.4x/libtransmission/rpc-server.c

@@ -56 +56 @@
     char *             username;
     char *             password;
-    char *             whitelist;
+    char *             whitelistStr;
+    tr_list *          whitelist;
 };
 
@@ -409 +410 @@
 }
 
-static int
+static tr_bool
 isAddressAllowed( const tr_rpc_server * server,
                   const char *          address )
 {
-    const char * str;
+    tr_list * l;
 
     if( !server->isWhitelistEnabled )
-        return 1;
-
-    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 1;
-        if( !delimiter )
-            break;
-        str = delimiter + 1;
-    }
-
-    return 0;
+        return TRUE;
+
+    for( l=server->whitelist; l!=NULL; l=l->next )
+        if( tr_wildmat( address, l->data ) )
+            return TRUE;
+
+    return FALSE;
 }
 
@@ -464 +455 @@
         if( !isAddressAllowed( server, req->remote_host ) )
         {
-            send_simple_response( req, 401, "Unauthorized IP Address" );
+            send_simple_response( req, 401,
+                "<p>Unauthorized IP Address.</p>"
+                "<p>Either disable the IP address whitelist or add your address to it.</p>"
+                "<p>If you're editing settings.json, see the 'rpc-whitelist' and 'rpc-whitelist-enabled' entries.</p>" );
         }
         else if( server->isPasswordEnabled
@@ -586 +580 @@
 void
 tr_rpcSetWhitelist( tr_rpc_server * server,
-                    const char *    whitelist )
-{
-    tr_free( server->whitelist );
-    server->whitelist = tr_strdup( whitelist );
+                    const char    * whitelistStr )
+{
+    void * tmp;
+    const char * walk;
+
+    /* keep the string */
+    tr_free( server->whitelistStr );
+    server->whitelistStr = tr_strdup( whitelistStr );
+
+    /* clear out the old whitelist entries */
+    while(( tmp = tr_list_pop_front( &server->whitelist )))
+        tr_free( tmp );
+
+    /* build the new whitelist entries */
+    for( walk=whitelistStr; walk && *walk; ) {
+        const char * delimiters = " ,;";
+        const size_t len = strcspn( walk, delimiters );
+        char * token = tr_strndup( walk, len );
+        tr_list_append( &server->whitelist, token );
+        tr_ninf( MY_NAME, "Adding address to whitelist: [%s]", token );
+        if( walk[len]=='\0' )
+            break;
+        walk += len + 1;
+    }
 }
 
@@ -595 +609 @@
 tr_rpcGetWhitelist( const tr_rpc_server * server )
 {
-    return tr_strdup( server->whitelist ? server->whitelist : "" );
+    return tr_strdup( server->whitelistStr ? server->whitelistStr : "" );
 }
 
@@ -666 +680 @@
 closeServer( void * vserver )
 {
+    void * tmp;
     tr_rpc_server * s = vserver;
 
     stopServer( s );
-    tr_free( s->whitelist );
+    while(( tmp = tr_list_pop_front( &s->whitelist )))
+        tr_free( tmp );
+    tr_free( s->whitelistStr );
     tr_free( s->username );
     tr_free( s->password );
@@ -697 +714 @@
     s->session = session;
     s->port = port;
-    s->whitelist = tr_strdup( whitelist && *whitelist
-                              ? whitelist
-                              : TR_DEFAULT_RPC_WHITELIST );
     s->username = tr_strdup( username );
     s->password = tr_strdup( password );
@@ -705 +719 @@
     s->isPasswordEnabled = isPasswordEnabled != 0;
     s->isEnabled = isEnabled != 0;
+    tr_rpcSetWhitelist( s, whitelist ? whitelist : TR_DEFAULT_RPC_WHITELIST );
     if( isEnabled )
         tr_runInEventThread( session, startServer, s );
+
+    if( isEnabled )
+    {
+        tr_ninf( MY_NAME, _( "Serving RPC and Web requests on port %d" ), (int)port );
+
+        if( isWhitelistEnabled )
+            tr_ninf( MY_NAME, _( "Whitelist enabled" ) );
+
+        if( isPasswordEnabled )
+            tr_ninf( MY_NAME, _( "Password required" ) );
+    }
+
     return s;
 }