Write adb public key to devices during provision.

build/android/provision_devices.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Provisions Android devices with settings required for bots.
 
 Usage:
   ./provision_devices.py [-d <device serial number>]
 """
 
 import argparse
 import logging
 import os
 import re
 import subprocess
 import sys
 import time
 
 from pylib import android_commands
 from pylib import constants
 from pylib import device_settings
 from pylib.device import device_blacklist
 from pylib.device import device_errors
 from pylib.device import device_utils
 from pylib.utils import run_tests_helper
+from sets import Set
 
 sys.path.append(os.path.join(constants.DIR_SOURCE_ROOT,
                              'third_party', 'android_testrunner'))
 import errors
 
 
 class _DEFAULT_TIMEOUTS(object):
   # L can take a while to reboot after a wipe.
   LOLLIPOP = 600
   PRE_LOLLIPOP = 180
@@ skipping 81 matching lines @@
 
   After wiping data on a device that has been authorized, adb can still
   communicate with the device, but after reboot the device will need to be
   re-authorized because the adb keys file is stored in /data/misc/adb/.
   Thus, adb_keys file is rewritten so the device does not need to be
   re-authorized.
 
   Arguments:
     device: the device to wipe
   """
-  device_authorized = device.FileExists(constants.ADB_KEYS_FILE)
-  if device_authorized:
-    adb_keys = device.ReadFile(constants.ADB_KEYS_FILE, as_root=True)
+  adb_dir_exists = device.FileExists(os.path.dirname(constants.ADB_KEYS_FILE))

[jbudorick, 2015/02/24 23:44:49]

I still think it'd be better to pass in a file via a command-line otpion than to
hard code the key file path in here. If you'd like to have the key located at
~/.android/adbkey.pub, you can still do that -- just have the recipe pass the
appropriate path to provision_devices.

If you want to support multiple adb keys (as you do here), you could allow the
option to be specified multiple times.

[navabi, 2015/02/25 01:22:35]

Done.

+  if adb_dir_exists:
+    adb_key_files = [adb_key_file for adb_key_file in
+                     os.listdir('%s/.android' % os.environ['HOME'])
+                     if adb_key_file.endswith('adbkey.pub')]
+    adb_keys = Set([])
+    for adb_key_file in adb_key_files:
+      file_path = os.path.join(os.environ['HOME'], '.android', adb_key_file)
+      with open(file_path, 'r') as f:
+        adb_public_key = f.readlines()
+      adb_keys.add(''.join(adb_public_key))
   device.RunShellCommand('wipe data', as_root=True)
-  if device_authorized:
+  if adb_dir_exists:
     path_list = constants.ADB_KEYS_FILE.split('/')
     dir_path = '/'.join(path_list[:len(path_list)-1])
     device.RunShellCommand('mkdir -p %s' % dir_path, as_root=True)
     device.RunShellCommand('restorecon %s' % dir_path, as_root=True)
-    device.WriteFile(constants.ADB_KEYS_FILE, adb_keys, as_root=True)
+    adb_key_contents = ''
+    for adb_key in adb_keys:

[jbudorick, 2015/02/24 23:44:49]

this is just

  adb_key_contents = ''.join('%s\n' % s for s in reversed(adb_keys))

right?

- do you want it to be in reverse order?
- do you want the newline at the end?

if both are no, this could be just

  adb_key_contents = '\n'.join(adb_keys)

[navabi, 2015/02/25 01:22:35]

Done.

+      adb_key_contents = '%s\n%s' % (adb_key, adb_key_contents)
+    device.WriteFile(constants.ADB_KEYS_FILE, adb_key_contents, as_root=True)
     device.RunShellCommand('restorecon %s' % constants.ADB_KEYS_FILE,
                            as_root=True)
 
-
 def WipeDeviceIfPossible(device, timeout):
   try:
     device.EnableRoot()
     WipeDeviceData(device)
     device.Reboot(True, timeout=timeout, retries=0)
   except (errors.DeviceUnresponsiveError, device_errors.CommandFailedError):
     pass
 
 
 def ProvisionDevice(device, options):
@@ skipping 124 matching lines @@
                       help='push binary which will reboot the device on adb'
                       ' disconnections')
   args = parser.parse_args()
   constants.SetBuildType(args.target)
 
   return ProvisionDevices(args)
 
 
 if __name__ == '__main__':
   sys.exit(main())