← 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

  • Committer: William Grant
  • Date: 2010-07-30 11:52:23 UTC
  • Revision ID: grantw@unimelb.edu.au-20100730115223-bcyxqpefhp514ra8
Tags: 1.0.2
Release 1.0.2.

Show diffs side-by-side

added added

removed removed

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