Changeset 34ded90

Timestamp:

2011-12-24T18:09:05Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

9a1c14d

Parents:

164352e

Message:

Slight cleanup: Use a constant instead of just "jabber_oauth" everywhere,
and added some safeguards to keep the user from messaging it when we're
not actually doing OAuth setup.

Location:

protocols/jabber

Files:

• jabber.c (modified) (2 diffs)
• jabber.h (modified) (1 diff)
• sasl.c (modified) (2 diffs)

protocols/jabber/jabber.c

@@ -90 +90 @@
         s = set_add( &acc->set, "tls_verify", "true", set_eval_bool, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
-        
+
         s = set_add( &acc->set, "user_agent", "BitlBee", NULL, acc );
         
@@ -337 +337 @@
                 return jabber_write( ic, message, strlen( message ) );
         
-        if( g_strcasecmp( who, "jabber_oauth" ) == 0 )
+        if( g_strcasecmp( who, JABBER_OAUTH_HANDLE ) == 0 &&
+            !( jd->flags & OPT_LOGGED_IN ) && jd->fd == -1 )
         {
                 if( sasl_oauth2_get_refresh_token( ic, message ) )

protocols/jabber/jabber.h

@@ -194 +194 @@
 
 #define JABBER_XMLCONSOLE_HANDLE "xmlconsole"
+#define JABBER_OAUTH_HANDLE "jabber_oauth"
 
 /* Prefixes to use for packet IDs (mainly for IQ packets ATM). Usually the

protocols/jabber/sasl.c

@@ -462 +462 @@
         
         /* Temporary contact, just used to receive the OAuth response. */
-        imcb_add_buddy( ic, "jabber_oauth", NULL );
+        imcb_add_buddy( ic, JABBER_OAUTH_HANDLE, NULL );
         url = oauth2_url( jd->oauth2_service );
         msg = g_strdup_printf( "Open this URL in your browser to authenticate: %s", url );
-        imcb_buddy_msg( ic, "jabber_oauth", msg, 0, 0 );
-        imcb_buddy_msg( ic, "jabber_oauth", "Respond to this message with the returned "
-                                            "authorization token.", 0, 0 );
+        imcb_buddy_msg( ic, JABBER_OAUTH_HANDLE, msg, 0, 0 );
+        imcb_buddy_msg( ic, JABBER_OAUTH_HANDLE, "Respond to this message with the returned "
+                                                 "authorization token.", 0, 0 );
         
         g_free( msg );
@@ -477 +477 @@
         struct im_connection *ic = data;
         if( g_slist_find( jabber_connections, ic ) )
-                imcb_remove_buddy( ic, "jabber_oauth", NULL );
+                imcb_remove_buddy( ic, JABBER_OAUTH_HANDLE, NULL );
         return FALSE;
 }