tildetown
/
tildetown-admin
1
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

improve error handling around _guarded_run

add-key-for-user
nate 2017-12-14 00:37:59 -08:00
parent efd8535ae1
commit 5c0814807a
1 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ttadmin/users/models.py
View File

@ -86,25 +86,35 @@ class Townie(User):
assert(self.reviewed) assert(self.reviewed)
dot_ssh_path = '/home/{}/.ssh'.format(self.username) dot_ssh_path = '/home/{}/.ssh'.format(self.username)
_guarded_run(['sudo', error = _guarded_run(['sudo',
'adduser', 'adduser',
'--quiet', '--quiet',
'--shell={}'.format(self.shell), '--shell={}'.format(self.shell),
'--gecos="{}"'.format(self.displayname), '--gecos="{}"'.format(self.displayname),
'--disabled-password', '--disabled-password',
self.username,]) self.username])
if error:
logging.error(error)
return
_guarded_run(['sudo', error = _guarded_run(['sudo',
'usermod', 'usermod',
'-a', '-a',
'-Gtown', '-Gtown',
self.username]) self.username])
if error:
logging.error(error)
return
# Create .ssh # Create .ssh
_guarded_run(['sudo', error = _guarded_run(['sudo',
'--user={}'.format(self.username), '--user={}'.format(self.username),
'mkdir', 'mkdir',
dot_ssh_path]) dot_ssh_path])
if error:
logging.error(error)
return
# Write out authorized_keys file # Write out authorized_keys file
# Why is this a call out to a python script? There's no secure way with # Why is this a call out to a python script? There's no secure way with
@ -120,12 +130,13 @@ class Townie(User):
with TemporaryFile(dir="/tmp") as fp: with TemporaryFile(dir="/tmp") as fp:
fp.write(self.generate_authorized_keys().encode('utf-8')) fp.write(self.generate_authorized_keys().encode('utf-8'))
fp.seek(0) fp.seek(0)
_guarded_run(['sudo', error = _guarded_run(['sudo',
'--user={}'.format(self.username), '--user={}'.format(self.username),
'/opt/bin/create_keyfile.py', '/opt/bin/create_keyfile.py',
self.username], self.username],
stdin=fp, stdin=fp)
) if error:
logging.error(error)
def generate_authorized_keys(self): def generate_authorized_keys(self):
"""returns a string suitable for writing out to an authorized_keys """returns a string suitable for writing out to an authorized_keys
@ -161,7 +172,12 @@ def on_townie_pre_save(sender, instance, **kwargs):
instance.create_on_disk() instance.create_on_disk()
instance.send_welcome_email() instance.send_welcome_email()
def _guarded_run(cmd_args, **run_args): def _guarded_run(cmd_args, **run_args):
"""Given a list of args representing a command invocation as well as var
args to pass onto subprocess.run, run the command and check for an error.
if there is one, files a helpdesk ticket and returns it. Returns None on
success."""
try: try:
run(cmd_args, run(cmd_args,
check=True, check=True,
@ -172,6 +188,7 @@ def _guarded_run(cmd_args, **run_args):
issue_type='other', issue_type='other',
issue_text='error while running {}: {}'.format( issue_text='error while running {}: {}'.format(
cmd_args, e)) cmd_args, e))
return e
# development notes! # development notes!