Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 2f1d2b7

Browse files
committed
Set PAM_RHOST item for PAM authentication
The PAM_RHOST item is set to the remote IP address or host name and can be used by PAM modules. A pg_hba.conf option is provided to choose between IP address and resolved host name. From: Grzegorz Sampolski <grzsmp@gmail.com> Reviewed-by: Haribabu Kommi <kommi.haribabu@gmail.com>
1 parent 4e55b3f commit 2f1d2b7

File tree

4 files changed

+52
-4
lines changed

4 files changed

+52
-4
lines changed

doc/src/sgml/client-auth.sgml

+19-4
Original file line numberDiff line numberDiff line change
@@ -1617,10 +1617,11 @@ host ... ldap ldapurl="ldap://ldap.example.net/dc=example,dc=net?uid?sub"
16171617
<literal>password</literal> except that it uses PAM (Pluggable
16181618
Authentication Modules) as the authentication mechanism. The
16191619
default PAM service name is <literal>postgresql</literal>.
1620-
PAM is used only to validate user name/password pairs.
1621-
Therefore the user must already exist in the database before PAM
1622-
can be used for authentication. For more information about
1623-
PAM, please read the <ulink url="http://www.kernel.org/pub/linux/libs/pam/">
1620+
PAM is used only to validate user name/password pairs and optionally the
1621+
connected remote host name or IP address. Therefore the user must already
1622+
exist in the database before PAM can be used for authentication. For more
1623+
information about PAM, please read the
1624+
<ulink url="http://www.kernel.org/pub/linux/libs/pam/">
16241625
<productname>Linux-PAM</> Page</ulink>.
16251626
</para>
16261627

@@ -1635,6 +1636,20 @@ host ... ldap ldapurl="ldap://ldap.example.net/dc=example,dc=net?uid?sub"
16351636
</para>
16361637
</listitem>
16371638
</varlistentry>
1639+
<varlistentry>
1640+
<term><literal>pam_use_hostname</literal></term>
1641+
<listitem>
1642+
<para>
1643+
Determines whether the remote IP address or the host name is provided
1644+
to PAM modules through the <symbol>PAM_RHOST</symbol> item. By
1645+
default, the IP address is used. Set this option to 1 to use the
1646+
resolved host name instead. Host name resolution can lead to login
1647+
delays. (Most PAM configurations don't use this information, so it is
1648+
only necessary to consider this setting if a PAM configuration was
1649+
specifically created to make use of it.)
1650+
</para>
1651+
</listitem>
1652+
</varlistentry>
16381653
</variablelist>
16391654
</para>
16401655

src/backend/libpq/auth.c

+23
Original file line numberDiff line numberDiff line change
@@ -1739,6 +1739,18 @@ CheckPAMAuth(Port *port, char *user, char *password)
17391739
{
17401740
int retval;
17411741
pam_handle_t *pamh = NULL;
1742+
char hostinfo[NI_MAXHOST];
1743+
1744+
retval = pg_getnameinfo_all(&port->raddr.addr, port->raddr.salen,
1745+
hostinfo, sizeof(hostinfo), NULL, 0,
1746+
port->hba->pam_use_hostname ? 0 : NI_NUMERICHOST | NI_NUMERICSERV);
1747+
if (retval != 0)
1748+
{
1749+
ereport(WARNING,
1750+
(errmsg_internal("pg_getnameinfo_all() failed: %s",
1751+
gai_strerror(retval))));
1752+
return STATUS_ERROR;
1753+
}
17421754

17431755
/*
17441756
* We can't entirely rely on PAM to pass through appdata --- it appears
@@ -1784,6 +1796,17 @@ CheckPAMAuth(Port *port, char *user, char *password)
17841796
return STATUS_ERROR;
17851797
}
17861798

1799+
retval = pam_set_item(pamh, PAM_RHOST, hostinfo);
1800+
1801+
if (retval != PAM_SUCCESS)
1802+
{
1803+
ereport(LOG,
1804+
(errmsg("pam_set_item(PAM_RHOST) failed: %s",
1805+
pam_strerror(pamh, retval))));
1806+
pam_passwd = NULL;
1807+
return STATUS_ERROR;
1808+
}
1809+
17871810
retval = pam_set_item(pamh, PAM_CONV, &pam_passw_conv);
17881811

17891812
if (retval != PAM_SUCCESS)

src/backend/libpq/hba.c

+9
Original file line numberDiff line numberDiff line change
@@ -1447,6 +1447,15 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline, int line_num)
14471447
REQUIRE_AUTH_OPTION(uaPAM, "pamservice", "pam");
14481448
hbaline->pamservice = pstrdup(val);
14491449
}
1450+
else if (strcmp(name, "pam_use_hostname") == 0)
1451+
{
1452+
REQUIRE_AUTH_OPTION(uaPAM, "pam_use_hostname", "pam");
1453+
if (strcmp(val, "1") == 0)
1454+
hbaline->pam_use_hostname = true;
1455+
else
1456+
hbaline->pam_use_hostname = false;
1457+
1458+
}
14501459
else if (strcmp(name, "ldapurl") == 0)
14511460
{
14521461
#ifdef LDAP_API_FEATURE_X_OPENLDAP

src/include/libpq/hba.h

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ typedef struct HbaLine
6464

6565
char *usermap;
6666
char *pamservice;
67+
bool pam_use_hostname;
6768
bool ldaptls;
6869
char *ldapserver;
6970
int ldapport;

0 commit comments

Comments
 (0)