X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FPersons.py;h=ff1b6cb845fa27bfb9554f3e1949c664b40eb6ef;hb=b0d2dea38d0136e256330b561ec1c6efd652f4dc;hp=c61e8bda254d6b0aeb2d6575758d585aac1993ef;hpb=e1a827010ec8e6e5c1e1272e22b3269108bcc9c8;p=plcapi.git diff --git a/PLC/Persons.py b/PLC/Persons.py index c61e8bd..ff1b6cb 100644 --- a/PLC/Persons.py +++ b/PLC/Persons.py @@ -4,7 +4,7 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: Persons.py,v 1.17 2006/11/08 22:45:20 mlhuang Exp $ +# $Id: Persons.py,v 1.32 2007/01/11 05:37:55 mlhuang Exp $ # from types import StringTypes @@ -16,11 +16,13 @@ import re import crypt from PLC.Faults import * +from PLC.Debug import log from PLC.Parameter import Parameter from PLC.Filter import Filter from PLC.Table import Row, Table +from PLC.Roles import Role, Roles from PLC.Keys import Key, Keys -import PLC.Sites +from PLC.Messages import Message, Messages class Person(Row): """ @@ -31,9 +33,9 @@ class Person(Row): table_name = 'persons' primary_key = 'person_id' - join_tables = ['person_role', 'person_site', 'slice_person', 'person_session'] + join_tables = ['person_key', 'person_role', 'person_site', 'slice_person', 'person_session', 'peer_person'] fields = { - 'person_id': Parameter(int, "Account identifier"), + 'person_id': Parameter(int, "User identifier"), 'first_name': Parameter(str, "Given name", max = 128), 'last_name': Parameter(str, "Surname", max = 128), 'title': Parameter(str, "Title", max = 128, nullok = True), @@ -43,15 +45,33 @@ class Person(Row): 'bio': Parameter(str, "Biography", max = 254, nullok = True), 'enabled': Parameter(bool, "Has been enabled"), 'password': Parameter(str, "Account password in crypt() form", max = 254), - 'last_updated': Parameter(int, "Date and time of last update", ro = True), + 'verification_key': Parameter(str, "Reset password key", max = 254, nullok = True), + 'verification_expires': Parameter(int, "Date and time when verification_key expires", nullok = True), + 'last_updated': Parameter(int, "Date and time of last update", ro = True), 'date_created': Parameter(int, "Date and time when account was created", ro = True), 'role_ids': Parameter([int], "List of role identifiers"), 'roles': Parameter([str], "List of roles"), 'site_ids': Parameter([int], "List of site identifiers"), 'key_ids': Parameter([int], "List of key identifiers"), 'slice_ids': Parameter([int], "List of slice identifiers"), + 'peer_id': Parameter(int, "Peer to which this user belongs", nullok = True), + 'peer_person_id': Parameter(int, "Foreign user identifier at peer", nullok = True), } + # for Cache + class_key = 'email' + foreign_fields = ['first_name', 'last_name', 'title', 'email', 'phone', 'url', + 'bio', 'enabled', 'password', ] + # forget about these ones, they are read-only anyway + # handling them causes Cache to re-sync all over again + # 'last_updated', 'date_created' + foreign_xrefs = [ + {'field' : 'key_ids', 'class': 'Key', 'table' : 'person_key' } , + {'field' : 'site_ids', 'class': 'Site', 'table' : 'person_site'}, +# xxx this is not handled by Cache yet +# 'role_ids': Parameter([int], "List of role identifiers"), +] + def validate_email(self, email): """ Validate email address. Stolen from Mailman. @@ -74,15 +94,15 @@ class Person(Row): rest = email[at_sign+1:] domain = rest.split('.') - # This means local, unqualified addresses, are no allowed + # This means local, unqualified addresses, are not allowed if not domain: raise invalid_email if len(domain) < 2: raise invalid_email conflicts = Persons(self.api, [email]) - for person_id, person in conflicts.iteritems(): - if 'person_id' not in self or self['person_id'] != person_id: + for person in conflicts: + if 'person_id' not in self or self['person_id'] != person['person_id']: raise PLCInvalidArgument, "E-mail address already in use" return email @@ -104,6 +124,10 @@ class Person(Row): salt = md5.md5(salt).hexdigest()[:8] return crypt.crypt(password.encode(self.api.encoding), magic + salt + "$") + validate_date_created = Row.validate_timestamp + validate_last_updated = Row.validate_timestamp + validate_verification_expires = Row.validate_timestamp + def can_update(self, person): """ Returns true if we can update the specified person. We can @@ -152,97 +176,18 @@ class Person(Row): return False - def add_role(self, role_id, commit = True): - """ - Add role to existing account. - """ - - assert 'person_id' in self - - person_id = self['person_id'] - - if role_id not in self['role_ids']: - self.api.db.do("INSERT INTO person_role (person_id, role_id)" \ - " VALUES(%(person_id)d, %(role_id)d)", - locals()) - - if commit: - self.api.db.commit() - - self['role_ids'].append(role_id) - - def remove_role(self, role_id, commit = True): - """ - Remove role from existing account. - """ - - assert 'person_id' in self - - person_id = self['person_id'] - - if role_id in self['role_ids']: - self.api.db.do("DELETE FROM person_role" \ - " WHERE person_id = %(person_id)d" \ - " AND role_id = %(role_id)d", - locals()) - - if commit: - self.api.db.commit() - - self['role_ids'].remove(role_id) - - def add_key(self, key, commit = True): - """ - Add key to existing account. - """ - - assert 'person_id' in self - assert isinstance(key, Key) - assert 'key_id' in key - - person_id = self['person_id'] - key_id = key['key_id'] - - if key_id not in self['key_ids']: - self.api.db.do("INSERT INTO person_key (person_id, key_id)" \ - " VALUES(%(person_id)d, %(key_id)d)", - locals()) - - if commit: - self.api.db.commit() - - self['key_ids'].append(key_id) - - def remove_key(self, key, commit = True): - """ - Remove key from existing account. - """ - - assert 'person_id' in self - assert isinstance(key, Key) - assert 'key_id' in key - - person_id = self['person_id'] - key_id = key['key_id'] - - if key_id in self['key_ids']: - self.api.db.do("DELETE FROM person_key" \ - " WHERE person_id = %(person_id)d" \ - " AND key_id = %(key_id)d", - locals()) - - if commit: - self.api.db.commit() + add_role = Row.add_object(Role, 'person_role') + remove_role = Row.remove_object(Role, 'person_role') - self['key_ids'].remove(key_id) + add_key = Row.add_object(Key, 'person_key') + remove_key = Row.remove_object(Key, 'person_key') def set_primary_site(self, site, commit = True): """ - Set the primary site for an existing account. + Set the primary site for an existing user. """ assert 'person_id' in self - assert isinstance(site, PLC.Sites.Site) assert 'site_id' in site person_id = self['person_id'] @@ -267,12 +212,12 @@ class Person(Row): def delete(self, commit = True): """ - Delete existing account. + Delete existing user. """ # Delete all keys keys = Keys(self.api, self['key_ids']) - for key in keys.values(): + for key in keys: key.delete(commit = False) # Clean up miscellaneous join tables @@ -290,11 +235,11 @@ class Persons(Table): database. """ - def __init__(self, api, person_filter = None): - Table.__init__(self, api, Person) + def __init__(self, api, person_filter = None, columns = None): + Table.__init__(self, api, Person, columns) sql = "SELECT %s FROM view_persons WHERE deleted IS False" % \ - ", ".join(Person.fields) + ", ".join(self.columns) if person_filter is not None: if isinstance(person_filter, (list, tuple, set)):