Trying to auth with a bad request reply with a KeyError

[Chmouel Boudjnah]

When trying to auth with this :

stack@devstack:~$ curl -i http://localhost:5000/v2.0/tokens -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "User-Agent: python-novaclient" -d '{"auth": {"RAX-KSKEY:apiKeyCredentials": {"username": "admin", "apiKey": "pass", "tenantName": "admin"}}}'

I am getting a key error :

HTTP/1.1 500 Internal Server Error
Vary: X-Auth-Token
Content-Type: application/json
Content-Length: 196
Date: Thu, 30 Aug 2012 19:35:23 GMT

{"error": {"message": "An unexpected error prevented the server from fulfilling your request. local variable 'expiry' referenced before assignment", "code": 500, "title": "Internal Server Error"}}

and server log :

(root): 2012-08-30 19:35:23,078 ERROR wsgi __call__ local variable 'expiry' referenced before assignment
Traceback (most recent call last):
  File "/opt/stack/keystone/keystone/common/wsgi.py", line 204, in __call__
    result = method(context, **params)
  File "/opt/stack/keystone/keystone/service.py", line 423, in authenticate
    auth_token_data['expires'] = expiry
UnboundLocalError: local variable 'expiry' referenced before assignment
(eventlet.wsgi.server): 2012-08-30 19:35:23,080 DEBUG wsgi write 5.79.6.29 - - [30/Aug/2012 19:35:23] "POST /v2.0/tokens HTTP/1.1" 500 344 0.005041

[stelford (stef-ummon)]

This stops the 500 explosion and returns a 403 Forbidden.

The request that explodes is 'improperly formatted', at least with regards to keystone/service.py; which expects a token in the request body specifically, or an auth dict in the format at line 272 in the authenticate method.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/14208

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/14208
Committed: http://github.com/openstack/keystone/commit/0fded564f12e62cba2e163ef74074d03b5d2347f
Submitter: Jenkins
Branch: master

commit 0fded564f12e62cba2e163ef74074d03b5d2347f
Author: Dolph Mathews <email address hidden>
Date: Tue Oct 9 09:22:03 2012 +0000

    Raise 400 if credentials not provided (bug 1044032)

    This request:

        POST /v2.0/tokens

        {
            "auth": {
                "RAX-KSKEY:apiKeyCredentials": {
                    "apiKey": "pass",
                    "tenantName": "admin",
                    "username": "admin"
                }
            }
        }

    Now results in:

        400 Bad Request

        {
            "error": {
                "code": 400,
                "message": "Expecting to find passwordCredentials or token in auth. The server could not comply with the request since it is eithermalformed or otherwise incorrect. The client is assumed to be in error.",
                "title": "Bad Request"
            }
        }

    Change-Id: I5caf2b15b1bf60e0e31e8afcc7fc227744bd933a