~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-03 04:13:06 UTC
  • mto: This revision was merged to the branch mainline in revision 1467.
  • Revision ID: grantw@unimelb.edu.au-20100203041306-mms3mre4r07gxt16
Replace the Packaging document with a general Releases one, and cover both source tarball and Ubuntu package releases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
73
73
    # (Note that paths "relative" to the jail actually begin with a '/' as
74
74
    # they are absolute in the jailspace)
75
75
 
76
 
    return interpreter(owner, jail_dir, working_dir, filename_abs, req,
 
76
    return interpreter(owner.unixid, jail_dir, working_dir, filename_abs, req,
77
77
                       gentle)
78
78
 
79
79
class CGIFlags:
88
88
        self.linebuf = ""
89
89
        self.headers = {}       # Header names : values
90
90
 
91
 
def execute_cgi(interpreter, owner, jail_dir, working_dir, script_path,
 
91
def execute_cgi(interpreter, uid, jail_dir, working_dir, script_path,
92
92
                req, gentle):
93
93
    """
94
94
    trampoline: Full path on the local system to the CGI wrapper program
95
95
        being executed.
96
 
    owner: User object of the owner of the file.
 
96
    uid: User ID of the owner of the file.
97
97
    jail_dir: Absolute path of owner's jail directory.
98
98
    working_dir: Directory containing the script file relative to owner's
99
99
        jail.
136
136
        del os.environ[k]
137
137
    for (k,v) in req.get_cgi_environ().items():
138
138
        os.environ[k] = v
139
 
    fixup_environ(req, script_path, owner)
 
139
    fixup_environ(req, script_path)
140
140
 
141
141
    # usage: tramp uid jail_dir working_dir script_path
142
 
    cmd_line = [trampoline, str(owner.unixid),
143
 
            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]
147
 
    # Popen doesn't like unicode strings. It hateses them.
148
 
    cmd_line = [(s.encode('utf-8') if isinstance(s, unicode) else s)
149
 
                for s in cmd_line]
150
 
    pid = subprocess.Popen(cmd_line,
 
142
    pid = subprocess.Popen(
 
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],
151
147
        stdin=f, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
152
148
        cwd=tramp_dir)
153
149
 
362
358
    # python-server-page
363
359
}
364
360
 
365
 
def fixup_environ(req, script_path, user):
 
361
def fixup_environ(req, script_path):
366
362
    """Assuming os.environ has been written with the CGI variables from
367
363
    apache, make a few changes for security and correctness.
368
364
 
419
415
    env['SERVER_SOFTWARE'] = "IVLE/" + ivle.__version__
420
416
 
421
417
    # Additional environment variables
422
 
    username = user.login
 
418
    username = split_path(req.path)[0]
423
419
    env['HOME'] = os.path.join('/home', username)
424
420
 
425
421
class ExecutionError(Exception):
436
432
    tramp_dir = os.path.split(tramp)[0]
437
433
 
438
434
    # Fire up trampoline. Vroom, vroom.
439
 
    cmd_line = [tramp, str(user.unixid), config['paths']['jails']['mounts'],
 
435
    proc = subprocess.Popen(
 
436
        [tramp, str(user.unixid), config['paths']['jails']['mounts'],
440
437
         config['paths']['jails']['src'],
441
438
         config['paths']['jails']['template'],
442
 
         jail_dir, working_dir, binary] + args
443
 
    # Popen doesn't like unicode strings. It hateses them.
444
 
    cmd_line = [(s.encode('utf-8') if isinstance(s, unicode) else s)
445
 
                for s in cmd_line]
446
 
    proc = subprocess.Popen(cmd_line,
 
439
         jail_dir, working_dir, binary] + args,
447
440
        stdin=subprocess.PIPE, stdout=subprocess.PIPE,
448
 
        stderr=subprocess.PIPE, cwd=tramp_dir, close_fds=True,
449
 
        env={'HOME': os.path.join('/home', user.login),
450
 
             'PATH': os.environ['PATH'],
451
 
             'USER': user.login,
452
 
             'LOGNAME': user.login})
 
441
        stderr=subprocess.PIPE, cwd=tramp_dir, close_fds=True)
453
442
 
454
443
    (stdout, stderr) = proc.communicate()
455
444
    exitcode = proc.returncode
456
445
 
457
446
    if exitcode != 0:
458
 
        raise ExecutionError('subprocess ended with code %d, stderr: "%s"' %
459
 
                             (exitcode, stderr))
 
447
        raise ExecutionError('subprocess ended with code %d, stderr %s' %
 
448
                             (exitcode, proc.stderr.read()))
460
449
    return (stdout, stderr)