Changeset 10403 for main

Timestamp:

5 Jul 2013, 09:41:43 (11 years ago)

Author:

uli

Message:

Fix check_session_cookie().
Reorganize login() to be more readable.

File:

• main/waeup.cas/trunk/waeup/cas/server.py (modified) (4 diffs)

main/waeup.cas/trunk/waeup/cas/server.py

@@ -103 +103 @@
     """Check whether `cookie_value` represents a valid ticket granting
     ticket in `db`.
+
+    `cookie_value` is a string representing a ticket granting ticket
+    maybe stored in `db`.
+
+    If a respective cookie can be found, a
+    :class:`waeup.cas.db.TicketGrantingCookie` is returend. Else
+    ``None`` is returned.
     """
     if cookie_value is None:
-        return False
+        return None
     try:
         # turn value into unicode (py2.x) / str (py3.x)
@@ -119 +126 @@
 
 
+def get_template(name):
+    path = os.path.join(template_dir, name)
+    if os.path.isfile(path):
+        return open(path, 'r').read()
+    return None
+
+
+def login_redirect_service(db, service):
+    """Return a response redirecting to a service via HTTP 303 See Other.
+    """
+    # safely redirect to service given
+    st = create_service_ticket(service)
+    db.add(st)
+    service = '%s?ticket=%s' % (service, st.ticket)
+    html = get_template('login_service_redirect.html')
+    html = html.replace('SERVICE_URL', service)
+    resp = exc.HTTPSeeOther(location=service)
+    # try to forbid caching of any type
+    resp.cache_control = 'no-store'
+    resp.pragma = 'no-cache'
+    # some arbitrary date in the past
+    resp.expires = 'Thu, 01 Dec 1994 16:00:00 GMT'
+    resp.text = html
+    return resp
+
+
+def login_success_no_service(db, msg='', sso=False):
+    """Show logged-in screen after successful auth.
+
+    `sso` must be a boolean indicating whether login happened via
+    credentials (``False``) or via cookie (``True``).
+
+    Returns a response.
+    """
+    # show logged-in screen
+    html = get_template('login_successful.html')
+    html = html.replace('MSG_TEXT', msg)
+    resp = Response(html)
+    if not sso:
+        resp = set_session_cookie(resp, db)
+    return resp
+
+
 class CASServer(object):
     """A WSGI CAS server.
@@ -161 +211 @@
         password = req.POST.get('password', None)
         valid_lt = check_login_ticket(self.db, req.POST.get('lt'))
-        tgc = req.cookies.get('cas-tgc', None)
-        tgc = check_session_cookie(self.db, tgc)
+        tgc = check_session_cookie(self.db, req.cookies.get('cas-tgc', None))
         if username and password and valid_lt or tgc:
             # act as credentials acceptor
@@ -175 +224 @@
                 if service is None:
                     # show logged-in screen
-                    html = self._get_template('login_successful.html')
-                    html = html.replace('MSG_TEXT', msg)
-                    resp = Response(html)
-                    if not tgc:
-                        resp = set_session_cookie(resp, self.db)
-                    return resp
+                    sso = (tgc is not None)
+                    return login_success_no_service(self.db, msg, sso)
                 else:
                     # safely redirect to service given
-                    st = create_service_ticket(service)
-                    self.db.add(st)
-                    service = '%s?ticket=%s' % (service, st.ticket)
-                    html = self._get_template('login_service_redirect.html')
-                    html = html.replace('SERVICE_URL', service)
-                    resp = exc.HTTPSeeOther(location=service)
-                    resp.cache_control = 'no-store'
-                    resp.pragma = 'no-cache'
-                    # some arbitrary date in the past
-                    resp.expires = 'Thu, 01 Dec 1994 16:00:00 GMT'
-                    resp.text = html
-                    return resp
+                    return login_redirect_service(self.db, service)
             else:
                 # login failed