IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-23 07:33:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

IPA-EPN: Fixes to starttls mode, convert some log errors to exceptions

Browse Source 
Tested security mode with none, starttls and ssl security.

Fixes: https://pagure.io/freeipa/issue/3687
Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Francois Cami <fcami@redhat.com>
This commit is contained in:
Rob Crittenden 2020-05-12 17:46:32 -04:00
parent cc84483411
commit c3cbaed9fd
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ipaclient/install/ipa_epn.py
View File

@ -583,7 +583,7 @@ class MTAClient:
def _connect(self):
try:
if self._security_protocol == "none":
if self._security_protocol.lower() in ["none", "starttls"]:
self._conn = smtplib.SMTP(
host=self._smtp_hostname,
port=self._smtp_port,
@ -615,7 +615,7 @@ class MTAClient:
if (
self._conn.has_extn("STARTTLS")
and self._security_protocol == "starttls"
and self._security_protocol.lower() == "starttls"
):
try:
self._conn.starttls()
@ -634,30 +634,30 @@ class MTAClient:
try:
self._conn.login(self._username, self._password)
if self._security_protocol == "none":
logger.info(
logger.warning(
"IPA-EPN: Username and Password "
"were sent in the clear."
)
except smtplib.SMTPAuthenticationError:
logger.error(
raise RuntimeError(
"IPA-EPN: Authentication to %s:%s failed, "
"please check your username and/or password:",
self._smtp_hostname,
self._smtp_port,
"please check your username and/or password:" %
(self._smtp_hostname,
self._smtp_port,)
)
except smtplib.SMTPException as e:
logger.error(
"IPA-EPN: SMTP Error at %s:%s:%s",
self._smtp_hostname,
self._smtp_port,
e,
raise RuntimeError(
"IPA-EPN: SMTP Error at %s:%s:%s" %
(self._smtp_hostname,
self._smtp_port,
e,)
)
else:
err_str = (
"IPA-EPN: Server at %s:%s "
"does not support authentication.",
self._smtp_hostname,
self._smtp_port,
"does not support authentication." %
(self._smtp_hostname,
self._smtp_port,)
)
logger.error(err_str)