Changeset 6738a67 for storage_xml.c

Timestamp:

2008-07-16T23:22:52Z (16 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

9b55485

Parents:

9730d72 (diff), 6a78c0e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge in latest trunk

File:

• storage_xml.c (modified) (8 diffs)

storage_xml.c

@@ -29 +29 @@
 #include "arc.h"
 #include "md5.h"
+#include <glib/gstdio.h>
+
+#if !GLIB_CHECK_VERSION(2,8,0)
+/* GLib < 2.8.0 doesn't have g_access, so just use the system access(). */
+#define g_access access
+#endif
 
 typedef enum
@@ -80 +86 @@
                 char *nick = xml_attr( attr_names, attr_values, "nick" );
                 char *pass = xml_attr( attr_names, attr_values, "password" );
-                md5_byte_t *pass_dec = NULL;
+                int st;
                 
                 if( !nick || !pass )
@@ -87 +93 @@
                                      "Missing attributes for %s element", element_name );
                 }
-                else if( base64_decode( pass, &pass_dec ) != 21 )
-                {
+                else if( ( st = md5_verify_password( xd->given_pass, pass ) ) == -1 )
+                {
+                        xd->pass_st = XML_PASS_WRONG;
                         g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
                                      "Error while decoding password attribute" );
                 }
+                else if( st == 0 )
+                {
+                        if( xd->pass_st != XML_PASS_CHECK_ONLY )
+                                xd->pass_st = XML_PASS_OK;
+                }
                 else
                 {
-                        md5_byte_t pass_md5[16];
-                        md5_state_t md5_state;
-                        int i;
-                        
-                        md5_init( &md5_state );
-                        md5_append( &md5_state, (md5_byte_t*) xd->given_pass, strlen( xd->given_pass ) );
-                        md5_append( &md5_state, (md5_byte_t*) pass_dec + 16, 5 ); /* Hmmm, salt! */
-                        md5_finish( &md5_state, pass_md5 );
-                        
-                        for( i = 0; i < 16; i ++ )
-                        {
-                                if( pass_dec[i] != pass_md5[i] )
-                                {
-                                        xd->pass_st = XML_PASS_WRONG;
-                                        g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                                                     "Password mismatch" );
-                                        break;
-                                }
-                        }
-                        
-                        /* If we reached the end of the loop, it was a match! */
-                        if( i == 16 )
-                        {
-                                if( xd->pass_st != XML_PASS_CHECK_ONLY )
-                                        xd->pass_st = XML_PASS_OK;
-                        }
-                }
-                
-                g_free( pass_dec );
+                        xd->pass_st = XML_PASS_WRONG;
+                        g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
+                                     "Password mismatch" );
+                }
         }
         else if( xd->pass_st < XML_PASS_OK )
@@ -262 +249 @@
 static void xml_init( void )
 {
-        if( access( global.conf->configdir, F_OK ) != 0 )
+        if( g_access( global.conf->configdir, F_OK ) != 0 )
                 log_message( LOGLVL_WARNING, "The configuration directory `%s' does not exist. Configuration won't be saved.", global.conf->configdir );
-        else if( access( global.conf->configdir, R_OK ) != 0 || access( global.conf->configdir, W_OK ) != 0 )
+        else if( g_access( global.conf->configdir, F_OK ) != 0 || 
+                 g_access( global.conf->configdir, W_OK ) != 0 )
                 log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to `%s'.", global.conf->configdir );
 }
@@ -391 +379 @@
         g_free( path2 );
         
-        if( !overwrite && access( path, F_OK ) != -1 )
+        if( !overwrite && g_access( path, F_OK ) == 0 )
                 return STORAGE_ALREADY_EXISTS;
         
@@ -428 +416 @@
                 int pass_len;
                 
-                pass_len = arc_encode( acc->pass, strlen( acc->pass ), (unsigned char**) &pass_cr, irc->password );
+                pass_len = arc_encode( acc->pass, strlen( acc->pass ), (unsigned char**) &pass_cr, irc->password, 12 );
                 pass_b64 = base64_encode( pass_cr, pass_len );
                 g_free( pass_cr );
@@ -499 +487 @@
 static storage_status_t xml_remove( const char *nick, const char *password )
 {
-        char s[512];
+        char s[512], *lc;
         storage_status_t status;
 
@@ -506 +494 @@
                 return status;
 
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, nick, ".xml" );
+        lc = g_strdup( nick );
+        nick_lc( lc );
+        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, lc, ".xml" );
+        g_free( lc );
+        
         if( unlink( s ) == -1 )
                 return STORAGE_OTHER_ERROR;