-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #88 from epam/develop
Release 6.2.1
- Loading branch information
Showing
13 changed files
with
82 additions
and
140 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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 |
|---|---|---|
| @@ -1,80 +1,30 @@ | ||
| import logging | ||
| import os | ||
| import re | ||
| from functools import cached_property | ||
| from sys import stdout | ||
| from typing import Dict | ||
| import logging.config | ||
|
|
||
| _name_to_level = { | ||
| 'CRITICAL': logging.CRITICAL, | ||
| 'FATAL': logging.FATAL, | ||
| 'ERROR': logging.ERROR, | ||
| 'WARNING': logging.WARNING, | ||
| 'INFO': logging.INFO, | ||
| 'DEBUG': logging.DEBUG | ||
| } | ||
| from modular_sdk.commons.constants import Env | ||
|
|
||
| LOG_FORMAT = '%(asctime)s - %(levelname)s - %(name)s - %(message)s' | ||
|
|
||
|
|
||
| class SensitiveFormatter(logging.Formatter): | ||
| """Formatter that removes sensitive information.""" | ||
|
|
||
| def __init__(self, *args, **kwargs): | ||
| super().__init__(*args, **kwargs) | ||
| self._param_to_regex: Dict[str, re.Pattern] = {} | ||
|
|
||
| @cached_property | ||
| def secured_params(self) -> set: | ||
| return { | ||
| 'refresh_token', 'id_token', 'password', 'authorization', 'secret', | ||
| 'AWS_SECRET_ACCESS_KEY', 'AWS_SESSION_TOKEN', 'git_access_secret', | ||
| 'api_key', 'AZURE_CLIENT_ID', 'AZURE_CLIENT_SECRET', | ||
| 'GOOGLE_APPLICATION_CREDENTIALS', 'private_key', 'private_key_id', | ||
| 'Authorization', 'Authentication' | ||
| logging.config.dictConfig({ | ||
| 'version': 1, | ||
| 'disable_existing_loggers': False, | ||
| 'formatters': {}, | ||
| 'handlers': { | ||
| 'null_handler': { | ||
| 'class': 'logging.NullHandler' | ||
| } | ||
|
|
||
| @staticmethod | ||
| def _compile_param_regex(param: str) -> re.Pattern: | ||
| """ | ||
| It searches for values in JSON objects where key is $param: | ||
| If param is "password" the string '{"password": "blabla"}' will be | ||
| printed as '{"password": "****"}' | ||
| [\'"] - single or double quote; [ ]* - zero or more spaces | ||
| """ | ||
| return re.compile(f'[\'"]{param}[\'"]:[ ]*[\'"](.*?)[\'"]') | ||
|
|
||
| def get_param_regex(self, param: str) -> re.Pattern: | ||
| if param not in self._param_to_regex: | ||
| self._param_to_regex[param] = self._compile_param_regex(param) | ||
| return self._param_to_regex[param] | ||
|
|
||
| def _filter(self, string): | ||
| # Hoping that this regex substitutions do not hit performance... | ||
| for param in self.secured_params: | ||
| string = re.sub(self.get_param_regex(param), | ||
| f'\'{param}\': \'****\'', string) | ||
| return string | ||
|
|
||
| def format(self, record): | ||
| original = logging.Formatter.format(self, record) | ||
| return self._filter(original) | ||
|
|
||
|
|
||
| logger = logging.getLogger(__name__) | ||
| logger.propagate = False | ||
| console_handler = logging.StreamHandler(stream=stdout) | ||
| console_handler.setFormatter(SensitiveFormatter(LOG_FORMAT)) | ||
| logger.addHandler(console_handler) | ||
|
|
||
| log_level = _name_to_level.get(os.environ.get('log_level')) | ||
| if not log_level: | ||
| log_level = logging.INFO | ||
| logging.captureWarnings(True) | ||
|
|
||
|
|
||
| def get_logger(log_name, level=log_level): | ||
| module_logger = logger.getChild(log_name) | ||
| }, | ||
| 'loggers': { | ||
| 'modular_sdk': { | ||
| 'level': Env.LOG_LEVEL.get(), | ||
| 'handlers': ['null_handler'], | ||
| 'propagate': False, | ||
| }, | ||
| } | ||
| }) | ||
|
|
||
|
|
||
| def get_logger(name: str, level: str | None = None, /): | ||
| log = logging.getLogger(name) | ||
| if level: | ||
| module_logger.setLevel(level) | ||
| return module_logger | ||
| log.setLevel(level) | ||
| return log | ||
|
|
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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