← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/apps/server/__init__.py

  • Committer: mattgiuca
  • Date: 2007-12-19 07:02:43 UTC
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:trunk:86
apps/server: Now calls trampoline-python.
bin/trampoline-python: Commented out throttle call (didn't work).
        Set jail relative to my test jail (will have to change).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/apps/server/__init__.py
135
135
 
136
136
    # Split up req.path again, this time with respect to the jail
137
137
    (_, jail_dir, path) = studpath.url_to_jailpaths(req.path)
 
138
    path = os.path.join('/', path)
138
139
    (working_dir, _) = os.path.split(path)
139
140
    # Now jail_dir is the jail directory relative to the jails root.
140
141
    # Note that the trampoline has jails root hard-coded for security.
141
142
    # path is the filename relative to the user's jail.
142
143
    # working_dir is the directory containing the file relative to the user's
143
144
    # jail.
 
145
    # (Note that paths "relative" to the jail actually begin with a '/' as
 
146
    # they are absolute in the jailspace)
144
147
 
145
148
    return interpreter(uid, jail_dir, working_dir, path, req)
146
149
 
252
255
</html>""")
253
256
 
254
257
# TODO: Replace mytest with cgi trampoline handler script
255
 
location_cgi_python = os.path.join(conf.ivlepath, "bin/mytest")
 
258
location_cgi_python = os.path.join(conf.ivlepath, "bin/trampoline-python")
256
259
 
257
260
# Mapping of interpreter names (as given in conf/app/server.py) to
258
261
# interpreter functions.