Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbe4585b

Browse files
committed
Replace use of credential control messages with getsockopt(LOCAL_PEERCRED).
It turns out the reason we hadn't found out about the portability issueswith our credential-control-message code is that almost no modern platformsuse that code at all; the ones that used to need it now offer getpeereid(),which we choose first. The last holdout was NetBSD, and they addedgetpeereid() as of 5.0. So far as I can tell, the only live platform onwhich that code was being exercised was Debian/kFreeBSD, ie, FreeBSD kernelwith Linux userland --- since glibc doesn't provide getpeereid(), we fellback to the control message code. However, the FreeBSD kernel provides aLOCAL_PEERCRED socket parameter that's functionally equivalent to Linux'sSO_PEERCRED. That is both much simpler to use than control messages, andsuperior because it doesn't require receiving a message from the other endat just the right time.Therefore, add code to use LOCAL_PEERCRED when necessary, and rip out allthe credential-control-message code in the backend. (libpq still has suchcode so that it can still talk to pre-9.1 servers ... but eventually we canget rid of it there too.) Clean up related autoconf probes, too.This means that libpq's requirepeer parameter now works on exactly the sameplatforms where the backend supports peer authentication, so adjust thedocumentation accordingly.
1 parent13c00ae commitbe4585b

File tree

10 files changed

+119
-434
lines changed

10 files changed

+119
-434
lines changed

‎configure

Lines changed: 6 additions & 225 deletions
Original file line numberDiff line numberDiff line change
@@ -9990,7 +9990,8 @@ done
99909990

99919991

99929992

9993-
for ac_header in crypt.h dld.h fp_class.h getopt.h ieeefp.h ifaddrs.h langinfo.h poll.h pwd.h sys/ioctl.h sys/ipc.h sys/poll.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/socket.h sys/sockio.h sys/tas.h sys/time.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h kernel/OS.h kernel/image.h SupportDefs.h
9993+
9994+
for ac_header in crypt.h dld.h fp_class.h getopt.h ieeefp.h ifaddrs.h langinfo.h poll.h pwd.h sys/ioctl.h sys/ipc.h sys/poll.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/socket.h sys/sockio.h sys/tas.h sys/time.h sys/ucred.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h kernel/OS.h kernel/image.h SupportDefs.h
99949995
do
99959996
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
99969997
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -17037,10 +17038,10 @@ _ACEOF
1703717038
cat confdefs.h >>conftest.$ac_ext
1703817039
cat >>conftest.$ac_ext <<_ACEOF
1703917040
/* end confdefs.h. */
17040-
#include <sys/param.h>
17041-
#include <sys/types.h>
1704217041
#include <sys/socket.h>
17042+
#ifdef HAVE_SYS_UCRED_H
1704317043
#include <sys/ucred.h>
17044+
#endif
1704417045

1704517046
int
1704617047
main ()
@@ -17075,10 +17076,10 @@ _ACEOF
1707517076
cat confdefs.h >>conftest.$ac_ext
1707617077
cat >>conftest.$ac_ext <<_ACEOF
1707717078
/* end confdefs.h. */
17078-
#include <sys/param.h>
17079-
#include <sys/types.h>
1708017079
#include <sys/socket.h>
17080+
#ifdef HAVE_SYS_UCRED_H
1708117081
#include <sys/ucred.h>
17082+
#endif
1708217083

1708317084
int
1708417085
main ()
@@ -17134,226 +17135,6 @@ cat >>confdefs.h <<_ACEOF
1713417135
_ACEOF
1713517136

1713617137

17137-
fi
17138-
{ $as_echo "$as_me:$LINENO: checking for struct fcred" >&5
17139-
$as_echo_n "checking for struct fcred... " >&6; }
17140-
if test "${ac_cv_type_struct_fcred+set}" = set; then
17141-
$as_echo_n "(cached) " >&6
17142-
else
17143-
ac_cv_type_struct_fcred=no
17144-
cat >conftest.$ac_ext <<_ACEOF
17145-
/* confdefs.h. */
17146-
_ACEOF
17147-
cat confdefs.h >>conftest.$ac_ext
17148-
cat >>conftest.$ac_ext <<_ACEOF
17149-
/* end confdefs.h. */
17150-
#include <sys/param.h>
17151-
#include <sys/types.h>
17152-
#include <sys/socket.h>
17153-
#include <sys/ucred.h>
17154-
17155-
int
17156-
main ()
17157-
{
17158-
if (sizeof (struct fcred))
17159-
return 0;
17160-
;
17161-
return 0;
17162-
}
17163-
_ACEOF
17164-
rm -f conftest.$ac_objext
17165-
if { (ac_try="$ac_compile"
17166-
case "(($ac_try" in
17167-
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17168-
*) ac_try_echo=$ac_try;;
17169-
esac
17170-
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17171-
$as_echo "$ac_try_echo") >&5
17172-
(eval "$ac_compile") 2>conftest.er1
17173-
ac_status=$?
17174-
grep -v '^ *+' conftest.er1 >conftest.err
17175-
rm -f conftest.er1
17176-
cat conftest.err >&5
17177-
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17178-
(exit $ac_status); } && {
17179-
test -z "$ac_c_werror_flag" ||
17180-
test ! -s conftest.err
17181-
} && test -s conftest.$ac_objext; then
17182-
cat >conftest.$ac_ext <<_ACEOF
17183-
/* confdefs.h. */
17184-
_ACEOF
17185-
cat confdefs.h >>conftest.$ac_ext
17186-
cat >>conftest.$ac_ext <<_ACEOF
17187-
/* end confdefs.h. */
17188-
#include <sys/param.h>
17189-
#include <sys/types.h>
17190-
#include <sys/socket.h>
17191-
#include <sys/ucred.h>
17192-
17193-
int
17194-
main ()
17195-
{
17196-
if (sizeof ((struct fcred)))
17197-
return 0;
17198-
;
17199-
return 0;
17200-
}
17201-
_ACEOF
17202-
rm -f conftest.$ac_objext
17203-
if { (ac_try="$ac_compile"
17204-
case "(($ac_try" in
17205-
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17206-
*) ac_try_echo=$ac_try;;
17207-
esac
17208-
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17209-
$as_echo "$ac_try_echo") >&5
17210-
(eval "$ac_compile") 2>conftest.er1
17211-
ac_status=$?
17212-
grep -v '^ *+' conftest.er1 >conftest.err
17213-
rm -f conftest.er1
17214-
cat conftest.err >&5
17215-
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17216-
(exit $ac_status); } && {
17217-
test -z "$ac_c_werror_flag" ||
17218-
test ! -s conftest.err
17219-
} && test -s conftest.$ac_objext; then
17220-
:
17221-
else
17222-
$as_echo "$as_me: failed program was:" >&5
17223-
sed 's/^/| /' conftest.$ac_ext >&5
17224-
17225-
ac_cv_type_struct_fcred=yes
17226-
fi
17227-
17228-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17229-
else
17230-
$as_echo "$as_me: failed program was:" >&5
17231-
sed 's/^/| /' conftest.$ac_ext >&5
17232-
17233-
17234-
fi
17235-
17236-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17237-
fi
17238-
{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_fcred" >&5
17239-
$as_echo "$ac_cv_type_struct_fcred" >&6; }
17240-
if test "x$ac_cv_type_struct_fcred" = x""yes; then
17241-
17242-
cat >>confdefs.h <<_ACEOF
17243-
#define HAVE_STRUCT_FCRED 1
17244-
_ACEOF
17245-
17246-
17247-
fi
17248-
{ $as_echo "$as_me:$LINENO: checking for struct sockcred" >&5
17249-
$as_echo_n "checking for struct sockcred... " >&6; }
17250-
if test "${ac_cv_type_struct_sockcred+set}" = set; then
17251-
$as_echo_n "(cached) " >&6
17252-
else
17253-
ac_cv_type_struct_sockcred=no
17254-
cat >conftest.$ac_ext <<_ACEOF
17255-
/* confdefs.h. */
17256-
_ACEOF
17257-
cat confdefs.h >>conftest.$ac_ext
17258-
cat >>conftest.$ac_ext <<_ACEOF
17259-
/* end confdefs.h. */
17260-
#include <sys/param.h>
17261-
#include <sys/types.h>
17262-
#include <sys/socket.h>
17263-
#include <sys/ucred.h>
17264-
17265-
int
17266-
main ()
17267-
{
17268-
if (sizeof (struct sockcred))
17269-
return 0;
17270-
;
17271-
return 0;
17272-
}
17273-
_ACEOF
17274-
rm -f conftest.$ac_objext
17275-
if { (ac_try="$ac_compile"
17276-
case "(($ac_try" in
17277-
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17278-
*) ac_try_echo=$ac_try;;
17279-
esac
17280-
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17281-
$as_echo "$ac_try_echo") >&5
17282-
(eval "$ac_compile") 2>conftest.er1
17283-
ac_status=$?
17284-
grep -v '^ *+' conftest.er1 >conftest.err
17285-
rm -f conftest.er1
17286-
cat conftest.err >&5
17287-
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17288-
(exit $ac_status); } && {
17289-
test -z "$ac_c_werror_flag" ||
17290-
test ! -s conftest.err
17291-
} && test -s conftest.$ac_objext; then
17292-
cat >conftest.$ac_ext <<_ACEOF
17293-
/* confdefs.h. */
17294-
_ACEOF
17295-
cat confdefs.h >>conftest.$ac_ext
17296-
cat >>conftest.$ac_ext <<_ACEOF
17297-
/* end confdefs.h. */
17298-
#include <sys/param.h>
17299-
#include <sys/types.h>
17300-
#include <sys/socket.h>
17301-
#include <sys/ucred.h>
17302-
17303-
int
17304-
main ()
17305-
{
17306-
if (sizeof ((struct sockcred)))
17307-
return 0;
17308-
;
17309-
return 0;
17310-
}
17311-
_ACEOF
17312-
rm -f conftest.$ac_objext
17313-
if { (ac_try="$ac_compile"
17314-
case "(($ac_try" in
17315-
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17316-
*) ac_try_echo=$ac_try;;
17317-
esac
17318-
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17319-
$as_echo "$ac_try_echo") >&5
17320-
(eval "$ac_compile") 2>conftest.er1
17321-
ac_status=$?
17322-
grep -v '^ *+' conftest.er1 >conftest.err
17323-
rm -f conftest.er1
17324-
cat conftest.err >&5
17325-
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17326-
(exit $ac_status); } && {
17327-
test -z "$ac_c_werror_flag" ||
17328-
test ! -s conftest.err
17329-
} && test -s conftest.$ac_objext; then
17330-
:
17331-
else
17332-
$as_echo "$as_me: failed program was:" >&5
17333-
sed 's/^/| /' conftest.$ac_ext >&5
17334-
17335-
ac_cv_type_struct_sockcred=yes
17336-
fi
17337-
17338-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17339-
else
17340-
$as_echo "$as_me: failed program was:" >&5
17341-
sed 's/^/| /' conftest.$ac_ext >&5
17342-
17343-
17344-
fi
17345-
17346-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17347-
fi
17348-
{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockcred" >&5
17349-
$as_echo "$ac_cv_type_struct_sockcred" >&6; }
17350-
if test "x$ac_cv_type_struct_sockcred" = x""yes; then
17351-
17352-
cat >>confdefs.h <<_ACEOF
17353-
#define HAVE_STRUCT_SOCKCRED 1
17354-
_ACEOF
17355-
17356-
1735717138
fi
1735817139

1735917140

‎configure.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@ AC_SUBST(OSSP_UUID_LIBS)
984984
##
985985

986986
dnl sys/socket.h is required by AC_FUNC_ACCEPT_ARGTYPES
987-
AC_CHECK_HEADERS([crypt.h dld.h fp_class.h getopt.h ieeefp.h ifaddrs.h langinfo.h poll.h pwd.h sys/ioctl.h sys/ipc.h sys/poll.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/socket.h sys/sockio.h sys/tas.h sys/time.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h kernel/OS.h kernel/image.h SupportDefs.h])
987+
AC_CHECK_HEADERS([crypt.h dld.h fp_class.h getopt.h ieeefp.h ifaddrs.h langinfo.h poll.h pwd.h sys/ioctl.h sys/ipc.h sys/poll.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/socket.h sys/sockio.h sys/tas.h sys/time.h sys/ucred.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h kernel/OS.h kernel/image.h SupportDefs.h])
988988

989989
# On BSD, cpp test for net/if.h will fail unless sys/socket.h
990990
# is included first.
@@ -1125,11 +1125,11 @@ AC_TYPE_LONG_LONG_INT
11251125

11261126
PGAC_TYPE_LOCALE_T
11271127

1128-
AC_CHECK_TYPES([struct cmsgcred, struct fcred, struct sockcred], [], [],
1129-
[#include <sys/param.h>
1130-
#include <sys/types.h>
1131-
#include <sys/socket.h>
1132-
#include <sys/ucred.h>])
1128+
AC_CHECK_TYPES([struct cmsgcred], [], [],
1129+
[#include <sys/socket.h>
1130+
#ifdef HAVE_SYS_UCRED_H
1131+
#include <sys/ucred.h>
1132+
#endif])
11331133

11341134
AC_CHECK_TYPES([struct option], [], [],
11351135
[#ifdef HAVE_GETOPT_H

‎doc/src/sgml/client-auth.sgml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
runs. If all the users of a particular server also have accounts on
4949
the server's machine, it makes sense to assign database user names
5050
that match their operating system user names. However, a server that
51-
accepts remote connections might have many database users who have no local operating system
51+
accepts remote connections might have many database users who have no local
52+
operating system
5253
account, and in such cases there need be no connection between
5354
database user names and OS user names.
5455
</para>
@@ -472,8 +473,8 @@ hostnossl <replaceable>database</replaceable> <replaceable>user</replaceable>
472473
<term><literal>peer</></term>
473474
<listitem>
474475
<para>
475-
Obtain the operating system user name from the operating system
476-
and check if it matches the requested database user name.
476+
Obtain theclient'soperating system user name from the operating
477+
systemand check if it matches the requested database user name.
477478
This is only available for local connections.
478479
See <xref linkend="auth-peer"> for details.
479480
</para>
@@ -1304,7 +1305,7 @@ omicron bryanh guest1
13041305
The peer authentication method works by obtaining the client's
13051306
operating system user name from the kernel and using it as the
13061307
allowed database user name (with optional user name mapping). This
1307-
is only supported on local connections.
1308+
methodis only supported on local connections.
13081309
</para>
13091310

13101311
<para>
@@ -1323,14 +1324,13 @@ omicron bryanh guest1
13231324
</para>
13241325

13251326
<para>
1326-
Peer authentication is only available on systems supporting
1327-
<symbol>SO_PEERCRED</symbol> requests for
1328-
Unix-domain sockets (currently <systemitem
1329-
class="osname">Linux</>, <systemitem class="osname">FreeBSD</>,
1330-
<systemitem class="osname">NetBSD</>, <systemitem class="osname">OpenBSD</>,
1331-
<systemitem class="osname">BSD/OS</>, and <systemitem class="osname">Solaris</systemitem>).
1332-
<productname>PostgreSQL</> uses <symbol>SO_PEERCRED</symbol> to find out
1333-
the operating system name of the connected client process.
1327+
Peer authentication is only available on operating systems providing
1328+
the <function>getpeereid()</> function, the <symbol>SO_PEERCRED</symbol>
1329+
socket parameter, or similar mechanisms. Currently that includes
1330+
<systemitem class="osname">Linux</>,
1331+
most flavors of <systemitem class="osname">BSD</> including
1332+
<systemitem class="osname">Mac OS X</>,
1333+
and <systemitem class="osname">Solaris</systemitem>.
13341334
</para>
13351335

13361336
</sect2>

‎doc/src/sgml/libpq.sgml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -549,20 +549,21 @@ PGconn *PQconnectdbParams(const char **keywords, const char **values, int expand
549549
<term><literal>requirepeer</literal></term>
550550
<listitem>
551551
<para>
552-
For Unix-domain socket connections, if this parameter is
553-
set, the client checks at the beginning of the connection
554-
that the server process runs under the specified user name,
555-
otherwise the connection is aborted with an error. This
556-
parameter can be used to achieve the kind of server
557-
authentication that SSL certificates achieve on TCP/IP
558-
connections. (Note that if the Unix-domain socket is
559-
in <filename>/tmp</filename> or another publicly writable
560-
location, any user could start a server there. Use this
561-
parameter to ensure that you are connected to a server run
562-
by a trusted user,
563-
e.g., <literal>requirepeer=postgres</literal>.) This
564-
option is only supported on some platforms, currently
565-
Linux, FreeBSD, NetBSD, OpenBSD, and Solaris.
552+
This parameter specifies the operating-system user name of the
553+
server, for example <literal>requirepeer=postgres</literal>.
554+
When making a Unix-domain socket connection, if this
555+
parameter is set, the client checks at the beginning of the
556+
connection that the server process is running under the specified
557+
user name; if it is not, the connection is aborted with an error.
558+
This parameter can be used to provide server authentication similar
559+
to that available with SSL certificates on TCP/IP connections.
560+
(Note that if the Unix-domain socket is in
561+
<filename>/tmp</filename> or another publicly writable location,
562+
any user could start a server listening there. Use this parameter
563+
to ensure that you are connected to a server run by a trusted user.)
564+
This option is only supported on platforms for which the
565+
<literal>peer</> authentication method is implemented; see
566+
<xref linkend="auth-peer">.
566567
</para>
567568
</listitem>
568569
</varlistentry>

‎doc/src/sgml/protocol.sgml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,8 @@
314314
the credential message.) If the credential is acceptable,
315315
the server responds with an
316316
AuthenticationOk, otherwise it responds with an ErrorResponse.
317+
(This message type is only issued by pre-9.1 servers. It may
318+
eventually be removed from the protocol specification.)
317319
</para>
318320
</listitem>
319321
</varlistentry>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp