Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-11-29 08:14:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Security fix to setkey

Browse Source 
Now there is no more writing of cleartext secrets in any tempfile,
the last case was in setkey and is now eliminated. Tempfile creation
is cleaner. Related to issue #162
This commit is contained in:
Jaromil 2014-11-22 01:40:26 +01:00
parent 52e80b6042
commit 6bb1385c69
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tomb
View File

@ -218,25 +218,28 @@ _ensure_safe_memory check_shm() {
# Mount the tmpfs if the OS doesn't already # Mount the tmpfs if the OS doesn't already
[[ -k $shmprefix ]] || { [[ -k $shmprefix ]] || {
mkdir -p $shmprefix/$_UID || { mkdir $shmprefix
_failure "Fatal error creating a directory for temporary files" } [[ $? = 0 ]] || _failure "Fatal error creating a directory in shared memory."
}
mount -t tmpfs tmpfs $shmprefix/$_UID \ [[ -r $shmprefix/$_UID ]] || {
-o nosuid,noexec,nodev,mode=0700,uid=$_UID,gid=$_GID mkdir -m 700 $shmprefix/$_UID
[[ $? == 0 ]] || { [[ $? = 0 ]] || {
_failure "Cannot mount tmpfs in ::1 shm path::" $shmprefix } _failure "Fatal error creating a directory for temporary files" }
} }
# Ensure all temporary files go into a user-specific directory for # Ensure all temporary files go into a user-specific directory for
# additional safety # additional safety
mkdir -m 0700 -p $shmprefix/$_UID || { # mount -t tmpfs tmpfs $shmprefix/$_UID \
_failure "Fatal error creating a directory for temporary files" } # -o nosuid,noexec,nodev,mode=0700,uid=$_UID,gid=$_GID
# [[ $? == 0 ]] || {
# _failure "Cannot mount tmpfs in ::1 shm path::" $shmprefix }
# Set a global environment variable to ensure zsh will use that # Set a global environment variable to ensure zsh will use that
# directory in RAM to keep temporary files by setting an. They # directory in RAM to keep temporary files by setting an. They
# will be created on demand and deleted as soon as the function # will be created on demand and deleted as soon as the function
# using them ends. # using them ends.
TMPPREFIX="$shmprefix/$_UID/$RANDOM$RANDOM." TMPPREFIX="$shmprefix/$_UID"
return 0 return 0
@ -272,15 +275,18 @@ _plot() {
# Provide a random filename in shared memory # Provide a random filename in shared memory
_tmp_create() { _tmp_create() {
tfile="${TMPPREFIX}${RANDOM}" # Temporary file tfile="${TMPPREFIX}/$RANDOM$RANDOM$RANDOM" # Temporary file
umask 066
[[ $? == 0 ]] || {
_failure "Fatal error setting the permission umask for temporary files" }
touch $tfile touch $tfile
[[ $? == 0 ]] || { [[ $? == 0 ]] || {
_failure "Fatal error creating a temporary file: ::1 temp file::" $tfile } _failure "Fatal error creating a temporary file: ::1 temp file::" $tfile }
chown $_UID:$_GID $tfile && chmod 0600 $tfile chown $_UID:$_GID $tfile
[[ $? == 0 ]] || { [[ $? == 0 ]] || {
_failure "Fatal error setting permissions on temporary file: ::1 temp file::" $tfile } _failure "Fatal error setting ownership on temporary file: ::1 temp file::" $tfile }
_verbose "Created tempfile: ::1 temp file::" $tfile _verbose "Created tempfile: ::1 temp file::" $tfile
TOMBTMP="$tfile" TOMBTMP="$tfile"
@ -1608,8 +1614,8 @@ change_tomb_key() {
old_secret=$TOMBSECRET old_secret=$TOMBSECRET
# luksOpen the tomb (not really mounting, just on the loopback) # luksOpen the tomb (not really mounting, just on the loopback)
print -n - "$old_secret" | \ cryptsetup --key-file <(print -R -n - "$old_secret") \
cryptsetup --key-file - luksOpen ${nstloop} ${mapper} luksOpen ${nstloop} ${mapper}
[[ $? == 0 ]] || _failure "Unexpected error in luksOpen." [[ $? == 0 ]] || _failure "Unexpected error in luksOpen."
_load_key # Try loading new key from option -k and set TOMBKEYFILE _load_key # Try loading new key from option -k and set TOMBKEYFILE
@ -1627,14 +1633,9 @@ change_tomb_key() {
_failure "No valid password supplied for the new key." } _failure "No valid password supplied for the new key." }
new_secret=$TOMBSECRET new_secret=$TOMBSECRET
# Danger zone: due to cryptsetup limitations, in setkey we need cryptsetup --key-file <(print -R -n - "$old_secret") \
# to write the bare unencrypted key on the tmpfs. luksChangeKey "$nstloop" <(print -R -n - "$new_secret")
_tmp_create
local newsecretfile=$TOMBTMP
print -n - "$new_secret" >> $newsecretfile
print -n - "$old_secret" | \
cryptsetup --key-file - luksChangeKey "$nstloop" "$newsecretfile"
[[ $? == 0 ]] || _failure "Unexpected error in luksChangeKey." [[ $? == 0 ]] || _failure "Unexpected error in luksChangeKey."
cryptsetup luksClose "${mapper}" || _failure "Unexpected error in luksClose." cryptsetup luksClose "${mapper}" || _failure "Unexpected error in luksClose."