Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions authopenid/authopenid.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ def trac_auth_cookie_lifetime(self):
on each authenticated access.
""")

take_default_login = Option('openid', 'take_default_login', False,
"""Set to true if /login should be handled by openid.""")

default_openid = Option('openid', 'default_openid', None,
"""Default OpenID provider for directed identity.""")

Expand Down Expand Up @@ -317,10 +320,12 @@ def get_navigation_items(self, req):
# IRequestHandler methods

def match_request(self, req):
return re.match('/(openidlogin|openidverify|openidprocess|openidlogout)\??.*', req.path_info)
return (re.match('/(openidlogin|openidverify|openidprocess|openidlogout)\??.*', req.path_info) or
(self.take_default_login and (req.path_info == '/login' or req.path_info == '/login/')))
# Please note that I am not using re.match on purpose, because /login/xmlrpc cannot be handled with openid

def process_request(self, req):
if req.path_info.startswith('/openidlogin'):
if req.path_info.startswith('/openidlogin') or (self.take_default_login and req.path_info.startswith('/login')):
return self._do_login(req)
elif req.path_info.startswith('/openidverify'):
return self._do_verify(req)
Expand Down