mirror of
https://github.com/Llewellynvdm/Tomb.git
synced 2025-01-27 08:58:28 +00:00
some fixes to tomb-open
it would be ideal to make tomb-open never use 'sudo' but create internal tasks in tomb (like mktemp), this way if we enable users to create tombs on a system then just the full path to binary tomb is necessary in sudoers....
This commit is contained in:
parent
d2d86686a8
commit
2b62a972f5
@ -131,7 +131,7 @@ ask_usbkey() {
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
mtmp=$(/bin/mktemp -d --tmpdir tomb.XXXXXXXXXXXX)
|
mtmp=`$TOMBEXEC mktemp tomb`
|
||||||
sudo mount /dev/$usbpart $mtmp
|
sudo mount /dev/$usbpart $mtmp
|
||||||
if [ $? = 0 ]; then
|
if [ $? = 0 ]; then
|
||||||
usbmount=$mtmp
|
usbmount=$mtmp
|
||||||
@ -265,9 +265,11 @@ Create a new Tomb
|
|||||||
other people possessing it will discover your secrets, unless they
|
other people possessing it will discover your secrets, unless they
|
||||||
have your USB key and your password.
|
have your USB key and your password.
|
||||||
|
|
||||||
If you choose to proceed now, we'll guide you through the creation
|
If you choose to proceed now, we'll guide you through the creation
|
||||||
of a new Tomb.
|
of a new Tomb.
|
||||||
|
|
||||||
If you will, I'll be your Crypto Undertaker.
|
If you will, I'll be your Crypto Undertaker.
|
||||||
|
|
||||||
Do you want to proceed, Master? (y/n)
|
Do you want to proceed, Master? (y/n)
|
||||||
EOF
|
EOF
|
||||||
echo -n "> "
|
echo -n "> "
|
||||||
@ -295,13 +297,18 @@ echo
|
|||||||
cat <<EOF
|
cat <<EOF
|
||||||
Please confirm if you want to proceed now:
|
Please confirm if you want to proceed now:
|
||||||
|
|
||||||
You will need the super-user (sudo) password for the computer you
|
You will need the super-user (sudo) password for the computer you
|
||||||
are using, as well time available: depending how big your tomb will
|
are using, as well time available.
|
||||||
be, make sure you are not running low on batteries, or inside a
|
|
||||||
detachable screen if on a server. Considering 1GB takes usually
|
Depending how big your tomb will be, make sure you are not running
|
||||||
little less than an hour to be digged.
|
low on batteries.
|
||||||
|
|
||||||
|
If you are remotely connected to a server, make sure to use a
|
||||||
|
detachable screen.
|
||||||
|
|
||||||
|
Considering 1GB takes usually little less than an hour to be digged.
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
echo " "
|
|
||||||
echo " Digging will take quite some time! Should we start? (y/n)"
|
echo " Digging will take quite some time! Should we start? (y/n)"
|
||||||
echo -n "> "
|
echo -n "> "
|
||||||
read -q
|
read -q
|
||||||
@ -310,9 +317,8 @@ if [ $? != 0 ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
Operation confirmed! we will now call the undertaker to do its
|
Operation confirmed! we will now call the undertaker to do its job,
|
||||||
job, but in order to do so you will need to provide your sudo
|
but in order to do so you will need to provide your sudo password:
|
||||||
password:
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
tombfile=${tombname}.tomb
|
tombfile=${tombname}.tomb
|
||||||
@ -325,10 +331,12 @@ fi
|
|||||||
|
|
||||||
tomb-notify "The Tomb is ready!" "We will now open your new Tomb for the first time."
|
tomb-notify "The Tomb is ready!" "We will now open your new Tomb for the first time."
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
Would you like to save the key on an external usb device?"
|
Would you like to save the key on an external usb device?
|
||||||
This is recommended for safety:"
|
|
||||||
Always keep the key in a different place than the door!"
|
This is recommended for safety:
|
||||||
If you answer yes, you'll need a USB KEY now: (y/n)"
|
Always keep the key in a different place than the door!
|
||||||
|
|
||||||
|
If you answer yes, you'll need a USB KEY now: (y/n)
|
||||||
EOF
|
EOF
|
||||||
# tomb-notify "Tomb has forged a key." "Would you like to save it on USB?"
|
# tomb-notify "Tomb has forged a key." "Would you like to save it on USB?"
|
||||||
echo -n " > "
|
echo -n " > "
|
||||||
@ -338,18 +346,18 @@ if [ $? = 0 ]; then
|
|||||||
if [ ${usbkey_mount} ]; then
|
if [ ${usbkey_mount} ]; then
|
||||||
|
|
||||||
sudo mkdir -m 0700 -p ${usbkey_mount}/.tomb
|
sudo mkdir -m 0700 -p ${usbkey_mount}/.tomb
|
||||||
sudo cp -v ${tombname}.key ${usbkey_mount}/.tomb/
|
sudo cp -v ${tombfile}.key ${usbkey_mount}/.tomb/
|
||||||
sudo chmod -R go-rwx ${usbkey_mount}/.tomb
|
sudo chmod -R go-rwx ${usbkey_mount}/.tomb
|
||||||
|
|
||||||
echo "${tombname}.key succesfully saved on your USB"
|
echo "${tombname}.key succesfully saved on your USB"
|
||||||
echo "now we'll proceed opening your brand new tomb"
|
echo "now we'll proceed opening your brand new tomb"
|
||||||
|
|
||||||
"${TOMBEXEC}" -k ${tombname}.tomb.key open ${tombfile}
|
"${TOMBEXEC}" -k ${tombfile}.key open ${tombfile}
|
||||||
if [ $? = 0 ]; then
|
if [ $? = 0 ]; then
|
||||||
launch_status ${tombname}
|
launch_status ${tombname}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rm -f ${tombname}.tomb.key
|
rm -f ${tombfile}.key
|
||||||
|
|
||||||
sudo umount ${usbkey_mount}
|
sudo umount ${usbkey_mount}
|
||||||
rmdir ${usbkey_mount}
|
rmdir ${usbkey_mount}
|
||||||
@ -361,9 +369,11 @@ fi
|
|||||||
|
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
Impossible to save the key on USB.
|
Impossible to save the key on USB.
|
||||||
We recommend to preserve the key in a separate place!
|
|
||||||
You can move it yourself later, place it in a hidden directory
|
We recommend to preserve the key in a separate place! You can move
|
||||||
named .tomb inside the first partition of an usb key.
|
it yourself later, place it in a hidden directory named .tomb inside
|
||||||
|
the first partition of an usb key.
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
"${TOMBEXEC}" -k ${tombname}.tomb.key open ${tombfile}
|
"${TOMBEXEC}" -k ${tombname}.tomb.key open ${tombfile}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user