Mercurial > moin > 1.9
changeset 300:174cba552bd9
Fixed a few copy & paste bugs.
imported from: moin--main--1.5--patch-304
author | Alexander Schremmer <alex@alexanderweb.de.tla> |
---|---|
date | Thu, 08 Dec 2005 20:04:35 +0000 |
parents | da111ed329ee |
children | 6b02d608c5f4 |
files | contrib/auth_externalcookie/wikiconfig.py |
diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/auth_externalcookie/wikiconfig.py Wed Dec 07 21:59:24 2005 +0000 +++ b/contrib/auth_externalcookie/wikiconfig.py Thu Dec 08 20:04:35 2005 +0000 @@ -11,7 +11,9 @@ """ authenticate via external cookie """ import Cookie user = None + try_next = True # if True, moin tries the next auth method cookiename = "whatever" # XXX external cookie name you want to use + try: cookie = Cookie.SimpleCookie(request.saved_cookie) except Cookie.CookieError: @@ -49,11 +51,11 @@ if email != user.email: # was the email addr externally updated? user.email = email ; changed = True # yes -> update user profile - if u: - u.create_or_update(changed) - if u and u.valid: # did we succeed making up a valid user? - return u, False # yes, return user object and stop processing auth method list - return None, True # no, return None and continue with next method in auth list + if user: + user.create_or_update(changed) + if user and user.valid: # did we succeed making up a valid user? + try_next = False # stop processing auth method list + return user, try_next from MoinMoin.auth import moin_cookie, http # first try the external_cookie, then http basic auth, then the usual moin_cookie