mirror of
https://github.com/status-im/spiff-arena.git
synced 2025-03-01 01:40:42 +00:00
fix(): Ensure secure handling of file paths and improve error handling (CodeRabbit suggestion)
This commit is contained in:
parent
40f3dfca23
commit
6e83494384
@ -3,6 +3,7 @@ from os import environ
|
|||||||
from os import path
|
from os import path
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
|
from flask import current_app
|
||||||
from spiffworkflow_backend.config.normalized_environment import normalized_environment
|
from spiffworkflow_backend.config.normalized_environment import normalized_environment
|
||||||
|
|
||||||
# Consider: https://flask.palletsprojects.com/en/2.2.x/config/#configuring-from-environment-variables
|
# Consider: https://flask.palletsprojects.com/en/2.2.x/config/#configuring-from-environment-variables
|
||||||
@ -22,12 +23,14 @@ def config_from_env(variable_name: str, *, default: str | bool | int | None = No
|
|||||||
if value_from_file and value_from_file.startswith("/run/secrets"):
|
if value_from_file and value_from_file.startswith("/run/secrets"):
|
||||||
# rewrite variable name: remove _FILE
|
# rewrite variable name: remove _FILE
|
||||||
variable_name = variable_name.removesuffix("_FILE")
|
variable_name = variable_name.removesuffix("_FILE")
|
||||||
|
try:
|
||||||
if path.exists(value_from_file):
|
with open(value_from_file, 'r') as file:
|
||||||
with open(value_from_file) as f:
|
value_to_return = file.read().strip() # Read entire content and strip any extra whitespace
|
||||||
value_to_return = f.readline()
|
except FileNotFoundError:
|
||||||
else:
|
value_to_return = None # Handle the case where the file does not exist
|
||||||
value_to_return = None
|
except Exception as e:
|
||||||
|
current_app.logger.error(f"Error reading from {value_from_file}: {str(e)}")
|
||||||
|
value_to_return = None # Handle other potential errors
|
||||||
|
|
||||||
if value_from_env is not None:
|
if value_from_env is not None:
|
||||||
if isinstance(default, bool):
|
if isinstance(default, bool):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user