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

Fix issues with --password #535

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

Fix issues with --password #535

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b5ffa9
assert Unpriv is defined in some places where it is neeeded
echuber2 Sep 18, 2024
3368ea7
simplify mkfolder and return as soon as an error happens
echuber2 Sep 18, 2024
60635a8
improve error detection in set_password
echuber2 Sep 18, 2024
227638c
defer set_password after check_hostuser so that Unpriv is set first
echuber2 Sep 18, 2024
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
52 changes: 39 additions & 13 deletions x11docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1371,16 +1371,16 @@ mkfile() { # create file $1 owned by $Hostuser
return 0
}
mkfolder() { # create folder $1 owned by $Hostuser
local Step Path= Return=
assert_unpriv_defined
local Step Path=
for Step in $(tr '/' '\n' <<< "${1:-}" | grep .) ; do
Path="$Path/$Step"
[ -d "$Path" ] || {
unpriv "mkdir -p '$Path'" || Return=1
chmod "${2:-755}" "$Path" || Return=1
}
[ "$Return" ] && break
if [ ! -d "$Path" ] ; then
unpriv "mkdir -p '$Path'" || return 1
chmod "${2:-755}" "$Path" || return 1
fi
done
return ${Return:-0}
return 0
#unpriv "mkdir -p '${1:-}'" || return 1
}
myrealpath() { # real path of possible symlink
Expand Down Expand Up @@ -1909,9 +1909,22 @@ set_password() { # option --password: set container user password
}
mkpasswd "$Password"

mkfolder "$(dirname "$Passwordfile")"
echo "$Containeruserpassword" > "$Passwordfile"
chmod 600 "$Passwordfile"
local PasswordfileDirectory
PasswordfileDirectory="$(dirname "$Passwordfile")"
mkfolder "$PasswordfileDirectory"
(
echo "$Containeruserpassword" > "$Passwordfile" || exit 1
chmod 600 "$Passwordfile" || exit 1
) || {
local error_msg
error_msg="Error modifying file \"$Passwordfile\". If it already exists, check the ownership of the file."
if [ ! -w "$PasswordfileDirectory" ] ; then
error_msg="$error_msg Also, the parent directory \"$PasswordfileDirectory\" is not writable by current user \"$Hostuser\"."
fi
error "$error_msg"
return 1 # will not execute after error
}

note "Option --password: Password changed, exiting."
return 0
}
Expand Down Expand Up @@ -11349,14 +11362,26 @@ experimental() {
}
return 1
}
assert_unpriv_defined() {
if [ -z "$Unpriv" ] ; then
# The error function doesn't seem to work correctly in the contexts where this is called, so echo and fail fast to be sure.
local unpriv_check_msg
unpriv_check_msg='Error: Variable Unpriv should have been set by now. This means check_hostuser needs to run earlier (maybe a bug).'
echo "$unpriv_check_msg"
echo "$unpriv_check_msg" >&2
exit 1
fi
}
unpriv() { # run a command as unprivileged user. Needed if x11docker was started by root or with sudo.
# $Unpriv is declared in check_hostuser: 'eval' or 'su $Hostuser -c'
assert_unpriv_defined
local Command
Command="$(oneline "${1:-}")"
$Unpriv "$Command"
return $?
}
unpriv_backend() { # run container backend rootful or rootless
assert_unpriv_defined
local Command
Command="$(oneline "${1:-}")"
[ -z "$Backendbin" ] && {
Expand All @@ -11370,6 +11395,7 @@ unpriv_backend() { # run container backend rootful or rootless
return $?
}
unpriv_xcbackend() { # run X container backend rootful or rootless
assert_unpriv_defined
local Command
Command="$(oneline "${1:-}")"
case "${Xcrootless:-no}" in
Expand All @@ -11392,15 +11418,15 @@ main() {
set -Eu
trap 'traperror $? $LINENO $BASH_LINENO "$BASH_COMMAND" $(printf "::%s" ${FUNCNAME[@]})' ERR
}
check_host # get some infos about host system
check_options_arguments # check for valid arguments
check_hostuser # find unprivileged host user # --hostuser
[ -n "$Containeruserpassword" ] && { # --password
check_optionset "--password" "$(grep -v -- '--password' <<< "$Optionsetall")" ||:
set_password "$Containeruserpassword"
finish
return 0
}
check_host # get some infos about host system
check_options_arguments # check for valid arguments
check_hostuser # find unprivileged host user # --hostuser
check_console # check if running on console
create_cachefiles # create cache files owned by unprivileged user # --cachebasedir
setup_verbosity # create [and show] summary logfile # --verbose
Expand Down