Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add profile for twitch,youtube,youtube-music; fix git-cola ,add cola #3577

Merged
merged 7 commits into from
Sep 3, 2020
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions etc/inc/disable-programs.inc
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,11 @@ blacklist ${HOME}/.config/Slack
blacklist ${HOME}/.config/Standard Notes
blacklist ${HOME}/.config/SubDownloader
blacklist ${HOME}/.config/Thunar
blacklist ${HOME}/.config/Twitch
blacklist ${HOME}/.config/Unknown Organization
blacklist ${HOME}/.config/VirtualBox
blacklist ${HOME}/.config/Wire
blacklist ${HOME}/.config/Youtube
blacklist ${HOME}/.config/Zeal
blacklist ${HOME}/.config/ZeGrapher Project
blacklist ${HOME}/.config/abiword
Expand Down Expand Up @@ -396,6 +398,8 @@ blacklist ${HOME}/.config/yandex-browser
blacklist ${HOME}/.config/yandex-browser-beta
blacklist ${HOME}/.config/yelp
blacklist ${HOME}/.config/youtube-dl
blacklist ${HOME}/.config/youtubemusic-nativefier-040164
rusty-snake marked this conversation as resolved.
Show resolved Hide resolved
blacklist ${HOME}/.config/youtube-music-desktop-app
blacklist ${HOME}/.config/youtube-viewer
blacklist ${HOME}/.config/zathura
blacklist ${HOME}/.config/zoomus.conf
Expand Down
11 changes: 11 additions & 0 deletions etc/profile-a-l/cola.profile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Firejail profile for cola
# Description: Linux native frontend for Git,alternative call for git-cola
# This file is overwritten after every install/update
# Persistent local customizations
include cola.local
# Persistent global definitions
include globals.local

# Redirect

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

include git-cola.profile
31 changes: 23 additions & 8 deletions etc/profile-a-l/git-cola.profile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ include globals.local

ignore noexec ${HOME}

noblacklist ${HOME}/.config/git
noblacklist ${HOME}/.config/git-cola
noblacklist ${HOME}/.gitconfig
noblacklist ${HOME}/.git-credentials
noblacklist ${HOME}/.gnupg
noblacklist ${HOME}/.ssh
noblacklist ${HOME}/.config/git
noblacklist ${HOME}/.config/git-cola
noblacklist ${HOME}/.subversion
# Put your editor,diff viewer config path below and uncomment to load settings
# noblacklist ${HOME}/

Expand All @@ -28,7 +29,19 @@ include disable-passwdmgr.inc
include disable-programs.inc
include disable-xdg.inc

# Uncomment to allow ssh,gpg
# whitelist ${RUNUSER}/gnupg
# whitelist ${RUNUSER}/keyring
# Put your editor,diff viewer,gnupg path below
whitelist /usr/share/git
whitelist /usr/share/git-cola
whitelist /usr/share/git-core
whitelist /usr/share/git-gui
whitelist /usr/share/gitk
whitelist /usr/share/gitweb
whitelist /usr/share/gnupg
include whitelist-runuser-common.inc
include whitelist-usr-share-common.inc
include whitelist-var-common.inc

apparmor
Expand All @@ -49,18 +62,20 @@ seccomp
shell none
tracelog

# private-bin atom,bash,colordiff,emacs,fldiff,geany,gedit,git,git gui,git-cola,git-dag,gitk,gpg,gvim,leafpad,meld,mousepad,nano,notepadqq,python*,sh,ssh,vim,vimdiff,which,xed
private-bin atom,basename,bash,colordiff,diff,emacs,envsubst,fldiff,geany,gedit,gettext,git,git gui,git-cola,git-dag,gitk,gpg,gpg-agent,gvim,leafpad,meld,mousepad,nano,notepadqq,nvim,pinentry,pinentry-gtk-2,ps,python*,sh,ssh,ssh-agent,tclsh,tr,vim,vimdiff,wc,which,xed
rusty-snake marked this conversation as resolved.
Show resolved Hide resolved
private-cache
private-dev
# Comment if you sign commits with GPG
private-etc alternatives,ca-certificates,crypto-policies,fonts,gtk-2.0,gtk-3.0,host.conf,hostname,hosts,localtime,login.defs,machine-id,mime.types,nsswitch.conf,passwd,pki,resolv.conf,selinux,ssl,X11,xdg
private-etc alternatives,ca-certificates,crypto-policies,dconf,fonts,gcrypt,gitconfig,gtk-2.0,gtk-3.0,host.conf,hostname,hosts,localtime,login.defs,machine-id,mime.types,nsswitch.conf,passwd,pki,resolv.conf,selinux,ssh,ssl,X11,xdg
private-tmp

dbus-user filter
# Breaks meld as diff viewer
# dbus-user filter
# Uncomment if you need keyring access
# dbus-user.talk org.freedesktop.secrets
dbus-system none

read-only ${HOME}/.ssh
read-only ${HOME}/.gnupg
read-only ${HOME}/.git-credentials
# Comment if you sign commits with GPG
rusty-snake marked this conversation as resolved.
Show resolved Hide resolved
# read-only ${HOME}/.gnupg
# Comment if you need to allow hosts
read-only ${HOME}/.ssh
38 changes: 38 additions & 0 deletions etc/profile-m-z/twitch.profile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Firejail profile for twitch
# Description: Unofficial electron based desktop warpper for Twitch
# This file is overwritten after every install/update
# Persistent local customizations
include twitch.local
# Persistent global definitions
include globals.local

noblacklist ${HOME}/.config/Twitch

include disable-devel.inc
include disable-exec.inc
include disable-interpreters.inc
include disable-shell.inc
include disable-xdg.inc

mkdir ${HOME}/.config/Twitch
whitelist ${HOME}/.config/Twitch
include whitelist-common.inc
include whitelist-runuser-common.inc
include whitelist-usr-share-common.inc
include whitelist-var-common.inc

nou2f
rusty-snake marked this conversation as resolved.
Show resolved Hide resolved
novideo
rusty-snake marked this conversation as resolved.
Show resolved Hide resolved
seccomp !chroot
shell none

disable-mnt
private-bin twitch
private-cache
private-dev
private-etc alsa,alternatives,asound.conf,ati,bumblebee,ca-certificates,crypto-policies,drirc,fonts,gtk-2.0,gtk-3.0,host.conf,hostname,hosts,mime.types,nsswitch.conf,nvidia,pki,pulse,resolv.conf,selinux,ssl,X11,xdg
private-opt Twitch
private-tmp

# Redirect
include electron.profile
38 changes: 38 additions & 0 deletions etc/profile-m-z/youtube.profile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Firejail profile for youtube
# Description: Unofficial electron based desktop warpper for YouTube
# This file is overwritten after every install/update
# Persistent local customizations
include youtube.local
# Persistent global definitions
include globals.local

noblacklist ${HOME}/.config/Youtube

include disable-devel.inc
include disable-exec.inc
include disable-interpreters.inc
include disable-shell.inc
include disable-xdg.inc

mkdir ${HOME}/.config/Youtube
whitelist ${HOME}/.config/Youtube
include whitelist-common.inc
include whitelist-runuser-common.inc
include whitelist-usr-share-common.inc
include whitelist-var-common.inc

nou2f
rusty-snake marked this conversation as resolved.
Show resolved Hide resolved
novideo
seccomp !chroot
shell none

disable-mnt
private-bin youtube
private-cache
private-dev
private-etc alsa,alternatives,asound.conf,ati,bumblebee,ca-certificates,crypto-policies,drirc,fonts,gtk-2.0,gtk-3.0,host.conf,hostname,hosts,mime.types,nsswitch.conf,nvidia,pki,pulse,resolv.conf,selinux,ssl,X11,xdg
private-opt Youtube
private-tmp

# Redirect
include electron.profile
38 changes: 38 additions & 0 deletions etc/profile-m-z/youtubemusic-nativefier.profile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Firejail profile for youtubemusic-nativefier
# Description: Unofficial electron based desktop warpper for YouTube Music
# This file is overwritten after every install/update
# Persistent local customizations
include youtube.local
# Persistent global definitions
include globals.local

noblacklist ${HOME}/.config/youtubemusic-nativefier-040164

include disable-devel.inc
include disable-exec.inc
include disable-interpreters.inc
include disable-shell.inc
include disable-xdg.inc

mkdir ${HOME}/.config/youtubemusic-nativefier-040164
whitelist ${HOME}/.config/youtubemusic-nativefier-040164
include whitelist-common.inc
include whitelist-runuser-common.inc
include whitelist-usr-share-common.inc
include whitelist-var-common.inc

nou2f
novideo
seccomp !chroot
shell none

disable-mnt
private-bin youtubemusic-nativefier
private-cache
private-dev
private-etc alsa,alternatives,asound.conf,ati,bumblebee,ca-certificates,crypto-policies,drirc,fonts,gtk-2.0,gtk-3.0,host.conf,hostname,hosts,mime.types,nsswitch.conf,nvidia,pki,pulse,resolv.conf,selinux,ssl,X11,xdg
private-opt youtubemusic-nativefier
private-tmp

# Redirect
include electron.profile
39 changes: 39 additions & 0 deletions etc/profile-m-z/ytmdesktop.profile
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Firejail profile for ytmdesktop
# Description: Unofficial electron based desktop warpper for YouTube Music
# This file is overwritten after every install/update
# Persistent local customizations
include youtube.local
# Persistent global definitions
include globals.local

ignore dbus-user none

noblacklist ${HOME}/.config/youtube-music-desktop-app

include disable-devel.inc
include disable-exec.inc
include disable-interpreters.inc
include disable-xdg.inc

mkdir ${HOME}/.config/youtube-music-desktop-app
whitelist ${HOME}/.config/youtube-music-desktop-app
include whitelist-common.inc
include whitelist-runuser-common.inc
include whitelist-usr-share-common.inc
include whitelist-var-common.inc

nou2f
novideo
seccomp !chroot
shell none

disable-mnt
# private-bin env,ytmdesktop
private-cache
private-dev
private-etc alsa,alternatives,asound.conf,ati,bumblebee,ca-certificates,crypto-policies,drirc,fonts,gtk-2.0,gtk-3.0,host.conf,hostname,hosts,mime.types,nsswitch.conf,nvidia,pki,pulse,resolv.conf,selinux,ssl,X11,xdg
# private-opt
private-tmp

# Redirect
include electron.profile
5 changes: 5 additions & 0 deletions src/firecfg/firecfg.config
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ clocks
cmus
code
code-oss
cola
com.github.dahenson.agenda
com.github.johnfactotum.Foliate
com.gitlab.newsflash
Expand Down Expand Up @@ -741,6 +742,7 @@ truecraft
tshark
tuxguitar
tvbrowser
twitch
udiskie
uefitool
uget-gtk
Expand Down Expand Up @@ -818,8 +820,11 @@ xreader-thumbnailer
xviewer
yandex-browser
yelp
youtube
youtube-dl
youtube-viewer
youtubemusic-nativefier
ytmdesktop
zaproxy
zart
zathura
Expand Down