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 #28760 from dmyerscough/28732-Fix-cherrypi-api-keys-endpoint

Browse source 
Fixing CherryPy key bug
This commit is contained in:
Seth House 2015-11-11 08:11:18 -07:00
commit 77d4b980f1
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/netapi/rest_cherrypy/app.py
View file

@ -1108,6 +1108,7 @@ class Keys(LowDataAdapter):
module <salt.wheel.key>` functions.
'''
@cherrypy.config(**{'tools.salt_token.on': True})
def GET(self, mid=None):
'''
Show the list of minion keys or detail on a specific key
@ -1175,8 +1176,6 @@ class Keys(LowDataAdapter):
minions:
jerry: 51:93:b3:d0:9f:3a:6d:e5:28:67:c2:4b:27:d6:cd:2b
'''
self._cp_config['tools.salt_token.on'] = True
if mid:
lowstate = [{
'client': 'wheel',
@ -1194,6 +1193,7 @@ class Keys(LowDataAdapter):
return {'return': next(result, {}).get('data', {}).get('return', {})}
@cherrypy.config(**{'tools.hypermedia_out.on': False, 'tools.sessions.on': False})
def POST(self, mid, keysize=None, force=None, **kwargs):
r'''
Easily generate keys for a minion and auto-accept the new key
@ -1254,9 +1254,6 @@ class Keys(LowDataAdapter):
jerry.pub0000644000000000000000000000070300000000000010730 0ustar 00000000000000
'''
self._cp_config['tools.hypermedia_out.on'] = False
self._cp_config['tools.sessions.on'] = False
lowstate = [{
'client': 'wheel',
'fun': 'key.gen_accept',