Changeset 57b4525

Timestamp:

2011-07-22T18:29:25Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

59c9adb4

Parents:

a010498

Message:

Nothing useful yet, this just generates an auth URL. Things to do: Ability
to process the answer. This is hard because the GTalk server will time out
very quickly which means we lose our state/scope/etc. (And the ability to
even receive the answer, at least if I'd do this the same way the Twitter
module does it.)

And then, get the access token and use it, of course. :-)

Files:

• lib/Makefile (modified) (1 diff)
• lib/oauth2.c (added)
• lib/oauth2.h (added)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/jabber/sasl.c (modified) (5 diffs)

lib/Makefile

@@ -13 +13 @@
 
 # [SH] Program variables
-objects = arc.o base64.o $(DES) $(EVENT_HANDLER) ftutil.o http_client.o ini.o md5.o misc.o oauth.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+objects = arc.o base64.o $(DES) $(EVENT_HANDLER) ftutil.o http_client.o ini.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
 
 LFLAGS += -r

protocols/jabber/jabber.c

@@ -60 +60 @@
         s = set_add( &acc->set, "activity_timeout", "600", set_eval_int, acc );
         
+        s = set_add( &acc->set, "oauth", "false", set_eval_bool, acc );
+
         g_snprintf( str, sizeof( str ), "%d", jabber_port_list[0] );
         s = set_add( &acc->set, "port", str, set_eval_int, acc );

protocols/jabber/sasl.c

@@ -26 +26 @@
 #include "jabber.h"
 #include "base64.h"
+#include "oauth2.h"
 
 xt_status sasl_pkt_mechanisms( struct xt_node *node, gpointer data )
@@ -33 +34 @@
         struct xt_node *c, *reply;
         char *s;
-        int sup_plain = 0, sup_digest = 0;
+        int sup_plain = 0, sup_digest = 0, sup_oauth2 = 0;
         
         if( !sasl_supported( ic ) )
@@ -59 +60 @@
                 if( c->text && g_strcasecmp( c->text, "DIGEST-MD5" ) == 0 )
                         sup_digest = 1;
+                if( c->text && g_strcasecmp( c->text, "X-OAUTH2" ) == 0 )
+                        sup_oauth2 = 1;
                 
                 c = c->next;
@@ -73 +76 @@
         xt_add_attr( reply, "xmlns", XMLNS_SASL );
         
-        if( sup_digest )
+        if( sup_oauth2 && set_getbool( &ic->acc->set, "oauth" ) )
+        {
+                imcb_log( ic, "Open this URL in your browser to authenticate: %s",
+                          oauth2_url( &oauth2_service_google,
+                                      "https://www.googleapis.com/auth/googletalk" ) );
+                xt_free_node( reply );
+                reply = NULL;
+        }
+        else if( sup_digest )
         {
                 xt_add_attr( reply, "mechanism", "DIGEST-MD5" );
@@ -96 +107 @@
         }
         
-        if( !jabber_write_packet( ic, reply ) )
+        if( reply && !jabber_write_packet( ic, reply ) )
         {
                 xt_free_node( reply );