Always treat TokenError as fatal error.

appengine/swarming/swarming_bot/bot_code/bot_auth.py

 # Copyright 2016 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 import collections
 import logging
 import threading
 import time
 
 from utils import auth_server
@@ skipping 311 matching lines @@
         account_id, service_account, tok.expiry - time.time())
     return tok
 
   def _grab_bot_oauth_token(self, auth_params):
     # Piggyback on the bot own credentials. This works only for bots that use
     # OAuth for authentication (e.g. GCE bots). Also it totally ignores scopes.
     # It relies on bot_main to keep the bot OAuth token sufficiently fresh.
     # See remote_client.AUTH_HEADERS_EXPIRATION_SEC.
     bot_auth_hdr = auth_params.swarming_http_headers.get('Authorization') or ''
     if not bot_auth_hdr.startswith('Bearer '):
-      raise auth_server.TokenError(2, 'The bot is not using OAuth', fatal=True)
+      raise auth_server.TokenError(2, 'The bot is not using OAuth')
     tok = bot_auth_hdr[len('Bearer '):]
 
     # Default to some safe small expiration in case bot_main doesn't report it
     # to us. This may happen if get_authentication_header bot hook is not
     # reporting expiration time.
     exp = auth_params.swarming_http_headers_exp or (time.time() + 4*60)
 
     # TODO(vadimsh): For GCE bots specifically we can pass a list of OAuth
     # scopes granted to the GCE token and verify it contains all the requested
     # scopes.
     return auth_server.AccessToken(tok, exp)
 
   def _grab_oauth_token_via_rpc(self, _rpc_client, _account_id, _scopes):
     # TODO(vadimsh): Send a request to /swarming/api/v1/bot/oauth_token using
     # given RPC client.
     raise auth_server.TokenError(3, 'Not implemented yet')