From 5904e7552a6c603dc6fdbbb4845200eaa762bb9a Mon Sep 17 00:00:00 2001 From: willnx Date: Tue, 15 Oct 2019 10:51:31 -0700 Subject: [PATCH] Users are automatically placed in homedir now --- VERSION | 2 +- container_shell/lib/dockage.py | 10 ++++++---- tests/test_dockage.py | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index 027870b..e7fec55 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2019.08.28 +2019.10.15 diff --git a/container_shell/lib/dockage.py b/container_shell/lib/dockage.py index 7c232fd..0971676 100644 --- a/container_shell/lib/dockage.py +++ b/container_shell/lib/dockage.py @@ -143,10 +143,12 @@ def container_command(username, user_uid, user_gid, create_user, command, runuse username) fix_pty_ownership = 'chown {0}:{0} /dev/pts/0 2>/dev/null'.format(username) - everything = "/bin/bash -c '{0} && {1} && {2} ; {3}'".format(make_group, - make_user, - fix_pty_ownership, - run_user) + switch_dir = 'cd /home/{} 2>/dev/null'.format(username) + everything = "/bin/bash -c '{0} && {1} && {2} ; {3} ; {4}'".format(make_group, + make_user, + fix_pty_ownership, + switch_dir, + run_user) elif command: everything = command else: diff --git a/tests/test_dockage.py b/tests/test_dockage.py index 0d53280..29a2892 100644 --- a/tests/test_dockage.py +++ b/tests/test_dockage.py @@ -92,7 +92,7 @@ def test_create_no_command(self): command='', runuser='/sbin/runuser', useradd='/sbin/adduser') - expected = "/bin/bash -c '/usr/sbin/groupadd --gid 9001 liz && /sbin/adduser -m --uid 9001 --gid 9001 -s /bin/bash liz 2>/dev/null && chown liz:liz /dev/pts/0 2>/dev/null ; /sbin/runuser liz -l '" + expected = "/bin/bash -c '/usr/sbin/groupadd --gid 9001 liz && /sbin/adduser -m --uid 9001 --gid 9001 -s /bin/bash liz 2>/dev/null && chown liz:liz /dev/pts/0 2>/dev/null ; cd /home/liz 2>/dev/null ; /sbin/runuser liz -l '" self.assertEqual(cmd, expected) @@ -125,7 +125,7 @@ def test_create_command(self): command='/usr/local/bin/redis-cli', runuser='/sbin/runuser', useradd='/sbin/adduser') - expected = '/bin/bash -c \'/usr/sbin/groupadd --gid 9001 liz && /sbin/adduser -m --uid 9001 --gid 9001 -s /bin/bash liz 2>/dev/null && chown liz:liz /dev/pts/0 2>/dev/null ; /sbin/runuser liz -c "/usr/local/bin/redis-cli"\'' + expected = '/bin/bash -c \'/usr/sbin/groupadd --gid 9001 liz && /sbin/adduser -m --uid 9001 --gid 9001 -s /bin/bash liz 2>/dev/null && chown liz:liz /dev/pts/0 2>/dev/null ; cd /home/liz 2>/dev/null ; /sbin/runuser liz -c "/usr/local/bin/redis-cli"\'' self.assertEqual(cmd, expected)