summaryrefslogtreecommitdiffstats
path: root/src/virtBootstrap/virt_bootstrap.py
diff options
context:
space:
mode:
authorRadostin Stoyanov <rstoyanov1@gmail.com>2017-07-21 13:13:20 +0100
committerRadostin Stoyanov <rstoyanov1@gmail.com>2017-07-21 13:35:48 +0100
commit8028e1054a596077fe7b15d4c254c5d37289ebd6 (patch)
tree58f89f1db48bdaaa4e0d496154c5624cf59a6f5f /src/virtBootstrap/virt_bootstrap.py
parent2762d815643754bc4f5b4a922989fc1acf5ea5b6 (diff)
downloadvirt-bootstrap.git-8028e1054a596077fe7b15d4c254c5d37289ebd6.tar.gz
virt-bootstrap.git-8028e1054a596077fe7b15d4c254c5d37289ebd6.tar.xz
virt-bootstrap.git-8028e1054a596077fe7b15d4c254c5d37289ebd6.zip
Drop need of root privileges to set root password
These changes aim to avoid the requirement for root privileges when setting the password of root user on root file system. The "-R, --root" flag of chpasswd is using chroot to apply changes in root file system and this requires root privileges. [1] Instead compute hash of the root password using passlib [2] and insert the value in the /etc/shadow file in the rootfs. [1] https://en.wikipedia.org/wiki/Chroot#Limitations [2] http://passlib.readthedocs.io/en/stable/lib/passlib.hosts.html
Diffstat (limited to 'src/virtBootstrap/virt_bootstrap.py')
-rwxr-xr-xsrc/virtBootstrap/virt_bootstrap.py18
1 files changed, 3 insertions, 15 deletions
diff --git a/src/virtBootstrap/virt_bootstrap.py b/src/virtBootstrap/virt_bootstrap.py
index c66cc92..b43c87e 100755
--- a/src/virtBootstrap/virt_bootstrap.py
+++ b/src/virtBootstrap/virt_bootstrap.py
@@ -27,7 +27,6 @@ import logging
import sys
import os
from textwrap import dedent
-from subprocess import CalledProcessError, Popen, PIPE
try:
from urlparse import urlparse
except ImportError:
@@ -70,18 +69,6 @@ def get_source(source_type):
raise Exception("Invalid image URL scheme: '%s'" % source_type)
-def set_root_password(rootfs, password):
- """
- Set password on the root user in rootfs
- """
- users = 'root:%s' % password
- args = ['chpasswd', '-R', rootfs]
- chpasswd = Popen(args, stdin=PIPE)
- chpasswd.communicate(input=users.encode('utf-8'))
- if chpasswd.returncode != 0:
- raise CalledProcessError(chpasswd.returncode, cmd=args, output=None)
-
-
# pylint: disable=too-many-arguments
def bootstrap(uri, dest,
fmt='dir',
@@ -117,8 +104,9 @@ def bootstrap(uri, dest,
no_cache=no_cache,
progress=prog).unpack(dest)
- if root_password is not None:
- set_root_password(dest, root_password)
+ if fmt == "dir" and root_password is not None:
+ logger.info("Setting password of the root account")
+ utils.set_root_password(dest, root_password)
def set_logging_conf(loglevel=None):