Changeset 2348

Timestamp:

11/10/2008 22:01:38 (4 years ago)

Author:

chris

Message:

Use getpeerucred() to identify connecting socket clients on Solaris,
and silence warnings that the peer cannot be identified on this
platform.

Remove another use of uname -o which doesn't work on Solaris.

Location:

box/trunk

Files:

• configure.ac (modified) (2 diffs)
• lib/common/BoxPlatform.h (modified) (1 diff)
• lib/server/SocketStream.cpp (modified) (2 diffs)

box/trunk/configure.ac

@@ -183 +183 @@
 AC_CHECK_DECLS([O_BINARY],,,)
 
+# Solaris provides getpeerucred() instead of getpeereid() or SO_PEERCRED
+AC_CHECK_HEADERS([ucred.h])
+AC_CHECK_FUNCS([getpeerucred])
+
 AC_CHECK_DECLS([optreset],,, [[#include <getopt.h>]])
 AC_CHECK_DECLS([dirfd],,,
@@ -312 +316 @@
 client_parcel_dir=`perl infrastructure/parcelpath.pl backup-client $target_os`
 
-os_name=`uname -o`
-if test "$os_name" = "Cygwin"; then
+if test "$build_os" = "cygwin"; then
         client_parcel_dir=`cygpath -wa $client_parcel_dir | sed -e 's|\\\|/|g'`
-        build_dir=`cygpath -wa $build_dir | sed -e 's|\\\|/|g'`
+        build_dir=`        cygpath -wa $build_dir         | sed -e 's|\\\|/|g'`
 fi
 

box/trunk/lib/common/BoxPlatform.h

@@ -73 +73 @@
 
 // Find out if credentials on UNIX sockets can be obtained
-#ifndef HAVE_GETPEEREID
-        #if !HAVE_DECL_SO_PEERCRED
-                #define PLATFORM_CANNOT_FIND_PEER_UID_OF_UNIX_SOCKET
-        #endif
+#ifdef HAVE_GETPEEREID
+        //
+#elif HAVE_DECL_SO_PEERCRED
+        //
+#elif HAVE_UCRED_H && HAVE_GETPEERUCRED
+        //
+#else
+        #define PLATFORM_CANNOT_FIND_PEER_UID_OF_UNIX_SOCKET
 #endif
 

box/trunk/lib/server/SocketStream.cpp

@@ -19 +19 @@
 
 #ifndef WIN32
-#include <poll.h>
+        #include <poll.h>
+#endif
+
+#ifdef HAVE_UCRED_H
+        #include <ucred.h>
 #endif
 
@@ -479 +483 @@
 #endif
 
+#if HAVE_UCRED_H && HAVE_GETPEERUCRED
+        ucred_t *pucred = NULL;
+        if(::getpeerucred(mSocketHandle, &pucred) == 0)
+        {
+                rUidOut = ucred_geteuid(pucred);
+                rGidOut = ucred_getegid(pucred);
+                ucred_free(pucred);
+                if (rUidOut == -1 || rGidOut == -1)
+                {
+                        BOX_ERROR("Failed to get peer credentials on "
+                                "socket: insufficient information");
+                        return false;
+                }
+                return true;
+        }
+
+        BOX_LOG_SYS_ERROR("Failed to get peer credentials on socket");
+#endif
+
         // Not available
         return false;
 }
 
-
-
-