← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/interpret.py

  • Committer: William Grant
  • Date: 2010-02-15 05:37:50 UTC
  • Revision ID: grantw@unimelb.edu.au-20100215053750-hihmegnp8e7dshc2
Ignore test coverage files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/interpret.py
21
21
 
22
22
# Runs a student script in a safe execution environment.
23
23
 
 
24
import ivle
24
25
from ivle import studpath
25
26
from ivle.util import IVLEError, IVLEJailError, split_path
26
 
import ivle.conf
27
27
 
28
28
import functools
29
29
 
88
88
        self.linebuf = ""
89
89
        self.headers = {}       # Header names : values
90
90
 
91
 
def execute_cgi(interpreter, trampoline, uid, jail_dir, working_dir,
92
 
                script_path, req, gentle):
 
91
def execute_cgi(interpreter, uid, jail_dir, working_dir, script_path,
 
92
                req, gentle):
93
93
    """
94
94
    trampoline: Full path on the local system to the CGI wrapper program
95
95
        being executed.
105
105
    its environment.
106
106
    """
107
107
 
 
108
    trampoline = os.path.join(req.config['paths']['lib'], 'trampoline')
 
109
 
108
110
    # Support no-op trampoline runs.
109
111
    if interpreter is None:
110
112
        interpreter = '/bin/true'
138
140
 
139
141
    # usage: tramp uid jail_dir working_dir script_path
140
142
    pid = subprocess.Popen(
141
 
        [trampoline, str(uid), ivle.conf.jail_base, ivle.conf.jail_src_base,
142
 
         ivle.conf.jail_system, jail_dir, working_dir, interpreter,
143
 
        script_path],
 
143
        [trampoline, str(uid), req.config['paths']['jails']['mounts'],
 
144
         req.config['paths']['jails']['src'],
 
145
         req.config['paths']['jails']['template'],
 
146
         jail_dir, working_dir, interpreter, script_path],
144
147
        stdin=f, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
145
148
        cwd=tramp_dir)
146
149
 
342
345
    <pre>
343
346
""" % (warning, text))
344
347
 
345
 
location_cgi_python = os.path.join(ivle.conf.lib_path, "trampoline")
346
 
 
347
348
# Mapping of interpreter names (as given in conf/app/server.py) to
348
349
# interpreter functions.
349
350
 
350
351
interpreter_objects = {
351
352
    'cgi-python'
352
 
        : functools.partial(execute_cgi, "/usr/bin/python",
353
 
            location_cgi_python),
 
353
        : functools.partial(execute_cgi, "/usr/bin/python"),
354
354
    'noop'
355
 
        : functools.partial(execute_cgi, None,
356
 
            location_cgi_python),
 
355
        : functools.partial(execute_cgi, None),
357
356
    # Should also have:
358
357
    # cgi-generic
359
358
    # python-server-page
413
412
 
414
413
    # SERVER_SOFTWARE is actually not Apache but IVLE, since we are
415
414
    # custom-making the CGI request.
416
 
    env['SERVER_SOFTWARE'] = "IVLE/" + str(ivle.conf.ivle_version)
 
415
    env['SERVER_SOFTWARE'] = "IVLE/" + ivle.__version__
417
416
 
418
417
    # Additional environment variables
419
418
    username = split_path(req.path)[0]
422
421
class ExecutionError(Exception):
423
422
    pass
424
423
 
425
 
def execute_raw(user, jail_dir, working_dir, binary, args):
 
424
def execute_raw(config, user, jail_dir, working_dir, binary, args):
426
425
    '''Execute a binary in a user's jail, returning the raw output.
427
426
 
428
427
    The binary is executed in the given working directory with the given
429
428
    args. A tuple of (stdout, stderr) is returned.
430
429
    '''
431
430
 
432
 
    tramp = location_cgi_python
433
 
    tramp_dir = os.path.split(location_cgi_python)[0]
 
431
    tramp = os.path.join(config['paths']['lib'], 'trampoline')
 
432
    tramp_dir = os.path.split(tramp)[0]
434
433
 
435
434
    # Fire up trampoline. Vroom, vroom.
436
435
    proc = subprocess.Popen(
437
 
        [tramp, str(user.unixid), ivle.conf.jail_base,
438
 
         ivle.conf.jail_src_base, ivle.conf.jail_system, jail_dir,
439
 
         working_dir, binary] + args,
 
436
        [tramp, str(user.unixid), config['paths']['jails']['mounts'],
 
437
         config['paths']['jails']['src'],
 
438
         config['paths']['jails']['template'],
 
439
         jail_dir, working_dir, binary] + args,
440
440
        stdin=subprocess.PIPE, stdout=subprocess.PIPE,
441
441
        stderr=subprocess.PIPE, cwd=tramp_dir, close_fds=True)
442
442