Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed S3 actions not handled properly.

Browse Source
This commit is contained in:
acsbendi 2019-07-10 20:42:23 +02:00
parent 947e26ce1b
commit bec0c5a273
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moto/core/authentication.py
View File

@ -1,5 +1,6 @@
import json import json
import re import re
import sys
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from enum import Enum from enum import Enum
@ -121,7 +122,7 @@ class CreateAccessKeyFailure(Exception):
class IAMRequestBase(ABC): class IAMRequestBase(ABC):
def __init__(self, method, path, data, headers): def __init__(self, method, path, data, headers):
print(f"Creating {self.__class__.__name__} with method={method}, path={path}, data={data}, headers={headers}") print(f"Creating {self.__class__.__name__} with method={method}, path={path}, data={data}, headers={headers}", file=sys.stderr)
self._method = method self._method = method
self._path = path self._path = path
self._data = data self._data = data
@ -130,7 +131,7 @@ class IAMRequestBase(ABC):
credential_data = credential_scope.split('/') credential_data = credential_scope.split('/')
self._region = credential_data[2] self._region = credential_data[2]
self._service = credential_data[3] self._service = credential_data[3]
self._action = self._service + ":" + self._data["Action"][0] self._action = self._service + ":" + (self._data["Action"][0] if isinstance(self._data["Action"], list) else self._data["Action"])
try: try:
self._access_key = create_access_key(access_key_id=credential_data[0], headers=headers) self._access_key = create_access_key(access_key_id=credential_data[0], headers=headers)
except CreateAccessKeyFailure as e: except CreateAccessKeyFailure as e:
@ -143,9 +144,6 @@ class IAMRequestBase(ABC):
raise SignatureDoesNotMatchError() raise SignatureDoesNotMatchError()
def check_action_permitted(self): def check_action_permitted(self):
self._check_action_permitted_for_iam_user()
def _check_action_permitted_for_iam_user(self):
policies = self._access_key.collect_policies() policies = self._access_key.collect_policies()
permitted = False permitted = False