ADB connect now respects auth keys in the settings page.

lib/units/app/index.js

@@ -10,11 +10,13 @@ var csrf = require('csurf')
 var Promise = require('bluebird')
 var httpProxy = require('http-proxy')
 var compression = require('compression')
+var adbkit = require('adbkit')
 
 var logger = require('../../util/logger')
 var pathutil = require('../../util/pathutil')
 var dbapi = require('../../db/api')
 var datautil = require('../../util/datautil')
+var requtil = require('../../util/requtil')
 
 var auth = require('./middleware/auth')
 var deviceIconMiddleware = require('./middleware/device-icons')
@@ -147,6 +149,78 @@ module.exports = function(options) {
     })
   })
 
+  app.post('/api/v1/app/user/keys/adb', function(req, res) {
+    requtil.validate(req, function() {
+        req.checkBody('title').notEmpty().len(1, 100)
+        req.checkBody('key').notEmpty()
+      })
+      .then(function() {
+        return adbkit.util.parsePublicKey(req.body.key)
+      })
+      .then(function(key) {
+        return dbapi.lookupUsersByAdbKey(key.fingerprint)
+          .then(function(users) {
+            if (users.length) {
+              throw new dbapi.DuplicateSecondaryIndexError()
+            }
+            else {
+              // Well, this doesn't guarantee that no one else inserts the
+              // same key before we do, but it's hardly a big enough problem
+              // to consider right now.
+              return dbapi.insertUserAdbKey(req.user.email, {
+                  title: req.body.title
+                , fingerprint: key.fingerprint
+                })
+                .then(function() {
+                  res.send({
+                    success: true
+                  , key: {
+                      title: req.body.title
+                    , fingerprint: key.fingerprint
+                    }
+                  })
+                })
+            }
+          })
+      })
+      .catch(requtil.ValidationError, function(err) {
+        res.status(400).send({
+          success: false
+        , error: 'ValidationError'
+        , validationErrors: err.errors
+        })
+      })
+      .catch(dbapi.DuplicateSecondaryIndexError, function() {
+        res.status(400).send({
+          success: false
+        , error: 'DuplicateKeyError'
+        })
+      })
+      .catch(function(err) {
+        log.error('Failed to insert ADB key: ', err.stack)
+        res.status(500).send({
+          success: false
+        , error: 'ServerError'
+        })
+      })
+  })
+
+  app.delete('/api/v1/app/user/keys/adb/:id', function(req, res) {
+    dbapi.deleteUserAdbKey(req.user.email, req.params.id)
+      .then(function() {
+        res.send({
+          success: true
+        })
+      })
+      .catch(function(err) {
+        log.error('Failed to delete ADB key: ', err.stack)
+        res.status(500).send({
+          success: false
+        , error: 'ServerError'
+        })
+      })
+  })
+
   app.get('/api/v1/app/group', function(req, res) {
     dbapi.loadGroup(req.user.email)
       .then(function(cursor) {

lib/units/device/plugins/connect.js

@@ -13,7 +13,8 @@ module.exports = syrup.serial()
   .dependency(require('../support/router'))
   .dependency(require('../support/push'))
   .dependency(require('./group'))
-  .define(function(options, adb, router, push, group) {
+  .dependency(require('./solo'))
+  .define(function(options, adb, router, push, group, solo) {
     var log = logger.createLogger('device:plugins:connect')
       , plugin = Object.create(null)
       , activeServer = null
@@ -27,7 +28,53 @@ module.exports = syrup.serial()
           return resolve(plugin.url)
         }
 
-        var server = adb.createTcpUsbBridge(options.serial)
+        var server = adb.createTcpUsbBridge(options.serial, {
+          auth: function(key) {
+            var resolver = Promise.defer()
+
+            function notify() {
+              push.send([
+                solo.channel
+              , wireutil.envelope(new wire.JoinGroupByAdbFingerprintMessage(
+                  options.serial
+                , key.fingerprint
+                , key.comment
+                ))
+              ])
+            }
+
+            function joinListener(group, identifier) {
+              if (identifier !== key.fingerprint) {
+                resolver.reject(new Error('Somebody else took the device'))
+              }
+            }
+
+            function autojoinListener(identifier, joined) {
+              if (identifier === key.fingerprint) {
+                if (joined) {
+                  resolver.resolve()
+                }
+                else {
+                  resolver.reject(new Error('Device is already in use'))
+                }
+              }
+            }
+
+            group.on('join', joinListener)
+            group.on('autojoin', autojoinListener)
+            router.on(wire.AdbKeysUpdatedMessage, notify)
+
+            notify()
+
+            return resolver.promise
+              .timeout(120000)
+              .finally(function() {
+                group.removeListener('join', joinListener)
+                group.removeListener('autojoin', autojoinListener)
+                router.removeListener(wire.AdbKeysUpdatedMessage, notify)
+              })
+          }
+        })
 
         server.on('listening', function() {
           resolve(plugin.url)

lib/units/device/plugins/group.js

@@ -30,7 +30,7 @@ module.exports = syrup.serial()
       return currentGroup
     })
 
-    plugin.join = function(newGroup, timeout) {
+    plugin.join = function(newGroup, timeout, identifier) {
       return plugin.get()
         .then(function() {
           if (currentGroup.group !== newGroup.group) {
@@ -60,7 +60,7 @@ module.exports = syrup.serial()
             ))
           ])
 
-          plugin.emit('join', currentGroup)
+          plugin.emit('join', currentGroup, identifier)
 
           return currentGroup
         })
@@ -134,6 +134,15 @@ module.exports = syrup.serial()
             ])
           })
       })
+      .on(wire.AutoGroupMessage, function(channel, message) {
+        return plugin.join(message.owner, message.timeout, message.identifier)
+          .then(function() {
+            plugin.emit('autojoin', message.identifier, true)
+          })
+          .catch(grouputil.AlreadyGroupedError, function() {
+            plugin.emit('autojoin', message.identifier, false)
+          })
+      })
       .on(wire.UngroupMessage, function(channel, message) {
         var reply = wireutil.reply(options.serial)
         grouputil.match(ident, message.requirements)

lib/units/processor/index.js

@@ -70,6 +70,35 @@ module.exports = function(options) {
         })
     })
     // Worker messages
+    .on(wire.JoinGroupByAdbFingerprintMessage, function(channel, message) {
+      dbapi.lookupUserByAdbFingerprint(message.fingerprint)
+        .then(function(user) {
+          if (user) {
+            devDealer.send([
+              channel
+            , wireutil.envelope(new wire.AutoGroupMessage(
+                new wire.OwnerMessage(
+                  user.email
+                , user.name
+                , user.group
+                )
+              , message.fingerprint
+              ))
+            ])
+          }
+          else {
+            /* ask user */
+            log.debug('ask user')
+          }
+        })
+        .catch(function(err) {
+          log.error(
+            'Unable to lookup user by fingerprint "%s"'
+          , message.fingerprint
+          , err.stack
+          )
+        })
+    })
     .on(wire.JoinGroupMessage, function(channel, message, data) {
       dbapi.setDeviceOwner(message.serial, message.owner)
       appDealer.send([channel, data])