bbohard/CD73
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ne lister que les utilisateurs de l’établissement en vue de la suppression

Browse Source
This commit is contained in:
Benjamin Bohard
2025-08-20 09:56:31 +02:00
parent 8073ca1747
commit 5f07388030
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches.d/scribe-backend.patch
View File

@ -1,5 +1,5 @@
diff --git usr/bin/importation_scribe usr/bin/importation_scribe diff --git usr/bin/importation_scribe usr/bin/importation_scribe
index 0db4982..47f5c80 100755 index 0db4982..01ee9a1 100755
--- usr/bin/importation_scribe --- usr/bin/importation_scribe
+++ usr/bin/importation_scribe +++ usr/bin/importation_scribe
@@ -42,21 +42,22 @@ choix de la source de données et imports @@ -42,21 +42,22 @@ choix de la source de données et imports
@ -15,7 +15,7 @@ index 0db4982..47f5c80 100755
from scribe.eoleldap import Ldap from scribe.eoleldap import Ldap
-from scribe.ldapconf import SUPPORT_ETAB -from scribe.ldapconf import SUPPORT_ETAB
+from scribe.eoleuser import User +from scribe.eoleuser import User
+from scribe.ldapconf import SUPPORT_ETAB, PROF_FILTER +from scribe.ldapconf import SUPPORT_ETAB, PROF_FILTER, BRANCHE_ETAB
from scribe.eoletools import nscd_start, nscd_stop from scribe.eoletools import nscd_start, nscd_stop
from scribe.parsing import sconet, aaf, be1d, scribecsv2 from scribe.parsing import sconet, aaf, be1d, scribecsv2
from scribe.importation import preferences, writer, config from scribe.importation import preferences, writer, config
@ -26,7 +26,7 @@ index 0db4982..47f5c80 100755
class OutOfRange(Exception): class OutOfRange(Exception):
""" Exception OutOfRange """ """ Exception OutOfRange """
@@ -458,33 +459,44 @@ class Console: @@ -458,33 +459,45 @@ class Console:
""" """
log.add_lock() log.add_lock()
log.debuglog("Arrêt de LSC...", title=True) log.debuglog("Arrêt de LSC...", title=True)
@ -38,7 +38,8 @@ index 0db4982..47f5c80 100755
etab = prefs.get_default('etab') etab = prefs.get_default('etab')
etab_prefix = prefs.get_default('etab_prefix') etab_prefix = prefs.get_default('etab_prefix')
+ purge_option = 'keep' + purge_option = 'keep'
+ old_logins = connexion._search('(&{})'.format(PROF_FILTER), 'uid') + suffix=BRANCHE_ETAB % {'etab': etab}
+ old_logins = connexion._search('(&{})'.format(PROF_FILTER), 'uid', suffix=suffix)
+ +
else: else:
etab = None etab = None
@ -57,11 +58,11 @@ index 0db4982..47f5c80 100755
+ if SUPPORT_ETAB: + if SUPPORT_ETAB:
+ user = User() + user = User()
+ user.ldap_admin = connexion + user.ldap_admin = connexion
+ obsolete_logins = [login[1]['uid'] for login in old_logins if login[1]['uid'] not in logins] + obsolete_logins = [login[1]['uid'][0] for login in old_logins if login[1]['uid'] not in logins]
+ for obsolete_login in obsolete_logins: + for obsolete_login in obsolete_logins:
+ # eoleusers from dns and eoleuser._quit_etab + # eoleusers from dns and eoleuser._quit_etab
+ user._quit_etab(obsolete_login, etab=etab) + print(obsolete_login)
+ print(obsolete_logins) + #user._quit_etab(obsolete_login, etab=etab)
if self.data_type in ['sconet', 'aaf']: if self.data_type in ['sconet', 'aaf']:
writer.write_service(store=self.store, connexion=connexion, writer.write_service(store=self.store, connexion=connexion,
etab=etab, etab_prefix=etab_prefix) etab=etab, etab_prefix=etab_prefix)