Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
leverage token_check only when posting results
[releng.git]
/
utils
/
test
/
testapi
/
opnfv_testapi
/
common
/
check.py
diff --git
a/utils/test/testapi/opnfv_testapi/common/check.py
b/utils/test/testapi/opnfv_testapi/common/check.py
index
24ba876
..
9ded48d
100644
(file)
--- a/
utils/test/testapi/opnfv_testapi/common/check.py
+++ b/
utils/test/testapi/opnfv_testapi/common/check.py
@@
-7,21
+7,19
@@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
import functools
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
import functools
+import re
from tornado import gen
from tornado import gen
-from tornado import web
from opnfv_testapi.common import message
from opnfv_testapi.common import raises
from opnfv_testapi.db import api as dbapi
from opnfv_testapi.common import message
from opnfv_testapi.common import raises
from opnfv_testapi.db import api as dbapi
-def authenticate(method):
- @web.asynchronous
- @gen.coroutine
+def valid_token(method):
@functools.wraps(method)
def wrapper(self, *args, **kwargs):
@functools.wraps(method)
def wrapper(self, *args, **kwargs):
- if self.auth:
+ if self.auth
and self.table == 'results'
:
try:
token = self.request.headers['X-Auth-Token']
except KeyError:
try:
token = self.request.headers['X-Auth-Token']
except KeyError:
@@
-92,7
+90,12
@@
def new_not_exists(xstep):
def wrap(self, *args, **kwargs):
query = kwargs.get('query')
if query:
def wrap(self, *args, **kwargs):
query = kwargs.get('query')
if query:
- to_data = yield dbapi.db_find_one(self.table, query())
+ query_data = query()
+ if self.table == 'pods':
+ if query_data.get('name') is not None:
+ query_data['name'] = re.compile(query_data.get('name'),
+ re.IGNORECASE)
+ to_data = yield dbapi.db_find_one(self.table, query_data)
if to_data:
raises.Forbidden(message.exist(self.table, query()))
ret = yield gen.coroutine(xstep)(self, *args, **kwargs)
if to_data:
raises.Forbidden(message.exist(self.table, query()))
ret = yield gen.coroutine(xstep)(self, *args, **kwargs)