jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Dev (#2536)

Browse source 
* fix(chalice): fixed Math-operators validation
refactor(chalice): search for sessions that have events for heatmaps

* refactor(chalice): search for sessions that have at least 1 location event for heatmaps

* fix(chalice): fixed Math-operators validation
refactor(chalice): search for sessions that have events for heatmaps

* refactor(chalice): search for sessions that have at least 1 location event for heatmaps

* feat(chalice): autocomplete return top 10 with stats

* fix(chalice): fixed autocomplete top 10 meta-filters

* refactor(chalice): refactored SSO dependency

* refactor(chalice): handle SSO configuration not available
This commit is contained in:
Kraiem Taha Yassine 2024-09-04 18:17:01 +02:00 • committed by GitHub
parent d4ce72787b
commit a2b0366267
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ee/api/chalicelib/utils/SAML2_helper.py
View file

@ -5,7 +5,7 @@ from os import environ
from urllib.parse import urlparse from urllib.parse import urlparse
from decouple import config from decouple import config
from fastapi import Request from fastapi import Request, HTTPException
from starlette.datastructures import FormData from starlette.datastructures import FormData
if config("ENABLE_SSO", cast=bool, default=True): if config("ENABLE_SSO", cast=bool, default=True):
@ -84,6 +84,8 @@ def init_saml_auth(req):
async def prepare_request(request: Request): async def prepare_request(request: Request):
if not is_saml2_available():
raise HTTPException(status_code=401, detail="SSO configuration not available.")
request.args = dict(request.query_params).copy() if request.query_params else {} request.args = dict(request.query_params).copy() if request.query_params else {}
form: FormData = await request.form() form: FormData = await request.form()
request.form = dict(form) request.form = dict(form)

22
ee/api/routers/saml.py
View file

@ -12,11 +12,11 @@ from routers.base import get_routers
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
public_app, app, app_apikey = get_routers() public_app, app, app_apikey = get_routers(prefix="/sso/saml2")
@public_app.get("/sso/saml2", tags=["saml2"]) @public_app.get("", tags=["saml2"])
@public_app.get("/sso/saml2/", tags=["saml2"]) @public_app.get("/", tags=["saml2"])
async def start_sso(request: Request, iFrame: bool = False, spot: bool = False): async def start_sso(request: Request, iFrame: bool = False, spot: bool = False):
request.path = '' request.path = ''
req = await SAML2_helper.prepare_request(request=request) req = await SAML2_helper.prepare_request(request=request)
@ -170,20 +170,20 @@ async def __process_assertion(request: Request, tenant_key=None) -> Response | d
return response return response
@public_app.post('/sso/saml2/acs', tags=["saml2"]) @public_app.post('/acs', tags=["saml2"])
@public_app.post('/sso/saml2/acs/', tags=["saml2"]) @public_app.post('/acs/', tags=["saml2"])
async def process_sso_assertion(request: Request): async def process_sso_assertion(request: Request):
return await __process_assertion(request=request) return await __process_assertion(request=request)
@public_app.post('/sso/saml2/acs/{tenantKey}', tags=["saml2"]) @public_app.post('/acs/{tenantKey}', tags=["saml2"])
@public_app.post('/sso/saml2/acs/{tenantKey}/', tags=["saml2"]) @public_app.post('/acs/{tenantKey}/', tags=["saml2"])
async def process_sso_assertion_tk(tenantKey: str, request: Request): async def process_sso_assertion_tk(tenantKey: str, request: Request):
return await __process_assertion(request=request, tenant_key=tenantKey) return await __process_assertion(request=request, tenant_key=tenantKey)
@public_app.get('/sso/saml2/sls', tags=["saml2"]) @public_app.get('/sls', tags=["saml2"])
@public_app.get('/sso/saml2/sls/', tags=["saml2"]) @public_app.get('/sls/', tags=["saml2"])
async def process_sls_assertion(request: Request): async def process_sls_assertion(request: Request):
req = await SAML2_helper.prepare_request(request=request) req = await SAML2_helper.prepare_request(request=request)
session = req["cookie"]["session"] session = req["cookie"]["session"]
@ -218,8 +218,8 @@ async def process_sls_assertion(request: Request):
return RedirectResponse(url=config("SITE_URL")) return RedirectResponse(url=config("SITE_URL"))
@public_app.get('/sso/saml2/metadata', tags=["saml2"]) @public_app.get('/metadata', tags=["saml2"])
@public_app.get('/sso/saml2/metadata/', tags=["saml2"]) @public_app.get('/metadata/', tags=["saml2"])
async def saml2_metadata(request: Request): async def saml2_metadata(request: Request):
req = await SAML2_helper.prepare_request(request=request) req = await SAML2_helper.prepare_request(request=request)
auth = SAML2_helper.init_saml_auth(req) auth = SAML2_helper.init_saml_auth(req)