View | Details | Raw Unified | Return to bug 44073 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-1 / +11 lines)
Line     Link Here 
0
-- a/ucs-school-4.1r2/ucs-school-umc-exam/umc/python/schoolexam-master/__init__.py
0
++ b/ucs-school-4.1r2/ucs-school-umc-exam/umc/python/schoolexam-master/__init__.py
 Lines 62-67   class Instance(SchoolBaseModule): Link Here 
62
		SchoolBaseModule.__init__(self)
62
		SchoolBaseModule.__init__(self)
63
63
64
		self._examUserPrefix = ucr.get('ucsschool/ldap/default/userprefix/exam', 'exam-')
64
		self._examUserPrefix = ucr.get('ucsschool/ldap/default/userprefix/exam', 'exam-')
65
		self._examGroupExcludeRegEx = None
66
		try:
67
			value = ucr.get('ucsschool/exam/group/ldap/blacklist/regex', '')
68
			if value.strip():
69
				self._examGroupExcludeRegEx = re.compile(value, re.I)
70
		except Exception as ex:
71
			MODULE.error('Failed to get/compile regexp provided by ucsschool/exam/group/ldap/blacklist/regex: %s' % (ex,))
65
72
66
		# cache objects
73
		# cache objects
67
		self._udm_modules = dict()
74
		self._udm_modules = dict()
 Lines 314-319   class Instance(SchoolBaseModule): Link Here 
314
			grpobj.fast_member_add([exam_user_dn], [exam_user_uid])
321
			grpobj.fast_member_add([exam_user_dn], [exam_user_uid])
315
322
316
			for group in user_orig.info.get('groups', []):
323
			for group in user_orig.info.get('groups', []):
324
				if self._examGroupExcludeRegEx and self._examGroupExcludeRegEx.search(group):
325
					MODULE.info('create_exam_user(): ignoring group %r as requested via regexp' % (group,))
326
					continue
317
				grpobj = module_groups_group.object(None, ldap_admin_write, ldap_position, group)
327
				grpobj = module_groups_group.object(None, ldap_admin_write, ldap_position, group)
318
				grpobj.fast_member_add([exam_user_dn], [exam_user_uid])
328
				grpobj.fast_member_add([exam_user_dn], [exam_user_uid])
319
329

Return to bug 44073