Garmelon/PFERD
1
0
Fork 0
mirror of https://github.com/Garmelon/PFERD.git synced 2026-04-12 15:35:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

impemented SimpleSAMLLogin option into the IliasWebCrawler

Browse source
This commit is contained in:
NIKL45 2025-11-03 21:28:57 +01:00
parent e59a9dbf2d
commit 31d2c86a05
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
PFERD/crawl/ilias/ilias_web_crawler.py
View file

@ -32,6 +32,7 @@ from .kit_ilias_html import (
parse_ilias_forum_export, parse_ilias_forum_export,
) )
from .shibboleth_login import ShibbolethLogin from .shibboleth_login import ShibbolethLogin
from .simplesaml_login import SimpleSAMLLogin
TargetType = str | int TargetType = str | int
@ -49,12 +50,14 @@ class IliasWebCrawlerSection(HttpCrawlerSection):
return base_url return base_url
def login(self) -> Literal["shibboleth"] | LoginTypeLocal: def login(self) -> Literal["shibboleth", "simple-saml"] | LoginTypeLocal:
login_type = self.s.get("login_type") login_type = self.s.get("login_type")
if not login_type: if not login_type:
self.missing_value("login_type") self.missing_value("login_type")
if login_type == "shibboleth": if login_type == "shibboleth":
return "shibboleth" return "shibboleth"
if login_type == "simple-saml":
return "simple-saml"
if login_type == "local": if login_type == "local":
client_id = self.s.get("client_id") client_id = self.s.get("client_id")
if not client_id: if not client_id:
@ -194,7 +197,14 @@ instance's greatest bottleneck.
if isinstance(self._login_type, LoginTypeLocal): if isinstance(self._login_type, LoginTypeLocal):
self._client_id = self._login_type.client_id self._client_id = self._login_type.client_id
else: else:
self._shibboleth_login = ShibbolethLogin(self._base_url, self._auth, self._tfa_auth) # Allow multiple remote login backends
if self._login_type == "shibboleth":
self._shibboleth_login = ShibbolethLogin(self._base_url, self._auth, self._tfa_auth)
elif self._login_type == "simple-saml":
self._simplesaml_login = SimpleSAMLLogin(self._base_url, self._auth, self._tfa_auth)
else:
# Fallback to shibboleth to avoid breaking older configs
self._shibboleth_login = ShibbolethLogin(self._base_url, self._auth, self._tfa_auth)
self._target = section.target() self._target = section.target()
self._link_file_redirect_delay = section.link_redirect_delay() self._link_file_redirect_delay = section.link_redirect_delay()
@ -1044,6 +1054,8 @@ instance's greatest bottleneck.
# fill the session with the correct cookies # fill the session with the correct cookies
if self._login_type == "shibboleth": if self._login_type == "shibboleth":
await self._shibboleth_login.login(self.session) await self._shibboleth_login.login(self.session)
elif self._login_type == "simple-saml":
await self._simplesaml_login.login(self.session)
else: else:
params = { params = {
"client_id": self._client_id, "client_id": self._client_id,