← 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-13 01:16:01 UTC
  • Revision ID: grantw@unimelb.edu.au-20100213011601-z4m8ax3zs46m33be
Tags: test
Restrict some queries to active enrolments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/console/service.py
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
 
50
52
        # Start the server
51
53
        jail_path = os.path.join(req.config['paths']['jails']['mounts'],
52
54
                                 req.user.login)
53
 
        cons = ivle.console.Console(req.config, req.user, jail_path,
54
 
                working_dir)
 
55
        cons = ivle.console.Console(req.config, uid, jail_path, working_dir)
55
56
 
56
57
        # Assemble the key and return it. Yes, it is double-encoded.
57
58
        return {'key': cjson.encode({"host": cons.host,
79
80
                                 req.user.login)
80
81
        # Within Jail
81
82
        working_dir = os.path.join("/home", req.user.login, cwd)
 
83
        uid = req.user.unixid
82
84
 
83
85
        # XXX: JSONRESTView should do this for us.
84
86
        text = text.decode('utf-8')
85
87
 
86
88
        msg = {'cmd':kind, 'text':text}
87
89
        try:
 
90
            json_response = ivle.chat.chat(host, port, msg, magic,decode=False)
 
91
 
 
92
            # Snoop the response from python-console to check that it's valid
88
93
            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
91
94
                response = cjson.decode(json_response)
92
 
            except (cjson.DecodeError, ivle.chat.ProtocolError):
 
95
            except cjson.DecodeError:
93
96
                # Could not decode the reply from the python-console server
94
97
                response = {"terminate":
95
 
                    "Communication lost"}
 
98
                    "Communication to console process lost"}
96
99
            if "terminate" in response:
97
 
                response = restart_console(req.config, req.user, jail_path,
 
100
                response = restart_console(req.config, uid, jail_path,
98
101
                    working_dir, response["terminate"])
99
102
        except socket.error, (enumber, estring):
100
103
            if enumber == errno.ECONNREFUSED:
101
104
                # Timeout: Restart the session
102
 
                response = restart_console(req.config, req.user, jail_path,
 
105
                response = restart_console(req.config, uid, jail_path,
103
106
                    working_dir,
104
 
                    "Timed out due to inactivity")
 
107
                    "The IVLE console has timed out due to inactivity")
105
108
            elif enumber == errno.ECONNRESET:
106
109
                # Communication issue: Restart the session
107
 
                response = restart_console(req.config, req.user, jail_path,
 
110
                response = restart_console(req.config, uid, jail_path,
108
111
                    working_dir,
109
 
                    "Connection reset")
 
112
                    "Connection with the console has been reset")
110
113
            else:
111
114
                # Some other error - probably serious
112
115
                raise socket.error, (enumber, estring)
113
116
        return response
114
117
 
115
118
 
116
 
def restart_console(config, user, 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(config, user, 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(