catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed error in python 2 and did some refactoring.

Browse source
This commit is contained in:
acsbendi 2019-07-26 21:05:04 +02:00
commit f3f47d44ac
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
moto/core/authentication.py → moto/core/access_control.py
View file

@ -127,7 +127,7 @@ class AssumedRoleAccessKey(object):
class CreateAccessKeyFailure(Exception):
def __init__(self, reason, *args):
super().__init__(*args)
super(CreateAccessKeyFailure, self).__init__(*args)
self.reason = reason

14
moto/core/responses.py
View file

@ -10,7 +10,7 @@ import io
import pytz
from moto.core.authentication import IAMRequest, S3IAMRequest
from moto.core.access_control import IAMRequest, S3IAMRequest
from moto.core.exceptions import DryRunClientError
from jinja2 import Environment, DictLoader, TemplateNotFound
@ -110,7 +110,7 @@ class ActionAuthenticatorMixin(object):
request_count = 0
def _authenticate_action(self, iam_request_cls):
def _authenticate_and_authorize_action(self, iam_request_cls):
if ActionAuthenticatorMixin.request_count >= settings.INITIAL_NO_AUTH_ACTION_COUNT:
iam_request = iam_request_cls(method=self.method, path=self.path, data=self.data, headers=self.headers)
iam_request.check_signature()
@ -118,11 +118,11 @@ class ActionAuthenticatorMixin(object):
else:
ActionAuthenticatorMixin.request_count += 1
def _authenticate_normal_action(self):
self._authenticate_action(IAMRequest)
def _authenticate_and_authorize_normal_action(self):
self._authenticate_and_authorize_action(IAMRequest)
def _authenticate_s3_action(self):
self._authenticate_action(S3IAMRequest)
def _authenticate_and_authorize_s3_action(self):
self._authenticate_and_authorize_action(S3IAMRequest)
@staticmethod
def set_initial_no_auth_action_count(initial_no_auth_action_count):
@ -319,7 +319,7 @@ class BaseResponse(_TemplateEnvironmentMixin, ActionAuthenticatorMixin):
headers = self.response_headers
try:
self._authenticate_normal_action()
self._authenticate_and_authorize_normal_action()
except HTTPException as http_error:
response = http_error.description, dict(status=http_error.code)
return self._send_response(headers, response)