rendered paste body=== modified file 'fedora/tg/identity/safas2provider.py'
--- fedora/tg/identity/safas2provider.py 2007-06-08 21:17:32 +0000
+++ fedora/tg/identity/safas2provider.py 2007-06-22 22:20:01 +0000
@@ -39,10 +39,10 @@
class FASGroup(object):
def __init__(self, group):
- self.group_id = group
- self.group_name = group
- self.display_name = group
- self.group = group
+ self.group_id = group[0]
+ self.group_name = group[0]
+ self.display_name = group[0]
+ self.group = group[0]
class SaFasIdentity(SqlAlchemyIdentity):
def __init__(self, visit_key, user=None):
@@ -105,7 +105,11 @@
user = Person.byUserName(user_name)
- verified = self.validate_password(user, user_name, password)
+ try:
+ verified = self.validate_password(user, user_name, password)
+ except AuthError, e:
+ log.warning(e)
+ return None
if not verified:
log.warning('Passwords do not match for user: %s', user_name)
return None
@@ -134,7 +138,7 @@
'''
try:
result = Person.auth(user_name, password)
- except AuthError, e:
+ except Exception, e:
log.warning('AccountSystem threw an exception: %s', e)
return False
return True