kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 15:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes #285 admin_user, the sshdir check didn't check in the chroot

Browse source
This commit is contained in:
Anders Ingemann 2016-02-18 18:21:30 +01:00
parent 73acb1f0d3
commit 3d2088ad2a
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bootstrapvz/plugins/admin_user/tasks.py
View file

@ -77,14 +77,17 @@ class AdminUserPublicKey(Task):
with open(info.manifest.plugins['admin_user']['pubkey']) as pubkey_handle: with open(info.manifest.plugins['admin_user']['pubkey']) as pubkey_handle:
pubkey = pubkey_handle.read() pubkey = pubkey_handle.read()
# paths
ssh_dir_rel = os.path.join('home', username, '.ssh')
auth_keys_rel = os.path.join(ssh_dir_rel, 'authorized_keys')
ssh_dir_abs = os.path.join(info.root, ssh_dir_rel)
auth_keys_abs = os.path.join(info.root, auth_keys_rel)
# Create the ssh dir if nobody has created it yet # Create the ssh dir if nobody has created it yet
ssh_dir = os.path.join('/home', username, '.ssh') if not os.path.exists(ssh_dir_abs):
if not os.path.exists(ssh_dir): os.mkdir(ssh_dir_abs, 0700)
os.mkdir(ssh_dir, 0700)
# Create (or append to) the authorized keys file (and chmod u=rw,go=) # Create (or append to) the authorized keys file (and chmod u=rw,go=)
import stat import stat
auth_keys_abs = os.path.join(info.root, 'home', username, '.ssh/authorized_keys')
with open(auth_keys_abs, 'a') as auth_keys_handle: with open(auth_keys_abs, 'a') as auth_keys_handle:
auth_keys_handle.write(pubkey + '\n') auth_keys_handle.write(pubkey + '\n')
os.chmod(auth_keys_abs, (stat.S_IRUSR | stat.S_IWUSR)) os.chmod(auth_keys_abs, (stat.S_IRUSR | stat.S_IWUSR))
@ -92,7 +95,6 @@ class AdminUserPublicKey(Task):
# Set the owner of the authorized keys file # Set the owner of the authorized keys file
# (must be through chroot, the host system doesn't know about the user) # (must be through chroot, the host system doesn't know about the user)
from bootstrapvz.common.tools import log_check_call from bootstrapvz.common.tools import log_check_call
auth_keys_rel = os.path.join(ssh_dir, 'authorized_keys')
log_check_call(['chroot', info.root, log_check_call(['chroot', info.root,
'chown', '-R', username, auth_keys_rel]) 'chown', '-R', username, auth_keys_rel])