From e607096c7548f9ba3fff816191f5ecef238fa89f Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Wed, 27 Jan 2021 17:56:46 -0300 Subject: git-cola.profile: add missing python template comment See etc/templates/profile.template. --- etc/profile-a-l/git-cola.profile | 1 + 1 file changed, 1 insertion(+) (limited to 'etc/profile-a-l') diff --git a/etc/profile-a-l/git-cola.profile b/etc/profile-a-l/git-cola.profile index 4708078dd..84e6fc486 100644 --- a/etc/profile-a-l/git-cola.profile +++ b/etc/profile-a-l/git-cola.profile @@ -18,6 +18,7 @@ noblacklist ${HOME}/.config/git-cola # Put your editor,diff viewer config path below and uncomment to load settings # noblacklist ${HOME}/ +# Allow python (blacklisted by disable-interpreters.inc) include allow-python2.inc include allow-python3.inc -- cgit v1.2.3-54-g00ecf From 83ac0239722f85ffed15e3b6b6088bfff547ac1b Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Sat, 9 Jan 2021 21:41:43 -0300 Subject: etc: add allow-ssh.inc And move the scattered `noblacklist ${HOME}/.ssh` entries into it. Command used to find the relevant files: $ grep -Fnr 'noblacklist ${HOME}/.ssh' etc Also, add it to profile.template, as reminded by @rusty-snake at https://github.com/netblue30/firejail/pull/3885#pullrequestreview-567527031 --- etc/inc/allow-ssh.inc | 5 +++++ etc/profile-a-l/android-studio.profile | 4 +++- etc/profile-a-l/aosp.profile | 4 +++- etc/profile-a-l/clion.profile | 4 +++- etc/profile-a-l/filezilla.profile | 4 +++- etc/profile-a-l/git-cola.profile | 4 +++- etc/profile-a-l/git.profile | 4 +++- etc/profile-a-l/gitg.profile | 4 +++- etc/profile-a-l/idea.sh.profile | 4 +++- etc/profile-m-z/meld.profile | 4 +++- etc/profile-m-z/remmina.profile | 4 +++- etc/profile-m-z/seahorse.profile | 4 +++- etc/profile-m-z/ssh-agent.profile | 4 +++- etc/profile-m-z/ssh.profile | 4 +++- etc/profile-m-z/webstorm.profile | 4 +++- etc/profile-m-z/x2goclient.profile | 4 +++- etc/templates/profile.template | 3 +++ 17 files changed, 53 insertions(+), 15 deletions(-) create mode 100644 etc/inc/allow-ssh.inc (limited to 'etc/profile-a-l') diff --git a/etc/inc/allow-ssh.inc b/etc/inc/allow-ssh.inc new file mode 100644 index 000000000..2e864ad64 --- /dev/null +++ b/etc/inc/allow-ssh.inc @@ -0,0 +1,5 @@ +# This file is overwritten during software install. +# Persistent customizations should go in a .local file. +include allow-ssh.local + +noblacklist ${HOME}/.ssh diff --git a/etc/profile-a-l/android-studio.profile b/etc/profile-a-l/android-studio.profile index 2e4e564dd..2cdd3a90c 100644 --- a/etc/profile-a-l/android-studio.profile +++ b/etc/profile-a-l/android-studio.profile @@ -10,12 +10,14 @@ noblacklist ${HOME}/.android noblacklist ${HOME}/.jack-server noblacklist ${HOME}/.jack-settings noblacklist ${HOME}/.local/share/JetBrains -noblacklist ${HOME}/.ssh noblacklist ${HOME}/.tooling # Allows files commonly used by IDEs include allow-common-devel.inc +# Allow ssh (blacklisted by disable-common.inc) +include allow-ssh.inc + include disable-common.inc include disable-passwdmgr.inc include disable-programs.inc diff --git a/etc/profile-a-l/aosp.profile b/etc/profile-a-l/aosp.profile index a5b1ba9f1..e7b09283e 100644 --- a/etc/profile-a-l/aosp.profile +++ b/etc/profile-a-l/aosp.profile @@ -11,12 +11,14 @@ noblacklist ${HOME}/.jack-server noblacklist ${HOME}/.jack-settings noblacklist ${HOME}/.repo_.gitconfig.json noblacklist ${HOME}/.repoconfig -noblacklist ${HOME}/.ssh noblacklist ${HOME}/.tooling # Allows files commonly used by IDEs include allow-common-devel.inc +# Allow ssh (blacklisted by disable-common.inc) +include allow-ssh.inc + include disable-common.inc include disable-passwdmgr.inc include disable-programs.inc diff --git a/etc/profile-a-l/clion.profile b/etc/profile-a-l/clion.profile index b27d93684..09246ccbc 100644 --- a/etc/profile-a-l/clion.profile +++ b/etc/profile-a-l/clion.profile @@ -11,9 +11,11 @@ noblacklist ${HOME}/.gitconfig noblacklist ${HOME}/.git-credentials noblacklist ${HOME}/.java noblacklist ${HOME}/.local/share/JetBrains -noblacklist ${HOME}/.ssh noblacklist ${HOME}/.tooling +# Allow ssh (blacklisted by disable-common.inc) +include allow-ssh.inc + include disable-common.inc include disable-passwdmgr.inc include disable-programs.inc diff --git a/etc/profile-a-l/filezilla.profile b/etc/profile-a-l/filezilla.profile index 43e877fd0..728929638 100644 --- a/etc/profile-a-l/filezilla.profile +++ b/etc/profile-a-l/filezilla.profile @@ -8,12 +8,14 @@ include globals.local noblacklist ${HOME}/.config/filezilla noblacklist ${HOME}/.filezilla -noblacklist ${HOME}/.ssh # Allow python (blacklisted by disable-interpreters.inc) include allow-python2.inc include allow-python3.inc +# Allow ssh (blacklisted by disable-common.inc) +include allow-ssh.inc + include disable-common.inc include disable-devel.inc include disable-interpreters.inc diff --git a/etc/profile-a-l/git-cola.profile b/etc/profile-a-l/git-cola.profile index 84e6fc486..312655b9b 100644 --- a/etc/profile-a-l/git-cola.profile +++ b/etc/profile-a-l/git-cola.profile @@ -11,7 +11,6 @@ ignore noexec ${HOME} noblacklist ${HOME}/.gitconfig noblacklist ${HOME}/.git-credentials noblacklist ${HOME}/.gnupg -noblacklist ${HOME}/.ssh noblacklist ${HOME}/.subversion noblacklist ${HOME}/.config/git noblacklist ${HOME}/.config/git-cola @@ -22,6 +21,9 @@ noblacklist ${HOME}/.config/git-cola include allow-python2.inc include allow-python3.inc +# Allow ssh (blacklisted by disable-common.inc) +include allow-ssh.inc + include disable-common.inc include disable-devel.inc include disable-exec.inc diff --git a/etc/profile-a-l/git.profile b/etc/profile-a-l/git.profile index e5a2f3985..aefb2917d 100644 --- a/etc/profile-a-l/git.profile +++ b/etc/profile-a-l/git.profile @@ -15,10 +15,12 @@ noblacklist ${HOME}/.gitconfig noblacklist ${HOME}/.git-credentials noblacklist ${HOME}/.gnupg noblacklist ${HOME}/.nanorc -noblacklist ${HOME}/.ssh noblacklist ${HOME}/.vim noblacklist ${HOME}/.viminfo +# Allow ssh (blacklisted by disable-common.inc) +include allow-ssh.inc + blacklist /tmp/.X11-unix blacklist ${RUNUSER}/wayland-* diff --git a/etc/profile-a-l/gitg.profile b/etc/profile-a-l/gitg.profile index 3d80c1ed2..93b90eb9e 100644 --- a/etc/profile-a-l/gitg.profile +++ b/etc/profile-a-l/gitg.profile @@ -10,7 +10,9 @@ noblacklist ${HOME}/.config/git noblacklist ${HOME}/.gitconfig noblacklist ${HOME}/.git-credentials noblacklist ${HOME}/.local/share/gitg -noblacklist ${HOME}/.ssh + +# Allow ssh (blacklisted by disable-common.inc) +include allow-ssh.inc include disable-common.inc include disable-devel.inc diff --git a/etc/profile-a-l/idea.sh.profile b/etc/profile-a-l/idea.sh.profile index a7d0d531f..0a048a38a 100644 --- a/etc/profile-a-l/idea.sh.profile +++ b/etc/profile-a-l/idea.sh.profile @@ -10,12 +10,14 @@ noblacklist ${HOME}/.android noblacklist ${HOME}/.jack-server noblacklist ${HOME}/.jack-settings noblacklist ${HOME}/.local/share/JetBrains -noblacklist ${HOME}/.ssh noblacklist ${HOME}/.tooling # Allows files commonly used by IDEs include allow-common-devel.inc +# Allow ssh (blacklisted by disable-common.inc) +include allow-ssh.inc + include disable-common.inc include disable-passwdmgr.inc include disable-programs.inc diff --git a/etc/profile-m-z/meld.profile b/etc/profile-m-z/meld.profile index 6ceeb867f..a5c74047a 100644 --- a/etc/profile-m-z/meld.profile +++ b/etc/profile-m-z/meld.profile @@ -18,7 +18,6 @@ noblacklist ${HOME}/.config/git noblacklist ${HOME}/.gitconfig noblacklist ${HOME}/.git-credentials noblacklist ${HOME}/.local/share/meld -noblacklist ${HOME}/.ssh noblacklist ${HOME}/.subversion # Allow python (blacklisted by disable-interpreters.inc) @@ -27,6 +26,9 @@ include allow-python3.inc # Python 2 is EOL (see #3164). Uncomment the next line (or put it into your meld.local) if you understand the risks but want python 2 support for older meld versions. #include allow-python2.inc +# Allow ssh (blacklisted by disable-common.inc) +include allow-ssh.inc + # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-common.inc. #include disable-common.inc include disable-devel.inc diff --git a/etc/profile-m-z/remmina.profile b/etc/profile-m-z/remmina.profile index 6311c91df..d4c7bdf31 100644 --- a/etc/profile-m-z/remmina.profile +++ b/etc/profile-m-z/remmina.profile @@ -9,7 +9,9 @@ include globals.local noblacklist ${HOME}/.remmina noblacklist ${HOME}/.config/remmina noblacklist ${HOME}/.local/share/remmina -noblacklist ${HOME}/.ssh + +# Allow ssh (blacklisted by disable-common.inc) +include allow-ssh.inc include disable-common.inc include disable-devel.inc diff --git a/etc/profile-m-z/seahorse.profile b/etc/profile-m-z/seahorse.profile index 8bb1f53a7..0f91c79ec 100644 --- a/etc/profile-m-z/seahorse.profile +++ b/etc/profile-m-z/seahorse.profile @@ -9,9 +9,11 @@ include globals.local blacklist /tmp/.X11-unix noblacklist ${HOME}/.gnupg -noblacklist ${HOME}/.ssh noblacklist /tmp/ssh-* +# Allow ssh (blacklisted by disable-common.inc) +include allow-ssh.inc + include disable-common.inc include disable-devel.inc include disable-exec.inc diff --git a/etc/profile-m-z/ssh-agent.profile b/etc/profile-m-z/ssh-agent.profile index 01b63d3ce..d2e2b3408 100644 --- a/etc/profile-m-z/ssh-agent.profile +++ b/etc/profile-m-z/ssh-agent.profile @@ -8,7 +8,9 @@ include globals.local noblacklist /etc/ssh noblacklist /tmp/ssh-* -noblacklist ${HOME}/.ssh + +# Allow ssh (blacklisted by disable-common.inc) +include allow-ssh.inc blacklist /tmp/.X11-unix blacklist ${RUNUSER}/wayland-* diff --git a/etc/profile-m-z/ssh.profile b/etc/profile-m-z/ssh.profile index e3e2b4541..efdf63976 100644 --- a/etc/profile-m-z/ssh.profile +++ b/etc/profile-m-z/ssh.profile @@ -9,11 +9,13 @@ include globals.local noblacklist /etc/ssh noblacklist /tmp/ssh-* -noblacklist ${HOME}/.ssh # nc can be used as ProxyCommand, e.g. when using tor noblacklist ${PATH}/nc noblacklist ${PATH}/ncat +# Allow ssh (blacklisted by disable-common.inc) +include allow-ssh.inc + include disable-common.inc include disable-exec.inc include disable-passwdmgr.inc diff --git a/etc/profile-m-z/webstorm.profile b/etc/profile-m-z/webstorm.profile index fc4e8e571..a4adf2896 100644 --- a/etc/profile-m-z/webstorm.profile +++ b/etc/profile-m-z/webstorm.profile @@ -8,12 +8,14 @@ include globals.local noblacklist ${HOME}/.WebStorm* noblacklist ${HOME}/.android noblacklist ${HOME}/.local/share/JetBrains -noblacklist ${HOME}/.ssh noblacklist ${HOME}/.tooling # Allows files commonly used by IDEs include allow-common-devel.inc +# Allow ssh (blacklisted by disable-common.inc) +include allow-ssh.inc + noblacklist ${PATH}/node noblacklist ${HOME}/.nvm diff --git a/etc/profile-m-z/x2goclient.profile b/etc/profile-m-z/x2goclient.profile index bc9603835..6146016b2 100644 --- a/etc/profile-m-z/x2goclient.profile +++ b/etc/profile-m-z/x2goclient.profile @@ -6,10 +6,12 @@ include x2goclient.local # Persistent global definitions include globals.local -noblacklist ${HOME}/.ssh noblacklist ${HOME}/.x2go noblacklist ${HOME}/.x2goclient +# Allow ssh (blacklisted by disable-common.inc) +include allow-ssh.inc + include disable-common.inc include disable-devel.inc include disable-exec.inc diff --git a/etc/templates/profile.template b/etc/templates/profile.template index 3d37fc827..9435fffae 100644 --- a/etc/templates/profile.template +++ b/etc/templates/profile.template @@ -103,6 +103,9 @@ include globals.local # Allows files commonly used by IDEs #include allow-common-devel.inc +# Allow ssh (blacklisted by disable-common.inc) +#include allow-ssh.inc + #include disable-common.inc #include disable-devel.inc #include disable-exec.inc -- cgit v1.2.3-54-g00ecf