853b5c9b24
Requests for resources with an unsupported HTTP method now return a HTTP response 405 (Method Not Allowed) or 501 (Not Implemented) rather than a 404 (Not Found) for everything. For example, attempting to DELETE on /v2/images will now return a 405 instead of a 404 and will provide a response header 'Allow' that lists the valid methods for the resource. Attempting to use NON_EXISTENT_METHOD on /v2/images will now return a 501. Attempting to GET on /v2/non_existent_resource will, as expected, return a 404. Fixed for v1 and v2. Change-Id: I5406f8ee423d3d5e66c56a26a7009b4f438a7e0f Closes-Bug: #1297362
118 lines
5.1 KiB
Python
118 lines
5.1 KiB
Python
# Copyright 2011 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
|
|
from glance.api.v1 import images
|
|
from glance.api.v1 import members
|
|
from glance.common import wsgi
|
|
|
|
|
|
class API(wsgi.Router):
|
|
|
|
"""WSGI router for Glance v1 API requests."""
|
|
|
|
def __init__(self, mapper):
|
|
reject_method_resource = wsgi.Resource(wsgi.RejectMethodController())
|
|
|
|
images_resource = images.create_resource()
|
|
|
|
mapper.connect("/",
|
|
controller=images_resource,
|
|
action="index")
|
|
mapper.connect("/images",
|
|
controller=images_resource,
|
|
action='index',
|
|
conditions={'method': ['GET']})
|
|
mapper.connect("/images",
|
|
controller=images_resource,
|
|
action='create',
|
|
conditions={'method': ['POST']})
|
|
mapper.connect("/images",
|
|
controller=reject_method_resource,
|
|
action='reject',
|
|
allowed_methods='GET, POST',
|
|
conditions={'method': ['PUT', 'DELETE', 'HEAD',
|
|
'PATCH']})
|
|
mapper.connect("/images/detail",
|
|
controller=images_resource,
|
|
action='detail',
|
|
conditions={'method': ['GET', 'HEAD']})
|
|
mapper.connect("/images/detail",
|
|
controller=reject_method_resource,
|
|
action='reject',
|
|
allowed_methods='GET, HEAD',
|
|
conditions={'method': ['POST', 'PUT', 'DELETE',
|
|
'PATCH']})
|
|
mapper.connect("/images/{id}",
|
|
controller=images_resource,
|
|
action="meta",
|
|
conditions=dict(method=["HEAD"]))
|
|
mapper.connect("/images/{id}",
|
|
controller=images_resource,
|
|
action="show",
|
|
conditions=dict(method=["GET"]))
|
|
mapper.connect("/images/{id}",
|
|
controller=images_resource,
|
|
action="update",
|
|
conditions=dict(method=["PUT"]))
|
|
mapper.connect("/images/{id}",
|
|
controller=images_resource,
|
|
action="delete",
|
|
conditions=dict(method=["DELETE"]))
|
|
mapper.connect("/images/{id}",
|
|
controller=reject_method_resource,
|
|
action='reject',
|
|
allowed_methods='GET, HEAD, PUT, DELETE',
|
|
conditions={'method': ['POST', 'PATCH']})
|
|
|
|
members_resource = members.create_resource()
|
|
|
|
mapper.connect("/images/{image_id}/members",
|
|
controller=members_resource,
|
|
action="index",
|
|
conditions={'method': ['GET']})
|
|
mapper.connect("/images/{image_id}/members",
|
|
controller=members_resource,
|
|
action="update_all",
|
|
conditions=dict(method=["PUT"]))
|
|
mapper.connect("/images/{image_id}/members",
|
|
controller=reject_method_resource,
|
|
action='reject',
|
|
allowed_methods='GET, PUT',
|
|
conditions={'method': ['POST', 'DELETE', 'HEAD',
|
|
'PATCH']})
|
|
mapper.connect("/images/{image_id}/members/{id}",
|
|
controller=members_resource,
|
|
action="show",
|
|
conditions={'method': ['GET']})
|
|
mapper.connect("/images/{image_id}/members/{id}",
|
|
controller=members_resource,
|
|
action="update",
|
|
conditions={'method': ['PUT']})
|
|
mapper.connect("/images/{image_id}/members/{id}",
|
|
controller=members_resource,
|
|
action="delete",
|
|
conditions={'method': ['DELETE']})
|
|
mapper.connect("/images/{image_id}/members/{id}",
|
|
controller=reject_method_resource,
|
|
action='reject',
|
|
allowed_methods='GET, PUT, DELETE',
|
|
conditions={'method': ['POST', 'HEAD', 'PATCH']})
|
|
mapper.connect("/shared-images/{id}",
|
|
controller=members_resource,
|
|
action="index_shared_images")
|
|
|
|
super(API, self).__init__(mapper)
|