summaryrefslogtreecommitdiffstats
path: root/dcop
diff options
context:
space:
mode:
authorOBATA Akio <obache@wizdas.com>2020-08-12 17:29:38 +0900
committerTDE Gitea <gitea@mirror.git.trinitydesktop.org>2020-08-12 13:56:13 +0000
commit7827038ab45c300b86bee1b9fb6cf0f78461c0e7 (patch)
tree6d14b561be734ea58cecccf533dcbab97501b128 /dcop
parentad5cc8cfa41c739199d4dddffbf42cb37f0dc4be (diff)
downloadtdelibs-7827038ab45c300b86bee1b9fb6cf0f78461c0e7.tar.gz
tdelibs-7827038ab45c300b86bee1b9fb6cf0f78461c0e7.zip
Add LOCAL_PEEREID sockopt support for peer socket uid check
It is supported on NetBSD 5 and later. Signed-off-by: OBATA Akio <obache@wizdas.com>
Diffstat (limited to 'dcop')
-rw-r--r--dcop/dcopclient.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp
index 7c884fe46..4e46cd828 100644
--- a/dcop/dcopclient.cpp
+++ b/dcop/dcopclient.cpp
@@ -41,6 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <sys/stat.h>
#include <sys/file.h>
#include <sys/socket.h>
+#include <sys/un.h>
#include <fcntl.h>
#include <unistd.h>
@@ -710,10 +711,12 @@ bool DCOPClient::isSuspended() const
return !d->notifier->isEnabled();
}
-#ifdef SO_PEERCRED
+#if defined(SO_PEERCRED) || defined(LOCAL_PEEREID)
+#define USE_PEER_IS_US
// Check whether the remote end is owned by the same user.
static bool peerIsUs(int sockfd)
{
+#ifdef SO_PEERCRED
#if defined(__OpenBSD__)
struct sockpeercred cred;
#else
@@ -723,6 +726,13 @@ static bool peerIsUs(int sockfd)
if (getsockopt(sockfd, SOL_SOCKET, SO_PEERCRED, &cred, &siz) != 0)
return false;
return (cred.uid == getuid());
+#elif defined LOCAL_PEEREID
+ struct unpcbid cred;
+ socklen_t siz = sizeof(cred);
+ if (getsockopt(sockfd, 0, LOCAL_PEEREID, &cred, &siz) != 0 || siz != sizeof(cred))
+ return false;
+ return (cred.unp_euid == geteuid());
+#endif
}
#else
// Check whether the socket is owned by the same user.
@@ -868,7 +878,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
return false;
}
-#ifdef SO_PEERCRED
+#ifdef USE_PEER_IS_US
d->foreign_server = !peerIsUs(socket());
#else
d->foreign_server = !isServerSocketOwnedByUser(d->serverAddr);