Merge lp:~stolowski/unity-scopes-shell/reset-user-data into lp:unity-scopes-shell

[Paweł Stołowski]

Reset user data set with previously executed canned query when shell calls setSearchQuery() (i.e.user typed a new search). Keeping the previous value and sending it again with new search (which is a user input, so no side-channel data should exists) is a bug that can confuse scopes.

Reset user data set with previously executed canned query when shell calls setSearchQuery() (i.e.user typed a new search). Keeping the previous value and sending it again with new search (which is a user input, so no side-channel data should exists) is a bug that can confuse scopes.

[Marcus Tomlinson (marcustomlinson)]

Indeed

review: Approve

[lp:~stolowski/unity-scopes-shell/reset-user-data]

210. By Paweł Stołowski on 2015-04-29

Merged fix-1335761

Unmerged revisions

=== modified file 'po/unity-plugin-scopes.pot'
--- po/unity-plugin-scopes.pot	2015-03-04 10:10:56 +0000
+++ po/unity-plugin-scopes.pot	2015-04-29 10:00:38 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 11:02+0100\n"
+"POT-Creation-Date: 2015-04-29 10:20+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 
=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2015-03-20 14:44:32 +0000
+++ src/Unity/scope.cpp	2015-04-29 10:00:38 +0000
@@ -267,7 +267,7 @@
     {
         m_queryUserData.reset(nullptr);
     }
-    setSearchQuery(QString::fromStdString(query.query_string()));
+    setSearchQueryString(QString::fromStdString(query.query_string()));
 }
 
 void Scope::executeCannedQuery(unity::scopes::CannedQuery const& query, bool allowDelayedActivation)
@@ -1031,6 +1031,16 @@
 
 void Scope::setSearchQuery(const QString& search_query)
 {
+    // this method is called by the shell when user types in search string,
+    // it needs to reset canned query user data.
+    if (m_searchQuery.isNull() || search_query != m_searchQuery) {
+        m_queryUserData.reset(nullptr);
+    }
+    setSearchQueryString(search_query);
+}
+
+void Scope::setSearchQueryString(const QString& search_query)
+{
     /* Checking for m_searchQuery.isNull() which returns true only when the string
        has never been set is necessary because when search_query is the empty
        string ("") and m_searchQuery is the null string,
 
=== modified file 'src/Unity/scope.h'
--- src/Unity/scope.h	2015-03-20 14:44:32 +0000
+++ src/Unity/scope.h	2015-04-29 10:00:38 +0000
@@ -171,6 +171,7 @@
     Scope::Ptr findTempScope(QString const& id) const;
 
     bool loginToAccount(QString const& scope_id, QString const& service_name, QString const& service_type, QString const& provider_name);
+    void setSearchQueryString(const QString& search_query);
 
 public Q_SLOTS:
     void invalidateResults();