From ddb9194f8152ef16e3a1e678a976dc7aca10b066 Mon Sep 17 00:00:00 2001 From: kortewegdevries Date: Wed, 18 Nov 2020 16:52:22 +0000 Subject: Add profile for straw-viewer (#3742) * Add profile for straw-viewer * Remove blacklist, fixes --- etc/inc/disable-programs.inc | 2 + etc/profile-a-l/gtk-straw-viewer.profile | 14 +++++++ etc/profile-a-l/gtk-youtube-viewer | 18 --------- etc/profile-a-l/gtk-youtube-viewer.profile | 14 +++++++ etc/profile-a-l/gtk2-youtube-viewer | 18 --------- etc/profile-a-l/gtk2-youtube-viewer.profile | 18 +++++++++ etc/profile-a-l/gtk3-youtube-viewer | 18 --------- etc/profile-a-l/gtk3-youtube-viewer.profile | 18 +++++++++ etc/profile-m-z/straw-viewer.profile | 58 +++++++++++++++++++++++++++++ etc/profile-m-z/youtube-viewer.profile | 8 +--- src/firecfg/firecfg.config | 2 + 11 files changed, 128 insertions(+), 60 deletions(-) create mode 100644 etc/profile-a-l/gtk-straw-viewer.profile delete mode 100644 etc/profile-a-l/gtk-youtube-viewer create mode 100644 etc/profile-a-l/gtk-youtube-viewer.profile delete mode 100644 etc/profile-a-l/gtk2-youtube-viewer create mode 100644 etc/profile-a-l/gtk2-youtube-viewer.profile delete mode 100644 etc/profile-a-l/gtk3-youtube-viewer create mode 100644 etc/profile-a-l/gtk3-youtube-viewer.profile create mode 100644 etc/profile-m-z/straw-viewer.profile diff --git a/etc/inc/disable-programs.inc b/etc/inc/disable-programs.inc index 7e3c0b657..976f988b2 100644 --- a/etc/inc/disable-programs.inc +++ b/etc/inc/disable-programs.inc @@ -378,6 +378,7 @@ blacklist ${HOME}/.config/spotify blacklist ${HOME}/.config/sqlitebrowser blacklist ${HOME}/.config/stellarium blacklist ${HOME}/.config/strawberry +blacklist ${HOME}/.config/straw-viewer blacklist ${HOME}/.config/supertuxkart blacklist ${HOME}/.config/synfig blacklist ${HOME}/.config/teams @@ -972,6 +973,7 @@ blacklist ${HOME}/.cache/smuxi blacklist ${HOME}/.cache/snox blacklist ${HOME}/.cache/spotify blacklist ${HOME}/.cache/strawberry +blacklist ${HOME}/.cache/straw-viewer blacklist ${HOME}/.cache/supertuxkart blacklist ${HOME}/.cache/systemsettings blacklist ${HOME}/.cache/telepathy diff --git a/etc/profile-a-l/gtk-straw-viewer.profile b/etc/profile-a-l/gtk-straw-viewer.profile new file mode 100644 index 000000000..e2721360b --- /dev/null +++ b/etc/profile-a-l/gtk-straw-viewer.profile @@ -0,0 +1,14 @@ +# Firejail profile for gtk-straw-viewer +# Description: Gtk front-end to straw-viewer +# This file is overwritten after every install/update +# Persistent local customizations +include gtk-straw-viewer.local +# added by included profile +#include globals.local + +ignore quiet + +include whitelist-runuser-common.inc + +# Redirect +include straw-viewer.profile diff --git a/etc/profile-a-l/gtk-youtube-viewer b/etc/profile-a-l/gtk-youtube-viewer deleted file mode 100644 index 023f10d3d..000000000 --- a/etc/profile-a-l/gtk-youtube-viewer +++ /dev/null @@ -1,18 +0,0 @@ -# Firejail profile for gtk-youtube-viewer -# Description: Gtk front-end to youtube-viewer -# This file is overwritten after every install/update -# Persistent local customizations -include gtk-youtube-viewer.local -# Persistent global definitions -# include globals.local - -ignore quiet - -noblacklist /tmp/.X11-unix -noblacklist ${RUNUSER}/wayland-* -noblacklist ${RUNUSER} - -include whitelist-runuser-common.inc - -# Redirect -include youtube-viewer.profile \ No newline at end of file diff --git a/etc/profile-a-l/gtk-youtube-viewer.profile b/etc/profile-a-l/gtk-youtube-viewer.profile new file mode 100644 index 000000000..848979b52 --- /dev/null +++ b/etc/profile-a-l/gtk-youtube-viewer.profile @@ -0,0 +1,14 @@ +# Firejail profile for gtk-youtube-viewer +# Description: Gtk front-end to youtube-viewer +# This file is overwritten after every install/update +# Persistent local customizations +include gtk-youtube-viewer.local +# added by included profile +#include globals.local + +ignore quiet + +include whitelist-runuser-common.inc + +# Redirect +include youtube-viewer.profile diff --git a/etc/profile-a-l/gtk2-youtube-viewer b/etc/profile-a-l/gtk2-youtube-viewer deleted file mode 100644 index 331e73218..000000000 --- a/etc/profile-a-l/gtk2-youtube-viewer +++ /dev/null @@ -1,18 +0,0 @@ -# Firejail profile for gtk2-youtube-viewer -# Description: Gtk front-end to youtube-viewer -# This file is overwritten after every install/update -# Persistent local customizations -include gtk2-youtube-viewer.local -# Persistent global definitions -# include globals.local - -ignore quiet - -noblacklist /tmp/.X11-unix -noblacklist ${RUNUSER}/wayland-* -noblacklist ${RUNUSER} - -include whitelist-runuser-common.inc - -# Redirect -include youtube-viewer.profile \ No newline at end of file diff --git a/etc/profile-a-l/gtk2-youtube-viewer.profile b/etc/profile-a-l/gtk2-youtube-viewer.profile new file mode 100644 index 000000000..dccadcf2e --- /dev/null +++ b/etc/profile-a-l/gtk2-youtube-viewer.profile @@ -0,0 +1,18 @@ +# Firejail profile for gtk2-youtube-viewer +# Description: Gtk front-end to youtube-viewer +# This file is overwritten after every install/update +# Persistent local customizations +include gtk2-youtube-viewer.local +# added by included profile +#include globals.local + +ignore quiet + +noblacklist /tmp/.X11-unix +noblacklist ${RUNUSER}/wayland-* +noblacklist ${RUNUSER} + +include whitelist-runuser-common.inc + +# Redirect +include youtube-viewer.profile diff --git a/etc/profile-a-l/gtk3-youtube-viewer b/etc/profile-a-l/gtk3-youtube-viewer deleted file mode 100644 index 4c5bde55f..000000000 --- a/etc/profile-a-l/gtk3-youtube-viewer +++ /dev/null @@ -1,18 +0,0 @@ -# Firejail profile for gtk3-youtube-viewer -# Description: Gtk front-end to youtube-viewer -# This file is overwritten after every install/update -# Persistent local customizations -include gtk3-youtube-viewer.local -# Persistent global definitions -# include globals.local - -ignore quiet - -noblacklist /tmp/.X11-unix -noblacklist ${RUNUSER}/wayland-* -noblacklist ${RUNUSER} - -include whitelist-runuser-common.inc - -# Redirect -include youtube-viewer.profile \ No newline at end of file diff --git a/etc/profile-a-l/gtk3-youtube-viewer.profile b/etc/profile-a-l/gtk3-youtube-viewer.profile new file mode 100644 index 000000000..3d91e284d --- /dev/null +++ b/etc/profile-a-l/gtk3-youtube-viewer.profile @@ -0,0 +1,18 @@ +# Firejail profile for gtk3-youtube-viewer +# Description: Gtk front-end to youtube-viewer +# This file is overwritten after every install/update +# Persistent local customizations +include gtk3-youtube-viewer.local +# added by included profile +#include globals.local + +ignore quiet + +noblacklist /tmp/.X11-unix +noblacklist ${RUNUSER}/wayland-* +noblacklist ${RUNUSER} + +include whitelist-runuser-common.inc + +# Redirect +include youtube-viewer.profile diff --git a/etc/profile-m-z/straw-viewer.profile b/etc/profile-m-z/straw-viewer.profile new file mode 100644 index 000000000..721ad38ee --- /dev/null +++ b/etc/profile-m-z/straw-viewer.profile @@ -0,0 +1,58 @@ +# Firejail profile for straw-viewer +# Description: Fork of youtube-viewer acts like an invidious frontend +quiet +# This file is overwritten after every install/update +# Persistent local customizations +include straw-viewer.local +# Persistent global definitions +include globals.local + +noblacklist ${HOME}/.cache/straw-viewer +noblacklist ${HOME}/.config/straw-viewer + +include allow-lua.inc +include allow-perl.inc +include allow-python2.inc +include allow-python3.inc + +include disable-common.inc +include disable-devel.inc +include disable-exec.inc +include disable-interpreters.inc +include disable-passwdmgr.inc +include disable-programs.inc +include disable-xdg.inc + +mkdir ${HOME}/.config/straw-viewer +mkdir ${HOME}/.cache/straw-viewer +whitelist ${HOME}/.cache/straw-viewer +whitelist ${HOME}/.config/straw-viewer +whitelist ${DOWNLOADS} +include whitelist-common.inc +include whitelist-usr-share-common.inc +include whitelist-var-common.inc + +apparmor +caps.drop all +netfilter +nodvd +nogroups +nonewprivs +noroot +notv +nou2f +novideo +protocol unix,inet,inet6 +seccomp +shell none +tracelog + +disable-mnt +private-bin bash,ffmpeg,ffprobe,gtk-straw-viewer,mpv,perl,python*,sh,smplayer,straw-viewer,stty,vlc,wget,which,youtube-dl +private-cache +private-dev +private-etc alsa,alternatives,asound.conf,ca-certificates,crypto-policies,fonts,gtk-2.0,gtk-3.0,host.conf,hostname,hosts,machine-id,mime.types,nsswitch.conf,passwd,pki,pulse,resolv.conf,ssl,X11,xdg +private-tmp + +dbus-user none +dbus-system none diff --git a/etc/profile-m-z/youtube-viewer.profile b/etc/profile-m-z/youtube-viewer.profile index 513cb0f6e..a3a2afa29 100644 --- a/etc/profile-m-z/youtube-viewer.profile +++ b/etc/profile-m-z/youtube-viewer.profile @@ -7,10 +7,6 @@ include youtube-viewer.local # Persistent global definitions include globals.local -blacklist /tmp/.X11-unix -blacklist ${RUNUSER}/wayland-* -blacklist ${RUNUSER} - noblacklist ${HOME}/.config/youtube-viewer include allow-perl.inc @@ -47,11 +43,11 @@ shell none tracelog disable-mnt -# private-bin ffmpeg,ffprobe,firefox,gtk-youtube-viewer,gtk2-youtube-viewer,gtk3-youtube-viewer,mpv,python*,smplayer,sh,which,vlc,youtube-dl,youtube-viewer +private-bin ffmpeg,ffprobe,firefox,gtk-youtube-viewer,gtk2-youtube-viewer,gtk3-youtube-viewer,mpv,python*,sh,smplayer,stty,vlc,which,youtube-dl,youtube-viewer private-cache private-dev private-etc alsa,alternatives,asound.conf,ca-certificates,crypto-policies,fonts,gtk-2.0,gtk-3.0,host.conf,hostname,hosts,machine-id,mime.types,nsswitch.conf,passwd,pki,pulse,resolv.conf,ssl,X11,xdg private-tmp dbus-user none -dbus-system none \ No newline at end of file +dbus-system none diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config index b0a223911..8794076c6 100644 --- a/src/firecfg/firecfg.config +++ b/src/firecfg/firecfg.config @@ -334,6 +334,7 @@ gradio gramps gravity-beams-and-evaporating-stars gthumb +gtk-straw-viewer gtk-youtube-viewer gtk2-youtube-viewer gtk3-youtube-viewer @@ -682,6 +683,7 @@ steam-native steam-runtime stellarium strawberry +straw-viewer strings studio.sh subdownloader -- cgit v1.2.3-70-g09d2