saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #42629 from xiaoanyunfei/tornadoapi

Browse source 
tornado api
This commit is contained in:
Mike Place 2017-08-03 17:21:19 -05:00 • committed by GitHub
commit 30725769ed
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/netapi/rest_tornado/saltnado.py
View file

@ -521,8 +521,7 @@ class BaseSaltAPIHandler(tornado.web.RequestHandler, SaltClientsMixIn): # pylin
try:
# Use cgi.parse_header to correctly separate parameters from value
header = cgi.parse_header(self.request.headers['Content-Type'])
value, parameters = header
value, parameters = cgi.parse_header(self.request.headers['Content-Type'])
return ct_in_map[value](data)
except KeyError:
self.send_error(406)
@ -536,7 +535,7 @@ class BaseSaltAPIHandler(tornado.web.RequestHandler, SaltClientsMixIn): # pylin
if not self.request.body:
return
data = self.deserialize(self.request.body)
self.raw_data = copy(data)
self.request_payload = copy(data)
if 'arg' in data and not isinstance(data['arg'], list):
data['arg'] = [data['arg']]
@ -694,15 +693,13 @@ class SaltAuthHandler(BaseSaltAPIHandler): # pylint: disable=W0223
}}
'''
try:
request_payload = self.deserialize(self.request.body)
if not isinstance(request_payload, dict):
if not isinstance(self.request_payload, dict):
self.send_error(400)
return
creds = {'username': request_payload['username'],
'password': request_payload['password'],
'eauth': request_payload['eauth'],
creds = {'username': self.request_payload['username'],
'password': self.request_payload['password'],
'eauth': self.request_payload['eauth'],
}
# if any of the args are missing, its a bad request
except KeyError:
@ -1633,7 +1630,7 @@ class WebhookSaltAPIHandler(SaltAPIHandler): # pylint: disable=W0223
listen=False)
ret = self.event.fire_event({
'post': self.raw_data,
'post': self.request_payload,
'get': dict(self.request.query_arguments),
# In Tornado >= v4.0.3, the headers come
# back as an HTTPHeaders instance, which