Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding support for detached headers for crypto root #54

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adding support for detached headers for crypto root #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c80d71
first addition of a header option
Aug 11, 2017
e786db3
added kernel parameters
Aug 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 83 additions & 7 deletions defaults/initrd.d/00-crypt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

CRYPTSETUP_BIN="/sbin/cryptsetup"
KEY_MNT="/mnt/key"
HEADER_MNT="/mnt/header"

_bootstrap_key() {
local ltype="${1}"
Expand Down Expand Up @@ -55,9 +56,12 @@ _open_luks() {
eval local luks_key='"${CRYPT_'${ltype}'_KEY}"'
eval local luks_keydev='"${CRYPT_'${ltype}'_KEYDEV}"'
eval local luks_trim='"${CRYPT_'${ltype}'_TRIM}"'
eval local luks_header='"${CRYPT_'${ltype}'_HEADER}"'
eval local luks_headerdev='"${CRYPT_'${ltype}'_HEADERDEV}"'

local dev_error=0 key_error=0 keydev_error=0
local mntkey="${KEY_MNT}/" cryptsetup_opts=""
local mntheader="${HEADER_MNT}/" header_error=0 headerdev_error=0

local exit_st=0 luks_device=
for luks_device in ${luks_devices}; do
Expand Down Expand Up @@ -93,6 +97,8 @@ _open_luks() {
[ "${dev_error}" = "1" ] && any_error=1
[ "${key_error}" = "1" ] && any_error=1
[ "${keydev_error}" = "1" ] && any_error=1
[ "${header_error}" = "1" ] && any_error=1
[ "${headerdeve_error}" = "1" ] && any_error=1
if [ "${CRYPT_SILENT}" = "1" ] && [ -n "${any_error}" ]; then
bad_msg "Failed to setup the LUKS device"
exit_st=1
Expand Down Expand Up @@ -121,11 +127,79 @@ _open_luks() {
[ -n "${luks_dev}" ] && \
luks_device="${luks_dev}" # otherwise hope...

eval "${CRYPTSETUP_BIN} isLuks ${luks_device}" || {
bad_msg "${luks_device} does not contain a LUKS header"
dev_error=1
continue;
}
if [ -n "${luks_header}" ]; then
local real_luks_headerdev="${luks_headerdev}"

if [ ! -e "${mntheader}${luks_header}" ]; then
real_luks_headerdev=$(find_real_device "${luks_headerdev}")
good_msg "Using header device ${real_luks_headerdev}."

if [ ! -b "${real_luks_headerdev}" ]; then
bad_msg "Insert device ${luks_headerdev} for ${luks_dev_name}"
bad_msg "You have 10 seconds..."
local count=10
while [ ${count} -gt 0 ]; do
count=$((count-1))
sleep 1

real_luks_headerdev=$(find_real_device "${luks_headerdev}")
[ ! -b "${real_luks_headerdev}" ] || {
good_msg "Device ${real_luks_headerdev} detected."
break;
}
done

if [ ! -b "${real_luks_headerdev}" ]; then
eval CRYPT_${ltype}_HEADER=${luks_header}
eval luks_headerdev='"${CRYPT_'${ltype}'_HEADERDEV}"'

real_luks_headerdev=$(find_real_device "${luks_headerdev}")
if [ ! -b "${real_luks_headerdev}" ]; then
headerdev_error=1
bad_msg "Device ${luks_headerdev} not found."
continue
fi

# continue otherwise will mount keydev which is
# mounted by bootstrap
continue
fi
fi

# At this point a device was recognized, now let's see
# if the key is there
mkdir -p "${mntheader}" # ignore

mount -n -o ro "${real_luks_headerdev}" \
"${mntheader}" || {
headerdev_error=1
bad_msg "Mounting of device ${real_luks_headerdev} failed."
continue;
}

good_msg "Removable device ${real_luks_headerdev} mounted."

if [ ! -e "${mntheader}${luks_header}" ]; then
umount -n "${mntheader}"
header_error=1
headerdev_error=1
bad_msg "{luks_header} on ${real_luks_headerdev} not found."
continue
fi
fi

# At this point a candidate header exists
# (either mounted before or not)
good_msg "${luks_header} on device ${real_luks_headerdev} found"
header_opts=" --header=${mntheader}${luks_header}"

else
eval "${CRYPTSETUP_BIN} isLuks ${luks_device}" || {
bad_msg "${luks_device} does not contain a LUKS header"
dev_error=1
continue;
}
fi

# Handle keys
if [ "${luks_trim}" = "yes" ]; then
Expand Down Expand Up @@ -222,8 +296,8 @@ _open_luks() {
# At this point, keyfile or not, we're ready!
local ply_cmd="${gpg_ply_cmd}${CRYPTSETUP_BIN}"
local tty_cmd="${gpg_tty_cmd}${CRYPTSETUP_BIN}"
ply_cmd="${ply_cmd} ${cryptsetup_opts} luksOpen ${luks_device} ${luks_dev_name}"
tty_cmd="${tty_cmd} ${cryptsetup_opts} luksOpen ${luks_device} ${luks_dev_name}"
ply_cmd="${ply_cmd} ${cryptsetup_opts} luksOpen ${luks_device} ${luks_dev_name}${header_opts}"
Copy link
Member

@mudler mudler Jan 27, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor note: afaics there isn't a default value for header_opts (that would be empty one anyway).

Overall looks good to me

tty_cmd="${tty_cmd} ${cryptsetup_opts} luksOpen ${luks_device} ${luks_dev_name}${header_opts}"
# send to a temporary shell script, so plymouth can
# invoke the pipeline successfully
local ply_cmd_file="$(mktemp -t "ply_cmd.XXXXXX")"
Expand Down Expand Up @@ -279,6 +353,8 @@ _open_luks() {

umount -l "${mntkey}" 2>/dev/null >/dev/null
rmdir "${mntkey}" 2>/dev/null >/dev/null
umount -l "${mntheader}" 2>/dev/null >/dev/null
rmdir "${mntheader}" 2>/dev/null >/dev/null

return ${exit_st}
}
Expand Down
6 changes: 6 additions & 0 deletions defaults/linuxrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,12 @@ for x in ${CMDLINE}; do
root_trim=*)
CRYPT_ROOT_TRIM=${x#*=}
;;
root_header=*)
CRYPT_ROOT_HEADER=${x#*=}
;;
root_headerdev=*)
CRYPT_ROOT_HEADERDEV=${x#*=}
;;

swap_key=*)
CRYPT_SWAP_KEY=${x#*=}
Expand Down