← 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: Matt Giuca
  • Date: 2010-03-05 07:17:17 UTC
  • Revision ID: matt.giuca@gmail.com-20100305071717-ed0zkkcqkpyrsn5m
Added to Subversion help: guide to external svn access. Link to this help from the user settings page.

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