Changes in / [9df916f:c2295f7]

Files:

• .bzrignore (modified) (1 diff)
• Makefile (modified) (1 diff)
• bitlbee.c (modified) (2 diffs)
• bitlbee.h (modified) (3 diffs)
• commands.c (modified) (5 diffs)
• conf.c (modified) (2 diffs)
• conf.h (modified) (1 diff)
• crypting.c (modified) (3 diffs)
• crypting.h (modified) (1 diff)
• irc.c (modified) (3 diffs)
• irc.h (modified) (1 diff)
• storage.c (deleted)
• storage.h (deleted)
• storage_text.c (deleted)
• unix.c (modified) (3 diffs)

.bzrignore

@@ -8 +8 @@
 build-arch-stamp
 tags
-decode
-encode

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o commands.o conf.o crypting.o help.o ini.o irc.o log.o nick.o query.o set.o unix.o url.o user.o storage_text.o storage.o
+objects = account.o bitlbee.o commands.o conf.o crypting.o help.o ini.o irc.o log.o nick.o query.o set.o unix.o url.o user.o
 subdirs = protocols
 

bitlbee.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "commands.h"
+#include "crypting.h"
 #include "protocols/nogaim.h"
 #include "help.h"
@@ -243 +244 @@
 }
 
+int bitlbee_load( irc_t *irc, const char* password )
+{
+        char s[512];
+        char *line;
+        int proto;
+        char nick[MAX_NICK_LENGTH+1];
+        FILE *fp;
+        user_t *ru = user_find( irc, ROOT_NICK );
+        
+        if( irc->status == USTATUS_IDENTIFIED )
+                return( 1 );
+        
+        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
+        fp = fopen( s, "r" );
+        if( !fp ) return( 0 );
+        
+        fscanf( fp, "%32[^\n]s", s );
+        if( setpass( irc, password, s ) < 0 )
+        {
+                fclose( fp );
+                return( -1 );
+        }
+        
+        /* Do this now. If the user runs with AuthMode = Registered, the
+           account command will not work otherwise. */
+        irc->status = USTATUS_IDENTIFIED;
+        
+        while( fscanf( fp, "%511[^\n]s", s ) > 0 )
+        {
+                fgetc( fp );
+                line = deobfucrypt( irc, s );
+                root_command_string( irc, ru, line, 0 );
+                g_free( line );
+        }
+        fclose( fp );
+        
+        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
+        fp = fopen( s, "r" );
+        if( !fp ) return( 0 );
+        while( fscanf( fp, "%s %d %s", s, &proto, nick ) > 0 )
+        {
+                http_decode( s );
+                nick_set( irc, s, proto, nick );
+        }
+        fclose( fp );
+        
+        if( set_getint( irc, "auto_connect" ) )
+        {
+                strcpy( s, "account on" );      /* Can't do this directly because r_c_s alters the string */
+                root_command_string( irc, ru, s, 0 );
+        }
+        
+        return( 1 );
+}
+
+int bitlbee_save( irc_t *irc )
+{
+        char s[512];
+        char path[512], new_path[512];
+        char *line;
+        nick_t *n;
+        set_t *set;
+        mode_t ou = umask( 0077 );
+        account_t *a;
+        FILE *fp;
+        char *hash;
+        
+        /*\
+         *  [SH] Nothing should be saved if no password is set, because the
+         *  password is not set if it was wrong, or if one is not identified
+         *  yet. This means that a malicious user could easily overwrite
+         *  files owned by someone else:
+         *  a Bad Thing, methinks
+        \*/
+
+        /* [WVG] No? Really? */
+
+        /*\
+         *  [SH] Okay, okay, it wasn't really Wilmer who said that, it was
+         *  me. I just thought it was funny.
+        \*/
+        
+        hash = hashpass( irc );
+        if( hash == NULL )
+        {
+                irc_usermsg( irc, "Please register yourself if you want to save your settings." );
+                return( 0 );
+        }
+        
+        g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks~" );
+        fp = fopen( path, "w" );
+        if( !fp ) return( 0 );
+        for( n = irc->nicks; n; n = n->next )
+        {
+                strcpy( s, n->handle );
+                s[169] = 0; /* Prevent any overflow (169 ~ 512 / 3) */
+                http_encode( s );
+                g_snprintf( s + strlen( s ), 510 - strlen( s ), " %d %s", n->proto, n->nick );
+                if( fprintf( fp, "%s\n", s ) != strlen( s ) + 1 )
+                {
+                        irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
+                        fclose( fp );
+                        return( 0 );
+                }
+        }
+        if( fclose( fp ) != 0 )
+        {
+                irc_usermsg( irc, "fclose() reported an error. Disk full?" );
+                return( 0 );
+        }
+  
+        g_snprintf( new_path, 512, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
+        if( unlink( new_path ) != 0 )
+        {
+                if( errno != ENOENT )
+                {
+                        irc_usermsg( irc, "Error while removing old .nicks file" );
+                        return( 0 );
+                }
+        }
+        if( rename( path, new_path ) != 0 )
+        {
+                irc_usermsg( irc, "Error while renaming new .nicks file" );
+                return( 0 );
+        }
+        
+        g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts~" );
+        fp = fopen( path, "w" );
+        if( !fp ) return( 0 );
+        if( fprintf( fp, "%s", hash ) != strlen( hash ) )
+        {
+                irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
+                fclose( fp );
+                return( 0 );
+        }
+        g_free( hash );
+
+        for( a = irc->accounts; a; a = a->next )
+        {
+                if( a->protocol == PROTO_OSCAR || a->protocol == PROTO_ICQ || a->protocol == PROTO_TOC )
+                        g_snprintf( s, sizeof( s ), "account add oscar \"%s\" \"%s\" %s", a->user, a->pass, a->server );
+                else
+                        g_snprintf( s, sizeof( s ), "account add %s \"%s\" \"%s\" \"%s\"",
+                                    proto_name[a->protocol], a->user, a->pass, a->server ? a->server : "" );
+                
+                line = obfucrypt( irc, s );
+                if( *line )
+                {
+                        if( fprintf( fp, "%s\n", line ) != strlen( line ) + 1 )
+                        {
+                                irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
+                                fclose( fp );
+                                return( 0 );
+                        }
+                }
+                g_free( line );
+        }
+        
+        for( set = irc->set; set; set = set->next )
+        {
+                if( set->value && set->def )
+                {
+                        g_snprintf( s, sizeof( s ), "set %s \"%s\"", set->key, set->value );
+                        line = obfucrypt( irc, s );
+                        if( *line )
+                        {
+                                if( fprintf( fp, "%s\n", line ) != strlen( line ) + 1 )
+                                {
+                                        irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
+                                        fclose( fp );
+                                        return( 0 );
+                                }
+                        }
+                        g_free( line );
+                }
+        }
+        
+        if( strcmp( irc->mynick, ROOT_NICK ) != 0 )
+        {
+                g_snprintf( s, sizeof( s ), "rename %s %s", ROOT_NICK, irc->mynick );
+                line = obfucrypt( irc, s );
+                if( *line )
+                {
+                        if( fprintf( fp, "%s\n", line ) != strlen( line ) + 1 )
+                        {
+                                irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
+                                fclose( fp );
+                                return( 0 );
+                        }
+                }
+                g_free( line );
+        }
+        if( fclose( fp ) != 0 )
+        {
+                irc_usermsg( irc, "fclose() reported an error. Disk full?" );
+                return( 0 );
+        }
+        
+        g_snprintf( new_path, 512, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
+        if( unlink( new_path ) != 0 )
+        {
+                if( errno != ENOENT )
+                {
+                        irc_usermsg( irc, "Error while removing old .accounts file" );
+                        return( 0 );
+                }
+        }
+        if( rename( path, new_path ) != 0 )
+        {
+                irc_usermsg( irc, "Error while renaming new .accounts file" );
+                return( 0 );
+        }
+        
+        umask( ou );
+        
+        return( 1 );
+}
+
 void bitlbee_shutdown( gpointer data )
 {

bitlbee.h

@@ -100 +100 @@
 
 #include "irc.h"
-#include "storage.h"
 #include "set.h"
 #include "protocols/nogaim.h"
@@ -116 +115 @@
         help_t *help;
         conf_t *conf;
-        storage_t *storage;
         char *helpfile;
         GMainLoop *loop;
@@ -129 +127 @@
 int root_command_string( irc_t *irc, user_t *u, char *command, int flags );
 int root_command( irc_t *irc, char *command[] );
+int bitlbee_load( irc_t *irc, const char *password );
+int bitlbee_save( irc_t *irc );
 void bitlbee_shutdown( gpointer data );
 double gettime( void );

commands.c

@@ -86 +86 @@
 int cmd_identify( irc_t *irc, char **cmd )
 {
-        storage_status_t status = global.storage->load( irc->nick, cmd[1], irc );
-        
-        switch (status) {
-        case STORAGE_INVALID_PASSWORD:
+        int checkie = bitlbee_load( irc, cmd[1] );
+        
+        if( checkie == -1 )
+        {
                 irc_usermsg( irc, "Incorrect password" );
-                break;
-        case STORAGE_NO_SUCH_USER:
+        }
+        else if( checkie == 0 )
+        {
                 irc_usermsg( irc, "The nick is (probably) not registered" );
-                break;
-        case STORAGE_OK:
+        }
+        else if( checkie == 1 )
+        {
                 irc_usermsg( irc, "Password accepted" );
-                break;
-        default:
+        }
+        else
+        {
                 irc_usermsg( irc, "Something very weird happened" );
-                break;
         }
         
@@ -108 +110 @@
 int cmd_register( irc_t *irc, char **cmd )
 {
+        int checkie;
+        char path[512];
+        
         if( global.conf->authmode == AUTHMODE_REGISTERED )
         {
@@ -113 +118 @@
                 return( 0 );
         }
-
-        irc_setpass( irc, cmd[1] );
-        switch( global.storage->save( irc, FALSE )) {
-                case STORAGE_ALREADY_EXISTS:
-                        irc_usermsg( irc, "Nick is already registered" );
-                        break;
-                        
-                case STORAGE_OK:
-                        irc->status = USTATUS_IDENTIFIED;
-                        break;
-
-                default:
-                        irc_usermsg( irc, "Error registering" );
-                        break;
+        
+        g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
+        checkie = access( path, F_OK );
+        
+        g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
+        checkie += access( path, F_OK );
+        
+        if( checkie == -2 )
+        {
+                setpassnc( irc, cmd[1] );
+                root_command_string( irc, user_find( irc, irc->mynick ), "save", 0 );
+                irc->status = USTATUS_IDENTIFIED;
+        }
+        else
+        {
+                irc_usermsg( irc, "Nick is already registered" );
         }
         
@@ -134 +141 @@
 int cmd_drop( irc_t *irc, char **cmd )
 {
-        storage_status_t status;
-        
-        status = global.storage->remove (irc->nick, cmd[1]);
-        switch (status) {
-        case STORAGE_NO_SUCH_USER:
+        char s[512];
+        FILE *fp;
+        
+        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
+        fp = fopen( s, "r" );
+        if( !fp )
+        {
                 irc_usermsg( irc, "That account does not exist" );
                 return( 0 );
-        case STORAGE_INVALID_PASSWORD:
-                irc_usermsg( irc, "Password invalid" );
-                return( 0 );
-        case STORAGE_OK:
-                irc_setpass( irc, NULL );
-                irc_usermsg( irc, "Account `%s' removed", irc->nick );
-                return( 0 );
-        default:
-                irc_usermsg( irc, "Error: '%d'", status );
-                return( 0 );
-        }
+        }
+        
+        fscanf( fp, "%32[^\n]s", s );
+        fclose( fp );
+        if( setpass( irc, cmd[1], s ) < 0 )
+        {
+                irc_usermsg( irc, "Incorrect password" );
+                return( 0 );
+        }
+        
+        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
+        unlink( s );
+        
+        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
+        unlink( s );
+        
+        setpassnc( irc, NULL );
+        irc_usermsg( irc, "Files belonging to account `%s' removed", irc->nick );
+        
+        return( 0 );
 }
 
@@ -616 +634 @@
 int cmd_save( irc_t *irc, char **cmd )
 {
-        if( global.storage->save( irc, TRUE ) == STORAGE_OK )
+        if( bitlbee_save( irc ) )
                 irc_usermsg( irc, "Configuration saved" );
         else

conf.c

@@ -50 +50 @@
         conf->nofork = 0;
         conf->verbose = 0;
-        conf->storage = "text";
         conf->runmode = RUNMODE_INETD;
         conf->authmode = AUTHMODE_OPEN;
@@ -199 +198 @@
                                 conf->motdfile = g_strdup( ini->value );
                         }
-                        else if( g_strcasecmp( ini->key, "storage" ) == 0 )
-                        {
-                                g_free( conf->storage );
-                                conf->storage = g_strdup( ini->value );
-                        }
                         else if( g_strcasecmp( ini->key, "pinginterval" ) == 0 )
                         {

conf.h

@@ -42 +42 @@
         char *configdir;
         char *motdfile;
-        char *storage;
         int ping_interval;
         int ping_timeout;

crypting.c

@@ -52 +52 @@
 #include <stdlib.h>
 
+#define irc_usermsg
+
 #endif
 
@@ -60 +62 @@
 \*/
 
-int checkpass (const char *pass, const char *md5sum)
+/* USE WITH CAUTION!
+   Sets pass without checking */
+void setpassnc (irc_t *irc, const char *pass) 
+{
+        if (irc->password) g_free (irc->password);
+        
+        if (pass) {
+                irc->password = g_strdup (pass);
+                irc_usermsg (irc, "Password successfully changed");
+        } else {
+                irc->password = NULL;
+        }
+}
+
+int setpass (irc_t *irc, const char *pass, const char* md5sum) 
 {
         md5_state_t md5state;
@@ -78 +94 @@
                 if (digits[1] != md5sum[j + 1]) return (-1);
         }
-
-        return( 0 );
-}
-
+        
+        /* If pass is correct, we end up here and we set the pass */
+        setpassnc (irc, pass);
+        
+        return (0);
+}
 
 char *hashpass (irc_t *irc) {

crypting.h

@@ -24 +24 @@
 */
 
-int checkpass (const char *password, const char *md5sum);
+void setpassnc (irc_t *irc, const char *pass); /* USE WITH CAUTION! */
+int setpass (irc_t *irc, const char *pass, const char* md5sum);
 char *hashpass (irc_t *irc);
 char *obfucrypt (irc_t *irc, char *line);

irc.c

@@ -32 +32 @@
 GSList *irc_connection_list = NULL;
 
-static char *passchange (irc_t *irc, void *set, char *value) 
-{
-        irc_setpass (irc, value);
+char *passchange (irc_t *irc, void *set, char *value) 
+{
+        setpassnc (irc, value);
         return (NULL);
 }
@@ -161 +161 @@
         
         if( irc->status >= USTATUS_IDENTIFIED && set_getint( irc, "save_on_quit" ) ) 
-                if( !global.storage->save( irc, TRUE ) )
+                if( !bitlbee_save( irc ) )
                         irc_usermsg( irc, "Error while saving settings!" );
         
@@ -266 +266 @@
         if( global.conf->runmode == RUNMODE_INETD )
                 g_main_quit( global.loop );
-}
-
-/* USE WITH CAUTION!
-   Sets pass without checking */
-void irc_setpass (irc_t *irc, const char *pass) 
-{
-        if (irc->password) g_free (irc->password);
-        
-        if (pass) {
-                irc->password = g_strdup (pass);
-                irc_usermsg (irc, "Password successfully changed");
-        } else {
-                irc->password = NULL;
-        }
 }
 

irc.h

@@ -137 +137 @@
 void irc_whois( irc_t *irc, char *nick );
 int irc_away( irc_t *irc, char *away );
-void irc_setpass( irc_t *irc, const char *pass ); /* USE WITH CAUTION! */
 
 int irc_send( irc_t *irc, char *nick, char *s, int flags );

unix.c

@@ -52 +52 @@
         
         global.helpfile = g_strdup( HELP_FILE );
-
+        
         global.conf = conf_load( argc, argv );
         if( global.conf == NULL )
                 return( 1 );
-
-
+        
         if( global.conf->runmode == RUNMODE_INETD )
         {
@@ -71 +70 @@
         if( i != 0 )
                 return( i );
-
-        global.storage = storage_init( global.conf->storage );
-        if ( global.storage == NULL) {
-                log_message( LOGLVL_ERROR, "No such storage backend '%s'", global.conf->storage );
-                return( 1 );
-        }
-        
         
         /* Catch some signals to tell the user what's happening before quitting */
@@ -95 +87 @@
         if( !getuid() || !geteuid() )
                 log_message( LOGLVL_WARNING, "BitlBee is running with root privileges. Why?" );
+        if( access( global.conf->configdir, F_OK ) != 0 )
+                log_message( LOGLVL_WARNING, "The configuration directory %s does not exist. Configuration won't be saved.", CONFIG );
+        else if( access( global.conf->configdir, R_OK ) != 0 || access( global.conf->configdir, W_OK ) != 0 )
+                log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to %s.", global.conf->configdir );
         if( help_init( &(global.help) ) == NULL )
                 log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );