From a70c526996f6cfe805a19ac83d5017c584f7eafa Mon Sep 17 00:00:00 2001 From: Antony Chazapis Date: Mon, 24 Oct 2011 13:21:25 +0300 Subject: [PATCH 1/1] Fix top level authentication. --- pithos/api/functions.py | 4 ++-- pithos/middleware/log.py | 4 ++-- tools/lib/util.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pithos/api/functions.py b/pithos/api/functions.py index 7c7005e..ccc2f6c 100644 --- a/pithos/api/functions.py +++ b/pithos/api/functions.py @@ -59,7 +59,7 @@ logger = logging.getLogger(__name__) def top_demux(request): if request.method == 'GET': - if request.user: + if getattr(request, 'user', None) is not None: return account_list(request) return authenticate(request) else: @@ -109,7 +109,7 @@ def object_demux(request, v_account, v_container, v_object): else: return method_not_allowed(request) -@api_method('GET') +@api_method('GET', user_required=False) def authenticate(request): # Normal Response Codes: 204 # Error Response Codes: serviceUnavailable (503), diff --git a/pithos/middleware/log.py b/pithos/middleware/log.py index f66a2f4..88436c5 100644 --- a/pithos/middleware/log.py +++ b/pithos/middleware/log.py @@ -41,7 +41,7 @@ class LoggingConfigMiddleware: def __init__(self): '''Initialise the logging setup from settings, called on first request.''' if getattr(settings, 'DEBUG', False): - logging.basicConfig(level = logging.DEBUG, format = '%(asctime)s [%(levelname)s] %(name)s %(message)s', datefmt = '%Y-%m-%d %H:%M:%S') + logging.basicConfig(level = logging.DEBUG, filename='/tmp/pithos.log', format = '%(asctime)s [%(levelname)s] %(name)s %(message)s', datefmt = '%Y-%m-%d %H:%M:%S') else: - logging.basicConfig(level = logging.INFO, format = '%(asctime)s [%(levelname)s] %(name)s %(message)s', datefmt = '%Y-%m-%d %H:%M:%S') + logging.basicConfig(level = logging.INFO, filename='/tmp/pithos.log', format = '%(asctime)s [%(levelname)s] %(name)s %(message)s', datefmt = '%Y-%m-%d %H:%M:%S') raise MiddlewareNotUsed('Logging setup only.') diff --git a/tools/lib/util.py b/tools/lib/util.py index 0b3a485..5e78e60 100644 --- a/tools/lib/util.py +++ b/tools/lib/util.py @@ -1,7 +1,7 @@ import os -#DEFAULT_HOST = 'pithos.dev.grnet.gr' -DEFAULT_HOST = '127.0.0.1:8000' +DEFAULT_HOST = 'pithos.dev.grnet.gr' +#DEFAULT_HOST = '127.0.0.1:8000' DEFAULT_API = 'v1' DEFAULT_USER = 'test' DEFAULT_AUTH = '0000' @@ -28,4 +28,4 @@ def get_api(): try: return os.environ['PITHOS_API'] except KeyError: - return DEFAULT_API \ No newline at end of file + return DEFAULT_API -- 1.7.10.4