← 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-02-24 09:51:04 UTC
  • Revision ID: grantw@unimelb.edu.au-20100224095104-nl3ndy0cysz2ioad
Add support for "really deep" (more than two segment) views.

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