Changeset 7c0a497 for protocols

Timestamp:

2005-12-17T20:56:50Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a03a9f3

Parents:

b5a22e3 (diff), ad8b8a3 (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:

Moved HTTP-stuff (right now only for passport) into a separate module. This
all works 100% asynchronous and non-blocking, so almost all I/O in BitlBee
should be completely non-blocking now!

Right now support for other modules than GnuTLS is probably broken, I'll fix
it later.

Location:

protocols

Files:

• Makefile (modified) (1 diff)
• http_client.c (added)
• http_client.h (added)
• msn/ns.c (modified) (1 diff)
• msn/passport.c (modified) (3 diffs)
• msn/passport.h (modified) (1 diff)
• proxy.c (modified) (1 diff)
• ssl_bogus.c (modified) (1 diff)
• ssl_client.h (modified) (1 diff)
• ssl_gnutls.c (modified) (7 diffs)
• ssl_nss.c (modified) (2 diffs)
• ssl_openssl.c (modified) (2 diffs)

protocols/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = md5.o nogaim.o proxy.o sha.o util.o $(SSL_CLIENT)
+objects = http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT) util.o
 
 # [SH] The next two lines should contain the directory name (in $(subdirs))

protocols/msn/ns.c

@@ -208 +208 @@
                 {
                         /* Time for some Passport black magic... */
-                        if( !passport_get_id( gc, gc->username, gc->password, cmd[4], msn_auth_got_passport_id ) )
+                        if( !passport_get_id( msn_auth_got_passport_id, gc, gc->username, gc->password, cmd[4] ) )
                         {
                                 hide_login_progress_error( gc, "Error while contacting Passport server" );

protocols/msn/passport.c

@@ -20 +20 @@
  */
 
-#include "ssl_client.h"
+#include "http_client.h"
 #include "passport.h"
 #include "msn.h"
@@ -31 +31 @@
 static char *prd_cached = NULL;
 
-static char *passport_create_header( char *reply, char *email, char *pwd );
+static int passport_get_id_real( gpointer func, gpointer data, char *header );
+static void passport_get_id_ready( struct http_request *req );
+
 static int passport_retrieve_dalogin( gpointer data, gpointer func, char *header );
-static void passport_retrieve_dalogin_connected( gpointer data, void *ssl, GaimInputCondition cond );
-static int passport_get_id_from( gpointer data, gpointer func, char *header_i, char *url );
-static void passport_get_id_connected( gpointer data, void *ssl, GaimInputCondition cond );
+static void passport_retrieve_dalogin_ready( struct http_request *req );
+
+static char *passport_create_header( char *cookie, char *email, char *pwd );
 static void destroy_reply( struct passport_reply *rep );
 
-
-int passport_get_id( gpointer data, char *username, char *password, char *cookie, gpointer func )
+int passport_get_id( gpointer func, gpointer data, char *username, char *password, char *cookie )
 {
         char *header = passport_create_header( cookie, username, password );
         
-        if( prd_cached )
-        {
-                int st;
-                
-                st = passport_get_id_from( data, func, header, prd_cached );
-                g_free( header );
-                return( st );
-        }
+        if( prd_cached == NULL )
+                return passport_retrieve_dalogin( func, data, header );
         else
-        {
-                return( passport_retrieve_dalogin( data, func, header ) );
-        }
-}
-
-
-static char *passport_create_header( char *reply, char *email, char *pwd )
-{
-        char *buffer = g_new0( char, 2048 );
-        char *currenttoken;
-        char *email_enc, *pwd_enc;
-        
-        email_enc = g_new0( char, strlen( email ) * 3 + 1 );
-        strcpy( email_enc, email );
-        http_encode( email_enc );
-        
-        pwd_enc = g_new0( char, strlen( pwd ) * 3 + 1 );
-        strcpy( pwd_enc, pwd );
-        http_encode( pwd_enc );
-        
-        currenttoken = strstr( reply, "lc=" );
-        if( currenttoken == NULL )
-                return( NULL );
-        
-        g_snprintf( buffer, 2048,
-                    "Authorization: Passport1.4 OrgVerb=GET,"
-                    "OrgURL=http%%3A%%2F%%2Fmessenger%%2Emsn%%2Ecom,"
-                    "sign-in=%s,pwd=%s,%s", email_enc, pwd_enc,
-                    currenttoken );
-        
-        g_free( email_enc );
-        g_free( pwd_enc );
-        
-        return( buffer );
-}
-
-
-static int passport_retrieve_dalogin( gpointer data, gpointer func, char *header )
-{
-        struct passport_reply *rep = g_new0( struct passport_reply, 1 );
-        void *ssl;
-        
+                return passport_get_id_real( func, data, header );
+}
+
+static int passport_get_id_real( gpointer func, gpointer data, char *header )
+{
+        struct passport_reply *rep;
+        char *server, *dummy, *reqs;
+        struct http_request *req;
+        
+        rep = g_new0( struct passport_reply, 1 );
         rep->data = data;
         rep->func = func;
-        rep->header = header;
-        
-        ssl = ssl_connect( "nexus.passport.com", 443, passport_retrieve_dalogin_connected, rep );
-        
-        if( !ssl )
-                destroy_reply( rep );
-        
-        return( ssl != NULL );
-}
-
-#define PPR_BUFFERSIZE 2048
-#define PPR_REQUEST "GET /rdr/pprdr.asp HTTP/1.0\r\n\r\n"
-static void passport_retrieve_dalogin_connected( gpointer data, void *ssl, GaimInputCondition cond )
-{
-        int ret;
-        char buffer[PPR_BUFFERSIZE+1];
-        struct passport_reply *rep = data;
+        
+        server = g_strdup( prd_cached );
+        dummy = strchr( server, '/' );
+        
+        if( dummy == NULL )
+        {
+                destroy_reply( rep );
+                return( 0 );
+        }
+        
+        reqs = g_malloc( strlen( header ) + strlen( dummy ) + 128 );
+        sprintf( reqs, "GET %s HTTP/1.0\r\n%s\r\n\r\n", dummy, header );
+        
+        *dummy = 0;
+        req = http_dorequest( server, 443, 1, reqs, passport_get_id_ready, rep );
+        
+        g_free( server );
+        g_free( reqs );
+        
+        if( req == NULL )
+                destroy_reply( rep );
+        
+        return( req != NULL );
+}
+
+static void passport_get_id_ready( struct http_request *req )
+{
+        struct passport_reply *rep = req->data;
         
         if( !g_slist_find( msn_connections, rep->data ) )
         {
-                if( ssl ) ssl_disconnect( ssl );
                 destroy_reply( rep );
                 return;
         }
         
-        if( !ssl )
-        {
-                rep->func( rep );
-                destroy_reply( rep );
-                return;
-        }
-        
-        ssl_write( ssl, PPR_REQUEST, strlen( PPR_REQUEST ) );
-        
-        if( ( ret = ssl_read( ssl, buffer, PPR_BUFFERSIZE ) ) <= 0 )
-        {
-                goto failure;
-        }
-
-        {
-                char *dalogin = strstr( buffer, "DALogin=" );
-                char *urlend;
+        if( req->status_code == 200 )
+        {
+                char *dummy;
                 
-                if( !dalogin )
-                        goto failure;
-                
-                dalogin += strlen( "DALogin=" );
-                urlend = strchr( dalogin, ',' );
-                if( urlend )
-                        *urlend = 0;
-                
-                /* strip the http(s):// part from the url */
-                urlend = strstr( urlend, "://" );
-                if( urlend )
-                        dalogin = urlend + strlen( "://" );
-                
-                if( prd_cached == NULL )
-                        prd_cached = g_strdup( dalogin );
-        }
-        
-        if( passport_get_id_from( rep->data, rep->func, rep->header, prd_cached ) )
-        {
-                ssl_disconnect( ssl );
-                destroy_reply( rep );
-                return;
-        }
-        
-failure:        
-        ssl_disconnect( ssl );
-        rep->func( rep );
-        destroy_reply( rep );
-}
-
-
-static int passport_get_id_from( gpointer data, gpointer func, char *header_i, char *url )
-{
-        struct passport_reply *rep = g_new0( struct passport_reply, 1 );
-        char server[512], *dummy;
-        void *ssl;
-        
-        rep->data = data;
-        rep->func = func;
-        rep->redirects = 4;
-        
-        strncpy( server, url, 512 );
-        dummy = strchr( server, '/' );
-        if( dummy )
-                *dummy = 0;
-        
-        ssl = ssl_connect( server, 443, passport_get_id_connected, rep );
-        
-        if( ssl )
-        {
-                rep->header = g_strdup( header_i );
-                rep->url = g_strdup( url );
-        }
-        else
-        {
-                destroy_reply( rep );
-        }
-        
-        return( ssl != NULL );
-}
-
-#define PPG_BUFFERSIZE 4096
-static void passport_get_id_connected( gpointer data, void *ssl, GaimInputCondition cond )
-{
-        struct passport_reply *rep = data;
-        char server[512], buffer[PPG_BUFFERSIZE+1], *dummy;
-        int ret;
-        
-        if( !g_slist_find( msn_connections, rep->data ) )
-        {
-                if( ssl ) ssl_disconnect( ssl );
-                destroy_reply( rep );
-                return;
-        }
-        
-        if( !ssl )
-        {
-                rep->func( rep );
-                destroy_reply( rep );
-                return;
-        }
-        
-        memset( buffer, 0, PPG_BUFFERSIZE + 1 );
-        
-        strncpy( server, rep->url, 512 );
-        dummy = strchr( server, '/' );
-        if( dummy == NULL )
-                goto end;
-        
-        g_snprintf( buffer, PPG_BUFFERSIZE - 1, "GET %s HTTP/1.0\r\n"
-                    "%s\r\n\r\n", dummy, rep->header );
-        
-        ssl_write( ssl, buffer, strlen( buffer ) );
-        memset( buffer, 0, PPG_BUFFERSIZE + 1 );
-        
-        {
-                char *buffer2 = buffer;
-                
-                while( ( ( ret = ssl_read( ssl, buffer2, 512 ) ) > 0 ) &&
-                       ( buffer + PPG_BUFFERSIZE - buffer2 - ret - 512 >= 0 ) )
-                {
-                        buffer2 += ret;
-                }
-        }
-        
-        if( *buffer == 0 )
-                goto end;
-        
-        if( ( dummy = strstr( buffer, "Location:" ) ) )
-        {
-                char *urlend;
-                
-                rep->redirects --;
-                if( rep->redirects == 0 )
-                        goto end;
-                
-                dummy += strlen( "Location:" );
-                while( isspace( *dummy ) ) dummy ++;
-                urlend = dummy;
-                while( !isspace( *urlend ) ) urlend ++;
-                *urlend = 0;
-                if( ( urlend = strstr( dummy, "://" ) ) )
-                        dummy = urlend + strlen( "://" );
-                
-                g_free( rep->url );
-                rep->url = g_strdup( dummy );
-                
-                strncpy( server, dummy, sizeof( server ) - 1 );
-                dummy = strchr( server, '/' );
-                if( dummy ) *dummy = 0;
-                
-                ssl_disconnect( ssl );
-                
-                if( ssl_connect( server, 443, passport_get_id_connected, rep ) )
-                {
-                        return;
-                }
-                else
-                {
-                        rep->func( rep );
-                        destroy_reply( rep );
-                        return;
-                }
-        }
-        else if( strstr( buffer, "200 OK" ) )
-        {
-                if( ( dummy = strstr( buffer, "from-PP='" ) ) )
+                if( ( dummy = strstr( req->reply_headers, "from-PP='" ) ) )
                 {
                         char *responseend;
@@ -298 +111 @@
         }
         
-end:
-        ssl_disconnect( ssl );
         rep->func( rep );
         destroy_reply( rep );
 }
 
+static char *passport_create_header( char *cookie, char *email, char *pwd )
+{
+        char *buffer = g_new0( char, 2048 );
+        char *currenttoken;
+        char *email_enc, *pwd_enc;
+        
+        email_enc = g_new0( char, strlen( email ) * 3 + 1 );
+        strcpy( email_enc, email );
+        http_encode( email_enc );
+        
+        pwd_enc = g_new0( char, strlen( pwd ) * 3 + 1 );
+        strcpy( pwd_enc, pwd );
+        http_encode( pwd_enc );
+        
+        currenttoken = strstr( cookie, "lc=" );
+        if( currenttoken == NULL )
+                return( NULL );
+        
+        g_snprintf( buffer, 2048,
+                    "Authorization: Passport1.4 OrgVerb=GET,"
+                    "OrgURL=http%%3A%%2F%%2Fmessenger%%2Emsn%%2Ecom,"
+                    "sign-in=%s,pwd=%s,%s", email_enc, pwd_enc,
+                    currenttoken );
+        
+        g_free( email_enc );
+        g_free( pwd_enc );
+        
+        return( buffer );
+}
+
+#define PPR_REQUEST "GET /rdr/pprdr.asp HTTP/1.0\r\n\r\n"
+static int passport_retrieve_dalogin( gpointer func, gpointer data, char *header )
+{
+        struct passport_reply *rep = g_new0( struct passport_reply, 1 );
+        struct http_request *req;
+        
+        rep->data = data;
+        rep->func = func;
+        rep->header = header;
+        
+        req = http_dorequest( "nexus.passport.com", 443, 1, PPR_REQUEST, passport_retrieve_dalogin_ready, rep );
+        
+        if( !req )
+                destroy_reply( rep );
+        
+        return( req != NULL );
+}
+
+static void passport_retrieve_dalogin_ready( struct http_request *req )
+{
+        struct passport_reply *rep = req->data;
+        char *dalogin;
+        char *urlend;
+        
+        if( !g_slist_find( msn_connections, rep->data ) )
+        {
+                destroy_reply( rep );
+                return;
+        }
+        
+        dalogin = strstr( req->reply_headers, "DALogin=" );     
+        
+        if( !dalogin )
+                goto failure;
+        
+        dalogin += strlen( "DALogin=" );
+        urlend = strchr( dalogin, ',' );
+        if( urlend )
+                *urlend = 0;
+        
+        /* strip the http(s):// part from the url */
+        urlend = strstr( urlend, "://" );
+        if( urlend )
+                dalogin = urlend + strlen( "://" );
+        
+        if( prd_cached == NULL )
+                prd_cached = g_strdup( dalogin );
+        
+        if( passport_get_id_real( rep->func, rep->data, rep->header ) )
+        {
+                destroy_reply( rep );
+                return;
+        }
+        
+failure:        
+        rep->func( rep );
+        destroy_reply( rep );
+}
 
 static void destroy_reply( struct passport_reply *rep )
 {
-        if( rep->result ) g_free( rep->result );
-        if( rep->url ) g_free( rep->url );
-        if( rep->header ) g_free( rep->header );
-        if( rep ) g_free( rep );
-}
+        g_free( rep->result );
+        g_free( rep->header );
+        g_free( rep );
+}

protocols/msn/passport.h

@@ -35 +35 @@
 struct passport_reply
 {
+        void (*func)( struct passport_reply * );
         void *data;
         char *result;
-        void (*func)( struct passport_reply * );
-        char *url;
         char *header;
-        int redirects;
 };
 
-int passport_get_id( gpointer data, char *username, char *password, char *cookie, gpointer func );
+int passport_get_id( gpointer func, gpointer data, char *username, char *password, char *cookie );
 
 #endif /* __PASSPORT_H__ */

protocols/proxy.c

@@ -106 +106 @@
         if (condition & GAIM_WRITE_COND)
                 gaim_cond |= GAIM_INPUT_WRITE;
-//      if (condition & GAIM_ERR_COND)
-//              fprintf( stderr, "ERROR! fd=%d\n", g_io_channel_unix_get_fd( source ) );
 
         closure->function(closure->data, g_io_channel_unix_get_fd(source), gaim_cond);

protocols/ssl_bogus.c

@@ -28 +28 @@
 int ssl_errno;
 
-void *ssl_connect( char *host, int port, SslInputFunction func, gpointer data )
+void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
 {
         return( NULL );

protocols/ssl_client.h

@@ -33 +33 @@
 extern int ssl_errno;
 
-typedef void (*SslInputFunction)(gpointer, void*, GaimInputCondition);
+typedef void (*ssl_input_function)(gpointer, void*, GaimInputCondition);
 
-G_MODULE_EXPORT void *ssl_connect( char *host, int port, SslInputFunction func, gpointer data );
+G_MODULE_EXPORT void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data );
 G_MODULE_EXPORT int ssl_read( void *conn, char *buf, int len );
 G_MODULE_EXPORT int ssl_write( void *conn, const char *buf, int len );
 G_MODULE_EXPORT void ssl_disconnect( void *conn_ );
 G_MODULE_EXPORT int ssl_getfd( void *conn );
+G_MODULE_EXPORT GaimInputCondition ssl_getdirection( void *conn );

protocols/ssl_gnutls.c

@@ -38 +38 @@
 struct scd
 {
-        SslInputFunction func;
+        ssl_input_function func;
         gpointer data;
         int fd;
@@ -51 +51 @@
 
 
-void *ssl_connect( char *host, int port, SslInputFunction func, gpointer data )
+void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
 {
         struct scd *conn = g_new0( struct scd, 1 );
@@ -117 +117 @@
                 if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED )
                 {
-                        conn->inpa = gaim_input_add( conn->fd,
-                                                     gnutls_record_get_direction( conn->session ) ?
-                                                         GAIM_INPUT_WRITE : GAIM_INPUT_READ,
+                        conn->inpa = gaim_input_add( conn->fd, ssl_getdirection( conn ),
                                                      ssl_handshake, data );
                 }
@@ -145 +143 @@
 int ssl_read( void *conn, char *buf, int len )
 {
+        int st;
+        
         if( !((struct scd*)conn)->established )
         {
@@ -151 +151 @@
         }
         
-        return( gnutls_record_recv( ((struct scd*)conn)->session, buf, len ) );
-        
+        st = gnutls_record_recv( ((struct scd*)conn)->session, buf, len );
+        
+        ssl_errno = SSL_OK;
+        if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED )
+                ssl_errno = SSL_AGAIN;
+        
+        return st;
 }
 
 int ssl_write( void *conn, const char *buf, int len )
 {
+        int st;
+        
         if( !((struct scd*)conn)->established )
         {
@@ -163 +170 @@
         }
         
-        return( gnutls_record_send( ((struct scd*)conn)->session, buf, len ) );
+        st = gnutls_record_send( ((struct scd*)conn)->session, buf, len );
+        
+        ssl_errno = SSL_OK;
+        if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED )
+                ssl_errno = SSL_AGAIN;
+        
+        return st;
 }
 
@@ -184 +197 @@
         return( ((struct scd*)conn)->fd );
 }
+
+GaimInputCondition ssl_getdirection( void *conn )
+{
+        return( gnutls_record_get_direction( ((struct scd*)conn)->session ) ?
+                GAIM_INPUT_WRITE : GAIM_INPUT_READ );
+}

protocols/ssl_nss.c

@@ -45 +45 @@
 struct scd
 {
-        SslInputFunction func;
+        ssl_input_function func;
         gpointer data;
         int fd;
@@ -91 +91 @@
 
 
-void *ssl_connect( char *host, int port, SslInputFunction func, gpointer data )
+void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
 {
         struct scd *conn = g_new0( struct scd, 1 );

protocols/ssl_openssl.c

@@ -41 +41 @@
 struct scd
 {
-        SslInputFunction func;
+        ssl_input_function func;
         gpointer data;
         int fd;
@@ -54 +54 @@
 
 
-void *ssl_connect( char *host, int port, SslInputFunction func, gpointer data )
+void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
 {
         struct scd *conn = g_new0( struct scd, 1 );