Enforce users to specify a 'pool' dimension when triggering a task.

appengine/swarming/handlers_bot.py

 # Copyright 2015 The Swarming Authors. All rights reserved.
 # Use of this source code is governed by the Apache v2.0 license that can be
 # found in the LICENSE file.
 
 """Internal bot API handlers."""
 
 import base64
 import json
 import logging
 import textwrap
@@ skipping 138 matching lines @@
     quarantined.
 
     Does one DB synchronous GET.
 
     Returns:
       tuple(request, bot_id, version, state, dimensions, quarantined_msg)
     """
     request = self.parse_body()
     version = request.get('version', None)
 
-    dimensions = request.get('dimensions', {})
-    state = request.get('state', {})
+    dimensions = request.get('dimensions') or {}
+    state = request.get('state') or {}
     bot_id = None
     if dimensions.get('id'):
       dimension_id = dimensions['id']
       if (isinstance(dimension_id, list) and len(dimension_id) == 1
           and isinstance(dimension_id[0], unicode)):
         bot_id = dimensions['id'][0]
 
     # The bot may decide to "self-quarantine" itself. Accept both via
     # dimensions or via state. See bot_management._BotCommon.quarantined for
     # more details.
@@ skipping 11 matching lines @@
         break
 
       quarantined_msg = has_missing_keys(
           self.REQUIRED_STATE_KEYS, state, 'state')
       if quarantined_msg:
         break
 
       if not bot_id:
         quarantined_msg = 'Missing bot id'
         break
+      if not dimensions.get('pool'):
+        quarantined_msg = 'Missing \'pool\' dimension'
+        break
 
       if not all(
           isinstance(key, unicode) and
           isinstance(values, list) and
           all(isinstance(value, unicode) for value in values)
           for key, values in dimensions.iteritems()):
         quarantined_msg = (
             'Invalid dimensions type:\n%s' % json.dumps(dimensions,
               sort_keys=True, indent=2, separators=(',', ': ')))
         break
@@ skipping 406 matching lines @@
       ('/swarming/api/v1/bot/poll', BotPollHandler),
       ('/swarming/api/v1/bot/server_ping', ServerPingHandler),
       ('/swarming/api/v1/bot/task_update', BotTaskUpdateHandler),
       ('/swarming/api/v1/bot/task_update/<task_id:[a-f0-9]+>',
           BotTaskUpdateHandler),
       ('/swarming/api/v1/bot/task_error', BotTaskErrorHandler),
       ('/swarming/api/v1/bot/task_error/<task_id:[a-f0-9]+>',
           BotTaskErrorHandler),
   ]
   return [webapp2.Route(*i) for i in routes]