← 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-21 04:21:50 UTC
  • Revision ID: matt.giuca@gmail.com-20100721042150-qovg2sth81sgbdq7
Project page: Replaced the confusing title 'Assigned submitters' with 'Expected submitters', and the heading 'assigned' with 'name'.

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
 
from ivle.webapp.base.rest import JSONRESTView, named_operation
 
34
from ivle.webapp.base.rest import JSONRESTView, write_operation
35
35
from ivle.webapp.errors import BadRequest
36
36
 
37
37
# XXX: Should be RPC view, with actions in URL?
43
43
        else:
44
44
            return set()
45
45
 
46
 
    @named_operation('use')
 
46
    @write_operation('use')
47
47
    def start(self, req, cwd=''):
48
48
        working_dir = os.path.join("/home", req.user.login, cwd)
49
49
 
50
 
        uid = req.user.unixid
51
 
 
52
50
        # Start the server
53
51
        jail_path = os.path.join(req.config['paths']['jails']['mounts'],
54
52
                                 req.user.login)
55
 
        cons = ivle.console.Console(req.config, uid, jail_path, working_dir)
 
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')
 
61
    @write_operation('use')
63
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,
80
79
                                 req.user.login)
81
80
        # Within Jail
82
81
        working_dir = os.path.join("/home", req.user.login, cwd)
83
 
        uid = req.user.unixid
84
82
 
85
83
        # XXX: JSONRESTView should do this for us.
86
84
        text = text.decode('utf-8')
94
92
            except (cjson.DecodeError, ivle.chat.ProtocolError):
95
93
                # Could not decode the reply from the python-console server
96
94
                response = {"terminate":
97
 
                    "Communication to console process lost"}
 
95
                    "Communication lost"}
98
96
            if "terminate" in response:
99
 
                response = restart_console(req.config, uid, jail_path,
 
97
                response = restart_console(req.config, req.user, jail_path,
100
98
                    working_dir, response["terminate"])
101
99
        except socket.error, (enumber, estring):
102
100
            if enumber == errno.ECONNREFUSED:
103
101
                # Timeout: Restart the session
104
 
                response = restart_console(req.config, uid, jail_path,
 
102
                response = restart_console(req.config, req.user, jail_path,
105
103
                    working_dir,
106
 
                    "The IVLE console has timed out due to inactivity")
 
104
                    "Timed out due to inactivity")
107
105
            elif enumber == errno.ECONNRESET:
108
106
                # Communication issue: Restart the session
109
 
                response = restart_console(req.config, uid, jail_path,
 
107
                response = restart_console(req.config, req.user, jail_path,
110
108
                    working_dir,
111
 
                    "Connection with the console has been reset")
 
109
                    "Connection reset")
112
110
            else:
113
111
                # Some other error - probably serious
114
112
                raise socket.error, (enumber, estring)
115
113
        return response
116
114
 
117
115
 
118
 
def restart_console(config, uid, jail_path, working_dir, reason):
 
116
def restart_console(config, user, jail_path, working_dir, reason):
119
117
    """Tells the client that it must be issued a new console since the old 
120
118
    console is no longer availible. The client must accept the new key.
121
119
    Returns the JSON response to be given to the client.
122
120
    """
123
121
    # Start a new console server console
124
 
    cons = ivle.console.Console(config, uid, jail_path, working_dir)
 
122
    cons = ivle.console.Console(config, user, jail_path, working_dir)
125
123
 
126
124
    # Make a JSON object to tell the browser to restart its console client
127
125
    new_key = cjson.encode(