← 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-26 06:30:50 UTC
  • Revision ID: grantw@unimelb.edu.au-20100226063050-nwkscx3qsvigtv31
Fix diffservice and svnlogservice to create authentication-capable pysvn.Clients, so they don't crash if credentials aren't cached.

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.
86
87
 
87
88
        msg = {'cmd':kind, 'text':text}
88
89
        try:
89
 
            json_response = ivle.chat.chat(host, port, msg, magic,decode=False)
90
 
 
91
 
            # Snoop the response from python-console to check that it's valid
92
90
            try:
 
91
                json_response = ivle.chat.chat(host, port, msg, magic,decode=False)
 
92
                # Snoop the response from python-console to check that it's valid
93
93
                response = cjson.decode(json_response)
94
 
            except cjson.DecodeError:
 
94
            except (cjson.DecodeError, ivle.chat.ProtocolError):
95
95
                # Could not decode the reply from the python-console server
96
96
                response = {"terminate":
97
 
                    "Communication to console process lost"}
 
97
                    "Communication lost"}
98
98
            if "terminate" in response:
99
 
                response = restart_console(uid, jail_path, working_dir,
100
 
                    response["terminate"])
 
99
                response = restart_console(req.config, uid, jail_path,
 
100
                    working_dir, response["terminate"])
101
101
        except socket.error, (enumber, estring):
102
102
            if enumber == errno.ECONNREFUSED:
103
103
                # Timeout: Restart the session
104
 
                response = restart_console(uid, jail_path, working_dir,
105
 
                    "The IVLE console has timed out due to inactivity")
 
104
                response = restart_console(req.config, uid, jail_path,
 
105
                    working_dir,
 
106
                    "Timed out due to inactivity")
106
107
            elif enumber == errno.ECONNRESET:
107
108
                # Communication issue: Restart the session
108
 
                response = restart_console(uid, jail_path, working_dir,
109
 
                    "Connection with the console has been reset")
 
109
                response = restart_console(req.config, uid, jail_path,
 
110
                    working_dir,
 
111
                    "Connection reset")
110
112
            else:
111
113
                # Some other error - probably serious
112
114
                raise socket.error, (enumber, estring)
113
115
        return response
114
116
 
115
117
 
116
 
def restart_console(uid, jail_path, working_dir, reason):
 
118
def restart_console(config, uid, jail_path, working_dir, reason):
117
119
    """Tells the client that it must be issued a new console since the old 
118
120
    console is no longer availible. The client must accept the new key.
119
121
    Returns the JSON response to be given to the client.
120
122
    """
121
123
    # Start a new console server console
122
 
    cons = ivle.console.Console(uid, jail_path, working_dir)
 
124
    cons = ivle.console.Console(config, uid, jail_path, working_dir)
123
125
 
124
126
    # Make a JSON object to tell the browser to restart its console client
125
127
    new_key = cjson.encode(