← 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

ivle.webapp.filesystem.diff: Port www/apps/diff to new framework. This moves
    all of the presentation logic into the app, with the service returning
    just a raw diff. This now runs the service using ivle.interpret#execute_raw

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