Merge lp:~jamesh/mediascanner2/bug-1489489 into lp:mediascanner2

[James Henstridge]

Replace deprecated use of GetConnectionAppArmorSecurityContext method with GetConnectionCredentials.

Replace deprecated use of GetConnectionAppArmorSecurityContext method with GetConnectionCredentials.

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:331
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/9/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/596/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/602
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/426/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/426
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/426/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/426
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/426/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/426/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/426
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/426/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/426/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/426/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/426
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/426/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/426
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/426/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/9/rebuild

review: Needs Fixing (continuous-integration)

[Michi Henning (michihenning)]

Looks good to me!

review: Approve

=== modified file 'src/ms-dbus/service-skeleton.cc'
--- src/ms-dbus/service-skeleton.cc	2015-07-14 01:34:56 +0000
+++ src/ms-dbus/service-skeleton.cc	2016-09-09 13:44:04 +0000
@@ -5,6 +5,7 @@
 #include <core/dbus/message.h>
 #include <core/dbus/object.h>
 #include <core/dbus/types/object_path.h>
+#include <core/dbus/types/variant.h>
 #include <sys/apparmor.h>
 
 #include <mediascanner/Album.hh>
@@ -16,21 +17,23 @@
 #include "dbus-codec.hh"
 
 using core::dbus::Message;
+using core::dbus::types::ObjectPath;
+using core::dbus::types::Variant;
 
 namespace mediascanner {
 namespace dbus {
 
-struct Apparmor {
+struct BusDaemon {
     static const std::string &name() {
         static std::string s = "org.freedesktop.DBus";
         return s;
     }
 
-    struct GetConnectionAppArmorSecurityContext {
-        typedef Apparmor Interface;
+    struct GetConnectionCredentials {
+        typedef BusDaemon Interface;
 
         static const std::string &name() {
-            static std::string s = "GetConnectionAppArmorSecurityContext";
+            static std::string s = "GetConnectionCredentials";
             return s;
         }
 
@@ -119,20 +122,33 @@
         auto service = core::dbus::Service::use_service(
             impl->access_bus(), "org.freedesktop.DBus");
         auto obj = service->object_for_path(
-            core::dbus::types::ObjectPath("/org/freedesktop/DBus"));
+            ObjectPath("/org/freedesktop/DBus"));
 
-        core::dbus::Result<std::string> result;
+        core::dbus::Result<std::map<std::string,Variant>> result;
         try {
-            result = obj->invoke_method_synchronously<Apparmor::GetConnectionAppArmorSecurityContext, std::string>(message->sender());
-        } catch (const std::runtime_error &e) {
-            fprintf(stderr, "Error getting apparmor context: %s\n", e.what());
+            result = obj->invoke_method_synchronously<BusDaemon::GetConnectionCredentials,std::map<std::string,Variant>>(message->sender());
+        } catch (const std::exception &e) {
+            fprintf(stderr, "Error getting connection credentials: %s\n", e.what());
             return std::string();
         }
         if (result.is_error()) {
-            fprintf(stderr, "Error getting apparmor context: %s\n", result.error().print().c_str());
-            return std::string();
-        }
-        return result.value();
+            fprintf(stderr, "Error getting connection credentials: %s\n", result.error().print().c_str());
+            return std::string();
+        }
+        const auto& creds = result.value();
+        auto it = creds.find("LinuxSecurityLabel");
+        if (it == creds.end()) {
+            fprintf(stderr, "Connection credentials don't include security label");
+            return std::string();
+        }
+        std::vector<int8_t> label;
+        try {
+            label = it->second.as<std::vector<int8_t>>();
+        } catch (const std::exception &e) {
+            fprintf(stderr, "Could not convert security label to byte array");
+            return std::string();
+        }
+        return std::string(aa_splitcon(reinterpret_cast<char*>(&label[0]), nullptr));
     }
 
     bool does_client_have_access(const std::string &context, MediaType type) {