Merge lp:~ted/media-hub/deb-apps-apparmor into lp:media-hub

[Ted Gould]

Add mediaplayer-app to the list of accepted legacy apps

[lp:~ted/media-hub/deb-apps-apparmor]

184. By Ted Gould on 2016-05-13

Make it so that media player comes up as unconfined

Unmerged revisions

184. By Ted Gould on 2016-05-13

Make it so that media player comes up as unconfined

183. By Ted Gould on 2016-05-12

Add media player app to the list of known apparmor profiles

=== modified file 'src/core/media/apparmor/ubuntu.cpp'
--- src/core/media/apparmor/ubuntu.cpp	2016-04-06 15:42:15 +0000
+++ src/core/media/apparmor/ubuntu.cpp	2016-05-13 13:35:29 +0000
@@ -74,6 +74,7 @@
 static constexpr std::size_t index_package{1};
 static constexpr std::size_t index_app{2};
 static const std::string unity_name{"unity8-dash"};
+static const std::string mediaplayer_name{"mediaplayer-app"};
 
 // Returns true if the context name is a valid Ubuntu app id.
 // If it is, out is populated with the package and app name.
@@ -85,7 +86,7 @@
     static const std::regex full_re{"(.*)_(.*)_(.*)"};
     static const std::regex trust_store_re{"(.*)-(.*)"};
 
-    if ((s == "messaging-app" or s == unity_name)
+    if ((s == "messaging-app" or s == unity_name or s == mediaplayer_name)
             and std::regex_match(s, out, trust_store_re))
     {
         pkg_name = s;
@@ -104,7 +105,7 @@
 
 apparmor::ubuntu::Context::Context(const std::string& name)
     : apparmor::Context{name},
-      unconfined_{str() == ubuntu::unconfined},
+      unconfined_{str() == ubuntu::unconfined or str() == mediaplayer_name},
       unity_{name == unity_name},
       has_package_name_{process_context_name(str(), match_, pkg_name_)}
 {