- Timestamp:
- 2014-10-11T02:20:52Z (10 years ago)
- Branches:
- master
- Children:
- 0e35ff6
- Parents:
- 168d3bb
- Location:
- protocols/jabber
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/jabber/jabber.c
r168d3bb rc27a923 148 148 jd->fd = jd->r_inpa = jd->w_inpa = -1; 149 149 150 if( strstr( jd->server, ".live.com" ) ) 151 jd->oauth2_service = &oauth2_service_mslive; 152 else if( strstr( jd->server, ".facebook.com" ) ) 150 if( strstr( jd->server, ".facebook.com" ) ) 153 151 jd->oauth2_service = &oauth2_service_facebook; 154 152 else -
protocols/jabber/jabber.h
r168d3bb rc27a923 338 338 extern const struct oauth2_service oauth2_service_google; 339 339 extern const struct oauth2_service oauth2_service_facebook; 340 extern const struct oauth2_service oauth2_service_mslive;341 340 342 341 /* conference.c */ -
protocols/jabber/sasl.c
r168d3bb rc27a923 47 47 "4b100f0f244d620bf3f15f8b217d4c32", 48 48 }; 49 const struct oauth2_service oauth2_service_mslive =50 {51 "https://oauth.live.com/authorize",52 "https://oauth.live.com/token",53 "http://www.bitlbee.org/main.php/Messenger/oauth2.html",54 "wl.offline_access%20wl.messenger",55 "000000004C06FCD1",56 "IRKlBPzJJAWcY-TbZjiTEJu9tn7XCFaV",57 };58 49 59 50 xt_status sasl_pkt_mechanisms( struct xt_node *node, gpointer data ) … … 63 54 struct xt_node *c, *reply; 64 55 char *s; 65 int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0 , sup_ms = 0;56 int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0; 66 57 int want_oauth = FALSE; 67 58 GString *mechs; … … 98 89 else if( c->text && g_strcasecmp( c->text, "X-FACEBOOK-PLATFORM" ) == 0 ) 99 90 sup_fb = 1; 100 else if( c->text && g_strcasecmp( c->text, "X-MESSENGER-OAUTH2" ) == 0 )101 sup_ms = 1;102 91 103 92 if( c->text ) … … 109 98 if( !want_oauth && !sup_plain && !sup_digest ) 110 99 { 111 if( !sup_gtalk && !sup_fb && !sup_ms)100 if( !sup_gtalk && !sup_fb ) 112 101 imcb_error( ic, "This server requires OAuth " 113 102 "(supported schemes:%s)", mechs->str ); … … 141 130 reply->text_len = strlen( reply->text ); 142 131 g_free( s ); 143 }144 else if( sup_ms && want_oauth )145 {146 xt_add_attr( reply, "mechanism", "X-MESSENGER-OAUTH2" );147 reply->text = g_strdup( jd->oauth2_access_token );148 reply->text_len = strlen( jd->oauth2_access_token );149 132 } 150 133 else if( sup_fb && want_oauth )
Note: See TracChangeset
for help on using the changeset viewer.