crans/lc_ldap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[lc_ldap, attributs] bugfixes, pylint++

Browse source
This commit is contained in:
Antoine Durand-Gasselin 2010-11-11 17:59:38 +01:00
parent 4d761ed180
commit 22b173a2d4
2 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
attributs.py
View file

@ -435,7 +435,7 @@ class blacklist(Attr):
return self.value['actif'] return self.value['actif']
def terminer(self): def terminer(self):
self.value.fin = max(self.value.debut, time.time() - 60) self.value['fin'] = max(self.value['debut'], time.time() - 60)
self.actif = False self.actif = False
def __unicode__(self): def __unicode__(self):

29
lc_ldap.py
View file

@ -37,7 +37,7 @@ from Levenshtein import jaro
sys.path.append('/usr/scripts/gestion') sys.path.append('/usr/scripts/gestion')
import config, crans_utils import config, crans_utils
from attributs import attrify from attributs import attrify, blacklist
from ldap_locks import CransLock from ldap_locks import CransLock
uri = 'ldapi:///' #'ldap://ldap.adm.crans.org/' uri = 'ldapi:///' #'ldap://ldap.adm.crans.org/'
@ -180,11 +180,10 @@ class lc_ldap(ldap.ldapobject.LDAPObject):
uniquement en unicode''' uniquement en unicode'''
cldif = ldif_to_cldif(uldif, self) cldif = ldif_to_cldif(uldif, self)
#lock = CransLock(self) #lock = CransLock(self)
for item in ['aid', 'uid', 'chbre', 'mailAlias', 'canonicalAlias', # for item in ['aid', 'uid', 'chbre', 'mailAlias', 'canonicalAlias',
'fid', 'cid', 'mid', 'macAddress', 'host', 'hostAlias' ]: # 'fid', 'cid', 'mid', 'macAddress', 'host', 'hostAlias' ]:
for val in cldif.get(item, []): # for val in cldif.get(item, []):
pass #lock.add(item, val) # lock.add(item, val)
#uldif['historique'] = [ self._hist('Création')]
ldif = cldif_to_ldif(cldif) ldif = cldif_to_ldif(cldif)
modlist = addModlist(ldif) modlist = addModlist(ldif)
#with lock: #with lock:
@ -210,9 +209,9 @@ class lc_ldap(ldap.ldapobject.LDAPObject):
(attr, plage[0], i)) (attr, plage[0], i))
return i return i
def _hist(self, msg): # def _hist(self, msg):
now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M : ') # now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M : ')
return unicode(now) + msg # return unicode(now) + msg
# ? def reconnect(self, conn=None): # ? def reconnect(self, conn=None):
@ -324,10 +323,10 @@ class CransLdapObject(object):
return [ unicode(v) for v in self.attrs[attr] ] return [ unicode(v) for v in self.attrs[attr] ]
def __setitem__(self, attr, values): def __setitem__(self, attr, values):
if not isinstance(values, list): if not isinstance(values, list):
values = [ values ] values = [ values ]
self._modifs[attr] = values self._modifs[attr] = values
self._modifs[attr] = [ attrify(val, attr, self._modifs, self.conn) for val in values ] self._modifs[attr] = [ attrify(val, attr, self._modifs, self.conn) for val in values ]
def search_historique(self, ign_fields=HIST_IGNORE_FIELDS): def search_historique(self, ign_fields=HIST_IGNORE_FIELDS):
u"""Récupère l'historique u"""Récupère l'historique
@ -358,7 +357,7 @@ class CransLdapObject(object):
out.append("%s : [%s] %s" % (date, attrs['reqAuthzID'][0], " ; ".join(mod_list))) out.append("%s : [%s] %s" % (date, attrs['reqAuthzID'][0], " ; ".join(mod_list)))
return out return out
def blacklist(self, sanction, commentaire, debut=time.time(), fin = '-') def blacklist(self, sanction, commentaire, debut=time.time(), fin = '-'):
u""" u"""
Blacklistage de la ou de toutes la machines du propriétaire Blacklistage de la ou de toutes la machines du propriétaire
* debut et fin sont le nombre de secondes depuis epoch * debut et fin sont le nombre de secondes depuis epoch
@ -371,7 +370,7 @@ class CransLdapObject(object):
debut = time.time() debut = time.time()
if fin == 'now': if fin == 'now':
fin = time.time() fin = time.time()
bl = balcklist(u'%s$s$s$s' % (sanction, commentaire, debut, fin), {}, self.conn, False) bl = blacklist(u'%s$%s$%s$%s' % (sanction, commentaire, debut, fin), {}, self.conn, False)
self._modifs.setdefault('blacklist', []).append(bl) self._modifs.setdefault('blacklist', []).append(bl)