← 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-03-18 09:02:12 UTC
  • Revision ID: grantw@unimelb.edu.au-20100318090212-yow58im0b21f9h6x
Tags: 1.0.1
Update version to 1.0.1.

Show diffs side-by-side

added added

removed removed

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