mirror of
https://github.com/Kicksecure/security-misc.git
synced 2024-10-01 08:25:45 -04:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
c5d1e9dda7
@ -1,10 +1,41 @@
|
||||
## Copyright (C) 2012 - 2019 ENCRYPTED SUPPORT LP <adrelanos@riseup.net>
|
||||
## See the file COPYING for copying conditions.
|
||||
|
||||
## File permission hardening.
|
||||
##
|
||||
## Syntax:
|
||||
## [filename] [mode] [owner] [group] [capability]
|
||||
##
|
||||
## To remove all SUID/SGID binaries in a directory, you can use the "nosuid"
|
||||
## argument.
|
||||
##
|
||||
/home/ 0755 root root
|
||||
/home/user/ 0700 user user
|
||||
/root/ 0700 root root
|
||||
/boot/ 0700 root root
|
||||
/etc/permission-hardening.conf 0600 root root
|
||||
|
||||
## Remove all SUID/SGID binaries/libraries.
|
||||
/bin/ nosuid
|
||||
/usr/bin/ nosuid
|
||||
/usr/local/bin/ nosuid
|
||||
/sbin/ nosuid
|
||||
/usr/sbin/ nosuid
|
||||
/usr/local/sbin/ nosuid
|
||||
/lib/ nosuid
|
||||
/lib32/ nosuid
|
||||
/lib64/ nosuid
|
||||
/usr/lib/ nosuid
|
||||
/usr/lib32/ nosuid
|
||||
/usr/lib64/ nosuid
|
||||
/usr/local/lib/ nosuid
|
||||
/usr/local/lib32/ nosuid
|
||||
/usr/local/lib64/ nosuid
|
||||
|
||||
## SUID whitelist.
|
||||
/usr/bin/sudo 4755 root root
|
||||
/usr/bin/bwrap 4755 root root
|
||||
/usr/lib/policykit-1/polkit-agent-helper-1 4755 root root
|
||||
/usr/lib/dbus-1.0/dbus-daemon-launch-helper 4754 root messagebus
|
||||
/usr/lib/spice-gtk/spice-client-glib-usb-acl-helper 4755 root root
|
||||
/usr/lib/x86_64-linux-gnu/utempter/utempter 2755 root utmp
|
||||
|
@ -1,11 +1,47 @@
|
||||
#!/bin/bash
|
||||
|
||||
## Copyright (C) 2012 - 2019 ENCRYPTED SUPPORT LP <adrelanos@riseup.net>
|
||||
## See the file COPYING for copying conditions.
|
||||
|
||||
set -x
|
||||
|
||||
config_file="/etc/permission-hardening.conf"
|
||||
|
||||
shopt -s globstar
|
||||
|
||||
add_statoverride_entry() {
|
||||
if [ "${nosuid}" = "true" ]; then
|
||||
while read -r line; do
|
||||
if ! read -r file_name existing_mode owner group; then
|
||||
continue
|
||||
fi
|
||||
|
||||
if test -u "${file_name}" || test -g "${file_name}"; then
|
||||
echo "suid - file_name: '${file_name}' | existing_mode: '${existing_mode}'"
|
||||
|
||||
if dpkg-statoverride --list | grep -q "${file_name}"; then
|
||||
if ! dpkg-statoverride --list | grep -q "${owner} ${group} ${existing_mode:1} ${file_name}"; then
|
||||
dpkg-statoverride --remove "${file_name}"
|
||||
dpkg-statoverride --add --update "${owner}" "${group}" "${existing_mode:1}" "${file_name}"
|
||||
fi
|
||||
else
|
||||
dpkg-statoverride --add --update "${owner}" "${group}" "${existing_mode:1}" "${file_name}"
|
||||
fi
|
||||
fi
|
||||
done < <( stat -c "%n %a %U %G" ${file%/}/** )
|
||||
else
|
||||
dpkg-statoverride --add --update "${owner}" "${group}" "${mode}" "${file%/}"
|
||||
fi
|
||||
}
|
||||
|
||||
set_file_perms() {
|
||||
while read -r line; do
|
||||
[[ "$line" =~ ^#.*$ ]] && continue
|
||||
|
||||
if [ "${line}" = "" ]; then
|
||||
continue
|
||||
fi
|
||||
|
||||
if ! read -r file mode owner group capability <<< "${line}" ; then
|
||||
echo "ERROR: cannot parse line: ${line}"
|
||||
continue
|
||||
@ -16,34 +52,34 @@ set_file_perms() {
|
||||
continue
|
||||
fi
|
||||
|
||||
if ! seq -w 000 4777 | grep -qw "${mode}"; then
|
||||
nosuid=""
|
||||
if [ "${mode}" = "nosuid" ]; then
|
||||
nosuid="true"
|
||||
elif ! seq -w 000 4777 | grep -qw "${mode}"; then
|
||||
echo "ERROR: Mode '${mode}' is invalid!"
|
||||
continue
|
||||
fi
|
||||
|
||||
if ! getent passwd | grep -q "^${owner}:"; then
|
||||
if ! getent passwd | grep -q "^${owner}:" && ! [ "${mode}" = "nosuid" ]; then
|
||||
echo "ERROR: User '${owner}' does not exist!"
|
||||
continue
|
||||
fi
|
||||
|
||||
if ! getent group | grep -q "^${group}:"; then
|
||||
if ! getent group | grep -q "^${group}:" && ! [ "${mode}" = "nosuid" ]; then
|
||||
echo "ERROR: Group '${group}' does not exist!"
|
||||
continue
|
||||
fi
|
||||
|
||||
chmod "${mode}" "${file}"
|
||||
chown "${owner}:${group}" "${file}"
|
||||
|
||||
## The permissions should not be reset during upgrades.
|
||||
if dpkg-statoverride --list | grep -q "${file%/}"; then
|
||||
## If there is an entry for the file, but the owner/group/mode do not
|
||||
## match, we remove and re-add the entry to update it.
|
||||
if ! dpkg-statoverride --list | grep -q "${owner} ${group} ${mode:1} ${file%/}"; then
|
||||
dpkg-statoverride --remove "${file}"
|
||||
dpkg-statoverride --add "${owner}" "${group}" "${mode}" "${file}"
|
||||
add_statoverride_entry
|
||||
fi
|
||||
else
|
||||
dpkg-statoverride --add "${owner}" "${group}" "${mode}" "${file}"
|
||||
add_statoverride_entry
|
||||
fi
|
||||
|
||||
if ! [ "${capability}" = "" ]; then
|
||||
|
Loading…
Reference in New Issue
Block a user