← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/webapp/console/service.py

Add an XHTMLUnauthorizedView which redirects unauthenticated users to the
login page if a page raises an Unauthorized. Alter UserSettingsView to raise
one in the right cases, for testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/console/service.py
31
31
 
32
32
import ivle.console
33
33
import ivle.chat
34
 
from ivle.webapp.base.rest import JSONRESTView, write_operation
 
34
import ivle.conf
 
35
from ivle.webapp.base.rest import JSONRESTView, named_operation
35
36
from ivle.webapp.errors import BadRequest
36
37
 
37
38
# XXX: Should be RPC view, with actions in URL?
38
39
class ConsoleServiceRESTView(JSONRESTView):
39
40
    '''An RPC interface to a Python console.'''
40
 
    def get_permissions(self, user, config):
41
 
        if user is not None:
42
 
            return set(['use'])
43
 
        else:
44
 
            return set()
45
 
 
46
 
    @write_operation('use')
 
41
    @named_operation
47
42
    def start(self, req, cwd=''):
48
43
        working_dir = os.path.join("/home", req.user.login, cwd)
49
44
 
 
45
        uid = req.user.unixid
 
46
 
50
47
        # Start the server
51
 
        jail_path = os.path.join(req.config['paths']['jails']['mounts'],
52
 
                                 req.user.login)
53
 
        cons = ivle.console.Console(req.config, req.user, jail_path,
54
 
                working_dir)
 
48
        jail_path = os.path.join(ivle.conf.jail_base, req.user.login)
 
49
        cons = ivle.console.Console(uid, jail_path, working_dir)
55
50
 
56
51
        # Assemble the key and return it. Yes, it is double-encoded.
57
52
        return {'key': cjson.encode({"host": cons.host,
58
53
                                     "port": cons.port,
59
54
                                     "magic": cons.magic}).encode('hex')}
60
55
 
61
 
    @write_operation('use')
62
 
    def chat(self, req, key, text='', cwd='', kind="chat"):
 
56
    @named_operation
 
57
    def chat(self, req, key, text='', kind="chat"):
63
58
        # The request *should* have the following four fields:
64
59
        # key: Hex JSON dict of host and port where the console server lives,
65
60
        # and the secret to use to digitally sign the communication with the
75
70
        except KeyError:
76
71
            raise BadRequest("Invalid console key.")
77
72
 
78
 
        jail_path = os.path.join(req.config['paths']['jails']['mounts'],
79
 
                                 req.user.login)
80
 
        # Within Jail
81
 
        working_dir = os.path.join("/home", req.user.login, cwd)
82
 
 
83
 
        # XXX: JSONRESTView should do this for us.
84
 
        text = text.decode('utf-8')
 
73
        jail_path = os.path.join(ivle.conf.jail_base, req.user.login)
 
74
        working_dir = os.path.join("/home", req.user.login)   # Within jail
 
75
        uid = req.user.unixid
85
76
 
86
77
        msg = {'cmd':kind, 'text':text}
87
78
        try:
 
79
            json_response = ivle.chat.chat(host, port, msg, magic,decode=False)
 
80
 
 
81
            # Snoop the response from python-console to check that it's valid
88
82
            try:
89
 
                json_response = ivle.chat.chat(host, port, msg, magic,decode=False)
90
 
                # Snoop the response from python-console to check that it's valid
91
83
                response = cjson.decode(json_response)
92
 
            except (cjson.DecodeError, ivle.chat.ProtocolError):
 
84
            except cjson.DecodeError:
93
85
                # Could not decode the reply from the python-console server
94
86
                response = {"terminate":
95
 
                    "Communication lost"}
 
87
                    "Communication to console process lost"}
96
88
            if "terminate" in response:
97
 
                response = restart_console(req.config, req.user, jail_path,
98
 
                    working_dir, response["terminate"])
 
89
                response = restart_console(uid, jail_path, working_dir,
 
90
                    response["terminate"])
99
91
        except socket.error, (enumber, estring):
100
92
            if enumber == errno.ECONNREFUSED:
101
93
                # Timeout: Restart the session
102
 
                response = restart_console(req.config, req.user, jail_path,
103
 
                    working_dir,
104
 
                    "Timed out due to inactivity")
 
94
                response = restart_console(uid, jail_path, working_dir,
 
95
                    "The IVLE console has timed out due to inactivity")
105
96
            elif enumber == errno.ECONNRESET:
106
97
                # Communication issue: Restart the session
107
 
                response = restart_console(req.config, req.user, jail_path,
108
 
                    working_dir,
109
 
                    "Connection reset")
 
98
                response = restart_console(uid, jail_path, working_dir,
 
99
                    "Connection with the console has been reset")
110
100
            else:
111
101
                # Some other error - probably serious
112
102
                raise socket.error, (enumber, estring)
113
103
        return response
114
104
 
115
105
 
116
 
def restart_console(config, user, jail_path, working_dir, reason):
 
106
def restart_console(uid, jail_path, working_dir, reason):
117
107
    """Tells the client that it must be issued a new console since the old 
118
108
    console is no longer availible. The client must accept the new key.
119
109
    Returns the JSON response to be given to the client.
120
110
    """
121
111
    # Start a new console server console
122
 
    cons = ivle.console.Console(config, user, jail_path, working_dir)
 
112
    cons = ivle.console.Console(uid, jail_path, working_dir)
123
113
 
124
114
    # Make a JSON object to tell the browser to restart its console client
125
115
    new_key = cjson.encode(