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 / Action
|
|
19 |
# Author: Matt Giuca
|
|
20 |
# Date: 10/1/2008
|
|
21 |
||
22 |
# Handles actions requested by the client as part of the 2-stage process of
|
|
23 |
# fileservice (the second part being the return listing).
|
|
24 |
||
25 |
### Actions ###
|
|
26 |
||
27 |
# The most important argument is "action". This determines which action is
|
|
28 |
# taken. Note that action, and all other arguments, are ignored unless the
|
|
29 |
# request is a POST request. The other arguments depend upon the action.
|
|
30 |
# Note that paths are often specified as arguments. Paths that begin with a
|
|
31 |
# slash are taken relative to the user's home directory (the top-level
|
|
32 |
# directory seen when fileservice has no arguments or path). Paths without a
|
|
33 |
# slash are taken relative to the specified path.
|
|
34 |
||
35 |
# action=remove: Delete a file(s) or directory(s) (recursively).
|
|
36 |
# path: The path to the file or directory to delete. Can be specified
|
|
37 |
# multiple times.
|
|
38 |
#
|
|
39 |
# action=move: Move or rename a file or directory.
|
|
40 |
# from: The path to the file or directory to be renamed.
|
|
41 |
# to: The path of the target filename. Error if the file already
|
|
42 |
# exists.
|
|
43 |
#
|
|
44 |
# action=putfile: Upload a file to the student workspace.
|
|
45 |
# path: The path to the file to be written. Error if the target
|
|
46 |
# file is a directory.
|
|
47 |
# data: Bytes to be written to the file verbatim. May either be
|
|
48 |
# a string variable or a file upload.
|
|
49 |
# overwrite: Optional. If supplied, the file will be overwritten.
|
|
50 |
# Otherwise, error if path already exists.
|
|
51 |
#
|
|
52 |
# action=putfiles: Upload multiple files to the student workspace, and
|
|
53 |
# optionally accept zip files which will be unpacked.
|
|
54 |
# path: The path to the DIRECTORY to place files in. Must not be a
|
|
55 |
# file.
|
|
56 |
# data: A file upload (may not be a simple string). The filename
|
|
57 |
# will be used to determine the target filename within
|
|
58 |
# the given path.
|
|
59 |
# unpack: Optional. If supplied, if any data is a valid ZIP file,
|
|
60 |
# will create a directory instead and unpack the ZIP file
|
|
61 |
# into it.
|
|
62 |
#
|
|
63 |
# action=mkdir: Create a directory. The parent dir must exist.
|
|
64 |
# path: The path to a file which does not exist, but whose parent
|
|
65 |
# does. The dir will be made with this name.
|
|
66 |
#
|
|
67 |
# The differences between putfile and putfiles are:
|
|
68 |
# * putfile can only accept a single file, and can't unpack zipfiles.
|
|
69 |
# * putfile can accept string data, doesn't have to be a file upload.
|
|
70 |
# * putfile ignores the upload filename, the entire filename is specified on
|
|
71 |
# path. putfiles calls files after the name on the user's machine.
|
|
72 |
#
|
|
73 |
# action=paste: Copy or move the files to a specified dir.
|
|
74 |
# src: The path to the DIRECTORY to get the files from (relative).
|
|
75 |
# dst: The path to the DIRECTORY to paste the files to. Must not
|
|
76 |
# be a file.
|
|
77 |
# mode: 'copy' or 'move'
|
|
78 |
# file: File to be copied or moved, relative to src, to a destination
|
|
79 |
# relative to dst. Can be specified multiple times.
|
|
80 |
#
|
|
81 |
# Subversion actions.
|
|
82 |
# action=svnadd: Add an existing file(s) to version control.
|
|
83 |
# path: The path to the file to be added. Can be specified multiple
|
|
84 |
# times.
|
|
85 |
#
|
|
86 |
# action=svnrevert: Revert a file(s) to its state as of the current revision
|
|
87 |
# / undo local edits.
|
|
88 |
# path: The path to the file to be reverted. Can be specified multiple
|
|
89 |
# times.
|
|
90 |
#
|
|
91 |
# action=svnupdate: Bring a file up to date with the head revision.
|
|
92 |
# path: The path to the file to be updated. Only one file may be
|
|
93 |
# specified.
|
|
1326.1.1
by David Coles
Add optional 'revision' paramenter to svnupdate in fileservice to allow |
94 |
# revision: The revision number to update to. If not provided this
|
95 |
# defaults to HEAD.
|
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
96 |
#
|
97 |
# action=svncommit: Commit a file(s) or directory(s) to the repository.
|
|
98 |
# path: The path to the file or directory to be committed. Can be
|
|
99 |
# specified multiple times. Directories are committed
|
|
100 |
# recursively.
|
|
101 |
# logmsg: Text of the log message. Optional. There is a default log
|
|
102 |
# message if unspecified.
|
|
103 |
# action=svncheckout: Checkout a file/directory from the repository.
|
|
104 |
# path: The [repository] path to the file or directory to be
|
|
105 |
# checked out.
|
|
106 |
#
|
|
107 |
# action=svnrepomkdir: Create a directory in a repository (not WC).
|
|
108 |
# path: The path to the directory to be created (under the IVLE
|
|
109 |
# repository base).
|
|
110 |
# logmsg: Text of the log message.
|
|
111 |
#
|
|
112 |
# action=svnrepostat: Check if a path exists in a repository (not WC).
|
|
113 |
# path: The path to the directory to be checked (under the IVLE
|
|
114 |
# repository base).
|
|
115 |
#
|
|
1318.1.1
by David Coles
Added svncleanup action to Fileservice to allow a cleanup to be run on svn |
116 |
# action=svncleanup: Recursively clean up the working copy, removing locks,
|
117 |
# resuming unfinished operations, etc.
|
|
118 |
# path: The path to the directory to be cleaned
|
|
119 |
#
|
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
120 |
# TODO: Implement the following actions:
|
121 |
# svnupdate (done?)
|
|
122 |
# TODO: Implement ZIP unpacking in putfiles (done?).
|
|
123 |
# TODO: svnupdate needs a digest to tell the user the files that were updated.
|
|
124 |
# This can be implemented by some message passing between action and
|
|
125 |
# listing, and having the digest included in the listing. (Problem if
|
|
126 |
# the listing is not a directory, but we could make it an error to do an
|
|
127 |
# update if the path is not a directory).
|
|
128 |
||
129 |
import os |
|
130 |
import cStringIO |
|
131 |
import shutil |
|
1238
by William Grant
URL-quote SVN repository paths in fileservice. |
132 |
import urllib |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
133 |
|
134 |
import pysvn |
|
135 |
||
136 |
from ivle import (util, studpath, zip) |
|
1089
by chadnickbok
Fixes Issue #14 |
137 |
from ivle.fileservice_lib.exceptions import WillNotOverwrite |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
138 |
import ivle.conf |
1423
by Matt Giuca
ivle.svn: Abstracted creation of Subversion client object, with authentication callback, from fileservice_lib. |
139 |
import ivle.svn |
140 |
||
141 |
# Make a Subversion client object (which will log in with this user's
|
|
142 |
# credentials, upon request)
|
|
143 |
svnclient = ivle.svn.create_auth_svn_client(username=ivle.conf.login, |
|
144 |
password=ivle.conf.svn_pass) |
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
145 |
svnclient.exception_style = 0 # Simple (string) exceptions |
146 |
||
147 |
DEFAULT_LOGMESSAGE = "No log message supplied." |
|
148 |
||
149 |
# Mime types
|
|
150 |
# application/json is the "best" content type but is not good for
|
|
151 |
# debugging because Firefox just tries to download it
|
|
152 |
mime_dirlisting = "text/html" |
|
153 |
#mime_dirlisting = "application/json"
|
|
154 |
||
155 |
class ActionError(Exception): |
|
156 |
"""Represents an error processing an action. This can be
|
|
157 |
raised by any of the action functions, and will be caught
|
|
158 |
by the top-level handler, put into the HTTP response field,
|
|
159 |
and continue.
|
|
160 |
||
161 |
Important Security Consideration: The message passed to this
|
|
162 |
exception will be relayed to the client.
|
|
163 |
"""
|
|
164 |
pass
|
|
165 |
||
166 |
def handle_action(req, action, fields): |
|
167 |
"""Perform the "action" part of the response.
|
|
168 |
This function should only be called if the response is a POST.
|
|
169 |
This performs the action's side-effect on the server. If unsuccessful,
|
|
170 |
writes the X-IVLE-Action-Error header to the request object. Otherwise,
|
|
171 |
does not touch the request object. Does NOT write any bytes in response.
|
|
172 |
||
173 |
May throw an ActionError. The caller should put this string into the
|
|
174 |
X-IVLE-Action-Error header, and then continue normally.
|
|
175 |
||
176 |
action: String, the action requested. Not sanitised.
|
|
177 |
fields: FieldStorage object containing all arguments passed.
|
|
178 |
"""
|
|
179 |
global actions_table # Table of function objects |
|
180 |
try: |
|
181 |
action = actions_table[action] |
|
182 |
except KeyError: |
|
183 |
# Default, just send an error but then continue
|
|
184 |
raise ActionError("Unknown action") |
|
1165.1.38
by William Grant
Allow fileservice actions to return custom JSON. |
185 |
return action(req, fields) |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
186 |
|
187 |
def actionpath_to_urlpath(req, path): |
|
188 |
"""Determines the URL path (relative to the student home) upon which the
|
|
189 |
action is intended to act. See actionpath_to_local.
|
|
190 |
"""
|
|
191 |
if path is None: |
|
192 |
return req.path |
|
193 |
elif len(path) > 0 and path[0] == os.sep: |
|
194 |
# Relative to student home
|
|
195 |
return path[1:] |
|
196 |
else: |
|
197 |
# Relative to req.path
|
|
198 |
return os.path.join(req.path, path) |
|
199 |
||
200 |
def actionpath_to_local(req, path): |
|
201 |
"""Determines the local path upon which an action is intended to act.
|
|
202 |
Note that fileservice actions accept two paths: the request path,
|
|
203 |
and the "path" argument given to the action.
|
|
204 |
According to the rules, if the "path" argument begins with a '/' it is
|
|
205 |
relative to the user's home; if it does not, it is relative to the
|
|
206 |
supplied path.
|
|
207 |
||
208 |
This resolves the path, given the request and path argument.
|
|
209 |
||
210 |
May raise an ActionError("Invalid path"). The caller is expected to
|
|
211 |
let this fall through to the top-level handler, where it will be
|
|
212 |
put into the HTTP response field. Never returns None.
|
|
213 |
||
214 |
Does not mutate req.
|
|
215 |
"""
|
|
1271
by William Grant
Replace uses of url_to_jailpaths in fileservice with to_home_path. |
216 |
r = studpath.to_home_path(actionpath_to_urlpath(req, path)) |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
217 |
if r is None: |
218 |
raise ActionError("Invalid path") |
|
219 |
return r |
|
220 |
||
221 |
def movefile(req, frompath, topath, copy=False): |
|
222 |
"""Performs a file move, resolving filenames, checking for any errors,
|
|
223 |
and throwing ActionErrors if necessary. Can also be used to do a copy
|
|
224 |
operation instead.
|
|
225 |
||
226 |
frompath and topath are straight paths from the client. Will be checked.
|
|
227 |
"""
|
|
228 |
# TODO: Do an SVN mv if the file is versioned.
|
|
229 |
# TODO: Disallow tampering with student's home directory
|
|
230 |
if frompath is None or topath is None: |
|
231 |
raise ActionError("Required field missing") |
|
232 |
frompath = actionpath_to_local(req, frompath) |
|
233 |
topath = actionpath_to_local(req, topath) |
|
234 |
if not os.path.exists(frompath): |
|
235 |
raise ActionError("The source file does not exist") |
|
236 |
if os.path.exists(topath): |
|
237 |
if frompath == topath: |
|
238 |
raise ActionError("Source and destination are the same") |
|
239 |
raise ActionError("A file already exists with that name") |
|
240 |
||
241 |
try: |
|
242 |
if copy: |
|
243 |
if os.path.isdir(frompath): |
|
244 |
shutil.copytree(frompath, topath) |
|
245 |
else: |
|
246 |
shutil.copy2(frompath, topath) |
|
247 |
else: |
|
248 |
shutil.move(frompath, topath) |
|
249 |
except OSError: |
|
250 |
raise ActionError("Could not move the file specified") |
|
251 |
except shutil.Error: |
|
252 |
raise ActionError("Could not move the file specified") |
|
253 |
||
1086
by chadnickbok
This commit fixes issue #10 and part of issue #9 |
254 |
def svn_movefile(req, frompath, topath, copy=False): |
255 |
"""Performs an svn move, resolving filenames, checking for any errors,
|
|
256 |
and throwing ActionErrors if necessary. Can also be used to do a copy
|
|
257 |
operation instead.
|
|
258 |
||
259 |
frompath and topath are straight paths from the client. Will be checked.
|
|
260 |
"""
|
|
261 |
if frompath is None or topath is None: |
|
262 |
raise ActionError("Required field missing") |
|
263 |
frompath = actionpath_to_local(req, frompath) |
|
264 |
topath = actionpath_to_local(req, topath) |
|
265 |
if not os.path.exists(frompath): |
|
266 |
raise ActionError("The source file does not exist") |
|
267 |
if os.path.exists(topath): |
|
268 |
if frompath == topath: |
|
269 |
raise ActionError("Source and destination are the same") |
|
270 |
raise ActionError("A file already exists with that name") |
|
271 |
||
272 |
try: |
|
273 |
if copy: |
|
274 |
svnclient.copy(frompath, topath) |
|
275 |
else: |
|
276 |
svnclient.move(frompath, topath) |
|
277 |
except OSError: |
|
278 |
raise ActionError("Could not move the file specified") |
|
279 |
except pysvn.ClientError: |
|
280 |
raise ActionError("Could not move the file specified") |
|
281 |
||
282 |
||
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
283 |
### ACTIONS ###
|
284 |
||
285 |
def action_delete(req, fields): |
|
286 |
# TODO: Disallow removal of student's home directory
|
|
287 |
"""Removes a list of files or directories.
|
|
288 |
||
289 |
Reads fields: 'path' (multiple)
|
|
290 |
"""
|
|
291 |
paths = fields.getlist('path') |
|
292 |
goterror = False |
|
293 |
for path in paths: |
|
294 |
path = actionpath_to_local(req, path) |
|
295 |
try: |
|
296 |
if os.path.isdir(path): |
|
297 |
shutil.rmtree(path) |
|
298 |
else: |
|
299 |
os.remove(path) |
|
300 |
except OSError: |
|
301 |
goterror = True |
|
302 |
except shutil.Error: |
|
303 |
goterror = True |
|
304 |
if goterror: |
|
305 |
if len(paths) == 1: |
|
306 |
raise ActionError("Could not delete the file specified") |
|
307 |
else: |
|
308 |
raise ActionError( |
|
309 |
"Could not delete one or more of the files specified") |
|
310 |
||
311 |
def action_move(req, fields): |
|
312 |
# TODO: Do an SVN mv if the file is versioned.
|
|
313 |
# TODO: Disallow tampering with student's home directory
|
|
314 |
"""Removes a list of files or directories.
|
|
315 |
||
316 |
Reads fields: 'from', 'to'
|
|
317 |
"""
|
|
318 |
frompath = fields.getfirst('from') |
|
319 |
topath = fields.getfirst('to') |
|
320 |
movefile(req, frompath, topath) |
|
321 |
||
322 |
def action_mkdir(req, fields): |
|
323 |
"""Creates a directory with the given path.
|
|
324 |
Reads fields: 'path'
|
|
325 |
"""
|
|
326 |
path = fields.getfirst('path') |
|
327 |
if path is None: |
|
328 |
raise ActionError("Required field missing") |
|
329 |
path = actionpath_to_local(req, path) |
|
330 |
||
331 |
if os.path.exists(path): |
|
332 |
raise ActionError("A file already exists with that name") |
|
333 |
||
334 |
# Create the directory
|
|
335 |
try: |
|
336 |
os.mkdir(path) |
|
337 |
except OSError: |
|
338 |
raise ActionError("Could not create directory") |
|
339 |
||
340 |
def action_putfile(req, fields): |
|
341 |
"""Writes data to a file, overwriting it if it exists and creating it if
|
|
342 |
it doesn't.
|
|
343 |
||
344 |
Reads fields: 'path', 'data' (file upload), 'overwrite'
|
|
345 |
"""
|
|
346 |
# TODO: Read field "unpack".
|
|
347 |
# Important: Data is "None" if the file submitted is empty.
|
|
348 |
path = fields.getfirst('path') |
|
349 |
data = fields.getfirst('data') |
|
350 |
if path is None: |
|
351 |
raise ActionError("Required field missing") |
|
352 |
if data is None: |
|
353 |
# Workaround - field reader treats "" as None, so this is the only
|
|
354 |
# way to allow blank file uploads
|
|
355 |
data = "" |
|
356 |
path = actionpath_to_local(req, path) |
|
357 |
||
358 |
if data is not None: |
|
359 |
data = cStringIO.StringIO(data) |
|
360 |
||
361 |
overwrite = fields.getfirst('overwrite') |
|
362 |
if overwrite is None: |
|
363 |
overwrite = False |
|
364 |
else: |
|
365 |
overwrite = True |
|
366 |
||
367 |
if overwrite: |
|
368 |
# Overwrite files; but can't if it's a directory
|
|
369 |
if os.path.isdir(path): |
|
370 |
raise ActionError("A directory already exists " |
|
371 |
+ "with that name") |
|
372 |
else: |
|
373 |
if os.path.exists(path): |
|
374 |
raise ActionError("A file already exists with that name") |
|
375 |
||
376 |
# Copy the contents of file object 'data' to the path 'path'
|
|
377 |
try: |
|
378 |
dest = open(path, 'wb') |
|
379 |
if data is not None: |
|
380 |
shutil.copyfileobj(data, dest) |
|
381 |
except (IOError, OSError), e: |
|
382 |
raise ActionError("Could not write to target file: %s" % e.strerror) |
|
383 |
||
384 |
def action_putfiles(req, fields): |
|
385 |
"""Writes data to one or more files in a directory, overwriting them if
|
|
386 |
it they exist.
|
|
387 |
||
388 |
Reads fields: 'path', 'data' (file upload, multiple), 'unpack'
|
|
389 |
"""
|
|
390 |
# Important: Data is "None" if the file submitted is empty.
|
|
391 |
path = fields.getfirst('path') |
|
392 |
data = fields['data'] |
|
393 |
if type(data) != type([]): |
|
394 |
data = [data] |
|
395 |
unpack = fields.getfirst('unpack') |
|
396 |
if unpack is None: |
|
397 |
unpack = False |
|
398 |
else: |
|
399 |
unpack = True |
|
400 |
if path is None: |
|
401 |
raise ActionError("Required field missing") |
|
402 |
path = actionpath_to_urlpath(req, path) |
|
403 |
goterror = False |
|
404 |
||
405 |
for datum in data: |
|
406 |
# Each of the uploaded files
|
|
407 |
filepath = os.path.join(path, datum.filename) |
|
1271
by William Grant
Replace uses of url_to_jailpaths in fileservice with to_home_path. |
408 |
filepath_local = studpath.to_home_path(filepath) |
1089
by chadnickbok
Fixes Issue #14 |
409 |
if os.path.isdir(filepath_local): |
410 |
raise ActionError("A directory already exists " |
|
411 |
+ "with that name") |
|
412 |
else: |
|
413 |
if os.path.exists(filepath_local): |
|
414 |
raise ActionError("A file already exists with that name") |
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
415 |
filedata = datum.file |
416 |
||
417 |
if unpack and datum.filename.lower().endswith(".zip"): |
|
418 |
# A zip file - unpack it instead of just copying
|
|
419 |
# TODO: Use the magic number instead of file extension
|
|
420 |
# Note: Just unzip into the current directory (ignore the
|
|
421 |
# filename)
|
|
422 |
try: |
|
423 |
# First get the entire path (within jail)
|
|
1271
by William Grant
Replace uses of url_to_jailpaths in fileservice with to_home_path. |
424 |
abspath = studpath.to_home_path(path) |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
425 |
abspath = os.path.join(os.sep, abspath) |
426 |
zip.unzip(abspath, filedata) |
|
427 |
except (OSError, IOError): |
|
428 |
goterror = True |
|
1089
by chadnickbok
Fixes Issue #14 |
429 |
except WillNotOverwrite, e: |
430 |
raise ActionError("File '" + e.filename + "' already exists.") |
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
431 |
else: |
432 |
# Not a zip file
|
|
1271
by William Grant
Replace uses of url_to_jailpaths in fileservice with to_home_path. |
433 |
filepath_local = studpath.to_home_path(filepath) |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
434 |
if filepath_local is None: |
435 |
raise ActionError("Invalid path") |
|
436 |
||
437 |
# Copy the contents of file object 'data' to the path 'path'
|
|
438 |
try: |
|
439 |
dest = open(filepath_local, 'wb') |
|
440 |
if data is not None: |
|
441 |
shutil.copyfileobj(filedata, dest) |
|
442 |
except (OSError, IOError): |
|
443 |
# TODO: Be more descriptive.
|
|
444 |
goterror = True |
|
445 |
||
446 |
if goterror: |
|
447 |
if len(data) == 1: |
|
448 |
raise ActionError("Could not write to target file") |
|
449 |
else: |
|
450 |
raise ActionError( |
|
451 |
"Could not write to one or more of the target files") |
|
452 |
||
453 |
def action_paste(req, fields): |
|
454 |
"""Performs the copy or move action with the files specified.
|
|
455 |
Copies/moves the files to the specified directory.
|
|
456 |
||
457 |
Reads fields: 'src', 'dst', 'mode', 'file' (multiple).
|
|
458 |
src: Base path that all the files are relative to (source).
|
|
459 |
dst: Destination path to paste into.
|
|
460 |
mode: 'copy' or 'move'.
|
|
461 |
file: (Multiple) Files relative to base, which will be copied
|
|
462 |
or moved to new locations relative to path.
|
|
463 |
"""
|
|
464 |
errormsg = None |
|
465 |
||
466 |
dst = fields.getfirst('dst') |
|
467 |
src = fields.getfirst('src') |
|
468 |
mode = fields.getfirst('mode') |
|
469 |
files = fields.getlist('file') |
|
470 |
if dst is None or src is None or mode is None: |
|
471 |
raise ActionError("Required field missing") |
|
1086
by chadnickbok
This commit fixes issue #10 and part of issue #9 |
472 |
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
473 |
dst_local = actionpath_to_local(req, dst) |
474 |
if not os.path.isdir(dst_local): |
|
475 |
raise ActionError("dst is not a directory") |
|
476 |
||
477 |
errorfiles = [] |
|
478 |
for file in files: |
|
479 |
# The source must not be interpreted as relative to req.path
|
|
480 |
# Add a slash (relative to top-level)
|
|
481 |
if src[:1] != '/': |
|
482 |
src = '/' + src |
|
483 |
frompath = os.path.join(src, file) |
|
484 |
# The destination is found by taking just the basename of the file
|
|
485 |
topath = os.path.join(dst, os.path.basename(file)) |
|
486 |
try: |
|
1086
by chadnickbok
This commit fixes issue #10 and part of issue #9 |
487 |
if mode == "copy": |
488 |
movefile(req, frompath, topath, True) |
|
489 |
elif mode == "move": |
|
490 |
movefile(req, frompath, topath, False) |
|
491 |
elif mode == "svncopy": |
|
492 |
svn_movefile(req, frompath, topath, True) |
|
493 |
elif mode == "svnmove": |
|
494 |
svn_movefile(req, frompath, topath, False) |
|
495 |
else: |
|
496 |
raise ActionError("Invalid mode (must be '(svn)copy' or '(svn)move')") |
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
497 |
except ActionError, message: |
498 |
# Store the error for later; we want to copy as many as possible
|
|
499 |
if errormsg is None: |
|
500 |
errormsg = message |
|
501 |
else: |
|
502 |
# Multiple errors; generic message
|
|
503 |
errormsg = "One or more files could not be pasted" |
|
504 |
# Add this file to errorfiles; it will be put back on the
|
|
505 |
# clipboard for possible future pasting.
|
|
506 |
errorfiles.append(file) |
|
507 |
if errormsg is not None: |
|
508 |
raise ActionError(errormsg) |
|
509 |
||
510 |
# XXX errorfiles contains a list of files that couldn't be pasted.
|
|
511 |
# we currently do nothing with this.
|
|
512 |
||
513 |
def action_publish(req,fields): |
|
514 |
"""Marks the folder as published by adding a '.published' file to the
|
|
515 |
directory and ensuring that the parent directory permissions are correct
|
|
516 |
||
517 |
Reads fields: 'path'
|
|
518 |
"""
|
|
519 |
paths = fields.getlist('path') |
|
1267
by William Grant
Drop unneeded use of studpath.url_to_local in fileservice. |
520 |
user = util.split_path(req.path)[0] |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
521 |
homedir = "/home/%s" % user |
522 |
if len(paths): |
|
523 |
paths = map(lambda path: actionpath_to_local(req, path), paths) |
|
524 |
else: |
|
1271
by William Grant
Replace uses of url_to_jailpaths in fileservice with to_home_path. |
525 |
paths = [studpath.to_home_path(req.path)] |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
526 |
|
527 |
# Set all the dirs in home dir world browsable (o+r,o+x)
|
|
528 |
#FIXME: Should really only do those in the direct path not all of the
|
|
529 |
# folders in a students home directory
|
|
530 |
for root,dirs,files in os.walk(homedir): |
|
531 |
os.chmod(root, os.stat(root).st_mode|0005) |
|
532 |
||
533 |
try: |
|
534 |
for path in paths: |
|
535 |
if os.path.isdir(path): |
|
536 |
pubfile = open(os.path.join(path,'.published'),'w') |
|
537 |
pubfile.write("This directory is published\n") |
|
538 |
pubfile.close() |
|
539 |
else: |
|
540 |
raise ActionError("Can only publish directories") |
|
541 |
except OSError, e: |
|
542 |
raise ActionError("Directory could not be published") |
|
543 |
||
544 |
def action_unpublish(req,fields): |
|
545 |
"""Marks the folder as unpublished by removing a '.published' file in the
|
|
546 |
directory (if it exits). It does not change the permissions of the parent
|
|
547 |
directories.
|
|
548 |
||
549 |
Reads fields: 'path'
|
|
550 |
"""
|
|
551 |
paths = fields.getlist('path') |
|
552 |
if len(paths): |
|
553 |
paths = map(lambda path: actionpath_to_local(req, path), paths) |
|
554 |
else: |
|
1271
by William Grant
Replace uses of url_to_jailpaths in fileservice with to_home_path. |
555 |
paths = [studpath.to_home_path(req.path)] |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
556 |
|
557 |
try: |
|
558 |
for path in paths: |
|
559 |
if os.path.isdir(path): |
|
560 |
pubfile = os.path.join(path,'.published') |
|
561 |
if os.path.isfile(pubfile): |
|
562 |
os.remove(pubfile) |
|
563 |
else: |
|
564 |
raise ActionError("Can only unpublish directories") |
|
565 |
except OSError, e: |
|
566 |
raise ActionError("Directory could not be unpublished") |
|
567 |
||
568 |
||
569 |
def action_svnadd(req, fields): |
|
570 |
"""Performs a "svn add" to each file specified.
|
|
571 |
||
572 |
Reads fields: 'path' (multiple)
|
|
573 |
"""
|
|
574 |
paths = fields.getlist('path') |
|
1641
by Matt Giuca
fileservice_lib.action: Decode all strings from UTF-8 to unicode before passing to SVN commands. This prevents UnicodeDecodeErrors on non-ASCII characters for all SVN actions. |
575 |
paths = map(lambda path: actionpath_to_local(req, path).decode('utf-8'), |
576 |
paths) |
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
577 |
|
578 |
try: |
|
579 |
svnclient.add(paths, recurse=True, force=True) |
|
580 |
except pysvn.ClientError, e: |
|
581 |
raise ActionError(str(e)) |
|
582 |
||
583 |
def action_svnremove(req, fields): |
|
584 |
"""Performs a "svn remove" on each file specified.
|
|
585 |
||
586 |
Reads fields: 'path' (multiple)
|
|
587 |
"""
|
|
588 |
paths = fields.getlist('path') |
|
1641
by Matt Giuca
fileservice_lib.action: Decode all strings from UTF-8 to unicode before passing to SVN commands. This prevents UnicodeDecodeErrors on non-ASCII characters for all SVN actions. |
589 |
paths = map(lambda path: actionpath_to_local(req, path).decode('utf-8'), |
590 |
paths) |
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
591 |
|
592 |
try: |
|
593 |
svnclient.remove(paths, force=True) |
|
594 |
except pysvn.ClientError, e: |
|
595 |
raise ActionError(str(e)) |
|
596 |
||
597 |
def action_svnupdate(req, fields): |
|
598 |
"""Performs a "svn update" to each file specified.
|
|
599 |
||
1326.1.1
by David Coles
Add optional 'revision' paramenter to svnupdate in fileservice to allow |
600 |
Reads fields: 'path' and 'revision'
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
601 |
"""
|
602 |
path = fields.getfirst('path') |
|
1326.1.1
by David Coles
Add optional 'revision' paramenter to svnupdate in fileservice to allow |
603 |
revision = fields.getfirst('revision') |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
604 |
if path is None: |
605 |
raise ActionError("Required field missing") |
|
1326.1.1
by David Coles
Add optional 'revision' paramenter to svnupdate in fileservice to allow |
606 |
if revision is None: |
607 |
revision = pysvn.Revision( pysvn.opt_revision_kind.head ) |
|
608 |
else: |
|
609 |
try: |
|
610 |
revision = pysvn.Revision(pysvn.opt_revision_kind.number, |
|
611 |
int(revision)) |
|
612 |
except ValueError, e: |
|
613 |
raise ActionError("Bad revision number: '%s'"%revision,) |
|
1641
by Matt Giuca
fileservice_lib.action: Decode all strings from UTF-8 to unicode before passing to SVN commands. This prevents UnicodeDecodeErrors on non-ASCII characters for all SVN actions. |
614 |
path = actionpath_to_local(req, path).decode('utf-8') |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
615 |
|
616 |
try: |
|
1326.1.1
by David Coles
Add optional 'revision' paramenter to svnupdate in fileservice to allow |
617 |
svnclient.update(path, recurse=True, revision=revision) |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
618 |
except pysvn.ClientError, e: |
619 |
raise ActionError(str(e)) |
|
620 |
||
621 |
def action_svnresolved(req, fields): |
|
622 |
"""Performs a "svn resolved" to each file specified.
|
|
623 |
||
624 |
Reads fields: 'path'
|
|
625 |
"""
|
|
626 |
path = fields.getfirst('path') |
|
627 |
if path is None: |
|
628 |
raise ActionError("Required field missing") |
|
1641
by Matt Giuca
fileservice_lib.action: Decode all strings from UTF-8 to unicode before passing to SVN commands. This prevents UnicodeDecodeErrors on non-ASCII characters for all SVN actions. |
629 |
path = actionpath_to_local(req, path).decode('utf-8') |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
630 |
|
631 |
try: |
|
632 |
svnclient.resolved(path, recurse=True) |
|
633 |
except pysvn.ClientError, e: |
|
634 |
raise ActionError(str(e)) |
|
635 |
||
636 |
def action_svnrevert(req, fields): |
|
637 |
"""Performs a "svn revert" to each file specified.
|
|
638 |
||
639 |
Reads fields: 'path' (multiple)
|
|
640 |
"""
|
|
641 |
paths = fields.getlist('path') |
|
1641
by Matt Giuca
fileservice_lib.action: Decode all strings from UTF-8 to unicode before passing to SVN commands. This prevents UnicodeDecodeErrors on non-ASCII characters for all SVN actions. |
642 |
paths = map(lambda path: actionpath_to_local(req, path).decode('utf-8'), |
643 |
paths) |
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
644 |
|
645 |
try: |
|
646 |
svnclient.revert(paths, recurse=True) |
|
647 |
except pysvn.ClientError, e: |
|
648 |
raise ActionError(str(e)) |
|
649 |
||
650 |
def action_svncommit(req, fields): |
|
651 |
"""Performs a "svn commit" to each file specified.
|
|
652 |
||
653 |
Reads fields: 'path' (multiple), 'logmsg' (optional)
|
|
654 |
"""
|
|
655 |
paths = fields.getlist('path') |
|
1664
by Matt Giuca
browser.js: Adjusted condition for enabling "Commit" action; now allowed if |
656 |
if len(paths): |
657 |
paths = map(lambda path:actionpath_to_local(req,path).decode('utf-8'), |
|
658 |
paths) |
|
659 |
else: |
|
660 |
paths = [studpath.to_home_path(req.path).decode('utf-8')] |
|
1641
by Matt Giuca
fileservice_lib.action: Decode all strings from UTF-8 to unicode before passing to SVN commands. This prevents UnicodeDecodeErrors on non-ASCII characters for all SVN actions. |
661 |
logmsg = str(fields.getfirst('logmsg', |
662 |
DEFAULT_LOGMESSAGE)).decode('utf-8') |
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
663 |
if logmsg == '': logmsg = DEFAULT_LOGMESSAGE |
664 |
||
665 |
try: |
|
666 |
svnclient.checkin(paths, logmsg, recurse=True) |
|
667 |
except pysvn.ClientError, e: |
|
668 |
raise ActionError(str(e)) |
|
669 |
||
670 |
def action_svncheckout(req, fields): |
|
671 |
"""Performs a "svn checkout" of the first path into the second path.
|
|
672 |
||
673 |
Reads fields: 'path' (multiple)
|
|
674 |
"""
|
|
675 |
paths = fields.getlist('path') |
|
676 |
if len(paths) != 2: |
|
677 |
raise ActionError("usage: svncheckout url local-path") |
|
1238
by William Grant
URL-quote SVN repository paths in fileservice. |
678 |
url = ivle.conf.svn_addr + "/" + urllib.quote(paths[0]) |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
679 |
local_path = actionpath_to_local(req, str(paths[1])) |
1641
by Matt Giuca
fileservice_lib.action: Decode all strings from UTF-8 to unicode before passing to SVN commands. This prevents UnicodeDecodeErrors on non-ASCII characters for all SVN actions. |
680 |
url = url.decode('utf-8') |
681 |
local_path = local_path.decode('utf-8') |
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
682 |
try: |
683 |
svnclient.checkout(url, local_path, recurse=True) |
|
684 |
except pysvn.ClientError, e: |
|
685 |
raise ActionError(str(e)) |
|
686 |
||
687 |
def action_svnrepomkdir(req, fields): |
|
688 |
"""Performs a "svn mkdir" on a path under the IVLE SVN root.
|
|
689 |
||
690 |
Reads fields: 'path'
|
|
691 |
"""
|
|
692 |
path = fields.getfirst('path') |
|
693 |
logmsg = fields.getfirst('logmsg') |
|
1641
by Matt Giuca
fileservice_lib.action: Decode all strings from UTF-8 to unicode before passing to SVN commands. This prevents UnicodeDecodeErrors on non-ASCII characters for all SVN actions. |
694 |
url = (ivle.conf.svn_addr + "/" + urllib.quote(path)).decode('utf-8') |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
695 |
try: |
696 |
svnclient.mkdir(url, log_message=logmsg) |
|
697 |
except pysvn.ClientError, e: |
|
698 |
raise ActionError(str(e)) |
|
699 |
||
700 |
def action_svnrepostat(req, fields): |
|
701 |
"""Discovers whether a path exists in a repo under the IVLE SVN root.
|
|
702 |
||
1165.1.39
by William Grant
Return the file's revision from svnrepostat. |
703 |
If it does exist, returns a dict containing its metadata.
|
704 |
||
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
705 |
Reads fields: 'path'
|
706 |
"""
|
|
707 |
path = fields.getfirst('path') |
|
1641
by Matt Giuca
fileservice_lib.action: Decode all strings from UTF-8 to unicode before passing to SVN commands. This prevents UnicodeDecodeErrors on non-ASCII characters for all SVN actions. |
708 |
url = (ivle.conf.svn_addr + "/" + urllib.quote(path)).decode('utf-8') |
1165.1.39
by William Grant
Return the file's revision from svnrepostat. |
709 |
svnclient.exception_style = 1 |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
710 |
|
711 |
try: |
|
1165.1.39
by William Grant
Return the file's revision from svnrepostat. |
712 |
info = svnclient.info2(url, |
713 |
revision=pysvn.Revision(pysvn.opt_revision_kind.head))[0][1] |
|
714 |
return {'svnrevision': info['rev'].number |
|
715 |
if info['rev'] and |
|
716 |
info['rev'].kind == pysvn.opt_revision_kind.number |
|
717 |
else None} |
|
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
718 |
except pysvn.ClientError, e: |
719 |
# Error code 170000 means ENOENT in this revision.
|
|
720 |
if e[1][0][1] == 170000: |
|
721 |
raise util.IVLEError(404, 'The specified repository path does not exist') |
|
722 |
else: |
|
723 |
raise ActionError(str(e[0])) |
|
1318.1.1
by David Coles
Added svncleanup action to Fileservice to allow a cleanup to be run on svn |
724 |
|
725 |
||
726 |
def action_svncleanup(req, fields): |
|
727 |
"""Recursively clean up the working copy, removing locks, resuming
|
|
728 |
unfinished operations, etc.
|
|
729 |
path: The path to be cleaned"""
|
|
730 |
||
731 |
path = fields.getfirst('path') |
|
732 |
if path is None: |
|
733 |
raise ActionError("Required field missing") |
|
1641
by Matt Giuca
fileservice_lib.action: Decode all strings from UTF-8 to unicode before passing to SVN commands. This prevents UnicodeDecodeErrors on non-ASCII characters for all SVN actions. |
734 |
path = actionpath_to_local(req, path).decode('utf-8') |
1318.1.1
by David Coles
Added svncleanup action to Fileservice to allow a cleanup to be run on svn |
735 |
|
736 |
try: |
|
737 |
svnclient.cleanup(path) |
|
738 |
except pysvn.ClientError, e: |
|
739 |
raise ActionError(str(e)) |
|
740 |
||
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
741 |
|
742 |
# Table of all action functions #
|
|
743 |
# Each function has the interface f(req, fields).
|
|
744 |
||
745 |
actions_table = { |
|
746 |
"delete" : action_delete, |
|
747 |
"move" : action_move, |
|
748 |
"mkdir" : action_mkdir, |
|
749 |
"putfile" : action_putfile, |
|
750 |
"putfiles" : action_putfiles, |
|
751 |
"paste" : action_paste, |
|
752 |
"publish" : action_publish, |
|
753 |
"unpublish" : action_unpublish, |
|
754 |
||
755 |
"svnadd" : action_svnadd, |
|
756 |
"svnremove" : action_svnremove, |
|
757 |
"svnupdate" : action_svnupdate, |
|
758 |
"svnresolved" : action_svnresolved, |
|
759 |
"svnrevert" : action_svnrevert, |
|
760 |
"svncommit" : action_svncommit, |
|
761 |
"svncheckout" : action_svncheckout, |
|
762 |
"svnrepomkdir" : action_svnrepomkdir, |
|
763 |
"svnrepostat" : action_svnrepostat, |
|
1318.1.1
by David Coles
Added svncleanup action to Fileservice to allow a cleanup to be run on svn |
764 |
"svncleanup" : action_svncleanup, |
1079
by William Grant
Merge setup-refactor branch. This completely breaks existing installations; |
765 |
}
|