Fix some null pointer dereferences in LDAP auth code

An LDAP URL without a host name such as "ldap://" or without a base DN
such as "ldap://localhost" would cause a crash when reading pg_hba.conf.

If no binddn is configured, an error message might end up trying to print a
null pointer, which could crash on some platforms.

Author: Thomas Munro <thomas.munro@enterprisedb.com>
Reviewed-by: Michael Paquier <michael.paquier@gmail.com>

diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index bf94e941e4234c442808d7f4cc4a2085bc7040f4..f9d4488d569d896e13f2b7a148780809653b0398 100644 (file)
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -2013,7 +2013,8 @@ CheckLDAPAuth(Port *port)
        {
            ereport(LOG,
                    (errmsg("could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s",
-                           port->hba->ldapbinddn, port->hba->ldapserver, ldap_err2string(r))));
+                           port->hba->ldapbinddn ? port->hba->ldapbinddn : "",
+                           port->hba->ldapserver, ldap_err2string(r))));
            return STATUS_ERROR;
        }
 

diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 2aac2299b9d48395af8aeee5da65f727f600a412..a9506fe7f0cf4fe8138f507a803d314766fee63f 100644 (file)
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -1453,9 +1453,11 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline, int line_num)
            return false;
        }
 
-       hbaline->ldapserver = pstrdup(urldata->lud_host);
+       if (urldata->lud_host)
+           hbaline->ldapserver = pstrdup(urldata->lud_host);
        hbaline->ldapport = urldata->lud_port;
-       hbaline->ldapbasedn = pstrdup(urldata->lud_dn);
+       if (urldata->lud_dn)
+           hbaline->ldapbasedn = pstrdup(urldata->lud_dn);
 
        if (urldata->lud_attrs)
            hbaline->ldapsearchattribute = pstrdup(urldata->lud_attrs[0]);      /* only use first one */