-
Couldn't load subscription status.
- Fork 343
feat(auth): Add TOTP support in Project and Tenant config #682
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.
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
Open
pragatimodi wants to merge 28 commits into master Choose a base branch from mfa-totp
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Open
Changes from 17 commits
Commits
Show all changes
28 commits Select commit Hold shift + click to select a range
44586d7 1. Adding Multi Factor Auth Configuration
pragatimodi b625e13 Updating list[ProviderConfig] to List[ProviderConfig]
pragatimodi c002232 1. Added a project_config_mgt file
pragatimodi 2a73f41 Import changes
pragatimodi b5e31b1 1. Changing auth url from `v2beta1` to `v2`
pragatimodi 7ff0089 Add new line (lint fix)
pragatimodi 81b1fa3 `v2beta1` -> `v2`
pragatimodi 1f5c366 corrections
pragatimodi 7e53e61 chore: Fix pypy tests (#694)
lahirumaramba 6a4f451 chore(auth): Update Auth API to `v2` (#691)
pragatimodi 0684915 Add release notes to project URLs in PyPI (#679)
samueldg 160f983 Merge branch 'master' into mfa-totp
pragatimodi 8b87e10 Addressing feedback
pragatimodi b5b3dce Merge branch 'master' into mfa-totp
pragatimodi 4bc2c83 Apply suggestions from code review
pragatimodi e542f91 Addressing PR feedback
pragatimodi 58fe7ef Merge branch 'mfa-totp' of https://github.com/firebase/firebase-admin…
pragatimodi b709148 Apply suggestions from code review
pragatimodi 083d670 Update firebase_admin/multi_factor_config_mgt.py
pragatimodi ba9d8f4 Merge branch 'master' into mfa-totp
pragatimodi c67e047 fix test error messages
pragatimodi cde81fb Merge branch 'master' into mfa-totp
pragatimodi 3245d6d lint fixes
pragatimodi b7e9eba fix indent
pragatimodi 6725d41 succinct import types
pragatimodi 021156a Merge branch 'master' into mfa-totp
pragatimodi 907bf2d change copyright year
pragatimodi e5c4c74 Merge branch 'master' into mfa-totp
pragatimodi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,224 @@ | ||
| # Copyright 2023 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. | ||
| """Firebase multifactor configuration management module. | ||
| | ||
| This module contains functions for managing multifactor auth configuration at | ||
| the project and tenant level. | ||
| """ | ||
| from enum import Enum | ||
| from typing import List | ||
| | ||
| __all__ = [ | ||
| 'validate_keys', | ||
| 'MultiFactorServerConfig', | ||
| 'TOTPProviderConfig', | ||
| 'ProviderConfig', | ||
| 'MultiFactorConfig', | ||
| ] | ||
| | ||
| | ||
| def validate_keys(keys, valid_keys, config_name): | ||
| for key in keys: | ||
| if key not in valid_keys: | ||
| raise ValueError( | ||
| '"{0}" is not a valid "{1}" parameter.'.format( | ||
| key, config_name)) | ||
| | ||
| | ||
| class MultiFactorServerConfig: | ||
| """Represents multi factor configuration response received from the server and | ||
| converts it to user format. | ||
pragatimodi marked this conversation as resolved. Outdated Show resolved Hide resolved | ||
| """ | ||
| | ||
| def __init__(self, data): | ||
| if not isinstance(data, dict): | ||
| raise ValueError( | ||
| 'Invalid data argument in MultiFactorServerConfig constructor: {0}, must be a valid dict'.format(data)) | ||
| self._data = data | ||
| | ||
| @property | ||
| def provider_configs(self): | ||
| data = self._data.get('providerConfigs', None) | ||
| if data is not None: | ||
| return [self.ProviderServerConfig(d) for d in data] | ||
| return None | ||
| | ||
| class ProviderServerConfig: | ||
| """Represents provider configuration response received from the server and converts | ||
| it to user format. | ||
pragatimodi marked this conversation as resolved. Outdated Show resolved Hide resolved | ||
| """ | ||
| | ||
| def __init__(self, data): | ||
| if not isinstance(data, dict): | ||
| raise ValueError( | ||
| 'Invalid data argument in ProviderServerConfig constructor: {0}'.format(data)) | ||
| self._data = data | ||
| | ||
| @property | ||
| def state(self): | ||
| return self._data.get('state', None) | ||
| | ||
| @property | ||
| def totp_provider_config(self): | ||
| data = self._data.get('totpProviderConfig', None) | ||
| if data is not None: | ||
| return self.TOTPProviderServerConfig(data) | ||
| return None | ||
| | ||
| class TOTPProviderServerConfig: | ||
| """Represents TOTP provider configuration response received from the server and converts | ||
| it to user format. | ||
pragatimodi marked this conversation as resolved. Outdated Show resolved Hide resolved | ||
| """ | ||
| | ||
| def __init__(self, data): | ||
| if not isinstance(data, dict): | ||
| raise ValueError( | ||
| 'Invalid data argument in TOTPProviderServerConfig' | ||
| ' constructor: {0}'.format(data)) | ||
| self._data = data | ||
| | ||
| @property | ||
| def adjacent_intervals(self): | ||
| return self._data.get('adjacentIntervals', None) | ||
| | ||
| | ||
| class TOTPProviderConfig: | ||
pragatimodi marked this conversation as resolved. Show resolved Hide resolved | ||
| """A tenant or project's TOTP provider configuration.""" | ||
| | ||
| def __init__(self, adjacent_intervals: int = None): | ||
| self.adjacent_intervals: int = adjacent_intervals | ||
| | ||
| def to_dict(self) -> dict: | ||
| data = {} | ||
| if self.adjacent_intervals is not None: | ||
| data['adjacentIntervals'] = self.adjacent_intervals | ||
| return data | ||
| | ||
| def validate(self): | ||
| """Validates the configuration. | ||
| | ||
| Raises: | ||
| ValueError: In case of an unsuccessful validation. | ||
| """ | ||
| validate_keys( | ||
| keys=vars(self).keys(), | ||
| valid_keys={'adjacent_intervals'}, | ||
| config_name='TOTPProviderConfig') | ||
| if self.adjacent_intervals is not None: | ||
| # Because bool types get converted to int here | ||
pragatimodi marked this conversation as resolved. Show resolved Hide resolved | ||
| # pylint: disable=C0123 | ||
| if type(self.adjacent_intervals) is not int: | ||
| raise ValueError( | ||
| 'TOTPProviderConfig.adjacent_intervals must be an integer between' | ||
| ' 1 and 10 (inclusive).') | ||
| if not 1 <= self.adjacent_intervals <= 10: | ||
| raise ValueError( | ||
| 'totp_provider_config.adjacent_intervals must be an integer between' | ||
| ' 1 and 10 (inclusive).') | ||
| | ||
| def build_server_request(self): | ||
| self.validate() | ||
| return self.to_dict() | ||
| | ||
| | ||
| class ProviderConfig: | ||
| """A tenant or project's multifactor provider configuration. | ||
| Currently, only TOTP can be configured.""" | ||
| | ||
| class State(Enum): | ||
| ENABLED = 'ENABLED' | ||
| DISABLED = 'DISABLED' | ||
| | ||
| def __init__(self, | ||
| state: State = None, | ||
| totp_provider_config: TOTPProviderConfig = None): | ||
| self.state: self.State = state | ||
| self.totp_provider_config: TOTPProviderConfig = totp_provider_config | ||
| | ||
| def to_dict(self) -> dict: | ||
| data = {} | ||
| if self.state: | ||
| data['state'] = self.state.value | ||
| if self.totp_provider_config: | ||
| data['totpProviderConfig'] = self.totp_provider_config.to_dict() | ||
| return data | ||
| | ||
| def validate(self): | ||
| """Validates the provider configuration. | ||
| | ||
| Raises: | ||
| ValueError: In case of an unsuccessful validation. | ||
| """ | ||
| validate_keys( | ||
| keys=vars(self).keys(), | ||
| valid_keys={ | ||
| 'state', | ||
| 'totp_provider_config'}, | ||
| config_name='ProviderConfig') | ||
| if self.state is None: | ||
| raise ValueError('ProviderConfig.state must be defined.') | ||
| if not isinstance(self.state, ProviderConfig.State): | ||
| raise ValueError( | ||
| 'ProviderConfig.state must be of type ProviderConfig.State.') | ||
| if self.totp_provider_config is None: | ||
| raise ValueError( | ||
| 'ProviderConfig.totp_provider_config must be defined.') | ||
| if not isinstance(self.totp_provider_config, TOTPProviderConfig): | ||
| raise ValueError( | ||
| 'ProviderConfig.totp_provider_config must be of type TOTPProviderConfig.') | ||
| | ||
| def build_server_request(self): | ||
| self.validate() | ||
| return self.to_dict() | ||
| | ||
| | ||
| class MultiFactorConfig: | ||
| """A tenant or project's multi factor configuration.""" | ||
| | ||
| def __init__(self, | ||
| provider_configs: List[ProviderConfig] = None): | ||
| self.provider_configs: List[ProviderConfig] = provider_configs | ||
| | ||
| def to_dict(self) -> dict: | ||
| data = {} | ||
| if self.provider_configs is not None: | ||
| data['providerConfigs'] = [d.to_dict() | ||
| for d in self.provider_configs] | ||
| return data | ||
| | ||
| def validate(self): | ||
| """Validates the configuration. | ||
| | ||
| Raises: | ||
| ValueError: In case of an unsuccessful validation. | ||
| """ | ||
| validate_keys( | ||
| keys=vars(self).keys(), | ||
| valid_keys={'provider_configs'}, | ||
| config_name='MultiFactorConfig') | ||
| if self.provider_configs is None: | ||
| raise ValueError( | ||
| 'multi_factor_config.provider_configs must be specified') | ||
| if not isinstance(self.provider_configs, list) or not self.provider_configs: | ||
| raise ValueError( | ||
| 'provider_configs must be an array of type ProviderConfigs.') | ||
| for provider_config in self.provider_configs: | ||
| if not isinstance(provider_config, ProviderConfig): | ||
| raise ValueError( | ||
| 'provider_configs must be an array of type ProviderConfigs.') | ||
| provider_config.validate() | ||
| | ||
| def build_server_request(self): | ||
| self.validate() | ||
| return self.to_dict() | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| # Copyright 2023 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. | ||
| """Firebase project configuration management module. | ||
kevinthecheung marked this conversation as resolved. Show resolved Hide resolved | ||
| | ||
| This module contains functions for managing projects. | ||
| """ | ||
| | ||
| import requests | ||
| | ||
| import firebase_admin | ||
| from firebase_admin import _auth_utils | ||
| from firebase_admin import _http_client | ||
| from firebase_admin import _utils | ||
| from firebase_admin.multi_factor_config_mgt import MultiFactorConfig | ||
| from firebase_admin.multi_factor_config_mgt import MultiFactorServerConfig | ||
| | ||
| _PROJECT_CONFIG_MGT_ATTRIBUTE = '_project_config_mgt' | ||
| | ||
| __all__ = [ | ||
| 'ProjectConfig', | ||
| 'get_project_config', | ||
| 'update_project_config', | ||
| ] | ||
| | ||
| | ||
| def get_project_config(app=None): | ||
| """Gets the project config corresponding to the current project_id. | ||
| | ||
| Args: | ||
| app: An App instance (optional). | ||
| | ||
| Returns: | ||
| Project: A project object. | ||
| | ||
| Raises: | ||
| ValueError: If the project ID is None, empty or not a string. | ||
| ProjectNotFoundError: If no project exists by the given ID. | ||
| FirebaseError: If an error occurs while retrieving the project. | ||
| """ | ||
| project_config_mgt_service = _get_project_config_mgt_service(app) | ||
| return project_config_mgt_service.get_project_config() | ||
| | ||
| def update_project_config(multi_factor_config: MultiFactorConfig = None, app=None): | ||
| """Update the project config with the given options. | ||
| | ||
| Args: | ||
| multi_factor_config: Updated multi-factor authentication configuration | ||
| (optional) | ||
| app: An App instance (optional). | ||
| Returns: | ||
| Project: An updated ProjectConfig object. | ||
| Raises: | ||
| ValueError: If any of the given arguments are invalid. | ||
| FirebaseError: If an error occurs while updating the project. | ||
| """ | ||
| project_config_mgt_service = _get_project_config_mgt_service(app) | ||
| return project_config_mgt_service.update_project_config(multi_factor_config=multi_factor_config) | ||
| | ||
| | ||
| def _get_project_config_mgt_service(app): | ||
| return _utils.get_app_service(app, _PROJECT_CONFIG_MGT_ATTRIBUTE, | ||
| _ProjectConfigManagementService) | ||
| | ||
| class ProjectConfig: | ||
| """Represents a project config in an application. | ||
| """ | ||
| | ||
| def __init__(self, data): | ||
| if not isinstance(data, dict): | ||
| raise ValueError( | ||
| 'Invalid data argument in Project constructor: {0}'.format(data)) | ||
| self._data = data | ||
| | ||
| @property | ||
| def multi_factor_config(self): | ||
| data = self._data.get('mfa') | ||
| if data: | ||
| return MultiFactorServerConfig(data) | ||
| return None | ||
| | ||
| class _ProjectConfigManagementService: | ||
| """Firebase project management service.""" | ||
| | ||
| PROJECT_CONFIG_MGT_URL = 'https://identitytoolkit.googleapis.com/v2/projects' | ||
| | ||
| def __init__(self, app): | ||
| credential = app.credential.get_credential() | ||
| version_header = 'Python/Admin/{0}'.format(firebase_admin.__version__) | ||
| base_url = '{0}/{1}/config'.format( | ||
| self.PROJECT_CONFIG_MGT_URL, app.project_id) | ||
| self.app = app | ||
| self.client = _http_client.JsonHttpClient( | ||
| credential=credential, base_url=base_url, headers={'X-Client-Version': version_header}) | ||
| | ||
| def get_project_config(self) -> ProjectConfig: | ||
| """Gets the project config""" | ||
| try: | ||
| body = self.client.body('get', url='') | ||
| except requests.exceptions.RequestException as error: | ||
| raise _auth_utils.handle_auth_backend_error(error) | ||
| else: | ||
| return ProjectConfig(body) | ||
| | ||
| def update_project_config(self, multi_factor_config: MultiFactorConfig = None) -> ProjectConfig: | ||
| """Updates the specified project with the given parameters.""" | ||
| | ||
| payload = {} | ||
| if multi_factor_config is not None: | ||
| if not isinstance(multi_factor_config, MultiFactorConfig): | ||
| raise ValueError('multi_factor_config must be of type MultiFactorConfig.') | ||
| payload['mfa'] = multi_factor_config.build_server_request() | ||
| if not payload: | ||
| raise ValueError( | ||
| 'At least one parameter must be specified for update.') | ||
| | ||
| update_mask = ','.join(_auth_utils.build_update_mask(payload)) | ||
| params = 'updateMask={0}'.format(update_mask) | ||
| try: | ||
| body = self.client.body( | ||
| 'patch', url='', json=payload, params=params) | ||
| except requests.exceptions.RequestException as error: | ||
| raise _auth_utils.handle_auth_backend_error(error) | ||
| else: | ||
| return ProjectConfig(body) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.