← 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: 2010-02-11 05:27:24 UTC
  • Revision ID: grantw@unimelb.edu.au-20100211052724-171m0779yqzn1y1x
Add a setup.cfg with nose settings. You can now run the suite with 'IVLECONF=. nosetests'.

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