diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 07:11:54 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 07:11:54 +0000 |
| commit | 8d58a2da0140361d0b191c4d6327cc23a42c3760 (patch) | |
| tree | 5eaddad28a2908b4ee9031eaf53aee68576d58dc /chrome | |
| parent | 6e3b4dce8ae5a21fc2329bd611115363d21147ba (diff) | |
| download | chromium_src-8d58a2da0140361d0b191c4d6327cc23a42c3760.zip chromium_src-8d58a2da0140361d0b191c4d6327cc23a42c3760.tar.gz chromium_src-8d58a2da0140361d0b191c4d6327cc23a42c3760.tar.bz2 | |
Relaxed check in IsValidCacheInvalidationIqPacket().
BUG=48988
TEST=tested manually with a gmail account with a canonical name including capital letters
Review URL: http://codereview.chromium.org/2805080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52457 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc b/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc index 0b31546..a5d23f2 100644 --- a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc +++ b/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc @@ -83,9 +83,15 @@ class CacheInvalidationListenTask : public buzz::XmppTask { private: bool IsValidCacheInvalidationIqPacket(const buzz::XmlElement* stanza) { + // We make sure to compare jids (which are normalized) instead of + // just strings -- server may use non-normalized jids in + // attributes. + // + // TODO(akalin): Add unit tests for this. + buzz::Jid to(stanza->Attr(buzz::QN_TO)); return (MatchRequestIq(stanza, buzz::STR_SET, kQnData) && - (stanza->Attr(buzz::QN_TO) == GetClient()->jid().Str())); + (to == GetClient()->jid())); } bool GetCacheInvalidationIqPacketData(const buzz::XmlElement* stanza, @@ -164,7 +170,6 @@ class CacheInvalidationSendMessageTask : public buzz::XmppTask { buzz::XmlElement* cache_invalidation_iq_packet = new buzz::XmlElement(kQnData, true); iq->AddElement(cache_invalidation_iq_packet); - // TODO(akalin): Remove use of seq and sid. cache_invalidation_iq_packet->SetAttr(kQnSeq, IntToString(seq)); cache_invalidation_iq_packet->SetAttr(kQnSid, sid); cache_invalidation_iq_packet->SetAttr(kQnServiceUrl, |