Changeset 10406 for main/waeup.cas/trunk/waeup

Timestamp:

5 Jul 2013, 10:45:41 (11 years ago)

Author:

uli

Message:

Service tickets now store SSO flag in db.

Location:

main/waeup.cas/trunk/waeup/cas

Files:

• db.py (modified) (3 diffs)
• tests/test_db.py (modified) (2 diffs)

main/waeup.cas/trunk/waeup/cas/db.py

@@ -3 +3 @@
 import time
 from sqlalchemy import (
-    create_engine, Column, Integer, Float, String, MetaData)
+    create_engine, Column, Integer, Float, String, Boolean, MetaData)
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker, scoped_session
@@ -19 +19 @@
     service = Column(String(2048), nullable=True)
     user = Column(String(512), nullable=False)
+    sso = Column(Boolean, nullable=False, default=True)
 
-    def __init__(self, ticket, user, service=None, timestamp=None):
+    def __init__(self, ticket, user, service=None, sso=True, timestamp=None):
         if timestamp is None:
             timestamp = time.time()
@@ -27 +28 @@
         self.service = service
         self.user = user
+        self.sso = sso
 
     def __repr__(self):
-        return "ServiceTicket('%s', '%s', '%s', %s)" % (
-            self.ticket, self.user, self.service, self.ts)
+        return "ServiceTicket('%s', '%s', '%s', %s, %s)" % (
+            self.ticket, self.user, self.service, self.sso, self.ts)
 
 

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

@@ -96 +96 @@
     def test_add_service_ticket(self):
         # we can add service tickets
-        self.db.add(ServiceTicket('foo', 'bar', 'baz', 12.1))
-        result = [(x.ticket, x.user, x.service, x.ts)
+        self.db.add(ServiceTicket('foo', 'bar', 'baz', False, 12.1))
+        result = [(x.ticket, x.user, x.service, x.sso, x.ts)
                   for x in self.db.query(ServiceTicket)]
-        assert result == [('foo', 'bar', 'baz', 12.1)]
+        assert result == [('foo', 'bar', 'baz', False, 12.1)]
 
     def test_service_ticket_repr(self):
         # we can get a proper ServiceTicket representation
         # (i.e. one that can be fed to `eval`)
-        sticket = ServiceTicket('foo', 'bar', 'baz', 12.1)
+        sticket = ServiceTicket('foo', 'bar', 'baz', True, 12.1)
         st_repr = sticket.__repr__()
-        assert st_repr == "ServiceTicket('foo', 'bar', 'baz', 12.1)"
+        assert st_repr == "ServiceTicket('foo', 'bar', 'baz', True, 12.1)"
 
     def test_service_ticket_timestamp(self):
@@ -112 +112 @@
         sticket = ServiceTicket('foo', 'bar', 'baz')
         assert isinstance(sticket.ts, float)
+
+
+    def test_service_ticket_sso(self):
+        # sso is set to True by default
+        sticket = ServiceTicket('foo', 'bar', 'baz')
+        assert sticket.sso is True
 
     def test_ticket_granting_cookie_add(self):