annotate uploader/handlers.py @ 22:a60cf57d6628

hopefully fix unicode issue
author Jeff Hammel <jhammel@mozilla.com>
date Mon, 29 Aug 2011 22:54:21 -0700
parents 183224756ded
children
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
20
f1142bcce77a add ability to log uploads
Jeff Hammel <jhammel@mozilla.com>
parents: 19
diff changeset
2 import sys
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
3 from urlparse import urlparse
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
4 from webob import Response, exc
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
5
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
6 class Handler(object):
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
7 def __init__(self, app, request):
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
8 self.app = app
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
9 self.request = request
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
10 self.application_path = urlparse(request.application_url)[2]
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
11
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
12 def link(self, path=(), permanant=False):
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
13 if isinstance(path, basestring):
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
14 path = [ path ]
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
15 path = [ i.strip('/') for i in path ]
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
16 if permanant:
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
17 application_url = [ self.request.application_url ]
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
18 else:
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
19 application_url = [ self.application_path ]
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
20 path = application_url + path
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
21 return '/'.join(path)
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
22
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
23 def redirect(self, location):
13
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
24 return exc.HTTPSeeOther(location=location)
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
25
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
26 class Get(Handler):
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
27
13
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
28 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
29 <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
30
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
31 @classmethod
2
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
32 def match(cls, app, request):
7
a8c60480fce0 make query_string argument more universal
k0s <k0scist@gmail.com>
parents: 6
diff changeset
33 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
34 return False
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
35 return request.method == 'GET'
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
36
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
37 def __call__(self):
13
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
38 form = "<html><body>"
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
39 if 'uploaded' in self.request.GET:
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
40 form += '<div>%s uploaded successfully</div>' % self.request.GET['uploaded']
17
d15f85eb2ab9 optionally display upload directory contents
Jeff Hammel <jhammel@mozilla.com>
parents: 15
diff changeset
41 form += self.form
d15f85eb2ab9 optionally display upload directory contents
Jeff Hammel <jhammel@mozilla.com>
parents: 15
diff changeset
42 if self.app.display_contents:
d15f85eb2ab9 optionally display upload directory contents
Jeff Hammel <jhammel@mozilla.com>
parents: 15
diff changeset
43 contents = os.listdir(self.app.directory)
d15f85eb2ab9 optionally display upload directory contents
Jeff Hammel <jhammel@mozilla.com>
parents: 15
diff changeset
44 if contents:
d15f85eb2ab9 optionally display upload directory contents
Jeff Hammel <jhammel@mozilla.com>
parents: 15
diff changeset
45 contents.sort()
22
a60cf57d6628 hopefully fix unicode issue
Jeff Hammel <jhammel@mozilla.com>
parents: 21
diff changeset
46 form += '<div><i>Currently uploaded:<ul><li>' + '</li><li>'.join([i.decode('utf-8', 'ignore') for i in contents]) + '</li></ul></i></div>'
17
d15f85eb2ab9 optionally display upload directory contents
Jeff Hammel <jhammel@mozilla.com>
parents: 15
diff changeset
47 else:
d15f85eb2ab9 optionally display upload directory contents
Jeff Hammel <jhammel@mozilla.com>
parents: 15
diff changeset
48 form += '<div><i>No files in upload directory</i></div>'
20
f1142bcce77a add ability to log uploads
Jeff Hammel <jhammel@mozilla.com>
parents: 19
diff changeset
49 log_file = self.app.log_file
f1142bcce77a add ability to log uploads
Jeff Hammel <jhammel@mozilla.com>
parents: 19
diff changeset
50 if log_file and os.path.exists(log_file):
21
183224756ded reverse order the log for display
Jeff Hammel <jhammel@mozilla.com>
parents: 20
diff changeset
51 log_contents = ''.join(reversed(file(log_file).readlines()))
20
f1142bcce77a add ability to log uploads
Jeff Hammel <jhammel@mozilla.com>
parents: 19
diff changeset
52 form += '<div>Upload log:<pre>%s</pre></div>' % log_contents
17
d15f85eb2ab9 optionally display upload directory contents
Jeff Hammel <jhammel@mozilla.com>
parents: 15
diff changeset
53 form += '</body></html>'
13
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
54 return Response(content_type='text/html', body=form)
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
55
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
56 class Post(Handler):
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
57
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
58 @classmethod
2
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
59 def match(cls, app, request):
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
60 return request.method == 'POST'
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
61
2
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
62 def write(self, fin, path):
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
63 fout = file(path, 'w')
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
64 fout.write(fin.file.read())
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
65 fout.close()
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
66
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
67 def __call__(self):
18
cc5f567ce840 make it safe
Jeff Hammel <jhammel@mozilla.com>
parents: 17
diff changeset
68
cc5f567ce840 make it safe
Jeff Hammel <jhammel@mozilla.com>
parents: 17
diff changeset
69 # get the file
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
70 fin = self.request.POST['file']
15
1ee374416987 handle more gracefully when no file is uploaded
Jeff Hammel <jhammel@mozilla.com>
parents: 14
diff changeset
71 try:
19
4da97e040145 * fix syntax
Jeff Hammel <jhammel@mozilla.com>
parents: 18
diff changeset
72 _path = fin.filename
15
1ee374416987 handle more gracefully when no file is uploaded
Jeff Hammel <jhammel@mozilla.com>
parents: 14
diff changeset
73 except AttributeError: # no file uploaded
1ee374416987 handle more gracefully when no file is uploaded
Jeff Hammel <jhammel@mozilla.com>
parents: 14
diff changeset
74 return self.redirect(self.link('/'))
18
cc5f567ce840 make it safe
Jeff Hammel <jhammel@mozilla.com>
parents: 17
diff changeset
75
cc5f567ce840 make it safe
Jeff Hammel <jhammel@mozilla.com>
parents: 17
diff changeset
76 # don't allow bad filenames
cc5f567ce840 make it safe
Jeff Hammel <jhammel@mozilla.com>
parents: 17
diff changeset
77 illegal = ['..', '<', '&', '>']
cc5f567ce840 make it safe
Jeff Hammel <jhammel@mozilla.com>
parents: 17
diff changeset
78 illegal.append(os.path.sep)
cc5f567ce840 make it safe
Jeff Hammel <jhammel@mozilla.com>
parents: 17
diff changeset
79 for i in illegal:
cc5f567ce840 make it safe
Jeff Hammel <jhammel@mozilla.com>
parents: 17
diff changeset
80 _path = _path.replace(i, '_')
cc5f567ce840 make it safe
Jeff Hammel <jhammel@mozilla.com>
parents: 17
diff changeset
81
cc5f567ce840 make it safe
Jeff Hammel <jhammel@mozilla.com>
parents: 17
diff changeset
82 # write the file + redirect
14
916d45d4f921 dont just die on questionable filenames
Jeff Hammel <jhammel@mozilla.com>
parents: 13
diff changeset
83 _path = os.path.join(self.app.directory, _path)
11
egj@socialplanning.org
parents: 10
diff changeset
84 self.write(fin, _path)
20
f1142bcce77a add ability to log uploads
Jeff Hammel <jhammel@mozilla.com>
parents: 19
diff changeset
85 if self.app.log_file:
f1142bcce77a add ability to log uploads
Jeff Hammel <jhammel@mozilla.com>
parents: 19
diff changeset
86 try:
f1142bcce77a add ability to log uploads
Jeff Hammel <jhammel@mozilla.com>
parents: 19
diff changeset
87 f = file(self.app.log_file, 'a')
f1142bcce77a add ability to log uploads
Jeff Hammel <jhammel@mozilla.com>
parents: 19
diff changeset
88 print >> f, fin.filename
f1142bcce77a add ability to log uploads
Jeff Hammel <jhammel@mozilla.com>
parents: 19
diff changeset
89 f.close()
f1142bcce77a add ability to log uploads
Jeff Hammel <jhammel@mozilla.com>
parents: 19
diff changeset
90 except Exception, e:
f1142bcce77a add ability to log uploads
Jeff Hammel <jhammel@mozilla.com>
parents: 19
diff changeset
91 print >> sys.stderr, e
13
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
92 return self.redirect(self.link('/?uploaded=' + fin.filename))
2
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
93
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
94 def path(directory, request):
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
95 if os.sep == '/':
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
96 return os.path.join(directory, request.path_info.strip('/'))
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
97 return os.path.join(directory, *request.path_info.strip('/').split('/'))
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
98
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
99 class SubpathGet(Get):
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
100
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
101 @classmethod
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
102 def match(cls, app, request):
9
619516d8c9ff fix typoe
egj@socialplanning.org
parents: 7
diff changeset
103 if not Get.match(app, request):
2
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
104 return False
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
105 _path = path(app.directory, request)
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
106 if os.path.exists(_path) and os.path.isdir(_path):
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
107 return True
0
827f7577f940 initial commit of file upload widget
k0s <k0scist@gmail.com>
parents:
diff changeset
108
2
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
109 class SubpathPost(Post):
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
110
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
111 @classmethod
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
112 def match(cls, app, request):
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
113 if request.method != 'POST':
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
114 return False
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
115 _path = path(app.directory, request)
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
116 if os.path.exists(_path) and os.path.isdir(_path):
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
117 return True
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
118
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
119 def __call__(self):
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
120 fin = self.request.POST['file']
10
egj@socialplanning.org
parents: 9
diff changeset
121 _path = path(self.app.directory, self.request)
egj@socialplanning.org
parents: 9
diff changeset
122 _path = os.path.join(_path, fin.filename)
egj@socialplanning.org
parents: 9
diff changeset
123 self.write(fin, _path)
13
b8c636b0b567 make work for non pastescript frameworks
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
124 return self.redirect(self.link(self.request.path_info))
2
0b5fce452087 include handling of subpaths
k0s <k0scist@gmail.com>
parents: 0
diff changeset
125