Dev (#2535)
* 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 * fix(chalice): fixed missing SSO dependency
This commit is contained in:
parent
b471d7f260
commit
4733db7c64
2 changed files with 9 additions and 9 deletions
|
|
@ -22,6 +22,7 @@ clickhouse-driver[lz4]==0.2.9
|
||||||
# TODO: enable after xmlsec fix https://github.com/xmlsec/python-xmlsec/issues/252
|
# TODO: enable after xmlsec fix https://github.com/xmlsec/python-xmlsec/issues/252
|
||||||
#--no-binary is used to avoid libxml2 library version incompatibilities between xmlsec and lxml
|
#--no-binary is used to avoid libxml2 library version incompatibilities between xmlsec and lxml
|
||||||
python3-saml==1.16.0 --no-binary=lxml
|
python3-saml==1.16.0 --no-binary=lxml
|
||||||
|
python-multipart==0.0.9
|
||||||
|
|
||||||
redis==5.1.0b6
|
redis==5.1.0b6
|
||||||
#confluent-kafka==2.1.0
|
#confluent-kafka==2.1.0
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ from starlette.responses import RedirectResponse
|
||||||
|
|
||||||
from chalicelib.core import users, tenants, roles
|
from chalicelib.core import users, tenants, roles
|
||||||
from chalicelib.utils import SAML2_helper
|
from chalicelib.utils import SAML2_helper
|
||||||
from chalicelib.utils.SAML2_helper import prepare_request, init_saml_auth
|
|
||||||
from routers.base import get_routers
|
from routers.base import get_routers
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
@ -20,16 +19,16 @@ public_app, app, app_apikey = get_routers()
|
||||||
@public_app.get("/sso/saml2/", tags=["saml2"])
|
@public_app.get("/sso/saml2/", 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 prepare_request(request=request)
|
req = await SAML2_helper.prepare_request(request=request)
|
||||||
auth = init_saml_auth(req)
|
auth = SAML2_helper.init_saml_auth(req)
|
||||||
sso_built_url = auth.login(return_to=json.dumps({'iFrame': iFrame, 'spot': spot}))
|
sso_built_url = auth.login(return_to=json.dumps({'iFrame': iFrame, 'spot': spot}))
|
||||||
return RedirectResponse(url=sso_built_url)
|
return RedirectResponse(url=sso_built_url)
|
||||||
|
|
||||||
|
|
||||||
async def __process_assertion(request: Request, tenant_key=None) -> Response | dict:
|
async def __process_assertion(request: Request, tenant_key=None) -> Response | dict:
|
||||||
req = await prepare_request(request=request)
|
req = await SAML2_helper.prepare_request(request=request)
|
||||||
session = req["cookie"]["session"]
|
session = req["cookie"]["session"]
|
||||||
auth = init_saml_auth(req)
|
auth = SAML2_helper.init_saml_auth(req)
|
||||||
|
|
||||||
post_data = req.get("post_data")
|
post_data = req.get("post_data")
|
||||||
if post_data is None:
|
if post_data is None:
|
||||||
|
|
@ -186,9 +185,9 @@ async def process_sso_assertion_tk(tenantKey: str, request: Request):
|
||||||
@public_app.get('/sso/saml2/sls', tags=["saml2"])
|
@public_app.get('/sso/saml2/sls', tags=["saml2"])
|
||||||
@public_app.get('/sso/saml2/sls/', tags=["saml2"])
|
@public_app.get('/sso/saml2/sls/', tags=["saml2"])
|
||||||
async def process_sls_assertion(request: Request):
|
async def process_sls_assertion(request: Request):
|
||||||
req = await prepare_request(request=request)
|
req = await SAML2_helper.prepare_request(request=request)
|
||||||
session = req["cookie"]["session"]
|
session = req["cookie"]["session"]
|
||||||
auth = init_saml_auth(req)
|
auth = SAML2_helper.init_saml_auth(req)
|
||||||
request_id = None
|
request_id = None
|
||||||
if 'LogoutRequestID' in session:
|
if 'LogoutRequestID' in session:
|
||||||
request_id = session['LogoutRequestID']
|
request_id = session['LogoutRequestID']
|
||||||
|
|
@ -222,8 +221,8 @@ async def process_sls_assertion(request: Request):
|
||||||
@public_app.get('/sso/saml2/metadata', tags=["saml2"])
|
@public_app.get('/sso/saml2/metadata', tags=["saml2"])
|
||||||
@public_app.get('/sso/saml2/metadata/', tags=["saml2"])
|
@public_app.get('/sso/saml2/metadata/', tags=["saml2"])
|
||||||
async def saml2_metadata(request: Request):
|
async def saml2_metadata(request: Request):
|
||||||
req = await prepare_request(request=request)
|
req = await SAML2_helper.prepare_request(request=request)
|
||||||
auth = init_saml_auth(req)
|
auth = SAML2_helper.init_saml_auth(req)
|
||||||
settings = auth.get_settings()
|
settings = auth.get_settings()
|
||||||
metadata = settings.get_sp_metadata()
|
metadata = settings.get_sp_metadata()
|
||||||
errors = settings.validate_metadata(metadata)
|
errors = settings.validate_metadata(metadata)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue