← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/console.py

Give console and tutorial services security declarations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/console.py
23
23
 
24
24
import errno
25
25
import cPickle
26
 
import hashlib
 
26
import md5
27
27
import os
28
28
import random
29
29
import socket
33
33
import cjson
34
34
 
35
35
import ivle.conf
36
 
from ivle import chat
 
36
from ivle import (chat, util)
37
37
 
38
38
# Outside Jail
39
39
trampoline_path = os.path.join(ivle.conf.lib_path, "trampoline")
154
154
 
155
155
        # Create magic
156
156
        # TODO
157
 
        self.magic = hashlib.md5(uuid.uuid4().bytes).hexdigest()
 
157
        self.magic = md5.new(uuid.uuid4().bytes).digest().encode('hex')
158
158
 
159
159
        # Try to find a free port on the server.
160
160
        # Just try some random ports in the range [3000,8000)
174
174
            res = os.spawnv(os.P_WAIT, trampoline_path, [
175
175
                trampoline_path,
176
176
                str(self.uid),
177
 
                ivle.conf.jail_base,
178
 
                ivle.conf.jail_src_base,
179
 
                ivle.conf.jail_system,
180
177
                self.jail_path,
181
178
                console_dir,
182
179
                python_path,