pinecrypt/certidude
2
1
Fork 0
Code Issues 1 Pull Requests Activity

Kerberos related fixes

Browse Source
This commit is contained in:
Lauri Võsandi 2021-06-08 08:57:50 +00:00
parent e2cbae9384
commit 093d1becd7
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pinecrypt/client/cli.py
View File

@ -62,7 +62,8 @@ class ConfigTreeParser(ConfigParser):
@click.command("provision", help="Add endpoint to Certidude client config") @click.command("provision", help="Add endpoint to Certidude client config")
@click.argument("authority") @click.argument("authority")
@click.option("-m", "--method", help="Force connection method") @click.option("-m", "--method", help="Force connection method")
def certidude_provision(authority, method): @click.option("-k", "--kerberos", default=False, is_flag=True, help="Offer system keytab for auth")
def certidude_provision(authority, method, kerberos):
client_config = ConfigParser() client_config = ConfigParser()
try: try:
os.makedirs(os.path.dirname(const.CLIENT_CONFIG_PATH)) os.makedirs(os.path.dirname(const.CLIENT_CONFIG_PATH))
@ -76,7 +77,7 @@ def certidude_provision(authority, method):
click.echo("Section '%s' added to %s" % (authority, const.CLIENT_CONFIG_PATH)) click.echo("Section '%s' added to %s" % (authority, const.CLIENT_CONFIG_PATH))
b = os.path.join(os.path.join(const.CONFIG_DIR, "authority", authority)) b = os.path.join(os.path.join(const.CONFIG_DIR, "authority", authority))
client_config.add_section(authority) client_config.add_section(authority)
client_config.set(authority, "trigger", "interface up") client_config.set(authority, "trigger", "domain joined" if kerberos else "interface up")
client_config.set(authority, "common name", "$HOSTNAME") client_config.set(authority, "common name", "$HOSTNAME")
client_config.set(authority, "request path", os.path.join(b, "host_req.pem")) client_config.set(authority, "request path", os.path.join(b, "host_req.pem"))
client_config.set(authority, "key path", os.path.join(b, "host_key.pem")) client_config.set(authority, "key path", os.path.join(b, "host_key.pem"))
@ -298,6 +299,10 @@ def certidude_enroll(fork, no_wait, kerberos):
} }
} }
# TODO: oh so exploitable
# TODO: don't read this from stored JSON
replica_name = bootstrap["hostname"]
# If machine is joined to domain attempt to present machine credentials for authentication # If machine is joined to domain attempt to present machine credentials for authentication
if kerberos: if kerberos:
try: try:
@ -306,23 +311,25 @@ def certidude_enroll(fork, no_wait, kerberos):
click.echo("Kerberos bindings not available, please install requests-kerberos") click.echo("Kerberos bindings not available, please install requests-kerberos")
else: else:
os.environ["KRB5CCNAME"] = "/tmp/ca.ticket" os.environ["KRB5CCNAME"] = "/tmp/ca.ticket"
# Fedora /w SSSD and Ubuntu /w Samba have keytab with uppercase hostname
# Mac OS X has keytab with lowercase hostname cmd = "kinit -S HTTP/%s -k %s$" % (replica_name, const.HOSTNAME.upper())
cmd = "kinit -S HTTP/%s -k %s$" % (authority_name, const.HOSTNAME.lower())
click.echo("Executing: %s" % cmd) click.echo("Executing: %s" % cmd)
if os.system(cmd): if os.system(cmd):
# Fedora /w SSSD has keytab with uppercase hostname # Mac OS X has keytab with lowercase hostname
cmd = "kinit -S HTTP/%s -k %s$" % (authority_name, const.HOSTNAME.upper()) cmd = "kinit -S HTTP/%s -k %s$" % (replica_name, const.HOSTNAME.lower())
click.echo("Executing: %s" % cmd)
if os.system(cmd): if os.system(cmd):
# Failed, probably /etc/krb5.keytab contains spaghetti # Failed, probably /etc/krb5.keytab contains spaghetti
raise ValueError("Failed to initialize Kerberos service ticket using machine keytab") raise ValueError("Failed to initialize Kerberos service ticket using machine keytab")
# TODO: better error reporting, kinit returns 1 for both: if replica name is not found or
# client is not found in Kerberos database
assert os.path.exists("/tmp/ca.ticket"), "Ticket not created!" assert os.path.exists("/tmp/ca.ticket"), "Ticket not created!"
click.echo("Initialized Kerberos service ticket using machine keytab") click.echo("Initialized Kerberos service ticket using machine keytab")
kwargs["auth"] = HTTPKerberosAuth(mutual_authentication=OPTIONAL, force_preemptive=True) kwargs["auth"] = HTTPKerberosAuth(mutual_authentication=OPTIONAL, force_preemptive=True)
else: else:
click.echo("Not using machine keytab") click.echo("Not using machine keytab")
request_url = "https://%s:8443/api/request/" % authority_name request_url = "https://%s:8443/api/request/" % replica_name
if request_params: if request_params:
request_url = request_url + "?" + "&".join(request_params) request_url = request_url + "?" + "&".join(request_params)