Merge lp:~thomas-voss/trust-store/do-not-prompt-or-cache-camera-app into lp:trust-store

[Thomas Voß]

Do not prompt or cache accesses being issued by the camera app.

Do not prompt or cache accesses being issued by the camera app.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alberto Aguirre (albaguirre)]

LGTM

review: Approve

=== modified file 'src/core/trust/daemon.cpp'
--- src/core/trust/daemon.cpp	2014-10-15 17:56:27 +0000
+++ src/core/trust/daemon.cpp	2014-10-15 17:56:28 +0000
@@ -365,17 +365,22 @@
             std::make_shared<core::trust::CachedAgentGlogReporter>(
                     core::trust::CachedAgentGlogReporter::Configuration{})
         });
-    auto formatting_agent = std::make_shared<core::trust::AppIdFormattingTrustAgent>(cached_agent);
-    auto whitelisting_agent = std::make_shared<core::trust::WhiteListingAgent>(
-                core::trust::WhiteListingAgent::always_grant_for_unconfined(),
-                formatting_agent);
+
+    auto whitelisting_agent = std::make_shared<core::trust::WhiteListingAgent>([](const core::trust::Agent::RequestParameters& params) -> bool
+    {
+        static auto unconfined_predicate = core::trust::WhiteListingAgent::always_grant_for_unconfined();
+        return unconfined_predicate(params) || params.application.id == "com.ubuntu.camera_camera";
+    }, cached_agent);
+
+    auto formatting_agent = std::make_shared<core::trust::AppIdFormattingTrustAgent>(whitelisting_agent);
+
     auto remote_agent = remote_agent_factory(service_name, formatting_agent, dict);
 
     return core::trust::Daemon::Skeleton::Configuration
     {
         service_name,
         bus_from_name(vm[Parameters::StoreBus::name].as<std::string>()),
-        {local_store, whitelisting_agent},
+        {local_store, formatting_agent},
         {remote_agent}
     };
 }