← 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-15 05:37:50 UTC
  • Revision ID: grantw@unimelb.edu.au-20100215053750-hihmegnp8e7dshc2
Ignore test coverage files.

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:
52
52
        # Start the server
53
53
        jail_path = os.path.join(req.config['paths']['jails']['mounts'],
54
54
                                 req.user.login)
55
 
        cons = ivle.console.Console(uid, jail_path, working_dir)
 
55
        cons = ivle.console.Console(req.config, uid, jail_path, working_dir)
56
56
 
57
57
        # Assemble the key and return it. Yes, it is double-encoded.
58
58
        return {'key': cjson.encode({"host": cons.host,
60
60
                                     "magic": cons.magic}).encode('hex')}
61
61
 
62
62
    @named_operation('use')
63
 
    def chat(self, req, key, text='', kind="chat"):
 
63
    def chat(self, req, key, text='', cwd='', kind="chat"):
64
64
        # The request *should* have the following four fields:
65
65
        # key: Hex JSON dict of host and port where the console server lives,
66
66
        # and the secret to use to digitally sign the communication with the
78
78
 
79
79
        jail_path = os.path.join(req.config['paths']['jails']['mounts'],
80
80
                                 req.user.login)
81
 
        working_dir = os.path.join("/home", req.user.login)   # Within jail
 
81
        # Within Jail
 
82
        working_dir = os.path.join("/home", req.user.login, cwd)
82
83
        uid = req.user.unixid
83
84
 
84
85
        # XXX: JSONRESTView should do this for us.
96
97
                response = {"terminate":
97
98
                    "Communication to console process lost"}
98
99
            if "terminate" in response:
99
 
                response = restart_console(uid, jail_path, working_dir,
100
 
                    response["terminate"])
 
100
                response = restart_console(req.config, uid, jail_path,
 
101
                    working_dir, response["terminate"])
101
102
        except socket.error, (enumber, estring):
102
103
            if enumber == errno.ECONNREFUSED:
103
104
                # Timeout: Restart the session
104
 
                response = restart_console(uid, jail_path, working_dir,
 
105
                response = restart_console(req.config, uid, jail_path,
 
106
                    working_dir,
105
107
                    "The IVLE console has timed out due to inactivity")
106
108
            elif enumber == errno.ECONNRESET:
107
109
                # Communication issue: Restart the session
108
 
                response = restart_console(uid, jail_path, working_dir,
 
110
                response = restart_console(req.config, uid, jail_path,
 
111
                    working_dir,
109
112
                    "Connection with the console has been reset")
110
113
            else:
111
114
                # Some other error - probably serious
113
116
        return response
114
117
 
115
118
 
116
 
def restart_console(uid, jail_path, working_dir, reason):
 
119
def restart_console(config, uid, jail_path, working_dir, reason):
117
120
    """Tells the client that it must be issued a new console since the old 
118
121
    console is no longer availible. The client must accept the new key.
119
122
    Returns the JSON response to be given to the client.
120
123
    """
121
124
    # Start a new console server console
122
 
    cons = ivle.console.Console(uid, jail_path, working_dir)
 
125
    cons = ivle.console.Console(config, uid, jail_path, working_dir)
123
126
 
124
127
    # Make a JSON object to tell the browser to restart its console client
125
128
    new_key = cjson.encode(