7 files changed, 113 insertions, 10 deletions

diff --git a/README b/README
index f4b77e247..998037e31 100644
--- a/README
+++ b/README
@@ -463,6 +463,9 @@ Zack Weinberg (https://github.com/zackw)
         - rework fcopy, --follow-link support in fcopy
         - follow link support in --private-bin
         - wait_for_other function rewrite
-        - xvfb X11 server support
+        - Xvfb X11 server support
+        - Xvfb and Xephyr profiles, modified Xpra profile
+        - support for sandboxing Xpra, Xvfb and Xephyr in independent sandboxes when started
+          with firejail --x11
 
 Copyright (C) 2014-2017 Firejail Authors
diff --git a/README.md b/README.md
index 21752839e..65ae6457a 100644
--- a/README.md
+++ b/README.md
@@ -219,4 +219,4 @@ Kino, Thunar, Geeqie, Engrampa, Scribus, mousepad, gpicview, keepassxc, cvlc, Me
 Nylas, dino, BibleTime, viewnior, Kodi, viking, youtube-dl, meld, Arduino, Akregator, KCalc, KTorrent,
 Orage Globaltime, Orage Clendar, xfce4-notes, xfce4-dict, Ristretto, PCManFM, Dia, FontForge, Geany, Hugin,
 mate-calc, mate-dictionary, mate-color-select, caja, galculator, Nemo, gnome-font-viewer, gucharmap,
-knotes, clipit, leafpad, lximage-qt, lxmusic, qlipper 
+knotes, clipit, leafpad, lximage-qt, lxmusic, qlipper, Xvfb, Xephyr 
diff --git a/RELNOTES b/RELNOTES
index 31b44b1d6..33088dfe5 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -32,6 +32,8 @@ firejail (0.9.46-rc1) baseline; urgency=low
   * feature: support overlay, overlay-named and overlay-tmpfs in profile files
   * feature: allow PulseAudio sockets in --private-tmp
   * feature: --fix-sound support in firecfg
+  * feature: added support for sandboxing Xpra, Xvfb and Xephyr in 
+    independent sandboxes when started with firejail --x11
   * new profiles: xiphos, Tor Browser Bundle, display (imagemagick), Wire,
   * new profiles: mumble, zoom, Guayadeque, qemu, keypass2, xed, pluma,
   * new profiles: Cryptocat, Bless, Gnome 2048, Gnome Calculator,
@@ -45,7 +47,7 @@ firejail (0.9.46-rc1) baseline; urgency=low
   * new profiles: Ristretto, PCManFM, Dia, FontForge, Geany, Hugin,
   * new profiles: mate-calc, mate-dictionary, mate-color-select, caja,
   * new profiles: galculator, Nemo, gnome-font-viewer, gucharmap, knotes
-  * new profiles: clipit, leafpad, lximage-qt, lxmusic, qlipper
+  * new profiles: clipit, leafpad, lximage-qt, lxmusic, qlipper, Xvfb, Xephyr
   * bugfixes
  -- netblue30 <netblue30@yahoo.com>  Fri, 7 Apr 2017 08:00:00 -0500
 
diff --git a/etc/Xephyr.profile b/etc/Xephyr.profile
new file mode 100644
index 000000000..362318bb1
--- /dev/null
+++ b/etc/Xephyr.profile
@@ -0,0 +1,40 @@
+# This file is overwritten during software install.
+# Persistent customizations should go in a .local file.
+include /etc/firejail/Xephyr.local
+
+#
+# This profile will sandbox Xephyr server itself when used with firejail --x11=xephyr.
+# The target program is sandboxed with its own profile. By default the this functionality
+# is disabled. To enable it, create a firejail-Xephyr  symlink in /usr/local/bin:
+#
+#    $ sudo ln -s /usr/bin/firejail /usr/local/bin/Xephyr
+#
+# We have this functionality disabled by default because it creates problems on
+# some Linux distributions.
+#
+
+
+# using a private home directory
+private
+
+
+caps.drop all
+# Xephyr needs to be allowed access to the abstract Unix socket namespace.
+#net none
+nogroups
+nonewprivs
+# In noroot mode, Xephyr cannot create a socket in the real /tmp/.X11-unix.
+#noroot
+nosound
+shell none
+seccomp
+protocol unix
+
+private-dev
+private-tmp
+#private-bin Xephyr,sh,xkbcomp,strace,bash,cat,ls
+#private-bin Xephyr,sh,xkbcomp
+#private-etc ld.so.conf,ld.so.cache,resolv.conf,host.conf,nsswitch.conf,gai.conf,hosts,hostname
+
+blacklist /media
+whitelist /var/lib/xkb
diff --git a/etc/Xvfb.profile b/etc/Xvfb.profile
new file mode 100644
index 000000000..9c919f432
--- /dev/null
+++ b/etc/Xvfb.profile
@@ -0,0 +1,39 @@
+# This file is overwritten during software install.
+# Persistent customizations should go in a .local file.
+include /etc/firejail/xvfb.local
+
+#
+# This profile will sandbox Xvfb server itself when used with firejail --x11=xvfb.
+# The target program is sandboxed with its own profile. By default the this functionality
+# is disabled. To enable it, create a firejail-Xvfb  symlink in /usr/local/bin:
+#
+#    $ sudo ln -s /usr/bin/firejail /usr/local/bin/Xvfb
+#
+# We have this functionality disabled by default because it creates problems on
+# some Linux distributions.
+#
+
+
+# using a private home directory
+private
+
+caps.drop all
+# Xvfb needs to be allowed access to the abstract Unix socket namespace.
+#net none
+nogroups
+nonewprivs
+# In noroot mode, Xvfb cannot create a socket in the real /tmp/.X11-unix.
+#noroot
+nosound
+shell none
+seccomp
+protocol unix
+
+private-dev
+private-tmp
+private-etc ld.so.conf,ld.so.cache,resolv.conf,host.conf,nsswitch.conf,gai.conf,hosts,hostname
+#private-bin Xvfb,sh,xkbcomp,strace,bash,cat,ls
+#private-bin Xvfb,sh,xkbcomp
+
+blacklist /media
+whitelist /var/lib/xkb
diff --git a/etc/xpra.profile b/etc/xpra.profile
index d0fff2ebf..f4f28f9de 100644
--- a/etc/xpra.profile
+++ b/etc/xpra.profile
@@ -2,26 +2,43 @@
 # Persistent customizations should go in a .local file.
 include /etc/firejail/xpra.local
 
-# xpra profile
+
+#
+# This profile will sandbox Xpra server itself when used with firejail --x11=xpra.
+# The target program is sandboxed with its own profile. By default the this functionality
+# is disabled. To enable it, create a firejail-xpra  symlink in /usr/local/bin:
+#
+#    $ sudo ln -s /usr/bin/firejail /usr/local/bin/xpra
+#
+# We have this functionality disabled by default because it creates problems on
+# some Linux distributions.
+#
+
+# private home directory doesn't work on some distros, so we go for a regular home
+#private
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
 include /etc/firejail/disable-passwdmgr.inc
 
 caps.drop all
-netfilter
+# xpra needs to be allowed access to the abstract Unix socket namespace.
+#net none
 nogroups
 nonewprivs
-noroot
+# In noroot mode, xpra cannot create a socket in the real /tmp/.X11-unix.
+#noroot
 nosound
 shell none
 seccomp
-protocol unix,inet,inet6
+protocol unix
 
-# blacklist /tmp/.X11-unix
 
-# private-bin 
 private-dev
 private-tmp
-# private-etc
+#private-bin xpra,python,Xvfb,Xorg,sh,xkbcomp,xauth,dbus-launch,pactl,ldconfig,which,strace,bash,cat,ls
+#private-etc ld.so.conf,ld.so.cache,resolv.conf,host.conf,nsswitch.conf,gai.conf,hosts,hostname,machine-id,xpra,X11
+
+blacklist /media
+whitelist /var/lib/xkb
 
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 200ecd685..ae7924140 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -296,3 +296,5 @@
 /etc/firejail/lximage-qt.profile
 /etc/firejail/lxmusic.profile
 /etc/firejail/qlipper.profile
+/etc/firejail/Xvfb.profile
+/etc/firejail/Xephyr.profile