← 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-22 01:54:19 UTC
  • mto: This revision was merged to the branch mainline in revision 1818.
  • Revision ID: matt.giuca@gmail.com-20100722015419-2zqjd1zsz2fti4zz
Late submission confirmation: Reworded so it is much clearer that a) the previous submission has not yet been overwritten, b) this is a late submission.
Also use more red/bold as a warning.

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