Skip to content

Commit

Permalink
Merge pull request #1650 from rommapp/misc/strip-credential-envvars
Browse files Browse the repository at this point in the history
misc: Strip environment variables related to third-party credentials
  • Loading branch information
adamantike authored Feb 22, 2025
2 parents f0b2bfe + fac3686 commit 3d8342f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
12 changes: 6 additions & 6 deletions backend/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,20 @@ def str_to_bool(value: str) -> bool:
# IGDB
IGDB_CLIENT_ID: Final = os.environ.get(
"IGDB_CLIENT_ID", os.environ.get("CLIENT_ID", "")
)
).strip()
IGDB_CLIENT_SECRET: Final = os.environ.get(
"IGDB_CLIENT_SECRET", os.environ.get("CLIENT_SECRET", "")
)
).strip()

# SCREENSCRAPER
SCREENSCRAPER_USER: Final = os.environ.get("SCREENSCRAPER_USER", "")
SCREENSCRAPER_PASSWORD: Final = os.environ.get("SCREENSCRAPER_PASSWORD", "")

# STEAMGRIDDB
STEAMGRIDDB_API_KEY: Final = os.environ.get("STEAMGRIDDB_API_KEY", "")
STEAMGRIDDB_API_KEY: Final = os.environ.get("STEAMGRIDDB_API_KEY", "").strip()

# MOBYGAMES
MOBYGAMES_API_KEY: Final = os.environ.get("MOBYGAMES_API_KEY", "")
MOBYGAMES_API_KEY: Final = os.environ.get("MOBYGAMES_API_KEY", "").strip()

# AUTH
ROMM_AUTH_SECRET_KEY: Final = os.environ.get(
Expand All @@ -81,8 +81,8 @@ def str_to_bool(value: str) -> bool:
# OIDC
OIDC_ENABLED: Final = str_to_bool(os.environ.get("OIDC_ENABLED", "false"))
OIDC_PROVIDER: Final = os.environ.get("OIDC_PROVIDER", "")
OIDC_CLIENT_ID: Final = os.environ.get("OIDC_CLIENT_ID", "")
OIDC_CLIENT_SECRET: Final = os.environ.get("OIDC_CLIENT_SECRET", "")
OIDC_CLIENT_ID: Final = os.environ.get("OIDC_CLIENT_ID", "").strip()
OIDC_CLIENT_SECRET: Final = os.environ.get("OIDC_CLIENT_SECRET", "").strip()
OIDC_REDIRECT_URI: Final = os.environ.get("OIDC_REDIRECT_URI", "")
OIDC_SERVER_APPLICATION_URL: Final = os.environ.get("OIDC_SERVER_APPLICATION_URL", "")
OIDC_TLS_CACERTFILE: Final = os.environ.get("OIDC_TLS_CACERTFILE", None)
Expand Down
3 changes: 2 additions & 1 deletion backend/endpoints/rom.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
DISABLE_DOWNLOAD_ENDPOINT_AUTH,
LIBRARY_BASE_PATH,
RESOURCES_BASE_PATH,
str_to_bool,
)
from decorators.auth import protected_route
from endpoints.responses import MessageResponse
Expand Down Expand Up @@ -320,7 +321,7 @@ async def get_rom_content(
raise RomNotFoundInDatabaseException(id)

# https://muos.dev/help/addcontent#what-about-multi-disc-content
hidden_folder = request.query_params.get("hidden_folder", "").lower() == "true"
hidden_folder = str_to_bool(request.query_params.get("hidden_folder", ""))

file_ids = request.query_params.get("file_ids") or ""
file_ids = [int(f) for f in file_ids.split(",") if f]
Expand Down

0 comments on commit 3d8342f

Please sign in to comment.