%s
' % (title, exp) + self.content_length = len(body) + self.content_type = 'text/html' + return [body] + return [''] + + def __call__(self, env, start_response): + self.environ = env + app_iter = self._response_iter(self.app_iter, self._body) + if 'location' in self.headers and self.location.startswith('/'): + self.location = self.environ['wsgi.url_scheme'] + '://' \ + + self.environ['SERVER_NAME'] + self.location + start_response(self.status, self.headers.items()) + return app_iter + + +class StatusMap(object): + """ + A dict-like object that returns Response subclasses/factory functions + where the given key is the status code. + """ + def __getitem__(self, key): + return partial(Response, status=key) +status_map = StatusMap() + + +HTTPAccepted = status_map[202] +HTTPCreated = status_map[201] +HTTPNoContent = status_map[204] +HTTPMovedPermanently = status_map[301] +HTTPNotModified = status_map[304] +HTTPBadRequest = status_map[400] +HTTPUnauthorized = status_map[401] +HTTPForbidden = status_map[403] +HTTPMethodNotAllowed = status_map[405] +HTTPNotFound = status_map[404] +HTTPRequestTimeout = status_map[408] +HTTPConflict = status_map[409] +HTTPLengthRequired = status_map[411] +HTTPPreconditionFailed = status_map[412] +HTTPRequestEntityTooLarge = status_map[413] +HTTPUnprocessableEntity = status_map[422] +HTTPClientDisconnect = status_map[499] +HTTPServerError = status_map[500] +HTTPInternalServerError = status_map[500] +HTTPServiceUnavailable = status_map[503] +HTTPInsufficientStorage = status_map[507] diff --git a/swift/common/utils.py b/swift/common/utils.py index f2bee5cb55..fd64a68445 100644 --- a/swift/common/utils.py +++ b/swift/common/utils.py @@ -40,6 +40,8 @@ import cPickle as pickle import glob from urlparse import urlparse as stdlib_urlparse, ParseResult import socket +import itertools +import types import eventlet from eventlet import GreenPool, sleep, Timeout @@ -114,7 +116,7 @@ def get_param(req, name, default=None): Get parameters from an HTTP request ensuring proper handling UTF-8 encoding. - :param req: Webob request object + :param req: request object :param name: parameter name :param default: result to return if the parameter is not found :returns: HTTP request parameter value @@ -1440,3 +1442,24 @@ def list_from_csv(comma_separated_str): if comma_separated_str: return [v.strip() for v in comma_separated_str.split(',') if v.strip()] return [] + + +def reiterate(iterable): + """ + Consume the first item from an iterator, then re-chain it to the rest of + the iterator. This is useful when you want to make sure the prologue to + downstream generators have been executed before continuing. + + :param iterable: an iterable object + """ + if isinstance(iterable, (list, tuple)): + return iterable + else: + iterator = iter(iterable) + try: + chunk = '' + while not chunk: + chunk = next(iterable) + return itertools.chain([chunk], iterable) + except StopIteration: + return [] diff --git a/swift/common/wsgi.py b/swift/common/wsgi.py index 75094b6b72..e8ef95f4a6 100644 --- a/swift/common/wsgi.py +++ b/swift/common/wsgi.py @@ -27,9 +27,9 @@ import eventlet from eventlet import greenio, GreenPool, sleep, wsgi, listen from paste.deploy import loadapp, appconfig from eventlet.green import socket, ssl -from webob import Request from urllib import unquote +from swift.common.swob import Request from swift.common.utils import capture_stdio, disable_fallocate, \ drop_privileges, get_logger, NullLogger, TRUE_VALUES, \ validate_configuration @@ -265,7 +265,7 @@ class WSGIContext(object): def make_pre_authed_request(env, method=None, path=None, body=None, headers=None, agent='Swift'): """ - Makes a new webob.Request based on the current env but with the + Makes a new swob.Request based on the current env but with the parameters specified. Note that this request will be preauthorized. :param env: The WSGI environment to base the new request on. @@ -285,7 +285,7 @@ def make_pre_authed_request(env, method=None, path=None, body=None, '%(orig)s StaticWeb'. You also set agent to None to use the original env's HTTP_USER_AGENT or '' to have no HTTP_USER_AGENT. - :returns: Fresh webob.Request object. + :returns: Fresh swob.Request object. """ query_string = None if path and '?' in path: diff --git a/swift/container/server.py b/swift/container/server.py index b123cacfb6..a9a62962bc 100644 --- a/swift/container/server.py +++ b/swift/container/server.py @@ -23,10 +23,6 @@ from xml.sax import saxutils from datetime import datetime from eventlet import Timeout -from webob import Request, Response -from webob.exc import HTTPAccepted, HTTPBadRequest, HTTPConflict, \ - HTTPCreated, HTTPInternalServerError, HTTPNoContent, \ - HTTPNotFound, HTTPPreconditionFailed, HTTPMethodNotAllowed import swift.common.db from swift.common.db import ContainerBroker @@ -38,7 +34,10 @@ from swift.common.constraints import CONTAINER_LISTING_LIMIT, \ from swift.common.bufferedhttp import http_connect from swift.common.exceptions import ConnectionTimeout from swift.common.db_replicator import ReplicatorRpc -from swift.common.http import HTTP_NOT_FOUND, is_success, \ +from swift.common.http import HTTP_NOT_FOUND, is_success +from swift.common.swob import HTTPAccepted, HTTPBadRequest, HTTPConflict, \ + HTTPCreated, HTTPInternalServerError, HTTPNoContent, HTTPNotFound, \ + HTTPPreconditionFailed, HTTPMethodNotAllowed, Request, Response, \ HTTPInsufficientStorage DATADIR = 'containers' @@ -90,7 +89,7 @@ class ContainerController(object): """ Update the account server with latest container info. - :param req: webob.Request object + :param req: swob.Request object :param account: account name :param container: container name :param borker: container DB broker object diff --git a/swift/obj/server.py b/swift/obj/server.py index d573b7a8b6..d2af6763ad 100644 --- a/swift/obj/server.py +++ b/swift/obj/server.py @@ -27,11 +27,6 @@ from tempfile import mkstemp from urllib import unquote from contextlib import contextmanager -from webob import Request, Response, UTC -from webob.exc import HTTPAccepted, HTTPBadRequest, HTTPCreated, \ - HTTPInternalServerError, HTTPNoContent, HTTPNotFound, \ - HTTPNotModified, HTTPPreconditionFailed, \ - HTTPRequestTimeout, HTTPUnprocessableEntity, HTTPMethodNotAllowed from xattr import getxattr, setxattr from eventlet import sleep, Timeout, tpool @@ -46,8 +41,12 @@ from swift.common.exceptions import ConnectionTimeout, DiskFileError, \ DiskFileNotExist from swift.obj.replicator import tpool_reraise, invalidate_hash, \ quarantine_renamer, get_hashes -from swift.common.http import is_success, HTTPInsufficientStorage, \ - HTTPClientDisconnect +from swift.common.http import is_success +from swift.common.swob import HTTPAccepted, HTTPBadRequest, HTTPCreated, \ + HTTPInternalServerError, HTTPNoContent, HTTPNotFound, HTTPNotModified, \ + HTTPPreconditionFailed, HTTPRequestTimeout, HTTPUnprocessableEntity, \ + HTTPClientDisconnect, HTTPMethodNotAllowed, Request, Response, UTC, \ + HTTPInsufficientStorage DATADIR = 'objects' diff --git a/swift/proxy/controllers/account.py b/swift/proxy/controllers/account.py index 58941a5f1d..d0ff8f90b1 100644 --- a/swift/proxy/controllers/account.py +++ b/swift/proxy/controllers/account.py @@ -28,13 +28,11 @@ import time from urllib import unquote from random import shuffle -from webob.exc import HTTPBadRequest, HTTPMethodNotAllowed -from webob import Request - from swift.common.utils import normalize_timestamp, public from swift.common.constraints import check_metadata, MAX_ACCOUNT_NAME_LENGTH from swift.common.http import is_success, HTTP_NOT_FOUND from swift.proxy.controllers.base import Controller +from swift.common.swob import HTTPBadRequest, HTTPMethodNotAllowed, Request class AccountController(Controller): diff --git a/swift/proxy/controllers/base.py b/swift/proxy/controllers/base.py index 80d9f61bc5..4d807355b3 100644 --- a/swift/proxy/controllers/base.py +++ b/swift/proxy/controllers/base.py @@ -30,8 +30,6 @@ import functools from eventlet import spawn_n, GreenPile, Timeout from eventlet.queue import Queue, Empty, Full from eventlet.timeout import Timeout -from webob.exc import status_map -from webob import Request, Response from swift.common.utils import normalize_timestamp, TRUE_VALUES, public from swift.common.bufferedhttp import http_connect @@ -41,13 +39,14 @@ from swift.common.http import is_informational, is_success, is_redirection, \ is_server_error, HTTP_OK, HTTP_PARTIAL_CONTENT, HTTP_MULTIPLE_CHOICES, \ HTTP_BAD_REQUEST, HTTP_NOT_FOUND, HTTP_SERVICE_UNAVAILABLE, \ HTTP_INSUFFICIENT_STORAGE +from swift.common.swob import Request, Response, status_map def update_headers(response, headers): """ Helper function to update headers in the response. - :param response: webob.Response object + :param response: swob.Response object :param headers: dictionary headers """ if hasattr(headers, 'items'): @@ -406,7 +405,7 @@ class Controller(object): :param headers: a list of dicts, where each dict represents one backend request that should be made. - :returns: a webob Response object + :returns: a swob.Response object """ start_nodes = ring.get_part_nodes(part) nodes = self.iter_nodes(part, start_nodes, ring) @@ -427,13 +426,13 @@ class Controller(object): Given a list of responses from several servers, choose the best to return to the API. - :param req: webob.Request object + :param req: swob.Request object :param statuses: list of statuses returned :param reasons: list of reasons for each status :param bodies: bodies of each response :param server_type: type of server the responses came from :param etag: etag - :returns: webob.Response object with the correct status, body, etc. set + :returns: swob.Response object with the correct status, body, etc. set """ resp = Response(request=req) if len(statuses): @@ -562,13 +561,13 @@ class Controller(object): """ Base handler for HTTP GET or HEAD requests. - :param req: webob.Request object + :param req: swob.Request object :param server_type: server type :param partition: partition :param nodes: nodes :param path: path for the request :param attempts: number of attempts to try - :returns: webob.Response object + :returns: swob.Response object """ statuses = [] reasons = [] diff --git a/swift/proxy/controllers/container.py b/swift/proxy/controllers/container.py index 1b349c99d3..77da9950de 100644 --- a/swift/proxy/controllers/container.py +++ b/swift/proxy/controllers/container.py @@ -28,13 +28,13 @@ import time from urllib import unquote from random import shuffle -from webob.exc import HTTPBadRequest, HTTPForbidden, HTTPNotFound - from swift.common.utils import normalize_timestamp, public from swift.common.constraints import check_metadata, MAX_CONTAINER_NAME_LENGTH from swift.common.http import HTTP_ACCEPTED from swift.proxy.controllers.base import Controller, delay_denial, \ get_container_memcache_key +from swift.common.swob import HTTPBadRequest, HTTPForbidden, \ + HTTPNotFound class ContainerController(Controller): diff --git a/swift/proxy/controllers/obj.py b/swift/proxy/controllers/obj.py index e09020ad0a..712a7c3f2a 100644 --- a/swift/proxy/controllers/obj.py +++ b/swift/proxy/controllers/obj.py @@ -39,10 +39,6 @@ from random import shuffle from eventlet import sleep, GreenPile, Timeout from eventlet.queue import Queue from eventlet.timeout import Timeout -from webob.exc import HTTPAccepted, HTTPBadRequest, HTTPNotFound, \ - HTTPPreconditionFailed, HTTPRequestEntityTooLarge, HTTPRequestTimeout, \ - HTTPServerError, HTTPServiceUnavailable -from webob import Request, Response from swift.common.utils import ContextPool, normalize_timestamp, TRUE_VALUES, \ public @@ -55,8 +51,12 @@ from swift.common.exceptions import ChunkReadTimeout, \ from swift.common.http import is_success, is_client_error, HTTP_CONTINUE, \ HTTP_CREATED, HTTP_MULTIPLE_CHOICES, HTTP_NOT_FOUND, \ HTTP_INTERNAL_SERVER_ERROR, HTTP_SERVICE_UNAVAILABLE, \ - HTTP_INSUFFICIENT_STORAGE, HTTPClientDisconnect + HTTP_INSUFFICIENT_STORAGE from swift.proxy.controllers.base import Controller, delay_denial +from swift.common.swob import HTTPAccepted, HTTPBadRequest, HTTPNotFound, \ + HTTPPreconditionFailed, HTTPRequestEntityTooLarge, HTTPRequestTimeout, \ + HTTPServerError, HTTPServiceUnavailable, Request, Response, \ + HTTPClientDisconnect class SegmentedIterable(object): @@ -72,7 +72,7 @@ class SegmentedIterable(object): :param listing: The listing of object segments to iterate over; this may be an iterator or list that returns dicts with 'name' and 'bytes' keys. - :param response: The webob.Response this iterable is associated with, if + :param response: The swob.Response this iterable is associated with, if any (default: None) """ @@ -327,11 +327,11 @@ class ObjectController(Controller): resp = Response(headers=resp.headers, request=req, conditional_response=True) if req.method == 'HEAD': - # These shenanigans are because webob translates the HEAD - # request into a webob EmptyResponse for the body, which + # These shenanigans are because swob translates the HEAD + # request into a swob EmptyResponse for the body, which # has a len, which eventlet translates as needing a # content-length header added. So we call the original - # webob resp for the headers but return an empty iterator + # swob resp for the headers but return an empty iterator # for the body. def head_response(environ, start_response): diff --git a/swift/proxy/server.py b/swift/proxy/server.py index 03e0940622..80bdd1a7a9 100644 --- a/swift/proxy/server.py +++ b/swift/proxy/server.py @@ -31,9 +31,6 @@ from ConfigParser import ConfigParser import uuid from eventlet import Timeout -from webob.exc import HTTPBadRequest, HTTPForbidden, HTTPMethodNotAllowed, \ - HTTPNotFound, HTTPPreconditionFailed, HTTPServerError -from webob import Request from swift.common.ring import Ring from swift.common.utils import cache_from_env, get_logger, \ @@ -41,6 +38,10 @@ from swift.common.utils import cache_from_env, get_logger, \ from swift.common.constraints import check_utf8 from swift.proxy.controllers import AccountController, ObjectController, \ ContainerController, Controller +from swift.common.swob import HTTPAccepted, HTTPBadRequest, HTTPForbidden, \ + HTTPMethodNotAllowed, HTTPNotFound, HTTPPreconditionFailed, \ + HTTPRequestEntityTooLarge, HTTPRequestTimeout, HTTPServerError, \ + HTTPServiceUnavailable, HTTPClientDisconnect, status_map, Request, Response class Application(object): @@ -130,7 +131,7 @@ class Application(object): def __call__(self, env, start_response): """ WSGI entry point. - Wraps env in webob.Request object and passes it down. + Wraps env in swob.Request object and passes it down. :param env: WSGI environment dictionary :param start_response: WSGI callable @@ -157,9 +158,9 @@ class Application(object): def handle_request(self, req): """ Entry point for proxy server. - Should return a WSGI-style callable (such as webob.Response). + Should return a WSGI-style callable (such as swob.Response). - :param req: webob.Request object + :param req: swob.Request object """ try: self.logger.set_statsd_prefix('proxy-server') diff --git a/test/functional/tests.py b/test/functional/tests.py index dd589e6b8c..cc87954448 100644 --- a/test/functional/tests.py +++ b/test/functional/tests.py @@ -1128,7 +1128,7 @@ class TestFile(Base): range_string = 'bytes=-%d' % (i) hdrs = {'Range': range_string} - self.assert_(file.read(hdrs=hdrs) == data[-i:], range_string) + self.assertEquals(file.read(hdrs=hdrs), data[-i:]) range_string = 'bytes=%d-' % (i) hdrs = {'Range': range_string} @@ -1149,10 +1149,6 @@ class TestFile(Base): def testRangedGetsWithLWSinHeader(self): #Skip this test until webob 1.2 can tolerate LWS in Range header. - from webob.byterange import Range - if not isinstance(Range.parse('bytes = 0-99 '), Range): - raise SkipTest - file_length = 10000 range_size = file_length / 10 file = self.env.container.file(Utils.create_name()) diff --git a/test/unit/account/test_server.py b/test/unit/account/test_server.py index 9451366c85..b5eed2b65a 100644 --- a/test/unit/account/test_server.py +++ b/test/unit/account/test_server.py @@ -21,8 +21,8 @@ from StringIO import StringIO import simplejson import xml.dom.minidom -from webob import Request +from swift.common.swob import Request from swift.account.server import AccountController, ACCOUNT_LISTING_LIMIT from swift.common.utils import normalize_timestamp @@ -111,9 +111,9 @@ class TestAccountController(unittest.TestCase): req = Request.blank('/sda1/p/a', environ={'REQUEST_METHOD': 'HEAD'}) resp = self.controller.HEAD(req) self.assertEquals(resp.status_int, 204) - self.assertEquals(resp.headers['x-account-container-count'], 0) - self.assertEquals(resp.headers['x-account-object-count'], 0) - self.assertEquals(resp.headers['x-account-bytes-used'], 0) + self.assertEquals(resp.headers['x-account-container-count'], '0') + self.assertEquals(resp.headers['x-account-object-count'], '0') + self.assertEquals(resp.headers['x-account-bytes-used'], '0') def test_HEAD_with_containers(self): req = Request.blank('/sda1/p/a', environ={'REQUEST_METHOD': 'PUT'}, @@ -136,9 +136,9 @@ class TestAccountController(unittest.TestCase): req = Request.blank('/sda1/p/a', environ={'REQUEST_METHOD': 'HEAD'}) resp = self.controller.HEAD(req) self.assertEquals(resp.status_int, 204) - self.assertEquals(resp.headers['x-account-container-count'], 2) - self.assertEquals(resp.headers['x-account-object-count'], 0) - self.assertEquals(resp.headers['x-account-bytes-used'], 0) + self.assertEquals(resp.headers['x-account-container-count'], '2') + self.assertEquals(resp.headers['x-account-object-count'], '0') + self.assertEquals(resp.headers['x-account-bytes-used'], '0') req = Request.blank('/sda1/p/a/c1', environ={'REQUEST_METHOD': 'PUT'}, headers={'X-Put-Timestamp': '1', 'X-Delete-Timestamp': '0', @@ -157,9 +157,9 @@ class TestAccountController(unittest.TestCase): 'HTTP_X_TIMESTAMP': '5'}) resp = self.controller.HEAD(req) self.assertEquals(resp.status_int, 204) - self.assertEquals(resp.headers['x-account-container-count'], 2) - self.assertEquals(resp.headers['x-account-object-count'], 4) - self.assertEquals(resp.headers['x-account-bytes-used'], 6) + self.assertEquals(resp.headers['x-account-container-count'], '2') + self.assertEquals(resp.headers['x-account-object-count'], '4') + self.assertEquals(resp.headers['x-account-bytes-used'], '6') def test_PUT_not_found(self): req = Request.blank('/sda1/p/a/c', environ={'REQUEST_METHOD': 'PUT'}, diff --git a/test/unit/common/middleware/test_cname_lookup.py b/test/unit/common/middleware/test_cname_lookup.py index 12ab7ad1f1..13a5e71bf1 100644 --- a/test/unit/common/middleware/test_cname_lookup.py +++ b/test/unit/common/middleware/test_cname_lookup.py @@ -16,8 +16,6 @@ import unittest from nose import SkipTest -from webob import Request - try: # this test requires the dnspython package to be installed import dns.resolver @@ -26,6 +24,7 @@ except ImportError: else: # executed if the try has no errors skip = False from swift.common.middleware import cname_lookup +from swift.common.swob import Request class FakeApp(object): diff --git a/test/unit/common/middleware/test_domain_remap.py b/test/unit/common/middleware/test_domain_remap.py index 7139ad7769..897ce50baf 100644 --- a/test/unit/common/middleware/test_domain_remap.py +++ b/test/unit/common/middleware/test_domain_remap.py @@ -15,8 +15,7 @@ import unittest -from webob import Request - +from swift.common.swob import Request from swift.common.middleware import domain_remap diff --git a/test/unit/common/middleware/test_except.py b/test/unit/common/middleware/test_except.py index 005792dd27..94ed2a74df 100644 --- a/test/unit/common/middleware/test_except.py +++ b/test/unit/common/middleware/test_except.py @@ -15,8 +15,7 @@ import unittest -from webob import Request, Response - +from swift.common.swob import Request, Response from swift.common.middleware import catch_errors from swift.common.utils import get_logger diff --git a/test/unit/common/middleware/test_formpost.py b/test/unit/common/middleware/test_formpost.py index 3c849a0b65..c4067f5918 100644 --- a/test/unit/common/middleware/test_formpost.py +++ b/test/unit/common/middleware/test_formpost.py @@ -20,8 +20,7 @@ from contextlib import contextmanager from StringIO import StringIO from time import time -from webob import Request, Response - +from swift.common.swob import Request, Response from swift.common.middleware import tempauth, formpost diff --git a/test/unit/common/middleware/test_healthcheck.py b/test/unit/common/middleware/test_healthcheck.py index c898d38ec5..49b4fc23a4 100644 --- a/test/unit/common/middleware/test_healthcheck.py +++ b/test/unit/common/middleware/test_healthcheck.py @@ -15,8 +15,7 @@ import unittest -from webob import Request - +from swift.common.swob import Request from swift.common.middleware import healthcheck class FakeApp(object): diff --git a/test/unit/common/middleware/test_keystoneauth.py b/test/unit/common/middleware/test_keystoneauth.py index c9c3b99508..16fd8a4396 100644 --- a/test/unit/common/middleware/test_keystoneauth.py +++ b/test/unit/common/middleware/test_keystoneauth.py @@ -14,9 +14,10 @@ # limitations under the License. import unittest -import webob from swift.common.middleware import keystoneauth +from swift.common.swob import Request, Response, HTTPForbidden +from swift.common.http import HTTP_FORBIDDEN class FakeApp(object): @@ -28,13 +29,13 @@ class FakeApp(object): def __call__(self, env, start_response): self.calls += 1 - self.request = webob.Request.blank('', environ=env) + self.request = Request.blank('', environ=env) if 'swift.authorize' in env: resp = env['swift.authorize'](self.request) if resp: return resp(env, start_response) status, headers, body = self.status_headers_body_iter.next() - return webob.Response(status=status, headers=headers, + return Response(status=status, headers=headers, body=body)(env, start_response) @@ -45,7 +46,7 @@ class SwiftAuth(unittest.TestCase): def _make_request(self, path=None, headers=None, **kwargs): if not path: path = '/v1/%s/c/o' % self.test_auth._get_account_for_tenant('foo') - return webob.Request.blank(path, headers=headers, **kwargs) + return Request.blank(path, headers=headers, **kwargs) def _get_identity_headers(self, status='Confirmed', tenant_id='1', tenant_name='acct', user='usr', role=''): @@ -118,7 +119,7 @@ class TestAuthorize(unittest.TestCase): self.test_auth = keystoneauth.filter_factory({})(FakeApp()) def _make_request(self, path, **kwargs): - return webob.Request.blank(path, **kwargs) + return Request.blank(path, **kwargs) def _get_account(self, identity=None): if not identity: @@ -147,17 +148,17 @@ class TestAuthorize(unittest.TestCase): req.acl = acl result = self.test_auth.authorize(req) if exception: - self.assertTrue(isinstance(result, exception)) + self.assertEquals(result.status_int, exception) else: self.assertTrue(result is None) return req def test_authorize_fails_for_unauthorized_user(self): - self._check_authenticate(exception=webob.exc.HTTPForbidden) + self._check_authenticate(exception=HTTP_FORBIDDEN) def test_authorize_fails_for_invalid_reseller_prefix(self): self._check_authenticate(account='BLAN_a', - exception=webob.exc.HTTPForbidden) + exception=HTTP_FORBIDDEN) def test_authorize_succeeds_for_reseller_admin(self): roles = [self.test_auth.reseller_admin_role] @@ -185,22 +186,22 @@ class TestAuthorize(unittest.TestCase): def test_authorize_fails_as_owner_for_tenant_owner_match(self): self.test_auth.is_admin = False self._check_authorize_for_tenant_owner_match( - exception=webob.exc.HTTPForbidden) + exception=HTTP_FORBIDDEN) def test_authorize_succeeds_for_container_sync(self): env = {'swift_sync_key': 'foo', 'REMOTE_ADDR': '127.0.0.1'} - headers = {'x-container-sync-key': 'foo', 'x-timestamp': None} + headers = {'x-container-sync-key': 'foo', 'x-timestamp': '1'} self._check_authenticate(env=env, headers=headers) def test_authorize_fails_for_invalid_referrer(self): env = {'HTTP_REFERER': 'http://invalid.com/index.html'} self._check_authenticate(acl='.r:example.com', env=env, - exception=webob.exc.HTTPForbidden) + exception=HTTP_FORBIDDEN) def test_authorize_fails_for_referrer_without_rlistings(self): env = {'HTTP_REFERER': 'http://example.com/index.html'} self._check_authenticate(acl='.r:example.com', env=env, - exception=webob.exc.HTTPForbidden) + exception=HTTP_FORBIDDEN) def test_authorize_succeeds_for_referrer_with_rlistings(self): env = {'HTTP_REFERER': 'http://example.com/index.html'} diff --git a/test/unit/common/middleware/test_memcache.py b/test/unit/common/middleware/test_memcache.py index c3657021f5..c07d7f5be6 100644 --- a/test/unit/common/middleware/test_memcache.py +++ b/test/unit/common/middleware/test_memcache.py @@ -16,10 +16,10 @@ import unittest from ConfigParser import NoSectionError, NoOptionError -from webob import Request - from swift.common.middleware import memcache from swift.common.memcached import MemcacheRing +from swift.common.swob import Request + class FakeApp(object): def __call__(self, env, start_response): diff --git a/test/unit/common/middleware/test_name_check.py b/test/unit/common/middleware/test_name_check.py index ab5503352b..1aa77bc7aa 100644 --- a/test/unit/common/middleware/test_name_check.py +++ b/test/unit/common/middleware/test_name_check.py @@ -22,7 +22,8 @@ Created on February 29, 2012 ''' import unittest -from webob import Request, Response + +from swift.common.swob import Request, Response from swift.common.middleware import name_check MAX_LENGTH = 255 diff --git a/test/unit/common/middleware/test_proxy_logging.py b/test/unit/common/middleware/test_proxy_logging.py index 25163e1f04..b3011d5643 100644 --- a/test/unit/common/middleware/test_proxy_logging.py +++ b/test/unit/common/middleware/test_proxy_logging.py @@ -18,11 +18,10 @@ from urllib import quote, unquote import cStringIO as StringIO from logging.handlers import SysLogHandler -from webob import Request - from test.unit import FakeLogger from swift.common.utils import get_logger from swift.common.middleware import proxy_logging +from swift.common.swob import Request class FakeApp(object): diff --git a/test/unit/common/middleware/test_ratelimit.py b/test/unit/common/middleware/test_ratelimit.py index 38b7cd09c6..82aef84541 100644 --- a/test/unit/common/middleware/test_ratelimit.py +++ b/test/unit/common/middleware/test_ratelimit.py @@ -18,12 +18,12 @@ import time import eventlet from contextlib import contextmanager from threading import Thread -from webob import Request from test.unit import FakeLogger from swift.common.middleware import ratelimit from swift.proxy.controllers.base import get_container_memcache_key from swift.common.memcached import MemcacheConnectionError +from swift.common.swob import Request class FakeMemcache(object): diff --git a/test/unit/common/middleware/test_recon.py b/test/unit/common/middleware/test_recon.py index 72b67c7f4d..5bcc936d9b 100644 --- a/test/unit/common/middleware/test_recon.py +++ b/test/unit/common/middleware/test_recon.py @@ -14,13 +14,14 @@ # limitations under the License. import unittest -from webob import Request -from swift.common.middleware import recon from unittest import TestCase from contextlib import contextmanager from posix import stat_result, statvfs_result import os + import swift.common.constraints +from swift.common.swob import Request +from swift.common.middleware import recon class FakeApp(object): diff --git a/test/unit/common/middleware/test_staticweb.py b/test/unit/common/middleware/test_staticweb.py index 135e611eb0..9b006bdea7 100644 --- a/test/unit/common/middleware/test_staticweb.py +++ b/test/unit/common/middleware/test_staticweb.py @@ -20,8 +20,7 @@ except ImportError: import unittest from contextlib import contextmanager -from webob import Request, Response - +from swift.common.swob import Request, Response from swift.common.middleware import staticweb from test.unit import FakeLogger diff --git a/test/unit/common/middleware/test_tempauth.py b/test/unit/common/middleware/test_tempauth.py index 5b047f9a29..19979b077f 100644 --- a/test/unit/common/middleware/test_tempauth.py +++ b/test/unit/common/middleware/test_tempauth.py @@ -22,9 +22,8 @@ from contextlib import contextmanager from time import time from base64 import b64encode -from webob import Request, Response - from swift.common.middleware import tempauth as auth +from swift.common.swob import Request, Response class FakeMemcache(object): diff --git a/test/unit/common/middleware/test_tempurl.py b/test/unit/common/middleware/test_tempurl.py index 42b425f8b2..7031152970 100644 --- a/test/unit/common/middleware/test_tempurl.py +++ b/test/unit/common/middleware/test_tempurl.py @@ -19,8 +19,7 @@ from hashlib import sha1 from contextlib import contextmanager from time import time -from webob import Request, Response - +from swift.common.swob import Request, Response from swift.common.middleware import tempauth, tempurl diff --git a/test/unit/common/test_constraints.py b/test/unit/common/test_constraints.py index 000a0b4ee5..4764dff69d 100644 --- a/test/unit/common/test_constraints.py +++ b/test/unit/common/test_constraints.py @@ -16,10 +16,10 @@ import unittest from test.unit import MockTrue -from webob import Request -from webob.exc import HTTPBadRequest, HTTPLengthRequired, \ - HTTPRequestEntityTooLarge - +from swift.common.swob import HTTPBadRequest, HTTPLengthRequired, \ + HTTPRequestEntityTooLarge, Request +from swift.common.http import HTTP_REQUEST_ENTITY_TOO_LARGE, \ + HTTP_BAD_REQUEST, HTTP_LENGTH_REQUIRED from swift.common import constraints @@ -47,8 +47,8 @@ class TestConstraints(unittest.TestCase): headers=headers), 'object'), None) name = 'a' * (constraints.MAX_META_NAME_LENGTH + 1) headers = {'X-Object-Meta-%s' % name: 'v'} - self.assert_(isinstance(constraints.check_metadata(Request.blank('/', - headers=headers), 'object'), HTTPBadRequest)) + self.assertEquals(constraints.check_metadata(Request.blank('/', + headers=headers), 'object').status_int, HTTP_BAD_REQUEST) def test_check_metadata_value_length(self): value = 'a' * constraints.MAX_META_VALUE_LENGTH @@ -57,8 +57,8 @@ class TestConstraints(unittest.TestCase): headers=headers), 'object'), None) value = 'a' * (constraints.MAX_META_VALUE_LENGTH + 1) headers = {'X-Object-Meta-Name': value} - self.assert_(isinstance(constraints.check_metadata(Request.blank('/', - headers=headers), 'object'), HTTPBadRequest)) + self.assertEquals(constraints.check_metadata(Request.blank('/', + headers=headers), 'object').status_int, HTTP_BAD_REQUEST) def test_check_metadata_count(self): headers = {} @@ -67,8 +67,8 @@ class TestConstraints(unittest.TestCase): self.assertEquals(constraints.check_metadata(Request.blank('/', headers=headers), 'object'), None) headers['X-Object-Meta-Too-Many'] = 'v' - self.assert_(isinstance(constraints.check_metadata(Request.blank('/', - headers=headers), 'object'), HTTPBadRequest)) + self.assertEquals(constraints.check_metadata(Request.blank('/', + headers=headers), 'object').status_int, HTTP_BAD_REQUEST) def test_check_metadata_size(self): headers = {} @@ -92,8 +92,8 @@ class TestConstraints(unittest.TestCase): headers['X-Object-Meta-%04d%s' % (x + 1, 'a' * (constraints.MAX_META_NAME_LENGTH - 4))] = \ 'v' * constraints.MAX_META_VALUE_LENGTH - self.assert_(isinstance(constraints.check_metadata(Request.blank('/', - headers=headers), 'object'), HTTPBadRequest)) + self.assertEquals(constraints.check_metadata(Request.blank('/', + headers=headers), 'object').status_int, HTTP_BAD_REQUEST) def test_check_object_creation_content_length(self): headers = {'Content-Length': str(constraints.MAX_FILE_SIZE), @@ -102,17 +102,17 @@ class TestConstraints(unittest.TestCase): headers=headers), 'object_name'), None) headers = {'Content-Length': str(constraints.MAX_FILE_SIZE + 1), 'Content-Type': 'text/plain'} - self.assert_(isinstance(constraints.check_object_creation( - Request.blank('/', headers=headers), 'object_name'), - HTTPRequestEntityTooLarge)) + self.assertEquals(constraints.check_object_creation( + Request.blank('/', headers=headers), 'object_name').status_int, + HTTP_REQUEST_ENTITY_TOO_LARGE) headers = {'Transfer-Encoding': 'chunked', 'Content-Type': 'text/plain'} self.assertEquals(constraints.check_object_creation(Request.blank('/', headers=headers), 'object_name'), None) headers = {'Content-Type': 'text/plain'} - self.assert_(isinstance(constraints.check_object_creation( - Request.blank('/', headers=headers), 'object_name'), - HTTPLengthRequired)) + self.assertEquals(constraints.check_object_creation( + Request.blank('/', headers=headers), 'object_name').status_int, + HTTP_LENGTH_REQUIRED) def test_check_object_creation_name_length(self): headers = {'Transfer-Encoding': 'chunked', @@ -121,9 +121,9 @@ class TestConstraints(unittest.TestCase): self.assertEquals(constraints.check_object_creation(Request.blank('/', headers=headers), name), None) name = 'o' * (constraints.MAX_OBJECT_NAME_LENGTH + 1) - self.assert_(isinstance(constraints.check_object_creation( - Request.blank('/', headers=headers), name), - HTTPBadRequest)) + self.assertEquals(constraints.check_object_creation( + Request.blank('/', headers=headers), name).status_int, + HTTP_BAD_REQUEST) def test_check_object_creation_content_type(self): headers = {'Transfer-Encoding': 'chunked', @@ -131,16 +131,16 @@ class TestConstraints(unittest.TestCase): self.assertEquals(constraints.check_object_creation(Request.blank('/', headers=headers), 'object_name'), None) headers = {'Transfer-Encoding': 'chunked'} - self.assert_(isinstance(constraints.check_object_creation( - Request.blank('/', headers=headers), 'object_name'), - HTTPBadRequest)) + self.assertEquals(constraints.check_object_creation( + Request.blank('/', headers=headers), 'object_name').status_int, + HTTP_BAD_REQUEST) def test_check_object_creation_bad_content_type(self): headers = {'Transfer-Encoding': 'chunked', 'Content-Type': '\xff\xff'} resp = constraints.check_object_creation( Request.blank('/', headers=headers), 'object_name') - self.assert_(isinstance(resp, HTTPBadRequest)) + self.assertEquals(resp.status_int, HTTP_BAD_REQUEST) self.assert_('Content-Type' in resp.body) def test_check_object_manifest_header(self): @@ -151,23 +151,23 @@ class TestConstraints(unittest.TestCase): resp = constraints.check_object_creation(Request.blank('/', headers={'X-Object-Manifest': 'container', 'Content-Length': '0', 'Content-Type': 'text/plain'}), 'manifest') - self.assert_(isinstance(resp, HTTPBadRequest)) + self.assertEquals(resp.status_int, HTTP_BAD_REQUEST) resp = constraints.check_object_creation(Request.blank('/', headers={'X-Object-Manifest': '/container/prefix', 'Content-Length': '0', 'Content-Type': 'text/plain'}), 'manifest') - self.assert_(isinstance(resp, HTTPBadRequest)) + self.assertEquals(resp.status_int, HTTP_BAD_REQUEST) resp = constraints.check_object_creation(Request.blank('/', headers={'X-Object-Manifest': 'container/prefix?query=param', 'Content-Length': '0', 'Content-Type': 'text/plain'}), 'manifest') - self.assert_(isinstance(resp, HTTPBadRequest)) + self.assertEquals(resp.status_int, HTTP_BAD_REQUEST) resp = constraints.check_object_creation(Request.blank('/', headers={'X-Object-Manifest': 'container/prefix&query=param', 'Content-Length': '0', 'Content-Type': 'text/plain'}), 'manifest') - self.assert_(isinstance(resp, HTTPBadRequest)) + self.assertEquals(resp.status_int, HTTP_BAD_REQUEST) resp = constraints.check_object_creation(Request.blank('/', headers={'X-Object-Manifest': 'http://host/container/prefix', 'Content-Length': '0', 'Content-Type': 'text/plain'}), 'manifest') - self.assert_(isinstance(resp, HTTPBadRequest)) + self.assertEquals(resp.status_int, HTTP_BAD_REQUEST) def test_check_mount(self): self.assertFalse(constraints.check_mount('', '')) diff --git a/test/unit/common/test_swob.py b/test/unit/common/test_swob.py new file mode 100644 index 0000000000..b3d2329bad --- /dev/null +++ b/test/unit/common/test_swob.py @@ -0,0 +1,398 @@ +# Copyright (c) 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. + +"Tests for swift.common.swob" + +import unittest +import datetime + +import swift.common.swob + + +class TestHeaderEnvironProxy(unittest.TestCase): + def test_proxy(self): + environ = {} + proxy = swift.common.swob.HeaderEnvironProxy(environ) + proxy['Content-Length'] = 20 + proxy['Content-Type'] = 'text/plain' + proxy['Something-Else'] = 'somevalue' + self.assertEquals( + proxy.environ, {'CONTENT_LENGTH': '20', + 'CONTENT_TYPE': 'text/plain', + 'HTTP_SOMETHING_ELSE': 'somevalue'}) + self.assertEquals(proxy['content-length'], '20') + self.assertEquals(proxy['content-type'], 'text/plain') + self.assertEquals(proxy['something-else'], 'somevalue') + + def test_del(self): + environ = {} + proxy = swift.common.swob.HeaderEnvironProxy(environ) + proxy['Content-Length'] = 20 + proxy['Content-Type'] = 'text/plain' + proxy['Something-Else'] = 'somevalue' + del proxy['Content-Length'] + del proxy['Content-Type'] + del proxy['Something-Else'] + self.assertEquals(proxy.environ, {}) + + def test_contains(self): + environ = {} + proxy = swift.common.swob.HeaderEnvironProxy(environ) + proxy['Content-Length'] = 20 + proxy['Content-Type'] = 'text/plain' + proxy['Something-Else'] = 'somevalue' + self.assert_('content-length' in proxy) + self.assert_('content-type' in proxy) + self.assert_('something-else' in proxy) + + def test_keys(self): + environ = {} + proxy = swift.common.swob.HeaderEnvironProxy(environ) + proxy['Content-Length'] = 20 + proxy['Content-Type'] = 'text/plain' + proxy['Something-Else'] = 'somevalue' + self.assertEquals( + set(proxy.keys()), + set(('Content-Length', 'Content-Type', 'Something-Else'))) + + +class TestHeaderKeyDict(unittest.TestCase): + def test_case_insensitive(self): + headers = swift.common.swob.HeaderKeyDict() + headers['Content-Length'] = 0 + headers['CONTENT-LENGTH'] = 10 + headers['content-length'] = 20 + self.assertEquals(headers['Content-Length'], '20') + self.assertEquals(headers['content-length'], '20') + self.assertEquals(headers['CONTENT-LENGTH'], '20') + + def test_del_contains(self): + headers = swift.common.swob.HeaderKeyDict() + headers['Content-Length'] = 0 + self.assert_('Content-Length' in headers) + del headers['Content-Length'] + self.assert_('Content-Length' not in headers) + + def test_update(self): + headers = swift.common.swob.HeaderKeyDict() + headers.update({'Content-Length': '0'}) + headers.update([('Content-Type', 'text/plain')]) + self.assertEquals(headers['Content-Length'], '0') + self.assertEquals(headers['Content-Type'], 'text/plain') + + def test_get(self): + headers = swift.common.swob.HeaderKeyDict() + headers['content-length'] = 20 + self.assertEquals(headers.get('CONTENT-LENGTH'), '20') + self.assertEquals(headers.get('something-else'), None) + self.assertEquals(headers.get('something-else', True), True) + + +class TestRange(unittest.TestCase): + def test_range(self): + range = swift.common.swob.Range('bytes=1-7') + self.assertEquals(range.ranges[0], (1, 7)) + + def test_upsidedown_range(self): + range = swift.common.swob.Range('bytes=5-10') + self.assertEquals(range.range_for_length(2), None) + + def test_str(self): + for range_str in ('bytes=1-7', 'bytes=1-', 'bytes=-1', + 'bytes=1-7,9-12', 'bytes=-7,9-'): + range = swift.common.swob.Range(range_str) + self.assertEquals(str(range), range_str) + + def test_range_for_length(self): + range = swift.common.swob.Range('bytes=1-7') + self.assertEquals(range.range_for_length(10), (1, 8)) + self.assertEquals(range.range_for_length(5), (1, 5)) + self.assertEquals(range.range_for_length(None), None) + + def test_range_for_length_no_end(self): + range = swift.common.swob.Range('bytes=1-') + self.assertEquals(range.range_for_length(10), (1, 10)) + self.assertEquals(range.range_for_length(5), (1, 5)) + self.assertEquals(range.range_for_length(None), None) + + def test_range_for_length_no_start(self): + range = swift.common.swob.Range('bytes=-7') + self.assertEquals(range.range_for_length(10), (3, 10)) + self.assertEquals(range.range_for_length(5), None) + self.assertEquals(range.range_for_length(None), None) + + +class TestMatch(unittest.TestCase): + def test_match(self): + match = swift.common.swob.Match('"a", "b"') + self.assertEquals(match.tags, set(('a', 'b'))) + self.assert_('a' in match) + self.assert_('b' in match) + self.assert_('c' not in match) + + def test_match_star(self): + match = swift.common.swob.Match('"a", "*"') + self.assert_('a' in match) + self.assert_('b' in match) + self.assert_('c' in match) + + def test_match_noquote(self): + match = swift.common.swob.Match('a, b') + self.assertEquals(match.tags, set(('a', 'b'))) + self.assert_('a' in match) + self.assert_('b' in match) + self.assert_('c' not in match) + + +class TestAccept(unittest.TestCase): + def test_accept_json(self): + for accept in ('application/json', 'application/json;q=1.0,*/*;q=0.9', + '*/*;q=0.9,application/json;q=1.0', 'application/*'): + acc = swift.common.swob.Accept(accept) + match = acc.best_match(['text/plain', 'application/json', + 'application/xml', 'text/xml'], + default_match='text/plain') + self.assertEquals(match, 'application/json') + + def test_accept_plain(self): + for accept in ('', 'text/plain', 'application/xml;q=0.8,*/*;q=0.9', + '*/*;q=0.9,application/xml;q=0.8', '*/*', + 'text/plain,application/xml'): + acc = swift.common.swob.Accept(accept) + match = acc.best_match(['text/plain', 'application/json', + 'application/xml', 'text/xml'], + default_match='text/plain') + self.assertEquals(match, 'text/plain') + + def test_accept_xml(self): + for accept in ('application/xml', 'application/xml;q=1.0,*/*;q=0.9', + '*/*;q=0.9,application/xml;q=1.0'): + acc = swift.common.swob.Accept(accept) + match = acc.best_match(['text/plain', 'application/xml', + 'text/xml'], default_match='text/plain') + self.assertEquals(match, 'application/xml') + + +class TestRequest(unittest.TestCase): + def test_blank(self): + req = swift.common.swob.Request.blank( + '/', environ={'REQUEST_METHOD': 'POST'}, + headers={'Content-Type': 'text/plain'}, body='hi') + self.assertEquals(req.path_info, '/') + self.assertEquals(req.body, 'hi') + self.assertEquals(req.headers['Content-Type'], 'text/plain') + self.assertEquals(req.method, 'POST') + + def test_params(self): + req = swift.common.swob.Request.blank('/?a=b&c=d') + self.assertEquals(req.params['a'], 'b') + self.assertEquals(req.params['c'], 'd') + + def test_path(self): + req = swift.common.swob.Request.blank('/hi?a=b&c=d') + self.assertEquals(req.path, '/hi') + req = swift.common.swob.Request.blank( + '/', environ={'SCRIPT_NAME': '/hi', 'PATH_INFO': '/there'}) + self.assertEquals(req.path, '/hi/there') + + def test_path_info_pop(self): + req = swift.common.swob.Request.blank('/hi/there') + self.assertEquals(req.path_info_pop(), 'hi') + self.assertEquals(req.path_info, '/there') + self.assertEquals(req.script_name, '/hi') + + def test_bad_path_info_pop(self): + req = swift.common.swob.Request.blank('blahblah') + self.assertEquals(req.path_info_pop(), None) + + def test_copy_get(self): + req = swift.common.swob.Request.blank('/hi/there', + environ={'REQUEST_METHOD': 'POST'}) + self.assertEquals(req.method, 'POST') + req2 = req.copy_get() + self.assertEquals(req2.method, 'GET') + + def test_get_response(self): + def test_app(environ, start_response): + start_response('200 OK', []) + return ['hi'] + + req = swift.common.swob.Request.blank('/') + resp = req.get_response(test_app) + self.assertEquals(resp.status_int, 200) + self.assertEquals(resp.body, 'hi') + + def test_properties(self): + req = swift.common.swob.Request.blank('/hi/there', body='hi') + + self.assertEquals(req.body, 'hi') + self.assertEquals(req.content_length, 2) + + req.remote_addr = 'something' + self.assertEquals(req.environ['REMOTE_ADDR'], 'something') + req.body = 'whatever' + self.assertEquals(req.content_length, 8) + self.assertEquals(req.body, 'whatever') + self.assertEquals(req.method, 'GET') + + req.range = 'bytes=1-7' + self.assertEquals(req.range.ranges[0], (1, 7)) + + self.assert_('Range' in req.headers) + req.range = None + self.assert_('Range' not in req.headers) + + def test_datetime_properties(self): + req = swift.common.swob.Request.blank('/hi/there', body='hi') + + req.if_unmodified_since = 0 + self.assert_(isinstance(req.if_unmodified_since, datetime.datetime)) + if_unmodified_since = req.if_unmodified_since + req.if_unmodified_since = if_unmodified_since + self.assertEquals(if_unmodified_since, req.if_unmodified_since) + + req.if_unmodified_since = 'something' + self.assertEquals(req.headers['If-Unmodified-Since'], 'something') + self.assertEquals(req.if_unmodified_since, None) + + req.if_unmodified_since = -1 + self.assertRaises(ValueError, lambda: req.if_unmodified_since) + + self.assert_('If-Unmodified-Since' in req.headers) + req.if_unmodified_since = None + self.assert_('If-Unmodified-Since' not in req.headers) + + def test_bad_range(self): + req = swift.common.swob.Request.blank('/hi/there', body='hi') + req.range = 'bad range' + self.assertEquals(req.range, None) + + +class TestStatusMap(unittest.TestCase): + def test_status_map(self): + response_args = [] + + def start_response(status, headers): + response_args.append(status) + response_args.append(headers) + resp_cls = swift.common.swob.status_map[404] + resp = resp_cls() + self.assertEquals(resp.status_int, 404) + self.assertEquals(resp.title, 'Not Found') + body = ''.join(resp({}, start_response)) + self.assert_('The resource could not be found.' in body) + self.assertEquals(response_args[0], '404 Not Found') + headers = dict(response_args[1]) + self.assertEquals(headers['content-type'], 'text/html') + self.assert_(int(headers['content-length']) > 0) + + +class TestResponse(unittest.TestCase): + def _get_response(self): + def test_app(environ, start_response): + start_response('200 OK', []) + return ['hi'] + + req = swift.common.swob.Request.blank('/') + return req.get_response(test_app) + + def test_properties(self): + resp = self._get_response() + + resp.location = 'something' + self.assertEquals(resp.location, 'something') + self.assert_('Location' in resp.headers) + resp.location = None + self.assert_('Location' not in resp.headers) + + resp.content_type = 'text/plain' + self.assert_('Content-Type' in resp.headers) + resp.content_type = None + self.assert_('Content-Type' not in resp.headers) + + def test_unicode_body(self): + resp = self._get_response() + resp.body = u'\N{SNOWMAN}' + self.assertEquals(resp.body, u'\N{SNOWMAN}'.encode('utf-8')) + + def test_location_rewrite(self): + def start_response(env, headers): + pass + req = swift.common.swob.Request.blank('/') + resp = self._get_response() + resp.location = '/something' + body = ''.join(resp(req.environ, start_response)) + self.assertEquals(resp.location, 'http://localhost/something') + + def test_app_iter(self): + def start_response(env, headers): + pass + resp = self._get_response() + resp.app_iter = ['a', 'b', 'c'] + body = ''.join(resp({}, start_response)) + self.assertEquals(body, 'abc') + + def test_range_body(self): + + def test_app(environ, start_response): + start_response('200 OK', [('Content-Length', '10')]) + return ['1234567890'] + + def start_response(env, headers): + pass + + req = swift.common.swob.Request.blank( + '/', headers={'Range': 'bytes=1-3'}) + resp = req.get_response(test_app) + resp.conditional_response = True + body = ''.join(resp([], start_response)) + self.assertEquals(body, '234') + + resp = swift.common.swob.Response( + body='1234567890', request=req, + conditional_response=True) + body = ''.join(resp([], start_response)) + self.assertEquals(body, '234') + + def test_content_type(self): + resp = self._get_response() + resp.content_type = 'text/plain; charset=utf8' + self.assertEquals(resp.content_type, 'text/plain') + + def test_charset(self): + resp = self._get_response() + resp.content_type = 'text/plain; charset=utf8' + self.assertEquals(resp.charset, 'utf8') + resp.charset = 'utf16' + self.assertEquals(resp.charset, 'utf16') + + def test_etag(self): + resp = self._get_response() + resp.etag = 'hi' + self.assertEquals(resp.headers['Etag'], '"hi"') + self.assertEquals(resp.etag, 'hi') + + self.assert_('etag' in resp.headers) + resp.etag = None + self.assert_('etag' not in resp.headers) + + +class TestUTC(unittest.TestCase): + def test_tzname(self): + self.assertEquals(swift.common.swob.UTC.tzname(None), 'UTC') + + +if __name__ == '__main__': + unittest.main() diff --git a/test/unit/common/test_wsgi.py b/test/unit/common/test_wsgi.py index 670cff7c93..73df5c3e1c 100644 --- a/test/unit/common/test_wsgi.py +++ b/test/unit/common/test_wsgi.py @@ -29,8 +29,8 @@ from collections import defaultdict from urllib import quote from eventlet import sleep -from webob import Request +from swift.common.swob import Request from swift.common import wsgi class TestWSGI(unittest.TestCase): diff --git a/test/unit/container/test_server.py b/test/unit/container/test_server.py index 61a71a8441..912c51bd75 100644 --- a/test/unit/container/test_server.py +++ b/test/unit/container/test_server.py @@ -23,8 +23,8 @@ from tempfile import mkdtemp from eventlet import spawn, Timeout, listen import simplejson -from webob import Request +from swift.common.swob import Request from swift.container import server as container_server from swift.common.utils import normalize_timestamp, mkdirs diff --git a/test/unit/obj/test_internal_client.py b/test/unit/obj/test_internal_client.py index cfbfde3255..3af6f8a75e 100644 --- a/test/unit/obj/test_internal_client.py +++ b/test/unit/obj/test_internal_client.py @@ -166,7 +166,7 @@ class TestInternalClient(unittest.TestCase): def fake_app(self, env, start_response): self.test.assertEquals(self.user_agent, env['HTTP_USER_AGENT']) - start_response('200 Ok', [{'Content-Length': '0'}]) + start_response('200 Ok', [('Content-Length', '0')]) return [] client = InternalClient(self) diff --git a/test/unit/obj/test_server.py b/test/unit/obj/test_server.py index f78baa1061..943fd29382 100644 --- a/test/unit/obj/test_server.py +++ b/test/unit/obj/test_server.py @@ -25,18 +25,18 @@ from tempfile import mkdtemp from hashlib import md5 from eventlet import sleep, spawn, wsgi, listen, Timeout -from webob import Request from test.unit import FakeLogger from test.unit import _getxattr as getxattr from test.unit import _setxattr as setxattr from test.unit import connect_tcp, readuntil2crlfs -from swift.obj import server as object_server +from swift.obj import server as object_server, replicator from swift.common import utils from swift.common.utils import hash_path, mkdirs, normalize_timestamp, \ NullLogger, storage_directory from swift.common.exceptions import DiskFileNotExist from swift.common import constraints from eventlet import tpool +from swift.common.swob import Request class TestDiskFile(unittest.TestCase): @@ -1047,7 +1047,7 @@ class TestObjectController(unittest.TestCase): resp = self.object_controller.GET(req) self.assertEquals(resp.status_int, 200) - since = strftime('%a, %d %b %Y %H:%M:%S GMT', gmtime(float(timestamp))) + since = strftime('%a, %d %b %Y %H:%M:%S GMT', gmtime(float(timestamp) + 1)) req = Request.blank('/sda1/p/a/c/o', environ={'REQUEST_METHOD': 'GET'}, headers={'If-Modified-Since': since}) resp = self.object_controller.GET(req) @@ -1521,6 +1521,24 @@ class TestObjectController(unittest.TestCase): self.assertEquals(resp.status_int, 200) self.assertEquals(resp.headers.get('x-object-manifest'), 'c/o/') + def test_manifest_head_request(self): + timestamp = normalize_timestamp(time()) + req = Request.blank('/sda1/p/a/c/o', environ={'REQUEST_METHOD': 'PUT'}, + headers={'X-Timestamp': timestamp, + 'Content-Type': 'text/plain', + 'Content-Length': '0', + 'X-Object-Manifest': 'c/o/'}) + req.body = 'hi' + resp = self.object_controller.PUT(req) + objfile = os.path.join(self.testdir, 'sda1', + storage_directory(object_server.DATADIR, 'p', hash_path('a', 'c', + 'o')), timestamp + '.data') + self.assert_(os.path.isfile(objfile)) + req = Request.blank('/sda1/p/a/c/o', + environ={'REQUEST_METHOD': 'HEAD'}) + resp = self.object_controller.GET(req) + self.assertEquals(resp.body, '') + def test_async_update_http_connect(self): given_args = [] diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py index e7e82e9e8e..2cd1763a3a 100644 --- a/test/unit/proxy/test_server.py +++ b/test/unit/proxy/test_server.py @@ -35,8 +35,6 @@ from tempfile import mkdtemp import eventlet from eventlet import sleep, spawn, Timeout, util, wsgi, listen import simplejson -from webob import Request, Response -from webob.exc import HTTPNotFound, HTTPUnauthorized from test.unit import connect_tcp, readuntil2crlfs, FakeLogger from swift.proxy import server as proxy_server @@ -54,6 +52,8 @@ from swift.proxy.controllers.obj import SegmentedIterable from swift.proxy.controllers.base import get_container_memcache_key, \ get_account_memcache_key import swift.proxy.controllers +from swift.common.swob import Request, Response, HTTPNotFound, \ + HTTPUnauthorized # mocks logging.getLogger().addHandler(logging.StreamHandler(sys.stdout)) @@ -2742,6 +2742,7 @@ class TestObjectController(unittest.TestCase): # Do it again but exceeding the container listing limit swift.proxy.controllers.obj.CONTAINER_LISTING_LIMIT = 2 sock = connect_tcp(('localhost', prolis.getsockname()[1])) + fd = sock.makefile() fd.write('GET /v1/a/segmented%20object/object%20name HTTP/1.1\r\n' 'Host: localhost\r\n' diff --git a/tools/pip-requires b/tools/pip-requires index 28bc426d4b..dff4bb769c 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -1,4 +1,3 @@ -WebOb>=1.0.8,<1.3 configobj==4.7.1 eventlet==0.9.15 greenlet==0.3.1