← 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

Removed debugging prints.

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