X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FPersons.py;h=ff1b6cb845fa27bfb9554f3e1949c664b40eb6ef;hb=ccf2e73ce274752dba1f9a7ad07b272831506cd9;hp=54e6a86c95c8576951511a0273d8209debb6b002;hpb=1c7c097852a2f2c3683091e5ffd58628bc4a88e8;p=plcapi.git diff --git a/PLC/Persons.py b/PLC/Persons.py index 54e6a86..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.26 2007/01/05 15:56:16 tmack Exp $ +# $Id: Persons.py,v 1.32 2007/01/11 05:37:55 mlhuang Exp $ # from types import StringTypes @@ -16,12 +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 from PLC.Messages import Message, Messages -import PLC.Sites class Person(Row): """ @@ -32,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), @@ -44,8 +45,8 @@ 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), - 'verification_key': Parameter(str, "Reset password key", max = 254), - 'verification_expires': Parameter(str, "Date/Time when verification_key expires", max = 254), + '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"), @@ -53,7 +54,8 @@ class Person(Row): '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 at which this slice was created", nullok = True), + '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 @@ -92,7 +94,7 @@ 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: @@ -122,12 +124,9 @@ class Person(Row): salt = md5.md5(salt).hexdigest()[:8] return crypt.crypt(password.encode(self.api.encoding), magic + salt + "$") - # timestamps - # verification_expires in the DB but not exposed here - def validate_date_created (self, timestamp): - return self.validate_timestamp (timestamp) - def validate_last_updated (self, timestamp): - return self.validate_timestamp (timestamp) + validate_date_created = Row.validate_timestamp + validate_last_updated = Row.validate_timestamp + validate_verification_expires = Row.validate_timestamp def can_update(self, person): """ @@ -177,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() + add_role = Row.add_object(Role, 'person_role') + remove_role = Row.remove_object(Role, 'person_role') - 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() - - 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'] @@ -290,72 +210,9 @@ class Person(Row): self['site_ids'].remove(site_id) self['site_ids'].insert(0, site_id) - def send_initiate_password_reset_email(self): - # email user next step instructions - to_addr = {} - to_addr[self['email']] = "%s %s" % \ - (self['first_name'], self['last_name']) - from_addr = {} - from_addr[self.api.config.PLC_MAIL_SUPPORT_ADDRESS] = \ - "%s %s" % ('Planetlab', 'Support') - - # fill in template - messages = Messages(self.api, ['PASSWORD_RESET_INITIATE']) - if not messages: - raise PLCAPIError, "Email template not found" - - message = messages[0] - subject = message['subject'] - template = message['template'] % \ - (self.api.config.PLC_WWW_HOST, - self['verification_key'], self['person_id'], - self.api.config.PLC_MAIL_SUPPORT_ADDRESS, - self.api.config.PLC_WWW_HOST) - - self.api.mailer.mail(to_addr, None, from_addr, subject, template) - - def send_account_registered_email(self, site): - - to_addr = {} - cc_addr = {} - from_addr = {} - from_addr[self.api.config.PLC_MAIL_SUPPORT_ADDRESS] = \ - "%s %s" % ('Planetlab', 'Support') - - # email user - user_full_name = "%s %s" % (self['first_name'], self['last_name']) - to_addr[self['email']] = "%s" % user_full_name - - # if the account had a admin role or a pi role, email support. - if set(['admin', 'pi']).intersection(self['roles']): - to_addr[self.api.config.PLC_MAIL_SUPPORT_ADDRESS] = \ - "%s %s" % ('Planetlab', 'Support') - - # cc site pi's - site_persons = Persons(self.api, site['person_ids']) - for person in site_persons: - if 'pi' in person['roles'] and not person['email'] in to_addr.keys(): - cc_addr[person['email']] = "%s %s" % \ - (person['first_name'], person['last_name']) - - # fill in template - messages = Messages(self.api, ['ACCOUNT_REGISTERED']) - if not messages: - raise PLCAPIError, "Email template not found" - - message = messages[0] - subject = message['subject'] % (user_full_name, site['name']) - template = message['template'] % \ - (user_full_name, site['name'], ", ".join(self['roles']), - self.api.config.PLC_WWW_HOST, self['person_id'], - self.api.config.PLC_MAIL_SUPPORT_ADDRESS, - self.api.config.PLC_WWW_HOST) - - self.api.mailer.mail(to_addr, cc_addr, from_addr, subject, template) - def delete(self, commit = True): """ - Delete existing account. + Delete existing user. """ # Delete all keys @@ -394,4 +251,5 @@ class Persons(Table): elif isinstance(person_filter, dict): person_filter = Filter(Person.fields, person_filter) sql += " AND (%s)" % person_filter.sql(api, "AND") + self.selectall(sql)