Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable AWS cred file to be read as long as .s3cfg auth fields are nonexistent #995

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable AWS cred file to be read as long as .s3cfg auth fields are nonexistent #995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions S3/Config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import http.client as httplib
import locale

try:
try:
from configparser import NoOptionError, NoSectionError, MissingSectionHeaderError, ConfigParser as PyConfigParser
except ImportError:
# Python2 fallback code
Expand Down Expand Up @@ -217,8 +217,7 @@ def __init__(self, configfile = None, access_key=None, secret_key=None, access_t
try:
self.read_config_file(configfile)
except IOError:
if 'AWS_CREDENTIAL_FILE' in os.environ or 'AWS_PROFILE' in os.environ:
self.aws_credential_file()
pass

# override these if passed on the command-line
if access_key and secret_key:
Expand All @@ -229,7 +228,10 @@ def __init__(self, configfile = None, access_key=None, secret_key=None, access_t
# Do not refresh the IAM role when an access token is provided.
self._access_token_refresh = False

if len(self.access_key)==0:
# The next few clauses are in descending order of priority.
# That is, we will prefer key envvars, then AWS cred file, then IAM auth.

if not self.is_option_nonempty('access_key'):
env_access_key = os.getenv('AWS_ACCESS_KEY') or os.getenv('AWS_ACCESS_KEY_ID')
env_secret_key = os.getenv('AWS_SECRET_KEY') or os.getenv('AWS_SECRET_ACCESS_KEY')
env_access_token = os.getenv('AWS_SESSION_TOKEN') or os.getenv('AWS_SECURITY_TOKEN')
Expand All @@ -241,15 +243,25 @@ def __init__(self, configfile = None, access_key=None, secret_key=None, access_t
# Do not refresh the IAM role when an access token is provided.
self._access_token_refresh = False
self.access_token = config_unicodise(env_access_token)
else:
self.role_config()

if not self.is_option_nonempty('access_key'):
self.aws_credential_file()

if not self.is_option_nonempty('access_key'):
self.role_config()

if not self.is_option_nonempty('access_key'):
raise Exception('There is no access key available!')

#TODO check KMS key is valid
if self.kms_key and self.server_side_encryption == True:
warning('Cannot have server_side_encryption (S3 SSE) and KMS_key set (S3 KMS). KMS encryption will be used. Please set server_side_encryption to False')
if self.kms_key and self.signature_v2 == True:
raise Exception('KMS encryption requires signature v4. Please set signature_v2 to False')

def is_option_nonempty(self, option_name):
return hasattr(self, option_name) and bool(str(getattr(self, option_name)))

def role_config(self):
"""
Get credentials from IAM authentication
Expand All @@ -273,6 +285,7 @@ def role_config(self):
else:
raise IOError
except:
warning('IAM role config failed')
raise

def role_refresh(self):
Expand All @@ -284,9 +297,11 @@ def role_refresh(self):

def aws_credential_file(self):
try:
aws_credential_file = os.path.expanduser('~/.aws/credentials')
aws_credential_file = os.path.expanduser('~/.aws/credentials')
if 'AWS_CREDENTIAL_FILE' in os.environ and os.path.isfile(os.environ['AWS_CREDENTIAL_FILE']):
aws_credential_file = config_unicodise(os.environ['AWS_CREDENTIAL_FILE'])
elif not os.path.isfile(aws_credential_file):
return

config = PyConfigParser()

Expand Down
5 changes: 3 additions & 2 deletions S3/S3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1662,9 +1662,10 @@ def recv_file(self, request, stream, labels, start_position = 0, retries = _max_
debug("Response:\n" + pprint.pformat(response))
except ParameterError as e:
raise
except OSError as e:
raise
except (IOError, Exception) as e:
if isinstance(e, OSError) and not isinstance(e, ConnectionResetError):
raise

if self.config.progress_meter:
progress.done("failed")
if ((hasattr(e, 'errno') and e.errno and
Expand Down