This commit is contained in:
Andrey Z 2021-07-06 18:38:52 +03:00
parent 0a063254a6
commit 0a4d07dd36
3 changed files with 8 additions and 5 deletions

View File

@ -73,3 +73,8 @@ services:
condition: service_healthy
kerberos:
condition: service_healthy
networks:
default:
name: krbnet
driver: bridge

View File

@ -68,8 +68,8 @@ def create_server_principal(self, node):
"""
try:
node.cmd("echo pwd | kinit admin/admin")
node.cmd(f"kadmin -w pwd -q \"add_principal -randkey HTTP/kerberos_env_{node.name}_1.kerberos_env_default\"")
node.cmd(f"kadmin -w pwd -q \"ktadd -k /etc/krb5.keytab HTTP/kerberos_env_{node.name}_1.kerberos_env_default\"")
node.cmd(f"kadmin -w pwd -q \"add_principal -randkey HTTP/kerberos_env_{node.name}_1.krbnet\"")
node.cmd(f"kadmin -w pwd -q \"ktadd -k /etc/krb5.keytab HTTP/kerberos_env_{node.name}_1.krbnet\"")
yield
finally:
node.cmd("kdestroy")

View File

@ -16,7 +16,7 @@ def ping(self):
for i in range(3):
with When(f"curl ch_{i} kerberos"):
r = ch_nodes[i].command(f"curl kerberos_env_kerberos_1 -c 1")
r = ch_nodes[i].command(f"curl kerberos -c 1")
kinit_no_keytab(node=ch_nodes[2])
with Then(f"return code should be 0"):
assert r.exitcode == 7, error()
@ -100,10 +100,8 @@ def invalid_server_ticket(self):
self.context.krb_server.start()
ch_nodes[2].cmd("kdestroy")
while True:
time.sleep(1)
kinit_no_keytab(node=ch_nodes[2])
create_server_principal(node=ch_nodes[0])
time.sleep(1)
if ch_nodes[2].cmd(test_select_query(node=ch_nodes[0])).output == "kerberos_user":
break
debug(test_select_query(node=ch_nodes[0]))