Revision 244c552b snf-app/synnefo/plankton/util.py

b/snf-app/synnefo/plankton/util.py
40 40
from django.http import (HttpResponse, HttpResponseBadRequest,
41 41
        HttpResponseServerError)
42 42

  
43
from synnefo.db.models import SynnefoUser
44 43
from synnefo.plankton.backend import ImageBackend, BackendException
45 44
from synnefo.util.log import getLogger
46 45

  
......
49 48

  
50 49

  
51 50
def get_user_from_token(token):
52
    try:
53
        user = SynnefoUser.objects.get(auth_token=token)
54
    except SynnefoUser.DoesNotExist:
55
        return None
56
    
57
    expires = user.auth_token_expires
58
    if not expires or expires < datetime.datetime.now():
59
        return None
60
    
61
    return user
51
    return None
62 52

  
63 53

  
64 54
def get_request_user(request):

Also available in: Unified diff