Skip to content

fix(api): move session secret to config, remove userinfo from session… #1463

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.

Sign up for GitHub

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
prmths128 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(api): move session secret to config, remove userinfo from session… #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions carbonserver/carbonserver/api/routers/authenticate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ async def get_login(
sign_up_service.check_jwt_user(id_token)
else:
sign_up_service.check_jwt_user(token["id_token"], create=True)
user = token.get("userinfo")
if user:
request.session["user"] = dict(user)

base_url = request.base_url
if settings.frontend_url != "":
Expand Down
5 changes: 5 additions & 0 deletions carbonserver/carbonserver/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ class Settings(BaseSettings):
)
environment: str = Field("production")
jwt_key: str = Field("", validation_alias=AliasChoices("JWT_KEY", "jwt_key"))
# Used by SessionMiddleware between login steps
session_secret_key: str = Field(
"session_secret_key",
validation_alias=AliasChoices("SESSION_SECRET_KEY", "session_secret_key"),
)
api_port: int = Field(8080, validation_alias=AliasChoices("API_PORT", "api_port"))
server_host: str = Field(
"0.0.0.0", validation_alias=AliasChoices("SERVER_HOST", "server_host")
Expand Down
6 changes: 5 additions & 1 deletion carbonserver/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ def create_app() -> FastAPI:
server.add_exception_handler(DBException, db_exception_handler)
server.add_exception_handler(ValidationError, validation_exception_handler)
server.add_exception_handler(Exception, generic_exception_handler)
server.add_middleware(SessionMiddleware, secret_key="some-random-string")
server.add_middleware(
SessionMiddleware,
secret_key=settings.session_secret_key,
https_only=settings.environment == "production",
)

return server

Expand Down
3 changes: 2 additions & 1 deletion deploy/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ FIEF_CLIENT_ID=
FIEF_CLIENT_SECRET=
FIEF_URL=
FRONTEND_URL=
JWT_KEY=
JWT_KEY=
SESSION_SECRET_KEY=
1 change: 1 addition & 0 deletions deploy/deploy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ def _setup(settings: Settings):
"FRONTEND_URL": f"http://{settings.hostname}",
"FIEF_URL": f"http://{settings.fief_hostname}",
"JWT_KEY": secrets.token_urlsafe(32),
"SESSION_SECRET_KEY": secrets.token_urlsafe(32),
}
if settings.run_fief:
variables["FIEF_CLIENT_ID"] = secrets.token_urlsafe(32)
Expand Down
Loading