annotate uploader/handlers.py @ 15:1ee374416987

handle more gracefully when no file is uploaded
author Jeff Hammel <jhammel@mozilla.com>
date Tue, 12 Jul 2011 09:18:29 -0700
parents 916d45d4f921
children d15f85eb2ab9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
1 import os
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
2 from urlparse import urlparse
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
3 from webob import Response, exc
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
4
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
5 class Handler(object):
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
6 def __init__(self, app, request):
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
7 self.app = app
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
8 self.request = request
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
9 self.application_path = urlparse(request.application_url)[2]
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
10
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
11 def link(self, path=(), permanant=False):
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
12 if isinstance(path, basestring):
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
13 path = [ path ]
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
14 path = [ i.strip('/') for i in path ]
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
15 if permanant:
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
16 application_url = [ self.request.application_url ]
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
17 else:
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
18 application_url = [ self.application_path ]
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
19 path = application_url + path
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
20 return '/'.join(path)
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
21
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
22 def redirect(self, location):
13
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
23 return exc.HTTPSeeOther(location=location)
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
24
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
25 class Get(Handler):
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
26
13
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
27 form = """<form name="upload_form" method="post" enctype="multipart/form-data">
2
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
28 <input type="file" name="file"/><input type="submit" value="upload"/></form></body></html>"""
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
29
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
30 @classmethod
2
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
31 def match(cls, app, request):
7
a8c60480fce0 make query_string argument more universal
k0s <k0scist@gmail.com>
parents: 6
diff changeset
32 if app.query_string and (app.query_string not in request.GET):
a8c60480fce0 make query_string argument more universal
k0s <k0scist@gmail.com>
parents: 6
diff changeset
33 return False
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
34 return request.method == 'GET'
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
35
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
36 def __call__(self):
13
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
37 form = "<html><body>"
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
38 if 'uploaded' in self.request.GET:
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
39 form += '<div>%s uploaded successfully</div>' % self.request.GET['uploaded']
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
40 form += self.form + '</body></html>'
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
41 return Response(content_type='text/html', body=form)
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
42
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
43 class Post(Handler):
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
44
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
45 @classmethod
2
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
46 def match(cls, app, request):
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
47 return request.method == 'POST'
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
48
2
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
49 def write(self, fin, path):
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
50 fout = file(path, 'w')
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
51 fout.write(fin.file.read())
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
52 fout.close()
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
53
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
54 def __call__(self):
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
55 fin = self.request.POST['file']
15
1ee374416987 handle more gracefully when no file is uploaded
Jeff Hammel <jhammel@mozilla.com>
parents: 14
diff changeset
56 try:
1ee374416987 handle more gracefully when no file is uploaded
Jeff Hammel <jhammel@mozilla.com>
parents: 14
diff changeset
57 _path = fin.filename.replace('..', '_')
1ee374416987 handle more gracefully when no file is uploaded
Jeff Hammel <jhammel@mozilla.com>
parents: 14
diff changeset
58 except AttributeError: # no file uploaded
1ee374416987 handle more gracefully when no file is uploaded
Jeff Hammel <jhammel@mozilla.com>
parents: 14
diff changeset
59 return self.redirect(self.link('/'))
14
916d45d4f921 dont just die on questionable filenames
Jeff Hammel <jhammel@mozilla.com>
parents: 13
diff changeset
60 _path = _path.replace(os.path.sep, '_')
916d45d4f921 dont just die on questionable filenames
Jeff Hammel <jhammel@mozilla.com>
parents: 13
diff changeset
61 _path = os.path.join(self.app.directory, _path)
11
egj@socialplanning.org
parents: 10
diff changeset
62 self.write(fin, _path)
13
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
63 return self.redirect(self.link('/?uploaded=' + fin.filename))
2
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
64
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
65 def path(directory, request):
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
66 if os.sep == '/':
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
67 return os.path.join(directory, request.path_info.strip('/'))
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
68 return os.path.join(directory, *request.path_info.strip('/').split('/'))
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
69
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
70 class SubpathGet(Get):
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
71
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
72 @classmethod
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
73 def match(cls, app, request):
9
619516d8c9ff fix typoe
egj@socialplanning.org
parents: 7
diff changeset
74 if not Get.match(app, request):
2
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
75 return False
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
76 _path = path(app.directory, request)
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
77 if os.path.exists(_path) and os.path.isdir(_path):
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
78 return True
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
79
2
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
80 class SubpathPost(Post):
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
81
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
82 @classmethod
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
83 def match(cls, app, request):
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
84 if request.method != 'POST':
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
85 return False
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
86 _path = path(app.directory, request)
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
87 if os.path.exists(_path) and os.path.isdir(_path):
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
88 return True
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
89
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
90 def __call__(self):
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
91 fin = self.request.POST['file']
10
egj@socialplanning.org
parents: 9
diff changeset
92 _path = path(self.app.directory, self.request)
egj@socialplanning.org
parents: 9
diff changeset
93 _path = os.path.join(_path, fin.filename)
egj@socialplanning.org
parents: 9
diff changeset
94 self.write(fin, _path)
13
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
95 return self.redirect(self.link(self.request.path_info))
2
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
96