← 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-11 05:09:56 UTC
  • Revision ID: grantw@unimelb.edu.au-20100211050956-t5i2z6b8iulxteza
Unbreak existing tests.

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
 
import ivle.conf
35
34
from ivle.webapp.base.rest import JSONRESTView, named_operation
36
35
from ivle.webapp.errors import BadRequest
37
36
 
51
50
        uid = req.user.unixid
52
51
 
53
52
        # Start the server
54
 
        jail_path = os.path.join(ivle.conf.jail_base, req.user.login)
55
 
        cons = ivle.console.Console(uid, jail_path, working_dir)
 
53
        jail_path = os.path.join(req.config['paths']['jails']['mounts'],
 
54
                                 req.user.login)
 
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
76
76
        except KeyError:
77
77
            raise BadRequest("Invalid console key.")
78
78
 
79
 
        jail_path = os.path.join(ivle.conf.jail_base, req.user.login)
80
 
        working_dir = os.path.join("/home", req.user.login)   # Within jail
 
79
        jail_path = os.path.join(req.config['paths']['jails']['mounts'],
 
80
                                 req.user.login)
 
81
        # Within Jail
 
82
        working_dir = os.path.join("/home", req.user.login, cwd)
81
83
        uid = req.user.unixid
82
84
 
 
85
        # XXX: JSONRESTView should do this for us.
 
86
        text = text.decode('utf-8')
 
87
 
83
88
        msg = {'cmd':kind, 'text':text}
84
89
        try:
85
90
            json_response = ivle.chat.chat(host, port, msg, magic,decode=False)
92
97
                response = {"terminate":
93
98
                    "Communication to console process lost"}
94
99
            if "terminate" in response:
95
 
                response = restart_console(uid, jail_path, working_dir,
96
 
                    response["terminate"])
 
100
                response = restart_console(req.config, uid, jail_path,
 
101
                    working_dir, response["terminate"])
97
102
        except socket.error, (enumber, estring):
98
103
            if enumber == errno.ECONNREFUSED:
99
104
                # Timeout: Restart the session
100
 
                response = restart_console(uid, jail_path, working_dir,
 
105
                response = restart_console(req.config, uid, jail_path,
 
106
                    working_dir,
101
107
                    "The IVLE console has timed out due to inactivity")
102
108
            elif enumber == errno.ECONNRESET:
103
109
                # Communication issue: Restart the session
104
 
                response = restart_console(uid, jail_path, working_dir,
 
110
                response = restart_console(req.config, uid, jail_path,
 
111
                    working_dir,
105
112
                    "Connection with the console has been reset")
106
113
            else:
107
114
                # Some other error - probably serious
109
116
        return response
110
117
 
111
118
 
112
 
def restart_console(uid, jail_path, working_dir, reason):
 
119
def restart_console(config, uid, jail_path, working_dir, reason):
113
120
    """Tells the client that it must be issued a new console since the old 
114
121
    console is no longer availible. The client must accept the new key.
115
122
    Returns the JSON response to be given to the client.
116
123
    """
117
124
    # Start a new console server console
118
 
    cons = ivle.console.Console(uid, jail_path, working_dir)
 
125
    cons = ivle.console.Console(config, uid, jail_path, working_dir)
119
126
 
120
127
    # Make a JSON object to tell the browser to restart its console client
121
128
    new_key = cjson.encode(