← 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-02-27 05:07:09 UTC
  • Revision ID: grantw@unimelb.edu.au-20090227050709-k16kvhyl50nzjbwm
Subject URLs now contain the short name (eg. info1) rather than the code
(eg. 600151).

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