Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › ecd5bea
Fix style
Baptiste Daroussin committed 10 years ago
commit ecd5bea90c7ed7f608e3f2d931079f985b6f8fd8
parent df9c792
1 file changed +74 -77
modified scripts/periodic/410.pkg-audit.in
@@ -33,8 +33,8 @@
#



if [ -r /etc/defaults/periodic.conf ]; then
- 
    . /etc/defaults/periodic.conf
- 
    source_periodic_confs
+ 
	. /etc/defaults/periodic.conf
+ 
	source_periodic_confs

fi



# Compute PKG_DBDIR from the config file.
@@ -43,30 +43,30 @@ PKG_DBDIR=`${pkgcmd} config PKG_DBDIR`
auditfile="${PKG_DBDIR}/vuln.xml"



audit_pkgs() {
- 
    local pkgargs="$1"
- 
    local basedir="$2"
- 
    local rc
- 
    local then
- 
    local now
-
- 
    then=`stat -f '%m' "${basedir}${auditfile}" 2> /dev/null` || rc=3
- 
    now=`date +%s` || rc=3
- 
    # Add 10 minutes of padding since the check is in seconds.
- 
    if [ $rc -ne 0 -o \
- 
	$(( 86400 \* "${daily_status_security_pkgaudit_expiry:-2}" )) \
- 
	-le $(( ${now} - ${then} + 600 )) ]; then
- 
	# Random delay so the mirrors do not get slammed when run by periodic(8)
- 
	if [ ! -t 0 ]; then
- 
	    sleep `jot -r 1 0 3600`
+ 
	local pkgargs="$1"
+ 
	local basedir="$2"
+ 
	local rc
+ 
	local then
+ 
	local now
+
+ 
	then=`stat -f '%m' "${basedir}${auditfile}" 2> /dev/null` || rc=3
+ 
	now=`date +%s` || rc=3
+ 
	# Add 10 minutes of padding since the check is in seconds.
+ 
	if [ $rc -ne 0 -o \
+ 
		$(( 86400 \* "${daily_status_security_pkgaudit_expiry:-2}" )) \
+ 
		-le $(( ${now} - ${then} + 600 )) ]; then
+ 
		# Random delay so the mirrors do not get slammed when run by periodic(8)
+ 
		if [ ! -t 0 ]; then
+ 
			sleep `jot -r 1 0 3600`
+ 
		fi
+ 
		${pkgcmd} ${pkgargs} audit -F $q || { rc=$?; [ $rc -lt 3 ] && rc=3; }
+ 
	else
+ 
		echo -n 'Database fetched: '
+ 
		date -r "${then}" || rc=3
+ 
		${pkgcmd} ${pkgargs} audit $q || { rc=$?; [ $rc -lt 3 ] && rc=3; }

	fi
- 
	${pkgcmd} ${pkgargs} audit -F $q || { rc=$?; [ $rc -lt 3 ] && rc=3; }
- 
    else
- 
	echo -n 'Database fetched: '
- 
	date -r "${then}" || rc=3
- 
	${pkgcmd} ${pkgargs} audit $q || { rc=$?; [ $rc -lt 3 ] && rc=3; }
- 
    fi
-
- 
    return $rc
+
+ 
	return $rc

}



# Use $pkg_chroots to provide a default list of chroots, and
@@ -76,70 +76,67 @@ audit_pkgs() {
# $daily_status_security_pkgaudit_jails for this script only.



audit_pkgs_all() {
- 
    local rc
- 
    local last_rc
- 
    local jails
-
- 
    : ${daily_status_security_pkgaudit_chroots=$pkg_chroots}
- 
    : ${daily_status_security_pkgaudit_jails=$pkg_jails}
+ 
	local rc
+ 
	local last_rc
+ 
	local jails
- 
    # We always show audit results for the base system, but only print
- 
    # a banner line if we're also showing audit results for any
- 
    # chroots or jails.
+ 
	: ${daily_status_security_pkgaudit_chroots=$pkg_chroots}
+ 
	: ${daily_status_security_pkgaudit_jails=$pkg_jails}
- 
    if [ -n "${daily_status_security_pkgaudit_chroots}" -o \
- 
	 -n "${daily_status_security_pkgaudit_jails}" ];
- 
    then
- 
	echo "Host system:"
- 
    fi
+ 
	# We always show audit results for the base system, but only print
+ 
	# a banner line if we're also showing audit results for any
+ 
	# chroots or jails.
- 
    audit_pkgs '' ''
- 
    last_rc=$?
- 
    [ $last_rc -gt 1 ] && rc=$last_rc
+ 
	if [ -n "${daily_status_security_pkgaudit_chroots}" -o \
+ 
		-n "${daily_status_security_pkgaudit_jails}" ]; then
+ 
		echo "Host system:"
+ 
	fi
- 
    for c in $daily_status_security_pkgaudit_chroots ; do
- 
	echo
- 
	echo "chroot: $c"
- 
	audit_pkgs "-c $c" $c
+ 
	audit_pkgs '' ''

	last_rc=$?
- 
	[ $last_rc -gt 1 ] && rc=$last_rc
- 
    done
+ 
	[ $last_rc -gt 1 ] && rc=$last_rc
+
+ 
	for c in $daily_status_security_pkgaudit_chroots ; do
+ 
		echo
+ 
		echo "chroot: $c"
+ 
		audit_pkgs "-c $c" $c
+ 
		last_rc=$?
+ 
		[ $last_rc -gt 1 ] && rc=$last_rc
+ 
	done
- 
    case $daily_status_security_pkgaudit_jails in
+ 
	case $daily_status_security_pkgaudit_jails in

	\*)
- 
	    jails=$(jls -q -h name path | sed -e 1d -e 's/ /|/')
- 
	    ;;
+ 
		jails=$(jls -q -h name path | sed -e 1d -e 's/ /|/')
+ 
		;;

	'')
- 
	    jails=
- 
	    ;;
+ 
		jails=
+ 
		;;

	*)
- 
	    # Given the jail name or jid, find the jail path
- 
	    jails=
- 
	    for j in $daily_status_security_pkgaudit_jails ; do
- 
		p=$(jls -j $j -h name path | sed -e 1d -e 's/ /|/')
- 
		jails="${jails} ${p}"
- 
	    done
- 
	    ;;
- 
    esac
-
- 
    for j in $jails ; do
- 
	echo
- 
	echo "jail: ${j%|*}"
- 
	audit_pkgs "-j ${j%|*}" ${j##*|}
- 
	last_rc=$?
- 
	[ $last_rc -gt 1 ] && rc=$last_rc
- 
    done
-
- 
    return $rc
+ 
		# Given the jail name or jid, find the jail path
+ 
		jails=
+ 
		for j in $daily_status_security_pkgaudit_jails ; do
+ 
			p=$(jls -j $j -h name path | sed -e 1d -e 's/ /|/')
+ 
			jails="${jails} ${p}"
+ 
		done
+ 
		;;
+ 
	esac
+
+ 
	for j in $jails ; do
+ 
		echo
+ 
		echo "jail: ${j%|*}"
+ 
		audit_pkgs "-j ${j%|*}" ${j##*|}
+ 
		last_rc=$?
+ 
		[ $last_rc -gt 1 ] && rc=$last_rc
+ 
	done
+
+ 
	return $rc

}



rc=0



case "${daily_status_security_pkgaudit_enable:-YES}" in
- 
	[Nn][Oo])
- 
	;;
- 
	*)
-
+ 
[Nn][Oo]) ;;
+ 
*)

	echo

	echo 'Checking for packages with security vulnerabilities:'
@@ -148,10 +145,10 @@ case "${daily_status_security_pkgaudit_enable:-YES}" in
		rc=2

	else

		case "${daily_status_security_pkgaudit_quiet:-YES}" in
- 
		    [Yy][Ee][Ss])
+ 
		[Yy][Ee][Ss])

			q='-q'

			;;
- 
		    *)
+ 
		*)

			q=

			;;

		esac