120 lines
4.6 KiB
Diff
120 lines
4.6 KiB
Diff
From 6d7b2d7d1b4711255ea72d62d27b5c5f4ec7c6e1 Mon Sep 17 00:00:00 2001
|
|
From: Sergey Orlov <sorlov@redhat.com>
|
|
Date: Tue, 16 Feb 2021 12:32:55 +0100
|
|
Subject: [PATCH] ipatests: skip tests for AD trust with shared secret in FIPS
|
|
mode
|
|
|
|
Related to https://pagure.io/freeipa/issue/8715
|
|
|
|
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
|
|
---
|
|
ipatests/test_integration/test_trust.py | 22 ++++++++++++++++++++++
|
|
1 file changed, 22 insertions(+)
|
|
|
|
diff --git a/ipatests/test_integration/test_trust.py b/ipatests/test_integration/test_trust.py
|
|
index 3e522617d..c8a348212 100644
|
|
--- a/ipatests/test_integration/test_trust.py
|
|
+++ b/ipatests/test_integration/test_trust.py
|
|
@@ -5,6 +5,7 @@ from __future__ import absolute_import
|
|
import re
|
|
import textwrap
|
|
import time
|
|
+import functools
|
|
|
|
import pytest
|
|
|
|
@@ -13,6 +14,7 @@ from ipaplatform.paths import paths
|
|
|
|
from ipatests.test_integration.base import IntegrationTest
|
|
from ipatests.pytest_ipa.integration import tasks
|
|
+from ipatests.pytest_ipa.integration import fips
|
|
from ipapython.dn import DN
|
|
from collections import namedtuple
|
|
from contextlib import contextmanager
|
|
@@ -20,6 +22,18 @@ from contextlib import contextmanager
|
|
TestDataRule = namedtuple('TestDataRule',
|
|
['name', 'ruletype', 'user', 'subject'])
|
|
|
|
+
|
|
+def skip_in_fips_mode_due_to_issue_8715(test_method):
|
|
+ @functools.wraps(test_method)
|
|
+ def wrapper(instance):
|
|
+ if fips.is_fips_enabled(instance.master):
|
|
+ pytest.skip('Skipping in FIPS mode due to '
|
|
+ 'https://pagure.io/freeipa/issue/8715')
|
|
+ else:
|
|
+ test_method(instance)
|
|
+ return wrapper
|
|
+
|
|
+
|
|
class BaseTestTrust(IntegrationTest):
|
|
num_clients = 1
|
|
topology = 'line'
|
|
@@ -751,6 +765,7 @@ class TestTrust(BaseTestTrust):
|
|
|
|
# Test for one-way forest trust with shared secret
|
|
|
|
+ @skip_in_fips_mode_due_to_issue_8715
|
|
def test_establish_forest_trust_with_shared_secret(self):
|
|
tasks.configure_dns_for_trust(self.master, self.ad)
|
|
tasks.configure_windows_dns_for_trust(self.ad, self.master)
|
|
@@ -775,6 +790,7 @@ class TestTrust(BaseTestTrust):
|
|
tasks.establish_trust_with_ad(
|
|
self.master, self.ad_domain, shared_secret=self.shared_secret)
|
|
|
|
+ @skip_in_fips_mode_due_to_issue_8715
|
|
def test_trustdomains_found_in_forest_trust_with_shared_secret(self):
|
|
result = self.master.run_command(
|
|
['ipa', 'trust-fetch-domains', self.ad.domain.name],
|
|
@@ -783,6 +799,7 @@ class TestTrust(BaseTestTrust):
|
|
self.check_trustdomains(
|
|
self.ad_domain, [self.ad_domain, self.ad_subdomain])
|
|
|
|
+ @skip_in_fips_mode_due_to_issue_8715
|
|
def test_user_gid_uid_resolution_in_forest_trust_with_shared_secret(self):
|
|
"""Check that user has SID-generated UID"""
|
|
# Using domain name since it is lowercased realm name for AD domains
|
|
@@ -801,6 +818,7 @@ class TestTrust(BaseTestTrust):
|
|
assert re.search(
|
|
testuser_regex, result.stdout_text), result.stdout_text
|
|
|
|
+ @skip_in_fips_mode_due_to_issue_8715
|
|
def test_remove_forest_trust_with_shared_secret(self):
|
|
ps_cmd = (
|
|
'[System.DirectoryServices.ActiveDirectory.Forest]'
|
|
@@ -823,6 +841,7 @@ class TestTrust(BaseTestTrust):
|
|
|
|
# Test for one-way external trust with shared secret
|
|
|
|
+ @skip_in_fips_mode_due_to_issue_8715
|
|
def test_establish_external_trust_with_shared_secret(self):
|
|
tasks.configure_dns_for_trust(self.master, self.ad)
|
|
tasks.configure_windows_dns_for_trust(self.ad, self.master)
|
|
@@ -838,6 +857,7 @@ class TestTrust(BaseTestTrust):
|
|
self.master, self.ad_domain, shared_secret=self.shared_secret,
|
|
extra_args=['--range-type', 'ipa-ad-trust', '--external=True'])
|
|
|
|
+ @skip_in_fips_mode_due_to_issue_8715
|
|
def test_trustdomains_found_in_external_trust_with_shared_secret(self):
|
|
result = self.master.run_command(
|
|
['ipa', 'trust-fetch-domains', self.ad.domain.name],
|
|
@@ -846,6 +866,7 @@ class TestTrust(BaseTestTrust):
|
|
self.check_trustdomains(
|
|
self.ad_domain, [self.ad_domain])
|
|
|
|
+ @skip_in_fips_mode_due_to_issue_8715
|
|
def test_user_uid_resolution_in_external_trust_with_shared_secret(self):
|
|
"""Check that user has SID-generated UID"""
|
|
# Using domain name since it is lowercased realm name for AD domains
|
|
@@ -864,6 +885,7 @@ class TestTrust(BaseTestTrust):
|
|
assert re.search(
|
|
testuser_regex, result.stdout_text), result.stdout_text
|
|
|
|
+ @skip_in_fips_mode_due_to_issue_8715
|
|
def test_remove_external_trust_with_shared_secret(self):
|
|
self.ad.run_command(
|
|
['netdom.exe', 'trust', self.master.domain.name,
|
|
--
|
|
2.29.2
|
|
|