← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/security/views.py

Remove the setup.configure import from setup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/security/views.py
25
25
    # This needs to be importable from outside Apache.
26
26
    pass
27
27
 
28
 
import ivle.pulldown_subj
29
 
import ivle.webapp.security
 
28
import ivle.util
 
29
import ivle.dispatch.login
30
30
from ivle.auth import authenticate, AuthError
31
31
from ivle.webapp.base.xhtml import XHTMLView
32
32
from ivle.webapp.base.plugins import CookiePlugin
 
33
from ivle.dispatch.login import get_user_details
33
34
 
34
35
class LoginView(XHTMLView):
35
36
    '''A view to allow a user to log in.'''
36
37
    template = 'login.html'
37
 
    allow_overlays = False
38
38
 
39
39
    def authorize(self, req):
40
40
        return True
46
46
        if nexturl is None:
47
47
            nexturl = '/'
48
48
 
49
 
        # We are already logged in. If it is a POST, they might be trying to
50
 
        # clobber their session with some new credentials. That's their own
51
 
        # business, so we let them do it. Otherwise, we don't bother prompting
52
 
        # and just redirect to the destination.
 
49
        # We are already logged in. Don't bother logging in again.
53
50
        # Note that req.user is None even if we are 'logged in', if the user is
54
 
        # invalid (state != enabled, or expired).
55
 
        if req.method != "POST" and req.user is not None:
 
51
        # invalid.
 
52
        if req.user is not None:
56
53
            req.throw_redirect(nexturl)
57
54
 
58
 
        # Don't give any URL if we want /.
59
 
        if nexturl == '/':
60
 
            query_string = ''
61
 
        else:
62
 
            query_string = '?url=' + urllib.quote(nexturl, safe="/~")
63
 
 
64
 
        ctx['path'] = req.make_path('+login') + query_string
 
55
        ctx['path'] = ivle.util.make_path('+login') + \
 
56
                         '?' + urllib.urlencode([('url', nexturl)])
65
57
 
66
58
        # If this succeeds, the user is invalid.
67
 
        user = ivle.webapp.security.get_user_details(req)
 
59
        user = get_user_details(req)
68
60
        if user is not None:
69
61
            if user.state == "no_agreement":
70
62
                # Authenticated, but need to accept the ToS. Send them there.
72
64
                # if you are not planning to display a ToS page - the ToS
73
65
                # acceptance process actually calls usrmgt to create the user
74
66
                # jails and related stuff.
75
 
                req.throw_redirect(req.make_path('+tos') + query_string)
 
67
                req.throw_redirect(ivle.util.make_path('+tos') + \
 
68
                        '?' + urllib.urlencode([('url', nexturl)]))
76
69
            elif user.state == "pending":
77
70
                # FIXME: this isn't quite the right answer, but it
78
71
                # should be more robust in the short term.
86
79
        if req.method == "POST":
87
80
            # While req.user is normally set to get_user_details, it won't set
88
81
            # it if the account isn't valid. So we get it ourselves.
89
 
            user = ivle.webapp.security.get_user_details(req)
 
82
            user = get_user_details(req)
90
83
 
91
84
            badlogin = None
92
85
 
101
94
                else:
102
95
                    user = None
103
96
                    try:
104
 
                        # Username is case insensitive
105
 
                        user = authenticate.authenticate(req.config, req.store,
106
 
                                    username.value.lower(), password.value)
 
97
                        user = authenticate.authenticate(req.store,
 
98
                                    username.value, password.value)
107
99
                    except AuthError, msg:
108
100
                        badlogin = msg
109
101
                    if user is None:
115
107
                        session = req.get_session()
116
108
                        session['login'] = user.login
117
109
                        session.save()
118
 
                        session.unlock()
119
110
                        user.last_login = datetime.datetime.now()
 
111
                        req.store.commit()
120
112
 
121
113
                        # Create cookies for plugins that might request them.
122
 
                        for plugin in req.config.plugin_index[CookiePlugin]:
 
114
                        for plugin in req.plugin_index[CookiePlugin]:
123
115
                            for cookie in plugin.cookies:
124
116
                                # The function can be None if they just need to be
125
117
                                # deleted at logout.
127
119
                                    req.add_cookie(mod_python.Cookie.Cookie(cookie,
128
120
                                          plugin.cookies[cookie](user), path='/'))
129
121
 
130
 
                        # Add any new enrolments.
131
 
                        ivle.pulldown_subj.enrol_user(req.config, req.store, user)
132
 
                        req.store.commit()
133
 
 
134
122
                        req.throw_redirect(nexturl)
135
123
 
136
124
                # We didn't succeed.
141
129
class LogoutView(XHTMLView):
142
130
    '''A view to log the current session out.'''
143
131
    template = 'logout.html'
144
 
    allow_overlays = False
145
132
 
146
133
    def authorize(self, req):
147
134
        # This can be used by any authenticated user, even if they haven't
148
135
        # accepted the ToS yet.
149
 
        return ivle.webapp.security.get_user_details(req) is not None
 
136
        return ivle.dispatch.login.get_user_details(req) is not None
150
137
 
151
138
    def populate(self, req, ctx):
152
139
        if req.method == "POST":
153
140
            req.logout()
154
141
        else:
155
 
            ctx['path'] =  req.make_path('+logout')
 
142
            ctx['path'] =  ivle.util.make_path('+logout')