Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Don't attempt to verify token if it wasn't sent to master. #31653

Merged
merged 1 commit into from
Mar 3, 2016
Merged

Don't attempt to verify token if it wasn't sent to master. #31653

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 15 additions & 9 deletions salt/crypt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,9 +500,10 @@ def sign_in(self, timeout=60, safe=True, tries=1):
crypt='clear',
io_loop=self.io_loop)

sign_in_payload = self.minion_sign_in_payload()
try:
payload = yield channel.send(
self.minion_sign_in_payload(),
sign_in_payload,
tries=tries,
timeout=timeout
)
Expand Down Expand Up @@ -543,7 +544,7 @@ def sign_in(self, timeout=60, safe=True, tries=1):
)
)
raise tornado.gen.Return('retry')
auth['aes'] = self.verify_master(payload)
auth['aes'] = self.verify_master(payload, master_pub='token' in sign_in_payload)
if not auth['aes']:
log.critical(
'The Salt Master server\'s public key did not authenticate!\n'
Expand Down Expand Up @@ -806,7 +807,7 @@ def extract_aes(self, payload, master_pub=True):
aes, token = self.decrypt_aes(payload, master_pub)
return aes

def verify_master(self, payload):
def verify_master(self, payload, master_pub=True):
'''
Verify that the master is the same one that was previously accepted.

Expand All @@ -816,12 +817,15 @@ def verify_master(self, payload):
'publish_port': The TCP port which published the message
'token': The encrypted token used to verify the message.
'pub_key': The RSA public key of the sender.
:param bool master_pub: Operate as if minion had no master pubkey when it sent auth request, i.e. don't verify
the minion signature

:rtype: str
:return: An empty string on verification failure. On success, the decrypted AES message in the payload.
'''
m_pub_fn = os.path.join(self.opts['pki_dir'], self.mpub)
if os.path.isfile(m_pub_fn) and not self.opts['open_mode']:
m_pub_exists = os.path.isfile(m_pub_fn)
if m_pub_exists and master_pub and not self.opts['open_mode']:
local_master_pub = salt.utils.fopen(m_pub_fn).read()

if payload['pub_key'].replace('\n', '').replace('\r', '') != \
Expand Down Expand Up @@ -868,10 +872,11 @@ def verify_master(self, payload):
return self.extract_aes(payload, master_pub=False)
else:
return ''
# the minion has not received any masters pubkey yet, write
# the newly received pubkey to minion_master.pub
else:
salt.utils.fopen(m_pub_fn, 'wb+').write(payload['pub_key'])
if not m_pub_exists:
# the minion has not received any masters pubkey yet, write
# the newly received pubkey to minion_master.pub
salt.utils.fopen(m_pub_fn, 'wb+').write(payload['pub_key'])
return self.extract_aes(payload, master_pub=False)


Expand Down Expand Up @@ -1009,9 +1014,10 @@ def sign_in(self, timeout=60, safe=True, tries=1):

channel = salt.transport.client.ReqChannel.factory(self.opts, crypt='clear')

sign_in_payload = self.minion_sign_in_payload()
try:
payload = channel.send(
self.minion_sign_in_payload(),
sign_in_payload,
tries=tries,
timeout=timeout
)
Expand Down Expand Up @@ -1056,7 +1062,7 @@ def sign_in(self, timeout=60, safe=True, tries=1):
)
)
return 'retry'
auth['aes'] = self.verify_master(payload)
auth['aes'] = self.verify_master(payload, master_pub='token' in sign_in_payload)
if not auth['aes']:
log.critical(
'The Salt Master server\'s public key did not authenticate!\n'
Expand Down