mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Split ssh state tests into separate modules to respect naming convention
This commit is contained in:
Erik Johnson
parent
9c8ba4a633
commit
c1f94dbf1b
2 changed files with 118 additions and 105 deletions
116
tests/integration/states/test_ssh_auth.py
Normal file
116
tests/integration/states/test_ssh_auth.py
Normal file
|
|
@ -0,0 +1,116 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
'''
|
||||
Test the ssh_auth states
|
||||
'''
|
||||
|
||||
# Import python libs
|
||||
from __future__ import absolute_import, unicode_literals, print_function
|
||||
import os
|
||||
|
||||
# Import Salt Testing libs
|
||||
from tests.support.case import ModuleCase
|
||||
from tests.support.mixins import SaltReturnAssertsMixin
|
||||
from tests.support.runtests import RUNTIME_VARS
|
||||
from tests.support.helpers import (
|
||||
destructiveTest,
|
||||
with_system_user,
|
||||
skip_if_not_root
|
||||
)
|
||||
|
||||
# Import salt libs
|
||||
import salt.utils.files
|
||||
|
||||
|
||||
class SSHAuthStateTests(ModuleCase, SaltReturnAssertsMixin):
|
||||
|
||||
@destructiveTest
|
||||
@skip_if_not_root
|
||||
@with_system_user('issue_7409', on_existing='delete', delete=True)
|
||||
def test_issue_7409_no_linebreaks_between_keys(self, username):
|
||||
|
||||
userdetails = self.run_function('user.info', [username])
|
||||
user_ssh_dir = os.path.join(userdetails['home'], '.ssh')
|
||||
authorized_keys_file = os.path.join(user_ssh_dir, 'authorized_keys')
|
||||
|
||||
ret = self.run_state(
|
||||
'file.managed',
|
||||
name=authorized_keys_file,
|
||||
user=username,
|
||||
makedirs=True,
|
||||
contents_newline=False,
|
||||
# Explicit no ending line break
|
||||
contents='ssh-rsa AAAAB3NzaC1kc3MAAACBAL0sQ9fJ5bYTEyY== root'
|
||||
)
|
||||
|
||||
ret = self.run_state(
|
||||
'ssh_auth.present',
|
||||
name='AAAAB3NzaC1kcQ9J5bYTEyZ==',
|
||||
enc='ssh-rsa',
|
||||
user=username,
|
||||
comment=username
|
||||
)
|
||||
self.assertSaltTrueReturn(ret)
|
||||
self.assertSaltStateChangesEqual(
|
||||
ret, {'AAAAB3NzaC1kcQ9J5bYTEyZ==': 'New'}
|
||||
)
|
||||
with salt.utils.files.fopen(authorized_keys_file, 'r') as fhr:
|
||||
self.assertEqual(
|
||||
fhr.read(),
|
||||
'ssh-rsa AAAAB3NzaC1kc3MAAACBAL0sQ9fJ5bYTEyY== root\n'
|
||||
'ssh-rsa AAAAB3NzaC1kcQ9J5bYTEyZ== {0}\n'.format(username)
|
||||
)
|
||||
|
||||
@destructiveTest
|
||||
@skip_if_not_root
|
||||
@with_system_user('issue_10198', on_existing='delete', delete=True)
|
||||
def test_issue_10198_keyfile_from_another_env(self, username=None):
|
||||
userdetails = self.run_function('user.info', [username])
|
||||
user_ssh_dir = os.path.join(userdetails['home'], '.ssh')
|
||||
authorized_keys_file = os.path.join(user_ssh_dir, 'authorized_keys')
|
||||
|
||||
key_fname = 'issue_10198.id_rsa.pub'
|
||||
|
||||
# Create the keyfile that we expect to get back on the state call
|
||||
with salt.utils.files.fopen(os.path.join(RUNTIME_VARS.TMP_PRODENV_STATE_TREE, key_fname), 'w') as kfh:
|
||||
kfh.write(
|
||||
'ssh-rsa AAAAB3NzaC1kcQ9J5bYTEyZ== {0}\n'.format(username)
|
||||
)
|
||||
|
||||
# Create a bogus key file on base environment
|
||||
with salt.utils.files.fopen(os.path.join(RUNTIME_VARS.TMP_STATE_TREE, key_fname), 'w') as kfh:
|
||||
kfh.write(
|
||||
'ssh-rsa BAAAB3NzaC1kcQ9J5bYTEyZ== {0}\n'.format(username)
|
||||
)
|
||||
|
||||
ret = self.run_state(
|
||||
'ssh_auth.present',
|
||||
name='Setup Keys',
|
||||
source='salt://{0}?saltenv=prod'.format(key_fname),
|
||||
enc='ssh-rsa',
|
||||
user=username,
|
||||
comment=username
|
||||
)
|
||||
self.assertSaltTrueReturn(ret)
|
||||
with salt.utils.files.fopen(authorized_keys_file, 'r') as fhr:
|
||||
self.assertEqual(
|
||||
fhr.read(),
|
||||
'ssh-rsa AAAAB3NzaC1kcQ9J5bYTEyZ== {0}\n'.format(username)
|
||||
)
|
||||
|
||||
os.unlink(authorized_keys_file)
|
||||
|
||||
ret = self.run_state(
|
||||
'ssh_auth.present',
|
||||
name='Setup Keys',
|
||||
source='salt://{0}'.format(key_fname),
|
||||
enc='ssh-rsa',
|
||||
user=username,
|
||||
comment=username,
|
||||
saltenv='prod'
|
||||
)
|
||||
self.assertSaltTrueReturn(ret)
|
||||
with salt.utils.files.fopen(authorized_keys_file, 'r') as fhr:
|
||||
self.assertEqual(
|
||||
fhr.read(),
|
||||
'ssh-rsa AAAAB3NzaC1kcQ9J5bYTEyZ== {0}\n'.format(username)
|
||||
)
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
'''
|
||||
Test the ssh_known_hosts state
|
||||
Test the ssh_known_hosts states
|
||||
'''
|
||||
|
||||
# Import python libs
|
||||
|
|
@ -12,15 +12,7 @@ import shutil
|
|||
from tests.support.case import ModuleCase
|
||||
from tests.support.mixins import SaltReturnAssertsMixin
|
||||
from tests.support.runtests import RUNTIME_VARS
|
||||
from tests.support.helpers import (
|
||||
destructiveTest,
|
||||
with_system_user,
|
||||
skip_if_binaries_missing,
|
||||
skip_if_not_root
|
||||
)
|
||||
|
||||
# Import salt libs
|
||||
import salt.utils.files
|
||||
from tests.support.helpers import skip_if_binaries_missing, skip_if_not_root
|
||||
|
||||
KNOWN_HOSTS = os.path.join(RUNTIME_VARS.TMP, 'known_hosts')
|
||||
GITHUB_FINGERPRINT = '9d:38:5b:83:a9:17:52:92:56:1a:5e:c4:d4:81:8e:0a:ca:51:a2:64:f1:74:20:11:2e:f8:8a:c3:a1:39:49:8f'
|
||||
|
|
@ -154,98 +146,3 @@ class SSHKnownHostsStateTest(ModuleCase, SaltReturnAssertsMixin):
|
|||
# test again
|
||||
ret = self.run_state('ssh_known_hosts.absent', test=True, **kwargs)
|
||||
self.assertSaltTrueReturn(ret)
|
||||
|
||||
|
||||
class SSHAuthStateTests(ModuleCase, SaltReturnAssertsMixin):
|
||||
|
||||
@destructiveTest
|
||||
@skip_if_not_root
|
||||
@with_system_user('issue_7409', on_existing='delete', delete=True)
|
||||
def test_issue_7409_no_linebreaks_between_keys(self, username):
|
||||
|
||||
userdetails = self.run_function('user.info', [username])
|
||||
user_ssh_dir = os.path.join(userdetails['home'], '.ssh')
|
||||
authorized_keys_file = os.path.join(user_ssh_dir, 'authorized_keys')
|
||||
|
||||
ret = self.run_state(
|
||||
'file.managed',
|
||||
name=authorized_keys_file,
|
||||
user=username,
|
||||
makedirs=True,
|
||||
contents_newline=False,
|
||||
# Explicit no ending line break
|
||||
contents='ssh-rsa AAAAB3NzaC1kc3MAAACBAL0sQ9fJ5bYTEyY== root'
|
||||
)
|
||||
|
||||
ret = self.run_state(
|
||||
'ssh_auth.present',
|
||||
name='AAAAB3NzaC1kcQ9J5bYTEyZ==',
|
||||
enc='ssh-rsa',
|
||||
user=username,
|
||||
comment=username
|
||||
)
|
||||
self.assertSaltTrueReturn(ret)
|
||||
self.assertSaltStateChangesEqual(
|
||||
ret, {'AAAAB3NzaC1kcQ9J5bYTEyZ==': 'New'}
|
||||
)
|
||||
with salt.utils.files.fopen(authorized_keys_file, 'r') as fhr:
|
||||
self.assertEqual(
|
||||
fhr.read(),
|
||||
'ssh-rsa AAAAB3NzaC1kc3MAAACBAL0sQ9fJ5bYTEyY== root\n'
|
||||
'ssh-rsa AAAAB3NzaC1kcQ9J5bYTEyZ== {0}\n'.format(username)
|
||||
)
|
||||
|
||||
@destructiveTest
|
||||
@skip_if_not_root
|
||||
@with_system_user('issue_10198', on_existing='delete', delete=True)
|
||||
def test_issue_10198_keyfile_from_another_env(self, username=None):
|
||||
userdetails = self.run_function('user.info', [username])
|
||||
user_ssh_dir = os.path.join(userdetails['home'], '.ssh')
|
||||
authorized_keys_file = os.path.join(user_ssh_dir, 'authorized_keys')
|
||||
|
||||
key_fname = 'issue_10198.id_rsa.pub'
|
||||
|
||||
# Create the keyfile that we expect to get back on the state call
|
||||
with salt.utils.files.fopen(os.path.join(RUNTIME_VARS.TMP_PRODENV_STATE_TREE, key_fname), 'w') as kfh:
|
||||
kfh.write(
|
||||
'ssh-rsa AAAAB3NzaC1kcQ9J5bYTEyZ== {0}\n'.format(username)
|
||||
)
|
||||
|
||||
# Create a bogus key file on base environment
|
||||
with salt.utils.files.fopen(os.path.join(RUNTIME_VARS.TMP_STATE_TREE, key_fname), 'w') as kfh:
|
||||
kfh.write(
|
||||
'ssh-rsa BAAAB3NzaC1kcQ9J5bYTEyZ== {0}\n'.format(username)
|
||||
)
|
||||
|
||||
ret = self.run_state(
|
||||
'ssh_auth.present',
|
||||
name='Setup Keys',
|
||||
source='salt://{0}?saltenv=prod'.format(key_fname),
|
||||
enc='ssh-rsa',
|
||||
user=username,
|
||||
comment=username
|
||||
)
|
||||
self.assertSaltTrueReturn(ret)
|
||||
with salt.utils.files.fopen(authorized_keys_file, 'r') as fhr:
|
||||
self.assertEqual(
|
||||
fhr.read(),
|
||||
'ssh-rsa AAAAB3NzaC1kcQ9J5bYTEyZ== {0}\n'.format(username)
|
||||
)
|
||||
|
||||
os.unlink(authorized_keys_file)
|
||||
|
||||
ret = self.run_state(
|
||||
'ssh_auth.present',
|
||||
name='Setup Keys',
|
||||
source='salt://{0}'.format(key_fname),
|
||||
enc='ssh-rsa',
|
||||
user=username,
|
||||
comment=username,
|
||||
saltenv='prod'
|
||||
)
|
||||
self.assertSaltTrueReturn(ret)
|
||||
with salt.utils.files.fopen(authorized_keys_file, 'r') as fhr:
|
||||
self.assertEqual(
|
||||
fhr.read(),
|
||||
'ssh-rsa AAAAB3NzaC1kcQ9J5bYTEyZ== {0}\n'.format(username)
|
||||
)
|
||||
Loading…
Add table
Reference in a new issue