@@ -29,7 +31,7 @@
${_('Remove me')}
-
+
- ${_('Name:')}
- ${group.name}
@@ -49,14 +51,16 @@
- ${group.prerequisite.name}
-
- ${_('Created:')}
- ${group.creation}
- - ${_('Add User:')}
- -
+
+
- ${_('Add User:')}
+ -
+
-
+ |
- -
- ${_('Sponsor')}
-
- ${_('Approve')}
-
+
-
+
+ ${_('Sponsor')}
+
+
+
+ ${_('Approve')}
+
+
-
${_('Remove')}
diff --git a/fas/fas/user.py b/fas/fas/user.py
index 72b1bee..08b0ffc 100644
--- a/fas/fas/user.py
+++ b/fas/fas/user.py
@@ -19,13 +19,12 @@ from fas.model import EmailPurposes
from fas.model import Log
from fas.auth import *
-from fas.user_email import Email, NonFedoraEmail
+#from fas.user_email import Email, NonFedoraEmail
from random import Random
import sha
from base64 import b64encode
-
class KnownUser(validators.FancyValidator):
'''Make sure that a user already exists'''
def _to_python(self, value, state):
@@ -50,6 +49,14 @@ class UnknownUser(validators.FancyValidator):
raise validators.Invalid(_("'%s' already exists.") % value, value, state)
+class NonFedoraEmail(validators.FancyValidator):
+ '''Make sure that an email address is not @fedoraproject.org'''
+ def _to_python(self, value, state):
+ return value.strip()
+ def validate_python(self, value, state):
+ if value.endswith('@fedoraproject.org'):
+ raise validators.Invalid(_("To prevent email loops, your email address cannot be @fedoraproject.org."), value, state)
+
class ValidSSHKey(validators.FancyValidator):
''' Make sure the ssh key uploaded is valid '''
def _to_python(self, value, state):
@@ -84,10 +91,10 @@ class UserSave(validators.Schema):
validators.Regex(regex='^[^\n:<>]+$'),
)
ssh_key = ValidSSHKey(max=5000)
- #mail = validators.All(
- # validators.Email(not_empty=True, strip=True, max=128),
- # NonFedoraEmail(not_empty=True, strip=True, max=128),
- #)
+ email = validators.All(
+ validators.Email(not_empty=True, strip=True, max=128),
+ NonFedoraEmail(not_empty=True, strip=True, max=128),
+ )
#fedoraPersonBugzillaMail = validators.Email(strip=True, max=128)
#fedoraPersonKeyId- Save this one for later :)
postal_address = validators.String(max=512)
@@ -148,7 +155,7 @@ def generate_salt(length=8):
class User(controllers.Controller):
- email = Email()
+ #email = Email()
def __init__(self):
'''Create a User Controller.
@@ -243,6 +250,9 @@ class User(controllers.Controller):
return dict()
try:
target.human_name = human_name
+ # FIXME: WARNING! This is deceptive. Remember that it
+ # changes the email object itself, not the email attached
+ # to the purpose.
target.emails['primary'] = email
# target.emails['bugzilla'] = bugzilla
target.ircnick = ircnick
@@ -323,7 +333,7 @@ class User(controllers.Controller):
session.flush()
newpass = generate_password()
- message = turbomail.Message(config.get('accounts_mail'), person.emails['primary'], _('Welcome to the Fedora Project!'))
+ message = turbomail.Message(config.get('accounts_email'), person.emails['primary'], _('Welcome to the Fedora Project!'))
message.plain = _('''
You have created a new Fedora account!
Your new password is: %s
@@ -424,7 +434,7 @@ forward to working with you!
turbogears.flash(_("username + email combo unknown."))
return dict()
newpass = generate_password()
- message = turbomail.Message(config.get('accounts_mail'), email, _('Fedora Project Password Reset'))
+ message = turbomail.Message(config.get('accounts_email'), email, _('Fedora Project Password Reset'))
mail = _('''
You have requested a password reset!
Your new password is: %s
diff --git a/fas/fas/user_email.py b/fas/fas/user_email.py
index 5d4c89c..7fdfa6b 100644
--- a/fas/fas/user_email.py
+++ b/fas/fas/user_email.py
@@ -238,7 +238,7 @@ class Email(controllers.Controller):
else:
# TODO: Make this email more friendly. Maybe escape the @ in email too?
validurl = config.get('base_url_filter.base_url') + turbogears.url('/user/email/verify/%s/%s/%s') % (target.username, email, validtoken)
- message = turbomail.Message(config.get('accounts_mail'), email, _('Confirm this email address'))
+ message = turbomail.Message(config.get('accounts_email'), email, _('Confirm this email address'))
message.plain = _('''
Go to this URL to verify that you own this email address: %s
''') % validurl
diff --git a/fas/fas2.sql b/fas/fas2.sql
index 9236aac..d92f887 100644
--- a/fas/fas2.sql
+++ b/fas/fas2.sql
@@ -282,65 +282,65 @@ create table visit_identity (
--
-- When a person's fedorabugs role is updated, add them to bugzilla queue.
--
-create or replace function bugzilla_sync() returns trigger as $bz_sync$
- # Decide which row we are operating on and the action to take
- if TD['event'] == 'DELETE':
- # 'r' for removing an entry from bugzilla
- newaction = 'r'
- row = TD['old']
- else:
- # insert or update
- row = TD['new']
- if row['role_status'] == 'approved':
- # approved so add an entry to bugzilla
- newaction = 'a'
- else:
- # no longer approved so remove the entry from bugzilla
- newaction = 'r'
-
- # Get the group id for fedorabugs
- result = plpy.execute("select id from groups where name = 'fedorabugs'", 1)
- if not result:
- # Danger Will Robinson! A basic FAS group does not exist!
- plpy.error('Basic FAS group fedorabugs does not exist')
- # If this is not a fedorabugs role, no change needed
- if row['group_id'] != result[0]['id']:
- return None
-
- # Retrieve the bugzilla email address
- plan = plpy.prepare("select email, purpose from person_emails as pee,"
- " email_purposes as epu"
- " where epu.id = epu.email_id and pee.person_id = $1"
- " and purpose in ('bugzilla', 'primary')",
- ('text',))
- result = plpy.execute(plan, row['person_id'])
- email = None
- for record in result:
- email = record['email']
- if record['purpose'] == 'bugzilla':
- break
- if not email:
- raise plpy.error('Cannot approve fedorabugs for person_id(%s) because they have no email address to use with bugzilla' % row['person_id'])
-
- # If there is already a row in bugzilla_queue update, otherwise insert
- plan = plpy.prepare("select email from bugzilla_queue where email = $1",
- ('text',))
- result = plpy.execute(plan, (email,), 1)
- if result:
- plan = plpy.prepare("update bugzilla_queue set action = $1"
- " where email = $2", ('char', 'text'))
- plpy.execute(plan, (newaction, email))
- else:
- plan = plpy.prepare("insert into bugzilla_queue (email, group_id"
- ", person_id, action) values ($1, $2, $3, $4)",
- ('text', 'text', 'text', 'char'))
- plpy.execute(plan, (email, row['group_id'], row['person_id'], newaction))
- return None
-$bz_sync$ language plpythonu;
-
-create trigger role_bugzilla_sync before update or insert or delete
- on person_roles
- for each row execute procedure bugzilla_sync();
+-- create or replace function bugzilla_sync() returns trigger as $bz_sync$
+-- # Decide which row we are operating on and the action to take
+-- if TD['event'] == 'DELETE':
+-- # 'r' for removing an entry from bugzilla
+-- newaction = 'r'
+-- row = TD['old']
+-- else:
+-- # insert or update
+-- row = TD['new']
+-- if row['role_status'] == 'approved':
+-- # approved so add an entry to bugzilla
+-- newaction = 'a'
+-- else:
+-- # no longer approved so remove the entry from bugzilla
+-- newaction = 'r'
+--
+-- # Get the group id for fedorabugs
+-- result = plpy.execute("select id from groups where name = 'fedorabugs'", 1)
+-- if not result:
+-- # Danger Will Robinson! A basic FAS group does not exist!
+-- plpy.error('Basic FAS group fedorabugs does not exist')
+-- # If this is not a fedorabugs role, no change needed
+-- if row['group_id'] != result[0]['id']:
+-- return None
+--
+-- # Retrieve the bugzilla email address
+-- plan = plpy.prepare("select email, purpose from person_emails as pee,"
+-- " email_purposes as epu"
+-- " where epu.id = epu.email_id and pee.person_id = $1"
+-- " and purpose in ('bugzilla', 'primary')",
+-- ('text',))
+-- result = plpy.execute(plan, row['person_id'])
+-- email = None
+-- for record in result:
+-- email = record['email']
+-- if record['purpose'] == 'bugzilla':
+-- break
+-- if not email:
+-- raise plpy.error('Cannot approve fedorabugs for person_id(%s) because they have no email address to use with bugzilla' % row['person_id'])
+--
+-- # If there is already a row in bugzilla_queue update, otherwise insert
+-- plan = plpy.prepare("select email from bugzilla_queue where email = $1",
+-- ('text',))
+-- result = plpy.execute(plan, (email,), 1)
+-- if result:
+-- plan = plpy.prepare("update bugzilla_queue set action = $1"
+-- " where email = $2", ('char', 'text'))
+-- plpy.execute(plan, (newaction, email))
+-- else:
+-- plan = plpy.prepare("insert into bugzilla_queue (email, group_id"
+-- ", person_id, action) values ($1, $2, $3, $4)",
+-- ('text', 'text', 'text', 'char'))
+-- plpy.execute(plan, (email, row['group_id'], row['person_id'], newaction))
+-- return None
+-- $bz_sync$ language plpythonu;
+--
+-- create trigger role_bugzilla_sync before update or insert or delete
+-- on person_roles
+-- for each row execute procedure bugzilla_sync();
--
-- When an email address changes, check whether it needs to be changed in
|