[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at f64c538ba64aec15592b76d18c312c8a48beb137

[Adrian Likins]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  f64c538ba64aec15592b76d18c312c8a48beb137 (commit)
       via  c8965e33d3e39a98e53a4f45dbebbc9f86685783 (commit)
      from  596e89abca81c81f3e91f583c5767e4f567c1431 (commit)

- Log -----------------------------------------------------------------
commit f64c538ba64aec15592b76d18c312c8a48beb137
Merge: c8965e3... 596e89a...
Author: Adrian Likins <alikins at grimlock.devel.redhat.com>
Date:   Wed Jun 27 16:10:55 2007 -0400

    Merge branch 'master' of git+ssh://g-alikins@et.redhat.com/git/virt-factory

commit c8965e33d3e39a98e53a4f45dbebbc9f86685783
Author: Adrian Likins <alikins at grimlock.devel.redhat.com>
Date:   Wed Jun 27 16:08:48 2007 -0400

    make sure new session objects get a new timestamp, before they
    were always getting set to the time stamp of the class creation
    (aka, server start up)
    
    also, raise expired token exception in the right place if need
    be.
    
    Should fix the tokens going "bad" after a while
-----------------------------------------------------------------------

Diffstat:
 service/modules/authentication.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/service/modules/authentication.py b/service/modules/authentication.py
index 2645d09..2e10e10 100755
--- a/service/modules/authentication.py
+++ b/service/modules/authentication.py
@@ -66,6 +66,7 @@ class Authentication(web_svc.WebSvc):
          ssn = db.Session()
          ssn.user_id = user.id
          ssn.session_token = token
+         ssn.session_timestamp = datetime.utcnow()
          
          user.sessions.append(ssn)
          
@@ -145,6 +146,7 @@ class Authentication(web_svc.WebSvc):
             if ssn is not None:
                 if ssn.session_timestamp < self.expired_mark():
                     session.delete(ssn)
+                    raise TokenExpiredException()
                 else:
                     valid = True
                     ssn.session_timestamp = datetime.utcnow()

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  596e89abca81c81f3e91f583c5767e4f567c1431 \
  f64c538ba64aec15592b76d18c312c8a48beb137