Attachment #9080 for bug #36210

View | Details | Raw Unified | Return to bug 36210
Collapse All | Expand All




						raise univention.admin.uexceptions.primaryGroup

			if self['passwordexpiry']:
				today = time.strftime('%Y-%m-%d', time.gmtime()).split('-')
				expiry = self['passwordexpiry'].split('-')
				# expiry.reverse()
				# today.reverse()
- 
userexpiry
--
.../modules/univention/admin/handlers/users/user.py | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py (-6 / +17 lines)

Lines 36-41 import string	Link Here

import re

import re

import copy

import copy

import time

import time

import calendar

import types

import types

import struct

import struct

from M2Crypto import X509

from M2Crypto import X509

Lines 1138-1145 def case_insensitive_in_list(dn, list):	Link Here

1138

	return False

1139

	return False

1139

1140

1141

1142

def posixSecondsToDate(seconds):

1143

	return time.strftime("%Y-%m-%d", time.gmtime(seconds))

1144

1145

1141

def posixDaysToDate(days):

1146

def posixDaysToDate(days):

1142

	return time.strftime("%Y-%m-%d", time.gmtime(long(days) * 3600 * 24))

1147

	return posixSecondsToDate(long(days) * 3600 * 24)

1148

1149

1150

def dateToPosixSeconds(iso_date):

1151

	return calendar.timegm(time.strptime(iso_date, "%Y-%m-%d"))

1152

1153

1154

def dateToPosixDays(iso_date):

1155

	return dateToPosixSeconds(iso_date) / 3600 / 24

1143

1156

1144

1157

1145

def sambaWorkstationsMap(workstations):

1158

def sambaWorkstationsMap(workstations):

Lines 1474-1480 class object(univention.admin.handlers.simpleLdap, mungeddial.Support):	Link Here

1474

		elif 'samba' in self.options:

1487

		elif 'samba' in self.options:

1475

			if self.oldattr.has_key('sambaKickoffTime'):

1488

			if self.oldattr.has_key('sambaKickoffTime'):

1476

				univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'sambaKickoffTime is: %s' % self.oldattr['sambaKickoffTime'][0])

1489

				univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'sambaKickoffTime is: %s' % self.oldattr['sambaKickoffTime'][0])

1477

				self.info['userexpiry'] = time.strftime("%Y-%m-%d", time.gmtime(long(self.oldattr['sambaKickoffTime'][0]) + (3600 * 24)))

1490

				self.info['userexpiry'] = posixSecondsToDate(self.oldattr['sambaKickoffTime'][0])

1478

1491

1479

		try:

1492

		try:

1480

			givenName = self.oldattr.get('givenName', [''])[0]

1493

			givenName = self.oldattr.get('givenName', [''])[0]

Lines 2307-2313 class object(univention.admin.handlers.simpleLdap, mungeddial.Support):	Link Here

2307

			if 'samba' in self.options:

2320

			if 'samba' in self.options:

2308

				sambaKickoffTime = ''

2321

				sambaKickoffTime = ''

2309

				if self['userexpiry']:

2322

				if self['userexpiry']:

2310

					sambaKickoffTime = "%d" % long(time.mktime(time.strptime(self['userexpiry'], "%Y-%m-%d")))

2323

					sambaKickoffTime = str(dateToPosixSeconds(self['userexpiry']))

2311

					univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'sambaKickoffTime: %s' % sambaKickoffTime)

2324

					univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'sambaKickoffTime: %s' % sambaKickoffTime)

2312

				old_sambaKickoffTime = self.oldattr.get('sambaKickoffTime', '')

2325

				old_sambaKickoffTime = self.oldattr.get('sambaKickoffTime', '')

2313

				if old_sambaKickoffTime != sambaKickoffTime:

2326

				if old_sambaKickoffTime != sambaKickoffTime:

Lines 2329-2335 class object(univention.admin.handlers.simpleLdap, mungeddial.Support):	Link Here

2329

				if self.__is_posix_disabled() and self.hasChanged('disabled') and not self.hasChanged('userexpiry'):

2342

				if self.__is_posix_disabled() and self.hasChanged('disabled') and not self.hasChanged('userexpiry'):

2330

					shadowExpire = '1'

2343

					shadowExpire = '1'

2331

				elif self['userexpiry']:

2344

				elif self['userexpiry']:

2332

					shadowExpire = "%d" % long(time.mktime(time.strptime(self['userexpiry'], "%Y-%m-%d")) / 3600 / 24 + 1)

2345

					shadowExpire = str(dateToPosixDays(self['userexpiry']))

2333

				elif self.__is_posix_disabled():

2346

				elif self.__is_posix_disabled():

2334

					shadowExpire = '1'

2347

					shadowExpire = '1'

2335

				else:

2348

				else:

2336

2337

special posix cases

2349

special posix cases

2338

--

2339

.../tests/61_udm-users/25_script_lock_expired_accounts         | 10 +++++-----

2350

.../tests/61_udm-users/25_script_lock_expired_accounts         | 10 +++++-----

2340

.../tests/61_udm-users/25_script_lock_expired_passwords        |  6 +++---

2351

.../tests/61_udm-users/25_script_lock_expired_passwords        |  6 +++---

2341

2 files changed, 8 insertions(+), 8 deletions(-)

2352

2 files changed, 8 insertions(+), 8 deletions(-)




## roles: [domaincontroller_master]
## exposure: dangerous
## packages: [univention-directory-manager-tools]
## bugs: [35088, 36210]

from datetime import datetime, timedelta
import univention.admin.uldap

		for delta, initial_state, expected_state in [
			[-9, 'none', 'none'],
			[-8, 'none', 'none'],
			[-7, 'none', 'none'],
			[-6, 'none', 'posix'],
			[-5, 'none', 'posix'],
			[-4, 'none', 'posix'],
			[-3, 'none', 'posix'],
			[-2, 'none', 'posix'],
			[-1, 'none', 'posix'],
			[0, 'none', 'posix'],
			[1, 'none', 'none'],
			[2, 'none', 'none'],
			[-4, 'windows', 'all'],
			[0, 'windows', 'all'],
			[2, 'windows', 'windows'],
		]:
			userdata[create_user(delta, initial_state)] = [initial_state, expected_state]




## roles: [domaincontroller_master]
## exposure: dangerous
## packages: [univention-directory-manager-tools]
## bugs: [35088, 36210]

import univention.admin.uldap
import univention.admin.modules as udm_modules

			[-3, 'none', 'posix'],
			[-2, 'none', 'posix'],
			[-1, 'none', 'posix'],
			[0, 'none', 'posix'],
			[1, 'none', 'none'],
			[2, 'none', 'none'],
			[-4, 'windows', 'all'],
			[0, 'windows', 'all'],
			[2, 'windows', 'windows'],
		]:
			userdata[create_user(delta, initial_state)] = [initial_state, expected_state]
- 
subprocess.check_call()
--
test/ucs-test/tests/61_udm-users/25_script_lock_expired_accounts  | 4 ++--
test/ucs-test/tests/61_udm-users/25_script_lock_expired_passwords | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

(-)a/test/ucs-test/tests/61_udm-users/25_script_lock_expired_accounts (-2 / +2 lines)

Lines 3-9	Link Here

## roles: [domaincontroller_master]

## roles: [domaincontroller_master]

## exposure: dangerous

## exposure: dangerous

## packages: [univention-directory-manager-tools]

## packages: [univention-directory-manager-tools]

## bugs: [35088, 36210]

## bugs: [35088,36210]

from datetime import datetime, timedelta

from datetime import datetime, timedelta

import univention.admin.uldap

import univention.admin.uldap

Lines 68-74 def main():	Link Here

				utils.fail('uid=%s should not be locked for posix prior to script execution!' % (entry['username'],))

				utils.fail('uid=%s should not be locked for posix prior to script execution!' % (entry['username'],))

		print 'Calling lock_expired_accounts...'

		print 'Calling lock_expired_accounts...'

		subprocess.call(['/usr/share/univention-directory-manager-tools/lock_expired_accounts', '--only-last-week'])

		subprocess.check_call(['/usr/share/univention-directory-manager-tools/lock_expired_accounts', '--only-last-week'])

		print 'DONE'

		print 'DONE'

		results = udm_modules.lookup('users/user', None, lo, scope='sub', filter=ldap_filter)

		results = udm_modules.lookup('users/user', None, lo, scope='sub', filter=ldap_filter)

(-)a/test/ucs-test/tests/61_udm-users/25_script_lock_expired_passwords (-2 / +1 lines)

Lines 64-70 def main():	Link Here

				utils.fail('uid=%s should not be locked for posix prior to script execution!' % (entry['username'],))

				utils.fail('uid=%s should not be locked for posix prior to script execution!' % (entry['username'],))

		print 'Calling lock_expired_passwords...'

		print 'Calling lock_expired_passwords...'

		subprocess.call(['/usr/share/univention-directory-manager-tools/lock_expired_passwords'])

		subprocess.check_call(['/usr/share/univention-directory-manager-tools/lock_expired_passwords'])

		print 'DONE'

		print 'DONE'

		results = udm_modules.lookup('users/user', None, lo, scope='sub', filter=ldap_filter)

		results = udm_modules.lookup('users/user', None, lo, scope='sub', filter=ldap_filter)

Return to bug 36210