← 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

Quick port of fileservice to the new framework. It's still very much old-style,
though.

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
 
from ivle.webapp.base.rest import JSONRESTView, write_operation
 
34
import ivle.conf
 
35
from ivle.webapp.base.rest import JSONRESTView, named_operation
35
36
from ivle.webapp.errors import BadRequest
36
37
 
37
38
# XXX: Should be RPC view, with actions in URL?
38
39
class ConsoleServiceRESTView(JSONRESTView):
39
40
    '''An RPC interface to a Python console.'''
40
 
    def get_permissions(self, user, config):
 
41
    def get_permissions(self, user):
41
42
        if user is not None:
42
43
            return set(['use'])
43
44
        else:
44
45
            return set()
45
46
 
46
 
    @write_operation('use')
 
47
    @named_operation('use')
47
48
    def start(self, req, cwd=''):
48
49
        working_dir = os.path.join("/home", req.user.login, cwd)
49
50
 
 
51
        uid = req.user.unixid
 
52
 
50
53
        # Start the server
51
 
        jail_path = os.path.join(req.config['paths']['jails']['mounts'],
52
 
                                 req.user.login)
53
 
        cons = ivle.console.Console(req.config, req.user, jail_path,
54
 
                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)
55
56
 
56
57
        # Assemble the key and return it. Yes, it is double-encoded.
57
58
        return {'key': cjson.encode({"host": cons.host,
58
59
                                     "port": cons.port,
59
60
                                     "magic": cons.magic}).encode('hex')}
60
61
 
61
 
    @write_operation('use')
62
 
    def chat(self, req, key, text='', cwd='', kind="chat"):
 
62
    @named_operation('use')
 
63
    def chat(self, req, key, text='', kind="chat"):
63
64
        # The request *should* have the following four fields:
64
65
        # key: Hex JSON dict of host and port where the console server lives,
65
66
        # and the secret to use to digitally sign the communication with the
75
76
        except KeyError:
76
77
            raise BadRequest("Invalid console key.")
77
78
 
78
 
        jail_path = os.path.join(req.config['paths']['jails']['mounts'],
79
 
                                 req.user.login)
80
 
        # Within Jail
81
 
        working_dir = os.path.join("/home", req.user.login, cwd)
82
 
 
83
 
        # XXX: JSONRESTView should do this for us.
84
 
        text = text.decode('utf-8')
 
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
 
81
        uid = req.user.unixid
85
82
 
86
83
        msg = {'cmd':kind, 'text':text}
87
84
        try:
 
85
            json_response = ivle.chat.chat(host, port, msg, magic,decode=False)
 
86
 
 
87
            # Snoop the response from python-console to check that it's valid
88
88
            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
89
                response = cjson.decode(json_response)
92
 
            except (cjson.DecodeError, ivle.chat.ProtocolError):
 
90
            except cjson.DecodeError:
93
91
                # Could not decode the reply from the python-console server
94
92
                response = {"terminate":
95
 
                    "Communication lost"}
 
93
                    "Communication to console process lost"}
96
94
            if "terminate" in response:
97
 
                response = restart_console(req.config, req.user, jail_path,
98
 
                    working_dir, response["terminate"])
 
95
                response = restart_console(uid, jail_path, working_dir,
 
96
                    response["terminate"])
99
97
        except socket.error, (enumber, estring):
100
98
            if enumber == errno.ECONNREFUSED:
101
99
                # Timeout: Restart the session
102
 
                response = restart_console(req.config, req.user, jail_path,
103
 
                    working_dir,
104
 
                    "Timed out due to inactivity")
 
100
                response = restart_console(uid, jail_path, working_dir,
 
101
                    "The IVLE console has timed out due to inactivity")
105
102
            elif enumber == errno.ECONNRESET:
106
103
                # Communication issue: Restart the session
107
 
                response = restart_console(req.config, req.user, jail_path,
108
 
                    working_dir,
109
 
                    "Connection reset")
 
104
                response = restart_console(uid, jail_path, working_dir,
 
105
                    "Connection with the console has been reset")
110
106
            else:
111
107
                # Some other error - probably serious
112
108
                raise socket.error, (enumber, estring)
113
109
        return response
114
110
 
115
111
 
116
 
def restart_console(config, user, jail_path, working_dir, reason):
 
112
def restart_console(uid, jail_path, working_dir, reason):
117
113
    """Tells the client that it must be issued a new console since the old 
118
114
    console is no longer availible. The client must accept the new key.
119
115
    Returns the JSON response to be given to the client.
120
116
    """
121
117
    # Start a new console server console
122
 
    cons = ivle.console.Console(config, user, jail_path, working_dir)
 
118
    cons = ivle.console.Console(uid, jail_path, working_dir)
123
119
 
124
120
    # Make a JSON object to tell the browser to restart its console client
125
121
    new_key = cjson.encode(