Merge lp:~osomon/trust-store/whitelist-webbrowser-app into lp:trust-store

[Olivier Tilloy]

Add webbrowser-app to whitelist.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:133
http://jenkins.qa.ubuntu.com/job/trust-store-ci/99/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/99/rebuild

review: Approve (continuous-integration)

Unmerged revisions

133. By Olivier Tilloy on 2015-10-02

Add webbrowser-app to whitelist.

=== modified file 'src/core/trust/daemon.cpp'
--- src/core/trust/daemon.cpp	2015-08-31 14:00:41 +0000
+++ src/core/trust/daemon.cpp	2015-10-02 11:28:45 +0000
@@ -371,7 +371,9 @@
     {
         static auto unconfined_predicate = core::trust::WhiteListingAgent::always_grant_for_unconfined();
         const bool is_unconfined = unconfined_predicate(params);
-        return is_unconfined || ((not (dict.count("disable-whitelisting") > 0)) && params.application.id == "com.ubuntu.camera_camera");
+        return is_unconfined || ((not (dict.count("disable-whitelisting") > 0)) &&
+                                 (params.application.id == "com.ubuntu.camera_camera" ||
+                                  params.application.id == "webbrowser-app"));
     }, cached_agent);
 
     auto formatting_agent = std::make_shared<core::trust::AppIdFormattingTrustAgent>(whitelisting_agent);