fix: update pre-commit

.github/workflows/main.yml

@@ -45,3 +45,9 @@ jobs:
  working-directory: ./src
  run: |
  poetry run pytest -c pytest.github.ini
+
+ - name: SonarCloud Scan
+ uses: SonarSource/sonarcloud-github-action@master
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
+ SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.pre-commit-config.yaml

@@ -31,20 +31,25 @@ repos:
 
 
  - repo: https://github.com/charliermarsh/ruff-pre-commit
- rev: v0.0.280
+ rev: v0.0.286
  hooks:
  - id: ruff
- args:
- - --fix # Enables autofix
+ args: [--fix, --exit-non-zero-on-fix] # Enables autofix
 
  - repo: https://github.com/psf/black # Refer to this repository for futher documentation about black hook
  rev: 23.7.0
  hooks:
  - id: black
 
 
+ - repo: https://github.com/pycqa/bandit
+ rev: 1.7.5
+ hooks:
+ - id: bandit
+ args: [ "-iii", "-ll" ]
+
  - repo: https://github.com/pre-commit/mirrors-mypy
- rev: v1.4.1
+ rev: v1.5.1
  hooks:
  - id: mypy
  args: [--config-file=mypy.ini, --ignore-missing-imports]

.vscode/settings.json

@@ -16,5 +16,12 @@
  "ruff.args": ["--config=${workspaceFolder}/pyproject.toml"],
  "[python]": {
  "editor.defaultFormatter": "ms-python.black-formatter"
+ },
+ "sonarlint.connectedMode.project": {
+ "connectionId": "alexandre-bussinero",
+ "projectKey": "alexandre-bussinero_abusquets-filmin"
+ },
+ "sonarlint.analyzerProperties": {
+
  }
 }

src/app/session_deps.py

@@ -8,6 +8,9 @@
 from infra.cache.ports import AbstractCacheRepository
 
 
+http_bearer = HTTPBearer()
+
+
 def get_token_service() -> TokenService:
  return AppContainer().token_service
 
@@ -46,23 +49,23 @@ async def _check_token(
 
 
 async def check_access_token(
- credentials: HTTPAuthorizationCredentials = Depends(HTTPBearer()),
+ credentials: HTTPAuthorizationCredentials = Depends(http_bearer),
  cache_repository: AbstractCacheRepository = Depends(get_cache_repository),
  token_service: TokenService = Depends(get_token_service),
 ) -> Session:
  return await _check_token('a', credentials, cache_repository, token_service)
 
 
 async def check_refresh_token(
- credentials: HTTPAuthorizationCredentials = Depends(HTTPBearer()),
+ credentials: HTTPAuthorizationCredentials = Depends(http_bearer),
  cache_repository: AbstractCacheRepository = Depends(get_cache_repository),
  token_service: TokenService = Depends(get_token_service),
 ) -> Session:
  return await _check_token('r', credentials, cache_repository, token_service)
 
 
 async def is_admin_session(
- credentials: HTTPAuthorizationCredentials = Depends(HTTPBearer()),
+ credentials: HTTPAuthorizationCredentials = Depends(http_bearer),
  cache_repository: AbstractCacheRepository = Depends(get_cache_repository),
  token_service: TokenService = Depends(get_token_service),
 ) -> Session:

src/core/domain/entities/user.py

@@ -24,7 +24,8 @@ def encrypt_password(password: str) -> str:
 
  @staticmethod
  def verify_password(password: str, hashed: str) -> bool:
- return bool(bcrypt.hashpw(password.encode(), hashed.encode()) == hashed.encode())
+ ret: bool = bcrypt.hashpw(password.encode(), hashed.encode()) == hashed.encode()
+ return ret
 
 
 @dataclass(kw_only=True)

src/infra/cache/memory_cache.py

@@ -1,7 +1,7 @@
 from threading import RLock
 import time
 
-from typing import Any, Dict, Union
+from typing import Any, Dict, Optional
 
 from infra.cache.ports import AbstractCacheRepository, EncodableT
 
@@ -27,7 +27,7 @@ async def get(self, key: str) -> Any:
  self._data.pop(key, None)
  return None
 
- async def set(self, key: str, value: Union[EncodableT, None], expire: int) -> None:
+ async def set(self, key: str, value: Optional[EncodableT], expire: int) -> None:
  with self.lock:
  if value is None:
  self._data.pop(key, None)

src/infra/cache/ports.py

@@ -1,6 +1,6 @@
 import abc
 
-from typing import Any, Union
+from typing import Any, Optional, Union
 
 
 EncodableT = Union[str, int, float, bytes]
@@ -12,7 +12,7 @@ async def get(self, key: str) -> Any:
  ...
 
  @abc.abstractmethod
- async def set(self, key: str, value: Union[EncodableT, None], expire: int) -> None:
+ async def set(self, key: str, value: Optional[EncodableT], expire: int) -> None:
  ...
 
  @abc.abstractmethod

src/infra/cache/redis_cache.py

@@ -1,4 +1,4 @@
-from typing import Any, Union
+from typing import Any, Optional
 
 from redis import (
  asyncio as aioredis,
@@ -11,7 +11,7 @@
 @singleton
 class RedisCache(AbstractCacheRepository):
  def __init__(self, url: str, user: str, password: str) -> None:
- self.redis: Union[aioredis.Redis, None] = None
+ self.redis: Optional[aioredis.Redis] = None
  self.url = url
  self.user = user
  self.password = password
@@ -38,7 +38,7 @@ async def close(self) -> None:
  async def get(self, key: str) -> Any:
  return await (await self.get_redis()).get(key)
 
- async def set(self, key: str, value: Union[EncodableT, None], expire: int) -> None:
+ async def set(self, key: str, value: Optional[EncodableT], expire: int) -> None:
  """expire: expiration in seconds"""
  await self.get_redis()
  if value is None: