adium.1-4: 6a525a20: Pluck yahoo-related revisions; authorize...
rekkanoryo at pidgin.im
rekkanoryo at pidgin.im
Sat Mar 13 23:08:48 EST 2010
-----------------------------------------------------------------
Revision: 6a525a20cfffe39369fb58b72aeaf5194aa468d9
Ancestor: 96a41ffb59d945d2fe01cdc5141640f84ce189aa
Author: rekkanoryo at pidgin.im
Date: 2010-03-14T03:49:52
Branch: im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/6a525a20cfffe39369fb58b72aeaf5194aa468d9
Modified files:
ChangeLog libpurple/protocols/yahoo/libymsg.c
libpurple/protocols/yahoo/libymsg.h
ChangeLog:
Pluck yahoo-related revisions; authorized by Zac West.
*** Plucked rev f1264b136d57d1ee917f59945e91b9b2bd4b2410 (rekkanoryo at pidgin.im):
Attempt to handle transparent proxies that return documents instead of errors.
I think this fixes #11478.
*** Plucked rev 17c1e048674ec57bdadbafc0b1e598a37143eccd (rekkanoryo at pidgin.im):
Document the code I just touched, and use a convenience variable in a couple
more places to make the code easier to read.
*** Plucked rev a87af6413b6aef7fd11608c15fb50aee2ac3d21e (vamposdecampos at gmail.com):
yahoo: fix decoding of P2P session_id
Apparently, inbound P2P packets containing key-11 session_id are
no longer sent by the server with a YAHOO_STATUS_BRB, but rather
a status value of 11.
Since we don't pick up the session_id, the first text message we
send over the P2P connection will have a key-11 value of 0, and cause
the remote (yahoo) client to disconnect us. This is causing the
"lost second line in a conversation" syndrome.
Fix it by also accepting status 11 in yahoo_process_p2p().
Fixes #10733.
-------------- next part --------------
============================================================
--- ChangeLog 1ff6b9176e6393f1a50db9360e31ef06dc7d8d08
+++ ChangeLog bf2b5122dac511cdd2af177e27a6f90abbdb8942
@@ -44,23 +44,24 @@ version 2.6.6 (02/18/2010):
* Less likely to send messages to a contact's idle/inactive resource.
Previously, if a message was received from a specific resource,
responses would be sent to that resource until either it went offline
- or a message is received from another resource. Now, messages are sent
- to the bare JID upon receipt of any presence change from the contact.
+ or a message is received from another resource. Now, messages are
+ sent to the bare JID upon receipt of any presence change from the
+ contact.
* Added support for the SCRAM-SHA-1 SASL mechanism. This is only
available when built without Cyrus SASL support.
* When getting info on a domain-only (server) JID, show uptime
- (when given by the result of the "last query") and don't show status as
- offline.
+ (when given by the result of the "last query") and don't show status
+ as offline.
* Fix getting info on your own JID.
- * Wrap XHTML messages in <p>, as described in XEP-0071, for compatibility
- with some clients.
+ * Wrap XHTML messages in <p>, as described in XEP-0071, for
+ compatibility with some clients.
* Don't do an SRV lookup for a STUN server associated with the account
if one is already set globally in prefs.
- * Don't send custom smileys larger than the recommended maximum object size
- specified in the BoB XEP. This prevents a client from being
+ * Don't send custom smileys larger than the recommended maximum object
+ size specified in the BoB XEP. This prevents a client from being
disconnected by servers that dislike overly-large stanzas.
- * Fix receiving messages without markup over an Openfire BOSH connection
- (forcibly put the stanzas in the jabber:client namespace).
+ * Fix receiving messages without markup over an Openfire BOSH
+ connection (forcibly put the stanzas in the jabber:client namespace).
* The default value for the file transfer proxies is automatically
updated when an account connects, if it is still the old (broken)
default (from 'proxy.jabber.org' to 'proxy.eu.jabber.org').
@@ -99,7 +100,8 @@ version 2.6.6 (02/18/2010):
tooltips will show for all tabs.
* The File Transfers and Debug Window windows are no longer created as
dialogs. These windows should now have minimize buttons in many
- environments in which they were previously missing (including Windows).
+ environments in which they were previously missing
+ (including Windows).
* Smiley themes with Windows line endings no longer cause theme
descriptions not to be displayed in the theme selector.
@@ -137,11 +139,11 @@ version 2.6.4 (11/29/2009):
* Actually emit the hold signal for media calls.
* Fix building the GnuTLS plugin with older versions of GnuTLS.
* Fix DNS TXT query resolution.
- * Don't send Proxy-Authorization headers to HTTP proxy servers until we've
- received a "407 Proxy Authentication Required" response from the server.
- (thecrux)
- * Added "MXit" protocol plugin, supported and maintained by the MXit folks
- themselves (MXit Lifestyle (Pty) Ltd.)
+ * Don't send Proxy-Authorization headers to HTTP proxy servers until
+ we've received a "407 Proxy Authentication Required" response from
+ the server. (thecrux)
+ * Added "MXit" protocol plugin, supported and maintained by the MXit
+ folks themselves (MXit Lifestyle (Pty) Ltd.)
General:
* New 'plugins' sub-command to 'debug' command (i.e. '/debug plugins')
@@ -172,14 +174,14 @@ version 2.6.4 (11/29/2009):
as it has probably been reset.
XMPP:
- * Users connecting to Google Talk now have an "Initiate Chat" context menu
- option for their buddies. (Eion Robb)
+ * Users connecting to Google Talk now have an "Initiate Chat" context
+ menu option for their buddies. (Eion Robb)
* Fix a crash when attempting to validate an invalid JID.
* Resolve an issue when connecting to iChat Server when no resource
is specified.
* Try to automatically find a STUN server by using an SRV lookup on the
- account's domain, and use that for voice and video if found and the user
- didn't set one manually in prefs.
+ account's domain, and use that for voice and video if found and the
+ user didn't set one manually in prefs.
* Fix a crash when adding a buddy without an '@'.
* Don't show the option to send a file to a buddy if we know for certain
they don't support any file transfer method supported by libpurple.
@@ -203,23 +205,23 @@ version 2.6.4 (11/29/2009):
* The userlist in a multiuser chat can be styled via gtkrc by using the
widget name "pidgin_conv_userlist". (Heiko Schmitt)
* Add a hold button to the media window.
- * Fix a bug where the conversation backlog stops scrolling in a very busy
- chat room.
+ * Fix a bug where the conversation backlog stops scrolling in a very
+ busy chat room.
* In the Conversation "Send To" menu, offline buddies appear grayed
out (but are still selectable). Previously, only offline buddies on
accounts that do not support offline messaging appeared grayed out.
Pidgin Preference and Preference Window Changes:
* Removed the "Use font from theme" and "Conversation Font" preferences
- for everyone except Windows users. The font can be controlled from the
- Pidgin GTK+ Theme Control plugin.
+ for everyone except Windows users. The font can be controlled from
+ the Pidgin GTK+ Theme Control plugin.
* Tabs in the Preferences window are now on the left side.
* The Browser tab is now visible for GNOME users.
* Added a Proxy tab shown no matter what environment Pidgin runs in.
- * The Browser and Proxy tabs show appropriate GNOME-specific messages and
- allow launching the correct applications to change the relevant GNOME
- preferences if found. These were previously together on the Network
- tab.
+ * The Browser and Proxy tabs show appropriate GNOME-specific messages
+ and allow launching the correct applications to change the relevant
+ GNOME preferences if found. These were previously together on the
+ Network tab.
* Moved the port range spin buttons on the Network tab to be beside the
checkbox that enables/disables them.
* Reorganized preferences on the Status/Idle tab to have one less
@@ -229,10 +231,10 @@ version 2.6.4 (11/29/2009):
* Moved Buddy List Theme and Status Icon Theme selectors from Interface
tab to Themes tab.
* Moved Sound Theme selector from Sounds tab to Themes tab.
- * Changed the Smiley Theme selector to be consistent with the other theme
- selectors.
- * Rearranged tabs such that Interface is first and all remaining tabs are
- alphabetized in English.
+ * Changed the Smiley Theme selector to be consistent with the other
+ theme selectors.
+ * Rearranged tabs such that Interface is first and all remaining tabs
+ are alphabetized in English.
version 2.6.3 (10/16/2009):
General:
@@ -272,16 +274,17 @@ version 2.6.2 (09/05/2009):
properly. In addition, it is no longer possible to add buddies of
the form "room at conference.example.net/User", where
room at conference.example.net is a MUC.
- * Don't crash when receiving "smileyfied" XHTML-IM from clients that don't
- support bits of binary (ie. when getting an empty <data/> in return)
+ * Don't crash when receiving "smileyfied" XHTML-IM from clients that
+ don't support bits of binary (ie. when getting an empty <data/> in
+ return)
* Fix bug where SSL/TLS was not required even though the
"require SSL/TLS" preference checked when connecting to servers
that use the older iq-based authentication. (CVE-2009-3026)
Yahoo!/Yahoo! JAPAN:
- * Accounts now have "Use account proxy for SSL connections" option. This
- option force-overrides the account specific proxy settings for SSL
- connections only and instead uses the global proxy configuration.
+ * Accounts now have "Use account proxy for SSL connections" option.
+ This option force-overrides the account specific proxy settings for
+ SSL connections only and instead uses the global proxy configuration.
Finch:
* Properly detect libpanel on OpenBSD. (Brad Smith)
@@ -323,8 +326,8 @@ version 2.6.0 (08/18/2009):
* Various memory leaks fixed as reported by Josh Mueller.
* Properly handle an IRC buddy appearing in multiple groups.
* Escape HTML entities in usernames when written with the HTML logger.
- * Do not display MySpace status changes as incoming IMs. (Mark Doliner and
- Justin Williams)
+ * Do not display MySpace status changes as incoming IMs. (Mark Doliner
+ and Justin Williams)
DNS:
* DNS servers are re-read when DNS queries fail in case the system has
@@ -335,32 +338,34 @@ version 2.6.0 (08/18/2009):
address configured.
* Fix a leak when the UI provides its own DNS resolving UI op.
(Aman Gupta)
- * Don't fork a DNS resolver process to resolve IP addresses. (Aman Gupta)
- * Internationalized Domain Names are supported when libpurple is compiled
- against the GNU IDN library.
+ * Don't fork a DNS resolver process to resolve IP addresses.
+ (Aman Gupta)
+ * Internationalized Domain Names are supported when libpurple is
+ compiled against the GNU IDN library.
Environment Variables:
* GnuTLS logging (disabled by default) can be controlled through the
PURPLE_GNUTLS_DEBUG environment variable, which is an integer between
0 and 9 (higher is more verbose). Higher values may reveal sensitive
information.
- * PURPLE_VERBOSE_DEBUG environment variable. Currently, this is an "on" or
- "off" variable. Set it to any value to turn it on and unset it to turn
- it off. This will optionally be used to only show less useful debug
- information on an as-needed basis.
- * PURPLE_LEAKCHECK_HELP environment variable. Currently, this is an "on"
+ * PURPLE_VERBOSE_DEBUG environment variable. Currently, this is an "on"
or "off" variable. Set it to any value to turn it on and unset it to
- turn it off. This will be used to perform various actions that are
- useful when running libpurple inside of Valgrind or similar programs.
- Currently, it keeps plugins in memory, allowing Valgrind to perform
- symbol resolution of leak traces at shutdown.
+ turn it off. This will optionally be used to only show less useful
+ debug information on an as-needed basis.
+ * PURPLE_LEAKCHECK_HELP environment variable. Currently, this is an
+ "on" or "off" variable. Set it to any value to turn it on and unset
+ it to turn it off. This will be used to perform various actions
+ that are useful when running libpurple inside of Valgrind or similar
+ programs. Currently, it keeps plugins in memory, allowing Valgrind
+ to perform symbol resolution of leak traces at shutdown.
AIM and ICQ:
* Preliminary support for a new authentication scheme called
"clientLogin."
* Fixed a bug where your away message sometimes would not get set when
you first sign on.
- * Make sure links in your away messages show up as links to other people.
+ * Make sure links in your away messages show up as links to other
+ people.
* For ICQ, Never change the privacy setting specified by the user.
Gadu-Gadu:
@@ -379,15 +384,16 @@ version 2.6.0 (08/18/2009):
Topper, and Elliott Sales de Andrade)
* Show the invite message for buddies that requested authorization
from you on MSN.
- * Support sending an invite message to buddies when requesting authorization
- from them on MSN.
+ * Support sending an invite message to buddies when requesting
+ authorization from them on MSN.
* Timeout switchboard connections aggressively (60 seconds).
XMPP:
- * Voice & Video support with Jingle (XEP-0166, 0167, 0176, & 0177), voice
- support with GTalk and voice and video support with the GMail web
- client. (Mike "Maiku" Ruprecht)
- * Added a Service Discovery Browser plugin for Pidgin. (Andrei Mozzhuhin)
+ * Voice & Video support with Jingle (XEP-0166, 0167, 0176, & 0177),
+ voice support with GTalk and voice and video support with the GMail
+ web client. (Mike "Maiku" Ruprecht)
+ * Added a Service Discovery Browser plugin for Pidgin.
+ (Andrei Mozzhuhin)
* Support for in-band bytestreams for file transfers (XEP-0047). (Marcus
Lundblad)
* Support for sending and receiving attentions (equivalent to "buzz"
@@ -404,28 +410,30 @@ version 2.6.0 (08/18/2009):
* Better support for receiving remote users' nicknames.
* /affiliate and /role will now list the room members with the specified
affiliation/role if possible. (Andrei Mozzhuhin)
- * Put section breaks between resources in "Get Info" to improve readability.
- * Silently remove invalid XML 1.0 entities (e.g. ASCII control characters)
- from sent messages.
+ * Put section breaks between resources in "Get Info" to improve
+ readability.
+ * Silently remove invalid XML 1.0 entities (e.g. ASCII control
+ characters) from sent messages.
* XHTML markup is only included in outgoing messages when the message
contains formatting.
- * Show when the user was last logged in when doing "Get Info" on an offline
- buddy, provided the server supports it.
+ * Show when the user was last logged in when doing "Get Info" on an
+ offline buddy, provided the server supports it.
* Support custom smileys in MUCs (only when all participants support the
- "Bits of Binary" extension, and a maximum of 10 participants are in the
- chat to avoid getting too many fetch requests).
+ "Bits of Binary" extension, and a maximum of 10 participants are in
+ the chat to avoid getting too many fetch requests).
* Fix an issue with Jabber (pre-XMPP) servers and the user's preference
to require SSL not being respected.
* Fix an issue where Cyrus SASL DIGEST MD5 authentication might fail if
the username, password, or realm (the JID domain) contain non-ASCII
characters.
- * Show emblem for mobile, handheld, and web clients and bots (if the other
- client supports it).
- * Google Talk mail notifications should now work for people for whom they
- inexplicably did not. (Thanks to yukam for determining the reason)
+ * Show emblem for mobile, handheld, and web clients and bots (if the
+ other client supports it).
+ * Google Talk mail notifications should now work for people for whom
+ they inexplicably did not. (Thanks to yukam for determining the
+ reason)
* New XMPP and Google Talk accounts require SSL by default.
- * Display kicks (and the reasons given) in chat rooms when an occupant is
- kicked.
+ * Display kicks (and the reasons given) in chat rooms when an occupant
+ is kicked.
* Fix issues with case-sensitivity of XMPP roster and case-insensitive
Purple groups.
* For contacts who advertise Entity Capabilities, only send rich text
============================================================
--- libpurple/protocols/yahoo/libymsg.c 334b02b1094c54f6778346615471096094b8d693
+++ libpurple/protocols/yahoo/libymsg.c 1674c03710a8e86e59ea81cf8e6b75b815ad70da
@@ -1854,6 +1854,7 @@ static void yahoo_auth16_stage1_cb(Purpl
return;
}
else if (len > 0 && ret_data && *ret_data) {
+ PurpleAccount *account = purple_connection_get_account(gc);
gchar **split_data = g_strsplit(ret_data, "\r\n", -1);
int totalelements = 0;
int response_no = -1;
@@ -1864,11 +1865,13 @@ static void yahoo_auth16_stage1_cb(Purpl
#else
while (split_data[++totalelements] != NULL);
#endif
- if(totalelements == 1)
+ if(totalelements == 1) { /* Received an error code */
response_no = strtol(split_data[0], NULL, 10);
- else if(totalelements >= 2) {
+ } else if(totalelements == 2 || totalelements == 3 ) { /* received valid data */
response_no = strtol(split_data[0], NULL, 10);
token = g_strdup(split_data[1] + strlen("ymsgr="));
+ } else { /* It looks like a transparent proxy has returned a document we don't want */
+ response_no = -1;
}
g_strfreev(split_data);
@@ -1887,8 +1890,8 @@ static void yahoo_auth16_stage1_cb(Purpl
case 1212:
/* Password incorrect */
/* Set password to NULL. Avoids account locking. Brings dialog to enter password if clicked on Re-enable account */
- if (!purple_account_get_remember_password(purple_connection_get_account(gc)))
- purple_account_set_password(purple_connection_get_account(gc), NULL);
+ if (!purple_account_get_remember_password(account))
+ purple_account_set_password(account, NULL);
error_reason = g_strdup(_("Incorrect password"));
error = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
break;
@@ -1930,7 +1933,6 @@ static void yahoo_auth16_stage1_cb(Purpl
else {
/* OK to login, correct information provided */
PurpleUtilFetchUrlData *url_data = NULL;
- PurpleAccount *account = purple_connection_get_account(gc);
char *url = NULL;
gboolean yahoojp = yahoo_is_japan(account);
gboolean proxy_ssl = purple_account_get_bool(account, "proxy_ssl", FALSE);
@@ -2734,8 +2736,9 @@ static void yahoo_process_p2p(PurpleConn
PurpleAccount *account;
YahooFriend *f;
- /* if status is not 1 ie YAHOO_STATUS_BRB, the packet bounced back, so contains our own ip */
- if(!(pkt->status == YAHOO_STATUS_BRB))
+ /* if status is not YAHOO_STATUS_BRB or YAHOO_STATUS_P2P, the packet bounced back,
+ * so it contains our own ip */
+ if(pkt->status != YAHOO_STATUS_BRB && pkt->status != YAHOO_STATUS_P2P)
return ;
while (l) {
============================================================
--- libpurple/protocols/yahoo/libymsg.h 8e984834fb1d7ff646200227a9b586b97f4cea0e
+++ libpurple/protocols/yahoo/libymsg.h 69498cd508e3de349dbd49eebcba06a0679fd589
@@ -119,6 +119,7 @@ enum yahoo_status {
YAHOO_STATUS_ONVACATION,
YAHOO_STATUS_OUTTOLUNCH,
YAHOO_STATUS_STEPPEDOUT,
+ YAHOO_STATUS_P2P = 11,
YAHOO_STATUS_INVISIBLE = 12,
YAHOO_STATUS_CUSTOM = 99,
YAHOO_STATUS_IDLE = 999,
More information about the Commits
mailing list