-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* builddep: add luksSuspend/Resume module * Add luksSuspend/Resume module Integrate luksSuspend/luksResume functionality into yubikey-luks * Fix systemd dir We need to overrule original systemd-suspend.service so install to /etc * README: add luksSuspend/Resume info * fix build
- Loading branch information
Showing
6 changed files
with
282 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
#!/bin/sh | ||
# Copyright 2013 Vianney le Clément de Saint-Marcq <vleclement@gmail.com> | ||
# Copyright 2017 Zhongfu Li <me@zhongfu.li> | ||
# | ||
# This program is free software: you can redistribute it and/or modify | ||
# it under the terms of the GNU General Public License as published by | ||
# the Free Software Foundation; version 3 of the License. | ||
# | ||
# This program is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
# GNU General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU General Public License | ||
# along with This program. If not, see http://www.gnu.org/licenses/. | ||
|
||
set -e | ||
|
||
PREREQ="cryptroot" | ||
|
||
prereqs() | ||
{ | ||
echo "$PREREQ" | ||
} | ||
|
||
case $1 in | ||
prereqs) | ||
prereqs | ||
exit 0 | ||
;; | ||
esac | ||
|
||
. /usr/share/initramfs-tools/hook-functions | ||
|
||
cp -pnL /usr/lib/yubikey-luks-suspend/initramfs-suspend "${DESTDIR}/suspend" | ||
chmod 755 "${DESTDIR}/suspend" | ||
|
||
exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
#!/bin/sh | ||
# Copyright 2013 Vianney le Clément de Saint-Marcq <vleclement@gmail.com> | ||
# Copyright 2017 Zhongfu Li <me@zhongfu.li> | ||
# | ||
# This program is free software: you can redistribute it and/or modify | ||
# it under the terms of the GNU General Public License as published by | ||
# the Free Software Foundation; version 3 of the License. | ||
# | ||
# This program is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
# GNU General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU General Public License | ||
# along with This program. If not, see http://www.gnu.org/licenses/. | ||
|
||
cryptname="${1}" | ||
|
||
# Start udev from initramfs | ||
/lib/systemd/systemd-udevd --daemon --resolve-names=never | ||
|
||
# Sync one more time, just in case | ||
sync | ||
|
||
# Suspend root device | ||
[ -z "${cryptname}" ] || cryptsetup luksSuspend "${cryptname}" | ||
|
||
# Suspend the system | ||
echo mem > /sys/power/state | ||
|
||
# Resume root device | ||
TMP_FILE=/run/new_key | ||
. /etc/ykluks.cfg | ||
|
||
[ -z "${cryptname}" ] || | ||
while true; do | ||
P1=$(/lib/cryptsetup/askpass "$WELCOME_TEXT") | ||
|
||
if [ "$HASH" = "1" ]; then | ||
P1=$(printf %s "$P1" | sha256sum | awk '{print $1}') | ||
fi | ||
|
||
R="$(ykchalresp -2 "$P1" 2>/dev/null || true)" | ||
|
||
touch "$TMP_FILE" | ||
chmod 600 "$TMP_FILE" | ||
|
||
if [ "$CONCATENATE" = "1" ]; then | ||
echo -n "$P1$R" > "$TMP_FILE" | ||
else | ||
echo -n "$R" > "$TMP_FILE" | ||
fi | ||
|
||
cryptsetup --key-file="$TMP_FILE" luksResume "${cryptname}" | ||
rm -rf "$TMP_FILE" | ||
[ $? -le 1 ] && break | ||
sleep 2 | ||
done | ||
|
||
# Stop udev from initramfs, as the real daemon from rootfs will be restarted | ||
udevadm control --exit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# This file has been adapted from systemd. | ||
# | ||
# systemd is free software; you can redistribute it and/or modify it | ||
# under the terms of the GNU Lesser General Public License as published by | ||
# the Free Software Foundation; either version 2.1 of the License, or | ||
# (at your option) any later version. | ||
|
||
[Unit] | ||
Description=Suspend | ||
Documentation=man:systemd-suspend.service(8) | ||
DefaultDependencies=no | ||
Requires=sleep.target | ||
After=sleep.target | ||
|
||
[Service] | ||
Type=oneshot | ||
ExecStart=/bin/openvt -ws /usr/lib/yubikey-luks-suspend/yubikey-luks-suspend |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,160 @@ | ||
#!/bin/sh | ||
# Copyright 2013 Vianney le Clément de Saint-Marcq <vleclement@gmail.com> | ||
# Copyright 2017 Zhongfu Li <me@zhongfu.li> | ||
# | ||
# This program is free software: you can redistribute it and/or modify | ||
# it under the terms of the GNU General Public License as published by | ||
# the Free Software Foundation; version 3 of the License. | ||
# | ||
# This program is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
# GNU General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU General Public License | ||
# along with This program. If not, see http://www.gnu.org/licenses/. | ||
|
||
set -e -u | ||
trap 'echo "Press ENTER to continue."; read dummy' ERR | ||
trap cleanup EXIT | ||
|
||
################################################################################ | ||
## Parameters and helper functions | ||
|
||
INITRAMFS_DIR=/run/initramfs | ||
SYSTEM_SLEEP_PATH=/lib/systemd/system-sleep | ||
BIND_PATHS="/sys /proc /dev /run" | ||
REMOUNT=0 | ||
# Retrieve cryptdevice name from /proc/mounts -- kinda hacky | ||
CRYPTNAME="$(grep -E "^/dev/mapper/[a-zA-Z0-9_\-]+ / " /proc/mounts | sed -r "s|^/dev/mapper/([a-zA-Z0-9_\-]+).*|\1|")" | ||
|
||
# run_dir DIR ARGS... | ||
# Run all executable scripts in directory DIR with arguments ARGS | ||
run_dir() { | ||
local dir=$1 | ||
shift | ||
find "${dir}" -type f -executable -exec "{}" "$@" ";" | ||
} | ||
|
||
# Remount root fs with barrier | ||
mount_barrier() { | ||
if ((REMOUNT)); then | ||
mount -o remount,barrier "/dev/mapper/$CRYPTNAME" | ||
REMOUNT=0 | ||
fi | ||
} | ||
|
||
# Unmount bind mounts | ||
umount_bind() { | ||
local p | ||
for p in ${BIND_PATHS}; do | ||
mountpoint -q "${INITRAMFS_DIR}${p}" && umount "${INITRAMFS_DIR}${p}" | ||
done | ||
} | ||
|
||
# Unmount (and remove) extracted initramfs | ||
# umount -l (lazy) because sometimes, it takes a while before everything stops | ||
# using the ramdisk. | ||
umount_initramfs() { | ||
mountpoint -q "${INITRAMFS_DIR}" && umount -l "${INITRAMFS_DIR}" | ||
} | ||
|
||
cleanup() { | ||
mount_barrier | ||
((BIND_MOUNTED)) && umount_bind | ||
umount_initramfs | ||
} | ||
|
||
cryptdevice_mount_options() { | ||
local mt | ||
mt="$(grep "^/dev/mapper/${1} " /proc/mounts | cut -d ' ' -f 3,4 | head -n 1)" | ||
local fs | ||
fs="$(cut -d ' ' -f 1 <<< "${mt}")" | ||
local opt | ||
opt="$(cut -d ' ' -f 2 <<< "${mt}")" | ||
if [[ "${fs}" == "ext4" || "${fs}" == "btrfs" ]]; then | ||
echo "${opt}" | ||
fi | ||
} | ||
|
||
################################################################################ | ||
## Main script | ||
|
||
# We'll mount ramfs on /run/initramfs, then extract initramfs there | ||
# Unmount /run/initramfs in case something failed previously | ||
mountpoint -q "${INITRAMFS_DIR}" && umount "${INITRAMFS_DIR}" | ||
[ -d "${INITRAMFS_DIR}" ] || mkdir "${INITRAMFS_DIR}" | ||
mount -t ramfs ramfs /run/initramfs | ||
|
||
INITRAMFS="/boot/initrd.img-$(uname -r)" | ||
[ -e "${INITRAMFS}" ] || exec /lib/systemd/systemd-sleep suspend | ||
cd "${INITRAMFS_DIR}" | ||
(cpio --quiet -id; zcat | cpio --quiet -id) < "${INITRAMFS}" | ||
chown -R root:root "${INITRAMFS_DIR}" | ||
chmod -R go-w "${INITRAMFS_DIR}" | ||
|
||
# In case we're still missing the suspend script. | ||
# (Perhaps the user didn't regenerate initramfs, or we picked the wrong file?) | ||
[ -e "${INITRAMFS_DIR}/suspend" ] || exec /lib/systemd/systemd-sleep suspend | ||
|
||
# Prepare chroot | ||
# For some reason, $BIND_PATHS aren't in ${INITRAMFS_DIR} | ||
# No worries, we'll just create them if they don't exist | ||
BIND_MOUNTED=1 | ||
for p in ${BIND_PATHS}; do | ||
[ -d "${INITRAMFS_DIR}${p}" ] || mkdir "${INITRAMFS_DIR}${p}" | ||
mount -o bind "${p}" "${INITRAMFS_DIR}${p}" | ||
done | ||
|
||
# Run pre-suspend scripts | ||
run_dir "${SYSTEM_SLEEP_PATH}" pre suspend | ||
|
||
# Stop udev service and prevent it from being autostarted. | ||
# Otherwise, luksResume will hang waiting for udev, which is itself waiting | ||
# for I/O on the root device. | ||
systemctl stop systemd-udevd-control.socket | ||
systemctl stop systemd-udevd-kernel.socket | ||
systemctl stop systemd-udevd.service | ||
|
||
# Stop systemd-journald and prevent it from being autostarted. | ||
# It seems to block suspend with file I/O | ||
systemctl stop systemd-journald-dev-log.socket | ||
systemctl stop systemd-journald.socket | ||
systemctl stop systemd-journald-audit.socket | ||
systemctl stop systemd-journald.service | ||
|
||
# Journalled ext4 filesystems in kernel versions 3.11+ will block suspend | ||
# if mounted with `barrier=1`, which is the default. Temporarily remount with | ||
# `barrier=0` if this is true of the crypt fs. | ||
MOUNT_OPTS="$(cryptdevice_mount_options "$CRYPTNAME")" | ||
if [[ "$MOUNT_OPTS" ]] && ! [[ "$MOUNT_OPTS" == *nobarrier* || "$MOUNT_OPTS" == *barrier=0* ]]; then | ||
REMOUNT=1 | ||
mount -o remount,nobarrier "/dev/mapper/$CRYPTNAME" | ||
fi | ||
|
||
# Synchronize filesystems before luksSuspend | ||
sync | ||
|
||
# Hand over execution to script inside initramfs | ||
cd "${INITRAMFS_DIR}" | ||
chroot . /suspend "$CRYPTNAME" | ||
|
||
# Restore original mount options if necessary | ||
mount_barrier | ||
|
||
# Restart systemd-journald | ||
systemctl start systemd-journald-dev-log.socket | ||
systemctl start systemd-journald.socket | ||
systemctl start systemd-journald-audit.socket | ||
systemctl start systemd-journald.service | ||
|
||
# Restart udev | ||
systemctl start systemd-udevd-control.socket | ||
systemctl start systemd-udevd-kernel.socket | ||
systemctl start systemd-udevd.service | ||
|
||
# Run post-suspend scripts | ||
run_dir "${SYSTEM_SLEEP_PATH}" post suspend | ||
|
||
# Unlock user sessions | ||
loginctl unlock-sessions |