← 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: 2009-05-28 02:43:56 UTC
  • Revision ID: grantw@unimelb.edu.au-20090528024356-mlrhizz7omnr71hd
Test ivle.mimetypes.nice_filetype.

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