x11 work

2 files changed, 66 insertions, 0 deletions

diff --git a/src/firemon/firemon.c b/src/firemon/firemon.c
index 679c5a3e9..c19c344b0 100644
--- a/src/firemon/firemon.c
+++ b/src/firemon/firemon.c
@@ -33,6 +33,7 @@ static int arg_seccomp = 0;
 static int arg_caps = 0;
 static int arg_cpu = 0;
 static int arg_cgroup = 0;
+static int arg_x11 = 0;
 int arg_nowrap = 0;
 
 static struct termios tlocal;   // startup terminal setting
@@ -141,6 +142,9 @@ int main(int argc, char **argv) {
 
 
                 // cumulative options with or without a pid argument
+                else if (strcmp(argv[i], "--x11") == 0) {
+                        arg_x11 = 1;
+                }
                 else if (strcmp(argv[i], "--cgroup") == 0) {
                         arg_cgroup = 1;
                 }
@@ -217,6 +221,8 @@ int main(int argc, char **argv) {
                 cpu((pid_t) pid);
         if (arg_cgroup)
                 cgroup((pid_t) pid);
+        if (arg_x11)
+                x11((pid_t) pid);
         
         if (!arg_route && !arg_arp && !arg_interface && !arg_tree && !arg_caps && !arg_seccomp)
                 procevent((pid_t) pid); // never to return
diff --git a/src/firemon/x11.c b/src/firemon/x11.c
new file mode 100644
index 000000000..e30c2d78b
--- /dev/null
+++ b/src/firemon/x11.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2014-2016 netblue30 (netblue30@yahoo.com)
+ *
+ * This file is part of firejail project
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+#include "firemon.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+                        
+void x11(pid_t pid) {
+        if (getuid() == 0)
+                firemon_drop_privs();
+        
+        pid_read(pid);
+        
+        // print processes
+        int i;
+        for (i = 0; i < max_pids; i++) {
+                if (pids[i].level == 1) {
+                        pid_print_list(i, 0);
+                        
+                        char *x11file;
+                        // todo: use macro from src/firejail/firejail.h for /run/firejail/x11 directory
+                        if (asprintf(&x11file, "/run/firejail/x11/%d", i) == -1)
+                                errExit("asprintf");
+
+                        struct stat s;
+                        if (stat(x11file, &s) == 0) {
+                                FILE *fp = fopen(x11file, "r");
+                                if (!fp) {
+                                        free(x11file);
+                                        continue;
+                                }
+                                int display;
+                                int rv = fscanf(fp, "%d", &display);
+                                if (rv == 1)
+                                        printf("   DISPLAY :%d\n", display);
+                                fclose(fp);
+                        }
+
+                        free(x11file);
+                }
+        }
+}
+