Changeset 9ead105


Ignore:
Timestamp:
2014-10-17T22:37:41Z (5 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
fef97af
Parents:
4f7255d (diff), 46511b3 (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:

Bunch of merges from dx.

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • lib/xmltree.c

    r4f7255d r9ead105  
    524524}
    525525
     526struct xt_node *xt_find_node_by_attr( struct xt_node *xt, const char *tag, const char *key, const char *value )
     527{
     528        struct xt_node *c;
     529        char *s;
     530
     531        for( c = xt; ( c = xt_find_node( c, tag ) ); c = c->next )
     532        {
     533                if( ( s = xt_find_attr( c, key ) ) && strcmp( s, value ) == 0 )
     534                {
     535                        return c;
     536                }
     537        }
     538        return NULL;
     539}
     540
     541
    526542/* Strip a few non-printable characters that aren't allowed in XML streams
    527543   (and upset some XMPP servers for example). */
  • lib/xmltree.h

    r4f7255d r9ead105  
    9292struct xt_node *xt_find_path( struct xt_node *node, const char *name );
    9393char *xt_find_attr( struct xt_node *node, const char *key );
     94struct xt_node *xt_find_node_by_attr( struct xt_node *xt, const char *tag, const char *key, const char *value );
    9495
    9596struct xt_node *xt_new_node( char *name, const char *text, struct xt_node *children );
  • nick.c

    r4f7255d r9ead105  
    408408       
    409409        for( i = 0; nick[i]; i ++ )
    410                 if( nick[i] < 0x7f )
    411                         nick[i] = tab[(int)nick[i]];
     410                if( ((guchar)nick[i]) < 0x7f )
     411                        nick[i] = tab[(guchar)nick[i]];
    412412       
    413413        return nick_ok( irc, nick );
  • protocols/jabber/io.c

    r4f7255d r9ead105  
    506506                allow_reconnect = FALSE;
    507507        }
     508        else if( strcmp( err->code, "not-authorized" ) == 0 )
     509        {
     510                imcb_error( ic, "Not authorized" );
     511                allow_reconnect = FALSE;
     512        }
    508513        else
    509514        {
  • protocols/jabber/jabber.c

    r4f7255d r9ead105  
    148148                jd->fd = jd->r_inpa = jd->w_inpa = -1;
    149149               
    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" ) )
    153151                        jd->oauth2_service = &oauth2_service_facebook;
    154152                else
  • protocols/jabber/jabber.h

    r4f7255d r9ead105  
    229229#define XMLNS_RECEIPTS     "urn:xmpp:receipts"                                   /* XEP-0184 */
    230230#define XMLNS_VCARD        "vcard-temp"                                          /* XEP-0054 */
    231 #define XMLNS_DELAY        "jabber:x:delay"                                      /* XEP-0091 */
     231#define XMLNS_DELAY_OLD    "jabber:x:delay"                                      /* XEP-0091 */
     232#define XMLNS_DELAY        "urn:xmpp:delay"                                      /* XEP-0203 */
    232233#define XMLNS_XDATA        "jabber:x:data"                                       /* XEP-0004 */
    233234#define XMLNS_CHATSTATES   "http://jabber.org/protocol/chatstates"               /* XEP-0085 */
     
    338339extern const struct oauth2_service oauth2_service_google;
    339340extern const struct oauth2_service oauth2_service_facebook;
    340 extern const struct oauth2_service oauth2_service_mslive;
    341341
    342342/* conference.c */
  • protocols/jabber/jabber_util.c

    r4f7255d r9ead105  
    726726        char *s = NULL;
    727727        struct tm tp;
    728        
    729         for( c = xt->children; ( c = xt_find_node( c, "x" ) ); c = c->next )
    730         {
    731                 if( ( s = xt_find_attr( c, "xmlns" ) ) && strcmp( s, XMLNS_DELAY ) == 0 )
    732                         break;
    733         }
    734        
    735         if( !c || !( s = xt_find_attr( c, "stamp" ) ) )
    736                 return 0;
     728        gboolean is_old = TRUE;
     729        const char *format;
     730
     731        /* XEP-0091 has <x> */
     732        c = xt_find_node_by_attr( xt->children, "x", "xmlns", XMLNS_DELAY_OLD );
     733
     734        if( !c || !( s = xt_find_attr( c, "stamp" ) ) ) {
     735                is_old = FALSE;
     736
     737                /* XEP-0203 has <delay> */
     738                c = xt_find_node_by_attr( xt->children, "delay", "xmlns", XMLNS_DELAY );
     739                if( !c || !( s = xt_find_attr( c, "stamp" ) ) ) {
     740                        return 0;
     741                }
     742        }
    737743       
    738744        memset( &tp, 0, sizeof( tp ) );
    739         if( sscanf( s, "%4d%2d%2dT%2d:%2d:%2d", &tp.tm_year, &tp.tm_mon, &tp.tm_mday,
    740                                                 &tp.tm_hour, &tp.tm_min, &tp.tm_sec ) != 6 )
     745
     746        /* The other main difference between XEPs is the timestamp format */
     747        format = (is_old) ? "%4d%2d%2dT%2d:%2d:%2d" : "%4d-%2d-%2dT%2d:%2d:%2dZ";
     748
     749        if( sscanf( s, format, &tp.tm_year, &tp.tm_mon, &tp.tm_mday,
     750                               &tp.tm_hour, &tp.tm_min, &tp.tm_sec ) != 6 )
    741751                return 0;
    742752       
  • protocols/jabber/sasl.c

    r4f7255d r9ead105  
    4747        "4b100f0f244d620bf3f15f8b217d4c32",
    4848};
    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 };
    5849
    5950xt_status sasl_pkt_mechanisms( struct xt_node *node, gpointer data )
     
    6354        struct xt_node *c, *reply;
    6455        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;
    6657        int want_oauth = FALSE;
    6758        GString *mechs;
     
    9889                else if( c->text && g_strcasecmp( c->text, "X-FACEBOOK-PLATFORM" ) == 0 )
    9990                        sup_fb = 1;
    100                 else if( c->text && g_strcasecmp( c->text, "X-MESSENGER-OAUTH2" ) == 0 )
    101                         sup_ms = 1;
    10291               
    10392                if( c->text )
     
    10998        if( !want_oauth && !sup_plain && !sup_digest )
    11099        {
    111                 if( !sup_gtalk && !sup_fb && !sup_ms )
     100                if( !sup_gtalk && !sup_fb )
    112101                        imcb_error( ic, "This server requires OAuth "
    113102                                        "(supported schemes:%s)", mechs->str );
     
    141130                reply->text_len = strlen( reply->text );
    142131                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 );
    149132        }
    150133        else if( sup_fb && want_oauth )
Note: See TracChangeset for help on using the changeset viewer.