Changeset 6049 for trunk/libtransmission/rpc-server.c

Timestamp:

Jun 5, 2008, 4:23:03 PM (14 years ago)

Author:

charles

Message:

get RPC password protections working in libT and the gtk+ client. mac, daemon, and cli need to be synced.

File:

• trunk/libtransmission/rpc-server.c (modified) (11 diffs)

trunk/libtransmission/rpc-server.c

@@ -17 +17 @@
 #include <string.h>
 
+#include <unistd.h> /* unlink */
+
 #include <libevent/event.h>
+#include <shttpd/defs.h> /* edit_passwords */
 #include <shttpd/shttpd.h>
 
@@ -26 +29 @@
 
 #define MY_NAME "RPC Server"
+#define MY_REALM "Transmission RPC Server"
 
 #define BUSY_INTERVAL_MSEC 30
@@ -40 +44 @@
     struct evbuffer * out;
     struct event timer;
+    int isPasswordEnabled;
+    char * username;
+    char * password;
     char * acl;
 };
@@ -121 +128 @@
 
 static void
+getPasswordFile( tr_rpc_server * server, char * buf, int buflen )
+{
+    tr_buildPath( buf, buflen, tr_sessionGetConfigDir( server->session ),
+                               "htpasswd",
+                               NULL );
+}
+
+static void
 startServer( tr_rpc_server * server )
 {
@@ -128 +143 @@
     {
         char ports[128];
+        char passwd[MAX_PATH_LENGTH];
         struct timeval tv = tr_timevalMsec( UNUSED_INTERVAL_MSEC );
+
+        getPasswordFile( server, passwd, sizeof( passwd ) );
+        if( !server->isPasswordEnabled )
+            unlink( passwd );
+        else
+            edit_passwords( passwd, MY_REALM, "user", "pass" );
 
         server->ctx = shttpd_init( );
@@ -136 +158 @@
         shttpd_set_option( server->ctx, "dir_list", "0" );
         shttpd_set_option( server->ctx, "root", "/dev/null" );
+        shttpd_set_option( server->ctx, "auth_realm", MY_REALM );
         if( server->acl ) {
             dbgmsg( "setting acl [%s]", server->acl );
             shttpd_set_option( server->ctx, "acl", server->acl );
         }
+        if( server->isPasswordEnabled ) {
+            char * buf = tr_strdup_printf( "/transmission=%s", passwd );
+            shttpd_set_option( server->ctx, "protect", buf );
+            tr_free( buf );
+        }
 
         evtimer_set( &server->timer, rpcPulse, server );
@@ -151 +179 @@
     if( server->ctx )
     {
+        char passwd[MAX_PATH_LENGTH];
+        getPasswordFile( server, passwd, sizeof( passwd ) );
+        unlink( passwd );
+
         evtimer_del( &server->timer );
         shttpd_fini( server->ctx );
@@ -193 +225 @@
     return server->port;
 }
+
+/****
+*****  ACL
+****/
 
 /*
@@ -328 +364 @@
 }
 
-const char*
+char*
 tr_rpcGetACL( const tr_rpc_server * server )
 {
-    return server->acl ? server->acl : "";
-}
+    return tr_strdup( server->acl ? server->acl : "" );
+}
+
+/****
+*****  PASSWORD
+****/
+
+void
+tr_rpcSetUsername( tr_rpc_server        * server,
+                   const char           * username )
+{
+    const int isRunning = server->ctx != NULL;
+
+    if( isRunning )
+        stopServer( server );
+
+    tr_free( server->username );
+    server->username = tr_strdup( username );
+    dbgmsg( "setting our Username to [%s]", server->username );
+
+    if( isRunning )
+        startServer( server );
+}
+
+char*
+tr_rpcGetUsername( const tr_rpc_server  * server )
+{
+    return tr_strdup( server->username ? server->username : "" );
+}
+
+void
+tr_rpcSetPassword( tr_rpc_server        * server,
+                   const char           * password )
+{
+    const int isRunning = server->ctx != NULL;
+
+    if( isRunning )
+        stopServer( server );
+
+    tr_free( server->password );
+    server->password = tr_strdup( password );
+    dbgmsg( "setting our Password to [%s]", server->password );
+
+    if( isRunning )
+        startServer( server );
+}
+
+char*
+tr_rpcGetPassword( const tr_rpc_server  * server )
+{
+    return tr_strdup( server->password ? server->password : "" );
+}
+
+void
+tr_rpcSetPasswordEnabled( tr_rpc_server  * server,
+                          int              isEnabled )
+{
+    const int isRunning = server->ctx != NULL;
+
+    if( isRunning )
+        stopServer( server );
+
+    server->isPasswordEnabled = isEnabled;
+    dbgmsg( "setting 'password enabled' to %d", isEnabled );
+
+    if( isRunning )
+        startServer( server );
+}
+
+int
+tr_rpcIsPasswordEnabled( const tr_rpc_server * server )
+{
+    return server->isPasswordEnabled;
+}
+
+/****
+*****  LIFE CYCLE
+****/
 
 void
@@ -351 +463 @@
             int           isEnabled,
             int           port,
-            const char  * acl )
+            const char  * acl,
+            int           isPasswordEnabled,
+            const char  * username,
+            const char  * password )
 {
     char * errmsg;
@@ -370 +485 @@
     s->out = evbuffer_new( );
     s->acl = tr_strdup( acl );
+    s->username = tr_strdup( username );
+    s->password = tr_strdup( password );
+    s->isPasswordEnabled = isPasswordEnabled;
    
     if( isEnabled )