diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-31 20:03:17 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-31 20:03:17 +0000 |
| commit | ebbad39834e94c644dea59afe865ac74aa14dee3 (patch) | |
| tree | 6976930bdee4a4d637858fc516cefe5de84792e2 /jingle | |
| parent | 80a3bb4b660bbb4e323227f54de7f0d9071628d1 (diff) | |
| download | chromium_src-ebbad39834e94c644dea59afe865ac74aa14dee3.zip chromium_src-ebbad39834e94c644dea59afe865ac74aa14dee3.tar.gz chromium_src-ebbad39834e94c644dea59afe865ac74aa14dee3.tar.bz2 | |
[Sync] Relax checks for received XMPP messages
Basically they caused more bugs than they fixed (see discussion in bug).
BUG=71285
TEST=
Review URL: http://codereview.chromium.org/6392014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/notifier/listener/listen_task.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/jingle/notifier/listener/listen_task.cc b/jingle/notifier/listener/listen_task.cc index 8466c57..01fb26c 100644 --- a/jingle/notifier/listener/listen_task.cc +++ b/jingle/notifier/listener/listen_task.cc @@ -65,8 +65,9 @@ int ListenTask::ProcessResponse() { // Note that there can be multiple "Result" elements, so we need to loop // through all of them. bool update_signaled = false; + const buzz::QName kQnNotifierGetAll(kNotifierNamespace, "getAll"); const buzz::XmlElement* get_all_element = - stanza->FirstNamed(buzz::QName("google:notifier", "getAll")); + stanza->FirstNamed(kQnNotifierGetAll); if (get_all_element) { const buzz::XmlElement* result_element = get_all_element->FirstNamed( @@ -125,8 +126,6 @@ bool ListenTask::HandleStanza(const buzz::XmlElement* stanza) { } bool ListenTask::IsValidNotification(const buzz::XmlElement* stanza) { - static const buzz::QName kQnNotifierGetAll( - kNotifierNamespace, "getAll"); // An update notificaiton has the following form. // <cli:iq from="{bare_jid}" to="{full_jid}" // id="#" type="set" xmlns:cli="jabber:client"> @@ -134,10 +133,11 @@ bool ListenTask::IsValidNotification(const buzz::XmlElement* stanza) { // <Timestamp long="#" xmlns=""/> // </not:getAll> // </cli:iq> - return - (MatchRequestIq(stanza, buzz::STR_SET, kQnNotifierGetAll) && - (stanza->Attr(buzz::QN_TO) == GetClient()->jid().Str()) && - (stanza->Attr(buzz::QN_FROM) == GetClient()->jid().BareJid().Str())); + // + // We deliberately minimize the verification we do here, though: see + // http://crbug.com/71285 . + const buzz::QName kQnNotifierGetAll(kNotifierNamespace, "getAll"); + return MatchRequestIq(stanza, buzz::STR_SET, kQnNotifierGetAll); } } // namespace notifier |