aboutsummaryrefslogtreecommitdiffstats
path: root/etc/inc
diff options
context:
space:
mode:
authorLibravatar glitsj16 <glitsj16@users.noreply.github.com>2021-11-10 10:24:15 +0000
committerLibravatar GitHub <noreply@github.com>2021-11-10 10:24:15 +0000
commit437043c9ddb812d6c4c31b9d373443ec003f7dc4 (patch)
tree924da6ab7bbe4fb3dd18454461dd15116a6e9dcc /etc/inc
parentdisable-common.inc: fix ssh (diff)
downloadfirejail-437043c9ddb812d6c4c31b9d373443ec003f7dc4.tar.gz
firejail-437043c9ddb812d6c4c31b9d373443ec003f7dc4.tar.zst
firejail-437043c9ddb812d6c4c31b9d373443ec003f7dc4.zip
fixes for ssh
After seeing https://github.com/netblue30/firejail/commit/9a81078ddbbb4215d06f7d1861481ece05ebda99 it dawned on me that Arch Linux doesn't have /usr/lib/openssh, but uses /usr/lib/ssh instead. That's a different path than what's referenced in our current {allow-ssh,disable-common}.inc files. Some very superficial checks revealed that OpenSSH seems to be packaged quite differently, at least on Debian/Ubuntu and Arch Linux. And then there's version differences on non-rolling distro's to consider. All in all IMO it makes more sense to (no)blacklist /usr/lib/openssh and /usr/lib/ssh instead of referencing all the possible individual files that live under those paths.
Diffstat (limited to 'etc/inc')
-rw-r--r--etc/inc/allow-ssh.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/etc/inc/allow-ssh.inc b/etc/inc/allow-ssh.inc
index a78798a18..8995e5a74 100644
--- a/etc/inc/allow-ssh.inc
+++ b/etc/inc/allow-ssh.inc
@@ -5,6 +5,9 @@ include allow-ssh.local
5noblacklist ${HOME}/.ssh 5noblacklist ${HOME}/.ssh
6noblacklist /etc/ssh 6noblacklist /etc/ssh
7noblacklist /etc/ssh/ssh_config 7noblacklist /etc/ssh/ssh_config
8noblacklist /tmp/ssh-*
9noblacklist ${PATH}/ssh 8noblacklist ${PATH}/ssh
10noblacklist /usr/lib/openssh/ssh-keysign 9noblacklist /tmp/ssh-*
10# Debian/Ubuntu and derivatives
11noblacklist /usr/lib/openssh
12# Arch Linux and derivatives
13noblacklist /usr/lib/ssh