Merge "Fix small inline docs for request validation"

This commit is contained in:
Jenkins 2016-07-07 22:42:10 +00:00 committed by Gerrit Code Review
commit 349000e299

View File

@ -134,7 +134,10 @@ class SigV4Mixin(object):
def _validate_expire_param(self): def _validate_expire_param(self):
""" """
:param now: a S3Timestamp instance Validate X-Amz-Expires in query parameter
:raises: AccessDenied
:raises: AuthorizationQueryParametersError
:raises: AccessDenined
""" """
err = None err = None
try: try:
@ -505,7 +508,8 @@ class Request(swob.Request):
def _validate_expire_param(self): def _validate_expire_param(self):
""" """
Validate Expire param Validate Expires in query parameters
:raises: AccessDenied
""" """
# Expires header is a float since epoch # Expires header is a float since epoch
try: try:
@ -522,6 +526,11 @@ class Request(swob.Request):
self.params['Expires']) self.params['Expires'])
def _validate_dates(self): def _validate_dates(self):
"""
Validate Date/X-Amz-Date headers for signature v2
:raises: AccessDenied
:raises: RequestTimeTooSkewed
"""
if self._is_query_auth: if self._is_query_auth:
self._validate_expire_param() self._validate_expire_param()
# TODO: make sure the case if timestamp param in query # TODO: make sure the case if timestamp param in query