← 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-07-20 09:42:45 UTC
  • Revision ID: matt.giuca@gmail.com-20100720094245-0poipwrxm9tde8et
TextView: Removed constructor (it just called its superclass ctor).

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