1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
1 |
# IVLE
|
2 |
# Copyright (C) 2007-2008 The University of Melbourne
|
|
3 |
#
|
|
4 |
# This program is free software; you can redistribute it and/or modify
|
|
5 |
# it under the terms of the GNU General Public License as published by
|
|
6 |
# the Free Software Foundation; either version 2 of the License, or
|
|
7 |
# (at your option) any later version.
|
|
8 |
#
|
|
9 |
# This program is distributed in the hope that it will be useful,
|
|
10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
12 |
# GNU General Public License for more details.
|
|
13 |
#
|
|
14 |
# You should have received a copy of the GNU General Public License
|
|
15 |
# along with this program; if not, write to the Free Software
|
|
16 |
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
17 |
||
18 |
# Module: File Service / Listing
|
|
19 |
# Author: Matt Giuca
|
|
20 |
# Date: 10/1/2008
|
|
21 |
||
22 |
# Handles the return part of the 2-stage process of fileservice. This
|
|
23 |
# is both the directory listing, and the raw serving of non-directory files.
|
|
24 |
||
25 |
# File Service Format.
|
|
26 |
# If a non-directory file is requested, then the HTTP response body will be
|
|
27 |
# the verbatim bytes of that file (if the file is valid). The HTTP response
|
|
28 |
# headers will include the guessed content type of the file, and the header
|
|
29 |
# "X-IVLE-Return: File".
|
|
30 |
||
31 |
# Directory Listing Format.
|
|
32 |
# If the path requested is a directory, then the HTTP response body will be
|
|
33 |
# a valid JSON string describing the directory. The HTTP response headers
|
|
34 |
# will include the header "X-IVLE-Return: Dir".
|
|
35 |
#
|
|
36 |
# The JSON structure is as follows:
|
|
37 |
# * The top-level value is an object. It always contains the key "listing",
|
|
38 |
# whose value is the primary listing object. It may also contain a key
|
|
39 |
# "clipboard" which contains the clipboard object.
|
|
40 |
# * The value for "listing" is an object, with one member for each file in the
|
|
41 |
# directory, plus an additional member (key ".") for the directory itself.
|
|
42 |
# * Each member's key is the filename. Its value is an object, which has
|
|
43 |
# various members describing the file.
|
|
44 |
# The members of this object are as follows:
|
|
45 |
# * svnstatus: String. The svn status of the file. Either all files in a
|
|
46 |
# directory or no files have an svnstatus. String may take the values:
|
|
47 |
# - none - does not exist
|
|
48 |
# - unversioned - is not a versioned thing in this wc
|
|
49 |
# - normal - exists, but uninteresting.
|
|
50 |
# - added - is scheduled for addition
|
|
51 |
# - missing - under v.c., but is missing
|
|
52 |
# - deleted - scheduled for deletion
|
|
53 |
# - replaced - was deleted and then re-added
|
|
54 |
# - modified - text or props have been modified
|
|
55 |
# - merged - local mods received repos mods
|
|
56 |
# - conflicted - local mods received conflicting repos mods
|
|
57 |
# - ignored - a resource marked as ignored
|
|
58 |
# - obstructed - an unversioned resource is in the way of the versioned resource
|
|
59 |
# - external - an unversioned path populated by an svn:external property
|
|
60 |
# - incomplete - a directory doesn't contain a complete entries list
|
|
61 |
# (From pysvn)
|
|
62 |
# If svnstatus is "Missing" then the file has no other attributes.
|
|
63 |
# * published: Boolean. True if the file is published. (Marked by a
|
|
64 |
# .published file in the folder)
|
|
65 |
# * isdir: Boolean. True if the file is a directory. Always present unless
|
|
66 |
# svnstatus is "missing".
|
|
67 |
# * size: Number. Size of the file in bytes. Present for non-directory
|
|
68 |
# files.
|
|
69 |
# * type: String. Guessed mime type of the file. Present for non-directory
|
|
70 |
# files.
|
|
71 |
# * mtime: Number. Number of seconds elapsed since the epoch.
|
|
72 |
# The epoch is not defined (this is an arbitrary number used for sorting
|
|
73 |
# dates).
|
|
74 |
# * mtime_nice: String. Modification time of the file or directory. Always
|
|
75 |
# present unless svnstatus is "Missing". Human-friendly.
|
|
76 |
#
|
|
77 |
# Members are not guaranteed to be present - client code should always check
|
|
78 |
# for each member that it is present, and handle gracefully if a member is not
|
|
79 |
# present.
|
|
80 |
#
|
|
81 |
# The listing object is guaranteed to have a "." key. Use this key to
|
|
82 |
# determine whether the directory is under version control or not. If this
|
|
83 |
# member does NOT have a "svnstatus" key, or "svnstatus" is "unversioned",
|
|
84 |
# then the directory is not under revision control (and no other files will
|
|
85 |
# have "svnstatus" either).
|
|
86 |
#
|
|
87 |
# The top-level object MAY contain a "clipboard" key, which specifies the
|
|
88 |
# files copied to the clipboard. This can be used by the client to show the
|
|
89 |
# user what files will be pasted. At the very least, the client should take
|
|
90 |
# the presence or absence of a "clipboard" key as whether to grey out the
|
|
91 |
# "paste" button.
|
|
92 |
#
|
|
93 |
# The "clipboard" object has three members:
|
|
94 |
# * mode: String. Either "copy" or "cut".
|
|
95 |
# * base: String. Path relative to the user's root. The common path between
|
|
96 |
# the files.
|
|
97 |
# * files: Array of Strings. Each element is a filename relative to base.
|
|
98 |
# Base and files exactly correspond to the listing path and argument paths
|
|
99 |
# which were supplied during the last copy or cut request.
|
|
100 |
||
101 |
import os |
|
102 |
import sys |
|
103 |
import stat |
|
104 |
import mimetypes |
|
105 |
import urlparse |
|
106 |
from cgi import parse_qs |
|
107 |
||
108 |
import cjson |
|
109 |
import pysvn |
|
110 |
||
111 |
import ivle.svn |
|
112 |
import ivle.date |
|
113 |
from ivle import (util, studpath) |
|
114 |
import ivle.conf.mimetypes |
|
115 |
||
116 |
# Make a Subversion client object
|
|
117 |
svnclient = pysvn.Client() |
|
118 |
||
119 |
# Whether or not to ignore dot files.
|
|
120 |
# TODO check settings!
|
|
121 |
ignore_dot_files = True |
|
122 |
||
123 |
# Mime types
|
|
124 |
# application/json is the "best" content type but is not good for
|
|
125 |
# debugging because Firefox just tries to download it
|
|
126 |
mime_dirlisting = "text/plain" |
|
127 |
#mime_dirlisting = "application/json"
|
|
128 |
||
129 |
def handle_return(req, return_contents): |
|
130 |
"""
|
|
131 |
Perform the "return" part of the response.
|
|
132 |
This function returns the file or directory listing contained in
|
|
133 |
req.path. Sets the HTTP response code in req, writes additional headers,
|
|
134 |
and writes the HTTP response, if any.
|
|
135 |
||
136 |
If return_contents is True, and the path is a non-directory, returns the
|
|
137 |
contents of the file verbatim. If False, returns a directory listing
|
|
138 |
with a single file, ".", and info about the file.
|
|
139 |
||
140 |
If the path is a directory, return_contents is ignored.
|
|
141 |
"""
|
|
142 |
||
143 |
(user, jail, path) = studpath.url_to_jailpaths(req.path) |
|
144 |
||
145 |
# FIXME: What to do about req.path == ""?
|
|
146 |
# Currently goes to 403 Forbidden.
|
|
147 |
urlpath = urlparse.urlparse(path) |
|
148 |
path = urlpath[2] |
|
1089
by chadnickbok
Fixes Issue #14 |
149 |
json = None |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
150 |
if path is None: |
151 |
req.status = req.HTTP_FORBIDDEN |
|
152 |
req.headers_out['X-IVLE-Return-Error'] = 'Forbidden' |
|
153 |
req.write("Forbidden") |
|
1193
by Matt Giuca
ivle.svn: Added revision_is_dir (like os.path.isdir for revision history). |
154 |
return
|
155 |
||
156 |
# If this is a repository-revision request, it needs to be treated
|
|
157 |
# differently than if it were a regular file request.
|
|
158 |
# Note: If there IS a revision requested but the file doesn't exist in
|
|
159 |
# that revision, this will terminate.
|
|
160 |
revision = _get_revision_or_die(req, svnclient, path) |
|
161 |
||
1194
by Matt Giuca
fileservice: Fixed a bug when browsing previous revisions, that the |
162 |
if revision is None: |
163 |
if not os.access(path, os.R_OK): |
|
164 |
req.status = req.HTTP_NOT_FOUND |
|
165 |
req.headers_out['X-IVLE-Return-Error'] = 'File not found' |
|
166 |
req.write("File not found") |
|
167 |
return
|
|
168 |
is_dir = os.path.isdir(path) |
|
169 |
else: |
|
170 |
is_dir = ivle.svn.revision_is_dir(svnclient, path, revision) |
|
171 |
||
172 |
if is_dir: |
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
173 |
# It's a directory. Return the directory listing.
|
174 |
req.content_type = mime_dirlisting |
|
175 |
req.headers_out['X-IVLE-Return'] = 'Dir' |
|
1089
by chadnickbok
Fixes Issue #14 |
176 |
# TODO: Fix this dirty, dirty hack
|
1193
by Matt Giuca
ivle.svn: Added revision_is_dir (like os.path.isdir for revision history). |
177 |
newjson = get_dirlisting(req, svnclient, path, revision) |
1089
by chadnickbok
Fixes Issue #14 |
178 |
if ("X-IVLE-Action-Error" in req.headers_out): |
179 |
newjson["Error"] = req.headers_out["X-IVLE-Action-Error"] |
|
180 |
req.write(cjson.encode(newjson)) |
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
181 |
elif return_contents: |
182 |
# It's a file. Return the file contents.
|
|
183 |
# First get the mime type of this file
|
|
184 |
# (Note that importing ivle.util has already initialised mime types)
|
|
185 |
(type, _) = mimetypes.guess_type(path) |
|
186 |
if type is None: |
|
187 |
type = ivle.conf.mimetypes.default_mimetype |
|
188 |
req.content_type = type |
|
189 |
req.headers_out['X-IVLE-Return'] = 'File' |
|
190 |
||
1193
by Matt Giuca
ivle.svn: Added revision_is_dir (like os.path.isdir for revision history). |
191 |
send_file(req, svnclient, path, revision) |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
192 |
else: |
193 |
# It's a file. Return a "fake directory listing" with just this file.
|
|
194 |
req.content_type = mime_dirlisting |
|
195 |
req.headers_out['X-IVLE-Return'] = 'File' |
|
1193
by Matt Giuca
ivle.svn: Added revision_is_dir (like os.path.isdir for revision history). |
196 |
req.write(cjson.encode(get_dirlisting(req, svnclient, path, |
197 |
revision))) |
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
198 |
|
199 |
def _get_revision_or_die(req, svnclient, path): |
|
1192
by Matt Giuca
ivle.fileservice_lib.listing: Proper docstring for the rather confusing |
200 |
"""Looks for a revision specification in req's URL.
|
201 |
Errors and terminates the request if the specification was bad, or it
|
|
202 |
doesn't exist for the given path.
|
|
203 |
@param req: Request object.
|
|
204 |
@param svnclient: pysvn Client object.
|
|
205 |
@param path: Path to the file whose revision is to be retrieved.
|
|
206 |
@returns: pysvn Revision object, for the file+revision specified, or None
|
|
207 |
if there was no revision specified.
|
|
208 |
"""
|
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
209 |
# Work out the revisions from query
|
210 |
r_str = req.get_fieldstorage().getfirst("r") |
|
211 |
revision = ivle.svn.revision_from_string(r_str) |
|
212 |
||
213 |
# Was some revision specified AND (it didn't resolve OR it was nonexistent)
|
|
214 |
if r_str and not (revision and |
|
215 |
ivle.svn.revision_exists(svnclient, path, revision)): |
|
216 |
req.status = req.HTTP_NOT_FOUND |
|
1195
by Matt Giuca
Fileservice: Improved the error message "Revision not found" to |
217 |
message = ('Revision not found or file not found in revision %d' % |
218 |
revision.number) |
|
219 |
req.headers_out['X-IVLE-Return-Error'] = message |
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
220 |
req.ensure_headers_written() |
1195
by Matt Giuca
Fileservice: Improved the error message "Revision not found" to |
221 |
req.write(message) |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
222 |
req.flush() |
223 |
sys.exit() |
|
224 |
return revision |
|
225 |
||
1193
by Matt Giuca
ivle.svn: Added revision_is_dir (like os.path.isdir for revision history). |
226 |
def send_file(req, svnclient, path, revision): |
227 |
"""Given a local absolute path to a file, sends the contents of the file
|
|
228 |
to the client.
|
|
229 |
||
230 |
@param req: Request object. Will not be mutated; just reads the session.
|
|
231 |
@param svnclient: Svn client object.
|
|
232 |
@param path: String. Absolute path on the local file system. Not checked,
|
|
233 |
must already be guaranteed safe. May be a file or a directory.
|
|
234 |
@param revision: pysvn Revision object for the given path, or None.
|
|
235 |
"""
|
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
236 |
if revision: |
237 |
req.write(svnclient.cat(path, revision=revision)) |
|
238 |
else: |
|
239 |
req.sendfile(path) |
|
240 |
||
1193
by Matt Giuca
ivle.svn: Added revision_is_dir (like os.path.isdir for revision history). |
241 |
def get_dirlisting(req, svnclient, path, revision): |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
242 |
"""Given a local absolute path, creates a directory listing object
|
243 |
ready to be JSONized and sent to the client.
|
|
244 |
||
1193
by Matt Giuca
ivle.svn: Added revision_is_dir (like os.path.isdir for revision history). |
245 |
@param req: Request object. Will not be mutated; just reads the session.
|
246 |
@param svnclient: Svn client object.
|
|
247 |
@param path: String. Absolute path on the local file system. Not checked,
|
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
248 |
must already be guaranteed safe. May be a file or a directory.
|
1193
by Matt Giuca
ivle.svn: Added revision_is_dir (like os.path.isdir for revision history). |
249 |
@param revision: pysvn Revision object for the given path, or None.
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
250 |
"""
|
251 |
||
252 |
# Start by trying to do an SVN status, so we can report file version
|
|
253 |
# status
|
|
254 |
listing = {} |
|
255 |
try: |
|
256 |
if revision: |
|
257 |
ls_list = svnclient.list(path, revision=revision, recurse=False) |
|
258 |
for ls in ls_list: |
|
259 |
filename, attrs = PysvnList_to_fileinfo(path, ls) |
|
260 |
listing[filename.decode('utf-8')] = attrs |
|
261 |
else: |
|
262 |
status_list = svnclient.status(path, recurse=False, get_all=True, |
|
263 |
update=False) |
|
264 |
for status in status_list: |
|
265 |
filename, attrs = PysvnStatus_to_fileinfo(path, status) |
|
266 |
listing[filename.decode('utf-8')] = attrs |
|
267 |
except pysvn.ClientError: |
|
268 |
# Presumably the directory is not under version control.
|
|
269 |
# Fallback to just an OS file listing.
|
|
270 |
try: |
|
271 |
for filename in os.listdir(path): |
|
272 |
listing[filename.decode('utf-8')] = file_to_fileinfo(path, filename)[1] |
|
1086
by chadnickbok
This commit fixes issue #10 and part of issue #9 |
273 |
try: |
274 |
svnclient.status(os.path.join(path, filename), recurse = False) |
|
275 |
listing[filename.decode('utf-8')]['svnstatus'] = 'normal' |
|
276 |
except: |
|
277 |
pass
|
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
278 |
except OSError: |
279 |
# Non-directories will error - that's OK, we just want the "."
|
|
280 |
pass
|
|
281 |
# The subversion one includes "." while the OS one does not.
|
|
282 |
# Add "." to the output, so the caller can see we are
|
|
283 |
# unversioned.
|
|
284 |
listing["."] = file_to_fileinfo(path, "")[1] |
|
285 |
||
286 |
if ignore_dot_files: |
|
287 |
for fn in listing.keys(): |
|
288 |
if fn != "." and fn.startswith("."): |
|
289 |
del listing[fn] |
|
290 |
||
291 |
# Listing is a nested object inside the top-level JSON.
|
|
292 |
listing = {"listing" : listing} |
|
293 |
||
294 |
if revision: |
|
295 |
listing['revision'] = revision.number |
|
296 |
||
297 |
# The other object is the clipboard, if present in the browser session.
|
|
298 |
# This can go straight from the session to JSON.
|
|
299 |
session = req.get_session() |
|
300 |
if session and 'clipboard' in session: |
|
301 |
# In CGI mode, we can't get our hands on the
|
|
302 |
# session (for the moment), so just leave it out.
|
|
303 |
listing['clipboard'] = session['clipboard'] |
|
304 |
||
305 |
return listing |
|
306 |
||
307 |
def _fullpath_stat_fileinfo(fullpath): |
|
308 |
file_stat = os.stat(fullpath) |
|
309 |
return _stat_fileinfo(fullpath, file_stat) |
|
310 |
||
311 |
def _stat_fileinfo(fullpath, file_stat): |
|
312 |
d = {} |
|
313 |
if stat.S_ISDIR(file_stat.st_mode): |
|
314 |
d["isdir"] = True |
|
315 |
d["type_nice"] = util.nice_filetype("/") |
|
316 |
# Only directories can be published
|
|
317 |
d["published"] = studpath.published(fullpath) |
|
318 |
else: |
|
319 |
d["isdir"] = False |
|
320 |
d["size"] = file_stat.st_size |
|
321 |
(type, _) = mimetypes.guess_type(fullpath) |
|
322 |
if type is None: |
|
323 |
type = ivle.conf.mimetypes.default_mimetype |
|
324 |
d["type"] = type |
|
325 |
d["type_nice"] = util.nice_filetype(fullpath) |
|
326 |
d["mtime"] = file_stat.st_mtime |
|
327 |
d["mtime_nice"] = ivle.date.make_date_nice(file_stat.st_mtime) |
|
328 |
d["mtime_short"] = ivle.date.make_date_nice_short(file_stat.st_mtime) |
|
329 |
return d |
|
330 |
||
331 |
def file_to_fileinfo(path, filename): |
|
332 |
"""Given a filename (relative to a given path), gets all the info "ls"
|
|
333 |
needs to display about the filename. Returns pair mapping filename to
|
|
334 |
a dict containing a number of other fields."""
|
|
335 |
fullpath = path if filename in ('', '.') else os.path.join(path, filename) |
|
336 |
return filename, _fullpath_stat_fileinfo(fullpath) |
|
337 |
||
338 |
def PysvnStatus_to_fileinfo(path, status): |
|
339 |
"""Given a PysvnStatus object, gets all the info "ls"
|
|
340 |
needs to display about the filename. Returns a pair mapping filename to
|
|
341 |
a dict containing a number of other fields."""
|
|
342 |
path = os.path.normcase(path) |
|
343 |
fullpath = status.path |
|
344 |
# If this is "." (the directory itself)
|
|
345 |
if path == os.path.normcase(fullpath): |
|
346 |
# If this directory is unversioned, then we aren't
|
|
347 |
# looking at any interesting files, so throw
|
|
348 |
# an exception and default to normal OS-based listing.
|
|
349 |
if status.text_status == pysvn.wc_status_kind.unversioned: |
|
350 |
raise pysvn.ClientError |
|
351 |
# We actually want to return "." because we want its
|
|
352 |
# subversion status.
|
|
353 |
filename = "." |
|
354 |
else: |
|
355 |
filename = os.path.basename(fullpath) |
|
356 |
text_status = status.text_status |
|
357 |
d = {'svnstatus': str(text_status)} |
|
1165.1.31
by William Grant
Expose SVN revision and URL information through fileservice. |
358 |
|
359 |
if status.entry is not None: |
|
360 |
d.update({ |
|
361 |
'svnurl': status.entry.url, |
|
362 |
'svnrevision': status.entry.revision.number |
|
363 |
if status.entry.revision.kind == pysvn.opt_revision_kind.number |
|
364 |
else None, |
|
365 |
})
|
|
366 |
||
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
367 |
try: |
368 |
d.update(_fullpath_stat_fileinfo(fullpath)) |
|
369 |
except OSError: |
|
370 |
# Here if, eg, the file is missing.
|
|
371 |
# Can't get any more information so just return d
|
|
372 |
pass
|
|
373 |
return filename, d |
|
374 |
||
375 |
def PysvnList_to_fileinfo(path, list): |
|
376 |
"""Given a List object from pysvn.Client.list, gets all the info "ls"
|
|
377 |
needs to display about the filename. Returns a pair mapping filename to
|
|
378 |
a dict containing a number of other fields."""
|
|
379 |
path = os.path.normcase(path) |
|
380 |
pysvnlist = list[0] |
|
381 |
fullpath = pysvnlist.path |
|
382 |
# If this is "." (the directory itself)
|
|
383 |
if path == os.path.normcase(fullpath): |
|
384 |
# If this directory is unversioned, then we aren't
|
|
385 |
# looking at any interesting files, so throw
|
|
386 |
# an exception and default to normal OS-based listing.
|
|
387 |
#if status.text_status == pysvn.wc_status_kind.unversioned:
|
|
388 |
# raise pysvn.ClientError
|
|
389 |
# We actually want to return "." because we want its
|
|
390 |
# subversion status.
|
|
391 |
filename = "." |
|
392 |
else: |
|
393 |
filename = os.path.basename(fullpath) |
|
394 |
d = {'svnstatus': 'revision'} # A special status. |
|
395 |
||
396 |
wrapped = ivle.svn.PysvnListStatWrapper(pysvnlist) |
|
397 |
d.update(_stat_fileinfo(fullpath, wrapped)) |
|
398 |
||
399 |
return filename, d |