← 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: Nick Chadwick
  • Date: 2009-02-24 03:32:59 UTC
  • mto: (1099.1.227 exercise-ui)
  • mto: This revision was merged to the branch mainline in revision 1162.
  • Revision ID: chadnickbok@gmail.com-20090224033259-m518nuqp6w9f23ax
Added a new page to display exercises. This will then be modified to
actually edit exercises.

Show diffs side-by-side

added added

removed removed

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