Skip to content

Commit

Permalink
feat: all asynchronous credential types required for all authenticati…
Browse files Browse the repository at this point in the history
…on types (service accounts, default... etc) (#573)

* feat: asyncio http request logic and asynchronous credentials log c

* feat: all asynchronous credentials types implemented and with tests

* feat: added the private scope for Response class

* feat: added docstring for Auth Session request method

* fix: Changed initialization of client session to within an async context manager

* changed aiohttp_requests abbreviation for the async authorized session class

* fix: changed abbrevation of the aiohttp_requests file

* fix: comments on PR regarding shared data between requests and aiohttp_requests

* fix: fixed noxfile test dependency sharing

* fix: fixed the noxfile dependencies between sync and async unit tests

* fix: cover async dependency

* fix: merge conflict issue with credentials

* fix: merge conflict #2

* fix: changed duplicated constants for sync-->async inheritance relationship

* fix: async docstring

* refactoring

* fix: refactoring

* fix: first round of comments, refactoring and test duplication changes

* fix: removed duplication in _default_async

* fix: removed oauth2 client
  • Loading branch information
anibadde committed Jul 31, 2020
1 parent 8d0bca1 commit b822e48
Show file tree
Hide file tree
Showing 25 changed files with 3,008 additions and 9 deletions.
7 changes: 7 additions & 0 deletions docs/reference/google.auth.credentials_async.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
google.auth.credentials\_async module
=====================================

.. automodule:: google.auth.credentials_async
:members:
:inherited-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/reference/google.auth.jwt_async.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
google.auth.jwt\_async module
=============================

.. automodule:: google.auth.jwt_async
:members:
:inherited-members:
:show-inheritance:
2 changes: 2 additions & 0 deletions docs/reference/google.auth.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ Submodules

google.auth.app_engine
google.auth.credentials
google.auth.credentials_async
google.auth.environment_vars
google.auth.exceptions
google.auth.iam
google.auth.impersonated_credentials
google.auth.jwt
google.auth.jwt_async
7 changes: 7 additions & 0 deletions docs/reference/google.auth.transport.aiohttp_requests.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
google.auth.transport.aiohttp\_requests module
==============================================

.. automodule:: google.auth.transport.aiohttp_requests
:members:
:inherited-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/reference/google.auth.transport.mtls.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
google.auth.transport.mtls module
=================================

.. automodule:: google.auth.transport.mtls
:members:
:inherited-members:
:show-inheritance:
1 change: 1 addition & 0 deletions docs/reference/google.auth.transport.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Submodules
.. toctree::
:maxdepth: 4

google.auth.transport.aiohttp_requests
google.auth.transport.grpc
google.auth.transport.mtls
google.auth.transport.requests
Expand Down
7 changes: 7 additions & 0 deletions docs/reference/google.oauth2.credentials_async.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
google.oauth2.credentials\_async module
=======================================

.. automodule:: google.oauth2.credentials_async
:members:
:inherited-members:
:show-inheritance:
2 changes: 2 additions & 0 deletions docs/reference/google.oauth2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,7 @@ Submodules
:maxdepth: 4

google.oauth2.credentials
google.oauth2.credentials_async
google.oauth2.id_token
google.oauth2.service_account
google.oauth2.service_account_async
7 changes: 7 additions & 0 deletions docs/reference/google.oauth2.service_account_async.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
google.oauth2.service\_account\_async module
============================================

.. automodule:: google.oauth2.service_account_async
:members:
:inherited-members:
:show-inheritance:
3 changes: 2 additions & 1 deletion google/auth/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
import logging

from google.auth._default import default, load_credentials_from_file
from google.auth._default_async import default_async


__all__ = ["default", "load_credentials_from_file"]
__all__ = ["default", "load_credentials_from_file", "default_async"]


# Set default logging handler to avoid "No handler found" warnings.
Expand Down
266 changes: 266 additions & 0 deletions google/auth/_default_async.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,266 @@
# Copyright 2020 Google Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

"""Application default credentials.
Implements application default credentials and project ID detection.
"""

import io
import json
import os

import six

from google.auth import _default
from google.auth import environment_vars
from google.auth import exceptions


def load_credentials_from_file(filename, scopes=None, quota_project_id=None):
"""Loads Google credentials from a file.
The credentials file must be a service account key or stored authorized
user credentials.
Args:
filename (str): The full path to the credentials file.
scopes (Optional[Sequence[str]]): The list of scopes for the credentials. If
specified, the credentials will automatically be scoped if
necessary
quota_project_id (Optional[str]): The project ID used for
quota and billing.
Returns:
Tuple[google.auth.credentials.Credentials, Optional[str]]: Loaded
credentials and the project ID. Authorized user credentials do not
have the project ID information.
Raises:
google.auth.exceptions.DefaultCredentialsError: if the file is in the
wrong format or is missing.
"""
if not os.path.exists(filename):
raise exceptions.DefaultCredentialsError(
"File {} was not found.".format(filename)
)

with io.open(filename, "r") as file_obj:
try:
info = json.load(file_obj)
except ValueError as caught_exc:
new_exc = exceptions.DefaultCredentialsError(
"File {} is not a valid json file.".format(filename), caught_exc
)
six.raise_from(new_exc, caught_exc)

# The type key should indicate that the file is either a service account
# credentials file or an authorized user credentials file.
credential_type = info.get("type")

if credential_type == _default._AUTHORIZED_USER_TYPE:
from google.oauth2 import credentials_async as credentials

try:
credentials = credentials.Credentials.from_authorized_user_info(
info, scopes=scopes
).with_quota_project(quota_project_id)
except ValueError as caught_exc:
msg = "Failed to load authorized user credentials from {}".format(filename)
new_exc = exceptions.DefaultCredentialsError(msg, caught_exc)
six.raise_from(new_exc, caught_exc)
if not credentials.quota_project_id:
_default._warn_about_problematic_credentials(credentials)
return credentials, None

elif credential_type == _default._SERVICE_ACCOUNT_TYPE:
from google.oauth2 import service_account_async as service_account

try:
credentials = service_account.Credentials.from_service_account_info(
info, scopes=scopes
).with_quota_project(quota_project_id)
except ValueError as caught_exc:
msg = "Failed to load service account credentials from {}".format(filename)
new_exc = exceptions.DefaultCredentialsError(msg, caught_exc)
six.raise_from(new_exc, caught_exc)
return credentials, info.get("project_id")

else:
raise exceptions.DefaultCredentialsError(
"The file {file} does not have a valid type. "
"Type is {type}, expected one of {valid_types}.".format(
file=filename, type=credential_type, valid_types=_default._VALID_TYPES
)
)


def _get_gcloud_sdk_credentials():
"""Gets the credentials and project ID from the Cloud SDK."""
from google.auth import _cloud_sdk

# Check if application default credentials exist.
credentials_filename = _cloud_sdk.get_application_default_credentials_path()

if not os.path.isfile(credentials_filename):
return None, None

credentials, project_id = load_credentials_from_file(credentials_filename)

if not project_id:
project_id = _cloud_sdk.get_project_id()

return credentials, project_id


def _get_explicit_environ_credentials():
"""Gets credentials from the GOOGLE_APPLICATION_CREDENTIALS environment
variable."""
explicit_file = os.environ.get(environment_vars.CREDENTIALS)

if explicit_file is not None:
credentials, project_id = load_credentials_from_file(
os.environ[environment_vars.CREDENTIALS]
)

return credentials, project_id

else:
return None, None


def _get_gae_credentials():
"""Gets Google App Engine App Identity credentials and project ID."""
# While this library is normally bundled with app_engine, there are
# some cases where it's not available, so we tolerate ImportError.

return _default._get_gae_credentials()


def _get_gce_credentials(request=None):
"""Gets credentials and project ID from the GCE Metadata Service."""
# Ping requires a transport, but we want application default credentials
# to require no arguments. So, we'll use the _http_client transport which
# uses http.client. This is only acceptable because the metadata server
# doesn't do SSL and never requires proxies.

# While this library is normally bundled with compute_engine, there are
# some cases where it's not available, so we tolerate ImportError.

return _default._get_gce_credentials(request)


def default_async(scopes=None, request=None, quota_project_id=None):
"""Gets the default credentials for the current environment.
`Application Default Credentials`_ provides an easy way to obtain
credentials to call Google APIs for server-to-server or local applications.
This function acquires credentials from the environment in the following
order:
1. If the environment variable ``GOOGLE_APPLICATION_CREDENTIALS`` is set
to the path of a valid service account JSON private key file, then it is
loaded and returned. The project ID returned is the project ID defined
in the service account file if available (some older files do not
contain project ID information).
2. If the `Google Cloud SDK`_ is installed and has application default
credentials set they are loaded and returned.
To enable application default credentials with the Cloud SDK run::
gcloud auth application-default login
If the Cloud SDK has an active project, the project ID is returned. The
active project can be set using::
gcloud config set project
3. If the application is running in the `App Engine standard environment`_
then the credentials and project ID from the `App Identity Service`_
are used.
4. If the application is running in `Compute Engine`_ or the
`App Engine flexible environment`_ then the credentials and project ID
are obtained from the `Metadata Service`_.
5. If no credentials are found,
:class:`~google.auth.exceptions.DefaultCredentialsError` will be raised.
.. _Application Default Credentials: https://developers.google.com\
/identity/protocols/application-default-credentials
.. _Google Cloud SDK: https://cloud.google.com/sdk
.. _App Engine standard environment: https://cloud.google.com/appengine
.. _App Identity Service: https://cloud.google.com/appengine/docs/python\
/appidentity/
.. _Compute Engine: https://cloud.google.com/compute
.. _App Engine flexible environment: https://cloud.google.com\
/appengine/flexible
.. _Metadata Service: https://cloud.google.com/compute/docs\
/storing-retrieving-metadata
Example::
import google.auth
credentials, project_id = google.auth.default()
Args:
scopes (Sequence[str]): The list of scopes for the credentials. If
specified, the credentials will automatically be scoped if
necessary.
request (google.auth.transport.Request): An object used to make
HTTP requests. This is used to detect whether the application
is running on Compute Engine. If not specified, then it will
use the standard library http client to make requests.
quota_project_id (Optional[str]): The project ID used for
quota and billing.
Returns:
Tuple[~google.auth.credentials.Credentials, Optional[str]]:
the current environment's credentials and project ID. Project ID
may be None, which indicates that the Project ID could not be
ascertained from the environment.
Raises:
~google.auth.exceptions.DefaultCredentialsError:
If no credentials were found, or if the credentials found were
invalid.
"""
from google.auth.credentials_async import with_scopes_if_required

explicit_project_id = os.environ.get(
environment_vars.PROJECT, os.environ.get(environment_vars.LEGACY_PROJECT)
)

checkers = (
_get_explicit_environ_credentials,
_get_gcloud_sdk_credentials,
_get_gae_credentials,
lambda: _get_gce_credentials(request),
)

for checker in checkers:
credentials, project_id = checker()
if credentials is not None:
credentials = with_scopes_if_required(
credentials, scopes
).with_quota_project(quota_project_id)
effective_project_id = explicit_project_id or project_id
if not effective_project_id:
_default._LOGGER.warning(
"No project ID could be determined. Consider running "
"`gcloud config set project` or setting the %s "
"environment variable",
environment_vars.PROJECT,
)
return credentials, effective_project_id

raise exceptions.DefaultCredentialsError(_default._HELP_MESSAGE)
6 changes: 5 additions & 1 deletion google/auth/credentials_async.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"""Interfaces for credentials."""

import abc
import inspect

import six

Expand Down Expand Up @@ -62,7 +63,10 @@ async def before_request(self, request, method, url, headers):
# the http request.)

if not self.valid:
self.refresh(request)
if inspect.iscoroutinefunction(self.refresh):
await self.refresh(request)
else:
self.refresh(request)
self.apply(headers)


Expand Down
Loading

0 comments on commit b822e48

Please sign in to comment.