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

Verify if hash_type is using vulnerable algorithms

Browse source
This commit is contained in:
Bo Maryniuk 2016-02-26 18:32:37 +01:00
parent 95ec634f00
commit 51f556243d
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/cli/daemons.py
View file

@ -195,6 +195,7 @@ class Master(parsers.MasterOptionParser, DaemonsMixin): # pylint: disable=no-in
'''
self.prepare()
if check_user(self.config['user']):
self.verify_hash_type()
logger.info('The salt master is starting up')
self.master.start()
@ -314,6 +315,7 @@ class Minion(parsers.MinionOptionParser, DaemonsMixin): # pylint: disable=no-in
try:
self.prepare()
if check_user(self.config['user']):
self.verify_hash_type()
logger.info('The salt minion is starting up')
self.minion.tune_in()
finally:
@ -471,6 +473,7 @@ class ProxyMinion(parsers.ProxyMinionOptionParser, DaemonsMixin): # pylint: dis
try:
self.prepare()
if check_user(self.config['user']):
self.verify_hash_type()
logger.info('The proxy minion is starting up')
self.minion.tune_in()
except (KeyboardInterrupt, SaltSystemExit) as exc:
@ -560,6 +563,7 @@ class Syndic(parsers.SyndicOptionParser, DaemonsMixin): # pylint: disable=no-in
'''
self.prepare()
if check_user(self.config['user']):
self.verify_hash_type()
logger.info('The salt syndic is starting up')
try:
self.syndic.tune_in()