Changeset 10413

Timestamp:

7 Jul 2013, 08:02:18 (11 years ago)

Author:

uli

Message:

Support warn parameter for login.

Location:

main/waeup.cas/trunk/waeup/cas

Files:

• server.py (modified) (5 diffs)
• templates/login_service_confirm.html (added)
• tests/test_server.py (modified) (1 diff)

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

@@ -133 +133 @@
 
 
-def login_redirect_service(db, service, sso=True, create_ticket=True):
+def login_redirect_service(db, service, sso=True, create_ticket=True,
+                           warn=False):
     """Return a response redirecting to a service via HTTP 303 See Other.
     """
-    # safely redirect to service given
     if create_ticket:
         st = create_service_ticket(service, sso)
@@ -142 +142 @@
         service = '%s?ticket=%s' % (service, st.ticket)
     html = get_template('login_service_redirect.html')
+    if warn:
+        html = get_template('login_service_confirm.html')
     html = html.replace('SERVICE_URL', service)
     resp = exc.HTTPSeeOther(location=service)
+    if warn:
+        resp = Response()
     # try to forbid caching of any type
     resp.cache_control = 'no-store'
@@ -210 +214 @@
         service = req.POST.get('service', req.GET.get('service', None))
         renew = req.POST.get('renew', req.GET.get('renew', None))
+        warn = req.POST.get('warn', req.GET.get('warn', False))
         gateway = req.POST.get('gateway', req.GET.get('gateway', None))
         if renew is not None and gateway is not None:
@@ -224 +229 @@
         if tgc and (renew is None):
             if service:
-                return login_redirect_service(self.db, service, sso=True)
+                return login_redirect_service(
+                    self.db, service, sso=True, warn=warn)
             else:
                 return login_success_no_service(
@@ -238 +244 @@
                 else:
                     # safely redirect to service given
-                    return login_redirect_service(self.db, service, sso=False)
+                    return login_redirect_service(
+                        self.db, service, sso=False, warn=warn)
             else:
                 # login failed

main/waeup.cas/trunk/waeup/cas/tests/test_server.py

@@ -200 +200 @@
         assert b'username' in resp.body
         assert 'Set-Cookie' not in resp.headers
+
+    def test_login_warn(self):
+        # 2.2.1 as a credential acceptor, with `warn` set we require confirm
+        app = CASServer()
+        tgc = create_tgc_value()
+        app.db.add(tgc)
+        value = str(tgc.value)
+        params = 'warn=true&service=http%3A%2F%2Fwww.service.com'
+        req = Request.blank('https://localhost/login?%s' % params)
+        req.headers['Cookie'] = 'cas-tgc=%s' % value
+        resp = app(req)
+        # without warn, we would get a redirect
+        assert resp.status == '200 OK'
+        assert b'CAS login successful' in resp.body