Merge lp:~ted/ubuntu-app-launch/appid-from-pid into lp:ubuntu-app-launch/16.10

[Ted Gould]

Add function to get an AppID from a PID

Unmerged revisions

231. By Ted Gould on 2016-05-12

Add a function to build an AppID from a PID

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-04-21 01:01:47 +0000
+++ CMakeLists.txt	2016-05-16 13:48:41 +0000
@@ -75,12 +75,15 @@
 pkg_check_modules(CGMANAGER REQUIRED libcgmanager)
 include_directories(${CGMANAGER_INCLUDE_DIRS})
 
-pkg_check_modules(MIR mirclient)
+pkg_check_modules(MIR REQUIRED mirclient)
 include_directories(${MIR_INCLUDE_DIRS})
 
-pkg_check_modules(LIBERTINE libertine)
+pkg_check_modules(LIBERTINE REQUIRED libertine)
 include_directories(${LIBERTINE_INCLUDE_DIRS})
 
+pkg_check_modules(APPARMOR REQUIRED libapparmor)
+include_directories(${APPARMOR_INCLUDE_DIRS})
+
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")

=== modified file 'libubuntu-app-launch/CMakeLists.txt'
--- libubuntu-app-launch/CMakeLists.txt	2016-05-02 13:47:11 +0000
+++ libubuntu-app-launch/CMakeLists.txt	2016-05-16 13:48:41 +0000
@@ -90,6 +90,7 @@
 	${ZEITGEIST_LIBRARIES}
 	${MIR_LIBRARIES}
 	${LIBERTINE_LIBRARIES}
+	${APPARMOR_LIBRARIES}
 	helpers
 	-Wl,--no-undefined
 )

=== modified file 'libubuntu-app-launch/appid.h'
--- libubuntu-app-launch/appid.h	2016-04-18 18:29:32 +0000
+++ libubuntu-app-launch/appid.h	2016-05-16 13:48:41 +0000
@@ -154,6 +154,15 @@
         \param version Version of the package
     */
     static AppID discover(const std::string& package, const std::string& appname, const std::string& version);
+
+    /** Looks at the AppArmor profile of a PID and determines the
+        AppID based on the AppArmor profile. This is useful for
+        trusted services that want to verify and untrusted connection's
+        owner is who they think it is.
+
+        \param pid PID to get an AppID for
+    */
+    static AppID fromPid(pid_t pid);
 };
 
 bool operator==(const AppID& a, const AppID& b);

=== modified file 'libubuntu-app-launch/application.cpp'
--- libubuntu-app-launch/application.cpp	2016-05-02 20:06:22 +0000
+++ libubuntu-app-launch/application.cpp	2016-05-16 13:48:41 +0000
@@ -20,6 +20,8 @@
 extern "C" {
 #include "app-info.h"
 #include "ubuntu-app-launch.h"
+
+#include <sys/apparmor.h>
 }
 
 #include "application-impl-click.h"
@@ -219,5 +221,25 @@
     return appid;
 }
 
+AppID AppID::fromPid(pid_t pid)
+{
+    gchar* clabel = nullptr;
+    gchar* cmode = nullptr;
+
+    if (aa_gettaskcon(pid, &clabel, &cmode) != 0)
+        return {};
+
+    if (clabel == nullptr)
+        return {};
+
+    std::string label(clabel);
+    free(clabel); /* No freeing of the mode per-apparmor docs */
+
+    if (label == "unconfined")
+        return {}; /* Wonder if we should try harder here? */
+
+    return find(label);
+}
+
 };  // namespace app_launch
 };  // namespace ubuntu