From 5f81913576e1d97f7fbfffc7f5a17e343afd6c96 Mon Sep 17 00:00:00 2001 From: kn Date: Wed, 30 Aug 2023 17:40:08 +0000 Subject: [PATCH] cover failure on insecure passfiles --- regress/sbin/bioctl/Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/regress/sbin/bioctl/Makefile b/regress/sbin/bioctl/Makefile index 81b726d92e4..8b76ba15a0d 100644 --- a/regress/sbin/bioctl/Makefile +++ b/regress/sbin/bioctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2023/08/30 17:21:40 kn Exp $ +# $OpenBSD: Makefile,v 1.9 2023/08/30 17:40:08 kn Exp $ BIOCTL ?= /sbin/bioctl @@ -42,7 +42,7 @@ scripted-recreate-volume: detach-volume ${SUDO} ${BIOCTL} -s -Cforce -r${NROUNDS} -cC -l"$$(<${CHUNKDEVFILE})a" -- softraid0 | \ grep -o 'sd[0-9]*$$' -- 1>${VOLDEVFILE} -reopen-volume-with-passfile: detach-volume create-passfile +reopen-volume-with-passfile: detach-volume ${SUDO} ${BIOCTL} -p${PASSFILE} -cC -l"$$(<${CHUNKDEVFILE})a" -- softraid0 | \ grep -o 'sd[0-9]*$$' -- 1>${VOLDEVFILE} @@ -59,6 +59,8 @@ verify-increased-rounds: FAILURE_TESTS = reuse-active-chunk \ + use-public-passfile \ + use-foreign-passfile \ set-empty-passphrase REGRESS_EXPECTED_FAILURES += ${FAILURE_TESTS} REGRESS_TARGETS += ${FAILURE_TESTS} @@ -67,6 +69,14 @@ REGRESS_ROOT_TARGETS += ${FAILURE_TESTS} reuse-active-chunk: ${SUDO} ${BIOCTL} -cC -l"$$(<${CHUNKDEVFILE})a" -- softraid0 +use-public-passfile: + ${SUDO} chmod a=rwx ${PASSFILE} + ${SUDO} ${BIOCTL} -p${PASSFILE} -P -- "$$(<${VOLDEVFILE})" + +use-foreign-passfile: + ${SUDO} chown build ${PASSFILE} + ${SUDO} ${BIOCTL} -p${PASSFILE} -P -- "$$(<${VOLDEVFILE})" + set-empty-passphrase: printf '\n' | ${SUDO} ${BIOCTL} -s -P -- "$$(<${VOLDEVFILE})" -- 2.20.1