← 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: 2009-06-24 10:47:04 UTC
  • Revision ID: grantw@unimelb.edu.au-20090624104704-614jru0retkt5h5q
Kill Request.unmake_path.

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
from ivle.webapp.base.rest import JSONRESTView, named_operation
35
35
from ivle.webapp.errors import BadRequest
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):
 
40
    def get_permissions(self, user):
41
41
        if user is not None:
42
42
            return set(['use'])
43
43
        else:
44
44
            return set()
45
45
 
46
 
    @write_operation('use')
 
46
    @named_operation('use')
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,
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
77
78
 
78
79
        jail_path = os.path.join(req.config['paths']['jails']['mounts'],
79
80
                                 req.user.login)
80
 
        # Within Jail
81
 
        working_dir = os.path.join("/home", req.user.login, cwd)
 
81
        working_dir = os.path.join("/home", req.user.login)   # Within jail
 
82
        uid = req.user.unixid
82
83
 
83
84
        # XXX: JSONRESTView should do this for us.
84
85
        text = text.decode('utf-8')
85
86
 
86
87
        msg = {'cmd':kind, 'text':text}
87
88
        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
88
92
            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
93
                response = cjson.decode(json_response)
92
 
            except (cjson.DecodeError, ivle.chat.ProtocolError):
 
94
            except cjson.DecodeError:
93
95
                # Could not decode the reply from the python-console server
94
96
                response = {"terminate":
95
 
                    "Communication lost"}
 
97
                    "Communication to console process lost"}
96
98
            if "terminate" in response:
97
 
                response = restart_console(req.config, req.user, jail_path,
 
99
                response = restart_console(req.config, uid, jail_path,
98
100
                    working_dir, response["terminate"])
99
101
        except socket.error, (enumber, estring):
100
102
            if enumber == errno.ECONNREFUSED:
101
103
                # Timeout: Restart the session
102
 
                response = restart_console(req.config, req.user, jail_path,
 
104
                response = restart_console(req.config, uid, jail_path,
103
105
                    working_dir,
104
 
                    "Timed out due to inactivity")
 
106
                    "The IVLE console has timed out due to inactivity")
105
107
            elif enumber == errno.ECONNRESET:
106
108
                # Communication issue: Restart the session
107
 
                response = restart_console(req.config, req.user, jail_path,
 
109
                response = restart_console(req.config, uid, jail_path,
108
110
                    working_dir,
109
 
                    "Connection reset")
 
111
                    "Connection with the console has been 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(config, user, 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(config, user, 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(