a4f371439b
There were a few different places where we had some repeated code to figure out what format an account or container listing response should be in (text, JSON, or XML). Now that's been pulled into a single function. As part of this, you can now raise HTTPException subclasses in proxy controllers instead of laboriously plumbing error responses all the way back up to swift.proxy.server.Application.handle_request(). This lets us avoid certain ugly patterns, like the one where a method returns a tuple of (x, y, z, error) and the caller has to see if it got (value, value, value, None) or (None, None, None, errorvalue). Now we can just raise the error. Change-Id: I316873df289160d526487ad116f6fbb9a575e3de
140 lines
6.2 KiB
Python
140 lines
6.2 KiB
Python
# Copyright (c) 2010-2012 OpenStack, LLC.
|
|
#
|
|
# 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.
|
|
|
|
# NOTE: swift_conn
|
|
# You'll see swift_conn passed around a few places in this file. This is the
|
|
# source httplib connection of whatever it is attached to.
|
|
# It is used when early termination of reading from the connection should
|
|
# happen, such as when a range request is satisfied but there's still more the
|
|
# source connection would like to send. To prevent having to read all the data
|
|
# that could be left, the source connection can be .close() and then reads
|
|
# commence to empty out any buffers.
|
|
# These shenanigans are to ensure all related objects can be garbage
|
|
# collected. We've seen objects hang around forever otherwise.
|
|
|
|
from gettext import gettext as _
|
|
from urllib import unquote
|
|
|
|
from swift.account.utils import account_listing_response
|
|
from swift.common.request_helpers import get_listing_content_type
|
|
from swift.common.utils import public
|
|
from swift.common.constraints import check_metadata, MAX_ACCOUNT_NAME_LENGTH
|
|
from swift.common.http import HTTP_NOT_FOUND
|
|
from swift.proxy.controllers.base import Controller, clear_info_cache
|
|
from swift.common.swob import HTTPBadRequest, HTTPMethodNotAllowed
|
|
|
|
|
|
class AccountController(Controller):
|
|
"""WSGI controller for account requests"""
|
|
server_type = 'Account'
|
|
|
|
def __init__(self, app, account_name, **kwargs):
|
|
Controller.__init__(self, app)
|
|
self.account_name = unquote(account_name)
|
|
if not self.app.allow_account_management:
|
|
self.allowed_methods.remove('PUT')
|
|
self.allowed_methods.remove('DELETE')
|
|
|
|
def GETorHEAD(self, req):
|
|
"""Handler for HTTP GET/HEAD requests."""
|
|
if len(self.account_name) > MAX_ACCOUNT_NAME_LENGTH:
|
|
resp = HTTPBadRequest(request=req)
|
|
resp.body = 'Account name length of %d longer than %d' % \
|
|
(len(self.account_name), MAX_ACCOUNT_NAME_LENGTH)
|
|
return resp
|
|
|
|
partition, nodes = self.app.account_ring.get_nodes(self.account_name)
|
|
resp = self.GETorHEAD_base(
|
|
req, _('Account'), self.app.account_ring, partition,
|
|
req.path_info.rstrip('/'))
|
|
if resp.status_int == HTTP_NOT_FOUND and self.app.account_autocreate:
|
|
resp = account_listing_response(self.account_name, req,
|
|
get_listing_content_type(req))
|
|
if not req.environ.get('swift_owner', False):
|
|
for key in self.app.swift_owner_headers:
|
|
if key in resp.headers:
|
|
del resp.headers[key]
|
|
return resp
|
|
|
|
@public
|
|
def PUT(self, req):
|
|
"""HTTP PUT request handler."""
|
|
if not self.app.allow_account_management:
|
|
return HTTPMethodNotAllowed(
|
|
request=req,
|
|
headers={'Allow': ', '.join(self.allowed_methods)})
|
|
error_response = check_metadata(req, 'account')
|
|
if error_response:
|
|
return error_response
|
|
if len(self.account_name) > MAX_ACCOUNT_NAME_LENGTH:
|
|
resp = HTTPBadRequest(request=req)
|
|
resp.body = 'Account name length of %d longer than %d' % \
|
|
(len(self.account_name), MAX_ACCOUNT_NAME_LENGTH)
|
|
return resp
|
|
account_partition, accounts = \
|
|
self.app.account_ring.get_nodes(self.account_name)
|
|
headers = self.generate_request_headers(req, transfer=True)
|
|
clear_info_cache(self.app, req.environ, self.account_name)
|
|
resp = self.make_requests(
|
|
req, self.app.account_ring, account_partition, 'PUT',
|
|
req.path_info, [headers] * len(accounts))
|
|
return resp
|
|
|
|
@public
|
|
def POST(self, req):
|
|
"""HTTP POST request handler."""
|
|
if len(self.account_name) > MAX_ACCOUNT_NAME_LENGTH:
|
|
resp = HTTPBadRequest(request=req)
|
|
resp.body = 'Account name length of %d longer than %d' % \
|
|
(len(self.account_name), MAX_ACCOUNT_NAME_LENGTH)
|
|
return resp
|
|
error_response = check_metadata(req, 'account')
|
|
if error_response:
|
|
return error_response
|
|
account_partition, accounts = \
|
|
self.app.account_ring.get_nodes(self.account_name)
|
|
headers = self.generate_request_headers(req, transfer=True)
|
|
clear_info_cache(self.app, req.environ, self.account_name)
|
|
resp = self.make_requests(
|
|
req, self.app.account_ring, account_partition, 'POST',
|
|
req.path_info, [headers] * len(accounts))
|
|
if resp.status_int == HTTP_NOT_FOUND and self.app.account_autocreate:
|
|
self.autocreate_account(req.environ, self.account_name)
|
|
resp = self.make_requests(
|
|
req, self.app.account_ring, account_partition, 'POST',
|
|
req.path_info, [headers] * len(accounts))
|
|
return resp
|
|
|
|
@public
|
|
def DELETE(self, req):
|
|
"""HTTP DELETE request handler."""
|
|
# Extra safety in case someone typos a query string for an
|
|
# account-level DELETE request that was really meant to be caught by
|
|
# some middleware.
|
|
if req.query_string:
|
|
return HTTPBadRequest(request=req)
|
|
if not self.app.allow_account_management:
|
|
return HTTPMethodNotAllowed(
|
|
request=req,
|
|
headers={'Allow': ', '.join(self.allowed_methods)})
|
|
account_partition, accounts = \
|
|
self.app.account_ring.get_nodes(self.account_name)
|
|
headers = self.generate_request_headers(req)
|
|
clear_info_cache(self.app, req.environ, self.account_name)
|
|
resp = self.make_requests(
|
|
req, self.app.account_ring, account_partition, 'DELETE',
|
|
req.path_info, [headers] * len(accounts))
|
|
return resp
|