-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
The attached patch resolves the following issues that were interfering
with FAS integration in ReviewBoard.
django/auth/middleware.py:
If there are other authentication mechanisms in place, don't throw
an exception on a missing session_id
django/auth/models.py:
connection.group_list returns a tuple, the second entry of which is
the dict that we intended to be accessing. Trying to call
gl['groups'] throws a KeyError
userinfo in _get_name() contains a double-level dictionary. When
requesting 'human_name', we need to access the 'person' dictionary
first or we throw a KeyError
- --
Stephen Gallagher
RHCE 804006346421761
Delivering value year after year.
Red Hat ranks #1 in value among software vendors.
http://www.redhat.com/promo/vendor/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/
iEYEARECAAYFAkt63FwACgkQeiVVYja6o6MO5wCbBxWmJ7bVn6FxzGuBOta+4IMI
TdYAn20akaNKqn2ibHU2Oy6n17BKOR+Q
=A2UF
-----END PGP SIGNATURE-----
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sgallagh@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
# target_branch: bzr://bzr.fedorahosted.org/bzr/python-fedora/python-\
# fedora-devel/
# testament_sha1: c9e3af7506ac04bedbee51287e2db727deeebc66
# timestamp: 2010-02-16 12:55:16 -0500
# base_revision_id: toshio@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
# q69f2pcejl403upz
#
# Begin patch
=== modified file 'fedora/django/auth/middleware.py'
--- fedora/django/auth/middleware.py 2009-07-30 21:18:38 +0000
+++ fedora/django/auth/middleware.py 2010-02-16 15:51:10 +0000
@@ -44,7 +44,10 @@
if 'tg-visit' in request.session:
del request.session['tg-visit']
else:
- request.session['tg-visit'] = local.session_id
+ try:
+ request.session['tg-visit'] = local.session_id
+ except:
+ pass
# response.set_cookie(key='tg-visit',
# value=local.session_id, max_age=0)
return response
=== modified file 'fedora/django/auth/models.py'
--- fedora/django/auth/models.py 2009-12-23 14:23:12 +0000
+++ fedora/django/auth/models.py 2010-02-16 15:51:10 +0000
@@ -56,7 +56,7 @@
print _('Unable to load FAS groups. Did you set '
'FAS_USERNAME and FAS_PASSWORD?')
else:
- groups = gl['groups']
+ groups = gl[1]['groups']
for group in groups:
_new_group(group)
if verbosity > 0:
@@ -91,7 +91,11 @@
class FasUser(authmodels.User):
def _get_name(self):
userinfo = person_by_id(self.id)
- return userinfo['human_name']
+ human_name = userinfo['person']['human_name']
+ if human_name:
+ return human_name
+ else:
+ return ''
def _get_email(self):
return '%s@xxxxxxxxxxxxxxxxx' % self.username
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWL/uH4AAnj/gERUQABR5///
U6gcir////BQBc9zte5wo0NdvcUz2usdwlEgNJlNqeIyQ08mp6jQ00AAY1HqAJSJGTwkaE/VGm0T
R6Q9IGEMTTIYJglAgkyaCep6ptqZMUNADIMjRoAAkVPUakejSNPKGjTI0000NAaAAAAkkICejUyD
U2iYUT2EnpR+qeSaDT0gH6pKQCJuoyrXeuuXbVn+jd5aLftf2+bHT7ST77SO5hkoS5YVSJsMN9UJ
hJxpdx4wkz7xBgwCJxBa/65pcF+xcMyiqT+p+4nph9rNCteyQqaNmzPb9D7ekee9WXjQwYjKPDw9
F3HZWh+MvFf1z+9miTWV5K1uzSJtG19ciIYLpXuEPsRxRwjK5WfLIx7ZL3LrzUYKtsvDKuIpmXgs
oC33YkE3+G3W7HW3g6H8EzMzmmfm/F5TzPG0DcYBtRICvYeQx0zXQr3HTo4fKQQGKQgxQpFLoglB
8zyqUsGOaOKtNGFpsbcQBFcIsU6ReAmTSM86RiFRpGCTD8kpgQk6Cnn4kz4Z0FqjTAZEPjz2GcCw
mZ93VN0uij7q8kFAhFtTeBQBrT1aW81RhmTx4gacCgCcNEKYJAyu0BBgIsEMw49CXgyWYnnHg5Fg
xA+IbQMFiFwGFV9c5lIClhAvwpkFc5lKB5obwNwOyF+fo9eFkZihozDg4K0NzLOFazGRdjVEK1ci
2dtA5VVFIG3abB5ktA1FwVxYkF5rOYbgWAUmUfoNGJYfxOIaA1FRy0obz+yewMaE4JwiYGUwwzyr
2vlQ1RkX3APhFy1DDywYMia1LuM4nLDCJmMJiDFRffOsSRYDgNRI4uy3MaKg8QfoV6JpgpPVeLJe
zGdWR7uKB5xvJxt741r+RXnmiUEnNGZGJBF1tjb9O6akvXszVLH5Z2ja/sGZp4GckOTI0OB7F97y
TFCNOlpl0GWo1mJzPOovl8S6cyDzKWooESh0bsg+2dBNj6Iq7mhyLcb9wZgMg1VIhim3xOBV01Hy
8zWchxwA5FO8ibe1vFLIczoWHUgMONUd9hrPIazFfIuCjY2ujdaBbHBocRTpFKPuUboDFgcYGyJo
looPvB+P30oIq5VmoHwE1Md7YyfxPgPe6ZaJiYGOchEsaTE5BluMWlJ41sSPKiFjDI2lB0zejtLK
BKJaOmsacMydRmDu1E6DSTmcSKDEinLJ31JTITcWYCvJa4tMaTVYsHUCJ0NkmNDAjfzYV22GkZzp
kFM48dBvOJwXH+kSX6HM0HTinB9HBrRqdwQZUu7CKaZjV15/M/vzI4sMxrA4oHyE0PJAyv79H0Md
aUODkBfKQ7BE3wD0NT+rsLlig5BOabJlvFmmLV9kSiO90/otcJt0NcnQbAqKiCkjsohPNTBU5+OD
tBqQ1HIGPIOBsRTNpnVYP3GycRxHdnBktD3AjEF66Yo5RrrvQXh7VI4LwCKCP67sh+b2aGMYQZqO
i+nMDGmF9zK5WGHUTnVAhBcRL0YddU0KvqnAEzBbQnFtR3GBVRFThxRdxeEIP3bMQzXqhvEKOqqM
OSBKjAy0laldQ0cyKlRjoAlrWpSSq2JLBh3A/3YqF1IhqfVXJsURiM9UFwHu9bFoAmIjFTnHYFQE
0CytGKU7Q9CDHAFmj8LK+WYsai4i3SoxJk4sqDyhwJKFaXjWqWKMUmZExjF/rX8WvSSZn6DKFy2N
zneT2ZLDHD+75nBklfViLZWhpogqB3kF5puUGB7nKoUKTnxfOyB6IZ9eeYwK/YHUOcd5aQpsswCB
wZ2d3zZOrzDyyRdeoKCJ1mMGHHuxUwW0Z1A0gbwLevqekEQMJOXZPWmOdFikvqMIeytg6FE7FHxP
mEjBUNvKaF2CKZDDPIYfeXMgmZCrUsb4gf4u5IpwoSDF/3D8
Attachment:
python-fedora-devel-593.patch.sig
Description: PGP signature
_______________________________________________ infrastructure mailing list infrastructure@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/infrastructure
