"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "salt/crypt.py" between
salt-2019.2.0.tar.gz and salt-2019.2.1.tar.gz

About: SaltStack is a systems management software for data center automation, cloud orchestration, server provisioning, configuration management and more. Community version.

crypt.py  (salt-2019.2.0):crypt.py  (salt-2019.2.1)
skipping to change at line 12 skipping to change at line 12
''' '''
The crypt module manages all of the cryptography functions for minions and The crypt module manages all of the cryptography functions for minions and
masters, encrypting and decrypting payloads, preparing messages, and masters, encrypting and decrypting payloads, preparing messages, and
authenticating peers authenticating peers
''' '''
# Import python libs # Import python libs
# NOTE: We can't use unicode_literals because this module implicitly uses # NOTE: We can't use unicode_literals because this module implicitly uses
# the Array class, which has incompatibilities with it. # the Array class, which has incompatibilities with it.
from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import os import os
import random
import sys import sys
import copy import copy
import time import time
import hmac import hmac
import base64 import base64
import hashlib import hashlib
import logging import logging
import stat import stat
import traceback import traceback
import binascii import binascii
skipping to change at line 731 skipping to change at line 732
) )
raise tornado.gen.Return('retry') raise tornado.gen.Return('retry')
else: else:
log.critical( log.critical(
'The Salt Master has rejected this minion\'s public ' 'The Salt Master has rejected this minion\'s public '
'key!\nTo repair this issue, delete the public key ' 'key!\nTo repair this issue, delete the public key '
'for this minion on the Salt Master and restart this ' 'for this minion on the Salt Master and restart this '
'minion.\nOr restart the Salt Master in open mode to ' 'minion.\nOr restart the Salt Master in open mode to '
'clean out the keys. The Salt Minion will now exit.' 'clean out the keys. The Salt Minion will now exit.'
) )
# Add a random sleep here for systems that are using a
# a service manager to immediately restart the service
# to avoid overloading the system
time.sleep(random.randint(10, 20))
sys.exit(salt.defaults.exitcodes.EX_NOPERM) sys.exit(salt.defaults.exitcodes.EX_NOPERM)
# has the master returned that its maxed out with minions? # has the master returned that its maxed out with minions?
elif payload['load']['ret'] == 'full': elif payload['load']['ret'] == 'full':
raise tornado.gen.Return('full') raise tornado.gen.Return('full')
else: else:
log.error( log.error(
'The Salt Master has cached the public key for this ' 'The Salt Master has cached the public key for this '
'node, this salt minion will wait for %s seconds ' 'node, this salt minion will wait for %s seconds '
'before attempting to re-authenticate', 'before attempting to re-authenticate',
self.opts['acceptance_wait_time'] self.opts['acceptance_wait_time']
 End of changes. 2 change blocks. 
0 lines changed or deleted 5 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)