Merge lp:~ondrak/goget-ubuntu-touch/new-adb into lp:goget-ubuntu-touch

[Ondrej Kubik]

touch: new adb support with key support.

updating developer-mode option
   - making developer mode work better with new adb
   - removig adb-onlock switch, which is not used anymore
   - if developer mode is enabled, provisioning device by default with local adbkeys.pub
   - adding --adb-keys option to provision with custom keys

[Michael Vogt (mvo)]

Looks good.

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~w-ondra/goget-ubuntu-touch/new-adb into lp:goget-ubuntu-touch failed. Below is the output from the failed tests.

Checking formatting
Formatting wrong in following files
diskimage/bootloader.go diskimage/common.go diskimage/core_grub.go diskimage/core_uboot.go

# we always run in a fresh dir in tarmac
export GOPATH=$(mktemp -d)
trap 'rm -rf "$GOPATH"' EXIT

# this is a hack, but not sure tarmac is golang friendly
mkdir -p $GOPATH/src/launchpad.net/goget-ubuntu-touch
cp -a . $GOPATH/src/launchpad.net/goget-ubuntu-touch
cd $GOPATH/src/launchpad.net/goget-ubuntu-touch

./run-checks

[Ondrej Kubik (ondrak)]

I guess it's safe to say this is false warning, considering it's complaining about files that were not touched by this MP...

> The attempt to merge lp:~w-ondra/goget-ubuntu-touch/new-adb into lp:goget-
> ubuntu-touch failed. Below is the output from the failed tests.
>
> Checking formatting
> Formatting wrong in following files
> diskimage/bootloader.go diskimage/common.go diskimage/core_grub.go
> diskimage/core_uboot.go
>
>
> # we always run in a fresh dir in tarmac
> export GOPATH=$(mktemp -d)
> trap 'rm -rf "$GOPATH"' EXIT
>
> # this is a hack, but not sure tarmac is golang friendly
> mkdir -p $GOPATH/src/launchpad.net/goget-ubuntu-touch
> cp -a . $GOPATH/src/launchpad.net/goget-ubuntu-touch
> cd $GOPATH/src/launchpad.net/goget-ubuntu-touch
>
> ./run-checks

=== modified file 'ubuntu-device-flash/touch.go'
--- ubuntu-device-flash/touch.go	2015-02-10 05:51:08 +0000
+++ ubuntu-device-flash/touch.go	2016-03-30 11:06:21 +0000
@@ -36,6 +36,7 @@
 	Wipe          bool   `long:"wipe" description:"Clear all data after flashing"`
 	Serial        string `long:"serial" description:"Serial of the device to operate"`
 	DeveloperMode bool   `long:"developer-mode" description:"Enables developer mode after the factory reset, this is meant for automation and makes the device insecure by default (requires --password)"`
+	AdbKeys       string `long:"adb-keys" description:"Specify a local adb keys files, instead of using default ~/.android/adbkey.pub (requires --developer-mode)"`
 	DeviceTarball string `long:"device-tarball" description:"Specify a local device tarball to override the one from the server (using official Ubuntu images with different device tarballs)"`
 	CustomTarball string `long:"custom-tarball" description:"Specify a local custom tarball to override the one from the server (using official Ubuntu images with different custom tarballs)"`
 	RunScript     string `long:"run-script" description:"Run a script given by path to finish the flashing process, instead of rebooting to recovery (mostly used during development to work around quirky or incomplete recovery images)"`
@@ -79,6 +80,30 @@
 		log.Fatal("Developer mode requires --password to be set (and --wipe or --bootstrap)")
 	}
 
+	if touchCmd.AdbKeys != "" && !touchCmd.DeveloperMode {
+		log.Fatal("Adb keys requires --developer-mode to be set")
+	}
+
+	var adbKeyPath string
+	if touchCmd.DeveloperMode {
+		if touchCmd.AdbKeys != "" {
+			p, err := expandFile(touchCmd.AdbKeys)
+			if err != nil {
+				log.Fatalln("Issues with custom adb keys file", err)
+			}
+			adbKeyPath = p
+		} else {
+			home := os.Getenv("HOME")
+			p, err := expandFile(filepath.Join(home, "/.android/adbkey.pub"))
+			if err != nil {
+				fmt.Println("WARNING: missing ~/.android/adbkey.pub, your device will not be preauthorised")
+			} else {
+				fmt.Println("no --adb-keys defined, using default ~/.android/adbkey.pub")
+				adbKeyPath = p
+			}
+		}
+	}
+
 	if touchCmd.Password != "" && !touchCmd.Wipe {
 		log.Fatal("Default password setup requires --wipe or --bootstrap")
 	}
@@ -87,6 +112,10 @@
 		fmt.Println("WARNING --developer-mode and --password are dangerous as they remove security features from your device")
 	}
 
+	if touchCmd.AdbKeys != "" && touchCmd.DeveloperMode {
+		fmt.Println("WARNING: --adb-keys is dangerous, potentially authorising multiple cliets to connect to your device")
+	}
+
 	var deviceTarballPath string
 	if touchCmd.DeviceTarball != "" {
 		p, err := expandFile(touchCmd.DeviceTarball)
@@ -220,7 +249,13 @@
 	var enableList []string
 	if touchCmd.DeveloperMode {
 		enableList = append(enableList, "developer_mode")
-		enableList = append(enableList, "adb_onlock")
+		// provision target device with adbkeys if available
+		if adbKeyPath != "" {
+			err := touchCmd.adb.Push(adbKeyPath, "/cache/recovery/adbkey.pub")
+			if err == nil {
+				enableList = append(enableList, "adb_keys adbkey.pub")
+			}
+		}
 	}
 	if touchCmd.Password != "" {
 		enableList = append(enableList, "default_password "+touchCmd.Password)