Move function for creating a user to its own file.
This commit is contained in:
parent
807bcfcde8
commit
dc11c6a27c
|
@ -17,9 +17,9 @@ import datetime
|
|||
import logging
|
||||
import os
|
||||
import subprocess
|
||||
import time
|
||||
import yaml
|
||||
import subiquitycore.utils as utils
|
||||
|
||||
from subiquitycore import utils
|
||||
|
||||
|
||||
log = logging.getLogger("subiquitycore.curtin")
|
||||
|
@ -90,48 +90,6 @@ POST_INSTALL_LIST = [
|
|||
POST_INSTALL = '\n' + "\n".join(POST_INSTALL_LIST) + '\n'
|
||||
|
||||
|
||||
def curtin_configure_user(userinfo, dryrun=False):
|
||||
usercmds = []
|
||||
# FIXME: snappy needs --extrausers too; should factor out a way to pass
|
||||
# additional parameters.
|
||||
usercmds += ["useradd -m -p {confirm_password} {username}".format(**userinfo)]
|
||||
if 'ssh_import_id' in userinfo:
|
||||
target = "/home/{username}/.ssh/authorized_keys".format(**userinfo)
|
||||
userinfo.update({'target': target})
|
||||
ssh_id = userinfo.get('ssh_import_id')
|
||||
if ssh_id.startswith('sso'):
|
||||
log.info('call out to SSO login')
|
||||
else:
|
||||
ssh_import_id = "ssh-import-id -o "
|
||||
ssh_import_id += "{target} {ssh_import_id}".format(**userinfo)
|
||||
usercmds += [ssh_import_id]
|
||||
|
||||
if not dryrun:
|
||||
for cmd in usercmds:
|
||||
utils.run_command(cmd.split(), shell=False)
|
||||
|
||||
# always run chown last
|
||||
homedir = '/home/{username}'.format(**userinfo)
|
||||
retries = 10
|
||||
while not os.path.exists(homedir) and retries > 0:
|
||||
log.debug('waiting on homedir')
|
||||
retries -= 1
|
||||
time.sleep(0.2)
|
||||
|
||||
if retries <= 0:
|
||||
raise ValueError('Failed to create homedir')
|
||||
|
||||
chown = "chown {username}.{username} -R /home/{username}".format(**userinfo)
|
||||
utils.run_command(chown.split(), shell=False)
|
||||
|
||||
# add sudo rule
|
||||
with open('/etc/sudoers.d/firstboot-user', 'w') as fh:
|
||||
fh.write('# firstboot config added user\n\n')
|
||||
fh.write('{username} ALL=(ALL) NOPASSWD:ALL\n'.format(**userinfo))
|
||||
else:
|
||||
log.info('dry-run, skiping user configuration')
|
||||
|
||||
|
||||
def curtin_userinfo_to_config(userinfo):
|
||||
user_template = ' - default\\n' + \
|
||||
' - name: {username}\\n' + \
|
||||
|
|
|
@ -27,8 +27,8 @@ from subiquitycore.ui.interactive import (PasswordEditor,
|
|||
UsernameEditor)
|
||||
from subiquitycore.ui.utils import Padding, Color
|
||||
from subiquitycore.view import BaseView
|
||||
from subiquitycore.curtin import (curtin_write_postinst_config,
|
||||
curtin_configure_user)
|
||||
from subiquitycore.curtin import curtin_write_postinst_config
|
||||
from subiquitycore.user import create_user
|
||||
|
||||
|
||||
log = logging.getLogger("subiquitycore.views.identity")
|
||||
|
@ -237,7 +237,7 @@ class IdentityView(BaseView):
|
|||
|
||||
try:
|
||||
curtin_write_postinst_config(result)
|
||||
curtin_configure_user(result, dryrun=self.opts.dry_run)
|
||||
create_user(result, dryrun=self.opts.dry_run)
|
||||
except PermissionError:
|
||||
log.exception('Failed to write curtin post-install config')
|
||||
self.signal.emit_signal('filesystem:error',
|
||||
|
|
|
@ -0,0 +1,67 @@
|
|||
# Copyright 2016 Canonical, Ltd.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import logging
|
||||
import os
|
||||
import time
|
||||
|
||||
from subiquitycore import utils
|
||||
|
||||
|
||||
log = logging.getLogger("subiquitycore.user")
|
||||
|
||||
|
||||
def create_user(userinfo, dryrun=False):
|
||||
"""Create a user according to the information in userinfo."""
|
||||
usercmds = []
|
||||
# FIXME: snappy needs --extrausers too; should factor out a way to pass
|
||||
# additional parameters.
|
||||
usercmds += ["useradd -m -p {confirm_password} {username}".format(**userinfo)]
|
||||
if 'ssh_import_id' in userinfo:
|
||||
target = "/home/{username}/.ssh/authorized_keys".format(**userinfo)
|
||||
userinfo.update({'target': target})
|
||||
ssh_id = userinfo.get('ssh_import_id')
|
||||
if ssh_id.startswith('sso'):
|
||||
log.info('call out to SSO login')
|
||||
else:
|
||||
ssh_import_id = "ssh-import-id -o "
|
||||
ssh_import_id += "{target} {ssh_import_id}".format(**userinfo)
|
||||
usercmds += [ssh_import_id]
|
||||
|
||||
if not dryrun:
|
||||
# TODO(mwhudson): cmd.split? really? what if the password contains a space?
|
||||
for cmd in usercmds:
|
||||
utils.run_command(cmd.split(), shell=False)
|
||||
|
||||
# always run chown last
|
||||
homedir = '/home/{username}'.format(**userinfo)
|
||||
retries = 10
|
||||
while not os.path.exists(homedir) and retries > 0:
|
||||
log.debug('waiting on homedir')
|
||||
retries -= 1
|
||||
time.sleep(0.2)
|
||||
|
||||
if retries <= 0:
|
||||
raise ValueError('Failed to create homedir')
|
||||
|
||||
chown = "chown {username}.{username} -R /home/{username}".format(**userinfo)
|
||||
utils.run_command(chown.split(), shell=False)
|
||||
|
||||
# add sudo rule
|
||||
with open('/etc/sudoers.d/firstboot-user', 'w') as fh:
|
||||
fh.write('# firstboot config added user\n\n')
|
||||
fh.write('{username} ALL=(ALL) NOPASSWD:ALL\n'.format(**userinfo))
|
||||
else:
|
||||
log.info('dry-run, skiping user configuration')
|
Loading…
Reference in New Issue