Skip to content

Sync #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 10, 2019
Merged

Sync #40

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6f5c82
fix "'Request' object has no attribute 'user'"; add 7 test cases
zhangchunlin Oct 10, 2019
915a47e
fix "NameError: name 'n' is not defined"; add 6 test cases
zhangchunlin Oct 10, 2019
0fb0711
fix "NameError: name 'model_name' is not defined"; add 3 test cases
zhangchunlin Oct 10, 2019
8f3f0b1
fix "NameError: name 'model' is not defined"; add 1 test case
zhangchunlin Oct 10, 2019
85534ca
fix owner_condition() invoke; add 2 test cases for owner_condition()
zhangchunlin Oct 10, 2019
d960506
fix AttributeError; add 6 test cases
zhangchunlin Oct 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix "'Request' object has no attribute 'user'"; add 7 test cases
  • Loading branch information
@zhangchunlin
zhangchunlin committed Oct 10, 2019
commit e6f5c822f83f28173339c132f575a86b827811d8
91 changes: 90 additions & 1 deletion tests/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,29 @@ def test_apijson_get():
>>> print(d)
{'code': 200, 'msg': 'success', 'user': {'username': 'admin', 'nickname': 'Administrator', 'email': 'admin@localhost', 'is_superuser': True, 'id': 1}}

>>> #query with @column which have a non existing column name
>>> data ='''{
... "user":{
... "@role":"OWNER",
... "@column": "id,username,email,nickname,is_superuser,nonexisting"
... }
... }'''
>>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("admin"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 200, 'msg': 'success', 'user': {'username': 'admin', 'nickname': 'Administrator', 'email': 'admin@localhost', 'is_superuser': True, 'id': 1}}

>>> #query with a non existing column property
>>> data ='''{
... "user":{
... "nonexisting": 1
... }
... }'''
>>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("admin"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': "'user' have no attribute 'nonexisting'"}

>>> #query one with a non existing model
>>> data ='''{
... "nonexist":{
Expand Down Expand Up @@ -120,7 +143,7 @@ def test_apijson_get():
>>> r = handler.post('/apijson/get', data=data, middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': "no user for role 'OWNER'"}
{'code': 400, 'msg': "no login user for role 'OWNER'"}

>>> #query one with OWNER but cannot filter with OWNER
>>> data ='''{
Expand Down Expand Up @@ -200,6 +223,72 @@ def test_apijson_get():
>>> print(d)
{'code': 400, 'msg': "'user' not accessible by role 'superuser'"}

>>> #query array
>>> data ='''{
... "[]":{
... "user": {"@role":"ADMIN"}
... }
... }'''
>>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("admin"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 200, 'msg': 'success', '[]': [{'user': {'username': 'admin', 'nickname': 'Administrator', 'email': 'admin@localhost', 'is_superuser': True, 'last_login': None, 'date_join': '2018-11-01 00:00:00', 'image': '', 'active': False, 'locked': False, 'deleted': False, 'auth_type': 'default', 'timezone': '', 'id': 1}}, {'user': {'username': 'usera', 'nickname': 'User A', 'email': 'usera@localhost', 'is_superuser': False, 'last_login': None, 'date_join': '2018-02-02 00:00:00', 'image': '', 'active': False, 'locked': False, 'deleted': False, 'auth_type': 'default', 'timezone': '', 'id': 2}}, {'user': {'username': 'userb', 'nickname': 'User B', 'email': 'userb@localhost', 'is_superuser': False, 'last_login': None, 'date_join': '2018-03-03 00:00:00', 'image': '', 'active': False, 'locked': False, 'deleted': False, 'auth_type': 'default', 'timezone': '', 'id': 3}}, {'user': {'username': 'userc', 'nickname': 'User C', 'email': 'userc@localhost', 'is_superuser': False, 'last_login': None, 'date_join': '2018-04-04 00:00:00', 'image': '', 'active': False, 'locked': False, 'deleted': False, 'auth_type': 'default', 'timezone': '', 'id': 4}}]}

>>> #query array
>>> data ='''{
... "[]":{
... "user": {
... "@role":"ADMIN",
... "@column":"id,username,nickname,email"
... }
... }
... }'''
>>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("admin"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 200, 'msg': 'success', '[]': [{'user': {'username': 'admin', 'nickname': 'Administrator', 'email': 'admin@localhost', 'id': 1}}, {'user': {'username': 'usera', 'nickname': 'User A', 'email': 'usera@localhost', 'id': 2}}, {'user': {'username': 'userb', 'nickname': 'User B', 'email': 'userb@localhost', 'id': 3}}, {'user': {'username': 'userc', 'nickname': 'User C', 'email': 'userc@localhost', 'id': 4}}]}

>>> #query array with non existing role
>>> data ='''{
... "[]":{
... "user": {
... "@role":"NONEXISTING",
... "@column":"id,username,nickname,email"
... }
... }
... }'''
>>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("admin"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': "'user' not accessible by role 'NONEXISTING'"}

>>> #query array with UNKNOWN
>>> data ='''{
... "[]":{
... "user": {
... "@column":"id,username,nickname,email"
... }
... }
... }'''
>>> r = handler.post('/apijson/get', data=data, middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': "'user' not accessible by role 'UNKNOWN'"}

>>> #query array without login user
>>> data ='''{
... "[]":{
... "user": {
... "@role":"ADMIN",
... "@column":"id,username,nickname,email"
... }
... }
... }'''
>>> r = handler.post('/apijson/get', data=data, middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': "no login user for role 'ADMIN'"}

>>> #Association query: Two tables, one to one,ref path is absolute path
>>> data ='''{
... "moment":{},
Expand Down
5 changes: 4 additions & 1 deletion uliweb_apijson/apijson/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,13 @@ def _check_GET_permission(self):
params_role = self.params.get("@role")

if not params_role:
if request.user:
if hasattr(request,"user"):
params_role = "LOGIN"
else:
params_role = "UNKNOWN"
elif params_role != "UNKNOWN":
if not hasattr(request,"user"):
raise UliwebError("no login user for role '%s'"%(params_role))
if params_role not in roles:
raise UliwebError("'%s' not accessible by role '%s'"%(self.name,params_role))
if params_role == "UNKNOWN":
Expand Down
2 changes: 1 addition & 1 deletion uliweb_apijson/apijson/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def _get_one(self,key):
params_role = "UNKNOWN"
elif params_role != "UNKNOWN":
if not hasattr(request,"user"):
return json({"code":400,"msg":"no user for role '%s'"%(params_role)})
return json({"code":400,"msg":"no login user for role '%s'"%(params_role)})
if params_role not in roles:
return json({"code":400,"msg":"'%s' not accessible by role '%s'"%(model_name,params_role)})
if params_role == "UNKNOWN":
Expand Down