Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit fdf2f01

Browse files
binuxbinux
committed
add test for webdav
1 parent 3abe619 commit fdf2f01

File tree

2 files changed

+151
-10
lines changed

2 files changed

+151
-10
lines changed

‎pyspider/webui/webdav.py

Lines changed: 39 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,34 @@
77

88

99
import os
10+
import re
1011
import time
1112
import base64
1213
from six import BytesIO
1314
from wsgidav.wsgidav_app import DEFAULT_CONFIG, WsgiDAVApp
1415
from wsgidav.dav_provider import DAVProvider, DAVCollection, DAVNonCollection
16+
from wsgidav.dav_error import DAVError, HTTP_NOT_FOUND, HTTP_FORBIDDEN
1517
from pyspider.libs.utils import utf8, text
1618
from .app import app
1719

1820

21+
def verify_project_name(project):
22+
if re.search(r"[^\w]", project):
23+
return False
24+
return True
25+
26+
class ContentIO(BytesIO):
27+
def close(self):
28+
self.content = self.getvalue()
29+
BytesIO.close(self)
30+
31+
1932
class ScriptResource(DAVNonCollection):
2033
def __init__(self, path, environ, app, project=None):
2134
super(ScriptResource, self).__init__(path, environ)
2235

2336
self.app = app
37+
self.new_project = False
2438
self._project = project
2539
self.project_name = self.name
2640
self.writebuffer = None
@@ -35,17 +49,24 @@ def project(self):
3549
if projectdb:
3650
self._project = projectdb.get(self.project_name)
3751
if not self._project:
38-
self._project = {
39-
'name': self.project_name,
40-
'script': '',
41-
'updatetime': time.time(),
42-
}
52+
if verify_project_name(self.project_name) and self.name.endswith('.py'):
53+
self.new_project = True
54+
self._project = {
55+
'name': self.project_name,
56+
'script': '',
57+
'status': 'TODO',
58+
'rate': self.app.config.get('max_rate', 1),
59+
'burst': self.app.config.get('max_burst', 3),
60+
'updatetime': time.time(),
61+
}
62+
else:
63+
raise DAVError(HTTP_FORBIDDEN)
4364
return self._project
4465

4566
@property
4667
def readonly(self):
4768
projectdb = self.app.config['projectdb']
48-
if projectdb:
69+
if not projectdb:
4970
return True
5071
if 'lock' in projectdb.split_group(self.project.get('group')) \
5172
and self.app.config.get('webui_username') \
@@ -84,7 +105,7 @@ def beginWrite(self, contentType=None):
84105
if self.readonly:
85106
self.app.logger.error('webdav.beginWrite readonly')
86107
return super(ScriptResource, self).beginWrite(contentType)
87-
self.writebuffer = BytesIO()
108+
self.writebuffer = ContentIO()
88109
return self.writebuffer
89110

90111
def endWrite(self, withErrors):
@@ -96,12 +117,19 @@ def endWrite(self, withErrors):
96117
projectdb = self.app.config['projectdb']
97118
if not projectdb:
98119
return
120+
99121
info = {
100-
'script': text(self.writebuffer.getvalue())
122+
'script': text(getattr(self.writebuffer, 'content', ''))
101123
}
102124
if self.project.get('status') in ('DEBUG', 'RUNNING'):
103125
info['status'] = 'CHECKING'
104-
return projectdb.update(self.project_name, info)
126+
127+
if self.new_project:
128+
self.project.update(info)
129+
self.new_project = False
130+
return projectdb.insert(self.project_name, self.project)
131+
else:
132+
return projectdb.update(self.project_name, info)
105133

106134

107135
class RootCollection(DAVCollection):
@@ -143,7 +171,8 @@ def __repr__(self):
143171
return "pyspiderScriptProvider"
144172

145173
def getResourceInst(self, path, environ):
146-
if path == '/':
174+
path = os.path.normpath(path)
175+
if path in ('/', '.', ''):
147176
return RootCollection(path, environ, self.app)
148177
else:
149178
return ScriptResource(path, environ, self.app)

‎tests/test_webdav.py

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
#!/usr/bin/env python
2+
# -*- encoding: utf-8 -*-
3+
# vim: set et sw=4 ts=4 sts=4 ff=unix fenc=utf8:
4+
# Author: Binux<[email protected]>
5+
# http://binux.me
6+
# Created on 2015-06-03 21:15
7+
8+
import os
9+
import six
10+
import time
11+
import shutil
12+
import inspect
13+
import unittest2 as unittest
14+
15+
from six import BytesIO
16+
from pyspider import run
17+
from pyspider.libs import utils
18+
from tests import data_sample_handler, data_handler
19+
20+
@unittest.skipIf(six.PY3, 'webdav not support python3')
21+
class TestWebDav(unittest.TestCase):
22+
@classmethod
23+
def setUpClass(self):
24+
import easywebdav
25+
26+
shutil.rmtree('./data/tests', ignore_errors=True)
27+
os.makedirs('./data/tests')
28+
29+
ctx = run.cli.make_context('test', [
30+
'--taskdb', 'sqlite+taskdb:///data/tests/task.db',
31+
'--projectdb', 'sqlite+projectdb:///data/tests/projectdb.db',
32+
'--resultdb', 'sqlite+resultdb:///data/tests/resultdb.db',
33+
], None, obj=utils.ObjectDict(testing_mode=True))
34+
self.ctx = run.cli.invoke(ctx)
35+
36+
ctx = run.webui.make_context('webui', [
37+
'--username', 'binux',
38+
'--password', '4321',
39+
], self.ctx)
40+
self.app = run.webui.invoke(ctx)
41+
utils.run_in_thread(self.app.run)
42+
43+
self.webdav = easywebdav.connect('localhost', port=5000, path='dav')
44+
self.webdav_up = easywebdav.connect('localhost', port=5000, path='dav',
45+
username='binux', password='4321')
46+
47+
@classmethod
48+
def tearDownClass(self):
49+
for each in self.ctx.obj.instances:
50+
each.quit()
51+
time.sleep(1)
52+
53+
shutil.rmtree('./data/tests', ignore_errors=True)
54+
55+
def test_10_ls(self):
56+
self.assertEqual(len(self.webdav.ls()), 1)
57+
58+
def test_20_create_error(self):
59+
import easywebdav
60+
with self.assertRaises(easywebdav.OperationFailed):
61+
self.webdav.upload(inspect.getsourcefile(data_sample_handler),
62+
'bad_file_name')
63+
with self.assertRaises(easywebdav.OperationFailed):
64+
self.webdav.upload(inspect.getsourcefile(data_sample_handler),
65+
'bad.file.name')
66+
67+
def test_30_create_ok(self):
68+
self.webdav.upload(inspect.getsourcefile(data_handler), 'handler.py')
69+
self.webdav.upload(inspect.getsourcefile(data_sample_handler), 'sample_handler.py')
70+
self.assertEqual(len(self.webdav.ls()), 3)
71+
72+
def test_40_get_404(self):
73+
io = BytesIO()
74+
import easywebdav
75+
with self.assertRaises(easywebdav.OperationFailed):
76+
self.webdav.download('not_exitst', io)
77+
io.close()
78+
79+
def test_50_get(self):
80+
io = BytesIO()
81+
self.webdav.download('handler.py', io)
82+
self.assertEqual(inspect.getsource(data_handler), io.getvalue())
83+
io.close()
84+
85+
io = BytesIO()
86+
self.webdav.download('sample_handler.py', io)
87+
self.assertEqual(inspect.getsource(data_sample_handler), io.getvalue())
88+
io.close()
89+
90+
def test_60_edit(self):
91+
self.webdav.upload(inspect.getsourcefile(data_handler), 'sample_handler.py')
92+
93+
def test_70_get(self):
94+
io = BytesIO()
95+
self.webdav.download('sample_handler.py', io)
96+
self.assertEqual(inspect.getsource(data_handler), io.getvalue())
97+
io.close()
98+
99+
def test_80_password(self):
100+
import requests
101+
rv = requests.post('http://localhost:5000/update', data={
102+
'name': 'group',
103+
'value': 'lock',
104+
'pk': 'sample_handler',
105+
})
106+
self.assertEqual(rv.status_code, 200)
107+
108+
import easywebdav
109+
with self.assertRaises(easywebdav.OperationFailed):
110+
self.webdav.upload(inspect.getsourcefile(data_sample_handler), 'sample_handler.py')
111+
self.webdav_up.upload(inspect.getsourcefile(data_sample_handler), 'sample_handler.py')
112+

0 commit comments

Comments
 (0)