← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/interpret.py

  • Committer: Matt Giuca
  • Date: 2010-02-23 05:27:07 UTC
  • Revision ID: matt.giuca@gmail.com-20100223052707-3a76wo23r2z503t8
https://launchpad.net/bugs/526161
browser.js: Adjusted condition for enabling "Commit" action; now allowed if
    no files are selected AND current directory is versioned (as well as if
    all selected files are versioned). Committing with 0 files selected will
    commit the current directory.
ivle.fileservice_lib.action: Fixed to allow commit to contain 0 paths. This
    will commit the current directory instead.
This fixes Launchpad bug #526161.

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
 
from ivle.util import IVLEError, IVLEJailError
26
 
import ivle.conf
 
26
from ivle.util import IVLEError, IVLEJailError, split_path
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'
137
139
    fixup_environ(req, script_path)
138
140
 
139
141
    # usage: tramp uid jail_dir working_dir script_path
140
 
    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],
 
142
    cmd_line = [trampoline, str(uid), req.config['paths']['jails']['mounts'],
 
143
         req.config['paths']['jails']['src'],
 
144
         req.config['paths']['jails']['template'],
 
145
         jail_dir, working_dir, interpreter, script_path]
 
146
    # Popen doesn't like unicode strings. It hateses them.
 
147
    cmd_line = [(s.encode('utf-8') if isinstance(s, unicode) else s)
 
148
                for s in cmd_line]
 
149
    pid = subprocess.Popen(cmd_line,
144
150
        stdin=f, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
145
151
        cwd=tramp_dir)
146
152
 
342
348
    <pre>
343
349
""" % (warning, text))
344
350
 
345
 
location_cgi_python = os.path.join(ivle.conf.lib_path, "trampoline")
346
 
 
347
351
# Mapping of interpreter names (as given in conf/app/server.py) to
348
352
# interpreter functions.
349
353
 
350
354
interpreter_objects = {
351
355
    'cgi-python'
352
 
        : functools.partial(execute_cgi, "/usr/bin/python",
353
 
            location_cgi_python),
 
356
        : functools.partial(execute_cgi, "/usr/bin/python"),
354
357
    'noop'
355
 
        : functools.partial(execute_cgi, None,
356
 
            location_cgi_python),
 
358
        : functools.partial(execute_cgi, None),
357
359
    # Should also have:
358
360
    # cgi-generic
359
361
    # python-server-page
404
406
    if script_path and script_path.startswith('/home'):
405
407
        normscript = os.path.normpath(script_path)
406
408
 
407
 
        uri_into_jail = studpath.url_to_jailpaths(os.path.normpath(req.path))[2]
 
409
        uri_into_jail = studpath.to_home_path(os.path.normpath(req.path))
408
410
 
409
411
        # PATH_INFO is wrong because the script doesn't physically exist.
410
412
        env['PATH_INFO'] = uri_into_jail[len(normscript):]
413
415
 
414
416
    # SERVER_SOFTWARE is actually not Apache but IVLE, since we are
415
417
    # custom-making the CGI request.
416
 
    env['SERVER_SOFTWARE'] = "IVLE/" + str(ivle.conf.ivle_version)
 
418
    env['SERVER_SOFTWARE'] = "IVLE/" + ivle.__version__
417
419
 
418
420
    # Additional environment variables
419
 
    username = studpath.url_to_jailpaths(req.path)[0]
 
421
    username = split_path(req.path)[0]
420
422
    env['HOME'] = os.path.join('/home', username)
421
423
 
422
424
class ExecutionError(Exception):
423
425
    pass
424
426
 
425
 
def execute_raw(user, jail_dir, working_dir, binary, args):
 
427
def execute_raw(config, user, jail_dir, working_dir, binary, args):
426
428
    '''Execute a binary in a user's jail, returning the raw output.
427
429
 
428
430
    The binary is executed in the given working directory with the given
429
431
    args. A tuple of (stdout, stderr) is returned.
430
432
    '''
431
433
 
432
 
    tramp = location_cgi_python
433
 
    tramp_dir = os.path.split(location_cgi_python)[0]
 
434
    tramp = os.path.join(config['paths']['lib'], 'trampoline')
 
435
    tramp_dir = os.path.split(tramp)[0]
434
436
 
435
437
    # Fire up trampoline. Vroom, vroom.
436
 
    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,
 
438
    cmd_line = [tramp, str(user.unixid), config['paths']['jails']['mounts'],
 
439
         config['paths']['jails']['src'],
 
440
         config['paths']['jails']['template'],
 
441
         jail_dir, working_dir, binary] + args
 
442
    # Popen doesn't like unicode strings. It hateses them.
 
443
    cmd_line = [(s.encode('utf-8') if isinstance(s, unicode) else s)
 
444
                for s in cmd_line]
 
445
    proc = subprocess.Popen(cmd_line,
440
446
        stdin=subprocess.PIPE, stdout=subprocess.PIPE,
441
447
        stderr=subprocess.PIPE, cwd=tramp_dir, close_fds=True)
442
448