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

Disable SigV4 signing of non-IAM AWS requests #179

Merged
merged 2 commits into from
Aug 16, 2021
Merged

Disable SigV4 signing of non-IAM AWS requests #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf77e65
Disable SigV4 signing of non-IAM AWS requests
michaelnchin Aug 13, 2021
c668ea4
update changelog
michaelnchin Aug 13, 2021
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
2 changes: 2 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Starting with v1.31.6, this file will contain a record of major features and upd

## Upcoming

- Disabled SigV4 signing for non-IAM AWS requests ([Link to PR](https://github.com/aws/graph-notebook/pull/179))

## Release 3.0.3 (August 11, 2021)

- Gremlin visualization bugfixes ([PR #1](https://github.com/aws/graph-notebook/pull/166)) ([PR #2](https://github.com/aws/graph-notebook/pull/174)) ([PR #3](https://github.com/aws/graph-notebook/pull/175))
Expand Down
17 changes: 10 additions & 7 deletions src/graph_notebook/neptune/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import requests
from SPARQLWrapper import SPARQLWrapper
from boto3 import Session
from botocore.session import Session as botocoreSession
from botocore.auth import SigV4Auth
from botocore.awsrequest import AWSRequest
from gremlin_python.driver import client
Expand Down Expand Up @@ -569,13 +570,15 @@ def _prepare_request(self, method, url, *, data=None, params=None, headers=None,
return request.prepare()

def _get_aws_request(self, method, url, *, data=None, params=None, headers=None, service=NEPTUNE_SERVICE_NAME):
credentials = self._session.get_credentials()
frozen_creds = credentials.get_frozen_credentials()

req = AWSRequest(method=method, url=url, data=data, params=params, headers=headers)
SigV4Auth(frozen_creds, service, self.region).add_auth(req)
prepared_iam_req = req.prepare()
return prepared_iam_req
if self.iam_enabled and self._auth is not None:
credentials = self._session.get_credentials()
frozen_creds = credentials.get_frozen_credentials()
SigV4Auth(frozen_creds, service, self.region).add_auth(req)
prepared_iam_req = req.prepare()
return prepared_iam_req
else:
return req

def _ensure_http_session(self):
if not self._http_session:
Expand All @@ -591,7 +594,7 @@ def close(self):

@property
def iam_enabled(self):
return type(self._session) is Session
return type(self._session) in [Session, botocoreSession]


class ClientBuilder(object):
Expand Down