valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:saltstack/salt into develop

Browse Source
This commit is contained in:
Thomas S Hatch 2012-03-27 23:01:56 -06:00
commit 27886f3e6a
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/cli/__init__.py
View File

@ -495,16 +495,19 @@ class SaltKey(object):
parser.add_option('-l', parser.add_option('-l',
'--list', '--list',
dest='list', dest='list',
default=False, default='',
action='store_true', help=('List the public keys. Takes the args: '
help='List the unaccepted public keys') '"pre", "un", "unaccepted": Unaccepted/unsigned keys '
'"acc", "accepted": Accepted/signed keys '
'"rej", "rejected": Rejected keys '
'"all": all keys'))
parser.add_option('-L', parser.add_option('-L',
'--list-all', '--list-all',
dest='list_all', dest='list_all',
default=False, default=False,
action='store_true', action='store_true',
help='List all public keys') help='List all public keys. Deprecated: use "--list all"')
parser.add_option('-a', parser.add_option('-a',
'--accept', '--accept',

41
salt/cli/key.py
View File

@ -54,38 +54,51 @@ class Key(object):
if not self.opts['quiet']: if not self.opts['quiet']:
print message print message
def _list_pre(self): def _list_pre(self, header=True):
''' '''
List the unaccepted keys List the unaccepted keys
''' '''
self._log(utils.LIGHT_RED + 'Unaccepted Keys:' + utils.ENDC) if header == True:
self._log(utils.LIGHT_RED + 'Unaccepted Keys:' + utils.ENDC)
for key in sorted(self._keys('pre')): for key in sorted(self._keys('pre')):
output = utils.RED + key + utils.ENDC output = utils.RED + key + utils.ENDC
self._log(output) self._log(output)
def _list_accepted(self): def _list_accepted(self, header=True):
''' '''
List the accepted public keys List the accepted public keys
''' '''
self._log(utils.LIGHT_GREEN + 'Accepted Keys:' + utils.ENDC) if header == True:
self._log(utils.LIGHT_GREEN + 'Accepted Keys:' + utils.ENDC)
for key in sorted(self._keys('acc')): for key in sorted(self._keys('acc')):
self._log(utils.GREEN + key + utils.ENDC) self._log(utils.GREEN + key + utils.ENDC)
def _list_rejected(self): def _list_rejected(self, header=True):
''' '''
List the unaccepted keys List the unaccepted keys
''' '''
self._log(utils.LIGHT_BLUE + 'Rejected:' + utils.ENDC) if header == True:
self._log(utils.LIGHT_BLUE + 'Rejected:' + utils.ENDC)
for key in sorted(self._keys('rej')): for key in sorted(self._keys('rej')):
self._log(utils.BLUE + key + utils.ENDC) self._log(utils.BLUE + key + utils.ENDC)
def _list_all(self): def _list(self, name):
''' '''
List all keys List keys
''' '''
self._list_pre() if name in ('pre', 'un', 'unaccept', 'unaccepted'):
self._list_accepted() self._list_pre(False)
self._list_rejected() elif name in ('acc', 'accept', 'accepted'):
self._list_accepted(False)
elif name in ('rej', 'reject', 'rejected'):
self._list_rejected(False)
elif name in ('all',):
self._list_pre()
self._list_accepted()
self._list_rejected()
else:
err = 'Unrecognized key type "%s". Run with -h for options.' % name
self._log(err, level='error')
def _print_key(self, name): def _print_key(self, name):
''' '''
@ -227,9 +240,9 @@ class Key(object):
self.opts['keysize']) self.opts['keysize'])
return return
if self.opts['list']: if self.opts['list']:
self._list_pre() self._list(self.opts['list'])
elif self.opts['list_all']: elif self.opts['list_all']:
self._list_all() self._list('all')
elif self.opts['print']: elif self.opts['print']:
self._print_key(self.opts['print']) self._print_key(self.opts['print'])
elif self.opts['print_all']: elif self.opts['print_all']:
@ -247,4 +260,4 @@ class Key(object):
elif self.opts['delete_all']: elif self.opts['delete_all']:
self._delete_all() self._delete_all()
else: else:
self._list_all() self._list('all')