ipa-migrate - starttls does not work

We were previousily taking the provided ca cert and creating a temporary
file from it. This was incorrect and caused the secure connection to
fail.  Instead just use the file path provided.

Fixes: https://pagure.io/freeipa/issue/9619

Signed-off-by: Mark Reynolds <mreynolds@redhat.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
This commit is contained in:
Mark Reynolds 2024-07-08 10:20:47 -04:00 committed by Rob Crittenden
parent 6c53a22a2c
commit eeade50933
2 changed files with 18 additions and 9 deletions

View File

@ -25,7 +25,7 @@ network interruptions)
In this mode everything will be migrated including the current user SIDs and
DNA ranges
.TP
\fBstage\-mod\fR
\fBstage\-mode\fR
In this mode, SIDs & DNA ranges are not migrated, and DNA attributes are reset
.SH "COMMANDS"

View File

@ -27,7 +27,6 @@ from ipalib.x509 import IPACertificate
from ipaplatform.paths import paths
from ipapython.dn import DN
from ipapython.ipaldap import LDAPClient, LDAPEntry, realm_to_ldapi_uri
from ipapython.ipautil import write_tmp_file
from ipapython.ipa_log_manager import standard_logging_setup
from ipaserver.install.ipa_migrate_constants import (
DS_CONFIG, DB_OBJECTS, DS_INDEXES, BIND_DN, LOG_FILE_NAME,
@ -758,13 +757,19 @@ class IPAMigrate():
insecure_bind = False
if self.args.cacertfile is not None:
# Store CA cert into file
tmp_ca_cert_f = write_tmp_file(self.args.cacertfile)
cacert = tmp_ca_cert_f.name
# Start TLS connection (START_TLS)
ds_conn = LDAPClient(ldapuri, cacert=cacert, start_tls=True)
tmp_ca_cert_f.close()
try:
ds_conn = LDAPClient(ldapuri, cacert=self.args.cacertfile,
start_tls=True)
except (
ldap.LDAPError,
errors.NetworkError,
errors.DatabaseError,
IOError
) as e:
self.handle_error(
f"Failed to connect to remote server: {str(e)}"
)
else:
# LDAP (insecure)
ds_conn = LDAPClient(ldapuri)
@ -773,7 +778,11 @@ class IPAMigrate():
try:
ds_conn.simple_bind(DN(self.args.bind_dn), self.bindpw,
insecure_bind=insecure_bind)
except (errors.NetworkError, errors.ACIError) as e:
except (
errors.NetworkError,
errors.ACIError,
errors.DatabaseError
) as e:
self.handle_error(f"Failed to bind to remote server: {str(e)}")
# All set, stash the remote connection