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

remove change of ownership when mounting tombs

Browse Source 
The chmod/chown launched on the mounted volume is not really effective
for security, plus the UID is not correctly guessed when tomb is
launched using sudo. It is now up to the user to correctly set
ownership and permission on mounted volumes. There is also one less
check on the ownership of the tomb file which was failing with a
warning in the same case.
This commit is contained in:
Jaromil 2017-01-02 11:04:08 +01:00
parent 5996beab0e
commit 843b7fdfc4
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tomb
View File

@ -45,7 +45,7 @@
# {{{ Global variables # {{{ Global variables
typeset VERSION="2.3" typeset VERSION="2.3"
typeset DATE="Dec/2016" typeset DATE="Jan/2017"
typeset TOMBEXEC=$0 typeset TOMBEXEC=$0
typeset TMPPREFIX=${TMPPREFIX:-/tmp} typeset TMPPREFIX=${TMPPREFIX:-/tmp}
# TODO: configure which tmp dir to use from a cli flag # TODO: configure which tmp dir to use from a cli flag
@ -525,12 +525,13 @@ is_valid_tomb() {
} }
_verbose "tomb file is not empty" _verbose "tomb file is not empty"
_uid="`zstat +uid $1`" # no more checking on the uid
[[ "$_uid" = "$UID" ]] || { # _uid="`zstat +uid $1`"
_user="`zstat -s +uid $1`" # [[ "$_uid" = "$UID" ]] || {
_warning "Tomb file is owned by another user: ::1 tomb owner::" $_user # _user="`zstat -s +uid $1`"
} # _warning "Tomb file is owned by another user: ::1 tomb owner::" $_user
_verbose "tomb is not owned by another user" # }
# _verbose "tomb is not owned by another user"
[[ $_fail = 1 ]] && { [[ $_fail = 1 ]] && {
_failure "Tomb command failed: ::1 command name::" $subcommand _failure "Tomb command failed: ::1 command name::" $subcommand
@ -1842,8 +1843,9 @@ mount_tomb() {
_failure "Cannot mount ::1 tomb name::" $TOMBNAME _failure "Cannot mount ::1 tomb name::" $TOMBNAME
} }
_sudo chown $UID:$GID ${tombmount} # we do not change ownership anymore when mounting tombs
_sudo chmod 0711 ${tombmount} # _sudo chown $UID:$GID ${tombmount}
# _sudo chmod 0711 ${tombmount}
_success "Success opening ::1 tomb file:: on ::2 mount point::" $TOMBFILE $tombmount _success "Success opening ::1 tomb file:: on ::2 mount point::" $TOMBFILE $tombmount