Merge lp:~thomas-voss/location-service/hot-fix-for-camera-app-and-osmtouch into lp:location-service/trunk

[Thomas Voß]

Add camera app and osm touch to the whitelist for permission mgmt.

Add camera app and osm touch to the whitelist for permission mgmt.

[Ricardo Salveti (rsalveti)]

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:84
http://jenkins.qa.ubuntu.com/job/location-service-ci/255/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/162/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/162/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/162/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/255/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/location-service/hot-fix-for-camera-app-and-osmtouch]

85. By Thomas Voß on 2014-08-07

Adjust camera-app version.

[Ricardo Salveti (rsalveti)]

Looks fine, can bite us again soon but better then allowing any version and forgetting to remove this fix.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/location-service-ci/257/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/164/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/164/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/164/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/257/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp'
--- src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp	2014-08-05 19:36:05 +0000
+++ src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp	2014-08-07 20:41:24 +0000
@@ -30,11 +30,24 @@
 
 #include <sys/apparmor.h>
 
+#include <set>
+
 namespace location = com::ubuntu::location;
 namespace service = com::ubuntu::location::service;
 
 namespace
 {
+std::set<std::string> whitelisted_apps
+{
+    "com.ubuntu.camera_camera_3.0.0.342",
+    "me.yohanboniface.osmtouch_OSMTouch_0.1.3"
+};
+
+bool is_application_with_confinement_profile_whitelisted(const std::string& profile)
+{
+    return whitelisted_apps.count(profile) > 0;
+}
+
 bool is_running_under_testing()
 {
     return core::posix::this_process::env::get(
@@ -133,6 +146,12 @@
         return service::PermissionManager::Result::rejected;
     }
 
+    // This is an ugly hack to prevent a revert. It will be removed as soon as
+    // https://bugs.launchpad.net/qtmir/+bug/1352977 is fixed. A separate bug tracks the removal
+    // of this hack: https://bugs.launchpad.net/location-service/+bug/1354080
+    if (is_application_with_confinement_profile_whitelisted(profile))
+        return Result::granted;
+
     std::string description;
 
     if (profile == "unconfined")