hero123457/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix permissions on user socket directory

Browse Source 
The user socket directory needs to be SGID so that they inherit
the group ownnership. Then xrdp can write to them.
This commit is contained in:
matt335672 2024-02-28 16:48:29 +00:00
parent 45df24076f
commit 200e4d84f4
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sesman/scp_process.c
View File

@ -323,6 +323,9 @@ process_logout_request(struct pre_session_item *psi)
static int static int
create_xrdp_socket_path(uid_t uid) create_xrdp_socket_path(uid_t uid)
{ {
// Owner all permissions, group read+execute
#define RWX_PERMS 0x750
int rv = 1; int rv = 1;
const char *sockdir_group = g_cfg->sec.session_sockdir_group; const char *sockdir_group = g_cfg->sec.session_sockdir_group;
int gid = 0; // Default if no group specified int gid = 0; // Default if no group specified
@ -330,14 +333,21 @@ create_xrdp_socket_path(uid_t uid)
char sockdir[XRDP_SOCKETS_MAXPATH]; char sockdir[XRDP_SOCKETS_MAXPATH];
g_snprintf(sockdir, sizeof(sockdir), XRDP_SOCKET_PATH, (int)uid); g_snprintf(sockdir, sizeof(sockdir), XRDP_SOCKET_PATH, (int)uid);
// Create directory permissions 0x750, if it doesn't exist already. // Create directory permissions RWX_PERMS, if it doesn't exist already
int old_umask = g_umask_hex(0x750 ^ 0x777); // (our os_calls layer doesn't allow us to set the SGID bit here)
int old_umask = g_umask_hex(RWX_PERMS ^ 0x777);
if (!g_directory_exist(sockdir) && !g_create_dir(sockdir)) if (!g_directory_exist(sockdir) && !g_create_dir(sockdir))
{ {
LOG(LOG_LEVEL_ERROR, LOG(LOG_LEVEL_ERROR,
"create_xrdp_socket_path: Can't create %s [%s]", "create_xrdp_socket_path: Can't create %s [%s]",
sockdir, g_get_strerror()); sockdir, g_get_strerror());
} }
else if (g_chmod_hex(sockdir, RWX_PERMS | 0x2000) != 0)
{
LOG(LOG_LEVEL_ERROR,
"create_xrdp_socket_path: Can't set SGID bit on %s [%s]",
sockdir, g_get_strerror());
}
else if (sockdir_group != NULL && sockdir_group[0] != '\0' && else if (sockdir_group != NULL && sockdir_group[0] != '\0' &&
g_getgroup_info(sockdir_group, &gid) != 0) g_getgroup_info(sockdir_group, &gid) != 0)
{ {
@ -358,6 +368,7 @@ create_xrdp_socket_path(uid_t uid)
(void)g_umask_hex(old_umask); (void)g_umask_hex(old_umask);
return rv; return rv;
#undef RWX_PERMS
} }
/******************************************************************************/ /******************************************************************************/