Mirrors/junest
1
0
Fork 0
mirror of https://github.com/fsquillace/junest.git synced 2026-08-03 16:22:35 +00:00
Code Issues Projects Releases Wiki Activity

Issue #89: Remove id executable

Browse source
This commit is contained in:
Filippo Squillace 2015-06-23 21:44:49 +00:00
parent a5346f8154
commit 21f3b6ebda
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/core.sh
View file

@ -82,7 +82,6 @@ ORIGIN_WD=$(pwd)
# List of executables that are run inside JuNest:
SH=("/bin/sh" "--login")
ID="id -u"
# List of executables that are run in the host OS:
PROOT_COMPAT="${JUNEST_HOME}/opt/proot/proot-${ARCH}"
@ -230,10 +229,11 @@ function _run_env_with_proot(){
function run_env_as_fakeroot(){
(( EUID == 0 )) && \
die "You cannot access with root privileges. Use --root option instead."
local proot_args="$1"
shift
[ "$(proot_cmd -R ${JUNEST_HOME} $proot_args ${ID} 2> /dev/null )" == "0" ] && \
die "You cannot access with root privileges. Use --root option instead."
[ ! -e ${JUNEST_HOME}/etc/mtab ] && ln_cmd -s /proc/self/mounts ${JUNEST_HOME}/etc/mtab
_run_env_with_proot "-S ${JUNEST_HOME} $proot_args" "${@}"
@ -241,10 +241,11 @@ function run_env_as_fakeroot(){
function run_env_as_user(){
(( EUID == 0 )) && \
die "You cannot access with root privileges. Use --root option instead."
local proot_args="$1"
shift
[ "$(proot_cmd -R ${JUNEST_HOME} $proot_args ${ID} 2> /dev/null )" == "0" ] && \
die "You cannot access with root privileges. Use --root option instead."
[ -e ${JUNEST_HOME}/etc/mtab ] && rm_cmd -f ${JUNEST_HOME}/etc/mtab
_run_env_with_proot "-R ${JUNEST_HOME} $proot_args" "${@}"
@ -283,7 +284,7 @@ function _check_package(){
function build_image_env(){
# The function must runs on ArchLinux with non-root privileges.
[ "$(${ID})" == "0" ] && \
(( EUID == 0 )) && \
die "You cannot build with root privileges."
_check_package arch-install-scripts

6
tests/test_core.sh
View file

@ -297,11 +297,13 @@ function test_run_env_with_proot_compat(){
}
function test_run_env_with_proot_as_root(){
[ $SKIP_ROOT_TESTS -eq 1 ] && return
install_mini_env
$(ID="/bin/echo 0" run_env_as_user 2> /dev/null)
$(sudo run_env_as_user 2> /dev/null)
assertEquals $? 1
$(ID="/bin/echo 0" run_env_as_fakeroot 2> /dev/null)
$(sudo run_env_as_fakeroot 2> /dev/null)
assertEquals $? 1
}