Merge lp:~javier.collado/utah/bug1068664 into lp:utah

[Javier Collado]

This branch changes the utah client command string to execute is as root as
it's required now.

Additional information:
- The way to use as root is to prepend "sudo -S".
- The -S tells sudo to read the password from stdin.
- SSHMixin.run takes care of writing the password to stdin when needed.
  (basically when the paramiko channel is still open after running the command).
- A new configuration variable (config.password) is used to store the password value.
- Support to overwrite the password in the preseed has been added so that the
  password in the preseed is in sync with the code.

[Joe Talbott (joetalbott)]

It seems to me that keeping the method name '_rewrite_passwd_username' is more descriptive since it's setting both the password and username.

Other than that looks good to me.

review: Needs Information

[lp:~javier.collado/utah/bug1068664]

718. By Javier Collado on 2012-10-22

Renamed _rewrite_passwd as suggested by joetalbott

Final name is: _rewrite_username_and_passwd

719. By Javier Collado on 2012-10-22

Changed username and passwd lines changed if any of them exists

The username and password lines in the preseed were changed only
if 'passwd/username' was present. Now, all of them are changed
just if any of the following is available:
- 'passwd/username'
- 'passwd/user-password'
- 'passwd/user-password-again'

[Max Brustkern (nuclearbob)]

We also install ssh keys under the root user, so we can call the run method of the machine class with root=True to use root instead of using sudo. I think we'd just need to make that change in run.py on line 43. That would mean we wouldn't need to rewrite the password either, since we don't need the password for that. At some point I'd like to move to using an encypted password in the default or rewritten preseed, but I haven't worked on that in a while since it hasn't been high priority.

[Javier Collado (javier.collado)]

@Max

Looking at the alternative that you suggested.

[Javier Collado (javier.collado)]

I've created a new merge request with the one line change suggested by Max.

I'm rejecting this proposal, since all the complexity to write root password
to stdin so that sudo receives it isn't needed at all.

review: Disapprove

Unmerged revisions

719. By Javier Collado on 2012-10-22

Changed username and passwd lines changed if any of them exists

The username and password lines in the preseed were changed only
if 'passwd/username' was present. Now, all of them are changed
just if any of the following is available:
- 'passwd/username'
- 'passwd/user-password'
- 'passwd/user-password-again'

718. By Javier Collado on 2012-10-22

Renamed _rewrite_passwd as suggested by joetalbott

Final name is: _rewrite_username_and_passwd

717. By Javier Collado on 2012-10-19

Added password rewritting to the preseed

Given that the previous commit adds a new password field to the configuration
file, this commit adds support to use that value in the preseed as well.

716. By Javier Collado on 2012-10-19

Updated utah client command to use "sudo -S"

Additional information:
- This is needed because the client needs to be executed as root.
- The -S tells sudo to read the password from stdin.
- A new configuration variable `password` is used to get the password to be
  used.

=== modified file 'utah/config.py'
--- utah/config.py	2012-10-16 10:46:10 +0000
+++ utah/config.py	2012-10-22 08:38:22 +0000
@@ -46,6 +46,7 @@
     nfscommand=['sudo', os.path.join('/', 'etc', 'init.d', 'nfs-kernel-server'), 'reload'],
     nfsconfigfile=os.path.join('/', 'etc', 'exports'),
     nfsoptions='*(ro,async,no_root_squash,no_subtree_check)',
+    password='!ubuntu123',
     powertimeout=5,
     preseed=None,
     qemupath='qemu:///system',
 
=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py	2012-10-16 10:46:10 +0000
+++ utah/provisioning/provisioning.py	2012-10-22 08:38:22 +0000
@@ -518,10 +518,14 @@
         channel = self.ssh_client.get_transport().open_session()
 
         self.logger.info('Running command through SSH: ' + commandstring)
+        stdin = channel.makefile('wb')
         stdout = channel.makefile('rb')
         stderr = channel.makefile_stderr('rb')
         if timeout is None:
             channel.exec_command(commandstring)
+            if not channel.closed:
+                stdin.write('{}\n'.format(config.password))
+                stdin.flush()
         else:
             utah.timeout.timeout(timeout, channel.exec_command, commandstring)
         retval = channel.recv_exit_status()
@@ -820,8 +824,13 @@
                     self._rewrite_pkgsel_include(preseed)
                 if 'netcfg/get_hostname' in preseed:
                     self._rewrite_get_hostname(preseed)
-                if 'passwd/username' in preseed:
-                    self._rewrite_passwd_username(preseed)
+
+                username_and_passwd_qnames = ['passwd/username',
+                                              'passwd/user-password',
+                                              'passwd/user-password-again']
+                if any(qname in preseed
+                       for qname in username_and_passwd_qnames):
+                    self._rewrite_username_and_passwd(preseed)
 
             output_preseed_filename = os.path.join(tmpdir,
                                                    'initrd.d', 'preseed.cfg')
@@ -896,13 +905,17 @@
         question = preseed['netcfg/get_hostname']
         question.value = self.name
 
-    def _rewrite_passwd_username(self, preseed):
+    def _rewrite_username_and_passwd(self, preseed):
         """
-        Set password properly in the preseed
+        Set username and password properly in the preseed
         """
         self.logger.info('Rewriting username to ' + config.user)
         question = preseed['passwd/username']
         question.value = config.user
+        question = preseed['passwd/user-password']
+        question.value = config.password
+        question = preseed['passwd/user-password-again']
+        question.value = config.password
 
     def _preseedcasper(self, tmpdir=None):
         """
 
=== modified file 'utah/run.py'
--- utah/run.py	2012-10-16 10:46:10 +0000
+++ utah/run.py	2012-10-22 08:38:22 +0000
@@ -38,7 +38,7 @@
         machine.uploadfiles([locallist], os.path.normpath('/tmp'))
 
         options = ' -r /tmp/' + os.path.basename(locallist)
-        utah_command = 'utah' + extraopts + options
+        utah_command = 'sudo -S utah' + extraopts + options
         try:
             _returncode, stdout, _stderr = machine.run(utah_command)
             # TODO: Decide which returncode means utah client failure