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.

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

Fixing CherryPy key bug #28760

Merged
merged 1 commit into from Nov 11, 2015
Jump to file or symbol
Failed to load files and symbols.
+2 −5
Diff settings

Always

Just for now

Fixing CherryPy key bug

  • Loading branch information...
dmyerscough committed Nov 11, 2015
commit 206d1684b2a0de4de72a944b122c8fa7f5a8fd3b
@@ -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 @@ def GET(self, mid=None):
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 @@ def GET(self, mid=None):
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 @@ def POST(self, mid, keysize=None, force=None, **kwargs):
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',
ProTip! Use n and p to navigate between commits in a pull request.