← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/common/interpret.py

  • Committer: mattgiuca
  • Date: 2007-12-20 01:47:43 UTC
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:trunk:91
common/studpath.py: url_to_jailpaths - The "jail" path returned is now
    absolute instead of relative to the common jails dir.
    Reason: Much less specific to our system and easier to check that it's in
    the correct directory than explain all over the place what the jails root
    is.
common/interpret.py: Updated comments to the above effect.
trampolines: Accept absolute jails and check their root instead of doing a
    path join.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common/interpret.py
62
62
    (_, jail_dir, path) = studpath.url_to_jailpaths(req.path)
63
63
    path = os.path.join('/', path)
64
64
    (working_dir, _) = os.path.split(path)
65
 
    # Now jail_dir is the jail directory relative to the jails root.
66
 
    # Note that the trampoline has jails root hard-coded for security.
 
65
    # jail_dir is the absolute jail directory.
67
66
    # path is the filename relative to the user's jail.
68
67
    # working_dir is the directory containing the file relative to the user's
69
68
    # jail.
81
80
    trampoline: Full path on the local system to the CGI wrapper program
82
81
        being executed.
83
82
    uid: User ID of the owner of the file.
84
 
    jail_dir: Owner's jail directory relative to the jails root.
 
83
    jail_dir: Absolute path of owner's jail directory.
85
84
    working_dir: Directory containing the script file relative to owner's
86
85
        jail.
87
86
    script_path: CGI script relative to the owner's jail.